Remove unnecessary warnings for SDL and Nixxes games about Windows.Ga…

…ming.Input
SpecialKO · Dec 15, 2024 · 27ebc46 · 27ebc46
1 parent 8a5913e
commit 27ebc46
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 30 deletions.
diff --git a/include/SpecialK/render/backend.h b/include/SpecialK/render/backend.h
@@ -571,6 +571,7 @@ class SK_RenderBackend_V2 : public SK_RenderBackend_V1
     bool                  capcom               = false;
     bool                  sdl                  = false;
     bool                  atlus                = false;
+    bool                  nixxes               = false;
 
     void setFocus  (HWND hWndFocus);
     void setDevice (HWND hWndRender);

diff --git a/src/input/windows.gaming.input.cpp b/src/input/windows.gaming.input.cpp
@@ -1003,25 +1003,40 @@ RoGetActivationFactory_Detour ( _In_  HSTRING activatableClassId,
 
     if (bHasPlayStationControllers)
     { 
-      if ((! config.input.gamepad.xinput.emulate) && SK_GetCurrentGameID () != SK_GAME_ID::HorizonForbiddenWest      &&
-                                                     SK_GetCurrentGameID () != SK_GAME_ID::RatchetAndClank_RiftApart &&
-                                                     SK_GetCurrentGameID () != SK_GAME_ID::ForzaHorizon5             &&
-                                                     SK_GetCurrentGameID () != SK_GAME_ID::StarWarsOutlaws           &&
-                                                     (! SK_GetCurrentRenderBackend ().windows.sdl))
+      if ((! config.input.gamepad.xinput.emulate) && SK_GetCurrentGameID () != SK_GAME_ID::ForzaHorizon5   &&
+                                                     SK_GetCurrentGameID () != SK_GAME_ID::StarWarsOutlaws &&
+                                                     (! SK_GetCurrentRenderBackend ().windows.sdl) &&
+                                                     (! SK_GetCurrentRenderBackend ().windows.nixxes))
       {
-        SK_ImGui_CreateNotification ( "WindowsGamingInput.Compatibility",
-                                      SK_ImGui_Toast::Warning,
-          "This game uses Windows.Gaming.Input\r\n\r\n  "
-          ICON_FA_PLAYSTATION "  "
-          "Your PlayStation controller may not work unless Xbox Mode is"
-          " enabled\r\n\r\n\t(Input Management | PlayStation > Xbox Mode)"
-          " and restart the game.",
-          "Windows.Gaming.Input Incompatibility Detected",
-                                      15000UL,
-                                    SK_ImGui_Toast::UseDuration |
-                                    SK_ImGui_Toast::ShowTitle   |
-                                    SK_ImGui_Toast::ShowCaption |
-                                    SK_ImGui_Toast::ShowOnce );
+        SK_RunOnce (SK_Thread_CreateEx([](LPVOID)->DWORD
+        {
+          while (game_window.hWnd == 0 || !IsWindow (game_window.hWnd))
+          {
+            SK_SleepEx (5, FALSE);
+          }
+
+          if ((! SK_GetCurrentRenderBackend ().windows.sdl) &&
+              (! SK_GetCurrentRenderBackend ().windows.nixxes))
+          {
+            SK_ImGui_CreateNotification ( "WindowsGamingInput.Compatibility",
+                                          SK_ImGui_Toast::Warning,
+              "This game uses Windows.Gaming.Input\r\n\r\n  "
+              ICON_FA_PLAYSTATION "  "
+              "Your PlayStation controller may not work unless Xbox Mode is"
+              " enabled\r\n\r\n\t(Input Management | PlayStation > Xbox Mode)"
+              " and restart the game.",
+              "Windows.Gaming.Input Incompatibility Detected",
+                                          15000UL,
+                                        SK_ImGui_Toast::UseDuration |
+                                        SK_ImGui_Toast::ShowTitle   |
+                                        SK_ImGui_Toast::ShowCaption |
+                                        SK_ImGui_Toast::ShowOnce );
+          }
+
+          SK_Thread_CloseSelf ();
+
+          return 0;
+        }, L"[SK] Windows.Gaming.Input Warning Thread"));
       }
     }
 

diff --git a/src/scheduler.cpp b/src/scheduler.cpp
@@ -102,7 +102,7 @@ SK_MMCS_ApplyPendingTaskPriority (SK_TLS **ppTLS = nullptr)
   }
 }
 
