#571 Restore the original windows getProcessCode() because Microsoft'…

…s GetModuleFileName isn't effective!
Exiv2 · Nov 29, 2018 · 8980eac · 8980eac
1 parent 948c48d
commit 8980eac
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/futils.cpp b/src/futils.cpp
@@ -464,9 +464,14 @@ namespace Exiv2 {
     {
         std::string ret("unknown");
     #if defined(WIN32)
-        TCHAR filename[MAX_PATH];
-        if ( GetModuleFileName( (HMODULE)"", filename, MAX_PATH ) != 0 ) {
-            ret = filename;
+        HANDLE processHandle = NULL;
+        processHandle = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, GetCurrentProcessId());
+        if (processHandle != NULL) {
+            TCHAR filename[MAX_PATH];
+            if (GetModuleFileNameEx(processHandle, NULL, filename, MAX_PATH) != 0) {
+                ret = filename;
+            }
+            CloseHandle(processHandle);
         }
     #elif defined(__APPLE__)
         const int pid = getpid();