Huw Davies : dxgi: Don' t crash and just skip the tests if glX in not available.
Alexandre Julliard
julliard at winehq.org
Thu Dec 4 09:02:55 CST 2008
Module: wine
Branch: master
Commit: 239221442705cbbcfcec8b5bbbd8ec70b6f4d721
URL: http://source.winehq.org/git/wine.git/?a=commit;h=239221442705cbbcfcec8b5bbbd8ec70b6f4d721
Author: Huw Davies <huw at codeweavers.com>
Date: Wed Dec 3 13:33:32 2008 +0000
dxgi: Don't crash and just skip the tests if glX in not available.
---
dlls/dxgi/dxgi_main.c | 6 ++++++
dlls/dxgi/tests/device.c | 1 -
2 files changed, 6 insertions(+), 1 deletions(-)
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 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory)
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);
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 @@ static IDXGIDevice *create_device(HMODULE d3d10core)
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);
More information about the wine-cvs
mailing list