Huw Davies : ole32/tests: Fix tests on systems without IE installed.
Alexandre Julliard
julliard at winehq.org
Mon May 25 10:06:29 CDT 2009
Module: wine
Branch: master
Commit: 628a8743d271403c208c9e9cd2732e5f18fd603c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=628a8743d271403c208c9e9cd2732e5f18fd603c
Author: Huw Davies <huw at codeweavers.com>
Date: Fri May 22 14:53:21 2009 +0100
ole32/tests: Fix tests on systems without IE installed.
---
dlls/ole32/tests/compobj.c | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c
index 7363f30..d9d684d 100644
--- a/dlls/ole32/tests/compobj.c
+++ b/dlls/ole32/tests/compobj.c
@@ -253,6 +253,13 @@ static void test_CoCreateInstance(void)
OleInitialize(NULL);
hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk);
+ if(hr == REGDB_E_CLASSNOTREG)
+ {
+ skip("IE not installed so can't test CoCreateInstance\n");
+ OleUninitialize();
+ return;
+ }
+
ok_ole_success(hr, "CoCreateInstance");
if(pUnk) IUnknown_Release(pUnk);
OleUninitialize();
@@ -325,8 +332,13 @@ static void test_CoGetClassObject(void)
pUnk = (IUnknown *)0xdeadbeef;
hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk);
- ok(hr == S_OK, "CoGetClassObject should have returned S_OK instead of 0x%08x\n", hr);
- if (pUnk) IUnknown_Release(pUnk);
+ if(hr == REGDB_E_CLASSNOTREG)
+ skip("IE not installed so can't test CoGetClassObject\n");
+ else
+ {
+ ok(hr == S_OK, "CoGetClassObject should have returned S_OK instead of 0x%08x\n", hr);
+ if (pUnk) IUnknown_Release(pUnk);
+ }
SetEvent(info.stop);
WaitForSingleObject(thread, INFINITE);
@@ -1030,7 +1042,7 @@ static void test_CoFreeUnusedLibraries(void)
hr = CoCreateInstance(&CLSID_FileProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void **)&pUnk);
if (hr == REGDB_E_CLASSNOTREG)
{
- trace("IE not installed so can't run CoFreeUnusedLibraries test\n");
+ skip("IE not installed so can't run CoFreeUnusedLibraries test\n");
CoUninitialize();
return;
}
More information about the wine-cvs
mailing list