OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-20 12:19:10 +00:00
Code Releases Activity

Add workaround for mouse handling bug in Win10 FCU (cherry picked from commit d15e58f3da33c77d015f1af248354b01ca237362)

Browse Source 
Author: Adam Johnson <AdamJohnso@gmail.com>
Date:   Sun Mar 25 21:08:57 2018 -0400

    Add workaround for mouse handling bug in Win10 FCU

    Windows 10 Fall Creators Update changed the behavior of SetCursorPos,
    which no longer sends the expected WM_MOUSEMOVE message when
    recentering the cursor.  This adds a function to detect affected
    versions of Windows and flags the necessity to manually send our own
    message.

    This workaround currently only detects the known affected version of
    Win10, in the hope that it will be fixed and no further attention
    will be required.  If this regression is not fixed, additional Win10
    versions can be added.
This commit is contained in:
Adam Johnson
2020-04-16 11:14:56 -06:00
committed by rarified
parent ec654905ee
commit f8841b8264
3 changed files with 74 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsUtils.cpp
View File

@ -766,3 +766,31 @@ char** DisplaySystemVersion()
return nil; return nil;
#endif #endif
} }
#ifdef HS_BUILD_FOR_WIN32
static RTL_OSVERSIONINFOW s_WinVer;
const RTL_OSVERSIONINFOW& hsGetWindowsVersion()
{
static bool done = false;
if (!done) {
memset(&s_WinVer, 0, sizeof(RTL_OSVERSIONINFOW));
HMODULE ntdll = LoadLibraryW(L"ntdll.dll");
hsAssert(ntdll, "Failed to LoadLibrary on ntdll???");
if (ntdll) {
s_WinVer.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOW);
typedef LONG(WINAPI* RtlGetVersionPtr)(RTL_OSVERSIONINFOW*);
RtlGetVersionPtr getVersion = (RtlGetVersionPtr)GetProcAddress(ntdll, "RtlGetVersion");
hsAssert(getVersion, "Could not find RtlGetVersion in ntdll");
if (getVersion) {
getVersion(&s_WinVer);
done = true;
}
}
FreeLibrary(ntdll);
}
return s_WinVer;
}
#endif

3
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsWindows.h
View File

@ -55,4 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <Windows.h> #include <Windows.h>
#endif // __AFX_H__ #endif // __AFX_H__
const RTL_OSVERSIONINFOW& hsGetWindowsVersion();
#endif // HS_BUILD_FOR_WIN32 #endif // HS_BUILD_FOR_WIN32

42
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp
View File

@ -262,6 +262,24 @@ plKeyDef plInputManager::UntranslateKey(plKeyDef key, hsBool extended)
return key; return key;
} }
#if HS_BUILD_FOR_WIN32
/** Determines if we need to hackily flush cursor updates
* \remarks Normally, we would just call SetCursorPos directly. However, in Windows 10's
* 2017 Fall Creator's Update, SetCursorPos, GetCursorPos, and WM_MOUSEMOVE are buggy.
* Research done by Deledrius matches my independent observations and failed fixes:
* https://discourse.libsdl.org/t/win10-fall-creators-update-breaks-mouse-warping/23526
* Many thanks to these fine folks who work on libsdl!
*/
static bool INeedsWin10CursorHack()
{
// According to Chromium, Microsoft will be fixing the cursor bug in the next build
// of Windows 10, so we only need to test for the dreaded 2017 FCU...
// Reference: https://bugs.chromium.org/p/chromium/issues/detail?id=781182#c15
const RTL_OSVERSIONINFOW& version = hsGetWindowsVersion();
return version.dwMajorVersion == 10 && version.dwBuildNumber == 16299;
}
#endif // HS_BUILD_FOR_WIN32
void plInputManager::HandleWin32ControlEvent(UINT message, WPARAM Wparam, LPARAM Lparam, HWND hWnd) void plInputManager::HandleWin32ControlEvent(UINT message, WPARAM Wparam, LPARAM Lparam, HWND hWnd)
{ {
@ -378,6 +396,12 @@ void plInputManager::HandleWin32ControlEvent(UINT message, WPARAM Wparam, LPARAM
{ {
pt.x = (rect.right - rect.left) / 2; pt.x = (rect.right - rect.left) / 2;
pt.y = HIWORD(Lparam); pt.y = HIWORD(Lparam);
if (INeedsWin10CursorHack()) {
pXMsg->fWx = pt.x;
pXMsg->fX = pt.x / (float)rect.right;
for (int i = 0; i < fInputDevices.Count(); i++)
fInputDevices[i]->MsgReceive(pXMsg);
}
ClientToScreen(hWnd, &pt); ClientToScreen(hWnd, &pt);
SetCursorPos( pt.x, pt.y ); SetCursorPos( pt.x, pt.y );
} }
@ -386,6 +410,13 @@ void plInputManager::HandleWin32ControlEvent(UINT message, WPARAM Wparam, LPARAM
{ {
pt.y = (rect.bottom - rect.top) / 2; pt.y = (rect.bottom - rect.top) / 2;
pt.x = LOWORD(Lparam); pt.x = LOWORD(Lparam);
if (INeedsWin10CursorHack()) {
pYMsg->fWy = pt.y;
pYMsg->fY = pYMsg->fWy / (float)rect.bottom;
for (int i = 0; i < fInputDevices.Count(); i++)
fInputDevices[i]->MsgReceive(pYMsg);
}
ClientToScreen(hWnd, &pt); ClientToScreen(hWnd, &pt);
SetCursorPos( pt.x, pt.y ); SetCursorPos( pt.x, pt.y );
} }
@ -393,6 +424,17 @@ void plInputManager::HandleWin32ControlEvent(UINT message, WPARAM Wparam, LPARAM
{ {
pt.y = (rect.bottom - rect.top) / 2; pt.y = (rect.bottom - rect.top) / 2;
pt.x = (rect.right - rect.left) / 2; pt.x = (rect.right - rect.left) / 2;
if (INeedsWin10CursorHack()) {
pXMsg->fWx = pt.x;
pXMsg->fX = pXMsg->fWx / (float)rect.right;
pYMsg->fWy = pt.y;
pYMsg->fY = pYMsg->fWy / (float)rect.bottom;
for (int i = 0; i < fInputDevices.Count(); i++) {
fInputDevices[i]->MsgReceive(pXMsg);
fInputDevices[i]->MsgReceive(pYMsg);
}
}
ClientToScreen(hWnd, &pt); ClientToScreen(hWnd, &pt);
SetCursorPos( pt.x, pt.y ); SetCursorPos( pt.x, pt.y );
} }