April 2009 - Wine-commits - list.winehq.org

Huw Davies : ole32/tests: Tests that show the consumer data object isn' t a singleton.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: f8a1b7e5a5c375af628cb622c0f05c283b24dc89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a1b7e5a5c375af628cb622c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 12:14:19 2009 +0100 ole32/tests: Tests that show the consumer data object isn't a singleton. --- dlls/ole32/tests/clipboard.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index fc55d38..aadc1ec 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -862,8 +862,59 @@ static void test_set_clipboard(void) OleUninitialize(); } +static void test_consumer_refs(void) +{ + HRESULT hr; + IDataObject *src, *get1, *get2, *get3; + LONG refs; + + OleInitialize(NULL); + + hr = DataObjectImpl_CreateText("data1", &src); + ok(hr == S_OK, "got %08x\n", hr); + + hr = OleSetClipboard(src); + ok(hr == S_OK, "got %08x\n", hr); + + hr = OleGetClipboard(&get1); + ok(hr == S_OK, "got %08x\n", hr); + + hr = OleGetClipboard(&get2); + ok(hr == S_OK, "got %08x\n", hr); + + ok(get1 == get2, "data objects differ\n"); + refs = IDataObject_Release(get2); +todo_wine + ok(refs == 1, "got %d\n", refs); + + OleFlushClipboard(); + + hr = OleGetClipboard(&get2); + ok(hr == S_OK, "got %08x\n", hr); + +todo_wine + ok(get1 != get2, "data objects match\n"); + + OleSetClipboard(NULL); + + hr = OleGetClipboard(&get3); + ok(hr == S_OK, "got %08x\n", hr); + +todo_wine { + ok(get1 != get3, "data objects match\n"); + ok(get2 != get3, "data objects match\n"); +} + + IDataObject_Release(get3); + IDataObject_Release(get2); + IDataObject_Release(get1); + IDataObject_Release(src); + + OleUninitialize(); +} START_TEST(clipboard) { test_set_clipboard(); + test_consumer_refs(); }

1 0

