Vitaliy Margolen : dinput: COM cleanup - use helper function instead of direct typecast in keyboard.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 31c828ea273a6d76acfb78a860d567f8d9e322bb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=31c828ea273a6d76acfb78a860...

Author: Vitaliy Margolen 
Date:   Sun Jan  9 15:43:32 2011 -0700

dinput: COM cleanup - use helper function instead of direct typecast in keyboard.

---

dlls/dinput/keyboard.c |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
index 7bd68a1..76563db 100644
--- a/dlls/dinput/keyboard.c
+++ b/dlls/dinput/keyboard.c
@@ -50,6 +50,15 @@ struct SysKeyboardImpl
     BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS];
 };

+static inline SysKeyboardImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface)
+{
+    return (SysKeyboardImpl *) iface;
+}
+static inline SysKeyboardImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface)
+{
+    return (SysKeyboardImpl *) iface;
+}
+
 static BYTE map_dik_code(DWORD scanCode, DWORD vkCode)
 {
     static const BYTE asciiCodes[] =
@@ -76,7 +85,7 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode)

static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam )
 {
-    SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
+    SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface);
     int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE;
     KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam;
     BYTE new_diks;
@@ -297,7 +306,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState(
    LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr
 )
 {
-    SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
+    SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface);
     TRACE("(%p)->(%d,%p)\n", This, len, ptr);

if (!This->base.acquired) return DIERR_NOTACQUIRED;
@@ -328,7 +337,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities(
    LPDIRECTINPUTDEVICE8A iface,
    LPDIDEVCAPS lpDIDevCaps)
 {
-    SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
+    SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface);
     DIDEVCAPS devcaps;

TRACE("(this=%p,%p)\n",This,lpDIDevCaps);
@@ -410,7 +419,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceInfo(
    LPDIRECTINPUTDEVICE8A iface,
    LPDIDEVICEINSTANCEA pdidi)
 {
-    SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
+    SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface);
     TRACE("(this=%p,%p)\n", This, pdidi);

if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA)) {
@@ -423,9 +432,9 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceInfo(
     return DI_OK;
 }

-static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi) 
+static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi)
 {
-    SysKeyboardImpl *This = (SysKeyboardImpl *)iface;
+    SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface);
     TRACE("(this=%p,%p)\n", This, pdidi);

if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW)) {