Module: wine Branch: master Commit: abf44708a4ac016b86bd0ed747cf8c88dc3f7eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf44708a4ac016b86bd0ed747...
Author: Stefan Dösinger stefan@codeweavers.com Date: Tue Nov 25 10:16:53 2014 +0100
d3d9/tests: Fix test_cursor().
---
dlls/d3d9/tests/device.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 061846b..04bdf41 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1571,15 +1571,20 @@ static void test_cursor(void) HCURSOR cur; HWND window; HRESULT hr; + BOOL ret; + + window = CreateWindowA("d3d9_test_wc", "d3d9_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(GetCursorInfo(&info), "GetCursorInfo failed\n"); cur = info.hCursor;
- window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); - ok(!!window, "Failed to create a window.\n"); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); if (!(device = create_device(d3d, window, NULL))) @@ -1623,12 +1628,11 @@ static void test_cursor(void) hr = IDirect3DDevice9_ShowCursor(device, TRUE); ok(hr == TRUE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr);
- /* GDI cursor unchanged */ memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(GetCursorInfo(&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 = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);