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

André Hentschel : winemaker: Add -m32 flag to support winegcc-changes.
by Alexandre Julliard April 20, 2009

April 20, 2009

Module: wine Branch: master Commit: 9312ff52e06e3d97f37b14f87cfbd44edfc41d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9312ff52e06e3d97f37b14f87… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 16 22:41:09 2009 +0200 winemaker: Add -m32 flag to support winegcc-changes. --- tools/winemaker | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 1d6800b..1bf25d3 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1479,6 +1479,7 @@ sub source_scan_directory($$$$) } if ((@$target[$T_FLAGS] & $TF_NOMSVCRT) == 0) { push @{@$target[$T_LDFLAGS]},"-mno-cygwin"; + push @{@$target[$T_LDFLAGS]},"-m32"; } push @{@$project[$P_TARGETS]},$target;

1 0

Jacek Caban : mshtml: Added IPersistHistory stub implementation.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 781b0873e60a39c3c604ae17212c8242ff0b856e URL: http://source.winehq.org/git/wine.git/?a=commit;h=781b0873e60a39c3c604ae172… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 19:58:05 2009 +0200 mshtml: Added IPersistHistory stub implementation. --- dlls/mshtml/htmldoc.c | 4 +- dlls/mshtml/mshtml_private.h | 3 ++ dlls/mshtml/persist.c | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/htmldoc.c | 2 +- 4 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1675c5c..0b95229 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -134,8 +134,8 @@ static HRESULT WINAPI HTMLDocument_QueryInterface(IHTMLDocument2 *iface, REFIID TRACE("(%p)->(IID_ISupportErrorInfo %p)\n", This, ppvObject); *ppvObject = SUPPERRINFO(This); }else if(IsEqualGUID(&IID_IPersistHistory, riid)) { - FIXME("(%p)->(IID_IPersistHistory currently not supported %p)\n", This, ppvObject); - *ppvObject = NULL; + TRACE("(%p)->(IID_IPersistHistory %p)\n", This, ppvObject); + *ppvObject = PERSISTHIST(This); }else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppvObject); return E_NOINTERFACE; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3ecfdea..ebb63bb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -21,6 +21,7 @@ #include "mshtml.h" #include "mshtmhst.h" #include "hlink.h" +#include "perhist.h" #include "dispex.h" #include "wine/list.h" @@ -229,6 +230,7 @@ struct HTMLDocument { const IHTMLDocument5Vtbl *lpHTMLDocument5Vtbl; const IPersistMonikerVtbl *lpPersistMonikerVtbl; const IPersistFileVtbl *lpPersistFileVtbl; + const IPersistHistoryVtbl *lpPersistHistoryVtbl; const IMonikerPropVtbl *lpMonikerPropVtbl; const IOleObjectVtbl *lpOleObjectVtbl; const IOleDocumentVtbl *lpOleDocumentVtbl; @@ -442,6 +444,7 @@ typedef struct { #define HLNKTARGET(x) ((IHlinkTarget*) &(x)->lpHlinkTargetVtbl) #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define PERSTRINIT(x) ((IPersistStreamInit*) &(x)->lpPersistStreamInitVtbl) +#define PERSISTHIST(x) ((IPersistHistory*) &(x)->lpPersistHistoryVtbl) #define CUSTOMDOC(x) ((ICustomDoc*) &(x)->lpCustomDocVtbl) #define NSWBCHROME(x) ((nsIWebBrowserChrome*) &(x)->lpWebBrowserChromeVtbl) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 81f9216..c8a0c57 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -748,12 +748,84 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = { PersistStreamInit_InitNew }; +/********************************************************** + * IPersistHistory implementation + */ + +#define PERSISTHIST_THIS(iface) DEFINE_THIS(HTMLDocument, PersistHistory, iface) + +static HRESULT WINAPI PersistHistory_QueryInterface(IPersistHistory *iface, REFIID riid, void **ppvObject) +{ + HTMLDocument *This = PERSISTHIST_THIS(iface); + return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppvObject); +} + +static ULONG WINAPI PersistHistory_AddRef(IPersistHistory *iface) +{ + HTMLDocument *This = PERSISTHIST_THIS(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI PersistHistory_Release(IPersistHistory *iface) +{ + HTMLDocument *This = PERSISTHIST_THIS(iface); + return IHTMLDocument2_Release(HTMLDOC(This)); +} + +static HRESULT WINAPI PersistHistory_GetClassID(IPersistHistory *iface, CLSID *pClassID) +{ + HTMLDocument *This = PERSISTHIST_THIS(iface); + return IPersist_GetClassID(PERSIST(This), pClassID); +} + +static HRESULT WINAPI PersistHistory_LoadHistory(IPersistHistory *iface, IStream *pStream, IBindCtx *pbc) +{ + HTMLDocument *This = PERSISTHIST_THIS(iface); + FIXME("(%p)->(%p %p)\n", This, pStream, pbc); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistHistory_SaveHistory(IPersistHistory *iface, IStream *pStream) +{ + HTMLDocument *This = PERSISTHIST_THIS(iface); + FIXME("(%p)->(%p)\n", This, pStream); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistHistory_SetPositionCookie(IPersistHistory *iface, DWORD dwPositioncookie) +{ + HTMLDocument *This = PERSISTHIST_THIS(iface); + FIXME("(%p)->(%x)\n", This, dwPositioncookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistHistory_GetPositionCookie(IPersistHistory *iface, DWORD *pdwPositioncookie) +{ + HTMLDocument *This = PERSISTHIST_THIS(iface); + FIXME("(%p)->(%p)\n", This, pdwPositioncookie); + return E_NOTIMPL; +} + +#undef PERSISTHIST_THIS + +static const IPersistHistoryVtbl PersistHistoryVtbl = { + PersistHistory_QueryInterface, + PersistHistory_AddRef, + PersistHistory_Release, + PersistHistory_GetClassID, + PersistHistory_LoadHistory, + PersistHistory_SaveHistory, + PersistHistory_SetPositionCookie, + PersistHistory_GetPositionCookie +}; + void HTMLDocument_Persist_Init(HTMLDocument *This) { This->lpPersistMonikerVtbl = &PersistMonikerVtbl; This->lpPersistFileVtbl = &PersistFileVtbl; This->lpMonikerPropVtbl = &MonikerPropVtbl; This->lpPersistStreamInitVtbl = &PersistStreamInitVtbl; + This->lpPersistHistoryVtbl = &PersistHistoryVtbl; This->bscallback = NULL; This->mon = NULL; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 45fc00c..60b3d2e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4191,7 +4191,7 @@ static void test_IPersistHistory(void) return; hres = IUnknown_QueryInterface(unk, &IID_IPersistHistory, (void**)&phist); - todo_wine ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); + ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); if(hres == S_OK) IPersistHistory_Release(phist);

