Lucas Zawacki : dinput8/tests: Test load actions when there' s no pre-stored ones.
Alexandre Julliard
julliard at winehq.org
Tue Aug 28 14:44:40 CDT 2012
Module: wine
Branch: master
Commit: 851d38c4eff4f1e3499835db2fbc438675bb2eca
URL: http://source.winehq.org/git/wine.git/?a=commit;h=851d38c4eff4f1e3499835db2fbc438675bb2eca
Author: Lucas Zawacki <lfzawacki at gmail.com>
Date: Tue Aug 28 02:23:02 2012 -0300
dinput8/tests: Test load actions when there's no pre-stored ones.
---
dlls/dinput8/tests/device.c | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c
index 76f9120..2140388 100644
--- a/dlls/dinput8/tests/device.c
+++ b/dlls/dinput8/tests/device.c
@@ -351,6 +351,8 @@ static void test_save_settings(void)
IDirectInputDevice8A *pKey;
static const GUID mapping_guid = { 0xcafecafe, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } };
+ static const GUID other_guid = { 0xcafe, 0xcafe, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } };
+
static DIACTION actions[] = {
{ 0, DIKEYBOARD_A , 0, { "Blam" } },
{ 1, DIKEYBOARD_B , 0, { "Kapow"} }
@@ -433,6 +435,27 @@ static void test_save_settings(void)
"Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[1], af.rgoAction[1].dwObjID);
ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n");
+ /* Test that a different action map with no pre-stored settings, in spite of the flags,
+ does not try to load mappings and instead applies the default mapping */
+ af.guidActionMap = other_guid;
+
+ af.rgoAction[0].dwObjID = 0;
+ af.rgoAction[1].dwObjID = 0;
+ memset(&af.rgoAction[0].guidInstance, 0, sizeof(GUID));
+ memset(&af.rgoAction[1].guidInstance, 0, sizeof(GUID));
+
+ hr = IDirectInputDevice8_BuildActionMap(pKey, &af, NULL, 0);
+ ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr);
+
+ todo_wine ok (results[0] == af.rgoAction[0].dwObjID,
+ "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[0], af.rgoAction[0].dwObjID);
+ todo_wine ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[0].guidInstance), "Action should be mapped to keyboard\n");
+
+ todo_wine ok (results[1] == af.rgoAction[1].dwObjID,
+ "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[1], af.rgoAction[1].dwObjID);
+ todo_wine ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n");
+
+ af.guidActionMap = mapping_guid;
/* Hard case. Customized mapping, save, ask for previous map and read it back */
af.rgoAction[0].dwObjID = other_results[0];
af.rgoAction[0].dwHow = DIAH_USERCONFIG;
More information about the wine-cvs
mailing list