Load config from correct location with static build

IB-8961

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

src/CMakeLists.txt

@@ -84,11 +84,9 @@ add_library(digidocpp_tsl STATIC
     XMLDocument.h
 )
 
-set_target_properties(digidocpp_util digidocpp_tsl PROPERTIES
-    POSITION_INDEPENDENT_CODE YES
-)
 target_compile_definitions(digidocpp_tsl PRIVATE $<IF:$<BOOL:${BUILD_SHARED_LIBS}>,digidocpp_EXPORTS,digidocpp_STATIC>)
 target_compile_definitions(digidocpp_util PRIVATE $<IF:$<BOOL:${BUILD_SHARED_LIBS}>,digidocpp_EXPORTS,digidocpp_STATIC>)
+set_target_properties(digidocpp_util digidocpp_tsl PROPERTIES POSITION_INDEPENDENT_CODE YES)
 
 target_include_directories(digidocpp_tsl PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
 

src/util/File.cpp

@@ -19,6 +19,7 @@
 
 #include "File.h"
 
+#include "Container.h"
 #include "log.h"
 
 #include <algorithm>
@@ -54,30 +55,38 @@ namespace fs = filesystem;
 #define f_stat _wstat64
 #define f_utime _wutime64
 using f_statbuf = struct _stat64;
-using f_utimbuf = struct __utimbuf64;
 #else
 #define f_stat stat
 #define f_utime utime
 using f_statbuf = struct stat;
-using f_utimbuf = struct utimbuf;
 #endif
 
 stack<fs::path> File::tempFiles;
 
-static string decodeName(fs::path path)
+static string decodeName(const fs::path &path)
 {
     auto name = path.u8string();
     return {reinterpret_cast<const char*>(name.data()), name.size()};
 }
 
 string File::confPath()
 {
-#if defined(__APPLE__)
+#ifdef __APPLE__
     return frameworkResourcesPath("ee.ria.digidocpp");
-#elif defined(_WIN32) && defined(_DEBUG)
-    return dllPath("digidocppd.dll");
-#elif defined(_WIN32)
-    return dllPath("digidocpp.dll");
+#elifdef _WIN32
+    if(HMODULE handle {};
+        GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
+                           GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+                           reinterpret_cast<LPCWSTR>(&digidoc::terminate),
+                           &handle))
+    {
+        wstring path(MAX_PATH, 0);
+        path.resize(GetModuleFileNameW(handle, path.data(), DWORD(path.size())));
+        if(size_t pos = path.find_last_of(L"/\\"); pos != wstring::npos)
+            path.resize(pos);
+        return decodeName(std::move(path));
+    }
+    return {};
 #else
     fs::path result;
     if(char *var = getenv("SNAP"))
@@ -107,20 +116,6 @@ bool File::fileExists(const string& path)
     return fs::is_regular_file(encodeName(path));
 }
 
-#ifdef _WIN32
-string File::dllPath(string_view dll)
-{
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-    HMODULE handle = GetModuleHandleW(encodeName(dll).c_str());
-    wstring path(MAX_PATH, 0);
-    path.resize(GetModuleFileNameW(handle, path.data(), DWORD(path.size())));
-    return decodeName(fs::path(path).parent_path());
-#else
-    return {};
-#endif
-}
-#endif
-
 /**
  * Returns last modified time
  *

src/util/File.h

@@ -53,9 +53,6 @@ namespace digidoc
               static std::vector<unsigned char> hexToBin(std::string_view in);
 
         private:
-#ifdef _WIN32
-              static std::string dllPath(std::string_view dll);
-#endif
 #ifdef __APPLE__
               static std::string frameworkResourcesPath(std::string_view name);
 #endif