October 2017 - Wine-commits

Alexandre Julliard : Release 2.20.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 40b7831cd80607e42b9e1c910a62f022c45ac884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b7831cd80607e42b9e1c910… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 19:13:35 2017 +0100 Release 2.20. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 510 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 260 insertions(+), 271 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40b7831cd80607e42b9e1…

1 0

Huw Davies : ole32: Implement IOleCache_InitCache().
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 525a7ab1df800f7b43f993d79145204ef73db29c URL: http://source.winehq.org/git/wine.git/?a=commit;h=525a7ab1df800f7b43f993d79… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 31 13:23:34 2017 +0000 ole32: Implement IOleCache_InitCache(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 8 +++----- dlls/ole32/tests/ole2.c | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 2c5e451..2907426 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2373,12 +2373,10 @@ fail: return hr; } -static HRESULT WINAPI DataCache_InitCache( - IOleCache2* iface, - IDataObject* pDataObject) +static HRESULT WINAPI DataCache_InitCache( IOleCache2 *iface, IDataObject *data ) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE( "(%p %p)\n", iface, data ); + return IOleCache2_UpdateCache( iface, data, UPDFCACHE_ALLBUTNODATACACHE, NULL ); } static HRESULT WINAPI DataCache_IOleCache2_SetData( diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 9b96570..1a982b4 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1963,18 +1963,14 @@ static void test_data_cache(void) DeleteDC(hdcMem); - todo_wine { hr = IOleCache2_InitCache(pOleCache, &DataObject); ok(hr == CACHE_E_NOCACHE_UPDATED, "IOleCache_InitCache should have returned CACHE_E_NOCACHE_UPDATED instead of 0x%08x\n", hr); - } IPersistStorage_Release(pPS); IViewObject_Release(pViewObject); IOleCache2_Release(pOleCache); - todo_wine { CHECK_NO_EXTRA_METHODS(); - } hr = CreateDataCache(NULL, &CLSID_NULL, &IID_IOleCache2, (LPVOID *)&pOleCache); ok_ole_success(hr, "CreateDataCache"); @@ -2623,6 +2619,12 @@ static void test_data_cache_updatecache( void ) { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, { NULL } }; + static const struct expected_method methods_initcache[] = + { + { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, + { "DataObject_GetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, + { NULL } + }; static const struct expected_method methods_empty[] = { { NULL } @@ -2841,6 +2843,13 @@ static void test_data_cache_updatecache( void ) CHECK_NO_EXTRA_METHODS(); + expected_method_list = methods_initcache; + + hr = IOleCache2_InitCache( cache, &DataObject ); + ok( hr == S_OK, "got %08x\n", hr ); + + CHECK_NO_EXTRA_METHODS(); + IOleCache2_Release( cache ); }

1 0

