From 317d5406d57ad5d3c9e2243e69f38ba044a558b6 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 20 Dec 2011 21:42:11 +0100 Subject: [PATCH] wined3d: Handle client storage in surface_init_sysmem(). --- dlls/wined3d/surface.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 998d28ead41..48d271f5615 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3956,13 +3956,21 @@ BOOL surface_init_sysmem(struct wined3d_surface *surface) { if (!surface->resource.allocatedMemory) { - surface->resource.heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - surface->resource.size + RESOURCE_ALIGNMENT); if (!surface->resource.heapMemory) { - ERR("Out of memory\n"); - return FALSE; + if (!(surface->resource.heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + surface->resource.size + RESOURCE_ALIGNMENT))) + { + ERR("Failed to allocate memory.\n"); + return FALSE; + } + } + else if (!(surface->flags & SFLAG_CLIENT)) + { + ERR("Surface %p has heapMemory %p and flags %#x.\n", + surface, surface->resource.heapMemory, surface->flags); } + surface->resource.allocatedMemory = (BYTE *)(((ULONG_PTR)surface->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); } -- 2.11.4.GIT