Skip to content

W
wine-cw
Commit fbe20ab6 authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard
Browse files
Options

d3d8/tests: Accept CURSOR_SUPPRESSED in cursor flags.

Signed-off-by: 's avatarVincent Povirk <vincent@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 2cebbfc5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/d3d8/tests/device.c
View file @ fbe20ab6
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WINVER 0x0602 /* for CURSOR_SUPPRESSED */
#define COBJMACROS #define COBJMACROS
#include <initguid.h> #include <initguid.h>
#include <d3d8.h> #include <d3d8.h>
...@@ -853,7 +854,7 @@ static void test_cursor(void) ...@@ -853,7 +854,7 @@ static void test_cursor(void)
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
info.cbSize = sizeof(info); info.cbSize = sizeof(info);
ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); 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 */ ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */
/* Still hidden */ /* Still hidden */
...@@ -867,7 +868,7 @@ static void test_cursor(void) ...@@ -867,7 +868,7 @@ static void test_cursor(void)
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
info.cbSize = sizeof(info); info.cbSize = sizeof(info);
ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); 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); ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor);
refcount = IDirect3DDevice8_Release(device); refcount = IDirect3DDevice8_Release(device);
......
include/winuser.h
View file @ fbe20ab6
...@@ -1533,6 +1533,7 @@ typedef struct tagCURSORINFO ...@@ -1533,6 +1533,7 @@ typedef struct tagCURSORINFO
} CURSORINFO, *PCURSORINFO, *LPCURSORINFO; } CURSORINFO, *PCURSORINFO, *LPCURSORINFO;
#define CURSOR_SHOWING 0x00000001 #define CURSOR_SHOWING 0x00000001
#define CURSOR_SUPPRESSED 0x00000002
/* this is the 6 byte accel struct used in Win32 when presented to the user */ /* this is the 6 byte accel struct used in Win32 when presented to the user */
typedef struct tagACCEL typedef struct tagACCEL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment