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

Zebediah Figura : widl: Size of an encapsulated union doesn' t include the tag.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 947ff4ba46ff140afd3deccbb3de304778cda723 URL: https://source.winehq.org/git/wine.git/?a=commit;h=947ff4ba46ff140afd3deccb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 10 20:30:29 2018 -0500 widl: Size of an encapsulated union doesn't include the tag. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 27855cc..9f62589 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3248,6 +3248,7 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, unsigned int nbranch = 0; type_t *deftype = NULL; short nodeftype = 0xffff; + unsigned int dummy; var_t *f; if (processed(type) && @@ -3256,10 +3257,10 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, guard_rec(type); - size = type_memsize(type); - fields = type_union_get_cases(type); + size = union_memsize(fields, &dummy); + if (fields) LIST_FOR_EACH_ENTRY(f, fields, var_t, entry) { expr_list_t *cases = get_attrp(f->attrs, ATTR_CASE);

1 0

Sergio Gómez Del Real : ole32: Add support for loading enhmetafiles from presentation and contents streams to data cache.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 3350cf23209ebafba07578a7fcab1b8ebc6a7993 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3350cf23209ebafba07578a7… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Wed Apr 11 11:45:14 2018 -0500 ole32: Add support for loading enhmetafiles from presentation and contents streams to data cache. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 106 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 82 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 325a98b..ff42e4d 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -547,6 +547,30 @@ static HRESULT open_pres_stream( IStorage *stg, int stream_number, IStream **stm return IStorage_OpenStream( stg, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); } +static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med ) +{ + METAFILEPICT *pict; + HRESULT hr = E_FAIL; + UINT size; + void *bits; + + if (!(pict = GlobalLock( data ))) return hr; + + size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); + if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) + { + GetMetaFileBitsEx( pict->hMF, size, bits ); + med->u.hEnhMetaFile = SetWinMetaFileBits( size, bits, NULL, pict ); + HeapFree( GetProcessHeap(), 0, bits ); + med->tymed = TYMED_ENHMF; + med->pUnkForRelease = NULL; + hr = S_OK; + } + + GlobalUnlock( data ); + return hr; +} + static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) { HRESULT hr; @@ -704,6 +728,60 @@ fail: } +static HRESULT load_emf( DataCacheEntry *cache_entry, IStream *stm ) +{ + HRESULT hr; + + if (cache_entry->load_stream_num != STREAM_NUMBER_CONTENTS) + { + STGMEDIUM stgmed; + + hr = load_mf_pict( cache_entry, stm ); + if (SUCCEEDED( hr )) + { + hr = synthesize_emf( cache_entry->stgmedium.u.hMetaFilePict, &stgmed ); + ReleaseStgMedium( &cache_entry->stgmedium ); + } + if (SUCCEEDED( hr )) + cache_entry->stgmedium = stgmed; + } + else + { + STATSTG stat; + BYTE *data; + ULONG read, size_bits; + + hr = IStream_Stat( stm, &stat, STATFLAG_NONAME ); + + if (SUCCEEDED( hr )) + { + data = HeapAlloc( GetProcessHeap(), 0, stat.cbSize.u.LowPart ); + if (!data) return E_OUTOFMEMORY; + + hr = IStream_Read( stm, data, stat.cbSize.u.LowPart, &read ); + if (hr != S_OK) + { + HeapFree( GetProcessHeap(), 0, data ); + return hr; + } + + if (read <= sizeof(DWORD) + sizeof(ENHMETAHEADER)) + { + HeapFree( GetProcessHeap(), 0, data ); + return E_FAIL; + } + size_bits = read - sizeof(DWORD) - sizeof(ENHMETAHEADER); + cache_entry->stgmedium.u.hEnhMetaFile = SetEnhMetaFileBits( size_bits, data + (read - size_bits) ); + cache_entry->stgmedium.tymed = TYMED_ENHMF; + cache_entry->stgmedium.pUnkForRelease = NULL; + + HeapFree( GetProcessHeap(), 0, data ); + } + } + + return hr; +} + /************************************************************************ * DataCacheEntry_LoadData * @@ -736,6 +814,10 @@ static HRESULT DataCacheEntry_LoadData(DataCacheEntry *cache_entry, IStorage *st hr = load_dib( cache_entry, stm ); break; + case CF_ENHMETAFILE: + hr = load_emf( cache_entry, stm ); + break; + default: FIXME( "Unimplemented clip format %x\n", cache_entry->fmtetc.cfFormat ); hr = E_NOTIMPL; @@ -1118,30 +1200,6 @@ static HRESULT synthesize_bitmap( HGLOBAL dib, STGMEDIUM *med ) return hr; } -static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med ) -{ - METAFILEPICT *pict; - HRESULT hr = E_FAIL; - UINT size; - void *bits; - - if (!(pict = GlobalLock( data ))) return hr; - - size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); - if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) - { - GetMetaFileBitsEx( pict->hMF, size, bits ); - med->u.hEnhMetaFile = SetWinMetaFileBits( size, bits, NULL, pict ); - HeapFree( GetProcessHeap(), 0, bits ); - med->tymed = TYMED_ENHMF; - med->pUnkForRelease = NULL; - hr = S_OK; - } - - GlobalUnlock( data ); - return hr; -} - static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, const FORMATETC *formatetc, STGMEDIUM *stgmedium,

1 0

Sergio Gómez Del Real : ole32: Add support for loading dibs from presentation streams to data cache.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: a1a99f014c36d60218e5df8fdc1bea8559b661dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1a99f014c36d60218e5df8f… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Wed Apr 11 11:45:15 2018 -0500 ole32: Add support for loading dibs from presentation streams to data cache. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 53 +++++++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ff42e4d..22b39cb 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -647,48 +647,61 @@ static HRESULT load_dib( DataCacheEntry *cache_entry, IStream *stm ) { HRESULT hr; STATSTG stat; - void *dib; + BYTE *dib; HGLOBAL hglobal; ULONG read, info_size, bi_size; BITMAPFILEHEADER file; BITMAPINFOHEADER *info; + CLIPFORMAT cf; + PresentationDataHeader pres; + ULARGE_INTEGER current_pos; + static const LARGE_INTEGER offset_zero; + + hr = IStream_Stat( stm, &stat, STATFLAG_NONAME ); + if (FAILED( hr )) return hr; if (cache_entry->load_stream_num != STREAM_NUMBER_CONTENTS) { - FIXME( "Unimplemented for presentation stream\n" ); - return E_FAIL; + hr = read_clipformat( stm, &cf ); + if (hr != S_OK) return hr; + hr = IStream_Read( stm, &pres, sizeof(pres), &read ); + if (hr != S_OK) return hr; + } + else + { + hr = IStream_Read( stm, &file, sizeof(BITMAPFILEHEADER), &read ); + if (hr != S_OK) return hr; } - hr = IStream_Stat( stm, &stat, STATFLAG_NONAME ); + hr = IStream_Seek( stm, offset_zero, STREAM_SEEK_CUR, &current_pos ); if (FAILED( hr )) return hr; - - if (stat.cbSize.QuadPart < sizeof(file) + sizeof(DWORD)) return E_FAIL; - hr = IStream_Read( stm, &file, sizeof(file), &read ); - if (hr != S_OK || read != sizeof(file)) return E_FAIL; - stat.cbSize.QuadPart -= sizeof(file); + stat.cbSize.QuadPart -= current_pos.QuadPart; hglobal = GlobalAlloc( GMEM_MOVEABLE, stat.cbSize.u.LowPart ); if (!hglobal) return E_OUTOFMEMORY; dib = GlobalLock( hglobal ); + /* read first DWORD of BITMAPINFOHEADER */ hr = IStream_Read( stm, dib, sizeof(DWORD), &read ); - if (hr != S_OK || read != sizeof(DWORD)) goto fail; + if (hr != S_OK) goto fail; bi_size = *(DWORD *)dib; if (stat.cbSize.QuadPart < bi_size) goto fail; - hr = IStream_Read( stm, (char *)dib + sizeof(DWORD), bi_size - sizeof(DWORD), &read ); - if (hr != S_OK || read != bi_size - sizeof(DWORD)) goto fail; + /* read rest of BITMAPINFOHEADER */ + hr = IStream_Read( stm, dib + sizeof(DWORD), bi_size - sizeof(DWORD), &read ); + if (hr != S_OK) goto fail; - info_size = bitmap_info_size( dib, DIB_RGB_COLORS ); + info_size = bitmap_info_size( (BITMAPINFO *)dib, DIB_RGB_COLORS ); if (stat.cbSize.QuadPart < info_size) goto fail; if (info_size > bi_size) { - hr = IStream_Read( stm, (char *)dib + bi_size, info_size - bi_size, &read ); - if (hr != S_OK || read != info_size - bi_size) goto fail; + hr = IStream_Read( stm, dib + bi_size, info_size - bi_size, &read ); + if (hr != S_OK) goto fail; } stat.cbSize.QuadPart -= info_size; - if (file.bfOffBits) + /* set Stream pointer to beginning of bitmap bits */ + if (cache_entry->load_stream_num == STREAM_NUMBER_CONTENTS && file.bfOffBits) { LARGE_INTEGER skip; @@ -699,8 +712,8 @@ static HRESULT load_dib( DataCacheEntry *cache_entry, IStream *stm ) stat.cbSize.QuadPart -= skip.QuadPart; } - hr = IStream_Read( stm, (char *)dib + info_size, stat.cbSize.u.LowPart, &read ); - if (hr != S_OK || read != stat.cbSize.QuadPart) goto fail; + hr = IStream_Read( stm, dib + info_size, stat.cbSize.u.LowPart, &read ); + if (hr != S_OK) goto fail; if (bi_size >= sizeof(*info)) { @@ -719,12 +732,12 @@ static HRESULT load_dib( DataCacheEntry *cache_entry, IStream *stm ) cache_entry->stgmedium.tymed = TYMED_HGLOBAL; cache_entry->stgmedium.u.hGlobal = hglobal; - return S_OK; + return hr; fail: GlobalUnlock( hglobal ); GlobalFree( hglobal ); - return E_FAIL; + return hr; }