1 0

Huw Davies : ole32: Add support for getting storage based objects from a flushed clipboard.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 9bacd00ce72b08f262b95215182c65fc34a79921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bacd00ce72b08f262b952151… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 12:34:25 2009 +0100 ole32: Add support for getting storage based objects from a flushed clipboard. --- dlls/ole32/clipboard.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 9f2f9e7..7188297 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -986,6 +986,42 @@ static HRESULT get_stgmed_for_stream(HGLOBAL h, STGMEDIUM *med) } /************************************************************************ + * get_stgmed_for_storage + * + * Returns a stg medium with a storage based on the handle + */ +static HRESULT get_stgmed_for_storage(HGLOBAL h, STGMEDIUM *med) +{ + HRESULT hr; + HGLOBAL dst; + ILockBytes *lbs; + + med->pUnkForRelease = NULL; + med->tymed = TYMED_NULL; + + hr = dup_global_mem(h, GMEM_MOVEABLE, &dst); + if(FAILED(hr)) return hr; + + hr = CreateILockBytesOnHGlobal(dst, TRUE, &lbs); + if(FAILED(hr)) + { + GlobalFree(dst); + return hr; + } + + hr = StgOpenStorageOnILockBytes(lbs, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, NULL, 0, &med->u.pstg); + ILockBytes_Release(lbs); + if(FAILED(hr)) + { + GlobalFree(dst); + return hr; + } + + med->tymed = TYMED_ISTORAGE; + return hr; +} + +/************************************************************************ * snapshot_GetData */ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, @@ -1030,7 +1066,9 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, else /* non-Ole format */ mask = fmt->tymed & TYMED_HGLOBAL; - if(mask & TYMED_HGLOBAL) + if(mask & TYMED_ISTORAGE) + hr = get_stgmed_for_storage(h, med); + else if(mask & TYMED_HGLOBAL) hr = get_stgmed_for_global(h, med); else if(mask & TYMED_ISTREAM) hr = get_stgmed_for_stream(h, med);

