d3d9/tests: Extend the window proc / focus window tests.
This commit is contained in:
Henri Verbeet
Alexandre Julliard
parent
7aa5e90914
commit
a62e5a4678
|
|
@ -2338,6 +2338,13 @@ struct
|
|||
UINT message;
|
||||
} expect_message;
|
||||
|
||||
struct wndproc_thread_param
|
||||
{
|
||||
HWND dummy_window;
|
||||
HANDLE window_created;
|
||||
HANDLE test_finished;
|
||||
};
|
||||
|
||||
static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)
|
||||
{
|
||||
if (filter_messages && filter_messages == hwnd)
|
||||
|
|
@ -2351,14 +2358,37 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM
|
|||
return DefWindowProcA(hwnd, message, wparam, lparam);
|
||||
}
|
||||
|
||||
static DWORD WINAPI wndproc_thread(void *param)
|
||||
{
|
||||
struct wndproc_thread_param *p = param;
|
||||
DWORD res;
|
||||
BOOL ret;
|
||||
|
||||
p->dummy_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test",
|
||||
WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0);
|
||||
|
||||
ret = SetEvent(p->window_created);
|
||||
ok(ret, "SetEvent failed, last error %#x.\n", GetLastError());
|
||||
|
||||
res = WaitForSingleObject(p->test_finished, INFINITE);
|
||||
ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError());
|
||||
|
||||
DestroyWindow(p->dummy_window);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void test_wndproc(void)
|
||||
{
|
||||
HWND device_window, focus_window, dummy_window, tmp;
|
||||
struct wndproc_thread_param thread_params;
|
||||
HWND device_window, focus_window, tmp;
|
||||
IDirect3DDevice9 *device;
|
||||
WNDCLASSA wc = {0};
|
||||
IDirect3D9 *d3d9;
|
||||
HANDLE thread;
|
||||
LONG_PTR proc;
|
||||
ULONG ref;
|
||||
DWORD res;
|
||||
|
||||
if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION)))
|
||||
{
|
||||
|
|
@ -2370,12 +2400,20 @@ static void test_wndproc(void)
|
|||
wc.lpszClassName = "d3d9_test_wndproc_wc";
|
||||
ok(RegisterClassA(&wc), "Failed to register window class.\n");
|
||||
|
||||
thread_params.window_created = CreateEvent(NULL, FALSE, FALSE, NULL);
|
||||
ok(!!thread_params.window_created, "CreateEvent failed, last error %#x.\n", GetLastError());
|
||||
thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL);
|
||||
ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError());
|
||||
|
||||
focus_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test",
|
||||
WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0);
|
||||
device_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test",
|
||||
WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0);
|
||||
dummy_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test",
|
||||
WS_MAXIMIZE | WS_CAPTION | WS_VISIBLE, 0, 0, 640, 480, 0, 0, 0, 0);
|
||||
thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, NULL);
|
||||
ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError());
|
||||
|
||||
res = WaitForSingleObject(thread_params.window_created, INFINITE);
|
||||
ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError());
|
||||
|
||||
proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC);
|
||||
ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
|
||||
|
|
@ -2384,10 +2422,14 @@ static void test_wndproc(void)
|
|||
ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
|
||||
(LONG_PTR)test_proc, proc);
|
||||
|
||||
trace("device_window %p, focus_window %p, dummy_window %p.\n", device_window, focus_window, dummy_window);
|
||||
trace("device_window %p, focus_window %p, dummy_window %p.\n",
|
||||
device_window, focus_window, thread_params.dummy_window);
|
||||
|
||||
tmp = GetFocus();
|
||||
ok(tmp == dummy_window, "Expected focus %p, got %p.\n", dummy_window, tmp);
|
||||
ok(tmp == device_window, "Expected focus %p, got %p.\n", device_window, tmp);
|
||||
tmp = GetForegroundWindow();
|
||||
ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n",
|
||||
thread_params.dummy_window, tmp);
|
||||
|
||||
expect_message.window = focus_window;
|
||||
expect_message.message = WM_SETFOCUS;
|
||||
|
|
@ -2402,7 +2444,10 @@ static void test_wndproc(void)
|
|||
ok(!expect_message.message, "Expected message %#x for window %p, but didn't receive it.\n",
|
||||
expect_message.message, expect_message.window);
|
||||
tmp = GetFocus();
|
||||
ok(tmp == focus_window, "Expected focus %p, got %p.\n", focus_window, tmp);
|
||||
todo_wine ok(tmp == focus_window, "Expected focus %p, got %p.\n", focus_window, tmp);
|
||||
tmp = GetForegroundWindow();
|
||||
todo_wine ok(tmp == focus_window, "Expected foreground window %p, got %p.\n", focus_window, tmp);
|
||||
SetForegroundWindow(focus_window);
|
||||
|
||||
filter_messages = focus_window;
|
||||
|
||||
|
|
@ -2452,7 +2497,13 @@ static void test_wndproc(void)
|
|||
done:
|
||||
filter_messages = NULL;
|
||||
IDirect3D9_Release(d3d9);
|
||||
DestroyWindow(dummy_window);
|
||||
|
||||
SetEvent(thread_params.test_finished);
|
||||
WaitForSingleObject(thread, INFINITE);
|
||||
CloseHandle(thread_params.test_finished);
|
||||
CloseHandle(thread_params.window_created);
|
||||
CloseHandle(thread);
|
||||
|
||||
DestroyWindow(device_window);
|
||||
DestroyWindow(focus_window);
|
||||
UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL));
|
||||
|
|
@ -2460,12 +2511,15 @@ done:
|
|||
|
||||
static void test_wndproc_windowed(void)
|
||||
{
|
||||
HWND device_window, focus_window, dummy_window, tmp;
|
||||
struct wndproc_thread_param thread_params;
|
||||
HWND device_window, focus_window, tmp;
|
||||
IDirect3DDevice9 *device;
|
||||
WNDCLASSA wc = {0};
|
||||
IDirect3D9 *d3d9;
|
||||
HANDLE thread;
|
||||
LONG_PTR proc;
|
||||
ULONG ref;
|
||||
DWORD res;
|
||||
|
||||
if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION)))
|
||||
{
|
||||
|
|
@ -2477,12 +2531,20 @@ static void test_wndproc_windowed(void)
|
|||
wc.lpszClassName = "d3d9_test_wndproc_wc";
|
||||
ok(RegisterClassA(&wc), "Failed to register window class.\n");
|
||||
|
||||
thread_params.window_created = CreateEvent(NULL, FALSE, FALSE, NULL);
|
||||
ok(!!thread_params.window_created, "CreateEvent failed, last error %#x.\n", GetLastError());
|
||||
thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL);
|
||||
ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError());
|
||||
|
||||
focus_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test",
|
||||
WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0);
|
||||
device_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test",
|
||||
WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0);
|
||||
dummy_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test",
|
||||
WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0);
|
||||
thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, NULL);
|
||||
ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError());
|
||||
|
||||
res = WaitForSingleObject(thread_params.window_created, INFINITE);
|
||||
ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError());
|
||||
|
||||
proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC);
|
||||
ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
|
||||
|
|
@ -2491,10 +2553,14 @@ static void test_wndproc_windowed(void)
|
|||
ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
|
||||
(LONG_PTR)test_proc, proc);
|
||||
|
||||
trace("device_window %p, focus_window %p, dummy_window %p.\n", device_window, focus_window, dummy_window);
|
||||
trace("device_window %p, focus_window %p, dummy_window %p.\n",
|
||||
device_window, focus_window, thread_params.dummy_window);
|
||||
|
||||
tmp = GetFocus();
|
||||
ok(tmp == dummy_window, "Expected focus %p, got %p.\n", dummy_window, tmp);
|
||||
ok(tmp == device_window, "Expected focus %p, got %p.\n", device_window, tmp);
|
||||
tmp = GetForegroundWindow();
|
||||
ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n",
|
||||
thread_params.dummy_window, tmp);
|
||||
|
||||
filter_messages = focus_window;
|
||||
|
||||
|
|
@ -2506,7 +2572,10 @@ static void test_wndproc_windowed(void)
|
|||
}
|
||||
|
||||
tmp = GetFocus();
|
||||
ok(tmp == dummy_window, "Expected focus %p, got %p.\n", dummy_window, tmp);
|
||||
ok(tmp == device_window, "Expected focus %p, got %p.\n", device_window, tmp);
|
||||
tmp = GetForegroundWindow();
|
||||
ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n",
|
||||
thread_params.dummy_window, tmp);
|
||||
|
||||
proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC);
|
||||
ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
|
||||
|
|
@ -2544,7 +2613,13 @@ static void test_wndproc_windowed(void)
|
|||
done:
|
||||
filter_messages = NULL;
|
||||
IDirect3D9_Release(d3d9);
|
||||
DestroyWindow(dummy_window);
|
||||
|
||||
SetEvent(thread_params.test_finished);
|
||||
WaitForSingleObject(thread, INFINITE);
|
||||
CloseHandle(thread_params.test_finished);
|
||||
CloseHandle(thread_params.window_created);
|
||||
CloseHandle(thread);
|
||||
|
||||
DestroyWindow(device_window);
|
||||
DestroyWindow(focus_window);
|
||||
UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL));
|
||||
|
|
|
|||
Loading…
Reference in New Issue