June 2017 - Wine-Commits - list.winehq.org

Huw Davies : ole32: InitNew() should fail if there is a current storage.
by Alexandre Julliard June 6, 2017

June 6, 2017

Module: wine Branch: master Commit: 33a720b7d7af2eace8a8b3844a5c63dd1042e2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a720b7d7af2eace8a8b3844… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 6 11:46:53 2017 +0100 ole32: InitNew() should fail if there is a current storage. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 9809c7a..ecae89d 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1464,7 +1464,7 @@ static HRESULT WINAPI DataCache_InitNew( TRACE("(%p, %p)\n", iface, pStg); if (This->presentationStorage != NULL) - IStorage_Release(This->presentationStorage); + return CO_E_ALREADYINITIALIZED; This->presentationStorage = pStg;

1 0

Huw Davies : ole32/tests: Add tests for automatic cache entry creation.
by Alexandre Julliard June 6, 2017

June 6, 2017

Module: wine Branch: master Commit: 51cca0b118bb113c21b0b09d0cc186a4025ca28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=51cca0b118bb113c21b0b09d0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 6 11:46:52 2017 +0100 ole32/tests: Add tests for automatic cache entry creation. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 6c6bea8..2db6de9 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -36,6 +36,7 @@ DEFINE_GUID(CLSID_Picture_Metafile,0x315,0,0,0xc0,0,0,0,0,0,0,0x46); DEFINE_GUID(CLSID_Picture_Dib,0x316,0,0,0xc0,0,0,0,0,0,0,0x46); +DEFINE_GUID(CLSID_Picture_EnhMetafile,0x319,0,0,0xc0,0,0,0,0,0,0,0x46); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -1520,7 +1521,7 @@ static const IUnknownVtbl UnknownVtbl = static IUnknown unknown = { &UnknownVtbl }; -static void check_enum_cache(IOleCache2 *cache, STATDATA *expect, int num) +static void check_enum_cache(IOleCache2 *cache, const STATDATA *expect, int num) { IEnumSTATDATA *enum_stat; STATDATA stat; @@ -2253,6 +2254,52 @@ static void test_data_cache_bitmap(void) IOleCache2_Release( cache ); } +/* The CLSID_Picture_ classes automatically create appropriate cache entries */ +static void test_data_cache_init(void) +{ + HRESULT hr; + IOleCache2 *cache; + IPersistStorage *persist; + int i; + CLSID clsid; + static const STATDATA enum_expect[] = + { + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 1 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 1 }, + {{ CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, 0, NULL, 1 }, + {{ CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, 0, NULL, 1 } + }; + static const struct + { + const CLSID *clsid; + int enum_start, enum_num; + } data[] = + { + { &CLSID_NULL, 0, 0 }, + { &CLSID_WineTestOld, 0, 0 }, + { &CLSID_Picture_Dib, 0, 2 }, + { &CLSID_Picture_Metafile, 2, 1 }, + { &CLSID_Picture_EnhMetafile, 3, 1 } + }; + + for (i = 0; i < sizeof(data) / sizeof(data[0]); i++) + { + hr = CreateDataCache( NULL, data[i].clsid, &IID_IOleCache2, (void **)&cache ); + ok( hr == S_OK, "got %08x\n", hr ); + + check_enum_cache( cache, enum_expect + data[i].enum_start , data[i].enum_num ); + + IOleCache2_QueryInterface( cache, &IID_IPersistStorage, (void **) &persist ); + hr = IPersistStorage_GetClassID( persist, &clsid ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( IsEqualCLSID( &clsid, data[i].clsid ), "class id mismatch %s %s\n", wine_dbgstr_guid( &clsid ), + wine_dbgstr_guid( data[i].clsid ) ); + + IPersistStorage_Release( persist ); + IOleCache2_Release( cache ); + } +} + static void test_default_handler(void) { HRESULT hr; @@ -3006,6 +3053,7 @@ START_TEST(ole2) test_data_cache_dib_contents_stream( 0 ); test_data_cache_dib_contents_stream( 1 ); test_data_cache_bitmap(); + test_data_cache_init(); test_default_handler(); test_runnable(); test_OleRun();

1 0

Huw Davies : ole32: Create initial cache entries for the CLSID_Picture_ classes.
by Alexandre Julliard June 6, 2017

June 6, 2017

Module: wine Branch: master Commit: 966e8a2c241fa4f5dc06a9c95246883f978cd6e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=966e8a2c241fa4f5dc06a9c95… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 6 11:46:51 2017 +0100 ole32: Create initial cache entries for the CLSID_Picture_ classes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 113 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 91 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index d97e288..9809c7a 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -160,7 +160,9 @@ struct DataCache */ DWORD sinkAspects; DWORD sinkAdviseFlag; - IAdviseSink* sinkInterface; + IAdviseSink *sinkInterface; + + CLSID clsid; IStorage *presentationStorage; /* list of cache entries */ @@ -360,9 +362,10 @@ static BOOL init_cache_entry(DataCacheEntry *entry, const FORMATETC *fmt, DWORD } static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc, DWORD advf, - DataCacheEntry **cache_entry) + BOOL automatic, DataCacheEntry **cache_entry) { HRESULT hr; + DWORD id = automatic ? 1 : This->last_cache_id; DataCacheEntry *entry; hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed); @@ -375,11 +378,16 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc if (!entry) return E_OUTOFMEMORY; - if (!init_cache_entry(entry, formatetc, advf, This->last_cache_id)) + if (!init_cache_entry(entry, formatetc, advf, id)) goto fail; - list_add_tail(&This->cache_list, &entry->entry); - This->last_cache_id++; + if (automatic) + list_add_head(&This->cache_list, &entry->entry); + else + { + list_add_tail(&This->cache_list, &entry->entry); + This->last_cache_id++; + } if (cache_entry) *cache_entry = entry; return hr; @@ -1042,6 +1050,54 @@ static inline DWORD tymed_from_cf( DWORD cf ) } } +/**************************************************************** + * create_automatic_entry + * + * Creates an appropriate cache entry for one of the CLSID_Picture_ + * classes. The connection id of the entry is one. Any pre-existing + * automatic entry is re-assigned a new connection id, and moved to + * the end of the list. + */ +static HRESULT create_automatic_entry(DataCache *cache, const CLSID *clsid) +{ + static const struct data + { + const CLSID *clsid; + FORMATETC fmt; + } data[] = + { + { &CLSID_Picture_Dib, { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, + { &CLSID_Picture_Metafile, { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, + { &CLSID_Picture_EnhMetafile, { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, + { NULL } + }; + const struct data *ptr = data; + struct list *head; + DataCacheEntry *entry; + + if (IsEqualCLSID( &cache->clsid, clsid )) return S_OK; + + /* move and reassign any pre-existing automatic entry */ + if ((head = list_head( &cache->cache_list ))) + { + entry = LIST_ENTRY( head, DataCacheEntry, entry ); + if (entry->id == 1) + { + list_remove( &entry->entry ); + entry->id = cache->last_cache_id++; + list_add_tail( &cache->cache_list, &entry->entry ); + } + } + + while (ptr->clsid) + { + if (IsEqualCLSID( clsid, ptr->clsid )) + return DataCache_CreateEntry( cache, &ptr->fmt, 0, TRUE, NULL ); + ptr++; + } + return S_OK; +} + /********************************************************* * Method implementation for the non delegating IUnknown * part of the DataCache class. @@ -1363,22 +1419,9 @@ static ULONG WINAPI DataCache_IPersistStorage_Release( static HRESULT WINAPI DataCache_GetClassID(IPersistStorage *iface, CLSID *clsid) { DataCache *This = impl_from_IPersistStorage( iface ); - HRESULT hr; - STATSTG statstg; - - TRACE( "(%p, %p)\n", iface, clsid ); - - if (This->presentationStorage) - { - hr = IStorage_Stat( This->presentationStorage, &statstg, STATFLAG_NONAME ); - if (SUCCEEDED(hr)) - { - *clsid = statstg.clsid; - return S_OK; - } - } - *clsid = CLSID_NULL; + TRACE( "(%p, %p) returning %s\n", iface, clsid, debugstr_guid(&This->clsid) ); + *clsid = This->clsid; return S_OK; } @@ -1415,6 +1458,8 @@ static HRESULT WINAPI DataCache_InitNew( IStorage* pStg) { DataCache *This = impl_from_IPersistStorage(iface); + CLSID clsid; + HRESULT hr; TRACE("(%p, %p)\n", iface, pStg); @@ -1425,6 +1470,15 @@ static HRESULT WINAPI DataCache_InitNew( IStorage_AddRef(This->presentationStorage); This->dirty = TRUE; + ReadClassStg( pStg, &clsid ); + hr = create_automatic_entry( This, &clsid ); + if (FAILED(hr)) + { + IStorage_Release( pStg ); + This->presentationStorage = NULL; + return hr; + } + This->clsid = clsid; return S_OK; } @@ -1440,7 +1494,7 @@ static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, DWORD adv cache_entry = DataCache_GetEntryForFormatEtc( This, fmt ); if (!cache_entry) - hr = DataCache_CreateEntry( This, fmt, advf, &cache_entry ); + hr = DataCache_CreateEntry( This, fmt, advf, FALSE, &cache_entry ); if (SUCCEEDED( hr )) { DataCacheEntry_DiscardData( cache_entry ); @@ -1537,11 +1591,22 @@ static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg ) DataCache *This = impl_from_IPersistStorage(iface); HRESULT hr; IStream *stm; + CLSID clsid; + DataCacheEntry *entry, *cursor2; TRACE("(%p, %p)\n", iface, pStg); IPersistStorage_HandsOffStorage( iface ); + LIST_FOR_EACH_ENTRY_SAFE( entry, cursor2, &This->cache_list, DataCacheEntry, entry ) + DataCacheEntry_Destroy( This, entry ); + + ReadClassStg( pStg, &clsid ); + hr = create_automatic_entry( This, &clsid ); + if (FAILED( hr )) return hr; + + This->clsid = clsid; + hr = IStorage_OpenStream( pStg, CONTENTS, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); if (SUCCEEDED( hr )) @@ -2191,7 +2256,7 @@ static HRESULT WINAPI DataCache_Cache( return CACHE_S_SAMECACHE; } - hr = DataCache_CreateEntry(This, &fmt_cpy, advf, &cache_entry); + hr = DataCache_CreateEntry(This, &fmt_cpy, advf, FALSE, &cache_entry); if (SUCCEEDED(hr)) { @@ -2622,12 +2687,16 @@ static DataCache* DataCache_Construct( newObject->sinkAspects = 0; newObject->sinkAdviseFlag = 0; newObject->sinkInterface = 0; + newObject->clsid = CLSID_NULL; newObject->presentationStorage = NULL; list_init(&newObject->cache_list); newObject->last_cache_id = 2; newObject->dirty = FALSE; newObject->running_object = NULL; + create_automatic_entry( newObject, clsid ); + newObject->clsid = *clsid; + return newObject; }

1 0

Huw Davies : ole32: Add the ability to create an entry without returning it.
by Alexandre Julliard June 6, 2017

June 6, 2017

Module: wine Branch: master Commit: 111b72fc85b19820a71accc037e6904638c4380a URL: http://source.winehq.org/git/wine.git/?a=commit;h=111b72fc85b19820a71accc03… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 6 11:46:50 2017 +0100 ole32: Add the ability to create an entry without returning it. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index c9ab200..d97e288 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -363,6 +363,7 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc DataCacheEntry **cache_entry) { HRESULT hr; + DataCacheEntry *entry; hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed); if (FAILED(hr)) @@ -370,20 +371,21 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc if (hr == CACHE_S_FORMATETC_NOTSUPPORTED) TRACE("creating unsupported format %d\n", formatetc->cfFormat); - *cache_entry = HeapAlloc(GetProcessHeap(), 0, sizeof(**cache_entry)); - if (!*cache_entry) + entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); + if (!entry) return E_OUTOFMEMORY; - if (!init_cache_entry(*cache_entry, formatetc, advf, This->last_cache_id)) + if (!init_cache_entry(entry, formatetc, advf, This->last_cache_id)) goto fail; - list_add_tail(&This->cache_list, &(*cache_entry)->entry); + list_add_tail(&This->cache_list, &entry->entry); This->last_cache_id++; + if (cache_entry) *cache_entry = entry; return hr; fail: - HeapFree(GetProcessHeap(), 0, *cache_entry); + HeapFree(GetProcessHeap(), 0, entry); return E_OUTOFMEMORY; }

1 0

Huw Davies : ole32: Fix incorrectly assigned member in the presentation stream.
by Alexandre Julliard June 6, 2017

June 6, 2017

Module: wine Branch: master Commit: 026756482aee72fc3c0fd5eecd257fdd8ebf5d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=026756482aee72fc3c0fd5eec… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 6 11:46:48 2017 +0100 ole32: Fix incorrectly assigned member in the presentation stream. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 36 ++++++++++++++++++++++++------------ dlls/ole32/tests/ole2.c | 16 +++++++--------- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index b6c227e..d921603 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -82,7 +82,7 @@ typedef struct PresentationDataHeader DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ DVASPECT dvAspect; DWORD lindex; - DWORD tymed; + DWORD advf; DWORD unknown7; /* 0 */ DWORD dwObjectExtentX; DWORD dwObjectExtentY; @@ -320,10 +320,10 @@ 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, BOOL load) +static HRESULT check_valid_clipformat_and_tymed(CLIPFORMAT cfFormat, DWORD tymed) { if (!cfFormat || !tymed || - (cfFormat == CF_METAFILEPICT && (tymed == TYMED_MFPICT || load)) || + (cfFormat == CF_METAFILEPICT && tymed == TYMED_MFPICT) || (cfFormat == CF_BITMAP && tymed == TYMED_GDI) || (cfFormat == CF_DIB && tymed == TYMED_HGLOBAL) || (cfFormat == CF_ENHMETAFILE && tymed == TYMED_ENHMF)) @@ -360,11 +360,11 @@ static BOOL init_cache_entry(DataCacheEntry *entry, const FORMATETC *fmt, DWORD } static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc, DWORD advf, - DataCacheEntry **cache_entry, BOOL load) + DataCacheEntry **cache_entry) { HRESULT hr; - hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed, load); + hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed); if (FAILED(hr)) return hr; if (hr == CACHE_S_FORMATETC_NOTSUPPORTED) @@ -798,7 +798,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag header.unknown3 = 4; header.dvAspect = cache_entry->fmtetc.dwAspect; header.lindex = cache_entry->fmtetc.lindex; - header.tymed = cache_entry->stgmedium.tymed; + header.advf = cache_entry->advise_flags; header.unknown7 = 0; header.dwObjectExtentX = 0; header.dwObjectExtentY = 0; @@ -1028,6 +1028,18 @@ static inline void DataCacheEntry_HandsOffStorage(DataCacheEntry *cache_entry) } } +static inline DWORD tymed_from_cf( DWORD cf ) +{ + switch( cf ) + { + case CF_BITMAP: return TYMED_GDI; + case CF_METAFILEPICT: return TYMED_MFPICT; + case CF_ENHMETAFILE: return TYMED_ENHMF; + case CF_DIB: + default: return TYMED_HGLOBAL; + } +} + /********************************************************* * Method implementation for the non delegating IUnknown * part of the DataCache class. @@ -1416,7 +1428,7 @@ static HRESULT WINAPI DataCache_InitNew( } -static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, IStream *stm, +static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, DWORD advf, IStream *stm, enum stream_type type ) { DataCacheEntry *cache_entry; @@ -1426,7 +1438,7 @@ static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, IStream * cache_entry = DataCache_GetEntryForFormatEtc( This, fmt ); if (!cache_entry) - hr = DataCache_CreateEntry( This, fmt, 0, &cache_entry, TRUE ); + hr = DataCache_CreateEntry( This, fmt, advf, &cache_entry ); if (SUCCEEDED( hr )) { DataCacheEntry_DiscardData( cache_entry ); @@ -1472,9 +1484,9 @@ static HRESULT parse_pres_streams( DataCache *This, IStorage *stg ) fmtetc.ptd = NULL; /* FIXME */ fmtetc.dwAspect = header.dvAspect; fmtetc.lindex = header.lindex; - fmtetc.tymed = header.tymed; + fmtetc.tymed = tymed_from_cf( clipformat ); - add_cache_entry( This, &fmtetc, stm, pres_stream ); + add_cache_entry( This, &fmtetc, header.advf, stm, pres_stream ); } IStream_Release( stm ); } @@ -1505,7 +1517,7 @@ static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *s return E_FAIL; } - return add_cache_entry( This, fmt, stm, contents_stream ); + return add_cache_entry( This, fmt, 0, stm, contents_stream ); } static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; @@ -2177,7 +2189,7 @@ static HRESULT WINAPI DataCache_Cache( return CACHE_S_SAMECACHE; } - hr = DataCache_CreateEntry(This, &fmt_cpy, advf, &cache_entry, FALSE); + hr = DataCache_CreateEntry(This, &fmt_cpy, advf, &cache_entry); if (SUCCEEDED(hr)) { diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 394371b..37e89da 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -135,7 +135,7 @@ typedef struct PresentationDataHeader DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ DVASPECT dvAspect; DWORD lindex; - DWORD tymed; + DWORD advf; DWORD unknown7; /* 0 */ DWORD dwObjectExtentX; DWORD dwObjectExtentY; @@ -1173,7 +1173,7 @@ static void test_OleLoad(IStorage *pStorage) IStorage *stg; IStream *stream; IUnknown *obj; - DWORD data, i, tymed, data_size; + DWORD data, i, data_size; PresentationDataHeader header; HDC hdc; HGDIOBJ hobj; @@ -1222,12 +1222,10 @@ static void test_OleLoad(IStorage *pStorage) break; } - tymed = 1 << i; - header.unknown3 = 4; header.dvAspect = DVASPECT_CONTENT; header.lindex = -1; - header.tymed = tymed; + header.advf = 1 << i; header.unknown7 = 0; header.dwObjectExtentX = 1; header.dwObjectExtentY = 1; @@ -1247,19 +1245,19 @@ static void test_OleLoad(IStorage *pStorage) IStorage_Release(stg); continue; } - ok(hr == S_OK, "OleLoad error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + ok(hr == S_OK, "OleLoad error %#x: cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); hdc = CreateCompatibleDC(0); SetRect(&rc, 0, 0, 100, 100); hr = OleDraw(obj, DVASPECT_CONTENT, hdc, &rc); DeleteDC(hdc); if (fmt == CF_METAFILEPICT) - ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); else if (fmt == CF_ENHMETAFILE) todo_wine - ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, tymed = %u\n", hr, fmt, tymed); + ok(hr == S_OK, "OleDraw error %#x: cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); else - ok(hr == OLE_E_BLANK || hr == OLE_E_NOTRUNNING || hr == E_FAIL, "OleDraw should fail: %#x, cfFormat = %u, tymed = %u\n", hr, fmt, header.tymed); + ok(hr == OLE_E_BLANK || hr == OLE_E_NOTRUNNING || hr == E_FAIL, "OleDraw should fail: %#x, cfFormat = %u, advf = %#x\n", hr, fmt, header.advf); IUnknown_Release(obj); IStorage_Release(stg);

1 0

Huw Davies : ole32: Start allocating regular cache entries with id of 2.
by Alexandre Julliard June 6, 2017

June 6, 2017

Module: wine Branch: master Commit: 705ccd748812566bd5bc33ff75705bde5ef62236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=705ccd748812566bd5bc33ff7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 6 11:46:49 2017 +0100 ole32: Start allocating regular cache entries with id of 2. 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 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index d921603..c9ab200 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2622,7 +2622,7 @@ static DataCache* DataCache_Construct( newObject->sinkInterface = 0; newObject->presentationStorage = NULL; list_init(&newObject->cache_list); - newObject->last_cache_id = 1; + newObject->last_cache_id = 2; newObject->dirty = FALSE; newObject->running_object = NULL; diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 37e89da..6c6bea8 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2140,6 +2140,7 @@ static void test_data_cache_bitmap(void) hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( hr == S_OK, "got %08x\n", hr ); + ok( conn == 2, "got %d\n", conn ); expect[0].dwConnection = conn; expect[1].dwConnection = conn; @@ -2158,6 +2159,7 @@ static void test_data_cache_bitmap(void) hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( hr == S_OK, "got %08x\n", hr ); + ok( conn == 3, "got %d\n", conn ); expect[2].dwConnection = conn; check_enum_cache( cache, expect, 3); @@ -2168,6 +2170,7 @@ static void test_data_cache_bitmap(void) hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( hr == S_OK, "got %08x\n", hr ); + ok( conn == 4, "got %d\n", conn ); expect[3].dwConnection = conn; check_enum_cache( cache, expect, 4 );

1 0

Piotr Caban : msvcrt: Translate SEH exception on each call to __CxxFrameHandler (i386).
by Alexandre Julliard June 6, 2017

June 6, 2017

Module: wine Branch: master Commit: c7a51dfdcb58f96125f832eda67665e7eef657b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a51dfdcb58f96125f832eda… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 6 12:10:41 2017 +0200 msvcrt: Translate SEH exception on each call to __CxxFrameHandler (i386). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 963bd58..f777ba6 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -96,6 +96,13 @@ typedef struct __cxx_function_descr UINT flags; /* flags when magic >= VC8 */ } cxx_function_descr; +typedef struct +{ + cxx_exception_frame *frame; + const cxx_function_descr *descr; + EXCEPTION_REGISTRATION_RECORD *nested_frame; +} se_translator_ctx; + typedef struct _SCOPETABLE { int previousTryLevel; @@ -532,6 +539,26 @@ int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, return EXCEPTION_EXECUTE_HANDLER; } +static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c ) +{ + se_translator_ctx *ctx = (se_translator_ctx *)c; + EXCEPTION_RECORD *rec = ep->ExceptionRecord; + cxx_exception_type *exc_type; + + if (rec->ExceptionCode != CXX_EXCEPTION) + { + TRACE( "non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode ); + MSVCRT_terminate(); + } + + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; + call_catch_block( rec, ctx->frame, ctx->descr, + ctx->frame->trylevel, ctx->nested_frame, exc_type ); + + __DestructExceptionObject( rec ); + return ExceptionContinueSearch; +} + /********************************************************************* * cxx_frame_handler * @@ -604,10 +631,21 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if (data->se_translator) { EXCEPTION_POINTERS except_ptrs; + se_translator_ctx ctx; - except_ptrs.ExceptionRecord = rec; - except_ptrs.ContextRecord = context; - data->se_translator(rec->ExceptionCode, &except_ptrs); + ctx.frame = frame; + ctx.descr = descr; + ctx.nested_frame = nested_frame; + __TRY + { + except_ptrs.ExceptionRecord = rec; + except_ptrs.ContextRecord = context; + data->se_translator( rec->ExceptionCode, &except_ptrs ); + } + __EXCEPT_CTX(se_translation_filter, &ctx) + { + } + __ENDTRY } }

1 0

Francois Gouget : ole32: Make bitmap_info_size() static.
by Alexandre Julliard June 6, 2017

June 6, 2017

Module: wine Branch: master Commit: 85a130958cf3d5138ee9711dbede1ff44098bf60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85a130958cf3d5138ee9711db… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:38:56 2017 +0200 ole32: Make bitmap_info_size() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 420711a..b6c227e 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -229,7 +229,7 @@ const char *debugstr_formatetc(const FORMATETC *formatetc) * * Return the size of the bitmap info structure including color table. */ -int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) +static int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) { unsigned int colors, size, masks = 0;

1 0

Hugh McMaster : regedit: Use shared code to add favourite key items to the 'Remove' listbox.
by Alexandre Julliard June 6, 2017

June 6, 2017

Module: wine Branch: master Commit: 75fed2d5a1360d7769f42122b95c8d4087cd0889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fed2d5a1360d7769f42122b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 6 08:01:07 2017 +0000 regedit: Use shared code to add favourite key items to the 'Remove' listbox. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 46 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 9853810..0503dc8 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -215,15 +215,15 @@ static void add_remove_modify_menu_items(HMENU hMenu) } } -static void add_favourite_key_menu_items(HMENU hMenu) +static int add_favourite_key_items(HMENU hMenu, HWND hList) { HKEY hkey; LONG rc; - DWORD num_values, max_value_len, value_len, type, i; + DWORD num_values, max_value_len, value_len, type, i = 0; WCHAR *value_name; rc = RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, KEY_READ, &hkey); - if (rc != ERROR_SUCCESS) return; + if (rc != ERROR_SUCCESS) return 0; rc = RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, &num_values, &max_value_len, NULL, NULL, NULL); @@ -239,19 +239,25 @@ static void add_favourite_key_menu_items(HMENU hMenu) value_name = HeapAlloc(GetProcessHeap(), 0, max_value_len * sizeof(WCHAR)); CHECK_ENOUGH_MEMORY(value_name); - AppendMenuW(hMenu, MF_SEPARATOR, 0, 0); + if (hMenu) AppendMenuW(hMenu, MF_SEPARATOR, 0, 0); for (i = 0; i < num_values; i++) { value_len = max_value_len; rc = RegEnumValueW(hkey, i, value_name, &value_len, NULL, &type, NULL, NULL); if (rc == ERROR_SUCCESS && type == REG_SZ) - AppendMenuW(hMenu, MF_ENABLED | MF_STRING, ID_FAVORITE_FIRST + i, value_name); + { + if (hMenu) + AppendMenuW(hMenu, MF_ENABLED | MF_STRING, ID_FAVORITE_FIRST + i, value_name); + else if (hList) + SendMessageW(hList, LB_ADDSTRING, 0, (LPARAM)value_name); + } } HeapFree(GetProcessHeap(), 0, value_name); exit: RegCloseKey(hkey); + return i; } static void OnInitMenuPopup(HWND hWnd, HMENU hMenu) @@ -263,7 +269,7 @@ static void OnInitMenuPopup(HWND hWnd, HMENU hMenu) while (GetMenuItemCount(hMenu) > 2) DeleteMenu(hMenu, 2, MF_BYPOSITION); - add_favourite_key_menu_items(hMenu); + add_favourite_key_items(hMenu, NULL); } UpdateMenuItems(hMenu); @@ -710,35 +716,11 @@ static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w HWND hwndList = GetDlgItem(hwndDlg, IDC_NAME_LIST); switch(uMsg) { - case WM_INITDIALOG: { - HKEY hKey; - int i = 0; - EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); - if (RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, - 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - WCHAR namebuf[KEY_MAX_LEN]; - BYTE valuebuf[4096]; - DWORD ksize, vsize, type; - LONG error; - do { - ksize = KEY_MAX_LEN; - vsize = sizeof(valuebuf); - error = RegEnumValueW(hKey, i, namebuf, &ksize, NULL, &type, valuebuf, &vsize); - if (error != ERROR_SUCCESS) - break; - if (type == REG_SZ) { - SendMessageW(hwndList, LB_ADDSTRING, 0, (LPARAM)namebuf); - } - i++; - } while(error == ERROR_SUCCESS); - RegCloseKey(hKey); - } - else + case WM_INITDIALOG: + if (!add_favourite_key_items(NULL, hwndList)) return FALSE; - EnableWindow(GetDlgItem(hwndDlg, IDOK), i != 0); SendMessageW(hwndList, LB_SETCURSEL, 0, 0); return TRUE; - } case WM_COMMAND: switch(LOWORD(wParam)) { case IDC_NAME_LIST:

1 0

Hans Leidekker : webservices: Pass AI_PASSIVE when resolving the hostname for a listener socket.
by Alexandre Julliard June 6, 2017

June 6, 2017

Module: wine Branch: master Commit: 1fb0e25cfb32438aa0b1439a410e195af0e2fde3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb0e25cfb32438aa0b1439a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:56:01 2017 +0200 webservices: Pass AI_PASSIVE when resolving the hostname for a listener socket. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 4 ++-- dlls/webservices/listener.c | 14 +++++++++----- dlls/webservices/sock.h | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 9fb1944..1fa96a9 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -637,7 +637,7 @@ static HRESULT connect_channel_tcp( struct channel *channel ) winsock_init(); - hr = resolve_hostname( host, port, addr, &addr_len ); + hr = resolve_hostname( host, port, addr, &addr_len, 0 ); heap_free( host ); if (hr != S_OK) return hr; @@ -675,7 +675,7 @@ static HRESULT connect_channel_udp( struct channel *channel ) winsock_init(); - hr = resolve_hostname( host, port, addr, &addr_len ); + hr = resolve_hostname( host, port, addr, &addr_len, 0 ); heap_free( host ); if (hr != S_OK) return hr; diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 764e002..a658ee7 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -256,16 +256,20 @@ void WINAPI WsFreeListener( WS_LISTENER *handle ) free_listener( listener ); } -HRESULT resolve_hostname( const WCHAR *host, USHORT port, struct sockaddr *addr, int *addr_len ) +HRESULT resolve_hostname( const WCHAR *host, USHORT port, struct sockaddr *addr, int *addr_len, int flags ) { static const WCHAR fmtW[] = {'%','u',0}; WCHAR service[6]; - ADDRINFOW *res, *info; + ADDRINFOW hints, *res, *info; HRESULT hr = WS_E_ADDRESS_NOT_AVAILABLE; + memset( &hints, 0, sizeof(hints) ); + hints.ai_flags = flags; + hints.ai_family = AF_INET; + *addr_len = 0; sprintfW( service, fmtW, port ); - if (GetAddrInfoW( host, service, NULL, &res )) return HRESULT_FROM_WIN32( WSAGetLastError() ); + if (GetAddrInfoW( host, service, &hints, &res )) return HRESULT_FROM_WIN32( WSAGetLastError() ); info = res; while (info && info->ai_family != AF_INET) info = info->ai_next; @@ -330,7 +334,7 @@ static HRESULT open_listener_tcp( struct listener *listener, const WS_STRING *ur winsock_init(); - hr = resolve_hostname( host, port, addr, &addr_len ); + hr = resolve_hostname( host, port, addr, &addr_len, AI_PASSIVE ); heap_free( host ); if (hr != S_OK) return hr; @@ -381,7 +385,7 @@ static HRESULT open_listener_udp( struct listener *listener, const WS_STRING *ur winsock_init(); - hr = resolve_hostname( host, port, addr, &addr_len ); + hr = resolve_hostname( host, port, addr, &addr_len, AI_PASSIVE ); heap_free( host ); if (hr != S_OK) return hr; diff --git a/dlls/webservices/sock.h b/dlls/webservices/sock.h index e03b91e..282a777 100644 --- a/dlls/webservices/sock.h +++ b/dlls/webservices/sock.h @@ -19,6 +19,6 @@ #include "ws2tcpip.h" void winsock_init(void) DECLSPEC_HIDDEN; -HRESULT resolve_hostname( const WCHAR *, USHORT, struct sockaddr *, int * ) DECLSPEC_HIDDEN; +HRESULT resolve_hostname( const WCHAR *, USHORT, struct sockaddr *, int *, int ) DECLSPEC_HIDDEN; HRESULT channel_accept_tcp( SOCKET, HANDLE, HANDLE, WS_CHANNEL * ) DECLSPEC_HIDDEN; HRESULT channel_accept_udp( SOCKET, HANDLE, HANDLE, WS_CHANNEL * ) DECLSPEC_HIDDEN;

1 0