=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: d3d8/tests: Fix some wndproc comparison error messages.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Nov 11 11:04:46 CST 2014
Module: wine
Branch: master
Commit: 7b7516189dc542cc754507ddc4cdec18b498ad56
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7516189dc542cc754507ddc4cdec18b498ad56
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Mon Nov 10 23:08:24 2014 +0100
d3d8/tests: Fix some wndproc comparison error messages.
---
dlls/d3d8/tests/device.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index 9153139..7468d13 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -2311,8 +2311,7 @@ static void test_wndproc(void)
(LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
- ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n",
- (LONG_PTR)test_proc, proc);
+ ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
ref = IDirect3DDevice8_Release(device);
ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);
@@ -2339,8 +2338,7 @@ static void test_wndproc(void)
}
proc = SetWindowLongPtrA(focus_window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA);
- ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n",
- (LONG_PTR)test_proc, proc);
+ ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
ref = IDirect3DDevice8_Release(device);
ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);
@@ -2459,8 +2457,7 @@ static void test_wndproc_windowed(void)
(LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
- ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
- (LONG_PTR)test_proc, proc);
+ ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
hr = reset_device(device, device_window, TRUE);
ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr);
@@ -2497,8 +2494,7 @@ static void test_wndproc_windowed(void)
(LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
- ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
- (LONG_PTR)test_proc, proc);
+ ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
hr = reset_device(device, focus_window, TRUE);
ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr);
@@ -2533,8 +2529,7 @@ static void test_wndproc_windowed(void)
(LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
- ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
- (LONG_PTR)test_proc, proc);
+ ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
hr = reset_device(device, device_window, TRUE);
ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr);
@@ -3208,8 +3203,7 @@ static void test_device_window_reset(void)
ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
(LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
- ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
- (LONG_PTR)test_proc, proc);
+ ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
hr = reset_device(device, device_window, FALSE);
ok(SUCCEEDED(hr), "Failed to reset device.\n");
@@ -3227,8 +3221,7 @@ static void test_device_window_reset(void)
ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
(LONG_PTR)test_proc, proc);
proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC);
- ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
- (LONG_PTR)test_proc, proc);
+ ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);
ref = IDirect3DDevice8_Release(device);
ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);
More information about the wine-cvs
mailing list