1 0

Rein Klazes : user32: When repainting a static control with SS_BITMAP style , do not erase the background if there is no valid bitmap to paint.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: dbfbce975d6d8aeefc045cc58c48fd2a9295e930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbfbce975d6d8aeefc045cc58… Author: Rein Klazes <wijn(a)online.nl> Date: Mon Apr 13 19:22:34 2009 +0200 user32: When repainting a static control with SS_BITMAP style, do not erase the background if there is no valid bitmap to paint. --- dlls/user32/static.c | 6 ------ dlls/user32/tests/static.c | 10 ++++++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 4e8091b..69acbc5 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -874,12 +874,6 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) SelectObject(hMemDC, oldbitmap); DeleteDC(hMemDC); } - else - { - RECT rcClient; - GetClientRect( hwnd, &rcClient ); - FillRect( hdc, &rcClient, hbrush ); - } } diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 6a474ff..d04f725 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -56,6 +56,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara ok(GetClipRgn(hdc, hrgn) == 1, "Static controls during a WM_CTLCOLORSTATIC must have a clipping region\n"); DeleteObject(hrgn); g_nReceivedColorStatic++; + return (LRESULT) GetStockObject(BLACK_BRUSH); } break; } @@ -81,7 +82,11 @@ static void test_updates(int style, int flags) InvalidateRect(hStatic, NULL, FALSE); UpdateWindow(hStatic); - + if( (style & SS_TYPEMASK) == SS_BITMAP) { + HDC hdc = GetDC( hStatic); + COLORREF colour = GetPixel( hdc, 10, 10); + ok ( colour != 0, "pixel should NOT be painted black!\n"); + } if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) exp = 4; else @@ -89,7 +94,7 @@ static void test_updates(int style, int flags) if (flags & TODO_COUNT) todo_wine { expect_eq(g_nReceivedColorStatic, exp, int, "%d"); } - else if (style == SS_ICON || style == SS_BITMAP) + else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP) ok( g_nReceivedColorStatic == exp || broken(g_nReceivedColorStatic == 0), /* win9x */ "expected %u got %u\n", exp, g_nReceivedColorStatic ); @@ -125,6 +130,7 @@ START_TEST(static) test_updates(SS_SIMPLE, 0); test_updates(SS_ICON, 0); test_updates(SS_BITMAP, 0); + test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); test_updates(SS_BLACKRECT, TODO_COUNT); test_updates(SS_WHITERECT, TODO_COUNT); test_updates(SS_ETCHEDHORZ, TODO_COUNT);

1 0

