Commit 833c3425 authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard

ole32: Fix a few failing tests in win2k.

parent 7d22101e
...@@ -782,10 +782,14 @@ static void test_OleCreate(IStorage *pStorage) ...@@ -782,10 +782,14 @@ static void test_OleCreate(IStorage *pStorage)
expected_method_list = methods_olerender_format; expected_method_list = methods_olerender_format;
trace("OleCreate with OLERENDER_FORMAT:\n"); trace("OleCreate with OLERENDER_FORMAT:\n");
hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_FORMAT, &formatetc, (IOleClientSite *)0xdeadbeef, pStorage, (void **)&pObject); 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) if (pObject)
{
IOleObject_Release(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; expected_method_list = methods_olerender_asis;
trace("OleCreate with OLERENDER_ASIS:\n"); trace("OleCreate with OLERENDER_ASIS:\n");
...@@ -839,10 +843,15 @@ static void test_OleLoad(IStorage *pStorage) ...@@ -839,10 +843,15 @@ static void test_OleLoad(IStorage *pStorage)
expected_method_list = methods_oleload; expected_method_list = methods_oleload;
trace("OleLoad:\n"); trace("OleLoad:\n");
hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); 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"); ok_ole_success(hr, "OleLoad");
if (pObject) if (pObject)
{
IOleObject_Release(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) static BOOL STDMETHODCALLTYPE draw_continue(ULONG_PTR param)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment