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

ole32: Don't clear the dirty flag when saving to another storage. 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2017-12-08 10:52:45 +00:00 committed by Alexandre Julliard
parent a343607909
commit 2a4bbb8864
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/ole32/datacache.c
View File

@ -1835,17 +1835,14 @@ static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg )
* our responsibility to copy the information when saving to a new * our responsibility to copy the information when saving to a new
* storage. * storage.
*/ */
static HRESULT WINAPI DataCache_Save( static HRESULT WINAPI DataCache_Save(IPersistStorage* iface, IStorage *stg, BOOL same_as_load)
IPersistStorage* iface,
IStorage* pStg,
BOOL fSameAsLoad)
{ {
DataCache *This = impl_from_IPersistStorage(iface); DataCache *This = impl_from_IPersistStorage(iface);
DataCacheEntry *cache_entry; DataCacheEntry *cache_entry;
HRESULT hr = S_OK; HRESULT hr = S_OK;
unsigned short stream_number = 0; unsigned short stream_number = 0;
TRACE("(%p, %p, %d)\n", iface, pStg, fSameAsLoad); TRACE("(%p, %p, %d)\n", iface, stg, same_as_load);
/* assign stream numbers to the cache entries */ /* assign stream numbers to the cache entries */
LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry)
@ -1861,17 +1858,17 @@ static HRESULT WINAPI DataCache_Save(
/* write out the cache entries */ /* write out the cache entries */
LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry)
{ {
if (!fSameAsLoad || cache_entry->dirty) if (!same_as_load || cache_entry->dirty)
{ {
hr = DataCacheEntry_Save(cache_entry, pStg, fSameAsLoad); hr = DataCacheEntry_Save(cache_entry, stg, same_as_load);
if (FAILED(hr)) if (FAILED(hr))
break; break;
cache_entry->dirty = FALSE; if (same_as_load) cache_entry->dirty = FALSE;
} }
} }
This->dirty = FALSE; if (same_as_load) This->dirty = FALSE;
return hr; return hr;
} }

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

@ -4320,6 +4320,9 @@ static void test_data_cache_save_data(void)
hr = IPersistStorage_Save(persist, doc, FALSE); hr = IPersistStorage_Save(persist, doc, FALSE);
ok(hr == S_OK, "unexpected %#x\n", hr); ok(hr == S_OK, "unexpected %#x\n", hr);
hr = IPersistStorage_IsDirty(persist);
ok(hr == S_OK, "unexpected %#x\n", hr);
check_storage_contents(doc, &pdata->stg_def, &enumerated_streams, &matched_streams); check_storage_contents(doc, &pdata->stg_def, &enumerated_streams, &matched_streams);
ok(enumerated_streams == matched_streams, "enumerated %d != matched %d\n", ok(enumerated_streams == matched_streams, "enumerated %d != matched %d\n",
enumerated_streams, matched_streams); enumerated_streams, matched_streams);