Blacklist openxr_load.dll while SK is injected into games

SpecialKO · Apr 15, 2024 · 04344ba · 04344ba
1 parent 20592ed
commit 04344ba
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -289,3 +289,5 @@ paket-files/
 unity_*.cpp
 opengl_stateblock.cpp
 /StructLayoutSettings.json
+/resource/textures/Gamepads/PS5 Button Icons and Controls/Buttons Full Solid/Black/128w/Circle.png
+*.png
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,4 +1,12 @@
-24.4.14
+24.4.15
+=======
+ + Removed ImGui nav focus on plot widgets (i.e. Framepacing Graph) when using
+     keyboard or gamepad in the control panel
+ + Condensed Frametime calculation selection in advanced Framerate Limiter view
+ + Blacklist openxr_load.dll while SK is injected into games, because it will
+     deadlock when the game exits. It's optional and for VR, so not a big deal.
+
+24.4.14
 =======
  + Fixed incorrect battery level for DualShock 4 Bluetooth controllers
  + Added support for binding DualShock 4 trackpad click to keyboard input

diff --git a/SpecialK.vcxproj b/SpecialK.vcxproj
@@ -448,7 +448,7 @@ if exist "$(TargetDir)$(TargetName).exp" ( del "$(TargetDir)$(TargetName).exp" )
       <Profile>false</Profile>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <EnableCOMDATFolding>false</EnableCOMDATFolding>
       <DataExecutionPrevention>true</DataExecutionPrevention>
       <AdditionalOptions>/GUARD:NO /IGNORE:4099,4286 %(AdditionalOptions)</AdditionalOptions>
       <LinkErrorReporting>NoErrorReport</LinkErrorReporting>
@@ -458,7 +458,7 @@ if exist "$(TargetDir)$(TargetName).exp" ( del "$(TargetDir)$(TargetName).exp" )
       <CETCompat>false</CETCompat>
       <SectionAlignment>
       </SectionAlignment>
-      <ShowProgress>LinkVerboseSAFESEH</ShowProgress>
+      <ShowProgress>NotSet</ShowProgress>
       <StackReserveSize>0x200000</StackReserveSize>
       <StackCommitSize>0x4000</StackCommitSize>
       <CreateHotPatchableImage>ItaniumImage</CreateHotPatchableImage>
@@ -497,6 +497,9 @@ if exist "$(TargetDir)$(TargetName).exp" ( del "$(TargetDir)$(TargetName).exp" )
     <Xdcmake>
       <DocumentLibraryDependencies>false</DocumentLibraryDependencies>
     </Xdcmake>
+    <ResourceCompile>
+      <NullTerminateStrings>true</NullTerminateStrings>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -573,7 +576,7 @@ if exist "$(TargetDir)$(TargetName).exp" ( del "$(TargetDir)$(TargetName).exp" )
       <Profile>false</Profile>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <EnableCOMDATFolding>false</EnableCOMDATFolding>
       <DataExecutionPrevention>true</DataExecutionPrevention>
       <AdditionalOptions>/GUARD:NO /IGNORE:4099,4286 %(AdditionalOptions)</AdditionalOptions>
       <LinkErrorReporting>NoErrorReport</LinkErrorReporting>
@@ -583,7 +586,7 @@ if exist "$(TargetDir)$(TargetName).exp" ( del "$(TargetDir)$(TargetName).exp" )
       <CETCompat>false</CETCompat>
       <SectionAlignment>
       </SectionAlignment>
-      <ShowProgress>LinkVerboseSAFESEH</ShowProgress>
+      <ShowProgress>NotSet</ShowProgress>
       <StackReserveSize>0x200000</StackReserveSize>
       <StackCommitSize>0x4000</StackCommitSize>
       <CreateHotPatchableImage>ItaniumImage</CreateHotPatchableImage>

diff --git a/include/SpecialK/DLL_VERSION.H b/include/SpecialK/DLL_VERSION.H
@@ -2,7 +2,7 @@
 
 #define SK_YEAR  24
 #define SK_MONTH 4
-#define SK_DATE  14
+#define SK_DATE  15
 #define SK_REV_N 0
 #define SK_REV   0
 

diff --git a/src/diagnostics/debug_utils.cpp b/src/diagnostics/debug_utils.cpp
@@ -4865,7 +4865,7 @@ SK_Win32_FormatMessageForException (
     if (lpMsgBuf != nullptr)
     {
       va_list      args = nullptr;
-      va_start    (args,           lpMsgFormat);
+      va_start    (args,              nExceptionCode);
       vswprintf_s (lpMsgBuf, 4096, lpMsgFormat, args);
       va_end      (args);
 

diff --git a/src/diagnostics/load_library.cpp b/src/diagnostics/load_library.cpp
@@ -787,6 +787,7 @@ LoadLibrary_Marshal ( LPVOID   lpRet,
     if (hModEarly == nullptr && BlacklistLibrary (compliant_path))
     {
       SK_UnlockDllLoader ();
+      SK_SetLastError (ERROR_MOD_NOT_FOUND);
       return nullptr;
     }
 
@@ -2416,6 +2417,14 @@ BlacklistLibrary (const _T* lpFileName)
     }
   }
 
+  if (StrStrI (lpFileName, SK_TEXT("openxr_loader.dll")))
+  {
+    SK_LOGs0 ( L"DLL Loader",
+                 L"OpenXR DLL Blocked to Prevent Deadlock at Shutdown" );
+
+    return TRUE;
+  }
+
   return FALSE;
 
 #pragma pop_macro ("StrStrI")