Vitaliy Margolen : dinput: Change internal check_dinput_hooks method to take W iface.

Alexandre Julliard julliard at winehq.org
Mon Jan 10 10:55:20 CST 2011


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

Author: Vitaliy Margolen <wine-patches at kievinfo.com>
Date:   Sun Jan  9 15:43:52 2011 -0700

dinput: Change internal check_dinput_hooks method to take W iface.

---

 dlls/dinput/device.c         |    4 ++--
 dlls/dinput/dinput_main.c    |    2 +-
 dlls/dinput/dinput_private.h |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index 12846bf..770a2c9 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -590,7 +590,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
     if (res == DI_OK)
     {
         This->queue_head = This->queue_tail = This->overflow = 0;
-        check_dinput_hooks(iface);
+        check_dinput_hooks((LPDIRECTINPUTDEVICE8W)iface);
     }
     LeaveCriticalSection(&This->crit);
 
@@ -610,7 +610,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
     res = !This->acquired ? DI_NOEFFECT : DI_OK;
     This->acquired = 0;
     if (res == DI_OK)
-        check_dinput_hooks(iface);
+        check_dinput_hooks((LPDIRECTINPUTDEVICE8W)iface);
     LeaveCriticalSection(&This->crit);
 
     return res;
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 646a4f8..14f7ca8 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -1093,7 +1093,7 @@ static BOOL check_hook_thread(void)
     return hook_thread_id != 0;
 }
 
-void check_dinput_hooks(LPDIRECTINPUTDEVICE8A iface)
+void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface)
 {
     static HHOOK callwndproc_hook;
     static ULONG foreground_cnt;
diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h
index b2b4c00..73f3049 100644
--- a/dlls/dinput/dinput_private.h
+++ b/dlls/dinput/dinput_private.h
@@ -60,7 +60,7 @@ extern const struct dinput_device joystick_linux_device;
 extern const struct dinput_device joystick_linuxinput_device;
 extern const struct dinput_device joystick_osx_device;
 
-extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8A);
+extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W);
 typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM);
 
 extern void _dump_diactionformatA(LPDIACTIONFORMATA);




More information about the wine-cvs mailing list