Huw Davies : ole32/tests: Tests for a flushed clipboard.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: aadd07ca9d303a82ced6aec892c9b0368423b3d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aadd07ca9d303a82ced6aec89… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 12:35:31 2009 +0100 ole32/tests: Tests for a flushed clipboard. --- dlls/ole32/tests/clipboard.c | 145 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 143 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index c3db7b2..ed47c8b 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define NONAMELESSUNION #include <stdarg.h> #include <stdio.h> @@ -255,7 +256,7 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor IStream_AddRef(This->stm); U(*pmedium).pstm = This->stm; } - else if(pformatetc->cfFormat == cf_storage) + else if(pformatetc->cfFormat == cf_storage || pformatetc->cfFormat == cf_another) { pmedium->tymed = TYMED_ISTORAGE; IStorage_AddRef(This->stg); @@ -386,12 +387,12 @@ static HRESULT DataObjectImpl_CreateText(LPCSTR text, LPDATAOBJECT *lplpdataobj) const char *cmpl_stm_data = "complex stream"; const char *cmpl_text_data = "complex text"; +const WCHAR devname[] = {'m','y','d','e','v',0}; static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) { DataObjectImpl *obj; ILockBytes *lbs; - static const WCHAR devname[] = {'m','y','d','e','v',0}; DEVMODEW dm; obj = HeapAlloc(GetProcessHeap(), 0, sizeof(DataObjectImpl)); @@ -1007,8 +1008,148 @@ static void test_consumer_refs(void) OleUninitialize(); } +static void test_flushed_getdata(void) +{ + HRESULT hr; + IDataObject *src, *get; + FORMATETC fmt; + STGMEDIUM med; + STATSTG stat; + DEVMODEW dm; + + OleInitialize(NULL); + + hr = DataObjectImpl_CreateComplex(&src); + ok(hr == S_OK, "got %08x\n", hr); + + hr = OleSetClipboard(src); + ok(hr == S_OK, "got %08x\n", hr); + + hr = OleFlushClipboard(); + ok(hr == S_OK, "got %08x\n", hr); + + hr = OleGetClipboard(&get); + ok(hr == S_OK, "got %08x\n", hr); + + /* global format -> global & stream */ + + InitFormatEtc(fmt, CF_TEXT, TYMED_HGLOBAL); + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); + ReleaseStgMedium(&med); + + InitFormatEtc(fmt, CF_TEXT, TYMED_ISTREAM); + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(med.tymed == TYMED_ISTREAM, "got %x\n", med.tymed); + ReleaseStgMedium(&med); + + InitFormatEtc(fmt, CF_TEXT, TYMED_ISTORAGE); + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == E_FAIL, "got %08x\n", hr); + + InitFormatEtc(fmt, CF_TEXT, 0xffff); + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); + ReleaseStgMedium(&med); + + /* stream format -> global & stream */ + + InitFormatEtc(fmt, cf_stream, TYMED_ISTREAM); + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(med.tymed == TYMED_ISTREAM, "got %x\n", med.tymed); + ReleaseStgMedium(&med); + + InitFormatEtc(fmt, cf_stream, TYMED_ISTORAGE); + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == E_FAIL, "got %08x\n", hr); + + InitFormatEtc(fmt, cf_stream, TYMED_HGLOBAL); + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); + ReleaseStgMedium(&med); + + InitFormatEtc(fmt, cf_stream, 0xffff); + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(med.tymed == TYMED_ISTREAM, "got %x\n", med.tymed); + ReleaseStgMedium(&med); + + /* storage format -> global, stream & storage */ + + InitFormatEtc(fmt, cf_storage, TYMED_ISTORAGE); + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(med.tymed == TYMED_ISTORAGE, "got %x\n", med.tymed); + hr = IStorage_Stat(med.u.pstg, &stat, STATFLAG_NONAME); + ok(hr == S_OK, "got %08x\n", hr); + ok(stat.grfMode == (STGM_SHARE_EXCLUSIVE | STGM_READWRITE), "got %08x\n", stat.grfMode); + ReleaseStgMedium(&med); + + InitFormatEtc(fmt, cf_storage, TYMED_ISTREAM); + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(med.tymed == TYMED_ISTREAM, "got %x\n", med.tymed); + ReleaseStgMedium(&med); + + InitFormatEtc(fmt, cf_storage, TYMED_HGLOBAL); + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); + ReleaseStgMedium(&med); + + InitFormatEtc(fmt, cf_storage, TYMED_HGLOBAL | TYMED_ISTREAM); + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); + ReleaseStgMedium(&med); + + InitFormatEtc(fmt, cf_storage, 0xffff); + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(med.tymed == TYMED_ISTORAGE, "got %x\n", med.tymed); + ReleaseStgMedium(&med); + + /* complex format with target device */ + + InitFormatEtc(fmt, cf_another, 0xffff); + hr = IDataObject_GetData(get, &fmt, &med); + todo_wine ok(hr == DV_E_FORMATETC, "got %08x\n", hr); + + InitFormatEtc(fmt, cf_another, 0xffff); + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmDriverExtra = 0; + lstrcpyW(dm.dmDeviceName, devname); + fmt.ptd = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(devname) + dm.dmSize + dm.dmDriverExtra); + fmt.ptd->tdSize = FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(devname) + dm.dmSize + dm.dmDriverExtra; + fmt.ptd->tdDriverNameOffset = FIELD_OFFSET(DVTARGETDEVICE, tdData); + fmt.ptd->tdDeviceNameOffset = 0; + fmt.ptd->tdPortNameOffset = 0; + fmt.ptd->tdExtDevmodeOffset = fmt.ptd->tdDriverNameOffset + sizeof(devname); + lstrcpyW((WCHAR*)fmt.ptd->tdData, devname); + memcpy(fmt.ptd->tdData + sizeof(devname), &dm, dm.dmSize + dm.dmDriverExtra); + + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(med.tymed == TYMED_ISTORAGE, "got %x\n", med.tymed); + ReleaseStgMedium(&med); + + HeapFree(GetProcessHeap(), 0, fmt.ptd); + + + IDataObject_Release(get); + IDataObject_Release(src); + OleUninitialize(); +} + START_TEST(clipboard) { test_set_clipboard(); test_consumer_refs(); + test_flushed_getdata(); }

