Austin English : d3d8/tests: Remove win9x hack.

Alexandre Julliard julliard at winehq.org
Mon Feb 28 11:02:07 CST 2011


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

Author: Austin English <austinenglish at gmail.com>
Date:   Fri Feb 25 14:30:46 2011 -0800

d3d8/tests: Remove win9x hack.

---

 dlls/d3d8/tests/device.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index 4ff9803..6885dd4 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -1306,13 +1306,9 @@ static void test_lights(void)
 
     /* TODO: Test the rendering results in this situation */
     hr = IDirect3DDevice8_LightEnable(device, i + 1, TRUE);
-    ok(hr == D3D_OK ||
-       broken(hr == D3DERR_INVALIDCALL), /* Some Win9x and WinME */
-       "Enabling one light more than supported returned %08x\n", hr);
+    ok(hr == D3D_OK, "Enabling one light more than supported returned %08x\n", hr);
     hr = IDirect3DDevice8_GetLightEnable(device, i + 1, &enabled);
-    ok(hr == D3D_OK ||
-       broken(hr == D3DERR_INVALIDCALL), /* Some Win9x and WinME */
-       "GetLightEnable on light %u failed with %08x\n", i + 1, hr);
+    ok(hr == D3D_OK, "GetLightEnable on light %u failed with %08x\n", i + 1, hr);
     ok(enabled, "Light %d is %s\n", i + 1, enabled ? "enabled" : "disabled");
     hr = IDirect3DDevice8_LightEnable(device, i + 1, FALSE);
     ok(hr == D3D_OK, "Disabling the additional returned %08x\n", hr);




More information about the wine-cvs mailing list