[PATCH 2/2] Fix some test failures on a clean W2K3

Paul Vriens Paul.Vriens.Wine at gmail.com
Wed Jan 13 01:25:15 CST 2010


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

diff --git a/dlls/dxdiagn/tests/provider.c b/dlls/dxdiagn/tests/provider.c
index 47732bc..0aa228b 100644
--- a/dlls/dxdiagn/tests/provider.c
+++ b/dlls/dxdiagn/tests/provider.c
@@ -32,7 +32,9 @@ static void test_Initialize(void)
 
     hr = CoCreateInstance(&CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER,
                           &IID_IDxDiagProvider, (LPVOID*)&pddp);
-    ok(hr == S_OK, "Creating a IDxDiagProvider instance failed with %x\n", hr);
+    ok(hr == S_OK ||
+       broken(hr == REGDB_E_CLASSNOTREG), /* Clean W2K3 */
+       "Creating a IDxDiagProvider instance failed with %x\n", hr);
     if (FAILED(hr))
     {
         skip("Failed to create a IDxDiagProvider instance\n");
@@ -97,7 +99,9 @@ static void test_GetRootContainer(void)
 
     hr = CoCreateInstance(&CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER,
                           &IID_IDxDiagProvider, (LPVOID*)&pddp);
-    ok(hr == S_OK, "Creating a IDxDiagProvider instance failed with %x\n", hr);
+    ok(hr == S_OK ||
+       broken(hr == REGDB_E_CLASSNOTREG), /* Clean W2K3 */
+       "Creating a IDxDiagProvider instance failed with %x\n", hr);
     if (FAILED(hr))
     {
         skip("Failed to create a IDxDiagProvider instance\n");
-- 
1.6.2.5


--------------030805090007060509050602--



More information about the wine-patches mailing list