-void
+bool
 SK_Thread_WaitWhilePumpingMessages (DWORD dwMilliseconds, BOOL bAlertable, SK_TLS **ppTLS)
 {
   UNREFERENCED_PARAMETER (ppTLS);
@@ -117,7 +117,7 @@ SK_Thread_WaitWhilePumpingMessages (DWORD dwMilliseconds, BOOL bAlertable, SK_TL
         bAlertable
     );
 
-    return;
+    return 0;
   }
 
 //#define SK_DISPATCH_SLEEP
@@ -237,7 +237,7 @@ SK_Thread_WaitWhilePumpingMessages (DWORD dwMilliseconds, BOOL bAlertable, SK_TL
         dwMilliseconds = ReadAcquire (&_SK_NIER_RAD_InputPollingPeriod);
 
       SK_SleepEx (dwMilliseconds, bAlertable);
-      return;
+      return 0;
     }
   }
 #endif
@@ -318,10 +318,10 @@ SK_Thread_WaitWhilePumpingMessages (DWORD dwMilliseconds, BOOL bAlertable, SK_TL
     if (dwMaxWait < 5000UL)
     {
       if (! bGUIThread)
-        return;
+        return 0;
 
       if (dwMaxWait <= (DWORD)config.render.framerate.max_delta_time)
-        return;
+        return 0;
 
       DWORD dwWaitState =
         MsgWaitForMultipleObjectsEx (
@@ -335,7 +335,7 @@ SK_Thread_WaitWhilePumpingMessages (DWORD dwMilliseconds, BOOL bAlertable, SK_TL
       if (     dwWaitState == WAIT_IO_COMPLETION)
       {  ////SK_ReleaseAssert (  "WAIT_IO_COMPLETION"
          ////                         && bAlertable );
-        return;
+        return 0;
       }
 
       // Waiting messages
@@ -345,19 +345,19 @@ SK_Thread_WaitWhilePumpingMessages (DWORD dwMilliseconds, BOOL bAlertable, SK_TL
         PeekAndDispatch ();
         // ...
 #endif
-        return;
+        return 1;
       }
 
       // DLL Shutdown
       else if (dwWaitState == WAIT_OBJECT_0)
       {
-        return;
+        return 0;
       }
 
       // Embarassing
       else if (dwWaitState == WAIT_TIMEOUT)
       {
-        return;
+        return 0;
       }
 
       // ???
@@ -369,19 +369,21 @@ SK_Thread_WaitWhilePumpingMessages (DWORD dwMilliseconds, BOOL bAlertable, SK_TL
       }
 
       if (dwMilliseconds == 0)
-        return;
+        return 1;
     }
 
     else
     {
       SK_SleepEx (dwMaxWait, bAlertable);
-      return;
+      return 0;
     }
 
     now =
       SK_CurrentPerf ().QuadPart;
   }
   while (now < end);
+
+  return 1;
 }
 
 float
@@ -1278,7 +1280,8 @@ SleepEx_Detour (DWORD dwMilliseconds, BOOL bAlertable)
       if (bRenderThread && SK_ImGui_Visible)
         SK::Framerate::events.getMessagePumpStats ().wake (std::max (1UL, dwMilliseconds));
 
-      SK_Thread_WaitWhilePumpingMessages (dwMilliseconds, bAlertable, &pTLS);
+      auto skip_sleep =
+        SK_Thread_WaitWhilePumpingMessages (0, bAlertable, &pTLS);
 
       // Check for I/O Wait Completion Before Going Sleepless
       if (bAlertable)
@@ -1287,6 +1290,13 @@ SleepEx_Detour (DWORD dwMilliseconds, BOOL bAlertable)
                              return WAIT_IO_COMPLETION;
       }
 
+#ifndef SK_DISPATCH_SLEEP
+      //if (! skip_sleep)
+      //  SwitchToThread ();
+#endif
+
+      std::ignore = skip_sleep;
+
       return 0;
     }
 

diff --git a/src/window.cpp b/src/window.cpp
@@ -7496,6 +7496,11 @@ SK_MakeWindowHook (WNDPROC class_proc, WNDPROC wnd_proc, HWND hWnd)
     SK_GetCurrentRenderBackend ().windows.sdl = true;
   }
 
+  else if (!_wcsicmp(wszClassName, L"GameNxApp"))
+  {
+    SK_GetCurrentRenderBackend ().windows.nixxes = true;
+  }
+
   else if (SK_GetCurrentGameID () == SK_GAME_ID::Metaphor ||
            SK_GetCurrentGameID () == SK_GAME_ID::Persona4 ||
            SK_GetCurrentGameID () == SK_GAME_ID::Persona5 ||