commit 239221442705cbbcfcec8b5bbbd8ec70b6f4d721
author Huw Davies <huw@codeweavers.com> Wed Dec 03 13:33:32 2008 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Dec 04 14:43:31 2008 +0100
tree c6502368050f85e006fa7ba2416f5d05f31eec9f
parent ba3054b60e0a188726865d967d9024be28fa61fe

dxgi: Don't crash and just skip the tests if glX in not available.

dlls/dxgi/dxgi_main.c

diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c
index eaf7b06..b72c04a 100644
--- a/dlls/dxgi/dxgi_main.c
+++ b/dlls/dxgi/dxgi_main.c
@@ -97,6 +97,12 @@
 
     EnterCriticalSection(&dxgi_cs);
     object->wined3d = WineDirect3DCreate(10, (IUnknown *)object);
+    if(!object->wined3d)
+    {
+        hr = DXGI_ERROR_UNSUPPORTED;
+        LeaveCriticalSection(&dxgi_cs);
+        goto fail;
+    }
 
     object->adapter_count = IWineD3D_GetAdapterCount(object->wined3d);
     LeaveCriticalSection(&dxgi_cs);

dlls/dxgi/tests/device.c

diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c
index 7f22bb4..7603c14 100644
--- a/dlls/dxgi/tests/device.c
+++ b/dlls/dxgi/tests/device.c
@@ -33,7 +33,6 @@
     HRESULT hr;
 
     hr = CreateDXGIFactory(&IID_IDXGIFactory, (void *)&factory);
-    ok(SUCCEEDED(hr), "CreateDXGIFactory failed, hr %#x\n", hr);
     if (FAILED(hr)) goto cleanup;
 
     hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter);