Rob Shearman : ole32: Fix a test failure in the moniker tests on Win9x.
Alexandre Julliard
julliard at winehq.org
Wed Feb 11 09:24:17 CST 2009
Module: wine
Branch: master
Commit: ad880ba057853ff5b48ffb4402327ef4088fd2e0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad880ba057853ff5b48ffb4402327ef4088fd2e0
Author: Rob Shearman <robertshearman at gmail.com>
Date: Tue Feb 10 15:32:12 2009 +0000
ole32: Fix a test failure in the moniker tests on Win9x.
Also fix a crash in running the tests on Win95.
---
dlls/ole32/tests/moniker.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c
index 08ef2ee..3501aa7 100644
--- a/dlls/ole32/tests/moniker.c
+++ b/dlls/ole32/tests/moniker.c
@@ -652,7 +652,9 @@ static void test_ROT(void)
ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT,
(IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie);
todo_wine {
- ok(hr == CO_E_WRONG_SERVER_IDENTITY, "IRunningObjectTable_Register should have returned CO_E_WRONG_SERVER_IDENTITY instead of 0x%08x\n", hr);
+ ok(hr == CO_E_WRONG_SERVER_IDENTITY ||
+ broken(hr == S_OK) /* Win9x */,
+ "IRunningObjectTable_Register should have returned CO_E_WRONG_SERVER_IDENTITY instead of 0x%08x\n", hr);
}
if (hr == S_OK) IRunningObjectTable_Revoke(pROT, dwCookie);
@@ -918,7 +920,8 @@ static void test_MkParseDisplayName(void)
hr = IMoniker_BindToObject(pmk, pbc, NULL, &IID_IUnknown, (LPVOID*)&object);
ok_ole_success(hr, IMoniker_BindToObject);
- IUnknown_Release(object);
+ if (SUCCEEDED(hr))
+ IUnknown_Release(object);
IMoniker_Release(pmk);
}
IBindCtx_Release(pbc);
More information about the wine-cvs
mailing list