Module: wine Branch: master Commit: fbe20ab62fb067f5219059f8748c98b549b58485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe20ab62fb067f5219059f874...
Author: Vincent Povirk vincent@codeweavers.com Date: Tue Nov 24 14:41:07 2015 -0600
d3d8/tests: Accept CURSOR_SUPPRESSED in cursor flags.
Signed-off-by: Vincent Povirk vincent@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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 827f144..daf45b7 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 <initguid.h> #include <d3d8.h> @@ -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 1d3759a..50821f4 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