Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-16 21:38:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[XINPUT1_3] Sync with Wine Staging 2.2. CORE-12823

Browse source 
8936a84 xinput1_3: Avoid spamming FIXME for XInputGetKeystroke.
1640c9c xinput1_3: Add DECLSPEC_HOTPATCH to XInputEnable() definition.

svn path=/trunk/; revision=73987
This commit is contained in:
Amine Khaldi 2017-02-26 20:37:15 +00:00
parent 0ddc7f0226
commit f730ef2eb5
2 changed files with 6 additions and 3 deletions
reactos
dll/win32/xinput1_3
xinput1_3_main.c
media/doc
README.WINE

7
reactos/dll/win32/xinput1_3/xinput1_3_main.c
View file

@ -50,7 +50,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
return TRUE; return TRUE;
} }
void WINAPI XInputEnable(BOOL enable) void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable)
{ {
/* Setting to false will stop messages from XInputSetState being sent /* Setting to false will stop messages from XInputSetState being sent
to the controllers. Setting to true will send the last vibration to the controllers. Setting to true will send the last vibration
@ -112,7 +112,10 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE_EX* st
DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) 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) if (index >= XUSER_MAX_COUNT)
return ERROR_BAD_ARGUMENTS; return ERROR_BAD_ARGUMENTS;

2
reactos/media/doc/README.WINE
View file

@ -216,7 +216,7 @@ reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.9.11
reactos/dll/win32/wuapi # Synced to WineStaging-1.9.11 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_1 # Synced to WineStaging-1.9.11
reactos/dll/win32/xinput1_2 # 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/xinput9_1_0 # Synced to WineStaging-1.9.11
reactos/dll/win32/xmllite # Synced to WineStaging-1.9.23 reactos/dll/win32/xmllite # Synced to WineStaging-1.9.23