Release v5.3 (revised): raw mouse error-87 fallback, dispatch retry, changelog

Made-with: Cursor

Author: d3nd3

CHANGELOG.md

@@ -2,9 +2,9 @@
 
 ## v5.3
 
-- Raw mouse: if `RegisterRawInputDevices` returns `ERROR_INVALID_PARAMETER` (87) for focus-following registration (`hwndTarget=NULL`), retry once with an explicit top-level HWND resolved from the game window and foreground heuristics.
-- Raw mouse: call `RegisterRawInputDevices` only on the thread that owns `cl_hwnd`; other threads defer. `DispatchMessageA` retries registration while raw mouse is enabled and not yet registered so deferred work completes on the game message thread.
-- Raw mouse: when enable is deferred, the `_sofbuddy_rawmouse` cvar path logs that registration is pending instead of reporting a hard failure.
+- Raw mouse: if `RegisterRawInputDevices` returns `ERROR_INVALID_PARAMETER` (87) for focus-following registration (`hwndTarget=NULL`), retry once with an explicit same-process top-level HWND (resolved via `cl_hwnd`, window heuristics, or foreground when it belongs to the game process). Non-null `hwndTarget` must be owned by the calling process; comments in `raw_shared.cpp` document that Win32 rule.
+- Raw mouse: `DispatchMessageA` calls `raw_mouse_ensure_registered` while `_sofbuddy_rawmouse` is on and registration is not complete yet, so enable still settles if the first attempt runs before the pump has ticked.
+- Raw mouse: `RegisterRawInputDevices` may still be invoked from the cvar path or other threads (same as v5.2); raw input registration is per-process and must not be restricted to the window thread only.
 
 ## v5.2
 

src/features/raw_mouse/hooks/dispatchmessagea.cpp

