Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com --- dlls/dinput/device.c | 73 ++++++++++++++++++++++++--------------- dlls/dinput/dinput_main.c | 4 +-- dlls/dinput/joystick.c | 10 +++--- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 4 +-- dlls/dinput/keyboard.c | 8 +++-- dlls/dinput/mouse.c | 3 +- 8 files changed, 63 insertions(+), 43 deletions(-)
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index cfade08..ff9bbfb 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1181,7 +1181,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W ifa { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface);
- TRACE("(%p this=%p,%s,%p)\n", iface, This, debugstr_guid(riid), ppobj); + TRACE("(%p) %s,%p)\n", This, debugstr_guid(riid), ppobj); if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDirectInputDeviceA, riid) || IsEqualGUID(&IID_IDirectInputDevice2A, riid) || @@ -1231,7 +1231,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(LPDIRECTINPUTDEVICE8A iface, DIDEVICEOBJECTINSTANCEA ddoi; int i;
- TRACE("(%p) %p,%p flags:%08x)\n", iface, lpCallback, lpvRef, dwFlags); + TRACE("(%p) %p,%p flags:%08x)\n", This, lpCallback, lpvRef, dwFlags); TRACE(" - flags = "); _dump_EnumObjects_flags(dwFlags); TRACE("\n"); @@ -1261,7 +1261,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, DIDEVICEOBJECTINSTANCEW ddoi; int i;
- TRACE("(%p) %p,%p flags:%08x)\n", iface, lpCallback, lpvRef, dwFlags); + TRACE("(%p) %p,%p flags:%08x)\n", This, lpCallback, lpvRef, dwFlags); TRACE(" - flags = "); _dump_EnumObjects_flags(dwFlags); TRACE("\n"); @@ -1292,7 +1292,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface);
- TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p) %s,%p\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph);
if (!IS_DIPROP(rguid)) return DI_OK; @@ -1357,7 +1357,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface);
- TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p) %s,%p\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph);
if (!IS_DIPROP(rguid)) return DI_OK; @@ -1596,7 +1596,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A ifac
HRESULT WINAPI IDirectInputDevice2WImpl_RunControlPanel(LPDIRECTINPUTDEVICE8W iface, HWND hwndOwner, DWORD dwFlags) { - FIXME("(this=%p,%p,0x%08x): stub!\n", iface, hwndOwner, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("%p) %p,0x%08x: stub!\n", This, hwndOwner, dwFlags);
return DI_OK; } @@ -1610,7 +1611,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel(LPDIRECTINPUTDEVICE8A if 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)); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) %p,%d,%s): stub!\n", This, hinst, dwVersion, debugstr_guid(rguid)); return DI_OK; }
@@ -1628,7 +1630,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Initialize(LPDIRECTINPUTDEVICE8A iface, 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); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) %s,%p,%p,%p: stub!\n", This, debugstr_guid(rguid), lpeff, ppdef, pUnkOuter);
FIXME("not available in the generic implementation\n"); *ppdef = NULL; @@ -1648,8 +1651,9 @@ HRESULT WINAPI IDirectInputDevice2AImpl_EnumEffects( LPVOID lpvRef, DWORD dwFlags) { - FIXME("(this=%p,%p,%p,0x%08x): stub!\n", - iface, lpCallback, lpvRef, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("%p) %p,%p,0x%08x: stub!\n", + This, lpCallback, lpvRef, dwFlags);
return DI_OK; } @@ -1660,8 +1664,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( LPVOID lpvRef, DWORD dwFlags) { - FIXME("(this=%p,%p,%p,0x%08x): stub!\n", - iface, lpCallback, lpvRef, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) %p,%p,0x%08x: stub!\n", + This, lpCallback, lpvRef, dwFlags);
return DI_OK; } @@ -1671,8 +1676,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetEffectInfo( LPDIEFFECTINFOA lpdei, REFGUID rguid) { - FIXME("(this=%p,%p,%s): stub!\n", - iface, lpdei, debugstr_guid(rguid)); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("(%p) %p,%s: stub!\n", This, lpdei, debugstr_guid(rguid)); return DI_OK; }
@@ -1681,14 +1686,15 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetEffectInfo( LPDIEFFECTINFOW lpdei, REFGUID rguid) { - FIXME("(this=%p,%p,%s): stub!\n", - iface, lpdei, debugstr_guid(rguid)); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) %p,%s: stub!\n", This, lpdei, debugstr_guid(rguid)); return DI_OK; }
HRESULT WINAPI IDirectInputDevice2WImpl_GetForceFeedbackState(LPDIRECTINPUTDEVICE8W iface, LPDWORD pdwOut) { - FIXME("(this=%p,%p): stub!\n", iface, pdwOut); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) %p: stub!\n", This, pdwOut); return DI_OK; }
@@ -1700,7 +1706,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetForceFeedbackState(LPDIRECTINPUTDEVIC
HRESULT WINAPI IDirectInputDevice2WImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags) { - TRACE("(%p) 0x%08x:\n", iface, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + TRACE("(%p) 0x%08x:\n", This, dwFlags); return DI_NOEFFECT; }
@@ -1713,7 +1720,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SendForceFeedbackCommand(LPDIRECTINPUTDE 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); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) %p,%p,0x%08x: stub!\n", This, lpCallback, lpvRef, dwFlags); return DI_OK; }
@@ -1726,7 +1734,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_EnumCreatedEffectObjects(LPDIRECTINPUTDE
HRESULT WINAPI IDirectInputDevice2WImpl_Escape(LPDIRECTINPUTDEVICE8W iface, LPDIEFFESCAPE lpDIEEsc) { - FIXME("(this=%p,%p): stub!\n", iface, lpDIEEsc); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) %p: stub!\n", This, lpDIEEsc); return DI_OK; }
@@ -1756,7 +1765,8 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SendDeviceData(LPDIRECTINPUTDEVICE8W ifa LPCDIDEVICEOBJECTDATA rgdod, LPDWORD pdwInOut, DWORD dwFlags) { - FIXME("(this=%p,0x%08x,%p,%p,0x%08x): stub!\n", iface, cbObjectData, rgdod, pdwInOut, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p) 0x%08x,%p,%p,0x%08x: stub!\n", This, cbObjectData, rgdod, pdwInOut, dwFlags);
return DI_OK; } @@ -1776,7 +1786,8 @@ HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8A LPVOID pvRef, DWORD dwFlags) { - FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", iface, lpszFileName, pec, pvRef, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", This, lpszFileName, pec, pvRef, dwFlags);
return DI_OK; } @@ -1787,7 +1798,8 @@ HRESULT WINAPI IDirectInputDevice7WImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8W LPVOID pvRef, DWORD dwFlags) { - FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", iface, debugstr_w(lpszFileName), pec, pvRef, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", This, debugstr_w(lpszFileName), pec, pvRef, dwFlags);
return DI_OK; } @@ -1798,7 +1810,8 @@ HRESULT WINAPI IDirectInputDevice7AImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE8A LPDIFILEEFFECT rgDiFileEft, DWORD dwFlags) { - FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", iface, lpszFileName, dwEntries, rgDiFileEft, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", This, lpszFileName, dwEntries, rgDiFileEft, dwFlags);
return DI_OK; } @@ -1809,7 +1822,8 @@ HRESULT WINAPI IDirectInputDevice7WImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE8W LPDIFILEEFFECT rgDiFileEft, DWORD dwFlags) { - FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", iface, debugstr_w(lpszFileName), dwEntries, rgDiFileEft, dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", This, debugstr_w(lpszFileName), dwEntries, rgDiFileEft, dwFlags);
return DI_OK; } @@ -1819,7 +1833,8 @@ HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifa LPCWSTR lpszUserName, DWORD dwFlags) { - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags); #define X(x) if (dwFlags & x) FIXME("\tdwFlags =|"#x"\n"); X(DIDBAM_DEFAULT) X(DIDBAM_PRESERVE) @@ -1833,7 +1848,8 @@ HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifa HRESULT WINAPI IDirectInputDevice8AImpl_GetImageInfo(LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEIMAGEINFOHEADERA lpdiDevImageInfoHeader) { - FIXME("(%p)->(%p): stub !\n", iface, lpdiDevImageInfoHeader); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); + FIXME("(%p)->(%p): stub !\n", This, lpdiDevImageInfoHeader);
return DI_OK; } @@ -1841,7 +1857,8 @@ HRESULT WINAPI IDirectInputDevice8AImpl_GetImageInfo(LPDIRECTINPUTDEVICE8A iface HRESULT WINAPI IDirectInputDevice8WImpl_GetImageInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEIMAGEINFOHEADERW lpdiDevImageInfoHeader) { - FIXME("(%p)->(%p): stub !\n", iface, lpdiDevImageInfoHeader); + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p): stub !\n", This, lpdiDevImageInfoHeader);
return DI_OK; } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 0929961..198c6a8 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -677,7 +677,7 @@ static HRESULT WINAPI IDirectInputAImpl_Initialize(LPDIRECTINPUT7A iface, HINSTA { IDirectInputImpl *This = impl_from_IDirectInput7A( iface );
- TRACE("(%p)->(%p, 0x%04x)\n", iface, hinst, version); + TRACE("(%p)->(%p, 0x%04x)\n", This, hinst, version);
if (!hinst) return DIERR_INVALIDPARAM; @@ -934,7 +934,7 @@ static HRESULT WINAPI IDirectInput8AImpl_Initialize(LPDIRECTINPUT8A iface, HINST { IDirectInputImpl *This = impl_from_IDirectInput8A( iface );
- TRACE("(%p)->(%p, 0x%04x)\n", iface, hinst, version); + TRACE("(%p)->(%p, 0x%04x)\n", This, hinst, version);
if (!hinst) return DIERR_INVALIDPARAM; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 9240ba3..5129bb8 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -467,7 +467,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); int size;
- TRACE("%p->(%p)\n",iface,lpDIDevCaps); + TRACE("%p->(%p)\n",This,lpDIDevCaps);
if (lpDIDevCaps == NULL) { WARN("invalid pointer\n"); @@ -550,7 +550,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF { JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface);
- TRACE("(%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p,%s,%p)\n", This, debugstr_guid(rguid), pdiph);
if (TRACE_ON(dinput)) _dump_DIPROPHEADER(pdiph); @@ -633,7 +633,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( DIPROPDWORD pd; DWORD index = 0;
- TRACE("(%p,%p)\n", iface, pdidi); + TRACE("(%p,%p)\n", This, pdidi);
if (pdidi == NULL) { WARN("invalid pointer\n"); @@ -778,7 +778,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, unsigned int i, j; BOOL has_actions = FALSE;
- FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags);
for (i=0; i < lpdiaf->dwNumActions; i++) { @@ -856,7 +856,7 @@ HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, { JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface);
- FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags);
return _set_action_map(iface, lpdiaf, lpszUserName, dwFlags, This->base.data_format.wine_df); } diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index fb1b878..2644ed6 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -674,7 +674,7 @@ static HRESULT WINAPI JoystickLinuxWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface { JoystickImpl *This = impl_from_IDirectInputDevice8W(iface);
- TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p) %s,%p\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph);
if (!IS_DIPROP(rguid)) return DI_OK; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index bc3c4de..c742c15 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -963,7 +963,7 @@ static HRESULT WINAPI JoystickWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF { JoystickImpl *This = impl_from_IDirectInputDevice8W(iface);
- TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(this=%p,%s,%p)\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph);
if (!IS_DIPROP(rguid)) return DI_OK; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index cb88b2f..aad6076 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1413,7 +1413,7 @@ static HRESULT WINAPI JoystickWImpl_CreateEffect(IDirectInputDevice8W *iface, EffectImpl *effect; HRESULT hr;
- TRACE("%p %s %p %p %p\n", iface, debugstr_guid(type), params, out, outer); + TRACE("%p %s %p %p %p\n", This, debugstr_guid(type), params, out, outer); dump_DIEFFECT(params, type, 0);
if(!This->ff){ @@ -1454,7 +1454,7 @@ static HRESULT WINAPI JoystickAImpl_CreateEffect(IDirectInputDevice8A *iface, { JoystickImpl *This = impl_from_IDirectInputDevice8A(iface);
- TRACE("%p %s %p %p %p\n", iface, debugstr_guid(type), params, out, outer); + TRACE("%p %s %p %p %p\n", This, debugstr_guid(type), params, out, outer);
return JoystickWImpl_CreateEffect(&This->generic.base.IDirectInputDevice8W_iface, type, params, out, outer); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 42c0759..70eb579 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -559,7 +559,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, { SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface);
- TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); + TRACE("(%p) %s,%p\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph);
if (!IS_DIPROP(rguid)) return DI_OK; @@ -625,7 +625,8 @@ static HRESULT WINAPI SysKeyboardWImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifac LPCWSTR lpszUserName, DWORD dwFlags) { - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags);
return _build_action_map(iface, lpdiaf, lpszUserName, dwFlags, DIKEYBOARD_MASK, &c_dfDIKeyboard); } @@ -665,7 +666,8 @@ static HRESULT WINAPI SysKeyboardWImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags);
return _set_action_map(iface, lpdiaf, lpszUserName, dwFlags, &c_dfDIKeyboard); } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 58c78a5..199ed03 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -830,7 +830,8 @@ static HRESULT WINAPI SysMouseWImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", This, lpdiaf, debugstr_w(lpszUserName), dwFlags);
return _set_action_map(iface, lpdiaf, lpszUserName, dwFlags, &c_dfDIMouse2); }
Hi Alistair,
not commenting on the patch idea, just something I noticed:
On Tue, May 7, 2019 at 5:17 AM Alistair Leslie-Hughes leslie_alistair@hotmail.com wrote:
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com
dlls/dinput/device.c | 73 ++++++++++++++++++++++++--------------- dlls/dinput/dinput_main.c | 4 +-- dlls/dinput/joystick.c | 10 +++--- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 4 +-- dlls/dinput/keyboard.c | 8 +++-- dlls/dinput/mouse.c | 3 +- 8 files changed, 63 insertions(+), 43 deletions(-)
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index cfade08..ff9bbfb 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1181,7 +1181,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W ifa { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface);
- TRACE("(%p this=%p,%s,%p)\n", iface, This, debugstr_guid(riid), ppobj);
- TRACE("(%p) %s,%p)\n", This, debugstr_guid(riid), ppobj);
That's probably too many closed parentheses. More of the same below.
-
Alistair Leslie-Hughes -
Matteo Bruni