From 5c9a7b0986db30c9565af519e6cbdef157524315 Mon Sep 17 00:00:00 2001 From: Paul Gofman Date: Mon, 5 Aug 2019 21:58:32 +0300 Subject: [PATCH] ddraw: Restore complex attached surfaces when restoring surface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47586 Signed-off-by: Paul Gofman Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/ddraw/surface.c | 7 +++++++ dlls/ddraw/tests/ddraw7.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 411267c3daa..d415e4ace75 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3732,6 +3732,7 @@ static HRESULT WINAPI ddraw_surface1_IsLost(IDirectDrawSurface *iface) static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + unsigned int i; TRACE("iface %p.\n", iface); @@ -3772,6 +3773,12 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) ddraw_update_lost_surfaces(surface->ddraw); surface->is_lost = FALSE; + for(i = 0; i < MAX_COMPLEX_ATTACHED; i++) + { + if (surface->complex_array[i]) + surface->complex_array[i]->is_lost = FALSE; + } + return DD_OK; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 171e6a5363a..99bd9c82f6b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9212,6 +9212,13 @@ static void test_lost_device(void) hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &back_buffer); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Restore(surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(back_buffer); IDirectDrawSurface7_Release(surface); refcount = IDirectDraw7_Release(ddraw);