Huw Davies : ole32: Implement IOleCache2_UpdateCache().
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: ca2607db328075dd5d145327080fbd837007b958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2607db328075dd5d1453270… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 31 13:23:33 2017 +0000 ole32: Implement IOleCache2_UpdateCache(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 141 ++++++++++++-- dlls/ole32/tests/ole2.c | 480 +++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 540 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca2607db328075dd5d145…

1 0

Huw Davies : ole32: There' s no need to store a separate clip format for the data.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 9cf2bd9d9165582e54ef824970818dda2cd767a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf2bd9d9165582e54ef82497… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 31 13:23:32 2017 +0000 ole32: There's no need to store a separate clip format for the data. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 9f9fdd3..7a19a17 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -101,8 +101,6 @@ typedef struct DataCacheEntry struct list entry; /* format of this entry */ FORMATETC fmtetc; - /* the clipboard format of the data */ - CLIPFORMAT data_cf; /* cached data */ STGMEDIUM stgmedium; /* @@ -351,7 +349,6 @@ static BOOL init_cache_entry(DataCacheEntry *entry, const FORMATETC *fmt, DWORD hr = copy_formatetc(&entry->fmtetc, fmt); if (FAILED(hr)) return FALSE; - entry->data_cf = 0; entry->stgmedium.tymed = TYMED_NULL; entry->stgmedium.pUnkForRelease = NULL; entry->stream = NULL; @@ -637,7 +634,6 @@ static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) GlobalUnlock( hmfpict ); if (SUCCEEDED( hr )) { - cache_entry->data_cf = cache_entry->fmtetc.cfFormat; cache_entry->stgmedium.tymed = TYMED_MFPICT; cache_entry->stgmedium.u.hMetaFilePict = hmfpict; } @@ -722,7 +718,6 @@ static HRESULT load_dib( DataCacheEntry *cache_entry, IStream *stm ) GlobalUnlock( hglobal ); - cache_entry->data_cf = cache_entry->fmtetc.cfFormat; cache_entry->stgmedium.tymed = TYMED_HGLOBAL; cache_entry->stgmedium.u.hGlobal = hglobal; @@ -803,7 +798,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag if (FAILED(hr)) return hr; - hr = write_clipformat(pres_stream, cache_entry->data_cf); + hr = write_clipformat(pres_stream, cache_entry->fmtetc.cfFormat); if (FAILED(hr)) return hr; @@ -819,7 +814,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag header.dwSize = 0; /* size the data */ - switch (cache_entry->data_cf) + switch (cache_entry->fmtetc.cfFormat) { case CF_METAFILEPICT: { @@ -854,7 +849,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag } /* get the data */ - switch (cache_entry->data_cf) + switch (cache_entry->fmtetc.cfFormat) { case CF_METAFILEPICT: { @@ -983,7 +978,6 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, cache_entry->dirty = TRUE; ReleaseStgMedium(&cache_entry->stgmedium); - cache_entry->data_cf = cache_entry->fmtetc.cfFormat ? cache_entry->fmtetc.cfFormat : formatetc->cfFormat; if (formatetc->cfFormat == CF_BITMAP) { @@ -1001,8 +995,7 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, return S_OK; } else - return copy_stg_medium(cache_entry->data_cf, - &cache_entry->stgmedium, stgmedium); + return copy_stg_medium(cache_entry->fmtetc.cfFormat, &cache_entry->stgmedium, stgmedium); } static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, FORMATETC *fmt, STGMEDIUM *stgmedium) @@ -1023,13 +1016,12 @@ static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, FORMATETC *fm stgmedium->pUnkForRelease = NULL; return S_OK; } - return copy_stg_medium(cache_entry->data_cf, stgmedium, &cache_entry->stgmedium); + return copy_stg_medium(cache_entry->fmtetc.cfFormat, stgmedium, &cache_entry->stgmedium); } static inline HRESULT DataCacheEntry_DiscardData(DataCacheEntry *cache_entry) { ReleaseStgMedium(&cache_entry->stgmedium); - cache_entry->data_cf = cache_entry->fmtetc.cfFormat; return S_OK; } @@ -1844,7 +1836,7 @@ static HRESULT WINAPI DataCache_Draw( if (pfnContinue && !pfnContinue(dwContinue)) return E_ABORT; - switch (cache_entry->data_cf) + switch (cache_entry->fmtetc.cfFormat) { case CF_METAFILEPICT: { @@ -2103,7 +2095,7 @@ static HRESULT WINAPI DataCache_GetExtent( continue; - switch (cache_entry->data_cf) + switch (cache_entry->fmtetc.cfFormat) { case CF_METAFILEPICT: {

1 0

Huw Davies : ole32: TYMED_NULL is not valid.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: c3fe4b87d6e5f1635241faf8146ee0dddd054177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3fe4b87d6e5f1635241faf81… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 31 13:23:31 2017 +0000 ole32: TYMED_NULL is not valid. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- dlls/ole32/tests/ole2.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 2bb0948..9f9fdd3 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -328,7 +328,7 @@ static HRESULT check_valid_formatetc( const FORMATETC *fmt ) if (fmt->dwAspect == DVASPECT_ICON && fmt->cfFormat != CF_METAFILEPICT) return DV_E_FORMATETC; - if (!fmt->cfFormat || !fmt->tymed || + if (!fmt->cfFormat || (fmt->cfFormat == CF_METAFILEPICT && fmt->tymed == TYMED_MFPICT) || (fmt->cfFormat == CF_BITMAP && fmt->tymed == TYMED_GDI) || (fmt->cfFormat == CF_DIB && fmt->tymed == TYMED_HGLOBAL) || diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 4f72622..aaee677 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2332,6 +2332,13 @@ static void test_data_cache_cache(void) hr = IOleCache2_Uncache( cache, conn ); ok( hr == S_OK, "got %08x\n", hr ); + /* tymed == 0 */ + fmt.cfFormat = CF_ENHMETAFILE; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.tymed = 0; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == DV_E_TYMED, "got %08x\n", hr ); + IDataObject_Release( data ); IOleCache2_Release( cache ); }

1 0

Huw Davies : ole32: A presentation cache for DVASPECT_ICON must have format CF_METAFILEPICT.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 12718fe02161358731ed19cd1e5bfe0fd122181e URL: http://source.winehq.org/git/wine.git/?a=commit;h=12718fe02161358731ed19cd1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 31 13:23:30 2017 +0000 ole32: A presentation cache for DVASPECT_ICON must have format CF_METAFILEPICT. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 22 +++++++++++++--------- dlls/ole32/tests/ole2.c | 23 +++++++++++++++++++++++ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 7b33c59..2bb0948 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -322,19 +322,23 @@ static DataCacheEntry *DataCache_GetEntryForFormatEtc(DataCache *This, const FOR /* checks that the clipformat and tymed are valid and returns an error if they * aren't and CACHE_S_NOTSUPPORTED if they are valid, but can't be rendered by * DataCache_Draw */ -static HRESULT check_valid_clipformat_and_tymed(CLIPFORMAT cfFormat, DWORD tymed) +static HRESULT check_valid_formatetc( const FORMATETC *fmt ) { - if (!cfFormat || !tymed || - (cfFormat == CF_METAFILEPICT && tymed == TYMED_MFPICT) || - (cfFormat == CF_BITMAP && tymed == TYMED_GDI) || - (cfFormat == CF_DIB && tymed == TYMED_HGLOBAL) || - (cfFormat == CF_ENHMETAFILE && tymed == TYMED_ENHMF)) + /* DVASPECT_ICON must be CF_METAFILEPICT */ + if (fmt->dwAspect == DVASPECT_ICON && fmt->cfFormat != CF_METAFILEPICT) + return DV_E_FORMATETC; + + if (!fmt->cfFormat || !fmt->tymed || + (fmt->cfFormat == CF_METAFILEPICT && fmt->tymed == TYMED_MFPICT) || + (fmt->cfFormat == CF_BITMAP && fmt->tymed == TYMED_GDI) || + (fmt->cfFormat == CF_DIB && fmt->tymed == TYMED_HGLOBAL) || + (fmt->cfFormat == CF_ENHMETAFILE && fmt->tymed == TYMED_ENHMF)) return S_OK; - else if (tymed == TYMED_HGLOBAL) + else if (fmt->tymed == TYMED_HGLOBAL) return CACHE_S_FORMATETC_NOTSUPPORTED; else { - WARN("invalid clipformat/tymed combination: %d/%d\n", cfFormat, tymed); + WARN("invalid clipformat/tymed combination: %d/%d\n", fmt->cfFormat, fmt->tymed); return DV_E_TYMED; } } @@ -368,7 +372,7 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc DWORD id = automatic ? 1 : This->last_cache_id; DataCacheEntry *entry; - hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed); + hr = check_valid_formatetc( formatetc ); if (FAILED(hr)) return hr; if (hr == CACHE_S_FORMATETC_NOTSUPPORTED) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 509c625..4f72622 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2309,6 +2309,29 @@ static void test_data_cache_cache(void) hr = IOleCache2_Uncache( cache, view_caching[0].dwConnection ); ok( hr == S_OK, "got %08x\n", hr ); + /* Only able to set cfFormat == CF_METAFILEPICT (or == 0, see above) for DVASPECT_ICON */ + fmt.dwAspect = DVASPECT_ICON; + fmt.cfFormat = CF_DIB; + fmt.tymed = TYMED_HGLOBAL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == DV_E_FORMATETC, "got %08x\n", hr ); + fmt.cfFormat = CF_BITMAP; + fmt.tymed = TYMED_GDI; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == DV_E_FORMATETC, "got %08x\n", hr ); + fmt.cfFormat = CF_ENHMETAFILE; + fmt.tymed = TYMED_ENHMF; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == DV_E_FORMATETC, "got %08x\n", hr ); + fmt.cfFormat = CF_METAFILEPICT; + fmt.tymed = TYMED_MFPICT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* uncache everything */ + hr = IOleCache2_Uncache( cache, conn ); + ok( hr == S_OK, "got %08x\n", hr ); + IDataObject_Release( data ); IOleCache2_Release( cache ); }

1 0

Huw Davies : ole32: Adding a view cache for DVASPECT_ICON produces a CF_METAFILEPICT cache entry.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 8d0a53e60d008e96cd136e4a286eb9591e381006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d0a53e60d008e96cd136e4a2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 31 13:23:29 2017 +0000 ole32: Adding a view cache for DVASPECT_ICON produces a CF_METAFILEPICT cache entry. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 11 ++++++++-- dlls/ole32/tests/ole2.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 360ecd8..7b33c59 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -310,10 +310,10 @@ static DataCacheEntry *DataCache_GetEntryForFormatEtc(DataCache *This, const FOR LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) { /* FIXME: also compare DVTARGETDEVICEs */ - if ((!cache_entry->fmtetc.cfFormat || !fmt.cfFormat || (fmt.cfFormat == cache_entry->fmtetc.cfFormat)) && + if ((fmt.cfFormat == cache_entry->fmtetc.cfFormat) && (fmt.dwAspect == cache_entry->fmtetc.dwAspect) && (fmt.lindex == cache_entry->fmtetc.lindex) && - (!cache_entry->fmtetc.tymed || !fmt.tymed || (fmt.tymed == cache_entry->fmtetc.tymed))) + ((fmt.tymed == cache_entry->fmtetc.tymed) || !cache_entry->fmtetc.cfFormat)) /* tymed is ignored for view caching */ return cache_entry; } return NULL; @@ -2245,6 +2245,13 @@ static HRESULT WINAPI DataCache_Cache( fmt_cpy.tymed = TYMED_HGLOBAL; } + /* View caching DVASPECT_ICON gets converted to CF_METAFILEPICT */ + if (fmt_cpy.dwAspect == DVASPECT_ICON && fmt_cpy.cfFormat == 0) + { + fmt_cpy.cfFormat = CF_METAFILEPICT; + fmt_cpy.tymed = TYMED_MFPICT; + } + *pdwConnection = 0; cache_entry = DataCache_GetEntryForFormatEtc(This, &fmt_cpy); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 08b6a27..509c625 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2122,7 +2122,7 @@ static void check_dib_size( HGLOBAL h, int cx, int cy ) GlobalUnlock( h ); } -static void test_data_cache_bitmap(void) +static void test_data_cache_cache(void) { HRESULT hr; IOleCache2 *cache; @@ -2137,6 +2137,13 @@ static void test_data_cache_bitmap(void) {{ CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, 0, NULL, 0 }, {{ CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, 0, NULL, 0 } }; + STATDATA view_caching[] = + { + {{ 0, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, 0, NULL, 0 }, + {{ 0, 0, DVASPECT_THUMBNAIL, -1, TYMED_HGLOBAL }, 0, NULL, 0 }, + {{ 0, 0, DVASPECT_DOCPRINT, -1, TYMED_HGLOBAL }, 0, NULL, 0 }, + {{ CF_METAFILEPICT, 0, DVASPECT_ICON, -1, TYMED_MFPICT }, 0, NULL, 0 } + }; hr = CreateDataCache( NULL, &CLSID_NULL, &IID_IOleCache2, (void **)&cache ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2259,6 +2266,49 @@ static void test_data_cache_bitmap(void) check_dib_size( U(med).hGlobal, 2, 1 ); ReleaseStgMedium( &med ); + /* uncache everything */ + hr = IOleCache2_Uncache( cache, conn ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* view caching */ + fmt.cfFormat = 0; + fmt.tymed = TYMED_ENHMF; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + view_caching[0].dwConnection = conn; + + fmt.tymed = TYMED_HGLOBAL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == CACHE_S_SAMECACHE, "got %08x\n", hr ); + + fmt.dwAspect = DVASPECT_THUMBNAIL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + view_caching[1].dwConnection = conn; + + fmt.dwAspect = DVASPECT_DOCPRINT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + view_caching[2].dwConnection = conn; + + /* DVASPECT_ICON view cache gets mapped to CF_METAFILEPICT */ + fmt.dwAspect = DVASPECT_ICON; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + view_caching[3].dwConnection = conn; + + check_enum_cache( cache, view_caching, 4 ); + + /* uncache everything */ + hr = IOleCache2_Uncache( cache, view_caching[3].dwConnection ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IOleCache2_Uncache( cache, view_caching[2].dwConnection ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IOleCache2_Uncache( cache, view_caching[1].dwConnection ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IOleCache2_Uncache( cache, view_caching[0].dwConnection ); + ok( hr == S_OK, "got %08x\n", hr ); + IDataObject_Release( data ); IOleCache2_Release( cache ); } @@ -3750,7 +3800,7 @@ START_TEST(ole2) test_data_cache(); test_data_cache_dib_contents_stream( 0 ); test_data_cache_dib_contents_stream( 1 ); - test_data_cache_bitmap(); + test_data_cache_cache(); test_data_cache_init(); test_data_cache_initnew(); test_default_handler();

1 0

Marcus Meissner : user32/tests: Removed a unreliable test.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: ebfd1d3df63fbd0934e2087f2e02eb097a79cb2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebfd1d3df63fbd0934e2087f2… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 30 18:07:36 2017 +0100 user32/tests: Removed a unreliable test. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index f0a24cb..8391ea0 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1759,10 +1759,8 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( 0xdeadbeef, hfixed ); ok( h == hfixed, "got %p\n", h ); ok( is_fixed( h ), "expected fixed mem %p\n", h ); -#ifndef _WIN64 - /* testing if hfixed2 is freed triggers an exception on Win64 */ - ok( is_freed( hfixed2 ) || broken( !is_freed( hfixed2 )) /* < Vista */, "expected freed mem %p\n", hfixed2 ); -#endif + if (0) /* this test is unreliable / crashes */ + ok( is_freed( hfixed2 ), "expected freed mem %p\n", hfixed2 ); r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() );

1 0

Huw Davies : user32: Use WS_MINIMIZE instead of WS_ICONIC.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 9c9c03046f58075faa9cd82f0496f27dfc718f88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9c03046f58075faa9cd82f0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 30 10:29:13 2017 +0000 user32: Use WS_MINIMIZE instead of WS_ICONIC. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 55b19cf..2b38897 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -378,7 +378,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRect( LPRECT rect, DWORD style, BOOL m */ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL menu, DWORD exStyle ) { - if (style & WS_ICONIC) return TRUE; + if (style & WS_MINIMIZE) return TRUE; style &= ~(WS_HSCROLL | WS_VSCROLL); TRACE("(%s) %08x %d %08x\n", wine_dbgstr_rect(rect), style, menu, exStyle ); @@ -409,7 +409,7 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) if (cls_style & CS_VREDRAW) result |= WVR_VREDRAW; if (cls_style & CS_HREDRAW) result |= WVR_HREDRAW; - if (!(style & WS_ICONIC)) + if (!(style & WS_MINIMIZE)) { NC_AdjustRectOuter( &tmpRect, style, FALSE, exStyle ); @@ -472,7 +472,7 @@ static void NC_GetInsideRect( HWND hwnd, enum coords_relative relative, RECT *re { WIN_GetRectangles( hwnd, relative, rect, NULL ); - if (style & WS_ICONIC) return; + if (style & WS_MINIMIZE) return; /* Remove frame from rectangle */ if (HAS_THICKFRAME( style, ex_style ))

1 0

Huw Davies : strmbase: Remove unnecessary WS_ICONIC.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 9ca53840789da6381d9a1ca178879209c5ff660b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca53840789da6381d9a1ca17… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 30 10:29:12 2017 +0000 strmbase: Remove unnecessary WS_ICONIC. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index b4b5aab..b08608e 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -295,7 +295,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG W TRACE("(%p/%p)->(%x -> %x)\n", This, iface, old, WindowStyle); - if (WindowStyle & (WS_DISABLED|WS_HSCROLL|WS_ICONIC|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) + if (WindowStyle & (WS_DISABLED|WS_HSCROLL|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) return E_INVALIDARG; SetWindowLongW(This->baseWindow.hWnd, GWL_STYLE, WindowStyle);

1 0