@@ -34,8 +34,8 @@ static bool msg_affects_cursor_clip(UINT msg) {
 LRESULT dispatchmessagea_override_callback(
     const MSG *msg, detour_DispatchMessageA::tDispatchMessageA original) {
   if (msg && raw_mouse_is_enabled() && raw_mouse_api_supported()) {
-    /* Finish registration on the GUI thread after deferred attempts from
-     * other threads (and before clip-only events). */
+    /* Retry registration if enable ran before the pump ticked (cheap no-op once
+     * registered). */
     if (!raw_mouse_registered) {
       raw_mouse_ensure_registered(msg->hwnd, false);
     }

src/features/raw_mouse/raw_cvars.cpp

@@ -28,10 +28,6 @@ void raw_mouse_on_change(cvar_t *cvar)
         raw_mouse_ensure_registered(nullptr, true);
         if (raw_mouse_registered) {
             PrintOut(PRINT_DEV, "raw_mouse: Raw input is now ENABLED\n");
-        } else if (raw_mouse_reg_deferred_to_gui_thread) {
-            PrintOut(PRINT_LOG,
-                     "raw_mouse: Raw input enable pending (registration will "
-                     "complete on the game message thread)\n");
         } else {
             PrintOut(PRINT_BAD,
                      "raw_mouse: Raw input was requested but registration failed\n");

src/features/raw_mouse/raw_shared.cpp

@@ -13,7 +13,6 @@ int raw_mouse_delta_y = 0;
 POINT window_center = {0, 0};
 bool raw_mouse_center_valid = false;
 bool raw_mouse_registered = false;
-bool raw_mouse_reg_deferred_to_gui_thread = false;
 bool raw_mouse_cursor_clipped = false;
 HWND raw_mouse_hwnd_target = nullptr;
 static RECT raw_mouse_clip_rect = {0, 0, 0, 0};
@@ -427,20 +426,9 @@ static void RawMouseDropRegistration() {
 }
 
 #if SOFBUDDY_RAWINPUT_API_AVAILABLE
-enum class RawMouseRegResult { Ok, Failed, Deferred };
-
-/* RegisterRawInputDevices is only reliable from the thread that owns the game's
- * message queue. Other threads (e.g. GetCursorPos hook) must defer. */
-static bool RawMouseOnGameGuiThread() {
-  HWND gw = RawMouseGameWindowHwnd();
-  if (!gw || !IsWindow(gw)) {
-    return true;
-  }
-  DWORD tid = 0;
-  GetWindowThreadProcessId(gw, &tid);
-  return GetCurrentThreadId() == tid;
-}
-
+/* HWND used as rid.hwndTarget must belong to this process: RegisterRawInputDevices
+ * rejects foreign HWNDs (error 87 is typical), by design so another process cannot
+ * attach raw input to arbitrary third-party windows. */
 static HWND RawMouseFallbackRegistrationHwnd() {
   HWND w = RawMouseResolveLocalWindow(nullptr);
   if (w) {
@@ -453,16 +441,11 @@ static HWND RawMouseFallbackRegistrationHwnd() {
   return nullptr;
 }
 
-static RawMouseRegResult RawMouseCommitRawInputRegistration(bool log_result) {
-  if (!RawMouseOnGameGuiThread()) {
-    if (log_result) {
-      PrintOut(PRINT_DEV,
-               "raw_mouse: Deferring raw input registration to the game GUI "
-               "thread (RegisterRawInputDevices is not reliable off-thread)\n");
-    }
-    return RawMouseRegResult::Deferred;
-  }
-
+/* Prefer focus-following (hwndTarget=NULL). If that fails with ERROR_INVALID_PARAMETER,
+ * retry with an explicit top-level HWND from RawMouseFallbackRegistrationHwnd (always
+ * same-process via RawMouseNormalizeCandidateHwnd). Registration may be called from any
+ * thread; the device list is per-process. */
+static bool RawMouseCommitRawInputRegistration(bool log_result) {
   RAWINPUTDEVICE rid = {};
   rid.usUsagePage = 0x01;
   rid.usUsage = 0x02;
@@ -489,7 +472,7 @@ static RawMouseRegResult RawMouseCommitRawInputRegistration(bool log_result) {
                                      PRINT_DEV);
             RawMouseLogRegisteredMouseDevice(PRINT_DEV);
           }
-          return RawMouseRegResult::Ok;
+          return true;
         }
       }
     }
@@ -512,7 +495,7 @@ static RawMouseRegResult RawMouseCommitRawInputRegistration(bool log_result) {
       }
     }
     RawMouseDropRegistration();
-    return RawMouseRegResult::Failed;
+    return false;
   }
 
   raw_mouse_registered = true;
@@ -522,7 +505,7 @@ static RawMouseRegResult RawMouseCommitRawInputRegistration(bool log_result) {
              "(focus-following mode, hwndTarget=NULL)\n");
     RawMouseLogRegisteredMouseDevice(PRINT_DEV);
   }
-  return RawMouseRegResult::Ok;
+  return true;
 }
 #endif
 
@@ -552,17 +535,7 @@ void raw_mouse_ensure_registered(HWND hwnd_hint, bool log_register_attempts) {
     return;
   }
 #if SOFBUDDY_RAWINPUT_API_AVAILABLE
-  switch (RawMouseCommitRawInputRegistration(log_register_attempts)) {
-  case RawMouseRegResult::Ok:
-    raw_mouse_reg_deferred_to_gui_thread = false;
-    break;
-  case RawMouseRegResult::Deferred:
-    raw_mouse_reg_deferred_to_gui_thread = true;
-    return;
-  case RawMouseRegResult::Failed:
-    raw_mouse_reg_deferred_to_gui_thread = false;
-    return;
-  }
+  if (!RawMouseCommitRawInputRegistration(log_register_attempts)) return;
 #endif
 
   if (raw_mouse_hwnd_target) {

src/features/raw_mouse/shared.h

@@ -34,8 +34,6 @@ extern int raw_mouse_delta_y;
 extern POINT window_center;
 extern bool raw_mouse_center_valid;
 extern bool raw_mouse_registered;
-/** True when RegisterRawInputDevices was skipped because we are not on the game GUI thread. */
-extern bool raw_mouse_reg_deferred_to_gui_thread;
 extern bool raw_mouse_cursor_clipped;
 extern HWND raw_mouse_hwnd_target;