James Hawkins : ole32: Fix two failing tests in win9x.

Alexandre Julliard julliard at winehq.org
Wed Sep 3 07:43:59 CDT 2008


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

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Tue Sep  2 22:57:54 2008 -0500

ole32: Fix two failing tests in win9x.

---

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

diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c
index b2aaa22..bdc34d9 100644
--- a/dlls/ole32/tests/compobj.c
+++ b/dlls/ole32/tests/compobj.c
@@ -244,7 +244,9 @@ static void test_CoGetClassObject(void)
     ok(pUnk == NULL, "CoGetClassObject should have changed the passed in pointer to NULL, instead of %p\n", pUnk);
 
     hr = CoGetClassObject(&CLSID_MyComputer, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, NULL);
-    ok(hr == E_INVALIDARG, "CoGetClassObject should have returned E_INVALIDARG instead of 0x%08x\n", hr);
+    ok(hr == E_INVALIDARG ||
+       broken(hr == CO_E_NOTINITIALIZED), /* win9x */
+       "CoGetClassObject should have returned E_INVALIDARG instead of 0x%08x\n", hr);
 }
 
 static ATOM register_dummy_class(void)
@@ -944,7 +946,9 @@ static void test_CoFreeUnusedLibraries(void)
 
     ok(is_module_loaded("urlmon.dll"), "urlmon.dll should be loaded\n");
 
-    ok(pUnk != NULL, "Expected a valid pointer\n");
+    ok(pUnk != NULL ||
+       broken(pUnk == NULL), /* win9x */
+       "Expected a valid pointer\n");
     if (pUnk)
         IUnknown_Release(pUnk);
 




More information about the wine-cvs mailing list