Huw Davies : ole32: Store a cached version of the local data object' s enumeration.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: e58a9db129f283b3b7e41d79223272cb7057f735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58a9db129f283b3b7e41d792… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 11:49:11 2009 +0100 ole32: Store a cached version of the local data object's enumeration. --- dlls/ole32/clipboard.c | 100 ++++++++++++++++++++++++++++-------------------- 1 files changed, 58 insertions(+), 42 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 3926537..bfb9c72 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -84,21 +84,55 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #define HANDLE_ERROR(err) do { hr = err; TRACE("(HRESULT=%x)\n", (HRESULT)err); goto CLEANUP; } while (0) +/* Structure of 'Ole Private Data' clipboard format */ +typedef struct +{ + FORMATETC fmtetc; + DWORD first_use; /* Has this cf been added to the list already */ + DWORD unk[2]; +} ole_priv_data_entry; + +typedef struct +{ + DWORD unk1; + DWORD size; /* in bytes of the entire structure */ + DWORD unk2; + DWORD count; /* no. of format entries */ + DWORD unk3[2]; + ole_priv_data_entry entries[1]; /* array of size count */ + /* then follows any DVTARGETDEVICE structures referenced in the FORMATETCs */ +} ole_priv_data; + +/* Create an empty data structure. The only thing that really matters + here is setting count and size members. This is used by the enumerator as a + convenience when there's an empty list. */ +static HRESULT create_empty_priv_data(ole_priv_data **data) +{ + ole_priv_data *ptr; + + *data = NULL; + ptr = HeapAlloc(GetProcessHeap(), 0, sizeof(*ptr)); + if(!ptr) return E_OUTOFMEMORY; + ptr->size = sizeof(*ptr); + ptr->count = 0; + *data = ptr; + return S_OK; +} + /**************************************************************************** * ole_clipbrd */ -struct ole_clipbrd +typedef struct ole_clipbrd { const IDataObjectVtbl* lpvtbl; /* Exposed IDataObject vtable */ LONG ref; HWND hWndClipboard; /* Hidden clipboard window */ - IDataObject* pIDataObjectSrc; /* Source object passed to OleSetClipboard */ -}; - -typedef struct ole_clipbrd ole_clipbrd; + IDataObject *pIDataObjectSrc; /* Source object passed to OleSetClipboard */ + ole_priv_data *cached_enum; /* Cached result from the enumeration of src data object */ +} ole_clipbrd; static inline ole_clipbrd *impl_from_IDataObject(IDataObject *iface) { @@ -128,41 +162,6 @@ static UINT dataobject_clipboard_format; static UINT ole_priv_data_clipboard_format; static UINT embed_source_clipboard_format; -/* Structure of 'Ole Private Data' clipboard format */ -typedef struct -{ - FORMATETC fmtetc; - DWORD first_use; /* Has this cf been added to the list already */ - DWORD unk[2]; -} ole_priv_data_entry; - -typedef struct -{ - DWORD unk1; - DWORD size; /* in bytes of the entire structure */ - DWORD unk2; - DWORD count; /* no. of format entries */ - DWORD unk3[2]; - ole_priv_data_entry entries[1]; /* array of size count */ - /* then follows any DVTARGETDEVICE structures referenced in the FORMATETCs */ -} ole_priv_data; - -/* Create an empty data structure. The only thing that really matters - here is setting count and size members. This is used by the enumerator as a - convenience when there's an empty list. */ -static HRESULT create_empty_priv_data(ole_priv_data **data) -{ - ole_priv_data *ptr; - - *data = NULL; - ptr = HeapAlloc(GetProcessHeap(), 0, sizeof(*ptr)); - if(!ptr) return E_OUTOFMEMORY; - ptr->size = sizeof(*ptr); - ptr->count = 0; - *data = ptr; - return S_OK; -} - /*---------------------------------------------------------------------* * Implementation of the internal IEnumFORMATETC interface returned by * the OLE clipboard's IDataObject. @@ -690,6 +689,8 @@ static LRESULT CALLBACK OLEClipbrd_WndProc { IDataObject_Release(theOleClipboard->pIDataObjectSrc); theOleClipboard->pIDataObjectSrc = NULL; + HeapFree(GetProcessHeap(), 0, theOleClipboard->cached_enum); + theOleClipboard->cached_enum = NULL; } break; } @@ -1104,6 +1105,7 @@ static ole_clipbrd* OLEClipbrd_Construct(void) This->hWndClipboard = NULL; This->pIDataObjectSrc = NULL; + This->cached_enum = NULL; theOleClipboard = This; return This; @@ -1228,7 +1230,7 @@ static inline BOOL is_format_in_list(ole_priv_data_entry *entries, DWORD num, UI * TODO: We need to additionally handle TYMED_IStorage and * TYMED_IStream data by copying into global memory. */ -static HRESULT set_clipboard_formats(IDataObject *data) +static HRESULT set_clipboard_formats(ole_clipbrd *clipbrd, IDataObject *data) { HRESULT hr; FORMATETC fmt; @@ -1301,6 +1303,14 @@ static HRESULT set_clipboard_formats(IDataObject *data) IEnumFORMATETC_Release(enum_fmt); + /* Cache the list and fixup any target device offsets to ptrs */ + clipbrd->cached_enum = HeapAlloc(GetProcessHeap(), 0, needed); + memcpy(clipbrd->cached_enum, priv_data, needed); + for(idx = 0; idx < clipbrd->cached_enum->count; idx++) + if(clipbrd->cached_enum->entries[idx].fmtetc.ptd) + clipbrd->cached_enum->entries[idx].fmtetc.ptd = + (DVTARGETDEVICE *)((char*)clipbrd->cached_enum + (DWORD)clipbrd->cached_enum->entries[idx].fmtetc.ptd); + GlobalUnlock(priv_data_handle); SetClipboardData(ole_priv_data_clipboard_format, priv_data_handle); @@ -1393,6 +1403,8 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) { IDataObject_Release(theOleClipboard->pIDataObjectSrc); theOleClipboard->pIDataObjectSrc = NULL; + HeapFree(GetProcessHeap(), 0, theOleClipboard->cached_enum); + theOleClipboard->cached_enum = NULL; } /* A NULL value indicates that the clipboard should be emptied. */ @@ -1400,7 +1412,7 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) if ( pDataObj ) { IDataObject_AddRef(theOleClipboard->pIDataObjectSrc); - hr = set_clipboard_formats(pDataObj); + hr = set_clipboard_formats(theOleClipboard, pDataObj); if(FAILED(hr)) goto end; } @@ -1416,6 +1428,8 @@ end: { IDataObject_Release(theOleClipboard->pIDataObjectSrc); theOleClipboard->pIDataObjectSrc = NULL; + HeapFree(GetProcessHeap(), 0, theOleClipboard->cached_enum); + theOleClipboard->cached_enum = NULL; } } @@ -1506,6 +1520,8 @@ HRESULT WINAPI OleFlushClipboard(void) IDataObject_Release(theOleClipboard->pIDataObjectSrc); theOleClipboard->pIDataObjectSrc = NULL; + HeapFree(GetProcessHeap(), 0, theOleClipboard->cached_enum); + theOleClipboard->cached_enum = NULL; end:

1 0

