d3drm/tests: Skip following tests when device creation fails.
Bernhard Übelacker
bernhardu at vr-web.de
Thu Oct 15 14:54:27 CDT 2015
Tried to run tests inside Xephyr X-Server. This leads to a crash in
this test because no OpenGL is available inside.
e.g.:
Xlib: extension "GLX" missing on display ":1".
err:wgl:X11DRV_WineGL_InitOpenglInfo couldn't initialize OpenGL, expect problems
d3drm.c:1481: Test failed: Cannot get IDirect3DRMDevice interface (hr = 80070057)
wine: Unhandled page fault on execute access to 0x00139c20 at address 0x139c20 (thread 0027), starting debugger...
This patch avoids the crashes by skipping the tests after the failing
calls to IDirect3DRM*_CreateDeviceFrom*.
Signed-off-by: Bernhard Übelacker <bernhardu at vr-web.de>
---
dlls/d3drm/tests/d3drm.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 06c2c54..a96da1f 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -1240,6 +1240,14 @@ static void test_Viewport(void)
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm, pClipper, &driver, rc.right, rc.bottom, &device);
ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ if (FAILED(hr))
+ {
+ skip("Cannot get IDirect3DRMDevice interface (hr = %x), skipping tests\n", hr);
+ IDirectDrawClipper_Release(pClipper);
+ IDirect3DRM_Release(d3drm);
+ DestroyWindow(window);
+ return;
+ }
hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame);
ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr);
@@ -1471,6 +1479,14 @@ static void test_Device(void)
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm, pClipper, &driver, rc.right, rc.bottom, &device);
ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ if (FAILED(hr))
+ {
+ skip("Cannot get IDirect3DRMDevice interface (hr = %x), skipping tests\n", hr);
+ IDirectDrawClipper_Release(pClipper);
+ IDirect3DRM_Release(d3drm);
+ DestroyWindow(window);
+ return;
+ }
hr = IDirect3DRMDevice_GetClassName(device, NULL, cname);
ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr);
@@ -2045,6 +2061,14 @@ static void test_device_qi(void)
memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID));
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1);
ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr);
+ if (FAILED(hr))
+ {
+ skip("Cannot get IDirect3DRMDevice interface (hr = %x), skipping tests\n", hr);
+ IDirectDrawClipper_Release(clipper);
+ IDirect3DRM_Release(d3drm1);
+ DestroyWindow(window);
+ return;
+ }
hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IUnknown, (void **)&unknown);
ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice (hr = %x)\n", hr);
IDirect3DRMDevice_Release(device1);
@@ -2136,6 +2160,14 @@ static void test_create_device_from_clipper1(void)
hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 300, 200, &device1);
ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ if (FAILED(hr))
+ {
+ skip("Cannot create IDirect3DRMDevice interface (hr = %x), skipping tests\n", hr);
+ IDirect3DRM_Release(d3drm1);
+ IDirectDrawClipper_Release(clipper);
+ DestroyWindow(window);
+ return;
+ }
ref2 = get_refcount((IUnknown *)d3drm1);
ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
cref2 = get_refcount((IUnknown *)clipper);
@@ -2307,6 +2339,15 @@ static void test_create_device_from_clipper2(void)
hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, &device2);
ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ if (FAILED(hr))
+ {
+ skip("Cannot create IDirect3DRMDevice2 interface (hr = %x), skipping tests\n", hr);
+ IDirect3DRM2_Release(d3drm2);
+ IDirect3DRM_Release(d3drm1);
+ IDirectDrawClipper_Release(clipper);
+ DestroyWindow(window);
+ return;
+ }
ref3 = get_refcount((IUnknown *)d3drm1);
ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
@@ -2481,6 +2522,15 @@ static void test_create_device_from_clipper3(void)
hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 300, 200, &device3);
ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ if (FAILED(hr))
+ {
+ skip("Cannot create IDirect3DRMDevice3 interface (hr = %x), skipping tests\n", hr);
+ IDirect3DRM3_Release(d3drm3);
+ IDirect3DRM_Release(d3drm1);
+ IDirectDrawClipper_Release(clipper);
+ DestroyWindow(window);
+ return;
+ }
ref3 = get_refcount((IUnknown *)d3drm1);
ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
@@ -2666,6 +2716,15 @@ static void test_create_device_from_surface1(void)
hr = IDirect3DRM_CreateDeviceFromSurface(d3drm1, &driver, ddraw, surface, &device1);
ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice interface (hr = %x).\n", hr);
+ if (FAILED(hr))
+ {
+ skip("Cannot create IDirect3DRMDevice interface (hr = %x), skipping tests\n", hr);
+ IDirectDrawSurface_Release(surface);
+ IDirect3DRM_Release(d3drm1);
+ IDirectDraw_Release(ddraw);
+ DestroyWindow(window);
+ return;
+ }
ref2 = get_refcount((IUnknown *)d3drm1);
ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2);
surface_ref2 = get_refcount((IUnknown *)surface);
@@ -2838,6 +2897,16 @@ static void test_create_device_from_surface2(void)
hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2);
ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr);
+ if (FAILED(hr))
+ {
+ skip("Cannot create IDirect3DRMDevice2 interface (hr = %x), skipping tests\n", hr);
+ IDirectDrawSurface_Release(surface);
+ IDirect3DRM2_Release(d3drm2);
+ IDirect3DRM_Release(d3drm1);
+ IDirectDraw_Release(ddraw);
+ DestroyWindow(window);
+ return;
+ }
ref3 = get_refcount((IUnknown *)d3drm1);
ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm2);
@@ -3016,6 +3085,16 @@ static void test_create_device_from_surface3(void)
hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, 0, &device3);
ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr);
+ if (FAILED(hr))
+ {
+ skip("Cannot create IDirect3DRMDevice3 interface (hr = %x), skipping tests\n", hr);
+ IDirectDrawSurface_Release(surface);
+ IDirect3DRM3_Release(d3drm3);
+ IDirect3DRM_Release(d3drm1);
+ IDirectDraw_Release(ddraw);
+ DestroyWindow(window);
+ return;
+ }
ref3 = get_refcount((IUnknown *)d3drm1);
ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3);
ref3 = get_refcount((IUnknown *)d3drm3);
--
2.1.4
More information about the wine-patches
mailing list