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

ole32: Register a few more clipboard formats and make them have global scope.

This commit is contained in:
Huw Davies 2009-04-23 15:04:56 +01:00 committed by Alexandre Julliard
parent 689c510f63
commit b133e94b62
2 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dlls/ole32/clipboard.c
View File

@ -196,9 +196,17 @@ static const WCHAR clipbrd_wndclass[] = {'C','L','I','P','B','R','D','W','N','D'
static const WCHAR wine_marshal_dataobject[] = {'W','i','n','e',' ','m','a','r','s','h','a','l',' ','d','a','t','a','o','b','j','e','c','t',0}; static const WCHAR wine_marshal_dataobject[] = {'W','i','n','e',' ','m','a','r','s','h','a','l',' ','d','a','t','a','o','b','j','e','c','t',0};
static UINT dataobject_clipboard_format; UINT ownerlink_clipboard_format = 0;
static UINT ole_priv_data_clipboard_format; UINT filename_clipboard_format = 0;
static UINT embed_source_clipboard_format; UINT filenameW_clipboard_format = 0;
UINT dataobject_clipboard_format = 0;
UINT embedded_object_clipboard_format = 0;
UINT embed_source_clipboard_format = 0;
UINT custom_link_source_clipboard_format = 0;
UINT link_source_clipboard_format = 0;
UINT object_descriptor_clipboard_format = 0;
UINT link_source_descriptor_clipboard_format = 0;
UINT ole_private_data_clipboard_format = 0;
static inline char *dump_fmtetc(FORMATETC *fmt) static inline char *dump_fmtetc(FORMATETC *fmt)
{ {
@ -952,7 +960,7 @@ static HRESULT get_priv_data(ole_priv_data **data)
*data = NULL; *data = NULL;
handle = GetClipboardData( ole_priv_data_clipboard_format ); handle = GetClipboardData( ole_private_data_clipboard_format );
if(handle) if(handle)
{ {
ole_priv_data *src = GlobalLock(handle); ole_priv_data *src = GlobalLock(handle);
@ -1358,16 +1366,30 @@ static snapshot *snapshot_construct(DWORD seq_no)
*/ */
static void register_clipboard_formats(void) static void register_clipboard_formats(void)
{ {
static const WCHAR DataObjectW[] = { 'D','a','t','a','O','b','j','e','c','t',0 }; static const WCHAR OwnerLink[] = {'O','w','n','e','r','L','i','n','k',0};
static const WCHAR OlePrivateDataW[] = { 'O','l','e',' ','P','r','i','v','a','t','e',' ','D','a','t','a',0 }; static const WCHAR FileName[] = {'F','i','l','e','N','a','m','e',0};
static const WCHAR EmbedSourceW[] = { 'E','m','b','e','d',' ','S','o','u','r','c','e',0 }; static const WCHAR FileNameW[] = {'F','i','l','e','N','a','m','e','W',0};
static const WCHAR DataObject[] = {'D','a','t','a','O','b','j','e','c','t',0};
static const WCHAR EmbeddedObject[] = {'E','m','b','e','d','d','e','d',' ','O','b','j','e','c','t',0};
static const WCHAR EmbedSource[] = {'E','m','b','e','d',' ','S','o','u','r','c','e',0};
static const WCHAR CustomLinkSource[] = {'C','u','s','t','o','m',' ','L','i','n','k',' ','S','o','u','r','c','e',0};
static const WCHAR LinkSource[] = {'L','i','n','k',' ','S','o','u','r','c','e',0};
static const WCHAR ObjectDescriptor[] = {'O','b','j','e','c','t',' ','D','e','s','c','r','i','p','t','o','r',0};
static const WCHAR LinkSourceDescriptor[] = {'L','i','n','k',' ','S','o','u','r','c','e',' ',
'D','e','s','c','r','i','p','t','o','r',0};
static const WCHAR OlePrivateData[] = {'O','l','e',' ','P','r','i','v','a','t','e',' ','D','a','t','a',0};
if(!dataobject_clipboard_format) ownerlink_clipboard_format = RegisterClipboardFormatW(OwnerLink);
dataobject_clipboard_format = RegisterClipboardFormatW(DataObjectW); filename_clipboard_format = RegisterClipboardFormatW(FileName);
if(!ole_priv_data_clipboard_format) filenameW_clipboard_format = RegisterClipboardFormatW(FileNameW);
ole_priv_data_clipboard_format = RegisterClipboardFormatW(OlePrivateDataW); dataobject_clipboard_format = RegisterClipboardFormatW(DataObject);
if(!embed_source_clipboard_format) embedded_object_clipboard_format = RegisterClipboardFormatW(EmbeddedObject);
embed_source_clipboard_format = RegisterClipboardFormatW(EmbedSourceW); embed_source_clipboard_format = RegisterClipboardFormatW(EmbedSource);
custom_link_source_clipboard_format = RegisterClipboardFormatW(CustomLinkSource);
link_source_clipboard_format = RegisterClipboardFormatW(LinkSource);
object_descriptor_clipboard_format = RegisterClipboardFormatW(ObjectDescriptor);
link_source_descriptor_clipboard_format = RegisterClipboardFormatW(LinkSourceDescriptor);
ole_private_data_clipboard_format = RegisterClipboardFormatW(OlePrivateData);
} }
/*********************************************************************** /***********************************************************************
@ -1524,7 +1546,7 @@ static HRESULT set_clipboard_formats(ole_clipbrd *clipbrd, IDataObject *data)
td_offs_to_ptr(clipbrd->cached_enum, (DWORD_PTR)clipbrd->cached_enum->entries[idx].fmtetc.ptd); td_offs_to_ptr(clipbrd->cached_enum, (DWORD_PTR)clipbrd->cached_enum->entries[idx].fmtetc.ptd);
GlobalUnlock(priv_data_handle); GlobalUnlock(priv_data_handle);
SetClipboardData(ole_priv_data_clipboard_format, priv_data_handle); SetClipboardData(ole_private_data_clipboard_format, priv_data_handle);
return S_OK; return S_OK;
} }

12
dlls/ole32/compobj_private.h
View File

@ -319,4 +319,16 @@ extern HRESULT WINAPI OLE32_DllUnregisterServer(void) DECLSPEC_HIDDEN;
HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate); HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate);
void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface); void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface);
extern UINT ownerlink_clipboard_format;
extern UINT filename_clipboard_format;
extern UINT filenameW_clipboard_format;
extern UINT dataobject_clipboard_format;
extern UINT embedded_object_clipboard_format;
extern UINT embed_source_clipboard_format;
extern UINT custom_link_source_clipboard_format;
extern UINT link_source_clipboard_format;
extern UINT object_descriptor_clipboard_format;
extern UINT link_source_descriptor_clipboard_format;
extern UINT ole_private_data_clipboard_format;
#endif /* __WINE_OLE_COMPOBJ_H */ #endif /* __WINE_OLE_COMPOBJ_H */