1 0

Sergio Gómez Del Real : ole32: Add support for loading wmf from contents streams to data cache.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 0792209187f7174ba3a6bfffe68e54510167d9af URL: https://source.winehq.org/git/wine.git/?a=commit;h=0792209187f7174ba3a6bfff… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Wed Apr 11 11:45:16 2018 -0500 ole32: Add support for loading wmf from contents streams to data cache. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 65 ++++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 22b39cb..b98c448 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -570,6 +570,17 @@ static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med ) GlobalUnlock( data ); return hr; } +#include <pshpack2.h> +struct meta_placeable +{ + DWORD key; + WORD hwmf; + WORD bounding_box[4]; + WORD inch; + DWORD reserved; + WORD checksum; +}; +#include <poppack.h> static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) { @@ -583,25 +594,26 @@ static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) CLIPFORMAT clipformat; static const LARGE_INTEGER offset_zero; ULONG read; - - if (cache_entry->load_stream_num == STREAM_NUMBER_CONTENTS) - { - FIXME( "Unimplemented for CONTENTS stream\n" ); - return E_FAIL; - } + struct meta_placeable mf_place; hr = IStream_Stat( stm, &stat, STATFLAG_NONAME ); if (FAILED( hr )) return hr; - hr = read_clipformat( stm, &clipformat ); - if (FAILED( hr )) return hr; - - hr = IStream_Read( stm, &header, sizeof(header), &read ); - if (hr != S_OK || read != sizeof(header)) return E_FAIL; + if (cache_entry->load_stream_num != STREAM_NUMBER_CONTENTS) + { + hr = read_clipformat( stm, &clipformat ); + if (hr != S_OK) return hr; + hr = IStream_Read( stm, &header, sizeof(header), &read ); + if (hr != S_OK) return hr; + } + else + { + hr = IStream_Read( stm, &mf_place, sizeof(mf_place), &read ); + if (hr != S_OK) return hr; + } hr = IStream_Seek( stm, offset_zero, STREAM_SEEK_CUR, &current_pos ); if (FAILED( hr )) return hr; - stat.cbSize.QuadPart -= current_pos.QuadPart; hmfpict = GlobalAlloc( GMEM_MOVEABLE, sizeof(METAFILEPICT) ); @@ -616,14 +628,23 @@ static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) } hr = IStream_Read( stm, bits, stat.cbSize.u.LowPart, &read ); - if (hr != S_OK || read != stat.cbSize.u.LowPart) hr = E_FAIL; if (SUCCEEDED( hr )) { - /* FIXME: get this from the stream */ mfpict->mm = MM_ANISOTROPIC; - mfpict->xExt = header.dwObjectExtentX; - mfpict->yExt = header.dwObjectExtentY; + /* FIXME: get this from the stream */ + if (cache_entry->load_stream_num != STREAM_NUMBER_CONTENTS) + { + mfpict->xExt = header.dwObjectExtentX; + mfpict->yExt = header.dwObjectExtentY; + } + else + { + mfpict->xExt = ((mf_place.bounding_box[2] - mf_place.bounding_box[0]) + * 2540) / mf_place.inch; + mfpict->yExt = ((mf_place.bounding_box[3] - mf_place.bounding_box[1]) + * 2540) / mf_place.inch; + } mfpict->hMF = SetMetaFileBitsEx( stat.cbSize.u.LowPart, bits ); if (!mfpict->hMF) hr = E_FAIL; @@ -912,18 +933,6 @@ end: return hr; } -#include <pshpack2.h> -struct meta_placeable -{ - DWORD key; - WORD hwmf; - WORD bounding_box[4]; - WORD inch; - DWORD reserved; - WORD checksum; -}; -#include <poppack.h> - static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream) { HRESULT hr = S_OK;

1 0

Sergio Gómez Del Real : ole32: Reset CLSID of datacache so that automatic entry is re-created on load.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 33fd8787289d9c3da7325aed9b576ae2dadaa040 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33fd8787289d9c3da7325aed… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Wed Apr 11 11:45:17 2018 -0500 ole32: Reset CLSID of datacache so that automatic entry is re-created on load. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index b98c448..b72b8ff 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1843,6 +1843,7 @@ static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *stg ) LIST_FOR_EACH_ENTRY_SAFE( entry, cursor2, &This->cache_list, DataCacheEntry, entry ) DataCacheEntry_Destroy( This, entry ); + This->clsid = CLSID_NULL; ReadClassStg( stg, &clsid ); hr = create_automatic_entry( This, &clsid );

1 0

Sergio Gómez Del Real : ole32/tests: Add tests for loading from presentation streams to data cache.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: edb7f51209044c9c566536dbf26aef546dbc8875 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edb7f51209044c9c566536db… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Wed Apr 11 11:45:18 2018 -0500 ole32/tests: Add tests for loading from presentation streams to data cache. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 112 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 3bd4acc..74dadd4 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4078,6 +4078,83 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ } } +static HRESULT stgmedium_cmp(const STGMEDIUM *med1, STGMEDIUM *med2) +{ + BYTE *data1, *data2; + ULONG datasize1, datasize2; + + if (med1->tymed != med2->tymed) + return E_FAIL; + + if (med1->tymed == TYMED_MFPICT) + { + METAFILEPICT *mfpict1 = GlobalLock(U(med1)->hMetaFilePict); + METAFILEPICT *mfpict2 = GlobalLock(U(med2)->hMetaFilePict); + + datasize1 = GetMetaFileBitsEx(mfpict1->hMF, 0, NULL); + datasize2 = GetMetaFileBitsEx(mfpict2->hMF, 0, NULL); + if (datasize1 == datasize2) + { + data1 = HeapAlloc(GetProcessHeap(), 0, datasize1); + data2 = HeapAlloc(GetProcessHeap(), 0, datasize2); + GetMetaFileBitsEx(mfpict1->hMF, datasize1, data1); + GetMetaFileBitsEx(mfpict2->hMF, datasize2, data2); + } + else return E_FAIL; + } + else if (med1->tymed == TYMED_ENHMF) + { + datasize1 = GetEnhMetaFileBits(med1->hEnhMetaFile, 0, NULL); + datasize2 = GetEnhMetaFileBits(med2->hEnhMetaFile, 0, NULL); + if (datasize1 == datasize2) + { + data1 = HeapAlloc(GetProcessHeap(), 0, datasize1); + data2 = HeapAlloc(GetProcessHeap(), 0, datasize2); + GetEnhMetaFileBits(med1->hEnhMetaFile, datasize1, data1); + GetEnhMetaFileBits(med2->hEnhMetaFile, datasize2, data2); + } + else return E_FAIL; + } + else if (med1->tymed == TYMED_HGLOBAL) + { + datasize1 = GlobalSize(med1->hGlobal); + datasize2 = GlobalSize(med2->hGlobal); + + if (datasize1 == datasize2) + { + data1 = GlobalLock(med1->hGlobal); + data2 = GlobalLock(med2->hGlobal); + } + else + return E_FAIL; + } + else + return E_NOTIMPL; + + if (memcmp(data1, data2, datasize1) != 0) + return E_FAIL; + + if (med1->tymed == TYMED_HGLOBAL) + { + GlobalUnlock(U(med1)->hGlobal); + GlobalUnlock(U(med2)->hGlobal); + } + else if (med1->tymed == TYMED_MFPICT) + { + HeapFree(GetProcessHeap(), 0, data1); + HeapFree(GetProcessHeap(), 0, data2); + GlobalUnlock(U(med1)->hMetaFilePict); + GlobalUnlock(U(med2)->hMetaFilePict); + } + else + { + HeapFree(GetProcessHeap(), 0, data1); + HeapFree(GetProcessHeap(), 0, data2); + } + + return S_OK; +} + static IStorage *create_storage_from_def(const struct storage_def *stg_def) { HRESULT hr; @@ -4250,8 +4327,10 @@ static void test_data_cache_save_data(void) IStorage *doc; IOleCache2 *cache; IPersistStorage *persist; + IDataObject *odata; int enumerated_streams, matched_streams, i; DWORD dummy; + STGMEDIUM stgmeds[MAX_FMTS]; struct tests_data_cache { FORMATETC fmts[MAX_FMTS]; @@ -4366,9 +4445,9 @@ static void test_data_cache_save_data(void) ok(SUCCEEDED(hr), "unexpected %#x\n", hr); if (i < pdata->num_set) { - get_stgmedium(pdata->fmts[i].cfFormat, &stgmed); - get_stgdef(&pdata->stg_def, pdata->fmts[i].cfFormat, &stgmed, i); - hr = IOleCache2_SetData(cache, &pdata->fmts[i], &stgmed, TRUE); + get_stgmedium(pdata->fmts[i].cfFormat, &stgmeds[i]); + get_stgdef(&pdata->stg_def, pdata->fmts[i].cfFormat, &stgmeds[i], i); + hr = IOleCache2_SetData(cache, &pdata->fmts[i], &stgmeds[i], FALSE); ok(hr == S_OK, "unexpected %#x\n", hr); } } @@ -4399,12 +4478,41 @@ static void test_data_cache_save_data(void) ok(enumerated_streams == pdata->stg_def.stream_count, "created %d != def streams %d\n", enumerated_streams, pdata->stg_def.stream_count); + IPersistStorage_Release(persist); + IOleCache2_Release(cache); + + /* now test _Load/_GetData using the storage we used for _Save */ + hr = CreateDataCache(NULL, pdata->clsid, &IID_IOleCache2, (void **)&cache); + ok(hr == S_OK, "unexpected %#x\n", hr); + hr = IOleCache2_QueryInterface(cache, &IID_IPersistStorage, (void **)&persist); + ok(hr == S_OK, "unexpected %#x\n", hr); + + hr = IStorage_SetClass(doc, pdata->clsid); + ok(hr == S_OK, "unexpected %#x\n", hr); + trace("IPersistStorage_Load\n"); + hr = IPersistStorage_Load(persist, doc); + ok(hr == S_OK, "unexpected %#x\n", hr); + + hr = IOleCache2_QueryInterface(cache, &IID_IDataObject, (void **)&odata); + ok(hr == S_OK, "unexpected %#x\n", hr); for (i = 0; i < pdata->num_set; i++) - HeapFree(GetProcessHeap(), 0, (void *)pdata->stg_def.stream[i].data); + { + hr = IDataObject_GetData(odata, &pdata->fmts[i], &stgmed); + ok(hr == S_OK, "unexpected %#x\n", hr); + hr = stgmedium_cmp(&stgmeds[i], &stgmed); + ok(hr == S_OK, "unexpected %#x\n", hr); + ReleaseStgMedium(&stgmed); + ReleaseStgMedium(&stgmeds[i]); + } + + IDataObject_Release(odata); IPersistStorage_Release(persist); IStorage_Release(doc); IOleCache2_Release(cache); + for (i = 0; i < pdata->num_set; i++) + HeapFree(GetProcessHeap(), 0, (void *)pdata->stg_def.stream[i].data); + } }

