Skip to content

W
wine-winehq
Commit 9594be7f authored by Vitaliy Margolen's avatar Vitaliy Margolen Committed by Alexandre Julliard
Browse files
Options

dinput: Change internal check_dinput_hooks method to take W iface.

parent 399be345
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/dinput/device.c
View file @ 9594be7f
...@@ -590,7 +590,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) ...@@ -590,7 +590,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
if (res == DI_OK) if (res == DI_OK)
{ {
This->queue_head = This->queue_tail = This->overflow = 0; This->queue_head = This->queue_tail = This->overflow = 0;
check_dinput_hooks(iface); check_dinput_hooks((LPDIRECTINPUTDEVICE8W)iface);
} }
LeaveCriticalSection(&This->crit); LeaveCriticalSection(&This->crit);
...@@ -610,7 +610,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) ...@@ -610,7 +610,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
res = !This->acquired ? DI_NOEFFECT : DI_OK; res = !This->acquired ? DI_NOEFFECT : DI_OK;
This->acquired = 0; This->acquired = 0;
if (res == DI_OK) if (res == DI_OK)
check_dinput_hooks(iface); check_dinput_hooks((LPDIRECTINPUTDEVICE8W)iface);
LeaveCriticalSection(&This->crit); LeaveCriticalSection(&This->crit);
return res; return res;
......
dlls/dinput/dinput_main.c
View file @ 9594be7f
...@@ -1093,7 +1093,7 @@ static BOOL check_hook_thread(void) ...@@ -1093,7 +1093,7 @@ static BOOL check_hook_thread(void)
return hook_thread_id != 0; return hook_thread_id != 0;
} }
void check_dinput_hooks(LPDIRECTINPUTDEVICE8A iface) void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface)
{ {
static HHOOK callwndproc_hook; static HHOOK callwndproc_hook;
static ULONG foreground_cnt; static ULONG foreground_cnt;
......
dlls/dinput/dinput_private.h
View file @ 9594be7f
...@@ -60,7 +60,7 @@ extern const struct dinput_device joystick_linux_device; ...@@ -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_linuxinput_device;
extern const struct dinput_device joystick_osx_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); typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM);
extern void _dump_diactionformatA(LPDIACTIONFORMATA); extern void _dump_diactionformatA(LPDIACTIONFORMATA);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment