Henri Verbeet : ddraw/tests: Check for multiple expected messages in test_wndproc().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4c4a414596be1198a4839dcba45d2cdba739fb58
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4c4a414596be1198a4839dcba4...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Nov  4 10:37:29 2010 +0100

ddraw/tests: Check for multiple expected messages in test_wndproc().

---

 dlls/ddraw/tests/d3d.c |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index 87a368c..bbd4bbd 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -3252,11 +3252,11 @@ static void SetRenderTargetTest(void)
     IDirectDrawSurface7_Release(failrt);
 }
 
-static UINT expect_message;
+static const UINT *expect_messages;
 
 static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)
 {
-    if (expect_message && message == expect_message) expect_message = 0;
+    if (expect_messages && message == *expect_messages) ++expect_messages;
 
     return DefWindowProcA(hwnd, message, wparam, lparam);
 }
@@ -3270,6 +3270,13 @@ static void test_wndproc(void)
     HRESULT hr;
     ULONG ref;
 
+    static const UINT messages[] =
+    {
+        WM_ACTIVATE,
+        WM_SETFOCUS,
+        0,
+    };
+
     hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL);
     if (FAILED(hr))
     {
@@ -3288,7 +3295,7 @@ static void test_wndproc(void)
     ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n",
             (LONG_PTR)test_proc, proc);
 
-    expect_message = WM_SETFOCUS;
+    expect_messages = messages;
 
     hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
     ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr);
@@ -3298,7 +3305,8 @@ static void test_wndproc(void)
         goto done;
     }
 
-    ok(!expect_message, "Expected message %#x, but didn't receive it.\n", expect_message);
+    ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
+    expect_messages = NULL;
 
     proc = GetWindowLongPtrA(window, GWLP_WNDPROC);
     ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n",
@@ -3342,7 +3350,7 @@ static void test_wndproc(void)
             (LONG_PTR)DefWindowProcA, proc);
 
 done:
-    expect_message = 0;
+    expect_messages = NULL;
     DestroyWindow(window);
     UnregisterClassA("d3d7_test_wndproc_wc", GetModuleHandleA(NULL));
 }