wined3d: Don't get rid of the user memory unless we're actually called with NULL…

wined3d: Don't get rid of the user memory unless we're actually called with NULL in surface_set_mem(). In particular, some applications will call surface_set_mem() with the same pointer to notify us the contents have changed.

wined3d: Don't get rid of the user memory unless we're actually called with NULL…
4b1ba0e0 · Henri Verbeet · Alexandre Julliard · 1ad1474b · 4b1ba0e0
Commit 4b1ba0e0 authored Aug 23, 2011 by Henri Verbeet Committed by Alexandre Julliard Aug 24, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

surface.c dlls/wined3d/surface.c +10 -6

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1783,17 +1783,21 @@ static HRESULT surface_set_mem(struct wined3d_surface *surface, void *mem)
    }
    else if (surface->flags & SFLAG_USERPTR)
    {
-        /* Map and GetDC will re-create the dib section and allocated memory. */
-        surface->resource.allocatedMemory = NULL;
        /* HeapMemory should be NULL already. */
        if (surface->resource.heapMemory)
            ERR("User pointer surface has heap memory allocated.\n");
-        surface->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM);

-        if (surface->flags & SFLAG_CLIENT)
-            surface_release_client_storage(surface);
+        if (!mem)
+        {
+            surface->resource.allocatedMemory = NULL;
+            surface->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM);
+
+            if (surface->flags & SFLAG_CLIENT)
+                surface_release_client_storage(surface);
+
+            surface_prepare_system_memory(surface);
+        }

-        surface_prepare_system_memory(surface);
        surface_modify_location(surface, SFLAG_INSYSMEM, TRUE);
    }