Henri Verbeet : ddraw: Use hr_ddraw_from_wined3d() in ddraw_surface_create( ).

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Mon Dec  2 12:07:35 2013 +0100

ddraw: Use hr_ddraw_from_wined3d() in ddraw_surface_create().

---

 dlls/ddraw/surface.c |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index e94876f..29385b7 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -5698,7 +5698,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
     {
         ERR("Failed to get display mode, hr %#x.\n", hr);
         HeapFree(GetProcessHeap(), 0, texture);
-        return hr;
+        return hr_ddraw_from_wined3d(hr);
     }
 
     /* No pixelformat given? Use the current screen format. */
@@ -5757,7 +5757,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
             {
                 ERR("Failed to reset device.\n");
                 HeapFree(GetProcessHeap(), 0, texture);
-                return hr;
+                return hr_ddraw_from_wined3d(hr);
             }
         }
     }
@@ -5906,18 +5906,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
             WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture)))
     {
         WARN("Failed to create wined3d texture, hr %#x.\n", hr);
-        switch (hr)
-        {
-            case WINED3DERR_INVALIDCALL:
-                hr = DDERR_INVALIDPARAMS;
-                break;
-
-            default:
-                FIXME("Unexpected wined3d error %#x.\n", hr);
-                break;
-        }
         HeapFree(GetProcessHeap(), 0, texture);
-        return hr;
+        return hr_ddraw_from_wined3d(hr);
     }
 
     resource = wined3d_texture_get_sub_resource(wined3d_texture, 0);
@@ -6006,6 +5996,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
                     WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture)))
             {
                 HeapFree(GetProcessHeap(), 0, texture);
+                hr = hr_ddraw_from_wined3d(hr);
                 goto fail;
             }