From 22e49cc78b17af03179b2f052bc3b2baa74bd19e Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Wed, 28 Nov 2018 11:53:20 +0000
Subject: [PATCH] Try to fix https://github.com/Exiv2/exiv2/issues/572

---
 src/CMakeLists.txt | 10 ++++++----
 src/futils.cpp     | 10 ++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4187931f..ca24006e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,7 +39,7 @@ add_library( exiv2lib_int OBJECT
     unused.h
 )
 
-add_library( exiv2lib 
+add_library( exiv2lib
     ../include/exiv2/config.h
     ../include/exiv2/exiv2.hpp
     ../include/exiv2/rwlock.hpp
@@ -195,10 +195,12 @@ if (NOT MSVC)
     endif()
 
     if (CYGWIN OR MINGW OR MSYS)
-        target_link_libraries( exiv2lib PRIVATE  psapi ws2_32 )
+        target_link_libraries( exiv2lib PRIVATE psapi ws2_32 )
     endif()
 
     target_link_libraries( exiv2lib PRIVATE Threads::Threads)
+else()
+    target_link_libraries( exiv2lib PRIVATE psapi ws2_32 )
 endif()
 
 if( EXIV2_ENABLE_PNG )
@@ -223,7 +225,7 @@ install(TARGETS exiv2lib EXPORT exiv2Config
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
-install(DIRECTORY ../include/exiv2 
+install(DIRECTORY ../include/exiv2
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h*")
 
@@ -238,7 +240,7 @@ install(EXPORT exiv2Config DESTINATION "share/exiv2/cmake")
 # exiv2 application
 
 if(EXIV2_BUILD_EXIV2_COMMAND)
-    add_executable( exiv2 
+    add_executable( exiv2
          exiv2.cpp
          exiv2app.hpp
          actions.cpp actions.hpp
diff --git a/src/futils.cpp b/src/futils.cpp
index a30acd98..c16d2453 100644
--- a/src/futils.cpp
+++ b/src/futils.cpp
@@ -464,14 +464,8 @@ namespace Exiv2 {
     {
         std::string ret("unknown");
     #if defined(WIN32)
-        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);
+        if ( GetModuleFileName( "", filename, MAX_PATH ) != 0 ) {
+            ret = filename;
         }
     #elif defined(__APPLE__)
         const int pid = getpid();