Henri Verbeet : ddraw/tests: Fix some surface locking calls.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Jan 11 21:27:31 2012 +0100

ddraw/tests: Fix some surface locking calls.

In ddraw7 DDLOCK_WAIT is the default behaviour, in earlier versions it's
DDLOCK_DONOTWAIT.

---

 dlls/ddraw/tests/ddraw1.c |    2 +-
 dlls/ddraw/tests/ddraw2.c |    2 +-
 dlls/ddraw/tests/ddraw4.c |    2 +-
 dlls/ddraw/tests/ddraw7.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 13464af..846ca19 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -283,7 +283,7 @@ static void test_clipper_blt(void)
     hr = IDirectDrawSurface_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx);
     ok(SUCCEEDED(hr), "Failed to clear destination surface, hr %#x.\n", hr);
 
-    hr = IDirectDrawSurface_Lock(src_surface, NULL, &surface_desc, 0, NULL);
+    hr = IDirectDrawSurface_Lock(src_surface, NULL, &surface_desc, DDLOCK_WAIT, NULL);
     ok(SUCCEEDED(hr), "Failed to lock source surface, hr %#x.\n", hr);
     ((DWORD *)surface_desc.lpSurface)[0] = 0xff0000ff;
     ((DWORD *)surface_desc.lpSurface)[1] = 0xff00ff00;
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 8146ff6..d94af1a 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -290,7 +290,7 @@ static void test_clipper_blt(void)
     hr = IDirectDrawSurface_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx);
     ok(SUCCEEDED(hr), "Failed to clear destination surface, hr %#x.\n", hr);
 
-    hr = IDirectDrawSurface_Lock(src_surface, NULL, &surface_desc, 0, NULL);
+    hr = IDirectDrawSurface_Lock(src_surface, NULL, &surface_desc, DDLOCK_WAIT, NULL);
     ok(SUCCEEDED(hr), "Failed to lock source surface, hr %#x.\n", hr);
     ((DWORD *)surface_desc.lpSurface)[0] = 0xff0000ff;
     ((DWORD *)surface_desc.lpSurface)[1] = 0xff00ff00;
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 65725b3..144f372 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -585,7 +585,7 @@ static void test_clipper_blt(void)
     hr = IDirectDrawSurface4_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx);
     ok(SUCCEEDED(hr), "Failed to clear destination surface, hr %#x.\n", hr);
 
-    hr = IDirectDrawSurface4_Lock(src_surface, NULL, &surface_desc, 0, NULL);
+    hr = IDirectDrawSurface4_Lock(src_surface, NULL, &surface_desc, DDLOCK_WAIT, NULL);
     ok(SUCCEEDED(hr), "Failed to lock source surface, hr %#x.\n", hr);
     ((DWORD *)surface_desc.lpSurface)[0] = 0xff0000ff;
     ((DWORD *)surface_desc.lpSurface)[1] = 0xff00ff00;
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 0826346..f130c01 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -86,7 +86,7 @@ static D3DCOLOR get_surface_color(IDirectDrawSurface7 *surface, UINT x, UINT y)
     memset(&surface_desc, 0, sizeof(surface_desc));
     surface_desc.dwSize = sizeof(surface_desc);
 
-    hr = IDirectDrawSurface7_Lock(surface, &rect, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL);
+    hr = IDirectDrawSurface7_Lock(surface, &rect, &surface_desc, DDLOCK_READONLY, NULL);
     ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr);
     if (FAILED(hr))
         return 0xdeadbeef;