ddraw: Don't crash if writing out a new ddraw7 surface segfaults.

dlls/ddraw/ddraw.c

@@ -2814,15 +2814,23 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 *
 
     hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 7);
     wined3d_mutex_unlock();
-    if (FAILED(hr))
+
+    __TRY
     {
-        *surface = NULL;
-        return hr;
+        if (FAILED(hr))
+        {
+            *surface = NULL;
+            break;
+        }
+        *surface = &impl->IDirectDrawSurface7_iface;
+        IDirectDraw7_AddRef(iface);
+        impl->ifaceToRelease = (IUnknown *)iface;
     }
-
-    *surface = &impl->IDirectDrawSurface7_iface;
-    IDirectDraw7_AddRef(iface);
-    impl->ifaceToRelease = (IUnknown *)iface;
+    __EXCEPT_PAGE_FAULT
+    {
+        hr = E_INVALIDARG;
+    }
+    __ENDTRY;
 
     return hr;
 }

dlls/ddraw/tests/ddraw7.c

@@ -1994,6 +1994,8 @@ static void test_surface_qi(void)
     surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
     surface_desc.dwWidth = 512;
     surface_desc.dwHeight = 512;
+    hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface7 **)0xdeadbeef, NULL);
+    ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
     hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL);
     ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);