From 833c342555801892f3c7a00266774c4e3c9abc3d Mon Sep 17 00:00:00 2001 From: James Hawkins Date: Mon, 7 Jul 2008 23:54:02 -0500 Subject: [PATCH] ole32: Fix a few failing tests in win2k. --- dlls/ole32/tests/ole2.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 8d72b153317..5ca600945cc 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -782,10 +782,14 @@ static void test_OleCreate(IStorage *pStorage) expected_method_list = methods_olerender_format; trace("OleCreate with OLERENDER_FORMAT:\n"); hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_FORMAT, &formatetc, (IOleClientSite *)0xdeadbeef, pStorage, (void **)&pObject); - ok_ole_success(hr, "OleCreate"); + ok(hr == S_OK || + broken(hr == E_INVALIDARG), /* win2k */ + "OleCreate failed with error 0x%08x\n", hr); if (pObject) + { IOleObject_Release(pObject); - ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + } expected_method_list = methods_olerender_asis; trace("OleCreate with OLERENDER_ASIS:\n"); @@ -839,10 +843,15 @@ static void test_OleLoad(IStorage *pStorage) expected_method_list = methods_oleload; trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); + ok(hr == S_OK || + broken(hr == E_INVALIDARG), /* win2k */ + "OleLoad failed with error 0x%08x\n", hr); ok_ole_success(hr, "OleLoad"); if (pObject) + { IOleObject_Release(pObject); - ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + } } static BOOL STDMETHODCALLTYPE draw_continue(ULONG_PTR param) -- 2.11.4.GIT