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

ole32: Always return false when asked if NULL is the current clipboard.

This commit is contained in:
Vincent Povirk 2008-07-17 17:33:48 -05:00 committed by Alexandre Julliard
parent 38c5185d2e
commit a0249babcd
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/ole32/clipboard.c
View File

@ -583,6 +583,9 @@ HRESULT WINAPI OleIsCurrentClipboard(IDataObject *pDataObject)
if (!theOleClipboard)
return E_OUTOFMEMORY;
if (pDataObject == NULL)
return S_FALSE;
return (pDataObject == theOleClipboard->pIDataObjectSrc) ? S_OK : S_FALSE;
}

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

@ -472,7 +472,7 @@ static void test_set_clipboard(void)
hr = OleIsCurrentClipboard(data2);
ok(hr == S_FALSE, "did not expect current clipboard to be data2, hr = 0x%08x\n", hr);
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);