Skip to content

W
wine-winehq
Commit 0bd130f2 authored by Zhiyi Zhang's avatar Zhiyi Zhang Committed by Alexandre Julliard
Browse files
Options

d3d8/tests: Fix possible test failures.

expect_messages points to a local variable. When it goes out of scope, it reads into random memory, causing failures. Signed-off-by: 's avatarZhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 63b294a9
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 3 deletions
dlls/d3d8/tests/device.c
View file @ 0bd130f2
...@@ -2662,6 +2662,7 @@ static void test_wndproc(void) ...@@ -2662,6 +2662,7 @@ static void test_wndproc(void)
{ {
struct wndproc_thread_param thread_params; struct wndproc_thread_param thread_params;
struct device_desc device_desc; struct device_desc device_desc;
static WINDOWPOS windowpos;
IDirect3DDevice8 *device; IDirect3DDevice8 *device;
WNDCLASSA wc = {0}; WNDCLASSA wc = {0};
IDirect3D8 *d3d8; IDirect3D8 *d3d8;
...@@ -2677,7 +2678,6 @@ static void test_wndproc(void) ...@@ -2677,7 +2678,6 @@ static void test_wndproc(void)
DEVMODEW devmode; DEVMODEW devmode;
LONG change_ret, device_style; LONG change_ret, device_style;
BOOL ret; BOOL ret;
WINDOWPOS windowpos;
static const struct message create_messages[] = static const struct message create_messages[] =
{ {
...@@ -2777,7 +2777,7 @@ static void test_wndproc(void) ...@@ -2777,7 +2777,7 @@ static void test_wndproc(void)
{WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_MAXIMIZED}, {WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_MAXIMIZED},
{0, 0, FALSE, 0}, {0, 0, FALSE, 0},
}; };
struct message mode_change_messages[] = static const struct message mode_change_messages[] =
{ {
{WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0},
{WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0},
...@@ -2790,7 +2790,7 @@ static void test_wndproc(void) ...@@ -2790,7 +2790,7 @@ static void test_wndproc(void)
* ShowWindow does not send such a message because the window is already visible. */ * ShowWindow does not send such a message because the window is already visible. */
{0, 0, FALSE, 0}, {0, 0, FALSE, 0},
}; };
struct message mode_change_messages_hidden[] = static const struct message mode_change_messages_hidden[] =
{ {
{WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0},
{WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0},
...@@ -2857,6 +2857,9 @@ static void test_wndproc(void) ...@@ -2857,6 +2857,9 @@ static void test_wndproc(void)
return; return;
} }
filter_messages = NULL;
expect_messages = NULL;
wc.lpfnWndProc = test_proc; wc.lpfnWndProc = test_proc;
wc.lpszClassName = "d3d8_test_wndproc_wc"; wc.lpszClassName = "d3d8_test_wndproc_wc";
ok(RegisterClassA(&wc), "Failed to register window class.\n"); ok(RegisterClassA(&wc), "Failed to register window class.\n");
...@@ -3200,6 +3203,7 @@ static void test_wndproc(void) ...@@ -3200,6 +3203,7 @@ static void test_wndproc(void)
flush_events(); flush_events();
ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n",
expect_messages->message, expect_messages->window, i); expect_messages->message, expect_messages->window, i);
expect_messages = NULL;
/* World of Warplanes hides the window by removing WS_VISIBLE and expects Reset() to show it again. */ /* World of Warplanes hides the window by removing WS_VISIBLE and expects Reset() to show it again. */
device_style = GetWindowLongA(device_window, GWL_STYLE); device_style = GetWindowLongA(device_window, GWL_STYLE);
...@@ -3219,6 +3223,7 @@ static void test_wndproc(void) ...@@ -3219,6 +3223,7 @@ static void test_wndproc(void)
flush_events(); flush_events();
ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n",
expect_messages->message, expect_messages->window); expect_messages->message, expect_messages->window);
expect_messages = NULL;
ok(windowpos.hwnd == device_window && !windowpos.hwndInsertAfter ok(windowpos.hwnd == device_window && !windowpos.hwndInsertAfter
&& !windowpos.x && !windowpos.y && !windowpos.cx && !windowpos.cy && !windowpos.x && !windowpos.y && !windowpos.cx && !windowpos.cy
...@@ -3242,6 +3247,7 @@ static void test_wndproc(void) ...@@ -3242,6 +3247,7 @@ static void test_wndproc(void)
done: done:
filter_messages = NULL; filter_messages = NULL;
expect_messages = NULL;
IDirect3D8_Release(d3d8); IDirect3D8_Release(d3d8);
SetEvent(thread_params.test_finished); SetEvent(thread_params.test_finished);
...@@ -3272,6 +3278,9 @@ static void test_wndproc_windowed(void) ...@@ -3272,6 +3278,9 @@ static void test_wndproc_windowed(void)
d3d8 = Direct3DCreate8(D3D_SDK_VERSION); d3d8 = Direct3DCreate8(D3D_SDK_VERSION);
ok(!!d3d8, "Failed to create a D3D object.\n"); ok(!!d3d8, "Failed to create a D3D object.\n");
filter_messages = NULL;
expect_messages = NULL;
wc.lpfnWndProc = test_proc; wc.lpfnWndProc = test_proc;
wc.lpszClassName = "d3d8_test_wndproc_wc"; wc.lpszClassName = "d3d8_test_wndproc_wc";
ok(RegisterClassA(&wc), "Failed to register window class.\n"); ok(RegisterClassA(&wc), "Failed to register window class.\n");
...@@ -4177,6 +4186,9 @@ static void test_device_window_reset(void) ...@@ -4177,6 +4186,9 @@ static void test_device_window_reset(void)
HRESULT hr; HRESULT hr;
ULONG ref; ULONG ref;
filter_messages = NULL;
expect_messages = NULL;
wc.lpfnWndProc = test_proc; wc.lpfnWndProc = test_proc;
wc.lpszClassName = "d3d8_test_wndproc_wc"; wc.lpszClassName = "d3d8_test_wndproc_wc";
ok(RegisterClassA(&wc), "Failed to register window class.\n"); ok(RegisterClassA(&wc), "Failed to register window class.\n");
......
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