Skip to content

W
wine-winehq
Commit 5e369853 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard
Browse files
Options

d3d9/tests: Fix some wndproc comparison error messages.

parent 83ceee74
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 24 deletions
dlls/d3d9/tests/d3d9ex.c
View file @ 5e369853
...@@ -1869,8 +1869,7 @@ static void test_wndproc(void) ...@@ -1869,8 +1869,7 @@ static void test_wndproc(void)
(LONG_PTR)test_proc, proc); (LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
(LONG_PTR)test_proc, proc);
ref = IDirect3DDevice9Ex_Release(device); ref = IDirect3DDevice9Ex_Release(device);
ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);
...@@ -1897,8 +1896,7 @@ static void test_wndproc(void) ...@@ -1897,8 +1896,7 @@ static void test_wndproc(void)
} }
proc = SetWindowLongPtrA(focus_window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); proc = SetWindowLongPtrA(focus_window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA);
ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
(LONG_PTR)test_proc, proc);
ref = IDirect3DDevice9Ex_Release(device); ref = IDirect3DDevice9Ex_Release(device);
ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);
...@@ -2012,8 +2010,7 @@ static void test_wndproc_windowed(void) ...@@ -2012,8 +2010,7 @@ static void test_wndproc_windowed(void)
(LONG_PTR)test_proc, proc); (LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
(LONG_PTR)test_proc, proc);
hr = reset_device(device, device_window, TRUE); hr = reset_device(device, device_window, TRUE);
ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr);
...@@ -2050,8 +2047,7 @@ static void test_wndproc_windowed(void) ...@@ -2050,8 +2047,7 @@ static void test_wndproc_windowed(void)
(LONG_PTR)test_proc, proc); (LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
(LONG_PTR)test_proc, proc);
hr = reset_device(device, focus_window, TRUE); hr = reset_device(device, focus_window, TRUE);
ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr);
...@@ -2086,8 +2082,7 @@ static void test_wndproc_windowed(void) ...@@ -2086,8 +2082,7 @@ static void test_wndproc_windowed(void)
(LONG_PTR)test_proc, proc); (LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
(LONG_PTR)test_proc, proc);
hr = reset_device(device, device_window, TRUE); hr = reset_device(device, device_window, TRUE);
ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr);
......
dlls/d3d9/tests/device.c
View file @ 5e369853
...@@ -3260,8 +3260,7 @@ static void test_wndproc(void) ...@@ -3260,8 +3260,7 @@ static void test_wndproc(void)
(LONG_PTR)test_proc, proc); (LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
(LONG_PTR)test_proc, proc);
ref = IDirect3DDevice9_Release(device); ref = IDirect3DDevice9_Release(device);
ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);
...@@ -3288,8 +3287,7 @@ static void test_wndproc(void) ...@@ -3288,8 +3287,7 @@ static void test_wndproc(void)
} }
proc = SetWindowLongPtrA(focus_window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); proc = SetWindowLongPtrA(focus_window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA);
ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
(LONG_PTR)test_proc, proc);
ref = IDirect3DDevice9_Release(device); ref = IDirect3DDevice9_Release(device);
ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);
...@@ -3408,8 +3406,7 @@ static void test_wndproc_windowed(void) ...@@ -3408,8 +3406,7 @@ static void test_wndproc_windowed(void)
(LONG_PTR)test_proc, proc); (LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
(LONG_PTR)test_proc, proc);
hr = reset_device(device, device_window, TRUE); hr = reset_device(device, device_window, TRUE);
ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr);
...@@ -3446,8 +3443,7 @@ static void test_wndproc_windowed(void) ...@@ -3446,8 +3443,7 @@ static void test_wndproc_windowed(void)
(LONG_PTR)test_proc, proc); (LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
(LONG_PTR)test_proc, proc);
hr = reset_device(device, focus_window, TRUE); hr = reset_device(device, focus_window, TRUE);
ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr);
...@@ -3482,8 +3478,7 @@ static void test_wndproc_windowed(void) ...@@ -3482,8 +3478,7 @@ static void test_wndproc_windowed(void)
(LONG_PTR)test_proc, proc); (LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
(LONG_PTR)test_proc, proc);
hr = reset_device(device, device_window, TRUE); hr = reset_device(device, device_window, TRUE);
ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr);
...@@ -4122,8 +4117,7 @@ static void test_device_window_reset(void) ...@@ -4122,8 +4117,7 @@ static void test_device_window_reset(void)
ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
(LONG_PTR)test_proc, proc); (LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
(LONG_PTR)test_proc, proc);
hr = reset_device(device, device_window, FALSE); hr = reset_device(device, device_window, FALSE);
ok(SUCCEEDED(hr), "Failed to reset device.\n"); ok(SUCCEEDED(hr), "Failed to reset device.\n");
...@@ -4141,8 +4135,7 @@ static void test_device_window_reset(void) ...@@ -4141,8 +4135,7 @@ static void test_device_window_reset(void)
ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
(LONG_PTR)test_proc, proc); (LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
(LONG_PTR)test_proc, proc);
ref = IDirect3DDevice9_Release(device); ref = IDirect3DDevice9_Release(device);
ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);
......
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