September 2016 - Wine-commits

Nikolay Sivov : kernel32: Map from CAL_* constants to LOCALE_*.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 64a8aa520adf78e4c7478928663916f023ad0f21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a8aa520adf78e4c74789286… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 1 02:04:51 2016 +0300 kernel32: Map from CAL_* constants to LOCALE_*. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 119 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 71 insertions(+), 48 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index b7a7918..0a5aa07 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -856,6 +856,68 @@ int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, LPWSTR lpCalData, int cchData, LPDWORD lpValue) { + static const LCTYPE caltype_lctype_map[] = { + 0, /* not used */ + 0, /* CAL_ICALINTVALUE */ + 0, /* CAL_SCALNAME */ + 0, /* CAL_IYEAROFFSETRANGE */ + 0, /* CAL_SERASTRING */ + LOCALE_SSHORTDATE, + LOCALE_SLONGDATE, + LOCALE_SDAYNAME1, + LOCALE_SDAYNAME2, + LOCALE_SDAYNAME3, + LOCALE_SDAYNAME4, + LOCALE_SDAYNAME5, + LOCALE_SDAYNAME6, + LOCALE_SDAYNAME7, + LOCALE_SABBREVDAYNAME1, + LOCALE_SABBREVDAYNAME2, + LOCALE_SABBREVDAYNAME3, + LOCALE_SABBREVDAYNAME4, + LOCALE_SABBREVDAYNAME5, + LOCALE_SABBREVDAYNAME6, + LOCALE_SABBREVDAYNAME7, + LOCALE_SMONTHNAME1, + LOCALE_SMONTHNAME2, + LOCALE_SMONTHNAME3, + LOCALE_SMONTHNAME4, + LOCALE_SMONTHNAME5, + LOCALE_SMONTHNAME6, + LOCALE_SMONTHNAME7, + LOCALE_SMONTHNAME8, + LOCALE_SMONTHNAME9, + LOCALE_SMONTHNAME10, + LOCALE_SMONTHNAME11, + LOCALE_SMONTHNAME12, + LOCALE_SMONTHNAME13, + LOCALE_SABBREVMONTHNAME1, + LOCALE_SABBREVMONTHNAME2, + LOCALE_SABBREVMONTHNAME3, + LOCALE_SABBREVMONTHNAME4, + LOCALE_SABBREVMONTHNAME5, + LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, + LOCALE_SABBREVMONTHNAME8, + LOCALE_SABBREVMONTHNAME9, + LOCALE_SABBREVMONTHNAME10, + LOCALE_SABBREVMONTHNAME11, + LOCALE_SABBREVMONTHNAME12, + LOCALE_SABBREVMONTHNAME13, + LOCALE_SYEARMONTH, + 0, /* CAL_ITWODIGITYEARMAX */ + LOCALE_SSHORTESTDAYNAME1, + LOCALE_SSHORTESTDAYNAME2, + LOCALE_SSHORTESTDAYNAME3, + LOCALE_SSHORTESTDAYNAME4, + LOCALE_SSHORTESTDAYNAME5, + LOCALE_SSHORTESTDAYNAME6, + LOCALE_SSHORTESTDAYNAME7, + LOCALE_SMONTHDAY, + 0, /* CAL_SABBREVERASTRING */ + }; + CALTYPE calinfo; + if (CalType & CAL_NOUSEROVERRIDE) FIXME("flag CAL_NOUSEROVERRIDE used, not fully implemented\n"); if (CalType & CAL_USE_CP_ACP) @@ -878,108 +940,69 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, /* FIXME: No verification is made yet wrt Locale * for the CALTYPES not requiring GetLocaleInfoA */ - switch (CalType & ~(CAL_NOUSEROVERRIDE|CAL_RETURN_NUMBER|CAL_USE_CP_ACP)) { + + calinfo = CalType & 0xffff; + + switch (calinfo) { case CAL_ICALINTVALUE: if (CalType & CAL_RETURN_NUMBER) return GetLocaleInfoW(Locale, LOCALE_RETURN_NUMBER | LOCALE_ICALENDARTYPE, (LPWSTR)lpValue, 2); return GetLocaleInfoW(Locale, LOCALE_ICALENDARTYPE, lpCalData, cchData); case CAL_SCALNAME: - FIXME("Unimplemented caltype %d\n", CalType & 0xffff); + FIXME("Unimplemented caltype %d\n", calinfo); if (lpCalData) *lpCalData = 0; return 1; case CAL_IYEAROFFSETRANGE: - FIXME("Unimplemented caltype %d\n", CalType & 0xffff); + FIXME("Unimplemented caltype %d\n", calinfo); return 0; case CAL_SERASTRING: - FIXME("Unimplemented caltype %d\n", CalType & 0xffff); + FIXME("Unimplemented caltype %d\n", calinfo); return 0; case CAL_SSHORTDATE: - return GetLocaleInfoW(Locale, LOCALE_SSHORTDATE, lpCalData, cchData); case CAL_SLONGDATE: - return GetLocaleInfoW(Locale, LOCALE_SLONGDATE, lpCalData, cchData); case CAL_SDAYNAME1: - return GetLocaleInfoW(Locale, LOCALE_SDAYNAME1, lpCalData, cchData); case CAL_SDAYNAME2: - return GetLocaleInfoW(Locale, LOCALE_SDAYNAME2, lpCalData, cchData); case CAL_SDAYNAME3: - return GetLocaleInfoW(Locale, LOCALE_SDAYNAME3, lpCalData, cchData); case CAL_SDAYNAME4: - return GetLocaleInfoW(Locale, LOCALE_SDAYNAME4, lpCalData, cchData); case CAL_SDAYNAME5: - return GetLocaleInfoW(Locale, LOCALE_SDAYNAME5, lpCalData, cchData); case CAL_SDAYNAME6: - return GetLocaleInfoW(Locale, LOCALE_SDAYNAME6, lpCalData, cchData); case CAL_SDAYNAME7: - return GetLocaleInfoW(Locale, LOCALE_SDAYNAME7, lpCalData, cchData); case CAL_SABBREVDAYNAME1: - return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME1, lpCalData, cchData); case CAL_SABBREVDAYNAME2: - return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME2, lpCalData, cchData); case CAL_SABBREVDAYNAME3: - return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME3, lpCalData, cchData); case CAL_SABBREVDAYNAME4: - return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME4, lpCalData, cchData); case CAL_SABBREVDAYNAME5: - return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME5, lpCalData, cchData); case CAL_SABBREVDAYNAME6: - return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME6, lpCalData, cchData); case CAL_SABBREVDAYNAME7: - return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME7, lpCalData, cchData); case CAL_SMONTHNAME1: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME1, lpCalData, cchData); case CAL_SMONTHNAME2: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME2, lpCalData, cchData); case CAL_SMONTHNAME3: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME3, lpCalData, cchData); case CAL_SMONTHNAME4: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME4, lpCalData, cchData); case CAL_SMONTHNAME5: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME5, lpCalData, cchData); case CAL_SMONTHNAME6: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME6, lpCalData, cchData); case CAL_SMONTHNAME7: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME7, lpCalData, cchData); case CAL_SMONTHNAME8: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME8, lpCalData, cchData); case CAL_SMONTHNAME9: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME9, lpCalData, cchData); case CAL_SMONTHNAME10: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME10, lpCalData, cchData); case CAL_SMONTHNAME11: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME11, lpCalData, cchData); case CAL_SMONTHNAME12: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME12, lpCalData, cchData); case CAL_SMONTHNAME13: - return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME13, lpCalData, cchData); case CAL_SABBREVMONTHNAME1: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME1, lpCalData, cchData); case CAL_SABBREVMONTHNAME2: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME2, lpCalData, cchData); case CAL_SABBREVMONTHNAME3: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME3, lpCalData, cchData); case CAL_SABBREVMONTHNAME4: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME4, lpCalData, cchData); case CAL_SABBREVMONTHNAME5: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME5, lpCalData, cchData); case CAL_SABBREVMONTHNAME6: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME6, lpCalData, cchData); case CAL_SABBREVMONTHNAME7: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME7, lpCalData, cchData); case CAL_SABBREVMONTHNAME8: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME8, lpCalData, cchData); case CAL_SABBREVMONTHNAME9: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME9, lpCalData, cchData); case CAL_SABBREVMONTHNAME10: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME10, lpCalData, cchData); case CAL_SABBREVMONTHNAME11: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME11, lpCalData, cchData); case CAL_SABBREVMONTHNAME12: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME12, lpCalData, cchData); case CAL_SABBREVMONTHNAME13: - return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME13, lpCalData, cchData); case CAL_SYEARMONTH: - return GetLocaleInfoW(Locale, LOCALE_SYEARMONTH, lpCalData, cchData); + return GetLocaleInfoW(Locale, caltype_lctype_map[calinfo], lpCalData, cchData); case CAL_ITWODIGITYEARMAX: if (CalType & CAL_RETURN_NUMBER) { @@ -1002,7 +1025,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, } break; default: - FIXME("Unknown caltype %d\n",CalType & 0xffff); + FIXME("Unknown caltype %d\n", calinfo); SetLastError(ERROR_INVALID_FLAGS); return 0; }

