wip-module-path

xtensor-stack · May 30, 2024 · ad9ad5f · ad9ad5f
1 parent d11fb6b
commit ad9ad5f
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/include/xtl/xsystem.hpp b/include/xtl/xsystem.hpp
@@ -39,14 +39,20 @@
 
 namespace xtl
 {
+    std::string module_path(bool executable);
     std::string executable_path();
-    std::string prefix_path();
+    std::string prefix_path(bool executable);
 
     /******************
      * implementation *
      ******************/
 
     inline std::string executable_path()
+    {
+        return module_path(false);
+    }
+
+    inline std::string module_path(bool executable = true)
     {
         std::string path;
 #if defined(UNICODE)
@@ -65,16 +71,21 @@ namespace xtl
             // failed to determine run path
         }
 #elif defined (_WIN32)
+        HMODULE handle = nullptr;
+        if (!executable)
+        {
+            GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, reinterpret_cast<LPCTSTR>(GetCurrentModule), &handle);
+        }
     #if defined(UNICODE)
-        if (GetModuleFileNameW(nullptr, buffer, sizeof(buffer)) != 0)
+        if (GetModuleFileNameW(handle, buffer, sizeof(buffer)) != 0)
         {
             // Convert wchar_t to std::string
             std::wstring wideString(buffer);
             std::string narrowString(wideString.begin(), wideString.end());
             path = narrowString;
         }
     #else
-        if (GetModuleFileNameA(nullptr, buffer, sizeof(buffer)) != 0)
+        if (GetModuleFileNameA(handle, buffer, sizeof(buffer)) != 0)
         {
             path = buffer;
         }
@@ -107,9 +118,9 @@ namespace xtl
         return path;
     }
 
-    inline std::string prefix_path()
+    inline std::string prefix_path(bool executable = true)
     {
-        std::string path = executable_path();
+        std::string path = module_path(executable);
 #if defined (_WIN32)
         char separator = '\\';
 #else