March 2015 - Wine-commits - list.winehq.org

Huw Davies : ole32: Read the class id from the top-level storage object.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: c5e020c5b5c0218a146d11cd5fba5aadb6f380cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5e020c5b5c0218a146d11cd5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:33 2015 +0000 ole32: Read the class id from the top-level storage object. The cache_entries' storages are just references to the same object anyway. --- dlls/ole32/datacache.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 2aae536..d9754a3 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1182,34 +1182,28 @@ static ULONG WINAPI DataCache_IPersistStorage_Release( /************************************************************************ * DataCache_GetClassID (IPersistStorage) * - * The data cache doesn't implement this method. */ -static HRESULT WINAPI DataCache_GetClassID( - IPersistStorage* iface, - CLSID* pClassID) +static HRESULT WINAPI DataCache_GetClassID(IPersistStorage *iface, CLSID *clsid) { - DataCache *This = impl_from_IPersistStorage(iface); - DataCacheEntry *cache_entry; + DataCache *This = impl_from_IPersistStorage( iface ); + HRESULT hr; + STATSTG statstg; - TRACE("(%p, %p)\n", iface, pClassID); + TRACE( "(%p, %p)\n", iface, clsid ); - LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) - { - if (cache_entry->storage != NULL) + if (This->presentationStorage) { - STATSTG statstg; - HRESULT hr = IStorage_Stat(cache_entry->storage, &statstg, STATFLAG_NONAME); - if (SUCCEEDED(hr)) - { - *pClassID = statstg.clsid; - return S_OK; - } + hr = IStorage_Stat( This->presentationStorage, &statstg, STATFLAG_NONAME ); + if (SUCCEEDED(hr)) + { + *clsid = statstg.clsid; + return S_OK; + } } - } - *pClassID = CLSID_NULL; + *clsid = CLSID_NULL; - return S_OK; + return S_OK; } /************************************************************************

1 0

Huw Davies : ole32: A cache entry should hold the stream its data is from, not the top-level storage.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: a4e3668f3f4c554d1d7db079c3fffb98bc964afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e3668f3f4c554d1d7db079c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:34 2015 +0000 ole32: A cache entry should hold the stream its data is from, not the top-level storage. --- dlls/ole32/datacache.c | 92 +++++++++++++++----------------------------------- 1 file changed, 27 insertions(+), 65 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index d9754a3..d13230d 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -98,11 +98,11 @@ typedef struct DataCacheEntry /* cached data */ STGMEDIUM stgmedium; /* - * This storage pointer is set through a call to + * This stream pointer is set through a call to * IPersistStorage_Load. This is where the visual * representation of the object is stored. */ - IStorage *storage; + IStream *stream; /* connection ID */ DWORD id; /* dirty flag */ @@ -218,8 +218,8 @@ static const char * debugstr_formatetc(const FORMATETC *formatetc) static void DataCacheEntry_Destroy(DataCache *cache, DataCacheEntry *cache_entry) { list_remove(&cache_entry->entry); - if (cache_entry->storage) - IStorage_Release(cache_entry->storage); + if (cache_entry->stream) + IStream_Release(cache_entry->stream); HeapFree(GetProcessHeap(), 0, cache_entry->fmtetc.ptd); ReleaseStgMedium(&cache_entry->stgmedium); if(cache_entry->sink_id) @@ -314,7 +314,7 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc (*cache_entry)->data_cf = 0; (*cache_entry)->stgmedium.tymed = TYMED_NULL; (*cache_entry)->stgmedium.pUnkForRelease = NULL; - (*cache_entry)->storage = NULL; + (*cache_entry)->stream = NULL; (*cache_entry)->id = This->last_cache_id++; (*cache_entry)->dirty = TRUE; (*cache_entry)->stream_number = -1; @@ -477,63 +477,25 @@ static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat) */ static HRESULT DataCacheEntry_OpenPresStream(DataCacheEntry *cache_entry, IStream **ppStm) { - STATSTG elem; - IEnumSTATSTG *pEnum; HRESULT hr; + LARGE_INTEGER offset; - if (!ppStm) return E_POINTER; - - hr = IStorage_EnumElements(cache_entry->storage, 0, NULL, 0, &pEnum); - if (FAILED(hr)) return hr; - - while ((hr = IEnumSTATSTG_Next(pEnum, 1, &elem, NULL)) == S_OK) + if (cache_entry->stream) { - if (DataCache_IsPresentationStream(&elem)) - { - IStream *pStm; - - hr = IStorage_OpenStream(cache_entry->storage, elem.pwcsName, - NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, - &pStm); - if (SUCCEEDED(hr)) - { - PresentationDataHeader header; - ULONG actual_read; - CLIPFORMAT clipformat; - - hr = read_clipformat(pStm, &clipformat); - - if (hr == S_OK) - hr = IStream_Read(pStm, &header, sizeof(header), &actual_read); + /* Rewind the stream before returning it. */ + offset.QuadPart = 0; - /* can't use SUCCEEDED(hr): S_FALSE counts as an error */ - if (hr == S_OK && actual_read == sizeof(header) - && header.dvAspect == cache_entry->fmtetc.dwAspect) - { - /* Rewind the stream before returning it. */ - LARGE_INTEGER offset; - offset.u.LowPart = 0; - offset.u.HighPart = 0; - IStream_Seek(pStm, offset, STREAM_SEEK_SET, NULL); - - *ppStm = pStm; - - CoTaskMemFree(elem.pwcsName); - IEnumSTATSTG_Release(pEnum); - - return S_OK; - } - - IStream_Release(pStm); - } - } - - CoTaskMemFree(elem.pwcsName); + hr = IStream_Seek( cache_entry->stream, offset, STREAM_SEEK_SET, NULL ); + if (SUCCEEDED( hr )) + { + *ppStm = cache_entry->stream; + IStream_AddRef( cache_entry->stream ); + } } + else + hr = OLE_E_BLANK; - IEnumSTATSTG_Release(pEnum); - - return (hr == S_FALSE ? OLE_E_BLANK : hr); + return hr; } /************************************************************************ @@ -841,7 +803,7 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, STGMEDIUM *stgmedium) { - if (stgmedium->tymed == TYMED_NULL && cache_entry->storage) + if (stgmedium->tymed == TYMED_NULL && cache_entry->stream) { HRESULT hr = DataCacheEntry_LoadData(cache_entry); if (FAILED(hr)) @@ -861,10 +823,10 @@ static inline HRESULT DataCacheEntry_DiscardData(DataCacheEntry *cache_entry) static inline void DataCacheEntry_HandsOffStorage(DataCacheEntry *cache_entry) { - if (cache_entry->storage) + if (cache_entry->stream) { - IStorage_Release(cache_entry->storage); - cache_entry->storage = NULL; + IStream_Release(cache_entry->stream); + cache_entry->stream = NULL; } } @@ -1320,9 +1282,9 @@ static HRESULT WINAPI DataCache_Load( if (SUCCEEDED(hr)) { DataCacheEntry_DiscardData(cache_entry); - if (cache_entry->storage) IStorage_Release(cache_entry->storage); - cache_entry->storage = pStg; - IStorage_AddRef(pStg); + if (cache_entry->stream) IStream_Release(cache_entry->stream); + cache_entry->stream = pStm; + IStream_AddRef(pStm); cache_entry->dirty = FALSE; } } @@ -1542,7 +1504,7 @@ static HRESULT WINAPI DataCache_Draw( continue; /* if the data hasn't been loaded yet, do it now */ - if ((cache_entry->stgmedium.tymed == TYMED_NULL) && cache_entry->storage) + if ((cache_entry->stgmedium.tymed == TYMED_NULL) && cache_entry->stream) { hres = DataCacheEntry_LoadData(cache_entry); if (FAILED(hres)) @@ -1784,7 +1746,7 @@ static HRESULT WINAPI DataCache_GetExtent( continue; /* if the data hasn't been loaded yet, do it now */ - if ((cache_entry->stgmedium.tymed == TYMED_NULL) && cache_entry->storage) + if ((cache_entry->stgmedium.tymed == TYMED_NULL) && cache_entry->stream) { hres = DataCacheEntry_LoadData(cache_entry); if (FAILED(hres))

1 0

Huw Davies : ole32: Split the data loading into a couple of helpers.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: d864387aaa5cfc93eba39824fb22e574e7df6773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d864387aaa5cfc93eba39824f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:35 2015 +0000 ole32: Split the data loading into a couple of helpers. --- dlls/ole32/datacache.c | 157 +++++++++++++++++++++++++++---------------------- 1 file changed, 88 insertions(+), 69 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index d13230d..53defc1 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -88,6 +88,12 @@ typedef struct PresentationDataHeader DWORD dwSize; } PresentationDataHeader; +enum stream_type +{ + no_stream, + pres_stream, +}; + typedef struct DataCacheEntry { struct list entry; @@ -103,6 +109,7 @@ typedef struct DataCacheEntry * representation of the object is stored. */ IStream *stream; + enum stream_type stream_type; /* connection ID */ DWORD id; /* dirty flag */ @@ -315,6 +322,7 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc (*cache_entry)->stgmedium.tymed = TYMED_NULL; (*cache_entry)->stgmedium.pUnkForRelease = NULL; (*cache_entry)->stream = NULL; + (*cache_entry)->stream_type = no_stream; (*cache_entry)->id = This->last_cache_id++; (*cache_entry)->dirty = TRUE; (*cache_entry)->stream_number = -1; @@ -1214,6 +1222,78 @@ static HRESULT WINAPI DataCache_InitNew( return S_OK; } + +static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, IStream *stm, + enum stream_type type ) +{ + DataCacheEntry *cache_entry; + HRESULT hr = S_OK; + + TRACE( "loading entry with formatetc: %s\n", debugstr_formatetc( fmt ) ); + + cache_entry = DataCache_GetEntryForFormatEtc( This, fmt ); + if (!cache_entry) + hr = DataCache_CreateEntry( This, fmt, &cache_entry ); + if (SUCCEEDED( hr )) + { + DataCacheEntry_DiscardData( cache_entry ); + if (cache_entry->stream) IStream_Release( cache_entry->stream ); + cache_entry->stream = stm; + IStream_AddRef( stm ); + cache_entry->stream_type = type; + cache_entry->dirty = FALSE; + } + return hr; +} + +static HRESULT parse_pres_streams( DataCache *This, IStorage *stg ) +{ + HRESULT hr; + IEnumSTATSTG *stat_enum; + STATSTG stat; + IStream *stm; + PresentationDataHeader header; + ULONG actual_read; + CLIPFORMAT clipformat; + FORMATETC fmtetc; + + hr = IStorage_EnumElements( stg, 0, NULL, 0, &stat_enum ); + if (FAILED( hr )) return hr; + + while ((hr = IEnumSTATSTG_Next( stat_enum, 1, &stat, NULL )) == S_OK) + { + if (DataCache_IsPresentationStream( &stat )) + { + hr = IStorage_OpenStream( stg, stat.pwcsName, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, + 0, &stm ); + if (SUCCEEDED( hr )) + { + hr = read_clipformat( stm, &clipformat ); + + if (hr == S_OK) + hr = IStream_Read( stm, &header, sizeof(header), &actual_read ); + + if (hr == S_OK && actual_read == sizeof(header)) + { + fmtetc.cfFormat = clipformat; + fmtetc.ptd = NULL; /* FIXME */ + fmtetc.dwAspect = header.dvAspect; + fmtetc.lindex = header.lindex; + fmtetc.tymed = header.tymed; + + add_cache_entry( This, &fmtetc, stm, pres_stream ); + } + IStream_Release( stm ); + } + } + CoTaskMemFree( stat.pwcsName ); + } + IEnumSTATSTG_Release( stat_enum ); + + return S_OK; +} + + /************************************************************************ * DataCache_Load (IPersistStorage) * @@ -1222,86 +1302,25 @@ static HRESULT WINAPI DataCache_InitNew( * and it will load the presentation information when the * IDataObject_GetData or IViewObject2_Draw methods are called. */ -static HRESULT WINAPI DataCache_Load( - IPersistStorage* iface, - IStorage* pStg) +static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg ) { DataCache *This = impl_from_IPersistStorage(iface); - STATSTG elem; - IEnumSTATSTG *pEnum; HRESULT hr; TRACE("(%p, %p)\n", iface, pStg); - if (This->presentationStorage != NULL) - IStorage_Release(This->presentationStorage); - - This->presentationStorage = pStg; + IPersistStorage_HandsOffStorage( iface ); - hr = IStorage_EnumElements(pStg, 0, NULL, 0, &pEnum); - if (FAILED(hr)) return hr; + hr = parse_pres_streams( This, pStg ); - while ((hr = IEnumSTATSTG_Next(pEnum, 1, &elem, NULL)) == S_OK) + if (SUCCEEDED( hr )) { - if (DataCache_IsPresentationStream(&elem)) - { - IStream *pStm; - - hr = IStorage_OpenStream(This->presentationStorage, elem.pwcsName, - NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, - &pStm); - if (SUCCEEDED(hr)) - { - PresentationDataHeader header; - ULONG actual_read; - CLIPFORMAT clipformat; - - hr = read_clipformat(pStm, &clipformat); - - if (hr == S_OK) - hr = IStream_Read(pStm, &header, sizeof(header), - &actual_read); - - /* can't use SUCCEEDED(hr): S_FALSE counts as an error */ - if (hr == S_OK && actual_read == sizeof(header)) - { - DataCacheEntry *cache_entry; - FORMATETC fmtetc; - - fmtetc.cfFormat = clipformat; - fmtetc.ptd = NULL; /* FIXME */ - fmtetc.dwAspect = header.dvAspect; - fmtetc.lindex = header.lindex; - fmtetc.tymed = header.tymed; - - TRACE("loading entry with formatetc: %s\n", debugstr_formatetc(&fmtetc)); - - cache_entry = DataCache_GetEntryForFormatEtc(This, &fmtetc); - if (!cache_entry) - hr = DataCache_CreateEntry(This, &fmtetc, &cache_entry); - if (SUCCEEDED(hr)) - { - DataCacheEntry_DiscardData(cache_entry); - if (cache_entry->stream) IStream_Release(cache_entry->stream); - cache_entry->stream = pStm; - IStream_AddRef(pStm); - cache_entry->dirty = FALSE; - } - } - - IStream_Release(pStm); - } - } - - CoTaskMemFree(elem.pwcsName); + This->dirty = FALSE; + This->presentationStorage = pStg; + IStorage_AddRef( This->presentationStorage ); } - This->dirty = FALSE; - - IEnumSTATSTG_Release(pEnum); - - IStorage_AddRef(This->presentationStorage); - return S_OK; + return hr; } /************************************************************************

1 0

Huw Davies : ole32: Add support for parsing the 'CONTENTS' stream.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 480c10cce994ee1cae89c2fdf9921d0d0e1e4a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=480c10cce994ee1cae89c2fdf… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:36 2015 +0000 ole32: Add support for parsing the 'CONTENTS' stream. --- dlls/ole32/datacache.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 53defc1..f791f80 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -92,6 +92,7 @@ enum stream_type { no_stream, pres_stream, + contents_stream }; typedef struct DataCacheEntry @@ -1293,6 +1294,26 @@ static HRESULT parse_pres_streams( DataCache *This, IStorage *stg ) return S_OK; } +static const FORMATETC static_dib_fmt = { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + +static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *stm ) +{ + HRESULT hr; + STATSTG stat; + const FORMATETC *fmt; + + hr = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); + if (FAILED( hr )) return hr; + + if (IsEqualCLSID( &stat.clsid, &CLSID_Picture_Dib )) + fmt = &static_dib_fmt; + else + return E_FAIL; + + return add_cache_entry( This, fmt, stm, contents_stream ); +} + +static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; /************************************************************************ * DataCache_Load (IPersistStorage) @@ -1306,12 +1327,21 @@ static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg ) { DataCache *This = impl_from_IPersistStorage(iface); HRESULT hr; + IStream *stm; TRACE("(%p, %p)\n", iface, pStg); IPersistStorage_HandsOffStorage( iface ); - hr = parse_pres_streams( This, pStg ); + hr = IStorage_OpenStream( pStg, CONTENTS, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, + 0, &stm ); + if (SUCCEEDED( hr )) + { + hr = parse_contents_stream( This, pStg, stm ); + IStream_Release( stm ); + } + else + hr = parse_pres_streams( This, pStg ); if (SUCCEEDED( hr )) {

1 0

Huw Davies : ole32: Separate metafile loading into a helper function.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 547fd746bb863fe4ee1599bce03abeb00d832fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547fd746bb863fe4ee1599bce… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:37 2015 +0000 ole32: Separate metafile loading into a helper function. --- dlls/ole32/datacache.c | 197 ++++++++++++++++++++++--------------------------- 1 file changed, 89 insertions(+), 108 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index f791f80..a2b7e57 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -507,6 +507,80 @@ static HRESULT DataCacheEntry_OpenPresStream(DataCacheEntry *cache_entry, IStrea return hr; } + +static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) +{ + HRESULT hr; + STATSTG stat; + ULARGE_INTEGER current_pos; + void *bits; + METAFILEPICT *mfpict; + HGLOBAL hmfpict; + PresentationDataHeader header; + CLIPFORMAT clipformat; + static const LARGE_INTEGER offset_zero; + ULONG read; + + if (cache_entry->stream_type != pres_stream) + { + FIXME( "Unimplemented for stream type %d\n", cache_entry->stream_type ); + return E_FAIL; + } + + 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; + + 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) ); + if (!hmfpict) return E_OUTOFMEMORY; + mfpict = GlobalLock( hmfpict ); + + bits = HeapAlloc( GetProcessHeap(), 0, stat.cbSize.u.LowPart); + if (!bits) + { + GlobalFree( hmfpict ); + return E_OUTOFMEMORY; + } + + 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; + mfpict->hMF = SetMetaFileBitsEx( stat.cbSize.u.LowPart, bits ); + if (!mfpict->hMF) + hr = E_FAIL; + } + + GlobalUnlock( hmfpict ); + if (SUCCEEDED( hr )) + { + cache_entry->data_cf = cache_entry->fmtetc.cfFormat; + cache_entry->stgmedium.tymed = TYMED_MFPICT; + cache_entry->stgmedium.u.hMetaFilePict = hmfpict; + } + else + GlobalFree( hmfpict ); + + HeapFree( GetProcessHeap(), 0, bits ); + + return hr; +} + /************************************************************************ * DataCacheEntry_LoadData * @@ -522,118 +596,25 @@ static HRESULT DataCacheEntry_OpenPresStream(DataCacheEntry *cache_entry, IStrea */ static HRESULT DataCacheEntry_LoadData(DataCacheEntry *cache_entry) { - IStream* presStream = NULL; - HRESULT hres; - ULARGE_INTEGER current_pos; - STATSTG streamInfo; - void* metafileBits; - METAFILEPICT *mfpict; - HGLOBAL hmfpict; - PresentationDataHeader header; - CLIPFORMAT clipformat; - static const LARGE_INTEGER offset_zero; - - /* - * Open the presentation stream. - */ - hres = DataCacheEntry_OpenPresStream(cache_entry, &presStream); - - if (FAILED(hres)) - return hres; - - /* - * Get the size of the stream. - */ - hres = IStream_Stat(presStream, - &streamInfo, - STATFLAG_NONAME); - if (FAILED(hres)) - { - IStream_Release(presStream); - return hres; - } - - /* - * Read the header. - */ - - hres = read_clipformat(presStream, &clipformat); - if (FAILED(hres)) - { - IStream_Release(presStream); - return hres; - } - - hres = IStream_Read( - presStream, - &header, - sizeof(PresentationDataHeader), - NULL); - if (hres != S_OK) - { - IStream_Release(presStream); - return E_FAIL; - } - - hres = IStream_Seek(presStream, offset_zero, STREAM_SEEK_CUR, &current_pos); - - streamInfo.cbSize.QuadPart -= current_pos.QuadPart; - - hmfpict = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); - if (!hmfpict) - { - IStream_Release(presStream); - return E_OUTOFMEMORY; - } - mfpict = GlobalLock(hmfpict); + HRESULT hr; + IStream *stm; - /* - * Allocate a buffer for the metafile bits. - */ - metafileBits = HeapAlloc(GetProcessHeap(), - 0, - streamInfo.cbSize.u.LowPart); + hr = DataCacheEntry_OpenPresStream( cache_entry, &stm ); + if (FAILED(hr)) return hr; - /* - * Read the metafile bits. - */ - hres = IStream_Read( - presStream, - metafileBits, - streamInfo.cbSize.u.LowPart, - NULL); - - /* - * Create a metafile with those bits. - */ - if (SUCCEEDED(hres)) - { - /* FIXME: get this from the stream */ - mfpict->mm = MM_ANISOTROPIC; - mfpict->xExt = header.dwObjectExtentX; - mfpict->yExt = header.dwObjectExtentY; - mfpict->hMF = SetMetaFileBitsEx(streamInfo.cbSize.u.LowPart, metafileBits); - if (!mfpict->hMF) - hres = E_FAIL; - } - - GlobalUnlock(hmfpict); - if (SUCCEEDED(hres)) - { - cache_entry->data_cf = cache_entry->fmtetc.cfFormat; - cache_entry->stgmedium.tymed = TYMED_MFPICT; - cache_entry->stgmedium.u.hMetaFilePict = hmfpict; - } - else - GlobalFree(hmfpict); + switch (cache_entry->fmtetc.cfFormat) + { + case CF_METAFILEPICT: + hr = load_mf_pict( cache_entry, stm ); + break; - /* - * Cleanup. - */ - HeapFree(GetProcessHeap(), 0, metafileBits); - IStream_Release(presStream); + default: + FIXME( "Unimplemented clip format %x\n", cache_entry->fmtetc.cfFormat ); + hr = E_NOTIMPL; + } - return hres; + IStream_Release( stm ); + return hr; } static HRESULT DataCacheEntry_CreateStream(DataCacheEntry *cache_entry,

1 0

Huw Davies : ole32: Add support for loading dibs.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: bbba2c00aaaf478bce1b42aecc2aa6b5fda0ab79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbba2c00aaaf478bce1b42aec… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:38 2015 +0000 ole32: Add support for loading dibs. --- dlls/ole32/datacache.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index a2b7e57..36c02dd 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -581,6 +581,43 @@ static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) return hr; } +static HRESULT load_dib( DataCacheEntry *cache_entry, IStream *stm ) +{ + HRESULT hr; + STATSTG stat; + void *dib; + HGLOBAL hglobal; + ULONG read; + + if (cache_entry->stream_type != contents_stream) + { + FIXME( "Unimplemented for stream type %d\n", cache_entry->stream_type ); + return E_FAIL; + } + + hr = IStream_Stat( stm, &stat, STATFLAG_NONAME ); + if (FAILED( hr )) return hr; + + hglobal = GlobalAlloc( GMEM_MOVEABLE, stat.cbSize.u.LowPart ); + if (!hglobal) return E_OUTOFMEMORY; + dib = GlobalLock( hglobal ); + + hr = IStream_Read( stm, dib, stat.cbSize.u.LowPart, &read ); + GlobalUnlock( hglobal ); + + if (hr != S_OK || read != stat.cbSize.u.LowPart) + { + GlobalFree( hglobal ); + return E_FAIL; + } + + cache_entry->data_cf = cache_entry->fmtetc.cfFormat; + cache_entry->stgmedium.tymed = TYMED_HGLOBAL; + cache_entry->stgmedium.u.hGlobal = hglobal; + + return S_OK; +} + /************************************************************************ * DataCacheEntry_LoadData * @@ -608,6 +645,10 @@ static HRESULT DataCacheEntry_LoadData(DataCacheEntry *cache_entry) hr = load_mf_pict( cache_entry, stm ); break; + case CF_DIB: + hr = load_dib( cache_entry, stm ); + break; + default: FIXME( "Unimplemented clip format %x\n", cache_entry->fmtetc.cfFormat ); hr = E_NOTIMPL;

1 0

Huw Davies : ole32: Add support for retrieving extents of dib format.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: e410f273cd8c352e6a0b5e0f08c7ce786dc5cbfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e410f273cd8c352e6a0b5e0f0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:39 2015 +0000 ole32: Add support for retrieving extents of dib format. --- dlls/ole32/datacache.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 36c02dd..ff15d91 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1846,6 +1846,41 @@ static HRESULT WINAPI DataCache_GetExtent( return S_OK; } + case CF_DIB: + { + BITMAPFILEHEADER *file_head; + BITMAPINFOHEADER *info; + LONG x_pels_m, y_pels_m; + + + if ((cache_entry->stgmedium.tymed != TYMED_HGLOBAL) || + !((file_head = GlobalLock( cache_entry->stgmedium.u.hGlobal )))) + continue; + + info = (BITMAPINFOHEADER *)(file_head + 1); + + x_pels_m = info->biXPelsPerMeter; + y_pels_m = info->biYPelsPerMeter; + + /* Size in units of 0.01mm (ie. MM_HIMETRIC) */ + if (x_pels_m != 0 && y_pels_m != 0) + { + lpsizel->cx = info->biWidth * 100000 / x_pels_m; + lpsizel->cy = info->biHeight * 100000 / y_pels_m; + } + else + { + HDC hdc = GetDC( 0 ); + lpsizel->cx = info->biWidth * 2540 / GetDeviceCaps( hdc, LOGPIXELSX ); + lpsizel->cy = info->biHeight * 2540 / GetDeviceCaps( hdc, LOGPIXELSY ); + + ReleaseDC( 0, hdc ); + } + + GlobalUnlock( cache_entry->stgmedium.u.hGlobal ); + + return S_OK; + } } }

