[PATCH] sxs: Don't assign a COM object to the 3rd param of QueryInterface

Dmitry Timoshkov dmitry at baikal.ru
Wed Sep 15 13:39:30 CDT 2021


Michael Stefaniuc <mstefani at winehq.org> wrote:

> @@ -57,19 +57,17 @@ static inline struct cache *impl_from_IAssemblyCache(IAssemblyCache *iface)
>  static HRESULT WINAPI cache_QueryInterface(
>      IAssemblyCache *iface,
>      REFIID riid,
> -    void **obj )
> +    void **ret_iface )
>  {
> -    struct cache *cache = impl_from_IAssemblyCache(iface);
> -
> -    TRACE("%p, %s, %p\n", cache, debugstr_guid(riid), obj);
> +    TRACE("%p, %s, %p\n", iface, debugstr_guid(riid), ret_iface);
>  
> -    *obj = NULL;
> +    *ret_iface = NULL;
>  
>      if (IsEqualIID(riid, &IID_IUnknown) ||
>          IsEqualIID(riid, &IID_IAssemblyCache))
>      {
>          IAssemblyCache_AddRef( iface );
> -        *obj = cache;
> +        *ret_iface = iface;
>          return S_OK;
>      }

Is that really necessary to rename obj to ret_iface? That doesn't really
make the change clearer IMO, and makes the patch larger.

-- 
Dmitry.



More information about the wine-devel mailing list