Load firmware from UTF-8 paths correctly, fixing #172

Dewb · Sep 17, 2023 · 3aa792e · 3aa792e
1 parent 93c8ab8
commit 3aa792e
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/common/core/FirmwareManager.cpp b/src/common/core/FirmwareManager.cpp
@@ -192,12 +192,19 @@ struct FirmwareManagerImpl
 
 #if ARCH_WIN
 
-        wchar_t* libName = new wchar_t[4096];
-        MultiByteToWideChar(CP_ACP, 0, libraryToLoad.c_str(), -1, libName, 4096);
+        int wideLength = MultiByteToWideChar(CP_UTF8, 0, libraryToLoad.c_str(), -1, nullptr, 0);
+        if (wideLength > 0)
+        {
+            std::vector<wchar_t> wideLibName(wideLength);
+            wideLength = MultiByteToWideChar(CP_UTF8, 0, libraryToLoad.c_str(), -1, wideLibName.data(), wideLength);
+            if (wideLength > 0)
+            {
+                SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS);
+                handle = LoadLibraryW(wideLibName.data());
+                SetErrorMode(0);
+            }
+        }
 
-        SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS);
-        handle = LoadLibrary(libName);
-        SetErrorMode(0);
         if (!handle)
         {
             int error = GetLastError();