James Hawkins : ole32: Fix a few tests that fail in win2k.

[Alexandre Julliard]

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

Author: James Hawkins 
Date:   Wed Apr 16 16:39:45 2008 -0500

ole32: Fix a few tests that fail in win2k.

---

dlls/ole32/tests/marshal.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c
index acea854..a1b9c15 100644
--- a/dlls/ole32/tests/marshal.c
+++ b/dlls/ole32/tests/marshal.c
@@ -2550,8 +2550,9 @@ static void test_local_server(void)
     hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER, NULL,
         &IID_IClassFactory, (LPVOID*)&cf);
     ok(hr == CO_E_SERVER_STOPPING || /* NT */
+       hr == REGDB_E_CLASSNOTREG || /* win2k */
        hr == S_OK /* Win9x */,
-        "CoGetClassObject should have returned CO_E_SERVER_STOPPING instead of 0x%08x\n", hr);
+        "CoGetClassObject should have returned CO_E_SERVER_STOPPING or REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr);

hr = CoRevokeClassObject(cookie);
     ok_ole_success(hr, CoRevokeClassObject);
@@ -2594,8 +2595,9 @@ static DWORD CALLBACK get_global_interface_proc(LPVOID pv)
    IClassFactory *cf;

hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(params->git, params->cookie, &IID_IClassFactory, (void **)&cf);
-	ok(hr == CO_E_NOTINITIALIZED,
-		"IGlobalInterfaceTable_GetInterfaceFromGlobal should have failed with error CO_E_NOTINITIALIZED instead of 0x%08x\n",
+	ok(hr == CO_E_NOTINITIALIZED ||
+		hr == E_UNEXPECTED, /* win2k */
+		"IGlobalInterfaceTable_GetInterfaceFromGlobal should have failed with error CO_E_NOTINITIALIZED or E_UNEXPECTED instead of 0x%08x\n",
    	hr);

CoInitialize(NULL);