Zebediah Figura : ddraw: Properly compare DDENUMSURFACES_NOMATCH to TRUE.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8e8e0f48c42587af372c0dcc7f0e98ee3ae506d9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8e8e0f48c42587af372c0dcc7...

Author: Zebediah Figura 
Date:   Sun May  3 15:42:07 2020 -0500

ddraw: Properly compare DDENUMSURFACES_NOMATCH to TRUE.

Signed-off-by: Zebediah Figura 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

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

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index b7e7e6514a..afd2875ea2 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -3213,7 +3213,7 @@ static HRESULT CALLBACK EnumSurfacesCallbackThunk(IDirectDrawSurface7 *surface,
  *  DD_OK on success
  *
  *****************************************************************************/
-static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags,
+static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD flags,
         DDSURFACEDESC2 *DDSD, void *Context, LPDDENUMSURFACESCALLBACK7 Callback)
 {
     struct ddraw *ddraw = impl_from_IDirectDraw7(iface);
@@ -3223,10 +3223,10 @@ static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags,
     struct list *entry, *entry2;

TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n",
-            iface, Flags, DDSD, Context, Callback);
+            iface, flags, DDSD, Context, Callback);

-    all = Flags & DDENUMSURFACES_ALL;
-    nomatch = Flags & DDENUMSURFACES_NOMATCH;
+    all = flags & DDENUMSURFACES_ALL;
+    nomatch = !!(flags & DDENUMSURFACES_NOMATCH);

if (!Callback)
         return DDERR_INVALIDPARAMS;
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 0e1de7909d..4a1818af6a 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -12229,7 +12229,7 @@ static void test_enum_surfaces(void)
     hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH,
             &desc, &param, enum_surfaces_cb);
     ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr);
-    todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count);
+    ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count);

desc.dwFlags = 0;
     param.count = 0;
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 8d38344520..03615c61ce 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -13205,7 +13205,7 @@ static void test_enum_surfaces(void)
     hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH,
             &desc, &param, enum_surfaces_cb);
     ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr);
-    todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count);
+    ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count);

desc.dwFlags = 0;
     param.count = 0;
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 3a3983639d..ce6c8aaf22 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -15793,7 +15793,7 @@ static void test_enum_surfaces(void)
     hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH,
             &desc, &param, enum_surfaces_cb);
     ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr);
-    todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count);
+    ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count);

desc.dwFlags = 0;
     param.count = 0;
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index bf31d3915b..466fcc544a 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -15203,7 +15203,7 @@ static void test_enum_surfaces(void)
     hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH,
             &desc, &param, enum_surfaces_cb);
     ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr);
-    todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count);
+    ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count);

desc.dwFlags = 0;
     param.count = 0;