diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 770a2c911c2..cc2ba7b0435 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -50,6 +50,15 @@ static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8W(IDirectInpu return (IDirectInputDeviceImpl *) iface; } +static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(IDirectInputDeviceImpl *This) +{ + return (IDirectInputDevice8A *)This; +} +static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(IDirectInputDeviceImpl *This) +{ + return (IDirectInputDevice8W *)This; +} + /****************************************************************************** * Various debugging tools */ @@ -575,9 +584,9 @@ void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD tim * Acquire */ -HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) +HRESULT WINAPI IDirectInputDevice2WImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; if (!This->data_format.user_df) return DIERR_INVALIDPARAM; @@ -590,40 +599,52 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) if (res == DI_OK) { This->queue_head = This->queue_tail = This->overflow = 0; - check_dinput_hooks((LPDIRECTINPUTDEVICE8W)iface); + check_dinput_hooks(iface); } LeaveCriticalSection(&This->crit); return res; } +HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_Acquire(IDirectInputDevice8W_from_impl(This)); +} + + /****************************************************************************** * Unacquire */ -HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) +HRESULT WINAPI IDirectInputDevice2WImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; EnterCriticalSection(&This->crit); res = !This->acquired ? DI_NOEFFECT : DI_OK; This->acquired = 0; if (res == DI_OK) - check_dinput_hooks((LPDIRECTINPUTDEVICE8W)iface); + check_dinput_hooks(iface); LeaveCriticalSection(&This->crit); return res; } +HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_Unacquire(IDirectInputDevice8W_from_impl(This)); +} + /****************************************************************************** * IDirectInputDeviceA */ -HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat( - LPDIRECTINPUTDEVICE8A iface, LPCDIDATAFORMAT df) +HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat(LPDIRECTINPUTDEVICE8W iface, LPCDIDATAFORMAT df) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res = DI_OK; if (!df) return E_POINTER; @@ -642,15 +663,20 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat( return res; } +HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat(LPDIRECTINPUTDEVICE8A iface, LPCDIDATAFORMAT df) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_SetDataFormat(IDirectInputDevice8W_from_impl(This), df); +} + /****************************************************************************** * SetCooperativeLevel * * Set cooperative level and the source window for the events. */ -HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel( - LPDIRECTINPUTDEVICE8A iface, HWND hwnd, DWORD dwflags) +HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8W iface, HWND hwnd, DWORD dwflags) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); TRACE("(%p) %p,0x%08x\n", This, hwnd, dwflags); _dump_cooperativelevel_DI(dwflags); @@ -682,13 +708,18 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel( return DI_OK; } +HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8A iface, HWND hwnd, DWORD dwflags) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_SetCooperativeLevel(IDirectInputDevice8W_from_impl(This), hwnd, dwflags); +} + /****************************************************************************** * SetEventNotification : specifies event to be sent on state change */ -HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification( - LPDIRECTINPUTDEVICE8A iface, HANDLE event) +HRESULT WINAPI IDirectInputDevice2WImpl_SetEventNotification(LPDIRECTINPUTDEVICE8W iface, HANDLE event) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); TRACE("(%p) %p\n", This, event); @@ -698,9 +729,16 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification( return DI_OK; } -ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface) +HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification(LPDIRECTINPUTDEVICE8A iface, HANDLE event) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_SetEventNotification(IDirectInputDevice8W_from_impl(This), event); +} + + +ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); ULONG ref; ref = InterlockedDecrement(&(This->ref)); @@ -730,6 +768,12 @@ ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface) return DI_OK; } +ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_Release(IDirectInputDevice8W_from_impl(This)); +} + HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface( LPDIRECTINPUTDEVICE8A iface,REFIID riid,LPVOID *ppobj ) @@ -802,11 +846,16 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface( return E_FAIL; } -ULONG WINAPI IDirectInputDevice2AImpl_AddRef( - LPDIRECTINPUTDEVICE8A iface) +ULONG WINAPI IDirectInputDevice2WImpl_AddRef(LPDIRECTINPUTDEVICE8W iface) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + return InterlockedIncrement(&This->ref); +} + +ULONG WINAPI IDirectInputDevice2AImpl_AddRef(LPDIRECTINPUTDEVICE8A iface) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - return InterlockedIncrement(&(This->ref)); + return IDirectInputDevice2WImpl_AddRef(IDirectInputDevice8W_from_impl(This)); } HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(LPDIRECTINPUTDEVICE8A iface, @@ -873,10 +922,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, * GetProperty */ -HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty( - LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) +HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPDIPROPHEADER pdiph) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); @@ -903,14 +951,20 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty( return DI_OK; } +HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); +} + /****************************************************************************** * SetProperty */ -HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty( - LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER pdiph) +HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( + LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPCDIPROPHEADER pdiph) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); @@ -967,12 +1021,20 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty( return DI_OK; } +HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty( + LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER pdiph) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_SetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); +} + HRESULT WINAPI IDirectInputDevice2AImpl_GetObjectInfo( LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEOBJECTINSTANCEA pdidoi, DWORD dwObj, DWORD dwHow) { + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); DIDEVICEOBJECTINSTANCEW didoiW; HRESULT res; @@ -982,7 +1044,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetObjectInfo( return DIERR_INVALIDPARAM; didoiW.dwSize = sizeof(didoiW); - res = IDirectInputDevice2WImpl_GetObjectInfo((LPDIRECTINPUTDEVICE8W)iface, &didoiW, dwObj, dwHow); + res = IDirectInputDevice2WImpl_GetObjectInfo(IDirectInputDevice8W_from_impl(This), &didoiW, dwObj, dwHow); if (res == DI_OK) { DWORD dwSize = pdidoi->dwSize; @@ -1051,11 +1113,10 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( return DI_OK; } -HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData( - LPDIRECTINPUTDEVICE8A iface, DWORD dodsize, LPDIDEVICEOBJECTDATA dod, - LPDWORD entries, DWORD flags) +HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, DWORD dodsize, + LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT ret = DI_OK; int len; @@ -1104,44 +1165,58 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData( return ret; } -HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel( - LPDIRECTINPUTDEVICE8A iface, - HWND hwndOwner, - DWORD dwFlags) +HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface, DWORD dodsize, + LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags) { - FIXME("(this=%p,%p,0x%08x): stub!\n", - iface, hwndOwner, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_GetDeviceData(IDirectInputDevice8W_from_impl(This), dodsize, dod, entries, flags); +} + +HRESULT WINAPI IDirectInputDevice2WImpl_RunControlPanel(LPDIRECTINPUTDEVICE8W iface, HWND hwndOwner, DWORD dwFlags) +{ + FIXME("(this=%p,%p,0x%08x): stub!\n", iface, hwndOwner, dwFlags); return DI_OK; } -HRESULT WINAPI IDirectInputDevice2AImpl_Initialize( - LPDIRECTINPUTDEVICE8A iface, - HINSTANCE hinst, - DWORD dwVersion, - REFGUID rguid) +HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel(LPDIRECTINPUTDEVICE8A iface, HWND hwndOwner, DWORD dwFlags) { - FIXME("(this=%p,%p,%d,%s): stub!\n", - iface, hinst, dwVersion, debugstr_guid(rguid)); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_RunControlPanel(IDirectInputDevice8W_from_impl(This), hwndOwner, dwFlags); +} + +HRESULT WINAPI IDirectInputDevice2WImpl_Initialize(LPDIRECTINPUTDEVICE8W iface, HINSTANCE hinst, DWORD dwVersion, + REFGUID rguid) +{ + FIXME("(this=%p,%p,%d,%s): stub!\n", iface, hinst, dwVersion, debugstr_guid(rguid)); return DI_OK; } +HRESULT WINAPI IDirectInputDevice2AImpl_Initialize(LPDIRECTINPUTDEVICE8A iface, HINSTANCE hinst, DWORD dwVersion, + REFGUID rguid) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_Initialize(IDirectInputDevice8W_from_impl(This), hinst, dwVersion, rguid); +} + /****************************************************************************** * IDirectInputDevice2A */ -HRESULT WINAPI IDirectInputDevice2AImpl_CreateEffect( - LPDIRECTINPUTDEVICE8A iface, - REFGUID rguid, - LPCDIEFFECT lpeff, - LPDIRECTINPUTEFFECT *ppdef, - LPUNKNOWN pUnkOuter) +HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPCDIEFFECT lpeff, + LPDIRECTINPUTEFFECT *ppdef, LPUNKNOWN pUnkOuter) { - FIXME("(this=%p,%s,%p,%p,%p): stub!\n", - iface, debugstr_guid(rguid), lpeff, ppdef, pUnkOuter); + FIXME("(this=%p,%s,%p,%p,%p): stub!\n", iface, debugstr_guid(rguid), lpeff, ppdef, pUnkOuter); return DI_OK; } +HRESULT WINAPI IDirectInputDevice2AImpl_CreateEffect(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIEFFECT lpeff, + LPDIRECTINPUTEFFECT *ppdef, LPUNKNOWN pUnkOuter) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_CreateEffect(IDirectInputDevice8W_from_impl(This), rguid, lpeff, ppdef, pUnkOuter); +} + HRESULT WINAPI IDirectInputDevice2AImpl_EnumEffects( LPDIRECTINPUTDEVICE8A iface, LPDIENUMEFFECTSCALLBACKA lpCallback, @@ -1186,66 +1261,89 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetEffectInfo( return DI_OK; } -HRESULT WINAPI IDirectInputDevice2AImpl_GetForceFeedbackState( - LPDIRECTINPUTDEVICE8A iface, - LPDWORD pdwOut) +HRESULT WINAPI IDirectInputDevice2WImpl_GetForceFeedbackState(LPDIRECTINPUTDEVICE8W iface, LPDWORD pdwOut) { - FIXME("(this=%p,%p): stub!\n", - iface, pdwOut); + FIXME("(this=%p,%p): stub!\n", iface, pdwOut); return DI_OK; } -HRESULT WINAPI IDirectInputDevice2AImpl_SendForceFeedbackCommand( - LPDIRECTINPUTDEVICE8A iface, - DWORD dwFlags) +HRESULT WINAPI IDirectInputDevice2AImpl_GetForceFeedbackState(LPDIRECTINPUTDEVICE8A iface, LPDWORD pdwOut) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_GetForceFeedbackState(IDirectInputDevice8W_from_impl(This), pdwOut); +} + +HRESULT WINAPI IDirectInputDevice2WImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags) { TRACE("(%p) 0x%08x:\n", iface, dwFlags); return DI_NOEFFECT; } -HRESULT WINAPI IDirectInputDevice2AImpl_EnumCreatedEffectObjects( - LPDIRECTINPUTDEVICE8A iface, - LPDIENUMCREATEDEFFECTOBJECTSCALLBACK lpCallback, - LPVOID lpvRef, - DWORD dwFlags) -{ - FIXME("(this=%p,%p,%p,0x%08x): stub!\n", - iface, lpCallback, lpvRef, dwFlags); - return DI_OK; -} - -HRESULT WINAPI IDirectInputDevice2AImpl_Escape( - LPDIRECTINPUTDEVICE8A iface, - LPDIEFFESCAPE lpDIEEsc) -{ - FIXME("(this=%p,%p): stub!\n", - iface, lpDIEEsc); - return DI_OK; -} - -HRESULT WINAPI IDirectInputDevice2AImpl_Poll( - LPDIRECTINPUTDEVICE8A iface) +HRESULT WINAPI IDirectInputDevice2AImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8A iface, DWORD dwFlags) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_SendForceFeedbackCommand(IDirectInputDevice8W_from_impl(This), dwFlags); +} + +HRESULT WINAPI IDirectInputDevice2WImpl_EnumCreatedEffectObjects(LPDIRECTINPUTDEVICE8W iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK lpCallback, LPVOID lpvRef, DWORD dwFlags) +{ + FIXME("(this=%p,%p,%p,0x%08x): stub!\n", iface, lpCallback, lpvRef, dwFlags); + return DI_OK; +} + +HRESULT WINAPI IDirectInputDevice2AImpl_EnumCreatedEffectObjects(LPDIRECTINPUTDEVICE8A iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK lpCallback, LPVOID lpvRef, DWORD dwFlags) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_EnumCreatedEffectObjects(IDirectInputDevice8W_from_impl(This), lpCallback, lpvRef, dwFlags); +} + +HRESULT WINAPI IDirectInputDevice2WImpl_Escape(LPDIRECTINPUTDEVICE8W iface, LPDIEFFESCAPE lpDIEEsc) +{ + FIXME("(this=%p,%p): stub!\n", iface, lpDIEEsc); + return DI_OK; +} + +HRESULT WINAPI IDirectInputDevice2AImpl_Escape(LPDIRECTINPUTDEVICE8A iface, LPDIEFFESCAPE lpDIEEsc) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_Escape(IDirectInputDevice8W_from_impl(This), lpDIEEsc); +} + +HRESULT WINAPI IDirectInputDevice2WImpl_Poll(LPDIRECTINPUTDEVICE8W iface) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); if (!This->acquired) return DIERR_NOTACQUIRED; /* Because wine devices do not need to be polled, just return DI_NOEFFECT */ return DI_NOEFFECT; } -HRESULT WINAPI IDirectInputDevice2AImpl_SendDeviceData( - LPDIRECTINPUTDEVICE8A iface, - DWORD cbObjectData, - LPCDIDEVICEOBJECTDATA rgdod, - LPDWORD pdwInOut, - DWORD dwFlags) +HRESULT WINAPI IDirectInputDevice2AImpl_Poll(LPDIRECTINPUTDEVICE8A iface) { - FIXME("(this=%p,0x%08x,%p,%p,0x%08x): stub!\n", - iface, cbObjectData, rgdod, pdwInOut, dwFlags); - + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_Poll(IDirectInputDevice8W_from_impl(This)); +} + +HRESULT WINAPI IDirectInputDevice2WImpl_SendDeviceData(LPDIRECTINPUTDEVICE8W iface, DWORD cbObjectData, + LPCDIDEVICEOBJECTDATA rgdod, LPDWORD pdwInOut, + DWORD dwFlags) +{ + FIXME("(this=%p,0x%08x,%p,%p,0x%08x): stub!\n", iface, cbObjectData, rgdod, pdwInOut, dwFlags); + return DI_OK; } +HRESULT WINAPI IDirectInputDevice2AImpl_SendDeviceData(LPDIRECTINPUTDEVICE8A iface, DWORD cbObjectData, + LPCDIDEVICEOBJECTDATA rgdod, LPDWORD pdwInOut, + DWORD dwFlags) +{ + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + return IDirectInputDevice2WImpl_SendDeviceData(IDirectInputDevice8W_from_impl(This), cbObjectData, rgdod, + pdwInOut, dwFlags); +} + HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8A iface, LPCSTR lpszFileName, LPDIENUMEFFECTSINFILECALLBACK pec, diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 3c427265b29..89862652a39 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -115,18 +115,21 @@ extern const char *_dump_dinput_GUID(const GUID *guid) ; /* And the stubs */ extern HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface); +extern HRESULT WINAPI IDirectInputDevice2WImpl_Acquire(LPDIRECTINPUTDEVICE8W iface); extern HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface); -extern HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat( - LPDIRECTINPUTDEVICE8A iface,LPCDIDATAFORMAT df ) ; -extern HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel( - LPDIRECTINPUTDEVICE8A iface,HWND hwnd,DWORD dwflags ) ; -extern HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification( - LPDIRECTINPUTDEVICE8A iface,HANDLE hnd ) ; +extern HRESULT WINAPI IDirectInputDevice2WImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface); +extern HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat(LPDIRECTINPUTDEVICE8A iface, LPCDIDATAFORMAT df); +extern HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat(LPDIRECTINPUTDEVICE8W iface, LPCDIDATAFORMAT df); +extern HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8A iface, HWND hwnd, DWORD dwflags); +extern HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8W iface, HWND hwnd, DWORD dwflags); +extern HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification(LPDIRECTINPUTDEVICE8A iface, HANDLE hnd); +extern HRESULT WINAPI IDirectInputDevice2WImpl_SetEventNotification(LPDIRECTINPUTDEVICE8W iface, HANDLE hnd); extern ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface) ; -extern HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(LPDIRECTINPUTDEVICE8A iface,REFIID riid,LPVOID *ppobj); -extern HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W iface,REFIID riid,LPVOID *ppobj); -extern ULONG WINAPI IDirectInputDevice2AImpl_AddRef( - LPDIRECTINPUTDEVICE8A iface) ; +extern ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface); +extern HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(LPDIRECTINPUTDEVICE8A iface, REFIID riid, LPVOID *ppobj); +extern HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W iface, REFIID riid, LPVOID *ppobj); +extern ULONG WINAPI IDirectInputDevice2AImpl_AddRef(LPDIRECTINPUTDEVICE8A iface); +extern ULONG WINAPI IDirectInputDevice2WImpl_AddRef(LPDIRECTINPUTDEVICE8W iface); extern HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects( LPDIRECTINPUTDEVICE8A iface, LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback, @@ -138,7 +141,9 @@ extern HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects( LPVOID lpvRef, DWORD dwFlags) ; extern HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph); +extern HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPDIPROPHEADER pdiph); extern HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER pdiph); +extern HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPCDIPROPHEADER pdiph); extern HRESULT WINAPI IDirectInputDevice2AImpl_GetObjectInfo( LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEOBJECTINSTANCEA pdidoi, @@ -148,23 +153,20 @@ extern HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo(LPDIRECTINPUTDEVICE LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow); -extern HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface, - DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags); -extern HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel( - LPDIRECTINPUTDEVICE8A iface, - HWND hwndOwner, - DWORD dwFlags) ; -extern HRESULT WINAPI IDirectInputDevice2AImpl_Initialize( - LPDIRECTINPUTDEVICE8A iface, - HINSTANCE hinst, - DWORD dwVersion, - REFGUID rguid) ; -extern HRESULT WINAPI IDirectInputDevice2AImpl_CreateEffect( - LPDIRECTINPUTDEVICE8A iface, - REFGUID rguid, - LPCDIEFFECT lpeff, - LPDIRECTINPUTEFFECT *ppdef, - LPUNKNOWN pUnkOuter) ; +extern HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface, DWORD dodsize, LPDIDEVICEOBJECTDATA dod, + LPDWORD entries, DWORD flags); +extern HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, DWORD dodsize, LPDIDEVICEOBJECTDATA dod, + LPDWORD entries, DWORD flags); +extern HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel(LPDIRECTINPUTDEVICE8A iface, HWND hwndOwner, DWORD dwFlags); +extern HRESULT WINAPI IDirectInputDevice2WImpl_RunControlPanel(LPDIRECTINPUTDEVICE8W iface, HWND hwndOwner, DWORD dwFlags); +extern HRESULT WINAPI IDirectInputDevice2AImpl_Initialize(LPDIRECTINPUTDEVICE8A iface, HINSTANCE hinst, DWORD dwVersion, + REFGUID rguid); +extern HRESULT WINAPI IDirectInputDevice2WImpl_Initialize(LPDIRECTINPUTDEVICE8W iface, HINSTANCE hinst, DWORD dwVersion, + REFGUID rguid); +extern HRESULT WINAPI IDirectInputDevice2AImpl_CreateEffect(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIEFFECT lpeff, + LPDIRECTINPUTEFFECT *ppdef, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPCDIEFFECT lpeff, + LPDIRECTINPUTEFFECT *ppdef, LPUNKNOWN pUnkOuter); extern HRESULT WINAPI IDirectInputDevice2AImpl_EnumEffects( LPDIRECTINPUTDEVICE8A iface, LPDIENUMEFFECTSCALLBACKA lpCallback, @@ -183,28 +185,24 @@ extern HRESULT WINAPI IDirectInputDevice2WImpl_GetEffectInfo( LPDIRECTINPUTDEVICE8W iface, LPDIEFFECTINFOW lpdei, REFGUID rguid) ; -extern HRESULT WINAPI IDirectInputDevice2AImpl_GetForceFeedbackState( - LPDIRECTINPUTDEVICE8A iface, - LPDWORD pdwOut) ; -extern HRESULT WINAPI IDirectInputDevice2AImpl_SendForceFeedbackCommand( - LPDIRECTINPUTDEVICE8A iface, - DWORD dwFlags) ; -extern HRESULT WINAPI IDirectInputDevice2AImpl_EnumCreatedEffectObjects( - LPDIRECTINPUTDEVICE8A iface, - LPDIENUMCREATEDEFFECTOBJECTSCALLBACK lpCallback, - LPVOID lpvRef, - DWORD dwFlags) ; -extern HRESULT WINAPI IDirectInputDevice2AImpl_Escape( - LPDIRECTINPUTDEVICE8A iface, - LPDIEFFESCAPE lpDIEEsc) ; -extern HRESULT WINAPI IDirectInputDevice2AImpl_Poll( - LPDIRECTINPUTDEVICE8A iface) ; -extern HRESULT WINAPI IDirectInputDevice2AImpl_SendDeviceData( - LPDIRECTINPUTDEVICE8A iface, - DWORD cbObjectData, - LPCDIDEVICEOBJECTDATA rgdod, - LPDWORD pdwInOut, - DWORD dwFlags) ; +extern HRESULT WINAPI IDirectInputDevice2AImpl_GetForceFeedbackState(LPDIRECTINPUTDEVICE8A iface, LPDWORD pdwOut); +extern HRESULT WINAPI IDirectInputDevice2WImpl_GetForceFeedbackState(LPDIRECTINPUTDEVICE8W iface, LPDWORD pdwOut); +extern HRESULT WINAPI IDirectInputDevice2AImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8A iface, DWORD dwFlags); +extern HRESULT WINAPI IDirectInputDevice2WImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags); +extern HRESULT WINAPI IDirectInputDevice2AImpl_EnumCreatedEffectObjects(LPDIRECTINPUTDEVICE8A iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK lpCallback, + LPVOID lpvRef, DWORD dwFlags); +extern HRESULT WINAPI IDirectInputDevice2WImpl_EnumCreatedEffectObjects(LPDIRECTINPUTDEVICE8W iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK lpCallback, + LPVOID lpvRef, DWORD dwFlags); +extern HRESULT WINAPI IDirectInputDevice2AImpl_Escape(LPDIRECTINPUTDEVICE8A iface, LPDIEFFESCAPE lpDIEEsc); +extern HRESULT WINAPI IDirectInputDevice2WImpl_Escape(LPDIRECTINPUTDEVICE8W iface, LPDIEFFESCAPE lpDIEEsc); +extern HRESULT WINAPI IDirectInputDevice2AImpl_Poll(LPDIRECTINPUTDEVICE8A iface); +extern HRESULT WINAPI IDirectInputDevice2WImpl_Poll(LPDIRECTINPUTDEVICE8W iface); +extern HRESULT WINAPI IDirectInputDevice2AImpl_SendDeviceData(LPDIRECTINPUTDEVICE8A iface, DWORD cbObjectData, + LPCDIDEVICEOBJECTDATA rgdod, LPDWORD pdwInOut, DWORD dwFlags); +extern HRESULT WINAPI IDirectInputDevice2WImpl_SendDeviceData(LPDIRECTINPUTDEVICE8W iface, DWORD cbObjectData, + LPCDIDEVICEOBJECTDATA rgdod, LPDWORD pdwInOut, DWORD dwFlags); extern HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8A iface, LPCSTR lpszFileName, LPDIENUMEFFECTSINFILECALLBACK pec, diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index fb1372208e2..06d6393628c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -673,38 +673,38 @@ static const IDirectInputDevice8AVtbl JoystickAvt = static const IDirectInputDevice8WVtbl JoystickWvt = { - IDirectInputDevice2WImpl_QueryInterface, - XCAST(AddRef)IDirectInputDevice2AImpl_AddRef, - XCAST(Release)IDirectInputDevice2AImpl_Release, + IDirectInputDevice2WImpl_QueryInterface, + IDirectInputDevice2WImpl_AddRef, + IDirectInputDevice2WImpl_Release, XCAST(GetCapabilities)JoystickAGenericImpl_GetCapabilities, - IDirectInputDevice2WImpl_EnumObjects, + IDirectInputDevice2WImpl_EnumObjects, XCAST(GetProperty)JoystickAGenericImpl_GetProperty, XCAST(SetProperty)JoystickAGenericImpl_SetProperty, XCAST(Acquire)JoystickLinuxAImpl_Acquire, XCAST(Unacquire)JoystickLinuxAImpl_Unacquire, XCAST(GetDeviceState)JoystickAGenericImpl_GetDeviceState, - XCAST(GetDeviceData)IDirectInputDevice2AImpl_GetDeviceData, - XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, - XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, - XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, - JoystickWGenericImpl_GetObjectInfo, - JoystickWGenericImpl_GetDeviceInfo, - XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel, - XCAST(Initialize)IDirectInputDevice2AImpl_Initialize, - XCAST(CreateEffect)IDirectInputDevice2AImpl_CreateEffect, - IDirectInputDevice2WImpl_EnumEffects, - IDirectInputDevice2WImpl_GetEffectInfo, - XCAST(GetForceFeedbackState)IDirectInputDevice2AImpl_GetForceFeedbackState, - XCAST(SendForceFeedbackCommand)IDirectInputDevice2AImpl_SendForceFeedbackCommand, - XCAST(EnumCreatedEffectObjects)IDirectInputDevice2AImpl_EnumCreatedEffectObjects, - XCAST(Escape)IDirectInputDevice2AImpl_Escape, + IDirectInputDevice2WImpl_GetDeviceData, + IDirectInputDevice2WImpl_SetDataFormat, + IDirectInputDevice2WImpl_SetEventNotification, + IDirectInputDevice2WImpl_SetCooperativeLevel, + JoystickWGenericImpl_GetObjectInfo, + JoystickWGenericImpl_GetDeviceInfo, + IDirectInputDevice2WImpl_RunControlPanel, + IDirectInputDevice2WImpl_Initialize, + IDirectInputDevice2WImpl_CreateEffect, + IDirectInputDevice2WImpl_EnumEffects, + IDirectInputDevice2WImpl_GetEffectInfo, + IDirectInputDevice2WImpl_GetForceFeedbackState, + IDirectInputDevice2WImpl_SendForceFeedbackCommand, + IDirectInputDevice2WImpl_EnumCreatedEffectObjects, + IDirectInputDevice2WImpl_Escape, XCAST(Poll)JoystickAGenericImpl_Poll, - XCAST(SendDeviceData)IDirectInputDevice2AImpl_SendDeviceData, - IDirectInputDevice7WImpl_EnumEffectsInFile, - IDirectInputDevice7WImpl_WriteEffectToFile, - IDirectInputDevice8WImpl_BuildActionMap, - IDirectInputDevice8WImpl_SetActionMap, - IDirectInputDevice8WImpl_GetImageInfo + IDirectInputDevice2WImpl_SendDeviceData, + IDirectInputDevice7WImpl_EnumEffectsInFile, + IDirectInputDevice7WImpl_WriteEffectToFile, + IDirectInputDevice8WImpl_BuildActionMap, + IDirectInputDevice8WImpl_SetActionMap, + IDirectInputDevice8WImpl_GetImageInfo }; #undef XCAST diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index e036cf2b63e..9182d48d545 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1363,38 +1363,38 @@ static const IDirectInputDevice8AVtbl JoystickAvt = static const IDirectInputDevice8WVtbl JoystickWvt = { - IDirectInputDevice2WImpl_QueryInterface, - XCAST(AddRef)IDirectInputDevice2AImpl_AddRef, - XCAST(Release)IDirectInputDevice2AImpl_Release, + IDirectInputDevice2WImpl_QueryInterface, + IDirectInputDevice2WImpl_AddRef, + IDirectInputDevice2WImpl_Release, XCAST(GetCapabilities)JoystickAGenericImpl_GetCapabilities, - IDirectInputDevice2WImpl_EnumObjects, + IDirectInputDevice2WImpl_EnumObjects, XCAST(GetProperty)JoystickAImpl_GetProperty, XCAST(SetProperty)JoystickAImpl_SetProperty, XCAST(Acquire)JoystickAImpl_Acquire, XCAST(Unacquire)JoystickAImpl_Unacquire, XCAST(GetDeviceState)JoystickAGenericImpl_GetDeviceState, - XCAST(GetDeviceData)IDirectInputDevice2AImpl_GetDeviceData, - XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, - XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, - XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, - JoystickWGenericImpl_GetObjectInfo, - JoystickWImpl_GetDeviceInfo, - XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel, - XCAST(Initialize)IDirectInputDevice2AImpl_Initialize, + IDirectInputDevice2WImpl_GetDeviceData, + IDirectInputDevice2WImpl_SetDataFormat, + IDirectInputDevice2WImpl_SetEventNotification, + IDirectInputDevice2WImpl_SetCooperativeLevel, + JoystickWGenericImpl_GetObjectInfo, + JoystickWImpl_GetDeviceInfo, + IDirectInputDevice2WImpl_RunControlPanel, + IDirectInputDevice2WImpl_Initialize, XCAST(CreateEffect)JoystickAImpl_CreateEffect, - JoystickWImpl_EnumEffects, - JoystickWImpl_GetEffectInfo, + JoystickWImpl_EnumEffects, + JoystickWImpl_GetEffectInfo, XCAST(GetForceFeedbackState)JoystickAImpl_GetForceFeedbackState, XCAST(SendForceFeedbackCommand)JoystickAImpl_SendForceFeedbackCommand, XCAST(EnumCreatedEffectObjects)JoystickAImpl_EnumCreatedEffectObjects, - XCAST(Escape)IDirectInputDevice2AImpl_Escape, + IDirectInputDevice2WImpl_Escape, XCAST(Poll)JoystickAGenericImpl_Poll, - XCAST(SendDeviceData)IDirectInputDevice2AImpl_SendDeviceData, - IDirectInputDevice7WImpl_EnumEffectsInFile, - IDirectInputDevice7WImpl_WriteEffectToFile, - IDirectInputDevice8WImpl_BuildActionMap, - IDirectInputDevice8WImpl_SetActionMap, - IDirectInputDevice8WImpl_GetImageInfo + IDirectInputDevice2WImpl_SendDeviceData, + IDirectInputDevice7WImpl_EnumEffectsInFile, + IDirectInputDevice7WImpl_WriteEffectToFile, + IDirectInputDevice8WImpl_BuildActionMap, + IDirectInputDevice8WImpl_SetActionMap, + IDirectInputDevice8WImpl_GetImageInfo }; #undef XCAST diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index dc15db83ad3..f8332601256 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -984,32 +984,32 @@ static const IDirectInputDevice8AVtbl JoystickAvt = static const IDirectInputDevice8WVtbl JoystickWvt = { IDirectInputDevice2WImpl_QueryInterface, - XCAST(AddRef)IDirectInputDevice2AImpl_AddRef, - XCAST(Release)IDirectInputDevice2AImpl_Release, + IDirectInputDevice2WImpl_AddRef, + IDirectInputDevice2WImpl_Release, XCAST(GetCapabilities)JoystickAGenericImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, XCAST(GetProperty)JoystickAGenericImpl_GetProperty, XCAST(SetProperty)JoystickAGenericImpl_SetProperty, - XCAST(Acquire)IDirectInputDevice2AImpl_Acquire, - XCAST(Unacquire)IDirectInputDevice2AImpl_Unacquire, + IDirectInputDevice2WImpl_Acquire, + IDirectInputDevice2WImpl_Unacquire, XCAST(GetDeviceState)JoystickAGenericImpl_GetDeviceState, - XCAST(GetDeviceData)IDirectInputDevice2AImpl_GetDeviceData, - XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, - XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, - XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, + IDirectInputDevice2WImpl_GetDeviceData, + IDirectInputDevice2WImpl_SetDataFormat, + IDirectInputDevice2WImpl_SetEventNotification, + IDirectInputDevice2WImpl_SetCooperativeLevel, JoystickWGenericImpl_GetObjectInfo, JoystickWGenericImpl_GetDeviceInfo, - XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel, - XCAST(Initialize)IDirectInputDevice2AImpl_Initialize, - XCAST(CreateEffect)IDirectInputDevice2AImpl_CreateEffect, + IDirectInputDevice2WImpl_RunControlPanel, + IDirectInputDevice2WImpl_Initialize, + IDirectInputDevice2WImpl_CreateEffect, IDirectInputDevice2WImpl_EnumEffects, IDirectInputDevice2WImpl_GetEffectInfo, - XCAST(GetForceFeedbackState)IDirectInputDevice2AImpl_GetForceFeedbackState, - XCAST(SendForceFeedbackCommand)IDirectInputDevice2AImpl_SendForceFeedbackCommand, - XCAST(EnumCreatedEffectObjects)IDirectInputDevice2AImpl_EnumCreatedEffectObjects, - XCAST(Escape)IDirectInputDevice2AImpl_Escape, + IDirectInputDevice2WImpl_GetForceFeedbackState, + IDirectInputDevice2WImpl_SendForceFeedbackCommand, + IDirectInputDevice2WImpl_EnumCreatedEffectObjects, + IDirectInputDevice2WImpl_Escape, XCAST(Poll)JoystickAGenericImpl_Poll, - XCAST(SendDeviceData)IDirectInputDevice2AImpl_SendDeviceData, + IDirectInputDevice2WImpl_SendDeviceData, IDirectInputDevice7WImpl_EnumEffectsInFile, IDirectInputDevice7WImpl_WriteEffectToFile, IDirectInputDevice8WImpl_BuildActionMap, diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 76563db8476..68d8b47b0fd 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -527,37 +527,37 @@ static const IDirectInputDevice8AVtbl SysKeyboardAvt = static const IDirectInputDevice8WVtbl SysKeyboardWvt = { - IDirectInputDevice2WImpl_QueryInterface, - XCAST(AddRef)IDirectInputDevice2AImpl_AddRef, - XCAST(Release)IDirectInputDevice2AImpl_Release, + IDirectInputDevice2WImpl_QueryInterface, + IDirectInputDevice2WImpl_AddRef, + IDirectInputDevice2WImpl_Release, XCAST(GetCapabilities)SysKeyboardAImpl_GetCapabilities, - IDirectInputDevice2WImpl_EnumObjects, + IDirectInputDevice2WImpl_EnumObjects, XCAST(GetProperty)SysKeyboardAImpl_GetProperty, - XCAST(SetProperty)IDirectInputDevice2AImpl_SetProperty, - XCAST(Acquire)IDirectInputDevice2AImpl_Acquire, - XCAST(Unacquire)IDirectInputDevice2AImpl_Unacquire, + IDirectInputDevice2WImpl_SetProperty, + IDirectInputDevice2WImpl_Acquire, + IDirectInputDevice2WImpl_Unacquire, XCAST(GetDeviceState)SysKeyboardAImpl_GetDeviceState, - XCAST(GetDeviceData)IDirectInputDevice2AImpl_GetDeviceData, - XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, - XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, - XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, - SysKeyboardWImpl_GetObjectInfo, - SysKeyboardWImpl_GetDeviceInfo, - XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel, - XCAST(Initialize)IDirectInputDevice2AImpl_Initialize, - XCAST(CreateEffect)IDirectInputDevice2AImpl_CreateEffect, - IDirectInputDevice2WImpl_EnumEffects, - IDirectInputDevice2WImpl_GetEffectInfo, - XCAST(GetForceFeedbackState)IDirectInputDevice2AImpl_GetForceFeedbackState, - XCAST(SendForceFeedbackCommand)IDirectInputDevice2AImpl_SendForceFeedbackCommand, - XCAST(EnumCreatedEffectObjects)IDirectInputDevice2AImpl_EnumCreatedEffectObjects, - XCAST(Escape)IDirectInputDevice2AImpl_Escape, - XCAST(Poll)IDirectInputDevice2AImpl_Poll, - XCAST(SendDeviceData)IDirectInputDevice2AImpl_SendDeviceData, - IDirectInputDevice7WImpl_EnumEffectsInFile, - IDirectInputDevice7WImpl_WriteEffectToFile, - IDirectInputDevice8WImpl_BuildActionMap, - IDirectInputDevice8WImpl_SetActionMap, - IDirectInputDevice8WImpl_GetImageInfo + IDirectInputDevice2WImpl_GetDeviceData, + IDirectInputDevice2WImpl_SetDataFormat, + IDirectInputDevice2WImpl_SetEventNotification, + IDirectInputDevice2WImpl_SetCooperativeLevel, + SysKeyboardWImpl_GetObjectInfo, + SysKeyboardWImpl_GetDeviceInfo, + IDirectInputDevice2WImpl_RunControlPanel, + IDirectInputDevice2WImpl_Initialize, + IDirectInputDevice2WImpl_CreateEffect, + IDirectInputDevice2WImpl_EnumEffects, + IDirectInputDevice2WImpl_GetEffectInfo, + IDirectInputDevice2WImpl_GetForceFeedbackState, + IDirectInputDevice2WImpl_SendForceFeedbackCommand, + IDirectInputDevice2WImpl_EnumCreatedEffectObjects, + IDirectInputDevice2WImpl_Escape, + IDirectInputDevice2WImpl_Poll, + IDirectInputDevice2WImpl_SendDeviceData, + IDirectInputDevice7WImpl_EnumEffectsInFile, + IDirectInputDevice7WImpl_WriteEffectToFile, + IDirectInputDevice8WImpl_BuildActionMap, + IDirectInputDevice8WImpl_SetActionMap, + IDirectInputDevice8WImpl_GetImageInfo }; #undef XCAST diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 683534f0d5a..1b91e84c4ff 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -795,32 +795,32 @@ static const IDirectInputDevice8AVtbl SysMouseAvt = static const IDirectInputDevice8WVtbl SysMouseWvt = { IDirectInputDevice2WImpl_QueryInterface, - XCAST(AddRef)IDirectInputDevice2AImpl_AddRef, - XCAST(Release)IDirectInputDevice2AImpl_Release, + IDirectInputDevice2WImpl_AddRef, + IDirectInputDevice2WImpl_Release, XCAST(GetCapabilities)SysMouseAImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, XCAST(GetProperty)SysMouseAImpl_GetProperty, - XCAST(SetProperty)IDirectInputDevice2AImpl_SetProperty, + IDirectInputDevice2WImpl_SetProperty, XCAST(Acquire)SysMouseAImpl_Acquire, XCAST(Unacquire)SysMouseAImpl_Unacquire, XCAST(GetDeviceState)SysMouseAImpl_GetDeviceState, XCAST(GetDeviceData)SysMouseAImpl_GetDeviceData, - XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, - XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, - XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, + IDirectInputDevice2WImpl_SetDataFormat, + IDirectInputDevice2WImpl_SetEventNotification, + IDirectInputDevice2WImpl_SetCooperativeLevel, SysMouseWImpl_GetObjectInfo, SysMouseWImpl_GetDeviceInfo, - XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel, - XCAST(Initialize)IDirectInputDevice2AImpl_Initialize, - XCAST(CreateEffect)IDirectInputDevice2AImpl_CreateEffect, + IDirectInputDevice2WImpl_RunControlPanel, + IDirectInputDevice2WImpl_Initialize, + IDirectInputDevice2WImpl_CreateEffect, IDirectInputDevice2WImpl_EnumEffects, IDirectInputDevice2WImpl_GetEffectInfo, - XCAST(GetForceFeedbackState)IDirectInputDevice2AImpl_GetForceFeedbackState, - XCAST(SendForceFeedbackCommand)IDirectInputDevice2AImpl_SendForceFeedbackCommand, - XCAST(EnumCreatedEffectObjects)IDirectInputDevice2AImpl_EnumCreatedEffectObjects, - XCAST(Escape)IDirectInputDevice2AImpl_Escape, - XCAST(Poll)IDirectInputDevice2AImpl_Poll, - XCAST(SendDeviceData)IDirectInputDevice2AImpl_SendDeviceData, + IDirectInputDevice2WImpl_GetForceFeedbackState, + IDirectInputDevice2WImpl_SendForceFeedbackCommand, + IDirectInputDevice2WImpl_EnumCreatedEffectObjects, + IDirectInputDevice2WImpl_Escape, + IDirectInputDevice2WImpl_Poll, + IDirectInputDevice2WImpl_SendDeviceData, IDirectInputDevice7WImpl_EnumEffectsInFile, IDirectInputDevice7WImpl_WriteEffectToFile, IDirectInputDevice8WImpl_BuildActionMap,