December 2006 - Wine-commits

Rob Shearman : ole32: Set the mapping mode to anisotropic in OleMetafilePictFromIconAndLabel.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 3b87fe97df3268f6a462c3b247cb1709b5970245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b87fe97df3268f6a462c3b24… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 1 15:05:45 2006 +0000 ole32: Set the mapping mode to anisotropic in OleMetafilePictFromIconAndLabel. --- dlls/ole32/ole32_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index c15c3e8..328a972 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -97,6 +97,7 @@ HGLOBAL WINAPI OleMetafilePictFromIconAn else width = icon_width; + SetMapMode(hdc, MM_ANISOTROPIC); SetWindowOrgEx(hdc, 0, 0, NULL); SetWindowExtEx(hdc, width, label_offset + text_size.cy, NULL);

1 0

Rob Shearman : ole32: Add handling of the dirty state to the data cache and fix InitNew to not call Load .
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: e5c82d3aa4f8f945eedefddecbdc3bbc3cd585e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c82d3aa4f8f945eedefddec… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 1 15:03:19 2006 +0000 ole32: Add handling of the dirty state to the data cache and fix InitNew to not call Load. --- dlls/ole32/datacache.c | 89 ++++++++++++++++++++++++++++++++++------------- dlls/ole32/tests/ole2.c | 2 - 2 files changed, 65 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 1d7a765..dba012c 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -88,21 +88,20 @@ typedef struct PresentationDataHeader typedef struct DataCacheEntry { struct list entry; - /* format of this entry */ FORMATETC fmtetc; - /* cached data */ STGMEDIUM stgmedium; - /* * This storage pointer is set through a call to * IPersistStorage_Load. This is where the visual * representation of the object is stored. */ IStorage *storage; - + /* connection ID */ DWORD id; + /* dirty flag */ + BOOL dirty; } DataCacheEntry; /**************************************************************************** @@ -140,10 +139,12 @@ struct DataCache IAdviseSink* sinkInterface; IStorage *presentationStorage; + /* list of cache entries */ struct list cache_list; - /* last id assigned to an entry */ DWORD last_cache_id; + /* dirty flag */ + BOOL dirty; }; typedef struct DataCache DataCache; @@ -257,6 +258,7 @@ static HRESULT DataCache_CreateEntry(Dat (*cache_entry)->stgmedium.pUnkForRelease = NULL; (*cache_entry)->storage = NULL; (*cache_entry)->id = This->last_cache_id++; + (*cache_entry)->dirty = TRUE; list_add_tail(&This->cache_list, &(*cache_entry)->entry); return S_OK; } @@ -557,6 +559,7 @@ static HRESULT copy_stg_medium(CLIPFORMA static HRESULT DataCacheEntry_SetData(DataCacheEntry *This, STGMEDIUM *stgmedium, BOOL fRelease) { + This->dirty = TRUE; ReleaseStgMedium(&This->stgmedium); if (fRelease) { @@ -1052,17 +1055,24 @@ static HRESULT WINAPI DataCache_GetClass /************************************************************************ * DataCache_IsDirty (IPersistStorage) * - * Until we actually connect to a running object and retrieve new - * information to it, we never get dirty. - * * See Windows documentation for more details on IPersistStorage methods. */ static HRESULT WINAPI DataCache_IsDirty( IPersistStorage* iface) { - TRACE("(%p)\n", iface); + DataCache *This = impl_from_IPersistStorage(iface); + DataCacheEntry *cache_entry; + + TRACE("(%p)\n", iface); - return S_FALSE; + if (This->dirty) + return S_OK; + + LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) + if (cache_entry->dirty) + return S_OK; + + return S_FALSE; } /************************************************************************ @@ -1077,9 +1087,19 @@ static HRESULT WINAPI DataCache_InitNew( IPersistStorage* iface, IStorage* pStg) { - TRACE("(%p, %p)\n", iface, pStg); + DataCache *This = impl_from_IPersistStorage(iface); + + TRACE("(%p, %p)\n", iface, pStg); + + if (This->presentationStorage != NULL) + IStorage_Release(This->presentationStorage); + + This->presentationStorage = pStg; - return IPersistStorage_Load(iface, pStg); + IStorage_AddRef(This->presentationStorage); + This->dirty = TRUE; + + return S_OK; } /************************************************************************ @@ -1148,6 +1168,7 @@ static HRESULT WINAPI DataCache_Load( if (cache_entry->storage) IStorage_Release(cache_entry->storage); cache_entry->storage = pStg; IStorage_AddRef(pStg); + cache_entry->dirty = FALSE; } } @@ -1158,6 +1179,8 @@ static HRESULT WINAPI DataCache_Load( CoTaskMemFree(elem.pwcsName); } + This->dirty = FALSE; + IEnumSTATSTG_Release(pEnum); IStorage_AddRef(This->presentationStorage); @@ -1179,21 +1202,37 @@ static HRESULT WINAPI DataCache_Save( IStorage* pStg, BOOL fSameAsLoad) { - DataCache *this = impl_from_IPersistStorage(iface); + DataCache *This = impl_from_IPersistStorage(iface); + DataCacheEntry *cache_entry; + BOOL dirty = FALSE; - TRACE("(%p, %p, %d)\n", iface, pStg, fSameAsLoad); + TRACE("(%p, %p, %d)\n", iface, pStg, fSameAsLoad); - if ( (!fSameAsLoad) && - (this->presentationStorage!=NULL) ) - { - return IStorage_CopyTo(this->presentationStorage, - 0, - NULL, - NULL, - pStg); - } + dirty = This->dirty; + if (!dirty) + { + LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) + { + dirty = cache_entry->dirty; + if (dirty) + break; + } + } - return S_OK; + /* this is a shortcut if nothing changed */ + if (!dirty && !fSameAsLoad && This->presentationStorage) + { + return IStorage_CopyTo(This->presentationStorage, 0, NULL, NULL, pStg); + } + + LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) + { + /* FIXME: actually do the save here */ + cache_entry->dirty = FALSE; + } + + This->dirty = FALSE; + return S_OK; } /************************************************************************ @@ -2060,6 +2099,8 @@ static DataCache* DataCache_Construct( newObject->sinkInterface = 0; newObject->presentationStorage = NULL; list_init(&newObject->cache_list); + newObject->last_cache_id = 1; + newObject->dirty = FALSE; return newObject; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 8c9a8b0..18a5a46 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1105,9 +1105,7 @@ static void test_data_cache(void) ok_ole_success(hr, "IPersistStorage_InitNew"); hr = IPersistStorage_IsDirty(pPS); - todo_wine { ok_ole_success(hr, "IPersistStorage_IsDirty"); - } hr = IPersistStorage_GetClassID(pPS, &clsid); ok_ole_success(hr, "IPersistStorage_GetClassID");

1 0

Rob Shearman : ole32: Implement saving of the data cache.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 587ba29174f67528de0578e079dedf42005c0b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587ba29174f67528de0578e07… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 1 15:04:04 2006 +0000 ole32: Implement saving of the data cache. Document a few of the unknown fields in the presentation data header. --- dlls/ole32/datacache.c | 162 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/ole32/tests/ole2.c | 10 +-- 2 files changed, 155 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=587ba29174f67528de057…

1 0

Rob Shearman : ole32: Call SetWindowOrgEx and SetWindowExtEx in OleMetafilePictFromIconAndLabel so that the created metafile scales correctly .
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 09376ea1f5316dc17ecc8eb624dd3541f48ccf15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09376ea1f5316dc17ecc8eb62… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 1 15:04:41 2006 +0000 ole32: Call SetWindowOrgEx and SetWindowExtEx in OleMetafilePictFromIconAndLabel so that the created metafile scales correctly. Centre the icon and the label. --- dlls/ole32/ole32_main.c | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index 1971d0f..87ff539 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -40,10 +40,15 @@ HGLOBAL WINAPI OleMetafilePictFromIconAn { METAFILEPICT mfp; HDC hdc; - UINT dy; HGLOBAL hmem = NULL; LPVOID mfdata; static const char szIconOnly[] = "IconOnly"; + SIZE text_size = { 0, 0 }; + INT width; + INT icon_width; + INT icon_height; + INT label_offset; + HDC hdcScreen; TRACE("%p %p %s %d\n", hIcon, lpszLabel, debugstr_w(lpszSourceFile), iIconIndex); @@ -56,11 +61,28 @@ HGLOBAL WINAPI OleMetafilePictFromIconAn ExtEscape(hdc, MFCOMMENT, sizeof(szIconOnly), szIconOnly, 0, NULL); - /* FIXME: things are drawn in the wrong place */ - DrawIcon(hdc, 0, 0, hIcon); - dy = GetSystemMetrics(SM_CXICON); + icon_width = GetSystemMetrics(SM_CXICON); + icon_height = GetSystemMetrics(SM_CYICON); + /* FIXME: should we give the label a bit of padding here? */ + label_offset = icon_height; + if (lpszLabel) + { + /* metafile DCs don't support GetTextExtentPoint32, so size the font + * using the desktop window DC */ + hdcScreen = GetDC(NULL); + GetTextExtentPoint32W(hdcScreen, lpszLabel, lstrlenW(lpszLabel), &text_size); + ReleaseDC(NULL, hdcScreen); + } + width = max(text_size.cx, icon_width); + + SetWindowOrgEx(hdc, 0, 0, NULL); + SetWindowExtEx(hdc, width, label_offset + text_size.cy, NULL); + + /* draw the icon centred */ + DrawIcon(hdc, (width-icon_width) / 2, 0, hIcon); if(lpszLabel) - TextOutW(hdc, 0, dy, lpszLabel, lstrlenW(lpszLabel)); + /* draw the label centred too, if provided */ + TextOutW(hdc, (width-text_size.cx) / 2, label_offset, lpszLabel, lstrlenW(lpszLabel)); if (lpszSourceFile) {

1 0

Rob Shearman : ole32: The METAFILEPICT created by OleMetafilePictFromIconAndLabel should have its mapping mode be anisotropic , not isotropic.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: f0e2ea54e09331d31e728d5ee548e734bcb9f982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e2ea54e09331d31e728d5ee… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 1 15:04:49 2006 +0000 ole32: The METAFILEPICT created by OleMetafilePictFromIconAndLabel should have its mapping mode be anisotropic, not isotropic. --- dlls/ole32/ole32_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index 87ff539..b9c2b67 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -102,7 +102,7 @@ HGLOBAL WINAPI OleMetafilePictFromIconAn ExtEscape(hdc, MFCOMMENT, strlen(szIconIndex)+1, szIconIndex, 0, NULL); } - mfp.mm = MM_ISOTROPIC; + mfp.mm = MM_ANISOTROPIC; mfp.xExt = mfp.yExt = 0; /* FIXME ? */ mfp.hMF = CloseMetaFile(hdc); if( !mfp.hMF )

