system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 08:04:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

dinput: Don't reset user specified range in SetDataFormat. With tests.

Browse source
This commit is contained in:
Vitaliy Margolen 2007-02-02 00:49:55 -07:00 committed by Alexandre Julliard
parent b8b03b54b7
commit 45b8d865b4
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/dinput/joystick_linux.c
View file

@ -664,8 +664,6 @@ static HRESULT WINAPI JoystickAImpl_SetDataFormat(
for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++)
{
This->props[i].lMin = 0;
This->props[i].lMax = 0xffff;
This->props[i].lDeadZone = 1000;
This->props[i].lSaturation = 0;
}

8
dlls/dinput/tests/joystick.c
View file

@ -258,6 +258,14 @@ static BOOL CALLBACK EnumJoysticks(
ok(caps.dwButtons == info.button, "Number of enumerated buttons doesn't match capabilities\n");
ok(caps.dwPOVs == info.pov, "Number of enumerated POVs doesn't match capabilities\n");
/* Set format and check limits again */
hr = IDirectInputDevice_SetDataFormat(pJoystick, &c_dfDIJoystick2);
ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %s\n", DXGetErrorString8(hr));
info.lMin = -2000;
info.lMax = +2000;
hr = IDirectInputDevice_EnumObjects(pJoystick, EnumAxes, (VOID*)&info, DIDFT_ALL);
ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %s\n", DXGetErrorString8(hr));
hr = IDirectInputDevice_GetDeviceInfo(pJoystick, 0);
ok(hr==E_POINTER, "IDirectInputDevice_GetDeviceInfo() "
"should have returned E_POINTER, returned: %s\n",