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

ole32: Fix the OLE clipboard test to call OleInitialize before performing the tests to fix test failures on Windows.

This commit is contained in:
Rob Shearman 2007-01-07 12:16:25 +00:00 committed by Alexandre Julliard
parent a45a2e37f9
commit b624e8125c
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/ole32/tests/clipboard.c
View File

@ -119,8 +119,10 @@ static HRESULT WINAPI EnumFormatImpl_Skip(IEnumFORMATETC *iface, ULONG celt)
static HRESULT WINAPI EnumFormatImpl_Reset(IEnumFORMATETC *iface)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;
EnumFormatImpl *This = (EnumFormatImpl*)iface;
This->cur = 0;
return S_OK;
}
static HRESULT WINAPI EnumFormatImpl_Clone(IEnumFORMATETC *iface, IEnumFORMATETC **ppenum)
@ -328,6 +330,19 @@ static void test_set_clipboard(void)
if(FAILED(hr))
return;
hr = OleSetClipboard(data1);
todo_wine
ok(hr == CO_E_NOTINITIALIZED, "OleSetClipboard should have failed with CO_E_NOTINITIALIZED instead of 0x%08x\n", hr);
CoInitialize(NULL);
hr = OleSetClipboard(data1);
todo_wine
ok(hr == CO_E_NOTINITIALIZED, "OleSetClipboard should have failed with CO_E_NOTINITIALIZED instead of 0x%08x\n", hr);
CoUninitialize();
hr = OleInitialize(NULL);
ok(hr == S_OK, "OleInitialize failed with error 0x%08x\n", hr);
hr = OleSetClipboard(data1);
ok(hr == S_OK, "failed to set clipboard to data1, hr = 0x%08x\n", hr);
hr = OleIsCurrentClipboard(data1);
@ -355,6 +370,8 @@ static void test_set_clipboard(void)
ok(ref == 0, "expected data1 ref=0, got %d\n", ref);
ref = IDataObject_Release(data2);
ok(ref == 0, "expected data2 ref=0, got %d\n", ref);
OleUninitialize();
}