Renamed def files and fixed issue with debug layer.

Author: Friendly0Fire

dxgi/deffile renamed to dxgi/deffile.def

@@ -1,6 +1,10 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
+using Compat_t = void*(WINAPI *)();
+Compat_t RealCompatValue = nullptr;
+Compat_t RealCompatString = nullptr;
+
 typedef HRESULT(WINAPI* DXGIFactoryCreate0)(REFIID riid, void** ppFactory);
 typedef HRESULT(WINAPI* DXGIFactoryCreate1)(REFIID riid, void** ppFactory);
 typedef HRESULT(WINAPI* DXGIFactoryCreate2)(UINT Flags, REFIID riid, void** ppFactory);
@@ -62,21 +66,29 @@ FARPROC GetDXGIFunction(LPCSTR name)
 
 extern "C" void* WINAPI CompatValue()
 {
-    static auto func = GET_DXGI_FUNC(CompatValue);
-    return func();
+    return RealCompatValue();
 }
 
 extern "C" void* WINAPI CompatString()
 {
-    static auto func = GET_DXGI_FUNC(CompatString);
-    return func();
+    return RealCompatString();
 }
 
 BOOL APIENTRY DllMain( HMODULE hModule,
-                       DWORD  ul_reason_for_call,
+                       DWORD  fdwReason,
                        LPVOID lpReserved
                      )
 {
-    return TRUE;
+    switch (fdwReason)
+    {
+    case DLL_PROCESS_ATTACH:
+        RealCompatValue = GET_DXGI_FUNC(CompatValue);
+        RealCompatString = GET_DXGI_FUNC(CompatString);
+        break;
+    case DLL_PROCESS_DETACH:
+        RealCompatValue = nullptr;
+        RealCompatString = nullptr;
+        break;
+    }
 }
 

dxgi/dllmain.cpp

@@ -97,7 +97,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <ModuleDefinitionFile>deffile</ModuleDefinitionFile>
+      <ModuleDefinitionFile>deffile.def</ModuleDefinitionFile>
     </Link>
     <PostBuildEvent>
       <Command>IF DEFINED GW2_INSTALL_DIR (
@@ -135,7 +135,7 @@ xcopy "$(TargetPath)" "$(GW2_INSTALL_DIR)\" /Y
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <ModuleDefinitionFile>deffile</ModuleDefinitionFile>
+      <ModuleDefinitionFile>deffile.def</ModuleDefinitionFile>
     </Link>
     <PostBuildEvent>
       <Command>IF DEFINED GW2_INSTALL_DIR (
@@ -170,7 +170,7 @@ xcopy "$(TargetPath)" "$(GW2_INSTALL_DIR)\" /Y
     <ClCompile Include="dllmain.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="deffile" />
+    <None Include="deffile.def" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

dxgi/dxgi.vcxproj

@@ -120,7 +120,7 @@ xcopy "$(TargetPath)" "$(GW2_INSTALL_DIR)\" /Y
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ModuleDefinitionFile>deffile</ModuleDefinitionFile>
+      <ModuleDefinitionFile>deffile.def</ModuleDefinitionFile>
     </Link>
     <PostBuildEvent>
       <Command>IF DEFINED GW2_INSTALL_DIR (
@@ -168,7 +168,7 @@ xcopy "$(TargetPath)" "$(GW2_INSTALL_DIR)\" /Y
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ModuleDefinitionFile>deffile</ModuleDefinitionFile>
+      <ModuleDefinitionFile>deffile.def</ModuleDefinitionFile>
     </Link>
     <PostBuildEvent>
       <Command>IF DEFINED GW2_INSTALL_DIR (
@@ -204,7 +204,7 @@ xcopy "$(TargetPath)" "$(GW2_INSTALL_DIR)\" /Y
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="deffile" />
+    <None Include="deffile.def" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

loader_core/deffile renamed to loader_core/deffile.def

@@ -62,6 +62,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="deffile" />
+    <None Include="deffile.def" />
   </ItemGroup>
 </Project>