From 6d6e4f4ea25759d3f66cc890564dc767a1dafcc8 Mon Sep 17 00:00:00 2001 From: Vitaliy Margolen <wine-patches@kievinfo.com> Date: Fri, 6 Jul 2007 23:36:22 -0600 Subject: [PATCH] dinput: Export Mouse and Keyboard GUIDs. --- dlls/dinput/device_private.h | 2 ++ dlls/dinput/keyboard.c | 7 ++----- dlls/dinput/mouse.c | 7 ++----- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 2ac609b948e..6d874d4cdfa 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -91,6 +91,8 @@ typedef struct { extern BOOL DIEnumDevicesCallbackAtoW(LPCDIDEVICEOBJECTINSTANCEA, LPVOID); +extern const GUID DInput_Wine_Keyboard_GUID; +extern const GUID DInput_Wine_Mouse_GUID; /* Various debug tools */ extern void _dump_cooperativelevel_DI(DWORD dwFlags) ; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index ad44023f586..0c5aef01737 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -90,11 +90,8 @@ static LRESULT CALLBACK KeyboardCallback( int code, WPARAM wparam, LPARAM lparam return CallNextHookEx(0, code, wparam, lparam); } -static const GUID DInput_Wine_Keyboard_GUID = { /* 0ab8648a-7735-11d2-8c73-71df54a96441 */ - 0x0ab8648a, - 0x7735, - 0x11d2, - {0x8c, 0x73, 0x71, 0xdf, 0x54, 0xa9, 0x64, 0x41} +const GUID DInput_Wine_Keyboard_GUID = { /* 0ab8648a-7735-11d2-8c73-71df54a96441 */ + 0x0ab8648a, 0x7735, 0x11d2, {0x8c, 0x73, 0x71, 0xdf, 0x54, 0xa9, 0x64, 0x41} }; static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version) { diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 3c80e7e47f8..df04ee54b7c 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -71,11 +71,8 @@ struct SysMouseImpl /* FIXME: This is ugly and not thread safe :/ */ static IDirectInputDevice8A* current_lock = NULL; -static const GUID DInput_Wine_Mouse_GUID = { /* 9e573ed8-7734-11d2-8d4a-23903fb6bdf7 */ - 0x9e573ed8, - 0x7734, - 0x11d2, - {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} +const GUID DInput_Wine_Mouse_GUID = { /* 9e573ed8-7734-11d2-8d4a-23903fb6bdf7 */ + 0x9e573ed8, 0x7734, 0x11d2, {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} }; static void fill_mouse_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version) { -- GitLab