ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: Adding a view cache for DVASPECT_ICON produces a CF_METAFILEPICT cache entry. 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2017-10-31 13:23:29 +00:00 committed by Alexandre Julliard
parent ebfd1d3df6
commit 8d0a53e60d
2 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/ole32/datacache.c
View File

@ -310,10 +310,10 @@ static DataCacheEntry *DataCache_GetEntryForFormatEtc(DataCache *This, const FOR
LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry)
{ {
/* FIXME: also compare DVTARGETDEVICEs */ /* FIXME: also compare DVTARGETDEVICEs */
if ((!cache_entry->fmtetc.cfFormat || !fmt.cfFormat || (fmt.cfFormat == cache_entry->fmtetc.cfFormat)) && if ((fmt.cfFormat == cache_entry->fmtetc.cfFormat) &&
(fmt.dwAspect == cache_entry->fmtetc.dwAspect) && (fmt.dwAspect == cache_entry->fmtetc.dwAspect) &&
(fmt.lindex == cache_entry->fmtetc.lindex) && (fmt.lindex == cache_entry->fmtetc.lindex) &&
(!cache_entry->fmtetc.tymed || !fmt.tymed || (fmt.tymed == cache_entry->fmtetc.tymed))) ((fmt.tymed == cache_entry->fmtetc.tymed) || !cache_entry->fmtetc.cfFormat)) /* tymed is ignored for view caching */
return cache_entry; return cache_entry;
} }
return NULL; return NULL;
@ -2245,6 +2245,13 @@ static HRESULT WINAPI DataCache_Cache(
fmt_cpy.tymed = TYMED_HGLOBAL; fmt_cpy.tymed = TYMED_HGLOBAL;
} }
/* View caching DVASPECT_ICON gets converted to CF_METAFILEPICT */
if (fmt_cpy.dwAspect == DVASPECT_ICON && fmt_cpy.cfFormat == 0)
{
fmt_cpy.cfFormat = CF_METAFILEPICT;
fmt_cpy.tymed = TYMED_MFPICT;
}
*pdwConnection = 0; *pdwConnection = 0;
cache_entry = DataCache_GetEntryForFormatEtc(This, &fmt_cpy); cache_entry = DataCache_GetEntryForFormatEtc(This, &fmt_cpy);

54
dlls/ole32/tests/ole2.c
View File

@ -2122,7 +2122,7 @@ static void check_dib_size( HGLOBAL h, int cx, int cy )
GlobalUnlock( h ); GlobalUnlock( h );
} }
static void test_data_cache_bitmap(void) static void test_data_cache_cache(void)
{ {
HRESULT hr; HRESULT hr;
IOleCache2 *cache; IOleCache2 *cache;
@ -2137,6 +2137,13 @@ static void test_data_cache_bitmap(void)
{{ CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, 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 } {{ CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, 0, NULL, 0 }
}; };
STATDATA view_caching[] =
{
{{ 0, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, 0, NULL, 0 },
{{ 0, 0, DVASPECT_THUMBNAIL, -1, TYMED_HGLOBAL }, 0, NULL, 0 },
{{ 0, 0, DVASPECT_DOCPRINT, -1, TYMED_HGLOBAL }, 0, NULL, 0 },
{{ CF_METAFILEPICT, 0, DVASPECT_ICON, -1, TYMED_MFPICT }, 0, NULL, 0 }
};
hr = CreateDataCache( NULL, &CLSID_NULL, &IID_IOleCache2, (void **)&cache ); hr = CreateDataCache( NULL, &CLSID_NULL, &IID_IOleCache2, (void **)&cache );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
@ -2259,6 +2266,49 @@ static void test_data_cache_bitmap(void)
check_dib_size( U(med).hGlobal, 2, 1 ); check_dib_size( U(med).hGlobal, 2, 1 );
ReleaseStgMedium( &med ); ReleaseStgMedium( &med );
/* uncache everything */
hr = IOleCache2_Uncache( cache, conn );
ok( hr == S_OK, "got %08x\n", hr );
/* view caching */
fmt.cfFormat = 0;
fmt.tymed = TYMED_ENHMF;
hr = IOleCache2_Cache( cache, &fmt, 0, &conn );
ok( hr == S_OK, "got %08x\n", hr );
view_caching[0].dwConnection = conn;
fmt.tymed = TYMED_HGLOBAL;
hr = IOleCache2_Cache( cache, &fmt, 0, &conn );
ok( hr == CACHE_S_SAMECACHE, "got %08x\n", hr );
fmt.dwAspect = DVASPECT_THUMBNAIL;
hr = IOleCache2_Cache( cache, &fmt, 0, &conn );
ok( hr == S_OK, "got %08x\n", hr );
view_caching[1].dwConnection = conn;
fmt.dwAspect = DVASPECT_DOCPRINT;
hr = IOleCache2_Cache( cache, &fmt, 0, &conn );
ok( hr == S_OK, "got %08x\n", hr );
view_caching[2].dwConnection = conn;
/* DVASPECT_ICON view cache gets mapped to CF_METAFILEPICT */
fmt.dwAspect = DVASPECT_ICON;
hr = IOleCache2_Cache( cache, &fmt, 0, &conn );
ok( hr == S_OK, "got %08x\n", hr );
view_caching[3].dwConnection = conn;
check_enum_cache( cache, view_caching, 4 );
/* uncache everything */
hr = IOleCache2_Uncache( cache, view_caching[3].dwConnection );
ok( hr == S_OK, "got %08x\n", hr );
hr = IOleCache2_Uncache( cache, view_caching[2].dwConnection );
ok( hr == S_OK, "got %08x\n", hr );
hr = IOleCache2_Uncache( cache, view_caching[1].dwConnection );
ok( hr == S_OK, "got %08x\n", hr );
hr = IOleCache2_Uncache( cache, view_caching[0].dwConnection );
ok( hr == S_OK, "got %08x\n", hr );
IDataObject_Release( data ); IDataObject_Release( data );
IOleCache2_Release( cache ); IOleCache2_Release( cache );
} }
@ -3750,7 +3800,7 @@ START_TEST(ole2)
test_data_cache(); test_data_cache();
test_data_cache_dib_contents_stream( 0 ); test_data_cache_dib_contents_stream( 0 );
test_data_cache_dib_contents_stream( 1 ); test_data_cache_dib_contents_stream( 1 );
test_data_cache_bitmap(); test_data_cache_cache();
test_data_cache_init(); test_data_cache_init();
test_data_cache_initnew(); test_data_cache_initnew();
test_default_handler(); test_default_handler();