1 0

Hugh McMaster : regedit: Remove two 'continue' statements from the end of two 'while' loops.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: b4d40846dd2b027a0a2c45ab67278688ff700a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d40846dd2b027a0a2c45ab6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 31 09:25:54 2016 +0000 regedit: Remove two 'continue' statements from the end of two 'while' loops. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e3e26c0..c33e28d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -741,7 +741,6 @@ static void processRegLinesA(FILE *in, char* first_chars) HeapFree(GetProcessHeap(), 0, lineW); line = s_eol + 1; s_eol = 0; - continue; /* That is the full virtual line */ } } processRegEntry(NULL, FALSE); @@ -859,7 +858,6 @@ static void processRegLinesW(FILE *in) processRegEntry(line, TRUE); line = s_eol + 1; s_eol = 0; - continue; /* That is the full virtual line */ } }

1 0

Hugh McMaster : regedit: Do not set s_eol to NULL when it will be re-assigned immediately.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 4cb93f4557d69edaa60ad79605427c76f3af4058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cb93f4557d69edaa60ad7960… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 31 09:26:06 2016 +0000 regedit: Do not set s_eol to NULL when it will be re-assigned immediately. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index c33e28d..7c5105f 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -727,7 +727,6 @@ static void processRegLinesA(FILE *in, char* first_chars) MoveMemory(s_eol - 1, next_line, chars_in_buf - (next_line - s) + 1); chars_in_buf -= next_line - s_eol + 1; - s_eol = 0; continue; } @@ -740,7 +739,6 @@ static void processRegLinesA(FILE *in, char* first_chars) processRegEntry(lineW, FALSE); HeapFree(GetProcessHeap(), 0, lineW); line = s_eol + 1; - s_eol = 0; } } processRegEntry(NULL, FALSE); @@ -846,7 +844,6 @@ static void processRegLinesW(FILE *in) MoveMemory(s_eol - 1, NextLine, (CharsInBuf - (NextLine - s) + 1)*sizeof(WCHAR)); CharsInBuf -= NextLine - s_eol + 1; - s_eol = 0; continue; } @@ -857,7 +854,6 @@ static void processRegLinesW(FILE *in) processRegEntry(line, TRUE); line = s_eol + 1; - s_eol = 0; } }

