ddraw: Don't depend on IWineD3DDevice_CreateSurface() not touching the surface…

ddraw: Don't depend on IWineD3DDevice_CreateSurface() not touching the surface parameter on failure. The reason it actually fails is because of ddraw trying to create surface of type "SURFACE_UNKNOWN". Stefan should have a patch for that.

ddraw: Don't depend on IWineD3DDevice_CreateSurface() not touching the surface…
aa305c4a · Henri Verbeet · Alexandre Julliard · 41b3b8e4 · aa305c4a
Commit aa305c4a authored Dec 17, 2009 by Henri Verbeet Committed by Alexandre Julliard Dec 18, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

ddraw.c dlls/ddraw/ddraw.c +4 -2

No files found.
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1655,9 +1655,11 @@ IDirectDrawImpl_RecreateSurfacesCallback(IDirectDrawSurface7 *surf,
            TRUE /* Lockable */, FALSE /* Discard */, surfImpl->mipmap_level, &surfImpl->WineD3DSurface, Usage, Pool,
            MultiSampleType, MultiSampleQuality, This->ImplType, Parent, &ddraw_null_wined3d_parent_ops);
    IUnknown_Release(Parent);
-
-    if(hr != D3D_OK)
+    if (FAILED(hr))
+    {
+        surfImpl->WineD3DSurface = wineD3DSurface;
        return hr;
+    }

    IWineD3DSurface_SetClipper(surfImpl->WineD3DSurface, clipper);