From: Rémi Bernon rbernon@codeweavers.com
--- dlls/dinput/device.c | 4 ++-- dlls/dinput/tests/joystick8.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 3d0527cddb3..bdae9a4c93e 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -2088,8 +2088,8 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D prop_range.lMax = format->lAxisMax; IDirectInputDevice8_SetProperty( iface, DIPROP_RANGE, &prop_range.diph );
- if ((prop_buffer.dwData = format->dwBufferSize)) - IDirectInputDevice8_SetProperty( iface, DIPROP_BUFFERSIZE, &prop_buffer.diph ); + prop_buffer.dwData = format->dwBufferSize; + IDirectInputDevice8_SetProperty( iface, DIPROP_BUFFERSIZE, &prop_buffer.diph );
if (username == NULL) GetUserNameW( username_buf, &username_len ); else lstrcpynW( username_buf, username, MAX_PATH ); diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 5295ee6c169..0cc2ec7d681 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -941,7 +941,6 @@ static void test_action_map( IDirectInputDevice8W *device, HANDLE file, HANDLE e
hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); ok( hr == DI_OK, "GetProperty returned %#lx\n", hr ); - todo_wine ok( prop_dword.dwData == 0, "got dwData %#lx\n", prop_dword.dwData );