1 0

Bruno Jesus : xinput1_3: Better trace all functions.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 309fed23166a60ced3ef45d30da529872c5e468c URL: http://source.winehq.org/git/wine.git/?a=commit;h=309fed23166a60ced3ef45d30… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Aug 31 15:17:42 2016 -0300 xinput1_3: Better trace all functions. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/xinput1_3_main.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index 63f725b..35df1d6 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -50,14 +50,14 @@ void WINAPI XInputEnable(BOOL enable) to the controllers. Setting to true will send the last vibration value (sent to XInputSetState) to the controller and allow messages to be sent */ - FIXME("(%d) Stub!\n", enable); + FIXME("(enable %d) Stub!\n", enable); } -DWORD WINAPI XInputSetState(DWORD dwUserIndex, XINPUT_VIBRATION* pVibration) +DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) { - FIXME("(%d %p) Stub!\n", dwUserIndex, pVibration); + FIXME("(index %u, vibration %p) Stub!\n", index, vibration); - if (dwUserIndex < XUSER_MAX_COUNT) + if (index < XUSER_MAX_COUNT) { return ERROR_DEVICE_NOT_CONNECTED; /* If controller exists then return ERROR_SUCCESS */ @@ -65,14 +65,14 @@ DWORD WINAPI XInputSetState(DWORD dwUserIndex, XINPUT_VIBRATION* pVibration) return ERROR_BAD_ARGUMENTS; } -DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) { static int warn_once; if (!warn_once++) - FIXME("(%u %p)\n", dwUserIndex, pState); + FIXME("(index %u, state %p) Stub!\n", index, state); - if (dwUserIndex < XUSER_MAX_COUNT) + if (index < XUSER_MAX_COUNT) { return ERROR_DEVICE_NOT_CONNECTED; /* If controller exists then return ERROR_SUCCESS */ @@ -80,11 +80,11 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD dwUserIndex, XINPUT_STATE* p return ERROR_BAD_ARGUMENTS; } -DWORD WINAPI XInputGetKeystroke(DWORD dwUserIndex, DWORD dwReserve, PXINPUT_KEYSTROKE pKeystroke) +DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) { - FIXME("(%d %d %p) Stub!\n", dwUserIndex, dwReserve, pKeystroke); + FIXME("(index %u, reserved %u, keystroke %p) Stub!\n", index, reserved, keystroke); - if (dwUserIndex < XUSER_MAX_COUNT) + if (index < XUSER_MAX_COUNT) { return ERROR_DEVICE_NOT_CONNECTED; /* If controller exists then return ERROR_SUCCESS */ @@ -92,14 +92,14 @@ DWORD WINAPI XInputGetKeystroke(DWORD dwUserIndex, DWORD dwReserve, PXINPUT_KEYS return ERROR_BAD_ARGUMENTS; } -DWORD WINAPI XInputGetCapabilities(DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES* pCapabilities) +DWORD WINAPI XInputGetCapabilities(DWORD index, DWORD flags, XINPUT_CAPABILITIES* capabilities) { static int warn_once; if (!warn_once++) - FIXME("(%d %d %p)\n", dwUserIndex, dwFlags, pCapabilities); + FIXME("(index %u, flags 0x%x, capabilities %p) Stub!\n", index, flags, capabilities); - if (dwUserIndex < XUSER_MAX_COUNT) + if (index < XUSER_MAX_COUNT) { return ERROR_DEVICE_NOT_CONNECTED; /* If controller exists then return ERROR_SUCCESS */ @@ -107,11 +107,11 @@ DWORD WINAPI XInputGetCapabilities(DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPA return ERROR_BAD_ARGUMENTS; } -DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD dwUserIndex, GUID* pDSoundRenderGuid, GUID* pDSoundCaptureGuid) +DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD index, GUID* render_guid, GUID* capture_guid) { - FIXME("(%d %p %p) Stub!\n", dwUserIndex, pDSoundRenderGuid, pDSoundCaptureGuid); + FIXME("(index %u, render guid %p, capture guid %p) Stub!\n", index, render_guid, capture_guid); - if (dwUserIndex < XUSER_MAX_COUNT) + if (index < XUSER_MAX_COUNT) { return ERROR_DEVICE_NOT_CONNECTED; /* If controller exists then return ERROR_SUCCESS */ @@ -119,11 +119,11 @@ DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD dwUserIndex, GUID* pDSoundRen return ERROR_BAD_ARGUMENTS; } -DWORD WINAPI XInputGetBatteryInformation(DWORD dwUserIndex, BYTE deviceType, XINPUT_BATTERY_INFORMATION* pBatteryInfo) +DWORD WINAPI XInputGetBatteryInformation(DWORD index, BYTE type, XINPUT_BATTERY_INFORMATION* battery) { - FIXME("(%d %u %p) Stub!\n", dwUserIndex, deviceType, pBatteryInfo); + FIXME("(index %u, type %u, battery %p) Stub!\n", index, type, battery); - if (dwUserIndex < XUSER_MAX_COUNT) + if (index < XUSER_MAX_COUNT) { return ERROR_DEVICE_NOT_CONNECTED; /* If controller exists then return ERROR_SUCCESS */

