Akihiro Sagawa : dinput/tests: Use GET_DIDEVICE_SUBTYPE macro in keyboard type tests.
Alexandre Julliard
julliard at winehq.org
Sun Mar 3 13:21:29 CST 2019
Module: wine
Branch: oldstable
Commit: d72d3a3652012d3d7e3cdef7e050350ce828f5d7
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d72d3a3652012d3d7e3cdef7e050350ce828f5d7
Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date: Fri Aug 17 17:14:51 2018 +0900
dinput/tests: Use GET_DIDEVICE_SUBTYPE macro in keyboard type tests.
Signed-off-by: Akihiro Sagawa <sagawa.aki at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 75a2893fca830dd93f506486b26abc07dde06d9f)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/dinput/tests/keyboard.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c
index e51e332..72b23e7 100644
--- a/dlls/dinput/tests/keyboard.c
+++ b/dlls/dinput/tests/keyboard.c
@@ -217,9 +217,9 @@ static void test_capabilities(IDirectInputA *pDI, HWND hwnd)
ok (SUCCEEDED(hr), "GetCapabilities failed: 0x%08x\n", hr);
ok (caps.dwFlags & DIDC_ATTACHED, "GetCapabilities dwFlags: 0x%08x\n", caps.dwFlags);
- ok (LOWORD(LOBYTE(caps.dwDevType)) == DIDEVTYPE_KEYBOARD,
+ ok (GET_DIDEVICE_TYPE(caps.dwDevType) == DIDEVTYPE_KEYBOARD,
"GetCapabilities invalid device type for dwDevType: 0x%08x\n", caps.dwDevType);
- ok (LOWORD(HIBYTE(caps.dwDevType)) != DIDEVTYPEKEYBOARD_UNKNOWN,
+ ok (GET_DIDEVICE_SUBTYPE(caps.dwDevType) != DIDEVTYPEKEYBOARD_UNKNOWN,
"GetCapabilities invalid device subtype for dwDevType: 0x%08x\n", caps.dwDevType);
IUnknown_Release(pKeyboard);
More information about the wine-cvs
mailing list