August 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Check for time conversion error to silence a compiler warning.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 963ec4699fec9abf9f7e3fd15e6c2aabe6f1fd5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=963ec4699fec9abf9f7e3fd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 20:24:52 2019 +0200 ntdll: Check for time conversion error to silence a compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7c0385bdb49f28472b63b3dab823732fabda6707) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/time.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index a4762fa..443d8b2 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -1006,9 +1006,8 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old if (!OldTime) OldTime = &tm; NtQuerySystemTime( OldTime ); - RtlTimeToSecondsSince1970( OldTime, &oldsec ); - - RtlTimeToSecondsSince1970( NewTime, &sec ); + if (!RtlTimeToSecondsSince1970( OldTime, &oldsec )) return STATUS_INVALID_PARAMETER; + if (!RtlTimeToSecondsSince1970( NewTime, &sec )) return STATUS_INVALID_PARAMETER; /* fake success if time didn't change */ if (oldsec == sec)

1 0

Matteo Bruni : wined3d: Avoid a GCC 8 warning.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: c203334c057e918299239c6f5d8a69f720093a65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c203334c057e918299239c6f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 13 20:34:17 2019 +0200 wined3d: Avoid a GCC 8 warning. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3724e9c4abb43a7e5a044bcc17010660d55c4ff3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6dafdfd..e8a6bf4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -226,7 +226,7 @@ struct recorded_instruction struct shader_arb_ctx_priv { - char addr_reg[20]; + char addr_reg[50]; enum { /* plain GL_ARB_vertex_program or GL_ARB_fragment_program */

1 0

Paul Gofman : xaudio2_7: Also preserve %ebx in call_on_voice_processing_pass_start().
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: f7e395df3248c18546176efd4641c3b194f922fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7e395df3248c18546176efd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 11 11:30:50 2019 +0300 xaudio2_7: Also preserve %ebx in call_on_voice_processing_pass_start(). It is tested that EBX register is not preserved by IXAudio2VoiceCallback_OnVoiceProcessingPassStart callback in League of Legends. It doesn't lead to crash in the present xaudio, while it might still be a potential issue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46870 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a5b22c86b4d46fa8443cc2bee8b91d237eb8996b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 0bbe943..6dc0d8f 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -52,7 +52,8 @@ static HINSTANCE instance; #endif #if XAUDIO2_VER != 0 && defined(__i386__) -/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi. */ +/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi; + * League of Legends uses a callback which corrupts %ebx. */ #define IXAudio2VoiceCallback_OnVoiceProcessingPassStart(a, b) call_on_voice_processing_pass_start(a, b) extern void call_on_voice_processing_pass_start(IXAudio2VoiceCallback *This, UINT32 BytesRequired); __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, @@ -65,13 +66,17 @@ __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") "pushl %edi\n\t" __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") - "subl $8,%esp\n\t" + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-12\n\t") + "subl $4,%esp\n\t" "pushl 12(%ebp)\n\t" /* BytesRequired */ "pushl 8(%ebp)\n\t" /* This */ "movl 8(%ebp),%eax\n\t" "movl 0(%eax),%eax\n\t" "call *0(%eax)\n\t" /* This->lpVtbl->OnVoiceProcessingPassStart */ - "leal -8(%ebp),%esp\n\t" + "leal -12(%ebp),%esp\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") "popl %edi\n\t" __ASM_CFI(".cfi_same_value %edi\n\t") "popl %esi\n\t"

1 0

Zhiyi Zhang : dinput: Fix a possible deadlock at exit.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: cf4883de1354df1061b4834b4d99615dfe8dedfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4883de1354df1061b4834b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 11 18:28:40 2019 +0800 dinput: Fix a possible deadlock at exit. This fix another deadlock issue with dinput. The old implementation of dinput waits for a hook thread to exit during its uninitialization, which will never return during DLL_THREAD_DETACH. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 886d28de974b0b012be87cf8552806dc65ef3ea9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/dinput_main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 65aaf92..1b2020c 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1781,7 +1781,7 @@ static DWORD WINAPI hook_thread_proc(void *param) DispatchMessageW(&msg); } - return 0; + FreeLibraryAndExitThread(DINPUT_instance, 0); } static DWORD hook_thread_id; @@ -1798,15 +1798,16 @@ static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0 static BOOL check_hook_thread(void) { static HANDLE hook_thread; + HMODULE module; EnterCriticalSection(&dinput_hook_crit); TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); if (!list_empty(&direct_input_list) && !hook_thread) { + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR*)DINPUT_instance, &module); hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); - LeaveCriticalSection(&dinput_hook_crit); } else if (list_empty(&direct_input_list) && hook_thread) { @@ -1821,16 +1822,11 @@ static BOOL check_hook_thread(void) hook_thread_id = 0; PostThreadMessageW(tid, WM_USER+0x10, 0, 0); - LeaveCriticalSection(&dinput_hook_crit); - - /* wait for hook thread to exit */ - WaitForSingleObject(hook_thread, INFINITE); CloseHandle(hook_thread); hook_thread = NULL; } - else - LeaveCriticalSection(&dinput_hook_crit); + LeaveCriticalSection(&dinput_hook_crit); return hook_thread_id != 0; }