1 0

Alexandre Julliard : user32: Get the system DPI from the registry instead of from GDI.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 74a9c91964bcbc9a5d550c2059c07c307c227414 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74a9c91964bcbc9a5d550c20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 12 13:24:36 2018 +0200 user32: Get the system DPI from the registry instead of from GDI. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 95a883d..7b948eb 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -612,6 +612,31 @@ static BOOL init_entry_string( struct sysparam_entry *entry, const WCHAR *str ) return init_entry( entry, str, (strlenW(str) + 1) * sizeof(WCHAR), REG_SZ ); } +static DWORD get_reg_dword( HKEY base, const WCHAR *key_name, const WCHAR *value_name ) +{ + HKEY key; + DWORD type, ret = 0, size = sizeof(ret); + + if (RegOpenKeyW( base, key_name, &key )) return 0; + if (RegQueryValueExW( key, value_name, NULL, &type, (void *)&ret, &size ) || type != REG_DWORD) + ret = 0; + RegCloseKey( key ); + return ret; +} + +/* get the system dpi from the registry */ +static UINT get_system_dpi(void) +{ + static const WCHAR dpi_key_name[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p','\0'}; + static const WCHAR def_dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; + static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; + DWORD dpi; + + if ((dpi = get_reg_dword( HKEY_CURRENT_USER, dpi_key_name, dpi_value_name ))) return dpi; + if ((dpi = get_reg_dword( HKEY_CURRENT_CONFIG, def_dpi_key_name, dpi_value_name ))) return dpi; + return USER_DEFAULT_SCREEN_DPI; +} + HDC get_display_dc(void) { static const WCHAR DISPLAY[] = {'D','I','S','P','L','A','Y',0}; @@ -3065,12 +3090,7 @@ UINT WINAPI GetDpiForSystem(void) if (!IsProcessDPIAware()) return USER_DEFAULT_SCREEN_DPI; - if (!display_dpi) - { - HDC hdc = get_display_dc(); - display_dpi = GetDeviceCaps( hdc, LOGPIXELSY ); - release_display_dc( hdc ); - } + if (!display_dpi) display_dpi = get_system_dpi(); return display_dpi; }

1 0

Alexandre Julliard : gdi32: Take DPI awareness into account for the LOGPIXELSX/Y device caps.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 31967ef51df71994ab9b273353ea4937b8231b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31967ef51df71994ab9b2733… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 12 13:25:16 2018 +0200 gdi32: Take DPI awareness into account for the LOGPIXELSX/Y device caps. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 5 +---- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdiobj.c | 18 ++++++++++++++++++ dlls/user32/tests/sysparams.c | 1 - 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index fcf016b..c81a2e1 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -298,7 +298,6 @@ static BOOL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *buffe static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) { - static int screen_dpi; int bpp; switch (cap) @@ -351,9 +350,7 @@ static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case SHADEBLENDCAPS: return 0; case COLORMGMTCAPS: return 0; case LOGPIXELSX: - case LOGPIXELSY: - if (!screen_dpi && !(screen_dpi = get_dpi())) screen_dpi = 96; - return screen_dpi; + case LOGPIXELSY: return get_system_dpi(); case NUMCOLORS: bpp = GetDeviceCaps( dev->hdc, BITSPIXEL ); return (bpp > 8) ? -1 : (1 << bpp); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index cf904d6..c5e4231 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -304,6 +304,7 @@ extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; extern void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; extern DWORD get_dpi(void) DECLSPEC_HIDDEN; +extern DWORD get_system_dpi(void) DECLSPEC_HIDDEN; /* mapping.c */ extern BOOL dp_to_lp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 16b82a3..db03f49 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -641,6 +641,24 @@ DWORD get_dpi(void) return 0; } +/****************************************************************************** + * get_system_dpi + * + * Get the system DPI, based on the DPI awareness mode. + */ +DWORD get_system_dpi(void) +{ + static UINT (WINAPI *pGetDpiForSystem)(void); + + if (!pGetDpiForSystem) + { + static const WCHAR user32W[] = {'u','s','e','r','3','2','.','d','l','l',0}; + HMODULE user = GetModuleHandleW( user32W ); + if (user) pGetDpiForSystem = (void *)GetProcAddress( user, "GetDpiForSystem" ); + } + return pGetDpiForSystem ? pGetDpiForSystem() : 96; +} + static HFONT create_scaled_font( const LOGFONTW *deffont ) { LOGFONTW lf; diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 5b185b9..4d60ea5 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3091,7 +3091,6 @@ static void test_dpi_aware(void) dpi = pGetDpiForSystem(); ok( dpi == USER_DEFAULT_SCREEN_DPI, "wrong dpi %u\n", dpi ); dpi = GetDeviceCaps( hdc, LOGPIXELSX ); - todo_wine_if (real_dpi != USER_DEFAULT_SCREEN_DPI) ok( dpi == USER_DEFAULT_SCREEN_DPI, "wrong dpi %u\n", dpi ); ok( !pIsProcessDPIAware(), "still aware\n" ); context = pGetThreadDpiAwarenessContext();

1 0

Alexandre Julliard : gdi32: Scale stock fonts based on the DPI awareness.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 60085f4e36d97938a1e7365161eb8f8b09140824 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60085f4e36d97938a1e73651… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 12 13:50:01 2018 +0200 gdi32: Scale stock fonts based on the DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 41 +++++++++++++++++++++------------------ dlls/user32/tests/sysparams.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index db03f49..819d24a 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -108,6 +108,7 @@ static const LOGPEN DCPen = { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; #define NB_STOCK_OBJECTS (STOCK_LAST+2) static HGDIOBJ stock_objects[NB_STOCK_OBJECTS]; +static HGDIOBJ scaled_stock_objects[NB_STOCK_OBJECTS]; static CRITICAL_SECTION gdi_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -662,7 +663,6 @@ DWORD get_system_dpi(void) static HFONT create_scaled_font( const LOGFONTW *deffont ) { LOGFONTW lf; - LONG height; static DWORD dpi; if (!dpi) @@ -672,9 +672,7 @@ static HFONT create_scaled_font( const LOGFONTW *deffont ) } lf = *deffont; - height = abs(lf.lfHeight) * dpi / 96; - lf.lfHeight = deffont->lfHeight < 0 ? -height : height; - + lf.lfHeight = MulDiv( lf.lfHeight, dpi, 96 ); return CreateFontIndirectW( &lf ); } @@ -716,10 +714,15 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) /* language-dependent stock fonts */ deffonts = get_default_fonts(get_default_charset()); - stock_objects[SYSTEM_FONT] = create_scaled_font( &deffonts->SystemFont ); - stock_objects[DEVICE_DEFAULT_FONT] = create_scaled_font( &deffonts->DeviceDefaultFont ); + stock_objects[SYSTEM_FONT] = CreateFontIndirectW( &deffonts->SystemFont ); + stock_objects[DEVICE_DEFAULT_FONT] = CreateFontIndirectW( &deffonts->DeviceDefaultFont ); stock_objects[SYSTEM_FIXED_FONT] = CreateFontIndirectW( &deffonts->SystemFixedFont ); - stock_objects[DEFAULT_GUI_FONT] = create_scaled_font( &deffonts->DefaultGuiFont ); + stock_objects[DEFAULT_GUI_FONT] = CreateFontIndirectW( &deffonts->DefaultGuiFont ); + + scaled_stock_objects[OEM_FIXED_FONT] = create_scaled_font( &OEMFixedFont ); + scaled_stock_objects[SYSTEM_FONT] = create_scaled_font( &deffonts->SystemFont ); + scaled_stock_objects[SYSTEM_FIXED_FONT] = create_scaled_font( &deffonts->SystemFixedFont ); + scaled_stock_objects[DEFAULT_GUI_FONT] = create_scaled_font( &deffonts->DefaultGuiFont ); stock_objects[DC_BRUSH] = CreateBrushIndirect( &DCBrush ); stock_objects[DC_PEN] = CreatePenIndirect( &DCPen ); @@ -727,15 +730,9 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) /* clear the NOSYSTEM bit on all stock objects*/ for (i = 0; i < NB_STOCK_OBJECTS; i++) { - if (!stock_objects[i]) - { - if (i == 9) continue; /* there's no stock object 9 */ - ERR( "could not create stock object %d\n", i ); - return FALSE; - } - __wine_make_gdi_object_system( stock_objects[i], TRUE ); + if (stock_objects[i]) __wine_make_gdi_object_system( stock_objects[i], TRUE ); + if (scaled_stock_objects[i]) __wine_make_gdi_object_system( scaled_stock_objects[i], TRUE ); } - return TRUE; } @@ -1061,11 +1058,17 @@ void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) */ HGDIOBJ WINAPI GetStockObject( INT obj ) { - HGDIOBJ ret; if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0; - ret = stock_objects[obj]; - TRACE("returning %p\n", ret ); - return ret; + switch (obj) + { + case OEM_FIXED_FONT: + case SYSTEM_FONT: + case SYSTEM_FIXED_FONT: + case DEFAULT_GUI_FONT: + if (get_system_dpi() != 96) return scaled_stock_objects[obj]; + break; + } + return stock_objects[obj]; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 4d60ea5..780cfbb 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3001,6 +3001,50 @@ static void test_GetSysColorBrush(void) win_skip("COLOR_MENUBAR unsupported\n"); } +static void test_dpi_stock_objects( HDC hdc ) +{ + DPI_AWARENESS_CONTEXT context; + HGDIOBJ obj[STOCK_LAST + 1], obj2[STOCK_LAST + 1]; + LOGFONTW lf, lf2; + UINT i, dpi; + + context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); + dpi = GetDeviceCaps( hdc, LOGPIXELSX ); + ok( dpi == USER_DEFAULT_SCREEN_DPI, "wrong dpi %u\n", dpi ); + ok( !pIsProcessDPIAware(), "not aware\n" ); + for (i = 0; i <= STOCK_LAST; i++) obj[i] = GetStockObject( i ); + + pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); + dpi = GetDeviceCaps( hdc, LOGPIXELSX ); + ok( dpi == real_dpi, "wrong dpi %u\n", dpi ); + ok( pIsProcessDPIAware(), "not aware\n" ); + for (i = 0; i <= STOCK_LAST; i++) obj2[i] = GetStockObject( i ); + + for (i = 0; i <= STOCK_LAST; i++) + { + switch (i) + { + case OEM_FIXED_FONT: + case SYSTEM_FIXED_FONT: + ok( obj[i] != obj2[i], "%u: same object\n", i ); + break; + case SYSTEM_FONT: + case DEFAULT_GUI_FONT: + ok( obj[i] != obj2[i], "%u: same object\n", i ); + GetObjectW( obj[i], sizeof(lf), &lf ); + GetObjectW( obj2[i], sizeof(lf2), &lf2 ); + ok( lf.lfHeight == MulDiv( lf2.lfHeight, USER_DEFAULT_SCREEN_DPI, real_dpi ), + "%u: wrong height %d / %d\n", i, lf.lfHeight, lf2.lfHeight ); + break; + default: + ok( obj[i] == obj2[i], "%u: different object\n", i ); + break; + } + } + + pSetThreadDpiAwarenessContext( context ); +} + static void test_dpi_aware(void) { BOOL ret; @@ -3181,6 +3225,7 @@ static void test_dpi_aware(void) break; } } + if (real_dpi != USER_DEFAULT_SCREEN_DPI) test_dpi_stock_objects( hdc ); ReleaseDC( 0, hdc ); } else win_skip( "SetProcessDpiAwarenessContext not supported\n" );

1 0

Henri Verbeet : wined3d: Select the correct texture level in draw_textured_quad().
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: e2a0a939bad89a502696618af3f235d14b0bdd76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2a0a939bad89a502696618a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 12 16:46:10 2018 +0430 wined3d: Select the correct texture level in draw_textured_quad(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c01bd32..6c7d6df 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -173,12 +173,14 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour { const struct wined3d_gl_info *gl_info = context->gl_info; struct blt_info info; + unsigned int level; texture2d_get_blt_info(texture, sub_resource_idx, src_rect, &info); gl_info->gl_ops.gl.p_glEnable(info.bind_target); checkGLcall("glEnable(bind_target)"); + level = sub_resource_idx % texture->level_count; context_bind_texture(context, info.bind_target, texture->texture_rgb.name); /* Filtering for StretchRect */ @@ -191,6 +193,8 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); if (context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_BASE_LEVEL, level); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, level); gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); checkGLcall("glTexEnvi"); @@ -209,6 +213,8 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour gl_info->gl_ops.gl.p_glVertex2i(dst_rect->right, dst_rect->bottom); gl_info->gl_ops.gl.p_glEnd(); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + /* Unbind the texture */ context_bind_texture(context, info.bind_target, 0); @@ -218,6 +224,7 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour texture->texture_rgb.sampler_desc.min_filter = WINED3D_TEXF_POINT; texture->texture_rgb.sampler_desc.mip_filter = WINED3D_TEXF_NONE; texture->texture_rgb.sampler_desc.srgb_decode = FALSE; + texture->texture_rgb.base_level = level; } /* Works correctly only for <= 4 bpp formats. */

1 0