LoadLibraryAWrappesa

otya128 · Jul 18, 2018 · 078333f · 078333f
1 parent f470553
commit 078333f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/wine/wine.vcxproj b/wine/wine.vcxproj
@@ -77,7 +77,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ModuleDefinitionFile>wine.def</ModuleDefinitionFile>
       <GenerateMapFile>true</GenerateMapFile>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -96,6 +96,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <ModuleDefinitionFile>wine.def</ModuleDefinitionFile>
+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/wine/wrapper.c b/wine/wrapper.c
@@ -1,6 +1,20 @@
 #include <Windows.h>
+#include <Shlwapi.h>
 //PROGMAN.EXEなどでCOMMDLGが読み込まれなかったので修正
 HMODULE LoadLibraryAWrapper(const char *name)
 {
-    return LoadLibraryA(name);
+    HMODULE m = LoadLibraryA(name);
+    if (m)
+        return m;
+    else
+    {
+        char buf[MAX_PATH];
+        char buf2[MAX_PATH];
+        GetModuleFileNameA(GetModuleHandleA("libwine.dll"), buf, sizeof(buf));
+        *PathFindFileNameA(buf) = '\0';
+        PathCombineA(buf2, buf, name);
+
+        m = LoadLibraryA(buf2);
+    }
+    return m;
 }