1 0

Tim Schumacher : winejoystick: Add support for wheel axes.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 4fcf59e0f2c2a5b4a10d60f45557c02ee4de8e03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fcf59e0f2c2a5b4a10d60f4… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sun Mar 31 13:02:27 2019 +0200 winejoystick: Add support for wheel axes. Wheel, gas, and brake are replacements for X, Y and Z in wheel-like joysticks. Remap them internally to send inputs as X, Y, and Z. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 905e7b0e2ef99c7ccfa5a3dda0844d5ea40afc77) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winejoystick.drv/joystick_linux.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 287f4be..7c24040 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -280,10 +280,13 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k', switch (jstck->axesMap[i]) { case 0: /* X */ case 1: /* Y */ + case 8: /* Wheel */ + case 9: /* Gas */ lpCaps->wNumAxes++; break; case 2: /* Z */ case 6: /* Throttle */ + case 10: /* Brake */ lpCaps->wNumAxes++; lpCaps->wCaps |= JOYCAPS_HASZ; break; @@ -365,13 +368,16 @@ LRESULT driver_joyGetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo) if (ev.type == (JS_EVENT_AXIS)) { switch (jstck->axesMap[ev.number]) { case 0: /* X */ + case 8: /* Wheel */ jstck->x = ev.value; break; case 1: /* Y */ + case 9: /* Gas */ jstck->y = ev.value; break; case 2: /* Z */ case 6: /* Throttle */ + case 10: /* Brake */ jstck->z = ev.value; break; case 5: /* Rz */

1 0

Tim Schumacher : dinput: Map wheel, gas, and brake axes as well.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 313dc20036b7a957af278ccc0ddbcd0a2a8d2680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=313dc20036b7a957af278ccc… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sun Mar 31 13:09:43 2019 +0200 dinput: Map wheel, gas, and brake axes as well. The axes wheel, gas, and brake are just differently named replacements for X, Y, and Z when using wheel-like joysticks. Make those accessible by remapping them to X, Y, and Z internally. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1a6458bad8191a8188d76ba21b38ef457bfe1295) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick_linux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 963e62f..c4efc93 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -239,6 +239,14 @@ static INT find_joystick_devices(void) joydev.dev_axes_map[j] = j; found_axes++; } + else if (axes_map[j] <= 10) + { + /* Axes 8 through 10 are Wheel, Gas and Brake, + * remap to 0, 1 and 2 + */ + joydev.dev_axes_map[j] = axes_map[j] - 8; + found_axes++; + } else if (axes_map[j] == 16 || axes_map[j] == 17) {

1 0

Alistair Leslie-Hughes : dinput: Ensure Cursor is visible on config dialog.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: b09a3bd621ef475d53aabb3d11a61e695dd4ae5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b09a3bd621ef475d53aabb3d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 8 07:02:50 2019 +0000 dinput: Ensure Cursor is visible on config dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9bcaf9769c5ae834f0f6e8fe2b28a85b286833b0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/config.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index db5878b..bf44898 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -375,9 +375,15 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w SendDlgItemMessageW(dialog, IDC_CONTROLLERCOMBO, CB_SETCURSEL, 0, 0); fill_device_object_list(dialog); + ShowCursor(TRUE); + break; } + case WM_DESTROY: + ShowCursor(FALSE); + break; + case WM_NOTIFY: switch (((LPNMHDR)lParam)->code)

1 0

