ole32: Always return false when asked if NULL is the current clipboard.
This commit is contained in:
parent
38c5185d2e
commit
a0249babcd
|
@ -583,6 +583,9 @@ HRESULT WINAPI OleIsCurrentClipboard(IDataObject *pDataObject)
|
||||||
if (!theOleClipboard)
|
if (!theOleClipboard)
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
|
|
||||||
|
if (pDataObject == NULL)
|
||||||
|
return S_FALSE;
|
||||||
|
|
||||||
return (pDataObject == theOleClipboard->pIDataObjectSrc) ? S_OK : S_FALSE;
|
return (pDataObject == theOleClipboard->pIDataObjectSrc) ? S_OK : S_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -472,7 +472,7 @@ static void test_set_clipboard(void)
|
||||||
hr = OleIsCurrentClipboard(data2);
|
hr = OleIsCurrentClipboard(data2);
|
||||||
ok(hr == S_FALSE, "did not expect current clipboard to be data2, hr = 0x%08x\n", hr);
|
ok(hr == S_FALSE, "did not expect current clipboard to be data2, hr = 0x%08x\n", hr);
|
||||||
hr = OleIsCurrentClipboard(NULL);
|
hr = OleIsCurrentClipboard(NULL);
|
||||||
todo_wine ok(hr == S_FALSE, "expect S_FALSE, hr = 0x%08x\n", hr);
|
ok(hr == S_FALSE, "expect S_FALSE, hr = 0x%08x\n", hr);
|
||||||
|
|
||||||
ok(OleSetClipboard(NULL) == S_OK, "failed to clear clipboard, hr = 0x%08x\n", hr);
|
ok(OleSetClipboard(NULL) == S_OK, "failed to clear clipboard, hr = 0x%08x\n", hr);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue