May 2017 - Wine-commits - list.winehq.org

Huw Davies : ole32: Check the cache entry' s stgmedium for the unloaded state.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: f9b0f60ae3c3d9f7c498ac22a079da85a13a29a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b0f60ae3c3d9f7c498ac22a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 23 13:11:39 2017 +0100 ole32: Check the cache entry's stgmedium for the unloaded state. 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 40d4ab8..a50c4fe 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -929,7 +929,7 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, STGMEDIUM *stgmedium) { - if (stgmedium->tymed == TYMED_NULL && cache_entry->stream) + if (cache_entry->stgmedium.tymed == TYMED_NULL && cache_entry->stream) { HRESULT hr = DataCacheEntry_LoadData(cache_entry); if (FAILED(hr))

1 0

Huw Davies : ole32: Implement IOleCache_EnumCache().
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 20a8f1adf4d2f9a43632670ff9368cf42432e157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a8f1adf4d2f9a43632670ff… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 23 13:11:40 2017 +0100 ole32: Implement IOleCache_EnumCache(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 3 +++ dlls/ole32/datacache.c | 36 ++++++++++++++++++++++++++++++----- dlls/ole32/oleobj.c | 45 +++++++++++++++++++++++++------------------- 3 files changed, 60 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 8bab819..64b6782 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -346,4 +346,7 @@ static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) return S_OK; } +extern HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, + BOOL copy, IEnumSTATDATA **ppenum) DECLSPEC_HIDDEN; + #endif /* __WINE_OLE_COMPOBJ_H */ diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index a50c4fe..5055c3f 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2129,12 +2129,38 @@ static HRESULT WINAPI DataCache_Uncache( return OLE_E_NOCONNECTION; } -static HRESULT WINAPI DataCache_EnumCache( - IOleCache2* iface, - IEnumSTATDATA** ppenumSTATDATA) +static HRESULT WINAPI DataCache_EnumCache(IOleCache2 *iface, + IEnumSTATDATA **enum_stat) { - FIXME("stub\n"); - return E_NOTIMPL; + DataCache *This = impl_from_IOleCache2( iface ); + DataCacheEntry *cache_entry; + int i = 0, count = list_count( &This->cache_list ); + STATDATA *data; + HRESULT hr; + + TRACE( "(%p, %p)\n", This, enum_stat ); + + data = CoTaskMemAlloc( count * sizeof(*data) ); + if (!data) return E_OUTOFMEMORY; + + LIST_FOR_EACH_ENTRY( cache_entry, &This->cache_list, DataCacheEntry, entry ) + { + if (i == count) break; + hr = copy_formatetc( &data[i].formatetc, &cache_entry->fmtetc ); + if (FAILED(hr)) goto fail; + data[i].advf = cache_entry->advise_flags; + data[i].pAdvSink = NULL; + data[i].dwConnection = cache_entry->id; + i++; + } + + hr = EnumSTATDATA_Construct( NULL, 0, i, data, FALSE, enum_stat ); + if (SUCCEEDED(hr)) return hr; + +fail: + while (i--) CoTaskMemFree( data[i].formatetc.ptd ); + CoTaskMemFree( data ); + return hr; } static HRESULT WINAPI DataCache_InitCache( diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 17ab8d0..44e15e5 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -71,8 +71,6 @@ static HRESULT copy_statdata(STATDATA *dst, const STATDATA *src) * EnumSTATDATA Implementation */ -static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, IEnumSTATDATA **ppenum); - typedef struct { IEnumSTATDATA IEnumSTATDATA_iface; @@ -120,7 +118,7 @@ static ULONG WINAPI EnumSTATDATA_Release(IEnumSTATDATA *iface) for(i = 0; i < This->num_of_elems; i++) release_statdata(This->statdata + i); HeapFree(GetProcessHeap(), 0, This->statdata); - IUnknown_Release(This->holder); + if (This->holder) IUnknown_Release(This->holder); HeapFree(GetProcessHeap(), 0, This); } return refs; @@ -184,7 +182,8 @@ static HRESULT WINAPI EnumSTATDATA_Clone(IEnumSTATDATA *iface, IEnumSTATDATA **p { EnumSTATDATA *This = impl_from_IEnumSTATDATA(iface); - return EnumSTATDATA_Construct(This->holder, This->index, This->num_of_elems, This->statdata, ppenum); + return EnumSTATDATA_Construct(This->holder, This->index, This->num_of_elems, This->statdata, + TRUE, ppenum); } static const IEnumSTATDATAVtbl EnumSTATDATA_VTable = @@ -198,8 +197,8 @@ static const IEnumSTATDATAVtbl EnumSTATDATA_VTable = EnumSTATDATA_Clone }; -static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, - IEnumSTATDATA **ppenum) +HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, + BOOL copy, IEnumSTATDATA **ppenum) { EnumSTATDATA *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); DWORD i, count; @@ -210,25 +209,33 @@ static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array This->ref = 1; This->index = index; - This->statdata = HeapAlloc(GetProcessHeap(), 0, array_len * sizeof(*This->statdata)); - if(!This->statdata) + if (copy) { - HeapFree(GetProcessHeap(), 0, This); - return E_OUTOFMEMORY; - } + This->statdata = HeapAlloc(GetProcessHeap(), 0, array_len * sizeof(*This->statdata)); + if(!This->statdata) + { + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } - for(i = 0, count = 0; i < array_len; i++) - { - if(data[i].pAdvSink) + for(i = 0, count = 0; i < array_len; i++) { - copy_statdata(This->statdata + count, data + i); - count++; + if(data[i].pAdvSink) + { + copy_statdata(This->statdata + count, data + i); + count++; + } } } + else + { + This->statdata = data; + count = array_len; + } This->num_of_elems = count; This->holder = holder; - IUnknown_AddRef(holder); + if (holder) IUnknown_AddRef(holder); *ppenum = &This->IEnumSTATDATA_iface; return S_OK; } @@ -403,7 +410,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_EnumAdvise(IOleAdviseHolder *iface, IE TRACE("(%p)->(%p)\n", This, enum_advise); IOleAdviseHolder_QueryInterface(iface, &IID_IUnknown, (void**)&unk); - hr = EnumSTATDATA_Construct(unk, 0, This->max_cons, This->connections, enum_advise); + hr = EnumSTATDATA_Construct(unk, 0, This->max_cons, This->connections, TRUE, enum_advise); IUnknown_Release(unk); return hr; } @@ -737,7 +744,7 @@ static HRESULT WINAPI DataAdviseHolder_EnumAdvise(IDataAdviseHolder *iface, TRACE("(%p)->(%p)\n", This, enum_advise); IDataAdviseHolder_QueryInterface(iface, &IID_IUnknown, (void**)&unk); - hr = EnumSTATDATA_Construct(unk, 0, This->maxCons, This->connections, enum_advise); + hr = EnumSTATDATA_Construct(unk, 0, This->maxCons, This->connections, TRUE, enum_advise); IUnknown_Release(unk); return hr; }

1 0

Huw Davies : ole32: Create CF_DIB and CF_BITMAP entries when either is cached.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: e27708f2fd5213cc181e8b40bb331c9a852a9c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27708f2fd5213cc181e8b40b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 23 13:11:41 2017 +0100 ole32: Create CF_DIB and CF_BITMAP entries when either is cached. 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 | 130 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 5055c3f..d850a34 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2079,6 +2079,7 @@ static HRESULT WINAPI DataCache_Cache( DataCache *This = impl_from_IOleCache2(iface); DataCacheEntry *cache_entry; HRESULT hr; + FORMATETC fmt_cpy; TRACE("(%p, 0x%x, %p)\n", pformatetc, advf, pdwConnection); @@ -2087,9 +2088,16 @@ static HRESULT WINAPI DataCache_Cache( TRACE("pformatetc = %s\n", debugstr_formatetc(pformatetc)); + fmt_cpy = *pformatetc; /* No need for a deep copy */ + if (fmt_cpy.cfFormat == CF_BITMAP && fmt_cpy.tymed == TYMED_GDI) + { + fmt_cpy.cfFormat = CF_DIB; + fmt_cpy.tymed = TYMED_HGLOBAL; + } + *pdwConnection = 0; - cache_entry = DataCache_GetEntryForFormatEtc(This, pformatetc); + cache_entry = DataCache_GetEntryForFormatEtc(This, &fmt_cpy); if (cache_entry) { TRACE("found an existing cache entry\n"); @@ -2097,7 +2105,7 @@ static HRESULT WINAPI DataCache_Cache( return CACHE_S_SAMECACHE; } - hr = DataCache_CreateEntry(This, pformatetc, advf, &cache_entry, FALSE); + hr = DataCache_CreateEntry(This, &fmt_cpy, advf, &cache_entry, FALSE); if (SUCCEEDED(hr)) { @@ -2134,24 +2142,44 @@ static HRESULT WINAPI DataCache_EnumCache(IOleCache2 *iface, { DataCache *This = impl_from_IOleCache2( iface ); DataCacheEntry *cache_entry; - int i = 0, count = list_count( &This->cache_list ); + int i = 0, count = 0; STATDATA *data; HRESULT hr; TRACE( "(%p, %p)\n", This, enum_stat ); + LIST_FOR_EACH_ENTRY( cache_entry, &This->cache_list, DataCacheEntry, entry ) + { + count++; + if (cache_entry->fmtetc.cfFormat == CF_DIB) + count++; + } + data = CoTaskMemAlloc( count * sizeof(*data) ); if (!data) return E_OUTOFMEMORY; LIST_FOR_EACH_ENTRY( cache_entry, &This->cache_list, DataCacheEntry, entry ) { - if (i == count) break; + if (i == count) goto fail; hr = copy_formatetc( &data[i].formatetc, &cache_entry->fmtetc ); if (FAILED(hr)) goto fail; data[i].advf = cache_entry->advise_flags; data[i].pAdvSink = NULL; data[i].dwConnection = cache_entry->id; i++; + + if (cache_entry->fmtetc.cfFormat == CF_DIB) + { + if (i == count) goto fail; + hr = copy_formatetc( &data[i].formatetc, &cache_entry->fmtetc ); + if (FAILED(hr)) goto fail; + data[i].formatetc.cfFormat = CF_BITMAP; + data[i].formatetc.tymed = TYMED_GDI; + data[i].advf = cache_entry->advise_flags; + data[i].pAdvSink = NULL; + data[i].dwConnection = cache_entry->id; + i++; + } } hr = EnumSTATDATA_Construct( NULL, 0, i, data, FALSE, enum_stat ); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 65abb3e..0102ca0 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1522,6 +1522,39 @@ static const IUnknownVtbl UnknownVtbl = static IUnknown unknown = { &UnknownVtbl }; +static void check_enum_cache(IOleCache2 *cache, STATDATA *expect, int num) +{ + IEnumSTATDATA *enum_stat; + STATDATA stat; + HRESULT hr; + + hr = IOleCache2_EnumCache( cache, &enum_stat ); + ok( hr == S_OK, "got %08x\n", hr ); + + while (IEnumSTATDATA_Next(enum_stat, 1, &stat, NULL) == S_OK) + { + ok( stat.formatetc.cfFormat == expect->formatetc.cfFormat, "got %d expect %d\n", + stat.formatetc.cfFormat, expect->formatetc.cfFormat ); + ok( !stat.formatetc.ptd == !expect->formatetc.ptd, "got %p expect %p\n", + stat.formatetc.ptd, expect->formatetc.ptd ); + ok( stat.formatetc.dwAspect == expect->formatetc.dwAspect, "got %d expect %d\n", + stat.formatetc.dwAspect, expect->formatetc.dwAspect ); + ok( stat.formatetc.lindex == expect->formatetc.lindex, "got %d expect %d\n", + stat.formatetc.lindex, expect->formatetc.lindex ); + ok( stat.formatetc.tymed == expect->formatetc.tymed, "got %d expect %d\n", + stat.formatetc.tymed, expect->formatetc.tymed ); + ok( stat.advf == expect->advf, "got %d expect %d\n", stat.advf, expect->advf ); + ok( stat.pAdvSink == 0, "got %p\n", stat.pAdvSink ); + ok( stat.dwConnection == expect->dwConnection, "got %d expect %d\n", stat.dwConnection, expect->dwConnection ); + num--; + expect++; + } + + ok( num == 0, "incorrect number. num %d\n", num ); + + IEnumSTATDATA_Release( enum_stat ); +} + static void test_data_cache(void) { HRESULT hr; @@ -1968,12 +2001,18 @@ static void test_data_cache_dib_contents_stream(int num) IDataObject *data; IViewObject2 *view; IStorage *stg; + IOleCache2 *cache; FORMATETC fmt = {CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; STGMEDIUM med; CLSID cls; SIZEL sz; BYTE *ptr; BITMAPINFOHEADER expect_info; + 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 }, + }; hr = CreateDataCache( NULL, &CLSID_Picture_Metafile, &IID_IUnknown, (void **)&unk ); ok( SUCCEEDED(hr), "got %08x\n", hr ); @@ -1983,6 +2022,8 @@ static void test_data_cache_dib_contents_stream(int num) ok( SUCCEEDED(hr), "got %08x\n", hr ); hr = IUnknown_QueryInterface( unk, &IID_IViewObject2, (void **)&view ); ok( SUCCEEDED(hr), "got %08x\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IOleCache2, (void **)&cache ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); stg = create_storage( num ); @@ -2015,6 +2056,8 @@ static void test_data_cache_dib_contents_stream(int num) GlobalUnlock( U(med).hGlobal ); ReleaseStgMedium( &med ); + check_enum_cache( cache, enum_expect, 2 ); + hr = IViewObject2_GetExtent( view, DVASPECT_CONTENT, -1, NULL, &sz ); ok( SUCCEEDED(hr), "got %08x\n", hr ); if (num == 0) @@ -2033,12 +2076,98 @@ static void test_data_cache_dib_contents_stream(int num) ReleaseDC( 0, hdc ); } + IOleCache2_Release( cache ); IViewObject2_Release( view ); IDataObject_Release( data ); IPersistStorage_Release( persist ); IUnknown_Release( unk ); } +static void test_data_cache_bitmap(void) +{ + HRESULT hr; + IOleCache2 *cache; + FORMATETC fmt; + DWORD conn; + STATDATA expect[] = + { + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 0 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 0 }, + {{ CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, 0, NULL, 0 }, + {{ CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, 0, NULL, 0 } + }; + + hr = CreateDataCache( NULL, &CLSID_NULL, &IID_IOleCache2, (void **)&cache ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* create a dib entry which will also create a bitmap entry too */ + fmt.cfFormat = CF_DIB; + fmt.ptd = NULL; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.lindex = -1; + fmt.tymed = TYMED_HGLOBAL; + + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + expect[0].dwConnection = conn; + expect[1].dwConnection = conn; + + check_enum_cache( cache, expect, 2 ); + + /* now try to add a bitmap */ + fmt.cfFormat = CF_BITMAP; + fmt.tymed = TYMED_GDI; + + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == CACHE_S_SAMECACHE, "got %08x\n", hr ); + + /* metafile */ + fmt.cfFormat = CF_METAFILEPICT; + fmt.tymed = TYMED_MFPICT; + + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + expect[2].dwConnection = conn; + + check_enum_cache( cache, expect, 3); + + /* enhmetafile */ + fmt.cfFormat = CF_ENHMETAFILE; + fmt.tymed = TYMED_ENHMF; + + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + expect[3].dwConnection = conn; + + check_enum_cache( cache, expect, 4 ); + + /* uncache everything */ + hr = IOleCache2_Uncache( cache, expect[3].dwConnection ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IOleCache2_Uncache( cache, expect[2].dwConnection ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IOleCache2_Uncache( cache, expect[0].dwConnection ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IOleCache2_Uncache( cache, expect[0].dwConnection ); + ok( hr == OLE_E_NOCONNECTION, "got %08x\n", hr ); + + check_enum_cache( cache, expect, 0 ); + + /* just create a bitmap entry which again adds both dib and bitmap */ + fmt.cfFormat = CF_BITMAP; + fmt.tymed = TYMED_GDI; + + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + + expect[0].dwConnection = conn; + expect[1].dwConnection = conn; + + check_enum_cache( cache, expect, 2 ); + + IOleCache2_Release( cache ); +} + static void test_default_handler(void) { HRESULT hr; @@ -2791,6 +2920,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_default_handler(); test_runnable(); test_OleRun();

1 0

Huw Davies : ole32: Synthesize dibs or bitmaps as appropriate.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 2e363267ebe1a6da518da6f8ac195aa56621bf76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e363267ebe1a6da518da6f8a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 23 13:11:42 2017 +0100 ole32: Synthesize dibs or bitmaps as appropriate. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 86 +++++++++++++++++++++++++++++++++++++++++++++---- dlls/ole32/tests/ole2.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index d850a34..420711a 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -297,13 +297,21 @@ static void DataCache_Destroy( static DataCacheEntry *DataCache_GetEntryForFormatEtc(DataCache *This, const FORMATETC *formatetc) { DataCacheEntry *cache_entry; + FORMATETC fmt = *formatetc; + + if (fmt.cfFormat == CF_BITMAP) + { + fmt.cfFormat = CF_DIB; + fmt.tymed = TYMED_HGLOBAL; + } + LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) { /* FIXME: also compare DVTARGETDEVICEs */ - if ((!cache_entry->fmtetc.cfFormat || !formatetc->cfFormat || (formatetc->cfFormat == cache_entry->fmtetc.cfFormat)) && - (formatetc->dwAspect == cache_entry->fmtetc.dwAspect) && - (formatetc->lindex == cache_entry->fmtetc.lindex) && - (!cache_entry->fmtetc.tymed || !formatetc->tymed || (formatetc->tymed == cache_entry->fmtetc.tymed))) + if ((!cache_entry->fmtetc.cfFormat || !fmt.cfFormat || (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))) return cache_entry; } return NULL; @@ -901,11 +909,56 @@ static HRESULT copy_stg_medium(CLIPFORMAT cf, STGMEDIUM *dest_stgm, return S_OK; } +static HGLOBAL synthesize_dib( HBITMAP bm ) +{ + HDC hdc = GetDC( 0 ); + BITMAPINFOHEADER header; + BITMAPINFO *bmi; + HGLOBAL ret = 0; + DWORD header_size; + + memset( &header, 0, sizeof(header) ); + header.biSize = sizeof(header); + if (!GetDIBits( hdc, bm, 0, 0, NULL, (BITMAPINFO *)&header, DIB_RGB_COLORS )) goto done; + + header_size = bitmap_info_size( (BITMAPINFO *)&header, DIB_RGB_COLORS ); + if (!(ret = GlobalAlloc( GMEM_MOVEABLE, header_size + header.biSizeImage ))) goto done; + bmi = GlobalLock( ret ); + memset( bmi, 0, header_size ); + memcpy( bmi, &header, header.biSize ); + GetDIBits( hdc, bm, 0, abs(header.biHeight), (char *)bmi + header_size, bmi, DIB_RGB_COLORS ); + GlobalUnlock( ret ); + +done: + ReleaseDC( 0, hdc ); + return ret; +} + +static HBITMAP synthesize_bitmap( HGLOBAL dib ) +{ + HBITMAP ret = 0; + BITMAPINFO *bmi; + HDC hdc = GetDC( 0 ); + + if ((bmi = GlobalLock( dib ))) + { + /* FIXME: validate data size */ + ret = CreateDIBitmap( hdc, &bmi->bmiHeader, CBM_INIT, + (char *)bmi + bitmap_info_size( bmi, DIB_RGB_COLORS ), + bmi, DIB_RGB_COLORS ); + GlobalUnlock( dib ); + } + ReleaseDC( 0, hdc ); + return ret; +} + static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, const FORMATETC *formatetc, - const STGMEDIUM *stgmedium, + STGMEDIUM *stgmedium, BOOL fRelease) { + STGMEDIUM dib_copy; + if ((!cache_entry->fmtetc.cfFormat && !formatetc->cfFormat) || (cache_entry->fmtetc.tymed == TYMED_NULL && formatetc->tymed == TYMED_NULL) || stgmedium->tymed == TYMED_NULL) @@ -917,6 +970,17 @@ 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) + { + dib_copy.tymed = TYMED_HGLOBAL; + dib_copy.u.hGlobal = synthesize_dib( stgmedium->u.hBitmap ); + dib_copy.pUnkForRelease = NULL; + if (fRelease) ReleaseStgMedium(stgmedium); + stgmedium = &dib_copy; + fRelease = TRUE; + } + if (fRelease) { cache_entry->stgmedium = *stgmedium; @@ -927,7 +991,7 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, &cache_entry->stgmedium, stgmedium); } -static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, STGMEDIUM *stgmedium) +static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, FORMATETC *fmt, STGMEDIUM *stgmedium) { if (cache_entry->stgmedium.tymed == TYMED_NULL && cache_entry->stream) { @@ -937,6 +1001,14 @@ static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, STGMEDIUM *st } if (cache_entry->stgmedium.tymed == TYMED_NULL) return OLE_E_BLANK; + + if (fmt->cfFormat == CF_BITMAP) + { + stgmedium->tymed = TYMED_GDI; + stgmedium->u.hBitmap = synthesize_bitmap( cache_entry->stgmedium.u.hGlobal ); + stgmedium->pUnkForRelease = NULL; + return S_OK; + } return copy_stg_medium(cache_entry->data_cf, stgmedium, &cache_entry->stgmedium); } @@ -1109,7 +1181,7 @@ static HRESULT WINAPI DataCache_GetData( if (!cache_entry) return OLE_E_BLANK; - return DataCacheEntry_GetData(cache_entry, pmedium); + return DataCacheEntry_GetData(cache_entry, pformatetcIn, pmedium); } static HRESULT WINAPI DataCache_GetDataHere( diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 0102ca0..394371b 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1993,6 +1993,18 @@ static IStorage *create_storage( int num ) return stg; } +static HGLOBAL create_dib( void ) +{ + HGLOBAL h; + void *ptr; + + h = GlobalAlloc( GMEM_MOVEABLE, sizeof(dib) - sizeof(BITMAPFILEHEADER) ); + ptr = GlobalLock( h ); + memcpy( ptr, dib + sizeof(BITMAPFILEHEADER), sizeof(dib) - sizeof(BITMAPFILEHEADER) ); + GlobalUnlock( h ); + return h; +} + static void test_data_cache_dib_contents_stream(int num) { HRESULT hr; @@ -2083,12 +2095,33 @@ static void test_data_cache_dib_contents_stream(int num) IUnknown_Release( unk ); } +static void check_bitmap_size( HBITMAP h, int cx, int cy ) +{ + BITMAP bm; + + GetObjectW( h, sizeof(bm), &bm ); + ok( bm.bmWidth == cx, "got %d expect %d\n", bm.bmWidth, cx ); + ok( bm.bmHeight == cy, "got %d expect %d\n", bm.bmHeight, cy ); +} + +static void check_dib_size( HGLOBAL h, int cx, int cy ) +{ + BITMAPINFO *info; + + info = GlobalLock( h ); + ok( info->bmiHeader.biWidth == cx, "got %d expect %d\n", info->bmiHeader.biWidth, cx ); + ok( info->bmiHeader.biHeight == cy, "got %d expect %d\n", info->bmiHeader.biHeight, cy ); + GlobalUnlock( h ); +} + static void test_data_cache_bitmap(void) { HRESULT hr; IOleCache2 *cache; + IDataObject *data; FORMATETC fmt; DWORD conn; + STGMEDIUM med; STATDATA expect[] = { {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 0 }, @@ -2165,6 +2198,57 @@ static void test_data_cache_bitmap(void) check_enum_cache( cache, expect, 2 ); + /* Try setting a 1x1 bitmap */ + hr = IOleCache2_QueryInterface( cache, &IID_IDataObject, (void **) &data ); + ok( hr == S_OK, "got %08x\n", hr ); + + med.tymed = TYMED_GDI; + U(med).hBitmap = CreateBitmap( 1, 1, 1, 1, NULL ); + med.pUnkForRelease = NULL; + + hr = IOleCache2_SetData( cache, &fmt, &med, TRUE ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IDataObject_GetData( data, &fmt, &med ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( med.tymed == TYMED_GDI, "got %d\n", med.tymed ); + check_bitmap_size( U(med).hBitmap, 1, 1 ); + ReleaseStgMedium( &med ); + + fmt.cfFormat = CF_DIB; + fmt.tymed = TYMED_HGLOBAL; + hr = IDataObject_GetData( data, &fmt, &med ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( med.tymed == TYMED_HGLOBAL, "got %d\n", med.tymed ); + check_dib_size( U(med).hGlobal, 1, 1 ); + ReleaseStgMedium( &med ); + + /* Now set a 2x1 dib */ + fmt.cfFormat = CF_DIB; + fmt.tymed = TYMED_HGLOBAL; + med.tymed = TYMED_HGLOBAL; + U(med).hGlobal = create_dib(); + + hr = IOleCache2_SetData( cache, &fmt, &med, TRUE ); + ok( hr == S_OK, "got %08x\n", hr ); + + fmt.cfFormat = CF_BITMAP; + fmt.tymed = TYMED_GDI; + hr = IDataObject_GetData( data, &fmt, &med ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( med.tymed == TYMED_GDI, "got %d\n", med.tymed ); + check_bitmap_size( U(med).hBitmap, 2, 1 ); + ReleaseStgMedium( &med ); + + fmt.cfFormat = CF_DIB; + fmt.tymed = TYMED_HGLOBAL; + hr = IDataObject_GetData( data, &fmt, &med ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( med.tymed == TYMED_HGLOBAL, "got %d\n", med.tymed ); + check_dib_size( U(med).hGlobal, 2, 1 ); + ReleaseStgMedium( &med ); + + IDataObject_Release( data ); IOleCache2_Release( cache ); }

1 0

Józef Kucia : d3d11/tests: Add additional test for occlussion query.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 4d00e05e518f0b9e35b04f6c150c142e37788bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d00e05e518f0b9e35b04f6c1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 23 13:11:40 2017 +0200 d3d11/tests: Add additional test for occlussion query. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b15ba37..7cc68f7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4833,6 +4833,48 @@ static void test_occlusion_query(void) "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); ID3D11Asynchronous_Release(query); + + /* The following test exercises a code path in wined3d. A wined3d context + * associated with the query is destroyed when the swapchain is released. */ + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + vp.Width = 64.0f; + vp.Height = 64.0f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_Begin(context, query); + draw_color_quad(&test_context, &red); + ID3D11DeviceContext_End(context, query); + + ID3D11RenderTargetView_Release(test_context.backbuffer_rtv); + ID3D11Texture2D_Release(test_context.backbuffer); + IDXGISwapChain_Release(test_context.swapchain); + test_context.swapchain = create_swapchain(device, test_context.window, NULL); + hr = IDXGISwapChain_GetBuffer(test_context.swapchain, 0, &IID_ID3D11Texture2D, + (void **)&test_context.backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)test_context.backbuffer, + NULL, &test_context.backbuffer_rtv); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, NULL); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* This test occasionally succeeds with CSMT enabled because of a race condition. */ +if (0) + todo_wine ok(data.dword[0] == 0x1000 && !data.dword[1], + "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + ID3D11Asynchronous_Release(query); ID3D11RenderTargetView_Release(rtv); ID3D11Texture2D_Release(texture); release_test_context(&test_context);

1 0

Józef Kucia : d3d11/tests: Add basic test for quad tessellation.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 131091dcc9f97bd7dd2783780db09e9ba7bcb0f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=131091dcc9f97bd7dd2783780… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 23 13:11:41 2017 +0200 d3d11/tests: Add basic test for quad tessellation. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 416 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 414 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=131091dcc9f97bd7dd278…

1 0

Józef Kucia : include/d3d9: Update D3DQUERYTYPE enum.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 678f6bbdb45bf4a5f3f5608232abb3ee875b11f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=678f6bbdb45bf4a5f3f560823… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 23 13:11:42 2017 +0200 include/d3d9: Update D3DQUERYTYPE enum. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9types.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 82e5112..ed14e9b 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -307,7 +307,8 @@ typedef enum _D3DQUERYTYPE { D3DQUERYTYPE_VERTEXTIMINGS = 15, D3DQUERYTYPE_PIXELTIMINGS = 16, D3DQUERYTYPE_BANDWIDTHTIMINGS = 17, - D3DQUERYTYPE_CACHEUTILIZATION = 18 + D3DQUERYTYPE_CACHEUTILIZATION = 18, + D3DQUERYTYPE_MEMORYPRESSURE = 19, } D3DQUERYTYPE; #define D3DISSUE_BEGIN (1 << 1)

1 0

Józef Kucia : d3d9/tests: Use ARRAY_SIZE() macro in device tests.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 5a03f2c430c2dbf411434cb988f4c219b88567ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a03f2c430c2dbf411434cb98… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 23 13:11:43 2017 +0200 d3d9/tests: Use ARRAY_SIZE() macro in device tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 88 +++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a03f2c430c2dbf411434…

1 0

Józef Kucia : d3d9/tests: Add test for invalid query types.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 42951f3e1014a3a165c3abffd55a1885ad3679f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42951f3e1014a3a165c3abffd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 23 13:11:44 2017 +0200 d3d9/tests: Add test for invalid query types. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 8ace42f..89ea772 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5539,6 +5539,20 @@ static void test_query_support(void) } } + for (i = 0; i < 40; ++i) + { + if (D3DQUERYTYPE_VCACHE <= i && i <= D3DQUERYTYPE_MEMORYPRESSURE) + continue; + + hr = IDirect3DDevice9_CreateQuery(device, i, NULL); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x for query %#x.\n", hr, i); + + query = (IDirect3DQuery9 *)0xdeadbeef; + hr = IDirect3DDevice9_CreateQuery(device, i, &query); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x for query %#x.\n", hr, i); + ok(query == (IDirect3DQuery9 *)0xdeadbeef, "Got unexpected query %p.\n", query); + } + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d9);

1 0

Jacek Caban : rpcrt4: Remove no longer needed helpers.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: c953763a4c7b4e5b0881cbe6f3b2d85e752f733a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c953763a4c7b4e5b0881cbe6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 23 17:38:43 2017 +0200 rpcrt4: Remove no longer needed helpers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 1e7a62b..37a0f6f 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1093,17 +1093,6 @@ static BOOL rpcrt4_sock_wait_for_send(RpcConnection_tcp *tcpc) } } -static void rpcrt4_sock_wait_cancel(RpcConnection_tcp *tcpc) -{ - SetEvent(tcpc->cancel_event); -} - -static void rpcrt4_sock_wait_destroy(RpcConnection_tcp *tcpc) -{ - CloseHandle(tcpc->sock_event); - CloseHandle(tcpc->cancel_event); -} - static RpcConnection *rpcrt4_conn_tcp_alloc(void) { RpcConnection_tcp *tcpc; @@ -1433,24 +1422,27 @@ static int rpcrt4_conn_tcp_write(RpcConnection *Connection, return bytes_written; } -static int rpcrt4_conn_tcp_close(RpcConnection *Connection) +static int rpcrt4_conn_tcp_close(RpcConnection *conn) { - RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; + RpcConnection_tcp *connection = (RpcConnection_tcp *) conn; - TRACE("%d\n", tcpc->sock); + TRACE("%d\n", connection->sock); - if (tcpc->sock != -1) - closesocket(tcpc->sock); - tcpc->sock = -1; - rpcrt4_sock_wait_destroy(tcpc); - return 0; + if (connection->sock != -1) + closesocket(connection->sock); + connection->sock = -1; + CloseHandle(connection->sock_event); + CloseHandle(connection->cancel_event); + return 0; } -static void rpcrt4_conn_tcp_cancel_call(RpcConnection *Connection) +static void rpcrt4_conn_tcp_cancel_call(RpcConnection *conn) { - RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; - TRACE("%p\n", Connection); - rpcrt4_sock_wait_cancel(tcpc); + RpcConnection_tcp *connection = (RpcConnection_tcp *) conn; + + TRACE("%p\n", connection); + + SetEvent(connection->cancel_event); } static RPC_STATUS rpcrt4_conn_tcp_is_server_listening(const char *endpoint)

1 0