Alistair Leslie-Hughes : dinput: Allow enumeration of joysticks with DirectX 3.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 20f2d0726b916c30a7c2b175bdf0b0c88b584c69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20f2d0726b916c30a7c2b175… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 10 03:46:11 2019 +0000 dinput: Allow enumeration of joysticks with DirectX 3. Star Wars: Rogue 3D requests a DirectX 3.0 version 0108:trace:dinput:DirectInputCreateEx (0x400000,0300,{9a4cb684-236d-11d3-8e9d-00c04f6844ae},0x7acfa0,(nil)) and then tries to interate over all Joysticks. When using modern windows, the current tests show that this is the correct behaviour. However, it's possible to use a shim to allow older games, like the one above, to interate over joysticks. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fe4db5309e3754a96873d959736b5c9099a5ef38) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick_linux.c | 4 ++-- dlls/dinput/joystick_linuxinput.c | 4 ++-- dlls/dinput/joystick_osx.c | 4 ++-- dlls/dinput/tests/joystick.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index c4efc93..32ea3ed 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -380,7 +380,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS } if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { /* check whether we have a joystick */ if ((fd = open(joystick_devices[id].device, O_RDONLY)) == -1) @@ -409,7 +409,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS } if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { /* check whether we have a joystick */ if ((fd = open(joystick_devices[id].device, O_RDONLY)) == -1) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 910e755..2ceb2eb 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -407,7 +407,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS } if (!((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) return S_FALSE; @@ -432,7 +432,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS } if (!((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) return S_FALSE; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 0701b9f..ad66434 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -953,7 +953,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS device = get_device_ref(id); if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { if (dwFlags & DIEDFL_FORCEFEEDBACK) { @@ -997,7 +997,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS device = get_device_ref(id); if ((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version >= 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { if (dwFlags & DIEDFL_FORCEFEEDBACK) { diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 69e95d0..57647c2 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -298,7 +298,7 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) DIPROPDWORD dip_gain_set, dip_gain_get; struct effect_enum effect_data; - ok(data->version > 0x0300, "Joysticks not supported in version 0x%04x\n", data->version); + ok(data->version >= 0x0300, "Joysticks not supported in version 0x%04x\n", data->version); hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidInstance, NULL, NULL); ok(hr==E_POINTER,"IDirectInput_CreateDevice() should have returned "

1 0

Alistair Leslie-Hughes : dinput: Handle setting DIPROP_CALIBRATIONMODE mode in generic implementation.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 88316ea8119d7a36a072f1f6372080c1f267ede2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88316ea8119d7a36a072f1f6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 14 01:10:39 2019 +0000 dinput: Handle setting DIPROP_CALIBRATIONMODE mode in generic implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47183 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 132cf25ed6df160db9df479fb7974c00110aaa58) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick.c | 5 +++++ dlls/dinput/joystick_linuxinput.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 0ec1ceb..0b2ee1a 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -395,6 +395,11 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF } break; } + case (DWORD_PTR)DIPROP_CALIBRATIONMODE: { + LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; + FIXME("DIPROP_CALIBRATIONMODE(%d)\n", pd->dwData); + break; + } default: return IDirectInputDevice2WImpl_SetProperty(iface, rguid, ph); } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2ceb2eb..b4c38fa 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -923,11 +923,6 @@ static HRESULT WINAPI JoystickWImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { - case (DWORD_PTR)DIPROP_CALIBRATIONMODE: { - LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; - FIXME("DIPROP_CALIBRATIONMODE(%d)\n", pd->dwData); - break; - } case (DWORD_PTR)DIPROP_AUTOCENTER: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;

1 0

Alistair Leslie-Hughes : vbscript: Move variable declaration outside of for.
by Alexandre Julliard 23 Aug '19

23 Aug '19

Module: wine Branch: stable Commit: 6d7c890e8307d8f7a214adf2dd3a87932567a86e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7c890e8307d8f7a214adf2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 28 22:37:25 2019 +0000 vbscript: Move variable declaration outside of for. This stops a compile error under gcc 4.8.4. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b75627ec1060e4a539cdbbdb6626876d61429970) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/tests/run.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 7f1fd4c..1858246 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -828,8 +828,9 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { "resume", DISPID_TESTOBJ_KEYWORD, NULL }, { "goto", DISPID_TESTOBJ_KEYWORD, NULL }, }; + int i; - for (int i = 0; i < ARRAY_SIZE(dispids); i++) { + for (i = 0; i < ARRAY_SIZE(dispids); i++) { if(!stricmp_wa(bstrName, dispids[i].name)) { dispid_t *d = &dispids[i]; if(d->expect) {

1 0