marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Properly compare DDENUMSURFACES_NOMATCH to TRUE. 

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Zebediah Figura 2020-05-03 15:42:07 -05:00 committed by Alexandre Julliard
parent 2389fae064
commit 8e8e0f48c4
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/ddraw/ddraw.c
View File

@ -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;

2
dlls/ddraw/tests/ddraw1.c
View File

@ -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;

2
dlls/ddraw/tests/ddraw2.c
View File

@ -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;

2
dlls/ddraw/tests/ddraw4.c
View File

@ -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;

2
dlls/ddraw/tests/ddraw7.c
View File

@ -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;