wined3d: Properly recreate the sysmem resource location in IWineD3DSurfaceImpl_SetMem().

Otherwise we could end up with surfaces that have SFLAG_INSYSMEM set, but no actual system memory allocated. This was exposed by 3bbe658e.

wined3d: Properly recreate the sysmem resource location in IWineD3DSurfaceImpl_SetMem().
745126b0 · Henri Verbeet · Alexandre Julliard · 44b9712c · 745126b0
Commit 745126b0 authored Nov 15, 2010 by Henri Verbeet Committed by Alexandre Julliard Nov 15, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

surface.c dlls/wined3d/surface.c +4 -1

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2631,10 +2631,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *M
        /* HeapMemory should be NULL already */
        if (This->resource.heapMemory)
            ERR("User pointer surface has heap memory allocated.\n");
-        This->flags &= ~SFLAG_USERPTR;
+        This->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM);

        if (This->flags & SFLAG_CLIENT)
            surface_release_client_storage(This);
+
+        surface_prepare_system_memory(This);
+        surface_modify_location(This, SFLAG_INSYSMEM, TRUE);
    }
    return WINED3D_OK;
 }