Commit 5c9a7b09 authored by Paul Gofman's avatar Paul Gofman Committed by Alexandre Julliard

ddraw: Restore complex attached surfaces when restoring surface.

parent 7361c7f2
...@@ -3732,6 +3732,7 @@ static HRESULT WINAPI ddraw_surface1_IsLost(IDirectDrawSurface *iface) ...@@ -3732,6 +3732,7 @@ static HRESULT WINAPI ddraw_surface1_IsLost(IDirectDrawSurface *iface)
static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface)
{ {
struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
unsigned int i;
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
...@@ -3772,6 +3773,12 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) ...@@ -3772,6 +3773,12 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface)
ddraw_update_lost_surfaces(surface->ddraw); ddraw_update_lost_surfaces(surface->ddraw);
surface->is_lost = FALSE; 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; return DD_OK;
} }
......
...@@ -9212,6 +9212,13 @@ static void test_lost_device(void) ...@@ -9212,6 +9212,13 @@ static void test_lost_device(void)
hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &back_buffer); hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &back_buffer);
ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); 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); IDirectDrawSurface7_Release(surface);
refcount = IDirectDraw7_Release(ddraw); refcount = IDirectDraw7_Release(ddraw);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment