wined3d: Properly allocate heap memory for volumes.

6e4e1ad3 · Stefan Dösinger · Alexandre Julliard · 4dd4a691 · 6e4e1ad3
Commit 6e4e1ad3 authored Aug 21, 2013 by Stefan Dösinger Committed by Alexandre Julliard Aug 21, 2013
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

volume.c dlls/wined3d/volume.c +10 -1

No files found.
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -184,7 +184,16 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume,
            volume, map_desc, box, flags);

    if (!volume->resource.allocatedMemory)
-        volume->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, volume->resource.size);
+    {
+        volume->resource.heap_memory = wined3d_resource_allocate_sysmem(volume->resource.size);
+        if (!volume->resource.heap_memory)
+        {
+            WARN("Out of memory.\n");
+            map_desc->data = NULL;
+            return E_OUTOFMEMORY;
+        }
+        volume->resource.allocatedMemory = volume->resource.heap_memory;
+    }

    TRACE("allocatedMemory %p.\n", volume->resource.allocatedMemory);