Huw Davies : ole32: Set the advise flags in CreateEntry().
Alexandre Julliard
julliard at winehq.org
Thu May 18 15:27:50 CDT 2017
Module: wine
Branch: master
Commit: fc49d98f6ae60c8202aead072e699473f679854c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc49d98f6ae60c8202aead072e699473f679854c
Author: Huw Davies <huw at codeweavers.com>
Date: Thu May 18 11:07:05 2017 +0100
ole32: Set the advise flags in CreateEntry().
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ole32/datacache.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c
index 3abb16f..0d3c2a9 100644
--- a/dlls/ole32/datacache.c
+++ b/dlls/ole32/datacache.c
@@ -322,7 +322,8 @@ static BOOL init_cache_entry(DataCacheEntry *entry, const FORMATETC *fmt, DWORD
return TRUE;
}
-static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc, DataCacheEntry **cache_entry, BOOL load)
+static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc, DWORD advf,
+ DataCacheEntry **cache_entry, BOOL load)
{
HRESULT hr;
@@ -336,7 +337,7 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc
if (!*cache_entry)
return E_OUTOFMEMORY;
- if (!init_cache_entry(*cache_entry, formatetc, 0, This->last_cache_id))
+ if (!init_cache_entry(*cache_entry, formatetc, advf, This->last_cache_id))
goto fail;
list_add_tail(&This->cache_list, &(*cache_entry)->entry);
@@ -1275,7 +1276,7 @@ static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, IStream *
cache_entry = DataCache_GetEntryForFormatEtc( This, fmt );
if (!cache_entry)
- hr = DataCache_CreateEntry( This, fmt, &cache_entry, TRUE );
+ hr = DataCache_CreateEntry( This, fmt, 0, &cache_entry, TRUE );
if (SUCCEEDED( hr ))
{
DataCacheEntry_DiscardData( cache_entry );
@@ -2023,12 +2024,11 @@ static HRESULT WINAPI DataCache_Cache(
return CACHE_S_SAMECACHE;
}
- hr = DataCache_CreateEntry(This, pformatetc, &cache_entry, FALSE);
+ hr = DataCache_CreateEntry(This, pformatetc, advf, &cache_entry, FALSE);
if (SUCCEEDED(hr))
{
*pdwConnection = cache_entry->id;
- cache_entry->advise_flags = advf;
setup_sink(This, cache_entry);
}
More information about the wine-cvs
mailing list