Henri Verbeet : wined3d: Recreate DIB sections in wined3d_surface_update_desc().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 544e52bff40dd51a3f4f9954a6a32a75ff70ae07
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=544e52bff40dd51a3f4f9954a6...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Dec 11 14:32:04 2013 +0100

wined3d: Recreate DIB sections in wined3d_surface_update_desc().

Since commit 6bc69c271bf440b4ecad012dc57888fdffc075d5, the GDI implementation
assumes DIB sections always exist.

---

 dlls/wined3d/surface.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 5b28e9b..a613059 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2814,6 +2814,8 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface,
     const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
     const struct wined3d_format *format = wined3d_get_format(gl_info, format_id);
     UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1);
+    BOOL create_dib = FALSE;
+    HRESULT hr;
 
     TRACE("surface %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u.\n",
             surface, width, height, debug_d3dformat(format_id), multisample_type, multisample_type);
@@ -2830,6 +2832,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface,
         DeleteObject(surface->dib.DIBsection);
         surface->dib.bitmap_data = NULL;
         surface->flags &= ~SFLAG_DIBSECTION;
+        create_dib = TRUE;
     }
 
     surface->flags &= ~(SFLAG_LOCATIONS | SFLAG_USERPTR);
@@ -2863,7 +2866,16 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface,
     surface->resource.multisample_quality = multisample_quality;
     surface->resource.size = resource_size;
 
-    if (!surface_init_sysmem(surface))
+    if (create_dib)
+    {
+        if (FAILED(hr = surface_create_dib_section(surface)))
+        {
+            ERR("Failed to create dib section, hr %#x.\n", hr);
+            return hr;
+        }
+        surface->resource.allocatedMemory = surface->dib.bitmap_data;
+    }
+    else if (!surface_init_sysmem(surface))
         return E_OUTOFMEMORY;
 
     return WINED3D_OK;