From 25f05b9860784c8c6ca16585de4591ffe2188ecc Mon Sep 17 00:00:00 2001 From: Lucas Fialho Zawacki Date: Wed, 8 Jun 2011 23:49:34 -0300 Subject: dinput: EnumDevicesBySemantics enumerating system keyboard and mouse --- dlls/dinput/dinput_main.c | 47 ++++++++++++++++++++++++++++--- dlls/dinput8/tests/device.c | 63 ++++++++++++++++++++++++++++++------------ 2 files changed, 87 insertions(+), 23 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index d3727bc..0f42e3e 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -681,8 +681,12 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( ) { IDirectInputImpl *This = impl_from_IDirectInput8A( iface ); + DIDEVICEINSTANCEA didevi; + LPDIRECTINPUTDEVICE8A lpdid; + BOOL ret; /* for the callback return */ + DWORD callbackFlags = 0; - FIXME("(this=%p,%s,%p,%p,%p,%04x): stub\n", This, ptszUserName, lpdiActionFormat, + FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, ptszUserName, lpdiActionFormat, lpCallback, pvRef, dwFlags); #define X(x) if (dwFlags & x) FIXME("\tdwFlags |= "#x"\n"); X(DIEDBSFL_ATTACHEDONLY) @@ -695,6 +699,20 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( _dump_diactionformatA(lpdiActionFormat); + didevi.dwSize = sizeof(didevi); + + /* enum the keyboard first */ + IDirectInput_CreateDevice(iface, &GUID_SysKeyboard, &lpdid, NULL); + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); + ret = lpCallback(&didevi, lpdid, callbackFlags , 1, pvRef); + + if (ret == DIENUM_STOP) return DI_OK; + + /* and then the mouse */ + IDirectInput_CreateDevice(iface, &GUID_SysMouse, &lpdid, NULL); + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); + ret = lpCallback(&didevi, lpdid, callbackFlags , 0, pvRef); + return DI_OK; } @@ -704,11 +722,30 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( LPVOID pvRef, DWORD dwFlags ) { - IDirectInputImpl *This = impl_from_IDirectInput8W( iface ); + IDirectInputImpl *This = impl_from_IDirectInput8W( iface ); + DIDEVICEINSTANCEW didevi; + LPDIRECTINPUTDEVICE8W lpdid; + BOOL ret; /* for the callback return */ + DWORD callbackFlags = 0; - FIXME("(this=%p,%s,%p,%p,%p,%04x): stub\n", This, debugstr_w(ptszUserName), lpdiActionFormat, - lpCallback, pvRef, dwFlags); - return 0; + FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_w(ptszUserName), lpdiActionFormat, + lpCallback, pvRef, dwFlags); + + didevi.dwSize = sizeof(didevi); + + /* enum the keyboard first */ + IDirectInput_CreateDevice(iface, &GUID_SysKeyboard, &lpdid, NULL); + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); + ret = lpCallback(&didevi, lpdid, callbackFlags , 1, pvRef); + + if (ret == DIENUM_STOP) return DI_OK; + + /* and then the mouse */ + IDirectInput_CreateDevice(iface, &GUID_SysMouse, &lpdid, NULL); + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); + ret = lpCallback(&didevi, lpdid, callbackFlags , 0, pvRef); + + return DI_OK; } static HRESULT WINAPI IDirectInput8AImpl_ConfigureDevices( diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index c18a83a..062b9c4 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -27,13 +27,51 @@ #include "initguid.h" #include "dinput.h" -static BOOL CALLBACK enum_by_semantics( +struct enum_data { + LPDIRECTINPUT8 pDI; + LPDIACTIONFORMAT lpdiaf; + LPDIRECTINPUTDEVICE8 keyboard; + LPDIRECTINPUTDEVICE8 mouse; + int ndevices; +}; + +/* Dummy GUID */ +const GUID ACTION_MAPPING_GUID = { 0x1, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; + +DIACTION actionMapping[]= +{ + /* axis */ + { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */ , 0, { "Steer" } }, + + /* button */ + { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */ , 0, { "Upshift" } } +}; + +static BOOL CALLBACK enumeration_callback( LPCDIDEVICEINSTANCE lpddi, LPDIRECTINPUTDEVICE8 lpdid, DWORD dwFlags, DWORD dwRemaining, LPVOID pvRef) { + struct enum_data *data = pvRef; + if (!data) return DIENUM_CONTINUE; + + data->ndevices++; + + /* collect the mouse and keyboard */ + if ( IsEqualGUID(&lpddi->guidInstance, &GUID_SysKeyboard) ) + { + IDirectInputDevice_AddRef(lpdid); + data->keyboard = lpdid; + } + + if ( IsEqualGUID(&lpddi->guidInstance, &GUID_SysMouse) ) + { + IDirectInputDevice_AddRef(lpdid); + data->mouse = lpdid; + } + return DIENUM_CONTINUE; } @@ -44,17 +82,7 @@ static void test_action_mapping(void) HINSTANCE hinst = GetModuleHandle(NULL); LPDIRECTINPUT8 pDI = NULL; DIACTIONFORMAT af; - /* Dummy GUID */ - const GUID ACTION_MAPPING_GUID = { 0x1, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; - - DIACTION actionMapping[]= - { - /* axis */ - { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */ , 0, { "Steer" } }, - - /* button */ - { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */ , 0, { "Upshift" } } - }; + struct enum_data data = { pDI, &af, NULL, NULL, 0}; hr = CoCreateInstance(&CLSID_DirectInput8, 0, 1, &IID_IDirectInput8A, (LPVOID*)&pDI); if (hr == DIERR_OLDDIRECTINPUTVERSION || @@ -85,16 +113,15 @@ static void test_action_mapping(void) af.guidActionMap = ACTION_MAPPING_GUID; af.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ - hr = IDirectInput8_EnumDevicesBySemantics(pDI,0, &af, - enum_by_semantics, 0, 0); - + hr = IDirectInput8_EnumDevicesBySemantics(pDI,0, &af, enumeration_callback, &data, 0); ok(SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n",hr); + ok( data.ndevices > 0, "EnumDevicesBySemantics did not call the callback hr=%08x\n",hr); + ok( data.keyboard != NULL, "EnumDevicesBySemantics should enumerate the keyboard\n"); + ok( data.mouse != NULL, "EnumDevicesBySemantics should enumerate the mouse\n"); /* The call fails with a zeroed GUID */ memset(&af.guidActionMap, 0, sizeof(GUID)); - hr = IDirectInput8_EnumDevicesBySemantics(pDI,0, &af, - enum_by_semantics, 0, 0); - + hr = IDirectInput8_EnumDevicesBySemantics(pDI,0, &af, enumeration_callback, 0, 0); todo_wine ok(FAILED(hr), "EnumDevicesBySemantics succeeded with invalid GUID hr=%08x\n", hr); } -- 1.7.0.4