1 0

Rob Shearman : ole32: Use the default icon title font when writing the caption text out in OleMetafilePictFromIconAndLabel .
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 2fa7cadf07c92128c2954677a619a0a14b7682c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa7cadf07c92128c2954677a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 1 15:05:17 2006 +0000 ole32: Use the default icon title font when writing the caption text out in OleMetafilePictFromIconAndLabel. --- dlls/ole32/ole32_main.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index b9c2b67..377aa4d 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -49,15 +49,29 @@ HGLOBAL WINAPI OleMetafilePictFromIconAn INT icon_height; INT label_offset; HDC hdcScreen; + LOGFONTW lf; + HFONT font; TRACE("%p %p %s %d\n", hIcon, lpszLabel, debugstr_w(lpszSourceFile), iIconIndex); if( !hIcon ) return NULL; + if (!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0)) + return NULL; + + font = CreateFontIndirectW(&lf); + if (!font) + return NULL; + hdc = CreateMetaFileW(NULL); if( !hdc ) + { + DeleteObject(font); return NULL; + } + + SelectObject(hdc, font); ExtEscape(hdc, MFCOMMENT, sizeof(szIconOnly), szIconOnly, 0, NULL); @@ -67,10 +81,13 @@ HGLOBAL WINAPI OleMetafilePictFromIconAn label_offset = icon_height; if (lpszLabel) { + HFONT screen_old_font; /* metafile DCs don't support GetTextExtentPoint32, so size the font * using the desktop window DC */ hdcScreen = GetDC(NULL); + screen_old_font = SelectObject(hdcScreen, font); GetTextExtentPoint32W(hdcScreen, lpszLabel, lstrlenW(lpszLabel), &text_size); + SelectObject(hdcScreen, screen_old_font); ReleaseDC(NULL, hdcScreen); } width = max(text_size.cx, icon_width); @@ -105,6 +122,7 @@ HGLOBAL WINAPI OleMetafilePictFromIconAn mfp.mm = MM_ANISOTROPIC; mfp.xExt = mfp.yExt = 0; /* FIXME ? */ mfp.hMF = CloseMetaFile(hdc); + DeleteObject(font); if( !mfp.hMF ) return NULL;

