=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: d3d8/tests: Fix test_cursor().
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Nov 25 12:54:01 CST 2014
Module: wine
Branch: master
Commit: 4e8da470f850245a1b2bbac850b8ee59e135c560
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e8da470f850245a1b2bbac850b8ee59e135c560
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Fri Nov 21 18:32:30 2014 +0100
d3d8/tests: Fix test_cursor().
---
dlls/d3d8/tests/device.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index c8f9713..99fe70a 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -759,6 +759,7 @@ static void test_cursor(void)
HCURSOR cur;
HWND window;
HRESULT hr;
+ BOOL ret;
pGetCursorInfo = (void *)GetProcAddress(user32_handle, "GetCursorInfo");
if (!pGetCursorInfo)
@@ -767,14 +768,19 @@ static void test_cursor(void)
return;
}
+ window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,
+ 0, 0, 640, 480, NULL, NULL, NULL, NULL);
+ ok(!!window, "Failed to create a window.\n");
+
+ ret = SetCursorPos(50, 50);
+ ok(ret, "Failed to set cursor position.\n");
+ flush_events();
+
memset(&info, 0, sizeof(info));
info.cbSize = sizeof(info);
ok(pGetCursorInfo(&info), "GetCursorInfo failed\n");
cur = info.hCursor;
- window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW,
- 0, 0, 640, 480, NULL, NULL, NULL, NULL);
- ok(!!window, "Failed to create a window.\n");
d3d = Direct3DCreate8(D3D_SDK_VERSION);
ok(!!d3d, "Failed to create a D3D object.\n");
if (!(device = create_device(d3d, window, NULL)))
@@ -817,12 +823,11 @@ static void test_cursor(void)
hr = IDirect3DDevice8_ShowCursor(device, TRUE);
ok(hr == TRUE, "IDirect3DDevice8_ShowCursor returned %#08x\n", hr);
- /* GDI cursor unchanged */
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.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */
+ ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor);
refcount = IDirect3DDevice8_Release(device);
ok(!refcount, "Device has %u references left.\n", refcount);
More information about the wine-cvs
mailing list