1 0

Bruno Jesus : xinput1_3: Better handle input parameters.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: f097399a50db588ce3cedff1f0e1924cd74274c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f097399a50db588ce3cedff1f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Aug 31 15:17:43 2016 -0300 xinput1_3: Better handle input parameters. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/xinput1_3_main.c | 65 ++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index 35df1d6..a088913 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -31,6 +31,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(xinput); +struct +{ + BOOL connected; +} controllers[XUSER_MAX_COUNT]; + BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { switch(reason) @@ -57,12 +62,12 @@ DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) { FIXME("(index %u, vibration %p) Stub!\n", index, vibration); - if (index < XUSER_MAX_COUNT) - { + if (index >= XUSER_MAX_COUNT) + return ERROR_BAD_ARGUMENTS; + if (!controllers[index].connected) return ERROR_DEVICE_NOT_CONNECTED; - /* If controller exists then return ERROR_SUCCESS */ - } - return ERROR_BAD_ARGUMENTS; + + return ERROR_NOT_SUPPORTED; } DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) @@ -72,24 +77,24 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) if (!warn_once++) FIXME("(index %u, state %p) Stub!\n", index, state); - if (index < XUSER_MAX_COUNT) - { + if (index >= XUSER_MAX_COUNT) + return ERROR_BAD_ARGUMENTS; + if (!controllers[index].connected) return ERROR_DEVICE_NOT_CONNECTED; - /* If controller exists then return ERROR_SUCCESS */ - } - return ERROR_BAD_ARGUMENTS; + + return ERROR_NOT_SUPPORTED; } DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) { 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; + if (!controllers[index].connected) return ERROR_DEVICE_NOT_CONNECTED; - /* If controller exists then return ERROR_SUCCESS */ - } - return ERROR_BAD_ARGUMENTS; + + return ERROR_NOT_SUPPORTED; } DWORD WINAPI XInputGetCapabilities(DWORD index, DWORD flags, XINPUT_CAPABILITIES* capabilities) @@ -99,34 +104,34 @@ DWORD WINAPI XInputGetCapabilities(DWORD index, DWORD flags, XINPUT_CAPABILITIES if (!warn_once++) FIXME("(index %u, flags 0x%x, capabilities %p) Stub!\n", index, flags, capabilities); - if (index < XUSER_MAX_COUNT) - { + if (index >= XUSER_MAX_COUNT) + return ERROR_BAD_ARGUMENTS; + if (!controllers[index].connected) return ERROR_DEVICE_NOT_CONNECTED; - /* If controller exists then return ERROR_SUCCESS */ - } - return ERROR_BAD_ARGUMENTS; + + return ERROR_NOT_SUPPORTED; } DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD index, GUID* render_guid, GUID* capture_guid) { FIXME("(index %u, render guid %p, capture guid %p) Stub!\n", index, render_guid, capture_guid); - if (index < XUSER_MAX_COUNT) - { + if (index >= XUSER_MAX_COUNT) + return ERROR_BAD_ARGUMENTS; + if (!controllers[index].connected) return ERROR_DEVICE_NOT_CONNECTED; - /* If controller exists then return ERROR_SUCCESS */ - } - return ERROR_BAD_ARGUMENTS; + + return ERROR_NOT_SUPPORTED; } DWORD WINAPI XInputGetBatteryInformation(DWORD index, BYTE type, XINPUT_BATTERY_INFORMATION* battery) { FIXME("(index %u, type %u, battery %p) Stub!\n", index, type, battery); - if (index < XUSER_MAX_COUNT) - { + if (index >= XUSER_MAX_COUNT) + return ERROR_BAD_ARGUMENTS; + if (!controllers[index].connected) return ERROR_DEVICE_NOT_CONNECTED; - /* If controller exists then return ERROR_SUCCESS */ - } - return ERROR_BAD_ARGUMENTS; + + return ERROR_NOT_SUPPORTED; }