Huw Davies : ole32: Change helper function to return the matching entry.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: b958dfdc4769515c0ef56c401430dd3e3980aabf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b958dfdc4769515c0ef56c401… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 11:51:45 2009 +0100 ole32: Change helper function to return the matching entry. --- dlls/ole32/clipboard.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index bfb9c72..5cede9d 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -528,6 +528,21 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt) return hr; } +/************************************************************************ + * find_format_in_list + * + * Returns the first entry that matches the provided clipboard format. + */ +static inline ole_priv_data_entry *find_format_in_list(ole_priv_data_entry *entries, DWORD num, UINT cf) +{ + DWORD i; + for(i = 0; i < num; i++) + if(entries[i].fmtetc.cfFormat == cf) + return &entries[i]; + + return NULL; +} + /*********************************************************************** * render_format * @@ -1211,16 +1226,6 @@ static HWND OLEClipbrd_CreateWindow(void) return hwnd; } -static inline BOOL is_format_in_list(ole_priv_data_entry *entries, DWORD num, UINT cf) -{ - DWORD i; - for(i = 0; i < num; i++) - if(entries[i].fmtetc.cfFormat == cf) - return TRUE; - - return FALSE; -} - /********************************************************************* * set_clipboard_formats * @@ -1294,7 +1299,7 @@ static HRESULT set_clipboard_formats(ole_clipbrd *clipbrd, IDataObject *data) CoTaskMemFree(fmt.ptd); } - priv_data->entries[idx].first_use = !is_format_in_list(priv_data->entries, idx, fmt.cfFormat); + priv_data->entries[idx].first_use = !find_format_in_list(priv_data->entries, idx, fmt.cfFormat); priv_data->entries[idx].unk[0] = 0; priv_data->entries[idx].unk[1] = 0;

1 0

Huw Davies : ole32: Rewrite the clipboard window' s wndproc to use the cached enum data.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 5e557d83ca9e59e7a28c04cee66a44b58394e81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e557d83ca9e59e7a28c04cee… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 12:02:53 2009 +0100 ole32: Rewrite the clipboard window's wndproc to use the cached enum data. --- dlls/ole32/clipboard.c | 154 +++++++++++++----------------------------------- 1 files changed, 41 insertions(+), 113 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 5cede9d..f52496f 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -103,9 +103,13 @@ typedef struct /* then follows any DVTARGETDEVICE structures referenced in the FORMATETCs */ } ole_priv_data; -/* Create an empty data structure. The only thing that really matters - here is setting count and size members. This is used by the enumerator as a - convenience when there's an empty list. */ +/***************************************************************************** + * create_empty_priv_data + * + * Create an empty data structure. The only thing that really matters + * here is setting count and size members. This is used by the enumerator as a + * convenience when there's an empty list. + */ static HRESULT create_empty_priv_data(ole_priv_data **data) { ole_priv_data *ptr; @@ -592,138 +596,62 @@ end: /*********************************************************************** - * OLEClipbrd_WndProc(HWND, unsigned, WORD, LONG) - * Processes messages sent to the OLE clipboard window. - * Note that we will intercept messages in our WndProc only when data - * has been placed in the clipboard via OleSetClipboard(). - * i.e. Only when OLE owns the windows clipboard. + * clipbrd_wndproc */ -static LRESULT CALLBACK OLEClipbrd_WndProc - (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK clipbrd_wndproc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { - switch (message) - { - /* - * WM_RENDERFORMAT - * We receive this message to allow us to handle delayed rendering of - * a specific clipboard format when an application requests data in - * that format by calling GetClipboardData. - * (Recall that in OleSetClipboard, we used SetClipboardData to - * make all HGLOBAL formats supported by the source IDataObject - * available using delayed rendering) - * On receiving this message we must actually render the data in the - * specified format and place it on the clipboard by calling the - * SetClipboardData function. - */ + ole_clipbrd *clipbrd = theOleClipboard; + + switch (message) + { case WM_RENDERFORMAT: { - FORMATETC rgelt; - - ZeroMemory( &rgelt, sizeof(FORMATETC)); + UINT cf = wparam; + ole_priv_data_entry *entry; - /* - * Initialize FORMATETC to a Windows clipboard friendly format - */ - rgelt.cfFormat = (UINT) wParam; - rgelt.dwAspect = DVASPECT_CONTENT; - rgelt.lindex = -1; - rgelt.tymed = TYMED_HGLOBAL; + TRACE("(): WM_RENDERFORMAT(cfFormat=%x)\n", cf); + entry = find_format_in_list(clipbrd->cached_enum->entries, clipbrd->cached_enum->count, cf); - TRACE("(): WM_RENDERFORMAT(cfFormat=%d)\n", rgelt.cfFormat); + if(entry) + render_format(clipbrd->pIDataObjectSrc, &entry->fmtetc); - /* - * Render the clipboard data. - * (We must have a source data object or we wouldn't be in this WndProc) - */ - render_format( (IDataObject*)&(theOleClipboard->lpvtbl), &rgelt ); - - break; + break; } - /* - * WM_RENDERALLFORMATS - * Sent before the clipboard owner window is destroyed. - * We should receive this message only when OleUninitialize is called - * while we have an IDataObject in the clipboard. - * For the content of the clipboard to remain available to other - * applications, we must render data in all the formats the source IDataObject - * is capable of generating, and place the data on the clipboard by calling - * SetClipboardData. - */ case WM_RENDERALLFORMATS: { - IEnumFORMATETC* penumFormatetc = NULL; - FORMATETC rgelt; - - TRACE("(): WM_RENDERALLFORMATS\n"); + DWORD i; + ole_priv_data_entry *entries = clipbrd->cached_enum->entries; - /* - * Render all HGLOBAL formats supported by the source into - * the windows clipboard. - */ - if ( FAILED( IDataObject_EnumFormatEtc( (IDataObject*)&(theOleClipboard->lpvtbl), - DATADIR_GET, &penumFormatetc) ) ) - { - WARN("(): WM_RENDERALLFORMATS failed to retrieve EnumFormatEtc!\n"); - return 0; - } + TRACE("(): WM_RENDERALLFORMATS\n"); - while ( S_OK == IEnumFORMATETC_Next(penumFormatetc, 1, &rgelt, NULL) ) - { - if ( rgelt.tymed == TYMED_HGLOBAL ) + for(i = 0; i < clipbrd->cached_enum->count; i++) { - /* - * Render the clipboard data. - */ - if ( FAILED(render_format( (IDataObject*)&(theOleClipboard->lpvtbl), &rgelt )) ) - continue; - - TRACE("(): WM_RENDERALLFORMATS(cfFormat=%d)\n", rgelt.cfFormat); + if(entries[i].first_use) + render_format(clipbrd->pIDataObjectSrc, &entries[i].fmtetc); } - } - - IEnumFORMATETC_Release(penumFormatetc); - - break; + break; } - /* - * WM_DESTROYCLIPBOARD - * This is sent by EmptyClipboard before the clipboard is emptied. - * We should release any IDataObject we are holding onto when we receive - * this message, since it indicates that the OLE clipboard should be empty - * from this point on. - */ case WM_DESTROYCLIPBOARD: { - TRACE("(): WM_DESTROYCLIPBOARD\n"); - /* - * Release the data object we are holding on to - */ - if ( theOleClipboard->pIDataObjectSrc ) - { - IDataObject_Release(theOleClipboard->pIDataObjectSrc); - theOleClipboard->pIDataObjectSrc = NULL; - HeapFree(GetProcessHeap(), 0, theOleClipboard->cached_enum); - theOleClipboard->cached_enum = NULL; - } - break; + TRACE("(): WM_DESTROYCLIPBOARD\n"); + + if ( clipbrd->pIDataObjectSrc ) + { + IDataObject_Release(clipbrd->pIDataObjectSrc); + clipbrd->pIDataObjectSrc = NULL; + HeapFree(GetProcessHeap(), 0, clipbrd->cached_enum); + clipbrd->cached_enum = NULL; + } + break; } -/* - case WM_ASKCBFORMATNAME: - case WM_CHANGECBCHAIN: - case WM_DRAWCLIPBOARD: - case WM_SIZECLIPBOARD: - case WM_HSCROLLCLIPBOARD: - case WM_VSCROLLCLIPBOARD: - case WM_PAINTCLIPBOARD: -*/ default: - return DefWindowProcA(hWnd, message, wParam, lParam); - } + return DefWindowProcA(hwnd, message, wparam, lparam); + } - return 0; + return 0; } @@ -1196,7 +1124,7 @@ static HWND OLEClipbrd_CreateWindow(void) * We don't bother doing this since the FindClassByAtom code * would have to be changed to deal with this idiosyncrasy. */ wcex.style = CS_GLOBALCLASS; - wcex.lpfnWndProc = OLEClipbrd_WndProc; + wcex.lpfnWndProc = clipbrd_wndproc; wcex.hInstance = 0; wcex.lpszClassName = OLEClipbrd_WNDCLASS;

1 0

Huw Davies : ole32: Add support for rendering stream data to the clipboard.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 1e8727aacf891d8b229adc7a3ec40c88d733a786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8727aacf891d8b229adc7a3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 12:04:56 2009 +0100 ole32: Add support for rendering stream data to the clipboard. --- dlls/ole32/clipboard.c | 116 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 97 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index f52496f..2152bbe 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -547,16 +547,96 @@ static inline ole_priv_data_entry *find_format_in_list(ole_priv_data_entry *entr return NULL; } +/*************************************************************************** + * get_data_from_stream + * + * Returns stream data in an HGLOBAL. + */ +static HRESULT get_data_from_stream(IDataObject *data, FORMATETC *fmt, HGLOBAL *mem) +{ + HGLOBAL h; + IStream *stm = NULL; + HRESULT hr; + FORMATETC stm_fmt; + STGMEDIUM med; + + *mem = NULL; + + h = GlobalAlloc( GMEM_DDESHARE|GMEM_MOVEABLE, 0 ); + if(!h) return E_OUTOFMEMORY; + + hr = CreateStreamOnHGlobal(h, FALSE, &stm); + if(FAILED(hr)) goto error; + + stm_fmt = *fmt; + med.tymed = stm_fmt.tymed = TYMED_ISTREAM; + med.u.pstm = stm; + med.pUnkForRelease = NULL; + + hr = IDataObject_GetDataHere(data, &stm_fmt, &med); + if(FAILED(hr)) + { + LARGE_INTEGER offs; + ULARGE_INTEGER pos; + + med.u.pstm = NULL; + hr = IDataObject_GetData(data, &stm_fmt, &med); + if(FAILED(hr)) goto error; + + offs.QuadPart = 0; + IStream_Seek(med.u.pstm, offs, STREAM_SEEK_CUR, &pos); + IStream_Seek(med.u.pstm, offs, STREAM_SEEK_SET, NULL); + hr = IStream_CopyTo(med.u.pstm, stm, pos, NULL, NULL); + ReleaseStgMedium(&med); + if(FAILED(hr)) goto error; + } + *mem = h; + IStream_Release(stm); + return S_OK; + +error: + if(stm) IStream_Release(stm); + GlobalFree(h); + return hr; +} + +/*************************************************************************** + * get_data_from_global + * + * Returns global data in an HGLOBAL. + */ +static HRESULT get_data_from_global(IDataObject *data, FORMATETC *fmt, HGLOBAL *mem) +{ + HGLOBAL h; + HRESULT hr; + FORMATETC mem_fmt; + STGMEDIUM med; + + *mem = NULL; + + mem_fmt = *fmt; + mem_fmt.tymed = TYMED_HGLOBAL; + + hr = IDataObject_GetData(data, &mem_fmt, &med); + if(FAILED(hr)) return hr; + + hr = dup_global_mem(med.u.hGlobal, &h); + + if(SUCCEEDED(hr)) *mem = h; + + ReleaseStgMedium(&med); + + return hr; +} + /*********************************************************************** * render_format * * Render the clipboard data. Note that this call will delegate to the * source data object. - * Note: This function assumes it is passed an HGLOBAL format to render. */ static HRESULT render_format(IDataObject *data, LPFORMATETC fmt) { - STGMEDIUM std; HGLOBAL clip_data = NULL; HRESULT hr; @@ -566,35 +646,33 @@ static HRESULT render_format(IDataObject *data, LPFORMATETC fmt) return render_embed_source_hack(data, fmt); } - if (FAILED(hr = IDataObject_GetData(data, fmt, &std))) + if(fmt->tymed & TYMED_ISTREAM) { - WARN("() : IDataObject_GetData failed to render clipboard data! (%x)\n", hr); - return hr; + hr = get_data_from_stream(data, fmt, &clip_data); } - - if(std.tymed != TYMED_HGLOBAL) + else if(fmt->tymed & TYMED_HGLOBAL) { - FIXME("got tymed %x\n", std.tymed); + hr = get_data_from_global(data, fmt, &clip_data); + } + else + { + FIXME("Unhandled tymed %x\n", fmt->tymed); hr = DV_E_FORMATETC; - goto end; } - hr = dup_global_mem(std.u.hGlobal, &clip_data); - if(FAILED(hr)) goto end; - - if ( !SetClipboardData( fmt->cfFormat, clip_data ) ) + if(SUCCEEDED(hr)) { - WARN("() : Failed to set rendered clipboard data into clipboard!\n"); - GlobalFree(clip_data); - hr = CLIPBRD_E_CANT_SET; + if ( !SetClipboardData(fmt->cfFormat, clip_data) ) + { + WARN("() : Failed to set rendered clipboard data into clipboard!\n"); + GlobalFree(clip_data); + hr = CLIPBRD_E_CANT_SET; + } } -end: - ReleaseStgMedium(&std); return hr; } - /*********************************************************************** * clipbrd_wndproc */

1 0

Huw Davies : ole32: Make all formats available to the clipboard.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: f4745c0a06e293e142a26596ebb8ba5d4d5a43e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4745c0a06e293e142a26596e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 12:05:11 2009 +0100 ole32: Make all formats available to the clipboard. --- dlls/ole32/clipboard.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 2152bbe..e7c2335 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -61,6 +61,7 @@ #include <assert.h> #include <stdarg.h> #include <string.h> +#include <stdio.h> #define COBJMACROS #define NONAMELESSUNION @@ -166,6 +167,15 @@ static UINT dataobject_clipboard_format; static UINT ole_priv_data_clipboard_format; static UINT embed_source_clipboard_format; +static inline char *dump_fmtetc(FORMATETC *fmt) +{ + static char buf[100]; + + snprintf(buf, sizeof(buf), "cf %04x ptd %p aspect %x lindex %d tymed %x", + fmt->cfFormat, fmt->ptd, fmt->dwAspect, fmt->lindex, fmt->tymed); + return buf; +} + /*---------------------------------------------------------------------* * Implementation of the internal IEnumFORMATETC interface returned by * the OLE clipboard's IDataObject. @@ -1235,11 +1245,11 @@ static HWND OLEClipbrd_CreateWindow(void) /********************************************************************* * set_clipboard_formats * - * Enumerate all HGLOBAL formats supported by the source and make + * Enumerate all formats supported by the source and make * those formats available using delayed rendering using SetClipboardData. + * Cache the enumeration list and make that list visibile as the + * 'Ole Private Data' format on the clipboard. * - * TODO: We need to additionally handle TYMED_IStorage and - * TYMED_IStream data by copying into global memory. */ static HRESULT set_clipboard_formats(ole_clipbrd *clipbrd, IDataObject *data) { @@ -1287,14 +1297,7 @@ static HRESULT set_clipboard_formats(ole_clipbrd *clipbrd, IDataObject *data) while(IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL) == S_OK) { - if (fmt.tymed == TYMED_HGLOBAL) - { - char fmt_name[80]; - TRACE("(cfFormat=%d:%s)\n", fmt.cfFormat, - GetClipboardFormatNameA(fmt.cfFormat, fmt_name, sizeof(fmt_name)-1) ? fmt_name : ""); - - SetClipboardData(fmt.cfFormat, NULL); - } + TRACE("%s\n", dump_fmtetc(&fmt)); priv_data->entries[idx].fmtetc = fmt; if(fmt.ptd) @@ -1309,6 +1312,9 @@ static HRESULT set_clipboard_formats(ole_clipbrd *clipbrd, IDataObject *data) priv_data->entries[idx].unk[0] = 0; priv_data->entries[idx].unk[1] = 0; + if (priv_data->entries[idx].first_use) + SetClipboardData(fmt.cfFormat, NULL); + idx++; }

1 0

Huw Davies : ole32: Add support for rendering storage data to the clipboard .
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 469d6ea2df3f6010c69b2f9888f06c981634f8b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=469d6ea2df3f6010c69b2f988… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 12:05:26 2009 +0100 ole32: Add support for rendering storage data to the clipboard. --- dlls/ole32/clipboard.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 60 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index e7c2335..5b58a23 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -558,6 +558,61 @@ static inline ole_priv_data_entry *find_format_in_list(ole_priv_data_entry *entr } /*************************************************************************** + * get_data_from_storage + * + * Returns storage data in an HGLOBAL. + */ +static HRESULT get_data_from_storage(IDataObject *data, FORMATETC *fmt, HGLOBAL *mem) +{ + HGLOBAL h; + IStorage *stg; + HRESULT hr; + FORMATETC stg_fmt; + STGMEDIUM med; + ILockBytes *lbs; + + *mem = NULL; + + h = GlobalAlloc( GMEM_DDESHARE|GMEM_MOVEABLE, 0 ); + if(!h) return E_OUTOFMEMORY; + + hr = CreateILockBytesOnHGlobal(h, FALSE, &lbs); + if(SUCCEEDED(hr)) + { + hr = StgCreateDocfileOnILockBytes(lbs, STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stg); + ILockBytes_Release(lbs); + } + if(FAILED(hr)) + { + GlobalFree(h); + return hr; + } + + stg_fmt = *fmt; + med.tymed = stg_fmt.tymed = TYMED_ISTORAGE; + med.u.pstg = stg; + med.pUnkForRelease = NULL; + + hr = IDataObject_GetDataHere(data, &stg_fmt, &med); + if(FAILED(hr)) + { + med.u.pstg = NULL; + hr = IDataObject_GetData(data, &stg_fmt, &med); + if(FAILED(hr)) goto end; + + hr = IStorage_CopyTo(med.u.pstg, 0, NULL, NULL, stg); + ReleaseStgMedium(&med); + if(FAILED(hr)) goto end; + } + *mem = h; + +end: + IStorage_Release(stg); + if(FAILED(hr)) GlobalFree(h); + return hr; +} + +/*************************************************************************** * get_data_from_stream * * Returns stream data in an HGLOBAL. @@ -656,7 +711,11 @@ static HRESULT render_format(IDataObject *data, LPFORMATETC fmt) return render_embed_source_hack(data, fmt); } - if(fmt->tymed & TYMED_ISTREAM) + if(fmt->tymed & TYMED_ISTORAGE) + { + hr = get_data_from_storage(data, fmt, &clip_data); + } + else if(fmt->tymed & TYMED_ISTREAM) { hr = get_data_from_stream(data, fmt, &clip_data); }

1 0

Huw Davies : ole32: Use helper function to duplicate global memory.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 5defc71dfe8a77b533bba2d116511d381267e2f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5defc71dfe8a77b533bba2d11… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 12:06:29 2009 +0100 ole32: Use helper function to duplicate global memory. --- dlls/ole32/clipboard.c | 33 ++++++++------------------------- 1 files changed, 8 insertions(+), 25 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 5b58a23..4bcce37 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -404,7 +404,7 @@ static HRESULT enum_fmtetc_construct(ole_priv_data *data, UINT pos, IEnumFORMATE * * Helper method to duplicate an HGLOBAL chunk of memory */ -static HRESULT dup_global_mem( HGLOBAL src, HGLOBAL *dst ) +static HRESULT dup_global_mem( HGLOBAL src, DWORD flags, HGLOBAL *dst ) { void *src_ptr, *dst_ptr; DWORD size; @@ -414,7 +414,7 @@ static HRESULT dup_global_mem( HGLOBAL src, HGLOBAL *dst ) size = GlobalSize(src); - *dst = GlobalAlloc( GMEM_DDESHARE|GMEM_MOVEABLE, size ); + *dst = GlobalAlloc( flags, size ); if ( !*dst ) return E_OUTOFMEMORY; src_ptr = GlobalLock(src); @@ -685,7 +685,7 @@ static HRESULT get_data_from_global(IDataObject *data, FORMATETC *fmt, HGLOBAL * hr = IDataObject_GetData(data, &mem_fmt, &med); if(FAILED(hr)) return hr; - hr = dup_global_mem(med.u.hGlobal, &h); + hr = dup_global_mem(med.u.hGlobal, GMEM_DDESHARE|GMEM_MOVEABLE, &h); if(SUCCEEDED(hr)) *mem = h; @@ -918,9 +918,9 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_GetData( LPFORMATETC pformatetcIn, STGMEDIUM* pmedium) { - HANDLE hData = 0; - LPVOID src; + HANDLE h, hData = 0; ole_clipbrd *This = impl_from_IDataObject(iface); + HRESULT hr; TRACE("(%p,%p,%p)\n", iface, pformatetcIn, pmedium); @@ -953,26 +953,8 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_GetData( */ if ( !OpenClipboard(theOleClipboard->hWndClipboard)) return CLIPBRD_E_CANT_OPEN; - hData = GetClipboardData(pformatetcIn->cfFormat); - - /* Must make a copy of global handle returned by GetClipboardData; it - * is not valid after we call CloseClipboard - * Application is responsible for freeing the memory (Forte Agent does this) - */ - src = GlobalLock(hData); - if(src) { - LPVOID dest; - ULONG size; - HANDLE hDest; - - size = GlobalSize(hData); - hDest = GlobalAlloc(GHND, size); - dest = GlobalLock(hDest); - memcpy(dest, src, size); - GlobalUnlock(hDest); - GlobalUnlock(hData); - hData = hDest; - } + h = GetClipboardData(pformatetcIn->cfFormat); + hr = dup_global_mem(h, GMEM_MOVEABLE, &hData); /* * Return the clipboard data in the storage medium structure @@ -983,6 +965,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_GetData( if ( !CloseClipboard() ) return CLIPBRD_E_CANT_CLOSE; + if(FAILED(hr)) return hr; return (hData == 0) ? DV_E_FORMATETC : S_OK; }

1 0

Huw Davies : ole32: Unicodify window creation. Don' t register the class as global.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 72f53ed4d7f3064b672856fc6c2b96f6ae0f307e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f53ed4d7f3064b672856fc6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 12:06:48 2009 +0100 ole32: Unicodify window creation. Don't register the class as global. --- dlls/ole32/clipboard.c | 75 +++++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 45 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 4bcce37..196f220 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -161,7 +161,7 @@ static ole_clipbrd* theOleClipboard; /* * Name of our registered OLE clipboard window class */ -static const CHAR OLEClipbrd_WNDCLASS[] = "CLIPBRDWNDCLASS"; +static const WCHAR clipbrd_wndclass[] = {'C','L','I','P','B','R','D','W','N','D','C','L','A','S','S',0}; static UINT dataobject_clipboard_format; static UINT ole_priv_data_clipboard_format; @@ -795,7 +795,7 @@ static LRESULT CALLBACK clipbrd_wndproc(HWND hwnd, UINT message, WPARAM wparam, } default: - return DefWindowProcA(hwnd, message, wparam, lparam); + return DefWindowProcW(hwnd, message, wparam, lparam); } return 0; @@ -863,8 +863,11 @@ static ULONG WINAPI OLEClipbrd_IDataObject_AddRef( */ static void OLEClipbrd_DestroyWindow(HWND hwnd) { - DestroyWindow(hwnd); - UnregisterClassA( OLEClipbrd_WNDCLASS, 0 ); + static const WCHAR ole32W[] = {'o','l','e','3','2',0}; + HINSTANCE hinst = GetModuleHandleW(ole32W); + + DestroyWindow(hwnd); + UnregisterClassW( clipbrd_wndclass, hinst ); } static void OLEClipbrd_Destroy(ole_clipbrd* This) @@ -1241,47 +1244,29 @@ void OLEClipbrd_UnInitialize(void) */ static HWND OLEClipbrd_CreateWindow(void) { - HWND hwnd = 0; - WNDCLASSEXA wcex; - - /* - * Register the clipboard window class if necessary - */ - ZeroMemory( &wcex, sizeof(WNDCLASSEXA)); - - wcex.cbSize = sizeof(WNDCLASSEXA); - /* Windows creates this class with a style mask of 0 - * We don't bother doing this since the FindClassByAtom code - * would have to be changed to deal with this idiosyncrasy. */ - wcex.style = CS_GLOBALCLASS; - wcex.lpfnWndProc = clipbrd_wndproc; - wcex.hInstance = 0; - wcex.lpszClassName = OLEClipbrd_WNDCLASS; - - RegisterClassExA(&wcex); - - /* - * Create a hidden window to receive OLE clipboard messages - */ - -/* - * If we need to store state info we can store it here. - * For now we don't need this functionality. - * ClipboardWindowInfo clipboardInfo; - * ZeroMemory( &trackerInfo, sizeof(ClipboardWindowInfo)); - */ - - hwnd = CreateWindowA(OLEClipbrd_WNDCLASS, - "ClipboardWindow", - WS_POPUP | WS_CLIPSIBLINGS | WS_OVERLAPPED, - CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, - 0, - 0, - 0, - 0 /*(LPVOID)&clipboardInfo */); - - return hwnd; + WNDCLASSEXW class; + static const WCHAR ole32W[] = {'o','l','e','3','2',0}; + static const WCHAR title[] = {'C','l','i','p','b','o','a','r','d','W','i','n','d','o','w',0}; + HINSTANCE hinst = GetModuleHandleW(ole32W); + + class.cbSize = sizeof(class); + class.style = 0; + class.lpfnWndProc = clipbrd_wndproc; + class.cbClsExtra = 0; + class.cbWndExtra = 0; + class.hInstance = hinst; + class.hIcon = 0; + class.hCursor = 0; + class.hbrBackground = 0; + class.lpszMenuName = NULL; + class.lpszClassName = clipbrd_wndclass; + class.hIconSm = NULL; + + RegisterClassExW(&class); + + return CreateWindowW(clipbrd_wndclass, title, WS_POPUP | WS_CLIPSIBLINGS | WS_OVERLAPPED, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + NULL, NULL, hinst, 0); } /*********************************************************************

1 0

Frans Kool : setupapi: Fixed Dutch translations.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: f207c280420d174efd2eb329ebd15de14f38a079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f207c280420d174efd2eb329e… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Wed Apr 15 22:12:37 2009 +0200 setupapi: Fixed Dutch translations. --- dlls/setupapi/Nl.rc | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Nl.rc b/dlls/setupapi/Nl.rc index be28ef0..1aa43dd 100644 --- a/dlls/setupapi/Nl.rc +++ b/dlls/setupapi/Nl.rc @@ -2,6 +2,7 @@ * setupapi (Dutch resources) * * Copyright 2003 Hans Leidekker + * Copyright 2009 Frans Kool * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,6 +21,14 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "Het bestand '%s' op %s is benodigd" + IDS_UNKNOWN "Onbekend" + IDS_COPYFROM "Kopieer bestanden van:" + IDS_INFO "Voer het pad in waar het bestand zich bevind, en klik dan op OK." +} + COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Bestanden worden gekopi�erd..." @@ -32,3 +41,17 @@ BEGIN LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Bestanden benodigd" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Voer de installatie disk van de fabrikant in, en zorg\ndan dat de correcte schijf is geselecteerd hieronder", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Kopieer de fabrikant's bestanden van:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Annuleren", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Bladeren...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0