1 0

Huw Davies : ole32: Add support for drawing the dib format.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: b4cd2c4dbb68e181d6124ef75329eac715a3977c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4cd2c4dbb68e181d6124ef75… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:40 2015 +0000 ole32: Add support for drawing the dib format. --- dlls/ole32/datacache.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ff15d91..35b27de 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1646,6 +1646,26 @@ static HRESULT WINAPI DataCache_Draw( return S_OK; } + case CF_DIB: + { + BITMAPFILEHEADER *file_head; + BITMAPINFO *info; + BYTE *bits; + + if ((cache_entry->stgmedium.tymed != TYMED_HGLOBAL) || + !((file_head = GlobalLock( cache_entry->stgmedium.u.hGlobal )))) + continue; + + info = (BITMAPINFO *)(file_head + 1); + bits = (BYTE *) file_head + file_head->bfOffBits; + StretchDIBits( hdcDraw, lprcBounds->left, lprcBounds->top, + lprcBounds->right - lprcBounds->left, lprcBounds->bottom - lprcBounds->top, + 0, 0, info->bmiHeader.biWidth, info->bmiHeader.biHeight, + bits, info, DIB_RGB_COLORS, SRCCOPY ); + + GlobalUnlock( cache_entry->stgmedium.u.hGlobal ); + return S_OK; + } } }