1 0

Bruno Jesus : xinput1_3: Stub XInputGetStateEx.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 0fe758046ddc0f37944b8a3e075b8a5fdc5d81a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe758046ddc0f37944b8a3e0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Aug 31 15:17:44 2016 -0300 xinput1_3: Stub XInputGetStateEx. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 79 ++++++++++++++++++++++++++++------------- dlls/xinput1_3/xinput1_3.spec | 1 + dlls/xinput1_3/xinput1_3_main.c | 15 ++++++++ include/xinput.h | 18 ++++++++++ 4 files changed, 89 insertions(+), 24 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 2a07f2d..5261425 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -24,6 +24,7 @@ #include "wine/test.h" static DWORD (WINAPI *pXInputGetState)(DWORD, XINPUT_STATE*); +static DWORD (WINAPI *pXInputGetStateEx)(DWORD, XINPUT_STATE_EX*); static DWORD (WINAPI *pXInputGetCapabilities)(DWORD,DWORD,XINPUT_CAPABILITIES*); static DWORD (WINAPI *pXInputSetState)(DWORD, XINPUT_VIBRATION*); static void (WINAPI *pXInputEnable)(BOOL); @@ -62,41 +63,63 @@ static void test_set_state(void) static void test_get_state(void) { - - XINPUT_STATE controllerState; - DWORD controllerNum; + union + { + XINPUT_STATE state; + XINPUT_STATE_EX state_ex; + } xinput; + DWORD controllerNum, i; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for (i = 0; i < (pXInputGetStateEx ? 2 : 1); i++) { - ZeroMemory(&controllerState, sizeof(XINPUT_STATE)); + for (controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + { + ZeroMemory(&xinput, sizeof(xinput)); - result = pXInputGetState(controllerNum, &controllerState); - ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetState failed with (%d)\n", result); + if (i == 0) + result = pXInputGetState(controllerNum, &xinput.state); + else + result = pXInputGetStateEx(controllerNum, &xinput.state_ex); + ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, + "%s failed with (%d)\n", i == 0 ? "XInputGetState" : "XInputGetStateEx", result); + + if (ERROR_DEVICE_NOT_CONNECTED == result) + { + skip("Controller %d is not connected\n", controllerNum); + continue; + } - if (ERROR_DEVICE_NOT_CONNECTED == result) - { - skip("Controller %d is not connected\n", controllerNum); - } - else - { trace("-- Results for controller %d --\n", controllerNum); - trace("XInputGetState: %d\n", result); - trace("State->dwPacketNumber: %d\n", controllerState.dwPacketNumber); + if (i == 0) + trace("XInputGetState: %d\n", result); + else + trace("XInputGetStateEx: %d\n", result); + trace("State->dwPacketNumber: %d\n", xinput.state.dwPacketNumber); trace("Gamepad Variables --\n"); - trace("Gamepad.wButtons: %#x\n", controllerState.Gamepad.wButtons); - trace("Gamepad.bLeftTrigger: 0x%08x\n", controllerState.Gamepad.bLeftTrigger); - trace("Gamepad.bRightTrigger: 0x%08x\n", controllerState.Gamepad.bRightTrigger); - trace("Gamepad.sThumbLX: %d\n", controllerState.Gamepad.sThumbLX); - trace("Gamepad.sThumbLY: %d\n", controllerState.Gamepad.sThumbLY); - trace("Gamepad.sThumbRX: %d\n", controllerState.Gamepad.sThumbRX); - trace("Gamepad.sThumbRY: %d\n", controllerState.Gamepad.sThumbRY); + trace("Gamepad.wButtons: %#x\n", xinput.state.Gamepad.wButtons); + trace("Gamepad.bLeftTrigger: 0x%08x\n", xinput.state.Gamepad.bLeftTrigger); + trace("Gamepad.bRightTrigger: 0x%08x\n", xinput.state.Gamepad.bRightTrigger); + trace("Gamepad.sThumbLX: %d\n", xinput.state.Gamepad.sThumbLX); + trace("Gamepad.sThumbLY: %d\n", xinput.state.Gamepad.sThumbLY); + trace("Gamepad.sThumbRX: %d\n", xinput.state.Gamepad.sThumbRX); + trace("Gamepad.sThumbRY: %d\n", xinput.state.Gamepad.sThumbRY); } } - ZeroMemory(&controllerState, sizeof(XINPUT_STATE)); - result = pXInputGetState(XUSER_MAX_COUNT+1, &controllerState); + result = pXInputGetState(XUSER_MAX_COUNT, &xinput.state); + ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); + + result = pXInputGetState(XUSER_MAX_COUNT+1, &xinput.state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); + if (pXInputGetStateEx) + { + result = pXInputGetStateEx(XUSER_MAX_COUNT, &xinput.state_ex); + ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); + + result = pXInputGetStateEx(XUSER_MAX_COUNT+1, &xinput.state_ex); + ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); + } } static void test_get_keystroke(void) @@ -196,6 +219,7 @@ static void test_get_batteryinformation(void) START_TEST(xinput) { HMODULE hXinput; + void *pXInputGetStateEx_Ordinal; hXinput = LoadLibraryA( "xinput1_3.dll" ); if (!hXinput) @@ -207,11 +231,18 @@ START_TEST(xinput) pXInputEnable = (void*)GetProcAddress(hXinput, "XInputEnable"); pXInputSetState = (void*)GetProcAddress(hXinput, "XInputSetState"); pXInputGetState = (void*)GetProcAddress(hXinput, "XInputGetState"); + pXInputGetStateEx = (void*)GetProcAddress(hXinput, "XInputGetStateEx"); /* Win >= 8 */ + pXInputGetStateEx_Ordinal = (void*)GetProcAddress(hXinput, (LPCSTR) 100); pXInputGetKeystroke = (void*)GetProcAddress(hXinput, "XInputGetKeystroke"); pXInputGetCapabilities = (void*)GetProcAddress(hXinput, "XInputGetCapabilities"); pXInputGetDSoundAudioDeviceGuids = (void*)GetProcAddress(hXinput, "XInputGetDSoundAudioDeviceGuids"); pXInputGetBatteryInformation = (void*)GetProcAddress(hXinput, "XInputGetBatteryInformation"); + if (pXInputGetStateEx_Ordinal) + ok (pXInputGetStateEx_Ordinal == pXInputGetStateEx, "XInputGetStateEx in the wrong ordinal\n"); + else + ok (broken(1), "XInputGetStateEx not found in this dll version\n"); + test_set_state(); test_get_state(); test_get_keystroke(); diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec index 67805d1..0023016 100644 --- a/dlls/xinput1_3/xinput1_3.spec +++ b/dlls/xinput1_3/xinput1_3.spec @@ -6,3 +6,4 @@ 6 stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) 7 stdcall XInputGetBatteryInformation(long long ptr) 8 stdcall XInputGetKeystroke(long long ptr) +100 stdcall XInputGetStateEx(long ptr) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index a088913..227ab7a 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -85,6 +85,21 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) return ERROR_NOT_SUPPORTED; } +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE_EX* state_ex) +{ + static int warn_once; + + if (!warn_once++) + FIXME("(index %u, state %p) Stub!\n", index, state_ex); + + if (index >= XUSER_MAX_COUNT) + return ERROR_BAD_ARGUMENTS; + if (!controllers[index].connected) + return ERROR_DEVICE_NOT_CONNECTED; + + return ERROR_NOT_SUPPORTED; +} + DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) { FIXME("(index %u, reserved %u, keystroke %p) Stub!\n", index, reserved, keystroke); diff --git a/include/xinput.h b/include/xinput.h index 98d23a3..ccdc023 100644 --- a/include/xinput.h +++ b/include/xinput.h @@ -170,11 +170,27 @@ typedef struct _XINPUT_GAMEPAD { SHORT sThumbRY; } XINPUT_GAMEPAD, *PXINPUT_GAMEPAD; +typedef struct _XINPUT_GAMEPAD_EX { + WORD wButtons; + BYTE bLeftTrigger; + BYTE bRightTrigger; + SHORT sThumbLX; + SHORT sThumbLY; + SHORT sThumbRX; + SHORT sThumbRY; + DWORD dwPaddingReserved; +} XINPUT_GAMEPAD_EX, *PXINPUT_GAMEPAD_EX; + typedef struct _XINPUT_STATE { DWORD dwPacketNumber; XINPUT_GAMEPAD Gamepad; } XINPUT_STATE, *PXINPUT_STATE; +typedef struct _XINPUT_STATE_EX { + DWORD dwPacketNumber; + XINPUT_GAMEPAD_EX Gamepad; +} XINPUT_STATE_EX, *PXINPUT_STATE_EX; + /* * Defines the structure of how much vibration is set on both the * right and left motors in a joystick. If you're not using a 360 @@ -232,6 +248,8 @@ DWORD WINAPI XInputGetCapabilities(DWORD, DWORD, XINPUT_CAPABILITIES*); DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD, GUID*, GUID*); DWORD WINAPI XInputGetBatteryInformation(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*); +DWORD WINAPI XInputGetStateEx(DWORD, XINPUT_STATE_EX*); + #ifdef __cplusplus } #endif