1 0

Huw Davies : ole32: Try global and stream types if the requested types don' t match the source.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: c648dcf61595c641cffe800348e2510b1435e4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c648dcf61595c641cffe80034… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 12:35:06 2009 +0100 ole32: Try global and stream types if the requested types don't match the source. --- dlls/ole32/clipboard.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index dde09ea..eaffb77 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1062,7 +1062,10 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, entry = find_format_in_list(enum_data->entries, enum_data->count, fmt->cfFormat); if(entry) + { mask = fmt->tymed & entry->fmtetc.tymed; + if(!mask) mask = fmt->tymed & (TYMED_ISTREAM | TYMED_HGLOBAL); + } else /* non-Ole format */ mask = fmt->tymed & TYMED_HGLOBAL;

1 0

Huw Davies : ole32: OleFlushClipboard should render all formats to the clipboard.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 18d413bb7488f62e8038693b640f37f2bc5ef5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d413bb7488f62e8038693b6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 12:34:43 2009 +0100 ole32: OleFlushClipboard should render all formats to the clipboard. --- dlls/ole32/clipboard.c | 30 +----------------------------- 1 files changed, 1 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 7188297..dde09ea 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1709,8 +1709,6 @@ HRESULT WINAPI OleGetClipboard(IDataObject **obj) */ HRESULT WINAPI OleFlushClipboard(void) { - IEnumFORMATETC* penumFormatetc = NULL; - FORMATETC rgelt; HRESULT hr; ole_clipbrd *clipbrd; HWND wnd; @@ -1728,38 +1726,12 @@ HRESULT WINAPI OleFlushClipboard(void) if (!OpenClipboard(wnd)) return CLIPBRD_E_CANT_OPEN; - /* - * Render all HGLOBAL formats supported by the source into - * the windows clipboard. - */ - if ( FAILED( hr = IDataObject_EnumFormatEtc( clipbrd->src_data, - DATADIR_GET, - &penumFormatetc) )) - goto end; - - - while ( S_OK == IEnumFORMATETC_Next(penumFormatetc, 1, &rgelt, NULL) ) - { - if ( rgelt.tymed == TYMED_HGLOBAL ) - { - CHAR szFmtName[80]; - TRACE("(cfFormat=%d:%s)\n", rgelt.cfFormat, - GetClipboardFormatNameA(rgelt.cfFormat, szFmtName, sizeof(szFmtName)-1) - ? szFmtName : ""); - - if ( FAILED(render_format( clipbrd->src_data, &rgelt )) ) - continue; - } - } - - IEnumFORMATETC_Release(penumFormatetc); + SendMessageW(wnd, WM_RENDERALLFORMATS, 0, 0); hr = set_dataobject_format(NULL); set_src_dataobject(clipbrd, NULL); -end: - if ( !CloseClipboard() ) hr = CLIPBRD_E_CANT_CLOSE; return hr;

1 0

Huw Davies : ole32: Add support for getting stream based objects from a flushed clipboard.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 25d7ecde4751fa65e872c828e4eaf1e74bdf332c URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d7ecde4751fa65e872c828e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 12:34:07 2009 +0100 ole32: Add support for getting stream based objects from a flushed clipboard. --- dlls/ole32/clipboard.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 57a48fb..9f2f9e7 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -959,6 +959,33 @@ static HRESULT get_stgmed_for_global(HGLOBAL h, STGMEDIUM *med) } /************************************************************************ + * get_stgmed_for_stream + * + * Returns a stg medium with a stream based on the handle + */ +static HRESULT get_stgmed_for_stream(HGLOBAL h, STGMEDIUM *med) +{ + HRESULT hr; + HGLOBAL dst; + + med->pUnkForRelease = NULL; + med->tymed = TYMED_NULL; + + hr = dup_global_mem(h, GMEM_MOVEABLE, &dst); + if(FAILED(hr)) return hr; + + hr = CreateStreamOnHGlobal(dst, TRUE, &med->u.pstm); + if(FAILED(hr)) + { + GlobalFree(dst); + return hr; + } + + med->tymed = TYMED_ISTREAM; + return hr; +} + +/************************************************************************ * snapshot_GetData */ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, @@ -1005,6 +1032,8 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, if(mask & TYMED_HGLOBAL) hr = get_stgmed_for_global(h, med); + else if(mask & TYMED_ISTREAM) + hr = get_stgmed_for_stream(h, med); else { FIXME("Unhandled tymed - emum tymed %x req tymed %x\n", entry->fmtetc.tymed, fmt->tymed);

1 0

Huw Davies : ole32: Now that the consumer side of the clipboard separated from the main clipboard object , simplify the initialization code.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: d2156f3894f5a5bfa31191c6241ebdbf60692eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2156f3894f5a5bfa31191c62… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 12:16:17 2009 +0100 ole32: Now that the consumer side of the clipboard separated from the main clipboard object, simplify the initialization code. --- dlls/ole32/clipboard.c | 117 +++++++++++++++++++++--------------------------- 1 files changed, 51 insertions(+), 66 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index a93ff85..b7527e9 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -813,31 +813,6 @@ static ULONG WINAPI snapshot_AddRef(IDataObject *iface) return InterlockedIncrement(&This->ref); } -/*********************************************************************** - * destroy_clipbrd_window - * Destroy the clipboard window and unregister its class - */ -static void destroy_clipbrd_window(HWND hwnd) -{ - 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) -{ - TRACE("()\n"); - - if (!This) return; - - if ( This->window ) destroy_clipbrd_window(This->window); - - IStream_Release(This->marshal_data); - HeapFree(GetProcessHeap(), 0, This); -} - /************************************************************************ * snapshot_Release */ @@ -1160,35 +1135,8 @@ static snapshot *snapshot_construct(DWORD seq_no) } /********************************************************* - * Construct the OLEClipbrd class. + * register_clipboard_formats */ -static ole_clipbrd* OLEClipbrd_Construct(void) -{ - ole_clipbrd* This; - HGLOBAL h; - - This = HeapAlloc( GetProcessHeap(), 0, sizeof(*This) ); - if (!This) return NULL; - - This->latest_snapshot = NULL; - This->window = NULL; - This->src_data = NULL; - This->cached_enum = NULL; - - h = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, 0); - if(!h) goto error; - - if(FAILED(CreateStreamOnHGlobal(h, TRUE, &This->marshal_data))) - goto error; - - return This; - -error: - if(h) GlobalFree(h); - HeapFree(GetProcessHeap(), 0, This); - return NULL; -} - static void register_clipboard_formats(void) { static const WCHAR DataObjectW[] = { 'D','a','t','a','O','b','j','e','c','t',0 }; @@ -1209,15 +1157,40 @@ static void register_clipboard_formats(void) */ void OLEClipbrd_Initialize(void) { - register_clipboard_formats(); + register_clipboard_formats(); - if ( !theOleClipboard ) - { - TRACE("()\n"); - theOleClipboard = OLEClipbrd_Construct(); - } -} + if ( !theOleClipboard ) + { + ole_clipbrd* clipbrd; + HGLOBAL h; + + TRACE("()\n"); + + clipbrd = HeapAlloc( GetProcessHeap(), 0, sizeof(*clipbrd) ); + if (!clipbrd) return; + clipbrd->latest_snapshot = NULL; + clipbrd->window = NULL; + clipbrd->src_data = NULL; + clipbrd->cached_enum = NULL; + + h = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, 0); + if(!h) + { + HeapFree(GetProcessHeap(), 0, clipbrd); + return; + } + + if(FAILED(CreateStreamOnHGlobal(h, TRUE, &clipbrd->marshal_data))) + { + GlobalFree(h); + HeapFree(GetProcessHeap(), 0, clipbrd); + return; + } + + theOleClipboard = clipbrd; + } +} /*********************************************************************** * OLEClipbrd_UnInitialize() @@ -1225,13 +1198,25 @@ void OLEClipbrd_Initialize(void) */ void OLEClipbrd_UnInitialize(void) { - TRACE("()\n"); + ole_clipbrd *clipbrd = theOleClipboard; - if ( theOleClipboard ) - { - OLEClipbrd_Destroy( theOleClipboard ); - theOleClipboard = NULL; - } + TRACE("()\n"); + + if ( clipbrd ) + { + static const WCHAR ole32W[] = {'o','l','e','3','2',0}; + HINSTANCE hinst = GetModuleHandleW(ole32W); + + if ( clipbrd->window ) + { + DestroyWindow(clipbrd->window); + UnregisterClassW( clipbrd_wndclass, hinst ); + } + + IStream_Release(clipbrd->marshal_data); + HeapFree(GetProcessHeap(), 0, clipbrd); + theOleClipboard = NULL; + } } /*********************************************************************

1 0

Huw Davies : ole32: After a call to GetData the consumer should hold a ref on the source data object .
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: fca4ed5596eaab51438771df58178c4a8184713d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca4ed5596eaab51438771df5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 12:17:00 2009 +0100 ole32: After a call to GetData the consumer should hold a ref on the source data object. --- dlls/ole32/clipboard.c | 36 ++++++++++++++---------- dlls/ole32/tests/clipboard.c | 61 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 81 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index b7527e9..c1ef5d3 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -134,6 +134,8 @@ typedef struct snapshot LONG ref; DWORD seq_no; /* Clipboard sequence number corresponding to this snapshot */ + + IDataObject *data; /* If we unmarshal a remote data object we hold a ref here */ } snapshot; /**************************************************************************** @@ -830,6 +832,8 @@ static ULONG WINAPI snapshot_Release(IDataObject *iface) ole_clipbrd *clipbrd; HRESULT hr = get_ole_clipbrd(&clipbrd); + if(This->data) IDataObject_Release(This->data); + if(SUCCEEDED(hr) && clipbrd->latest_snapshot == This) clipbrd->latest_snapshot = NULL; HeapFree(GetProcessHeap(), 0, This); @@ -907,25 +911,26 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *pformatetcIn, STGMEDIUM *pmedium) { - HANDLE h, hData = 0; - HRESULT hr; - IDataObject *data; + snapshot *This = impl_from_IDataObject(iface); + HANDLE h, hData = 0; + HRESULT hr; - TRACE("(%p,%p,%p)\n", iface, pformatetcIn, pmedium); + TRACE("(%p,%p,%p)\n", iface, pformatetcIn, pmedium); - if ( !pformatetcIn || !pmedium ) - return E_INVALIDARG; + if ( !pformatetcIn || !pmedium ) return E_INVALIDARG; - if ( !OpenClipboard(NULL)) return CLIPBRD_E_CANT_OPEN; + if ( !OpenClipboard(NULL)) return CLIPBRD_E_CANT_OPEN; + + if(!This->data) + hr = get_current_dataobject(&This->data); + + if(This->data) + { + hr = IDataObject_GetData(This->data, pformatetcIn, pmedium); + CloseClipboard(); + return hr; + } - hr = get_current_dataobject(&data); - if ( hr == S_OK ) - { - hr = IDataObject_GetData(data, pformatetcIn, pmedium); - IDataObject_Release(data); - CloseClipboard(); - return hr; - } /* * Otherwise, get the data from the windows clipboard using GetClipboardData @@ -1130,6 +1135,7 @@ static snapshot *snapshot_construct(DWORD seq_no) This->lpVtbl = &snapshot_vtable; This->ref = 0; This->seq_no = seq_no; + This->data = NULL; return This; } diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index eef57bd..c77ec95 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -862,14 +862,27 @@ static void test_set_clipboard(void) OleUninitialize(); } +static inline ULONG count_refs(IDataObject *d) +{ + IDataObject_AddRef(d); + return IDataObject_Release(d); +} + static void test_consumer_refs(void) { HRESULT hr; IDataObject *src, *get1, *get2, *get3; - LONG refs; + ULONG refs, old_refs; + FORMATETC fmt; + STGMEDIUM med; + + InitFormatEtc(fmt, CF_TEXT, TYMED_HGLOBAL); OleInitialize(NULL); + /* First show that each clipboard state results in + a different data object */ + hr = DataObjectImpl_CreateText("data1", &src); ok(hr == S_OK, "got %08x\n", hr); @@ -888,6 +901,12 @@ static void test_consumer_refs(void) OleFlushClipboard(); + DataObjectImpl_GetData_calls = 0; + hr = IDataObject_GetData(get1, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(DataObjectImpl_GetData_calls == 0, "GetData called\n"); + ReleaseStgMedium(&med); + hr = OleGetClipboard(&get2); ok(hr == S_OK, "got %08x\n", hr); @@ -904,6 +923,46 @@ static void test_consumer_refs(void) IDataObject_Release(get3); IDataObject_Release(get2); IDataObject_Release(get1); + + /* Now call GetData before the flush and show that this + takes a ref on our src data obj. */ + + hr = OleSetClipboard(src); + ok(hr == S_OK, "got %08x\n", hr); + + old_refs = count_refs(src); + trace("old_refs %d\n", old_refs); + + hr = OleGetClipboard(&get1); + ok(hr == S_OK, "got %08x\n", hr); + + refs = count_refs(src); + ok(refs == old_refs, "%d %d\n", refs, old_refs); + + DataObjectImpl_GetData_calls = 0; + hr = IDataObject_GetData(get1, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(DataObjectImpl_GetData_calls == 1, "GetData not called\n"); + ReleaseStgMedium(&med); + refs = count_refs(src); + ok(refs == old_refs + 1, "%d %d\n", refs, old_refs); + + OleFlushClipboard(); + + DataObjectImpl_GetData_calls = 0; + hr = IDataObject_GetData(get1, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(DataObjectImpl_GetData_calls == 1, "GetData not called\n"); + ReleaseStgMedium(&med); + + refs = count_refs(src); + ok(refs == 2, "%d\n", refs); + + IDataObject_Release(get1); + + refs = count_refs(src); + ok(refs == 1, "%d\n", refs); + IDataObject_Release(src); OleUninitialize();

1 0