ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dinput: COM cleanup - use proper DirectInput interface with IUknown calls.

This commit is contained in:
Vitaliy Margolen 2011-01-09 15:43:09 -07:00 committed by Alexandre Julliard
parent 7b47282625
commit 15216098e0
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/dinput/device.c
View File

@ -712,7 +712,7 @@ ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface)
list_remove( &This->entry ); list_remove( &This->entry );
LeaveCriticalSection( &This->dinput->crit ); LeaveCriticalSection( &This->dinput->crit );
IDirectInput_Release((LPDIRECTINPUTDEVICE8A)This->dinput); IDirectInput_Release(&This->dinput->IDirectInput7A_iface);
This->crit.DebugInfo->Spare[0] = 0; This->crit.DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&This->crit); DeleteCriticalSection(&This->crit);

2
dlls/dinput/dinput_main.c
View File

@ -153,7 +153,7 @@ HRESULT WINAPI DirectInputCreateEx(
if (!check_hook_thread()) if (!check_hook_thread())
{ {
IUnknown_Release( (LPDIRECTINPUT7A)This ); IUnknown_Release( &This->IDirectInput7A_iface );
return DIERR_GENERIC; return DIERR_GENERIC;
} }

2
dlls/dinput/joystick_linux.c
View File

@ -368,7 +368,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di
newDevice->generic.props[i].lSaturation = 0; newDevice->generic.props[i].lSaturation = 0;
} }
IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->generic.base.dinput); IDirectInput_AddRef(&newDevice->generic.base.dinput->IDirectInput7A_iface);
newDevice->generic.devcaps.dwSize = sizeof(newDevice->generic.devcaps); newDevice->generic.devcaps.dwSize = sizeof(newDevice->generic.devcaps);
newDevice->generic.devcaps.dwFlags = DIDC_ATTACHED; newDevice->generic.devcaps.dwFlags = DIDC_ATTACHED;

2
dlls/dinput/joystick_linuxinput.c
View File

@ -504,7 +504,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm
if (newDevice->joydev->has_ff) if (newDevice->joydev->has_ff)
newDevice->generic.devcaps.dwFlags |= DIDC_FORCEFEEDBACK; newDevice->generic.devcaps.dwFlags |= DIDC_FORCEFEEDBACK;
IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->generic.base.dinput); IDirectInput_AddRef(&newDevice->generic.base.dinput->IDirectInput7A_iface);
return newDevice; return newDevice;
failed: failed:

2
dlls/dinput/joystick_osx.c
View File

@ -807,7 +807,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di
/* initialize default properties */ /* initialize default properties */
get_osx_device_elements_props(newDevice); get_osx_device_elements_props(newDevice);
IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->generic.base.dinput); IDirectInput_AddRef(&newDevice->generic.base.dinput->IDirectInput7A_iface);
newDevice->generic.devcaps.dwSize = sizeof(newDevice->generic.devcaps); newDevice->generic.devcaps.dwSize = sizeof(newDevice->generic.devcaps);
newDevice->generic.devcaps.dwFlags = DIDC_ATTACHED; newDevice->generic.devcaps.dwFlags = DIDC_ATTACHED;

2
dlls/dinput/keyboard.c
View File

@ -236,7 +236,7 @@ static SysKeyboardImpl *alloc_device(REFGUID rguid, const void *kvt, IDirectInpu
df->dwNumObjs = idx; df->dwNumObjs = idx;
newDevice->base.data_format.wine_df = df; newDevice->base.data_format.wine_df = df;
IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->base.dinput); IDirectInput_AddRef(&newDevice->base.dinput->IDirectInput7A_iface);
return newDevice; return newDevice;
failed: failed:

2
dlls/dinput/mouse.c
View File

@ -223,7 +223,7 @@ static SysMouseImpl *alloc_device(REFGUID rguid, const void *mvt, IDirectInputIm
df->rgodf[i].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; df->rgodf[i].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON;
newDevice->base.data_format.wine_df = df; newDevice->base.data_format.wine_df = df;
IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->base.dinput); IDirectInput_AddRef(&newDevice->base.dinput->IDirectInput7A_iface);
return newDevice; return newDevice;
failed: failed: