[PATCH] ole32: Prevent adding additional cache entries to static class caches.

Huw Davies huw at codeweavers.com
Tue Jan 23 02:49:59 CST 2018


> On 22 Jan 2018, at 14:35, Sergio Gómez Del Real <sdelreal at codeweavers.com> wrote:
> 
> Signed-off-by: Sergio Gómez Del Real <sdelreal at codeweavers.com>
> ---
> dlls/ole32/datacache.c  |  4 ++++
> dlls/ole32/tests/ole2.c | 23 +++++++++++++++++++++++
> 2 files changed, 27 insertions(+)
> 
> diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c
> index 4ba08268d7..fa0c857f15 100644
> --- a/dlls/ole32/datacache.c
> +++ b/dlls/ole32/datacache.c
> @@ -2440,6 +2440,10 @@ static HRESULT WINAPI DataCache_Cache(
>         *pdwConnection = cache_entry->id;
>         return CACHE_S_SAMECACHE;
>     }
> +    if (IsEqualCLSID(&This->clsid, &CLSID_Picture_Dib) ||
> +        IsEqualCLSID(&This->clsid, &CLSID_Picture_Metafile) ||
> +        IsEqualCLSID(&This->clsid, &CLSID_Picture_EnhMetafile))
> +        return DV_E_FORMATETC;

I’ve sent in an updated version of this that uses This->clsid_static.

Huw.





More information about the wine-devel mailing list