ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: Fix a test failure in the moniker tests on Win9x. 

Also fix a crash in running the tests on Win95.
This commit is contained in:
Rob Shearman 2009-02-10 15:32:12 +00:00 committed by Alexandre Julliard
parent 1e8ae571f5
commit ad880ba057
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/ole32/tests/moniker.c
View File

@ -652,7 +652,9 @@ static void test_ROT(void)
ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT, ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT,
(IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie);
todo_wine { 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); if (hr == S_OK) IRunningObjectTable_Revoke(pROT, dwCookie);
@ -918,6 +920,7 @@ static void test_MkParseDisplayName(void)
hr = IMoniker_BindToObject(pmk, pbc, NULL, &IID_IUnknown, (LPVOID*)&object); hr = IMoniker_BindToObject(pmk, pbc, NULL, &IID_IUnknown, (LPVOID*)&object);
ok_ole_success(hr, IMoniker_BindToObject); ok_ole_success(hr, IMoniker_BindToObject);
if (SUCCEEDED(hr))
IUnknown_Release(object); IUnknown_Release(object);
IMoniker_Release(pmk); IMoniker_Release(pmk);
} }