ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Deny locking lost surfaces. 

Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Paul Gofman 2020-03-26 16:09:41 +03:00 committed by Alexandre Julliard
parent 62ff00b066
commit 530a3d94de
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/ddraw/surface.c
View File

@ -1110,6 +1110,12 @@ static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface,
if (!surface_validate_lock_desc(surface, (DDSURFACEDESC *)surface_desc, &surface_desc_size))
return DDERR_INVALIDPARAMS;
if (ddraw_surface_is_lost(surface))
{
WARN("Surface is lost.\n");
return DDERR_SURFACELOST;
}
return surface_lock(surface, rect, surface_desc, surface_desc_size, flags, h);
}
@ -1125,6 +1131,12 @@ static HRESULT WINAPI ddraw_surface4_Lock(IDirectDrawSurface4 *iface, RECT *rect
if (!surface_validate_lock_desc(surface, (DDSURFACEDESC *)surface_desc, &surface_desc_size))
return DDERR_INVALIDPARAMS;
if (ddraw_surface_is_lost(surface))
{
WARN("Surface is lost.\n");
return DDERR_SURFACELOST;
}
return surface_lock(surface, rect, surface_desc, surface_desc_size, flags, h);
}
@ -1138,6 +1150,12 @@ static HRESULT ddraw_surface_lock_ddsd(struct ddraw_surface *surface, RECT *rect
if (!surface_validate_lock_desc(surface, surface_desc, &surface_desc_size))
return DDERR_INVALIDPARAMS;
if (ddraw_surface_is_lost(surface))
{
WARN("Surface is lost.\n");
return DDERR_SURFACELOST;
}
surface_desc2.dwSize = surface_desc->dwSize;
surface_desc2.dwFlags = 0;
hr = surface_lock(surface, rect, &surface_desc2, surface_desc_size, flags, h);

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

@ -1056,6 +1056,7 @@ static void test_coop_level_d3d_state(void)
IDirectDrawSurface7 *rt, *surface;
IDirect3DDevice7 *device;
IDirectDraw7 *ddraw;
DDSURFACEDESC2 lock;
IDirect3D7 *d3d;
D3DCOLOR color;
DDSCAPS2 caps;
@ -1116,6 +1117,13 @@ static void test_coop_level_d3d_state(void)
hr = IDirectDrawSurface7_IsLost(rt);
ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr);
memset(&lock, 0, sizeof(lock));
lock.dwSize = sizeof(lock);
lock.lpSurface = (void *)0xdeadbeef;
hr = IDirectDrawSurface7_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL);
ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr);
ok(lock.lpSurface == (void *)0xdeadbeef, "Got unexpected lock.lpSurface %p.\n", lock.lpSurface);
memset(&caps, 0, sizeof(caps));
caps.dwCaps = DDSCAPS_ZBUFFER;
hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface);
@ -1127,6 +1135,11 @@ static void test_coop_level_d3d_state(void)
hr = IDirectDraw7_RestoreAllSurfaces(ddraw);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirectDrawSurface7_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirectDrawSurface7_Unlock(rt, NULL);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
caps.dwCaps = DDSCAPS_ZBUFFER;
hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);