Re: [PATCH] shlwapi: Avoid 'else if' for IStream_fnQueryInterface.

[Nikolay Sivov]

On Mon, 12 Dec 2016 13:24:38 +0200
Andrey Gusev <andrey.goosev(a)gmail.com> wrote:
> Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com>
> ---
>  dlls/shlwapi/regstream.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c
> index 1b0ca4e..d886c0c 100644
> --- a/dlls/shlwapi/regstream.c
> +++ b/dlls/shlwapi/regstream.c
> @@ -67,9 +67,7 @@ static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVO
>
> *ppvObj = NULL;
>
> -	if(IsEqualIID(riid, &IID_IUnknown))	/*IUnknown*/
> -	  *ppvObj = This;
> -	else if(IsEqualIID(riid, &IID_IStream))	/*IStream*/
> +	if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IStream))
>     *ppvObj = This;
>
> if(*ppvObj)

Please return interface pointer, to IStream_iface. Also TRACE() for this method needs simplification,
but it could be a separate change.