diff --git a/OptiScaler/menu/input/input_system_internal.h b/OptiScaler/menu/input/input_system_internal.h index 2b065d5b..56613674 100644 --- a/OptiScaler/menu/input/input_system_internal.h +++ b/OptiScaler/menu/input/input_system_internal.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -128,6 +129,9 @@ struct InputState HWND InputRootHwnd = nullptr; WNDPROC OriginalWndProc = nullptr; + // Each subclassed window's own original, another WndProc on top of ours can keep calling us for a window we + // no longer track + std::unordered_map OriginalWndProcs; bool Initialized = false; bool HooksInstalled = false; diff --git a/OptiScaler/menu/input/input_system_messages.cpp b/OptiScaler/menu/input/input_system_messages.cpp index 5dc5721b..780498d5 100644 --- a/OptiScaler/menu/input/input_system_messages.cpp +++ b/OptiScaler/menu/input/input_system_messages.cpp @@ -707,6 +707,13 @@ void ClearTransientState() _state.LastMouseClientPos = _state.MouseClientPos; } +// The window's own original, not the current input window's, they differ once the input window changed +static WNDPROC OriginalWndProcLocked(HWND hwnd) +{ + const auto it = _state.OriginalWndProcs.find(hwnd); + return it != _state.OriginalWndProcs.end() ? it->second : nullptr; +} + LRESULT CALLBACK OptiInputWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { if (msg == WM_NULL) @@ -715,7 +722,7 @@ LRESULT CALLBACK OptiInputWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa { std::unique_lock lock(_state.Mutex); - originalWndProc = _state.OriginalWndProc; + originalWndProc = OriginalWndProcLocked(hwnd); } if (originalWndProc != nullptr) @@ -731,7 +738,7 @@ LRESULT CALLBACK OptiInputWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa { std::unique_lock lock(_state.Mutex); - originalWndProc = _state.OriginalWndProc; + originalWndProc = OriginalWndProcLocked(hwnd); OPTIINPUT_LOG_VERBOSE("WndProc dispatch hwnd:{} msg:{}({:#x}) input:{} original:{} menu:{} focused:{}", static_cast(hwnd), WindowMessageName(msg), static_cast(msg), static_cast(_state.InputHwnd), reinterpret_cast(originalWndProc), diff --git a/OptiScaler/menu/input/input_system_window.cpp b/OptiScaler/menu/input/input_system_window.cpp index 6e09c903..fb6948b5 100644 --- a/OptiScaler/menu/input/input_system_window.cpp +++ b/OptiScaler/menu/input/input_system_window.cpp @@ -398,6 +398,7 @@ bool InstallWindowSubclass(HWND hwnd) } _state.OriginalWndProc = reinterpret_cast(previous); + _state.OriginalWndProcs[hwnd] = _state.OriginalWndProc; _state.WndProcSubclassed = true; LOG_INFO("subclass installed hwnd:{} previousWndProc:{} optiWndProc:{}", static_cast(hwnd), @@ -513,6 +514,9 @@ bool RemoveWindowSubclass(bool preserveLostChain) GetLastError()); return false; } + + // Restored, nothing chains through us for it anymore + _state.OriginalWndProcs.erase(_state.InputHwnd); } else {