1 0

Bruno Jesus : xinput1_3: Implement XInputGetState using XInputGetStateEx.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 44cd385af30ae8a0811d1af8764ef2f3a8f2d34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=44cd385af30ae8a0811d1af87… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Aug 31 15:17:45 2016 -0300 xinput1_3: Implement XInputGetState using XInputGetStateEx. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/xinput1_3_main.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index 227ab7a..04732eb 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -29,6 +29,9 @@ #include "xinput.h" +/* Not defined in the headers, used only by XInputGetStateEx */ +#define XINPUT_GAMEPAD_GUIDE 0x0400 + WINE_DEFAULT_DEBUG_CHANNEL(xinput); struct @@ -72,17 +75,26 @@ DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) { + union + { + XINPUT_STATE state; + XINPUT_STATE_EX state_ex; + } xinput; + DWORD ret; static int warn_once; if (!warn_once++) FIXME("(index %u, state %p) Stub!\n", index, state); - if (index >= XUSER_MAX_COUNT) - return ERROR_BAD_ARGUMENTS; - if (!controllers[index].connected) - return ERROR_DEVICE_NOT_CONNECTED; + ret = XInputGetStateEx(index, &xinput.state_ex); + if (ret != ERROR_SUCCESS) + return ret; - return ERROR_NOT_SUPPORTED; + /* The main difference between this and the Ex version is the media guide button */ + xinput.state.Gamepad.wButtons &= ~XINPUT_GAMEPAD_GUIDE; + *state = xinput.state; + + return ERROR_SUCCESS; } DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE_EX* state_ex)

