Henri Verbeet : ddraw: Explicitly create a wined3d object without 3D capabilities when creating a normal wined3d object fails .

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Sun Jan 13 22:08:09 2013 +0100

ddraw: Explicitly create a wined3d object without 3D capabilities when creating a normal wined3d object fails.

---

 dlls/ddraw/ddraw.c     |   12 +++++++---
 dlls/ddraw/main.c      |   11 +++++++++-
 dlls/wined3d/directx.c |   52 ++++++++++++++++++++++++------------------------
 include/wine/wined3d.h |    1 +
 4 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index e88f67e..ca6f8d5 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -5267,11 +5267,15 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type)
     ddraw->numIfaces = 1;
     ddraw->ref7 = 1;
 
-    ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS);
-    if (!ddraw->wined3d)
+    if (!(ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS)))
     {
-        WARN("Failed to create a wined3d object.\n");
-        return E_OUTOFMEMORY;
+        if (!(ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D)))
+        {
+            WARN("Failed to create a wined3d object.\n");
+            return E_FAIL;
+        }
+
+        WARN("Created a wined3d object without 3D support.\n");
     }
 
     hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type,
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index 51f9dda..e79b471 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -383,7 +383,16 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex
         FIXME("flags 0x%08x not handled\n", flags);
 
     TRACE("Enumerating ddraw interfaces\n");
-    wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS);
+    if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS)))
+    {
+        if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D)))
+        {
+            WARN("Failed to create a wined3d object.\n");
+            return E_FAIL;
+        }
+
+        WARN("Created a wined3d object without 3D support.\n");
+    }
 
     __TRY
     {
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index d541f4d..2190689 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -5406,7 +5406,7 @@ static BOOL InitAdapters(struct wined3d *wined3d)
         HDC hdc = GetDC( 0 );
         const struct opengl_funcs *wgl_driver = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION );
         ReleaseDC( 0, hdc );
-        if (!wgl_driver || wgl_driver == (void *)-1) goto nogl_adapter;
+        if (!wgl_driver || wgl_driver == (void *)-1) return FALSE;
         gl_info->gl_ops.wgl = wgl_driver->wgl;
         gl_info->gl_ops.gl = wgl_driver->gl;
     }
@@ -5433,7 +5433,7 @@ static BOOL InitAdapters(struct wined3d *wined3d)
         {
             DWORD err = GetLastError();
             ERR("Failed to set adapter LUID (%#x).\n", err);
-            goto nogl_adapter;
+            return FALSE;
         }
         TRACE("Allocated LUID %08x:%08x for adapter.\n",
                 adapter->luid.HighPart, adapter->luid.LowPart);
@@ -5441,20 +5441,20 @@ static BOOL InitAdapters(struct wined3d *wined3d)
         if (!WineD3D_CreateFakeGLContext(&fake_gl_ctx))
         {
             ERR("Failed to get a gl context for default adapter\n");
-            goto nogl_adapter;
+            return FALSE;
         }
 
         ret = wined3d_adapter_init_gl_caps(adapter);
         if(!ret) {
             ERR("Failed to initialize gl caps for default adapter\n");
             WineD3D_ReleaseFakeGLContext(&fake_gl_ctx);
-            goto nogl_adapter;
+            return FALSE;
         }
         ret = initPixelFormats(&adapter->gl_info, adapter->driver_info.vendor);
         if(!ret) {
             ERR("Failed to init gl formats\n");
             WineD3D_ReleaseFakeGLContext(&fake_gl_ctx);
-            goto nogl_adapter;
+            return FALSE;
         }
 
         hdc = fake_gl_ctx.dc;
@@ -5595,7 +5595,7 @@ static BOOL InitAdapters(struct wined3d *wined3d)
 
                 WineD3D_ReleaseFakeGLContext(&fake_gl_ctx);
                 HeapFree(GetProcessHeap(), 0, adapter->cfgs);
-                goto nogl_adapter;
+                return FALSE;
             }
         }
 
@@ -5609,26 +5609,23 @@ static BOOL InitAdapters(struct wined3d *wined3d)
     TRACE("%u adapters successfully initialized.\n", wined3d->adapter_count);
 
     return TRUE;
+}
 
-nogl_adapter:
-    /* Initialize an adapter for ddraw-only memory counting */
-    memset(wined3d->adapters, 0, sizeof(wined3d->adapters));
-    wined3d->adapters[0].ordinal = 0;
-    wined3d->adapters[0].opengl = FALSE;
-    wined3d->adapters[0].monitorPoint.x = -1;
-    wined3d->adapters[0].monitorPoint.y = -1;
+static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordinal)
+{
+    memset(adapter, 0, sizeof(*adapter));
+    adapter->ordinal = ordinal;
+    adapter->monitorPoint.x = -1;
+    adapter->monitorPoint.y = -1;
 
-    wined3d->adapters[0].driver_info.name = "Display";
-    wined3d->adapters[0].driver_info.description = "WineD3D DirectDraw Emulation";
+    adapter->driver_info.name = "Display";
+    adapter->driver_info.description = "WineD3D DirectDraw Emulation";
     if (wined3d_settings.emulated_textureram)
-        wined3d->adapters[0].TextureRam = wined3d_settings.emulated_textureram;
+        adapter->TextureRam = wined3d_settings.emulated_textureram;
     else
-        wined3d->adapters[0].TextureRam = 8 * 1024 * 1024; /* This is plenty for a DDraw-only card */
-
-    initPixelFormatsNoGL(&wined3d->adapters[0].gl_info);
+        adapter->TextureRam = 128 * 1024 * 1024;
 
-    wined3d->adapter_count = 1;
-    return FALSE;
+    initPixelFormatsNoGL(&adapter->gl_info);
 }
 
 static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {}
@@ -5645,14 +5642,17 @@ HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags)
     wined3d->ref = 1;
     wined3d->flags = flags;
 
+    if (flags & WINED3D_NO3D)
+    {
+        wined3d_adapter_init_nogl(&wined3d->adapters[0], 0);
+        wined3d->adapter_count = 1;
+        return WINED3D_OK;
+    }
+
     if (!InitAdapters(wined3d))
     {
         WARN("Failed to initialize adapters.\n");
-        if (version > 7)
-        {
-            MESSAGE("Direct3D%u is not available without OpenGL.\n", version);
-            return E_FAIL;
-        }
+        return E_FAIL;
     }
 
     return WINED3D_OK;
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 77c76ab..7aa9651 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1220,6 +1220,7 @@ enum wined3d_display_rotation
 #define WINED3DDEVCAPS_NPATCHES                                 0x01000000
 
 #define WINED3D_LEGACY_DEPTH_BIAS                               0x00000001
+#define WINED3D_NO3D                                            0x00000002
 
 /* dwDDFX */
 /* arithmetic stretching along y axis */