1 0

Rob Shearman : ole32: Add documentation for CreateDataCache.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: e9cc0744cc257de036eb67ecfea16c40194aa546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9cc0744cc257de036eb67ecf… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 1 15:02:58 2006 +0000 ole32: Add documentation for CreateDataCache. --- dlls/ole32/datacache.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 6ab4187..1d7a765 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1937,6 +1937,24 @@ static const IOleCacheControlVtbl DataCa /****************************************************************************** * CreateDataCache [OLE32.@] + * + * Creates a data cache to allow an object to render one or more of its views, + * whether running or not. + * + * PARAMS + * pUnkOuter [I] Outer unknown for the object. + * rclsid [I] + * riid [I] IID of interface to return. + * ppvObj [O] Address where the data cache object will be stored on return. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + * + * NOTES + * The following interfaces are supported by the returned data cache object: + * IOleCache, IOleCache2, IOleCacheControl, IPersistStorae, IDataObject, + * IViewObject and IViewObject2. */ HRESULT WINAPI CreateDataCache( LPUNKNOWN pUnkOuter,

1 0

Rob Shearman : ole32: The advise sink for the data cache should be primed with the passed in aspects value , not an arbitrarily selected value.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 4b7e8e73a4d0e4128122eacc89fcb909de0bfc03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7e8e73a4d0e4128122eacc8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 1 15:02:40 2006 +0000 ole32: The advise sink for the data cache should be primed with the passed in aspects value, not an arbitrarily selected value. --- dlls/ole32/datacache.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 99fd0e8..6ab4187 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1503,9 +1503,7 @@ static HRESULT WINAPI DataCache_SetAdvis */ if (advf & ADVF_PRIMEFIRST) { - DataCache_FireOnViewChange(this, - DVASPECT_CONTENT, - -1); + DataCache_FireOnViewChange(this, aspects, -1); } return S_OK;

1 0

Rob Shearman : ole32: Add some tests for the IViewObject, IOleCache2 and IPersistStorage interfaces of the OLE data cache.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 188fe95091225a685ecd4545bdfc565bba8cd741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=188fe95091225a685ecd4545b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 1 15:02:50 2006 +0000 ole32: Add some tests for the IViewObject, IOleCache2 and IPersistStorage interfaces of the OLE data cache. --- dlls/ole32/tests/ole2.c | 435 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 435 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=188fe95091225a685ecd4…

1 0

Rob Shearman : ole32: Implement Cache and Uncache for the data cache.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Module: wine Branch: master Commit: 4232d31c577b9f342bbe874e5182929d0bbbaee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4232d31c577b9f342bbe874e5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 1 15:01:50 2006 +0000 ole32: Implement Cache and Uncache for the data cache. --- dlls/ole32/datacache.c | 59 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 50 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 5ae22da..341e39a 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -98,6 +98,8 @@ typedef struct DataCacheEntry * representation of the object is stored. */ IStorage *storage; + + DWORD id; } DataCacheEntry; /**************************************************************************** @@ -136,6 +138,9 @@ struct DataCache IStorage *presentationStorage; struct list cache_list; + + /* last id assigned to an object */ + DWORD last_cache_id; }; typedef struct DataCache DataCache; @@ -186,6 +191,15 @@ static DataCache* DataCache_Construct(RE static HRESULT DataCacheEntry_OpenPresStream(DataCacheEntry *This, IStream **pStm); +static void DataCacheEntry_Destroy(DataCacheEntry *This) +{ + list_remove(&This->entry); + if (This->storage) + IStorage_Release(This->storage); + HeapFree(GetProcessHeap(), 0, This->fmtetc.ptd); + HeapFree(GetProcessHeap(), 0, This); +} + static void DataCache_Destroy( DataCache* ptrToDestroy) { @@ -200,11 +214,7 @@ static void DataCache_Destroy( } LIST_FOR_EACH_ENTRY_SAFE(cache_entry, next_cache_entry, &ptrToDestroy->cache_list, DataCacheEntry, entry) - { - IStorage_Release(cache_entry->storage); - HeapFree(GetProcessHeap(), 0, cache_entry->fmtetc.ptd); - HeapFree(GetProcessHeap(), 0, cache_entry); - } + DataCacheEntry_Destroy(cache_entry); /* * Free the datacache pointer. @@ -237,6 +247,7 @@ static HRESULT DataCache_CreateEntry(Dat memcpy((*cache_entry)->fmtetc.ptd, formatetc->ptd, formatetc->ptd->tdSize); } (*cache_entry)->storage = NULL; + (*cache_entry)->id = This->last_cache_id++; list_add_tail(&This->cache_list, &(*cache_entry)->entry); return S_OK; } @@ -1646,16 +1657,46 @@ static HRESULT WINAPI DataCache_Cache( DWORD advf, DWORD* pdwConnection) { - FIXME("stub\n"); - return E_NOTIMPL; + DataCache *This = impl_from_IOleCache2(iface); + DataCacheEntry *cache_entry; + HRESULT hr; + + TRACE("(%p, 0x%x, %p)\n", pformatetc, advf, pdwConnection); + + *pdwConnection = 0; + + cache_entry = DataCache_GetEntryForFormatEtc(This, pformatetc); + if (cache_entry) + { + *pdwConnection = cache_entry->id; + return CACHE_S_SAMECACHE; + } + + hr = DataCache_CreateEntry(This, pformatetc, &cache_entry); + + if (SUCCEEDED(hr)) + *pdwConnection = cache_entry->id; + + return hr; } static HRESULT WINAPI DataCache_Uncache( IOleCache2* iface, DWORD dwConnection) { - FIXME("stub\n"); - return E_NOTIMPL; + DataCache *This = impl_from_IOleCache2(iface); + DataCacheEntry *cache_entry; + + TRACE("(%d)\n", dwConnection); + + LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) + if (cache_entry->id == dwConnection) + { + DataCacheEntry_Destroy(cache_entry); + return S_OK; + } + + return OLE_E_NOCONNECTION; } static HRESULT WINAPI DataCache_EnumCache(

1 0