1 0

Michael Stefaniuc : dmusic: Avoid using the COM method implementations directly.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: dd8d5f38205a5a7ee625015cfc61c5cb3583c882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd8d5f38205a5a7ee625015cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 22:52:01 2016 +0200 dmusic: Avoid using the COM method implementations directly. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/clock.c | 2 +- dlls/dmusic/dmusic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index 7fd1d8f..2086bfa 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -138,7 +138,7 @@ HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNO DMUSIC_LockModule(); hr = IReferenceClockImpl_QueryInterface(&clock->IReferenceClock_iface, riid, ret_iface); - IReferenceClockImpl_Release(&clock->IReferenceClock_iface); + IReferenceClock_Release(&clock->IReferenceClock_iface); return hr; } diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 67900b3..5b01f0f 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -430,7 +430,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU DMUSIC_LockModule(); ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface); - IDirectMusic8Impl_Release(&dmusic->IDirectMusic8_iface); + IDirectMusic8_Release(&dmusic->IDirectMusic8_iface); return ret; }

1 0

Michael Stefaniuc : dmime: Avoid using the COM method implementations directly.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 8788061b10a5b52077a800b341164cb3931df55e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8788061b10a5b52077a800b34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 22:52:13 2016 +0200 dmime: Avoid using the COM method implementations directly. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index d1befcf..7e115bf 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -920,8 +920,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform if (ppDirectSound) *ppDirectSound = dsound; } - - IDirectMusicPerformance8Impl_Init(iface, ppDirectMusic, dsound, hWnd); + + IDirectMusicPerformance8_Init(iface, ppDirectMusic, dsound, hWnd); /* Init increases the ref count of the dsound object. Decrement it if the app doesn't want a pointer to the object. */ if (NULL == ppDirectSound) {

1 0

Nikolay Sivov : amstream: Remove some casts.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: e5f01e5107c6d826b37d8151dfc6c15d7da374fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f01e5107c6d826b37d8151d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 1 03:06:48 2016 +0300 amstream: Remove some casts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/amstream.c | 2 +- dlls/amstream/mediastreamfilter.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 1f8428b..463cba6 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -67,7 +67,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl; object->ref = 1; - *ppObj = object; + *ppObj = &object->IAMMultiMediaStream_iface; return S_OK; } diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index d0c6714..3eeafd3 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -360,7 +360,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i if (!pins) return E_OUTOFMEMORY; This->pins = pins; - info.pFilter = (IBaseFilter*)&This->filter; + info.pFilter = &This->filter.IBaseFilter_iface; info.dir = PINDIR_INPUT; hr = IAMMediaStream_GetInformation(pAMMediaStream, &purpose_id, NULL); if (FAILED(hr)) @@ -374,11 +374,11 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i return hr; pin = (MediaStreamFilter_InputPin*)This->pins[This->nb_streams]; - pin->pin.pin.pinInfo.pFilter = (LPVOID)This; + pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface; This->streams[This->nb_streams] = (IMediaStream*)pAMMediaStream; This->nb_streams++; - IMediaStream_AddRef((IMediaStream*)pAMMediaStream); + IAMMediaStream_AddRef(pAMMediaStream); return S_OK; } @@ -522,7 +522,7 @@ HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj) BaseFilter_Init(&object->filter, (IBaseFilterVtbl*)&MediaStreamFilter_Vtbl, &CLSID_MediaStreamFilter, (DWORD_PTR)(__FILE__ ": MediaStreamFilterImpl.csFilter"), &BaseFuncTable); - *ppObj = object; + *ppObj = &object->filter.IBaseFilter_iface; return S_OK; }

1 0