From fbe20ab62fb067f5219059f8748c98b549b58485 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Tue, 24 Nov 2015 14:41:07 -0600 Subject: [PATCH] d3d8/tests: Accept CURSOR_SUPPRESSED in cursor flags. Signed-off-by: Vincent Povirk Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/d3d8/tests/device.c | 5 +++-- include/winuser.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 827f144758a..daf45b72254 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINVER 0x0602 /* for CURSOR_SUPPRESSED */ #define COBJMACROS #include #include @@ -853,7 +854,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); - ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); + ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ /* Still hidden */ @@ -867,7 +868,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); - ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); + ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); refcount = IDirect3DDevice8_Release(device); diff --git a/include/winuser.h b/include/winuser.h index 1d3759aaea3..50821f449e3 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1533,6 +1533,7 @@ typedef struct tagCURSORINFO } CURSORINFO, *PCURSORINFO, *LPCURSORINFO; #define CURSOR_SHOWING 0x00000001 +#define CURSOR_SUPPRESSED 0x00000002 /* this is the 6 byte accel struct used in Win32 when presented to the user */ typedef struct tagACCEL