dlls/ole32: fixed dead assignments (llvm/clang)

[Rob Shearman]

2008/11/18 ricardo filipe <ricardo_barbano at hotmail.com>:
> @@ -1951,6 +1951,12 @@ HRESULT WINAPI CoRegisterClassObject(
>                                  newClass->pMarshaledData,
>                                  flags & (REGCLS_MULTIPLEUSE|REGCLS_MULTI_SEPARATE),
>                                  &newClass->RpcRegistration);
> +                     MSHLFLAGS_TABLESTRONG);

This won't compile.

> +      if (hr) {
> +          FIXME("RPC_StartLocalServer failed, %x!\n",hr);

You should change this to:
ERR("RPC_StartLocalServer failed with error 0x%x\n",hr);

> +          return hr;
> +      }
> +
>    }
>    return S_OK;
>  }
> diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c
> index a8fa59b..21fb1fb 100644
> --- a/dlls/ole32/ole16.c
> +++ b/dlls/ole32/ole16.c
> @@ -598,13 +598,13 @@ HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid)
>
>  	buf = HeapAlloc(GetProcessHeap(),0,strlen(progid)+8);
>  	sprintf(buf,"%s\\CLSID",progid);
> -	if ((err=RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey))) {
> +	if (RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey)) {

Since you are changing this anyway, you should explicitly compare the
result against ERROR_SUCCESS to improve readability of the code here.

>  		HeapFree(GetProcessHeap(),0,buf);
>                  return CO_E_CLASSSTRING;
>  	}
>  	HeapFree(GetProcessHeap(),0,buf);
>  	buf2len = sizeof(buf2);
> -	if ((err=RegQueryValueA(xhkey,NULL,buf2,&buf2len))) {
> +	if (RegQueryValueA(xhkey,NULL,buf2,&buf2len)) {

Ditto.

>  		RegCloseKey(xhkey);
>                  return CO_E_CLASSSTRING;
>  	}


-- 
Rob Shearman