1 0

Huw Davies : ole32: Implement QueryGetData().
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: b0deb315a06d135ba6f15c182380e4d23858fd16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0deb315a06d135ba6f15c182… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:41 2015 +0000 ole32: Implement QueryGetData(). --- dlls/ole32/datacache.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 35b27de..1076a37 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1026,12 +1026,15 @@ static HRESULT WINAPI DataCache_GetDataHere( return E_NOTIMPL; } -static HRESULT WINAPI DataCache_QueryGetData( - IDataObject* iface, - LPFORMATETC pformatetc) +static HRESULT WINAPI DataCache_QueryGetData( IDataObject *iface, FORMATETC *fmt ) { - FIXME("stub\n"); - return E_NOTIMPL; + DataCache *This = impl_from_IDataObject( iface ); + DataCacheEntry *cache_entry; + + TRACE( "(%p)->(%s)\n", iface, debugstr_formatetc( fmt ) ); + cache_entry = DataCache_GetEntryForFormatEtc( This, fmt ); + + return cache_entry ? S_OK : S_FALSE; } /************************************************************************

1 0

Huw Davies : ole32/tests: Add tests for loading a dib 'CONTENTS' stream.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: f57e08995a188fd8535a54252ec7537f737138dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57e08995a188fd8535a54252… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:42 2015 +0000 ole32/tests: Add tests for loading a dib 'CONTENTS' stream. --- dlls/ole32/tests/ole2.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 05e8c4f..0c27bd1 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -31,6 +31,11 @@ #include "wine/test.h" +#include "initguid.h" + +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 ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) #define DEFINE_EXPECT(func) \ @@ -1680,6 +1685,113 @@ static void test_data_cache(void) IStorage_Release(pStorage); } + +static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; + +/* 2 x 1 x 32 bpp dib. PelsPerMeter = 200x400 */ +static BYTE dib[] = +{ + 0x42, 0x4d, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00, + + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x00, + 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +}; + +static IStorage *create_storage( int num ) +{ + IStorage *stg; + IStream *stm; + HRESULT hr; + ULONG written; + + hr = StgCreateDocfile( NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_DELETEONRELEASE, 0, &stg ); + ok( hr == S_OK, "got %08x\n", hr); + hr = IStorage_SetClass( stg, &CLSID_Picture_Dib ); + ok( hr == S_OK, "got %08x\n", hr); + hr = IStorage_CreateStream( stg, CONTENTS, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, &stm ); + ok( hr == S_OK, "got %08x\n", hr); + if (num == 1) /* Set biXPelsPerMeter = 0 */ + { + dib[0x26] = 0; + dib[0x27] = 0; + } + hr = IStream_Write( stm, dib, sizeof(dib), &written ); + ok( hr == S_OK, "got %08x\n", hr); + IStream_Release( stm ); + return stg; +} + +static void test_data_cache_dib_contents_stream(int num) +{ + HRESULT hr; + IUnknown *unk; + IPersistStorage *persist; + IDataObject *data; + IViewObject2 *view; + IStorage *stg; + FORMATETC fmt = {CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + STGMEDIUM med; + CLSID cls; + SIZEL sz; + + hr = CreateDataCache( NULL, &CLSID_Picture_Metafile, &IID_IUnknown, (void *)&unk ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IPersistStorage, (void *)&persist ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IDataObject, (void *)&data ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IViewObject2, (void *)&view ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + + stg = create_storage( num ); + + hr = IPersistStorage_Load( persist, stg ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + IStorage_Release( stg ); + + hr = IPersistStorage_GetClassID( persist, &cls ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + ok( IsEqualCLSID( &cls, &CLSID_Picture_Dib ), "class id mismatch\n" ); + + hr = IDataObject_GetData( data, &fmt, &med ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + if (SUCCEEDED(hr)) + { + ok( med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed ); + ReleaseStgMedium( &med ); + } + + hr = IViewObject2_GetExtent( view, DVASPECT_CONTENT, -1, NULL, &sz ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + if (num == 0) + { + ok( sz.cx == 1000, "got %d\n", sz.cx ); + ok( sz.cy == 250, "got %d\n", sz.cy ); + } + else + { + HDC hdc = GetDC( 0 ); + LONG x = 2 * 2540 / GetDeviceCaps( hdc, LOGPIXELSX ); + LONG y = 1 * 2540 / GetDeviceCaps( hdc, LOGPIXELSY ); + ok( sz.cx == x, "got %d %d\n", sz.cx, x ); + ok( sz.cy == y, "got %d %d\n", sz.cy, y ); + + ReleaseDC( 0, hdc ); + } + + IViewObject2_Release( view ); + IDataObject_Release( data ); + IPersistStorage_Release( persist ); + IUnknown_Release( unk ); +} + static void test_default_handler(void) { HRESULT hr; @@ -2385,6 +2497,8 @@ START_TEST(ole2) ok_ole_success(hr, "CoRevokeClassObject"); test_data_cache(); + test_data_cache_dib_contents_stream( 0 ); + test_data_cache_dib_contents_stream( 1 ); test_default_handler(); test_runnable(); test_OleRun();

1 0