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

ole32: Don't pass a window if we're reading from the clipboard.

This commit is contained in:
Huw Davies 2009-04-16 12:09:19 +01:00 committed by Alexandre Julliard
parent 6526b570e1
commit bd9eb3b527
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/ole32/clipboard.c
View File

@ -902,7 +902,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_GetData(
/* /*
* Otherwise, get the data from the windows clipboard using GetClipboardData * Otherwise, get the data from the windows clipboard using GetClipboardData
*/ */
if ( !OpenClipboard(theOleClipboard->window)) return CLIPBRD_E_CANT_OPEN; if ( !OpenClipboard(NULL)) return CLIPBRD_E_CANT_OPEN;
h = GetClipboardData(pformatetcIn->cfFormat); h = GetClipboardData(pformatetcIn->cfFormat);
hr = dup_global_mem(h, GMEM_MOVEABLE, &hData); hr = dup_global_mem(h, GMEM_MOVEABLE, &hData);
@ -1006,7 +1006,6 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_EnumFormatEtc(
IEnumFORMATETC** enum_fmt) IEnumFORMATETC** enum_fmt)
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
ole_clipbrd *This = impl_from_IDataObject(iface);
HGLOBAL handle; HGLOBAL handle;
ole_priv_data *data = NULL; ole_priv_data *data = NULL;
@ -1015,7 +1014,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_EnumFormatEtc(
*enum_fmt = NULL; *enum_fmt = NULL;
if ( dwDirection != DATADIR_GET ) return E_NOTIMPL; if ( dwDirection != DATADIR_GET ) return E_NOTIMPL;
if ( !OpenClipboard(This->window) ) return CLIPBRD_E_CANT_OPEN; if ( !OpenClipboard(NULL) ) return CLIPBRD_E_CANT_OPEN;
handle = GetClipboardData( ole_priv_data_clipboard_format ); handle = GetClipboardData( ole_priv_data_clipboard_format );
if(handle) if(handle)