Author: akhaldi
Date: Sun Feb 26 20:37:15 2017
New Revision: 73987
URL:
http://svn.reactos.org/svn/reactos?rev=73987&view=rev
Log:
[XINPUT1_3] Sync with Wine Staging 2.2. CORE-12823
8936a84 xinput1_3: Avoid spamming FIXME for XInputGetKeystroke.
1640c9c xinput1_3: Add DECLSPEC_HOTPATCH to XInputEnable() definition.
Modified:
trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/xinput…
==============================================================================
--- trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c [iso-8859-1] Sun Feb 26 20:37:15
2017
@@ -50,7 +50,7 @@
return TRUE;
}
-void WINAPI XInputEnable(BOOL enable)
+void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable)
{
/* Setting to false will stop messages from XInputSetState being sent
to the controllers. Setting to true will send the last vibration
@@ -112,7 +112,10 @@
DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE
keystroke)
{
- FIXME("(index %u, reserved %u, keystroke %p) Stub!\n", index, reserved,
keystroke);
+ static int warn_once;
+
+ if (!warn_once++)
+ FIXME("(index %u, reserved %u, keystroke %p) Stub!\n", index, reserved,
keystroke);
if (index >= XUSER_MAX_COUNT)
return ERROR_BAD_ARGUMENTS;
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 20:37:15 2017
@@ -216,7 +216,7 @@
reactos/dll/win32/wuapi # Synced to WineStaging-1.9.11
reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.9.11
reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.9.11
-reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.9.23
+reactos/dll/win32/xinput1_3 # Synced to WineStaging-2.2
reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.9.11
reactos/dll/win32/xmllite # Synced to WineStaging-1.9.23