oleaut32: Use FAILED instead of !SUCCEEDED.

Michael Stefaniuc mstefani at redhat.de
Tue Oct 7 18:33:15 CDT 2008


---
 dlls/oleaut32/typelib.c  |    6 +++---
 dlls/oleaut32/typelib2.c |    2 +-
 dlls/oleaut32/variant.c  |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 9539bd0..7e069d6 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -394,7 +394,7 @@ HRESULT WINAPI LoadTypeLibEx(
                 /* else fall-through */
 
             case REGKIND_REGISTER:
-                if (!SUCCEEDED(res = RegisterTypeLib(*pptLib, (LPOLESTR)szPath, NULL)))
+                if (FAILED(res = RegisterTypeLib(*pptLib, (LPOLESTR)szPath, NULL)))
                 {
                     IUnknown_Release(*pptLib);
                     *pptLib = 0;
@@ -491,7 +491,7 @@ HRESULT WINAPI RegisterTypeLib(
     if (ptlib == NULL || szFullPath == NULL)
         return E_INVALIDARG;
 
-    if (!SUCCEEDED(ITypeLib_GetLibAttr(ptlib, &attr)))
+    if (FAILED(ITypeLib_GetLibAttr(ptlib, &attr)))
         return E_FAIL;
 
     get_typelib_key( &attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, keyName );
@@ -6449,7 +6449,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo(
                                              ref_type->pImpTLInfo->lcid,
 					     &pTLib);
 
-		    if(!SUCCEEDED(result)) {
+                    if(FAILED(result)) {
                         BSTR libnam=SysAllocString(ref_type->pImpTLInfo->name);
 			result=LoadTypeLib(libnam, &pTLib);
 			SysFreeString(libnam);
diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c
index cbcd7f0..0d10f53 100644
--- a/dlls/oleaut32/typelib2.c
+++ b/dlls/oleaut32/typelib2.c
@@ -1349,7 +1349,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo(
      * implementation of ITypeInfo. So we need to do the following...
      */
     res = ITypeInfo_GetContainingTypeLib(pTInfo, &container, &index);
-    if (!SUCCEEDED(res)) {
+    if (FAILED(res)) {
 	TRACE("failed to find containing typelib.\n");
 	return res;
     }
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index e96325f..26a19bb 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -5673,14 +5673,14 @@ HRESULT WINAPI VarPow(LPVARIANT left, LPVARIANT right, LPVARIANT result)
     }
 
     hr = VariantChangeType(&dl,left,0,resvt);
-    if (!SUCCEEDED(hr)) {
+    if (FAILED(hr)) {
         ERR("Could not change passed left argument to VT_R8, handle it differently.\n");
         hr = E_FAIL;
         goto end;
     }
 
     hr = VariantChangeType(&dr,right,0,resvt);
-    if (!SUCCEEDED(hr)) {
+    if (FAILED(hr)) {
         ERR("Could not change passed right argument to VT_R8, handle it differently.\n");
         hr = E_FAIL;
         goto end;
-- 
1.6.0.2
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20081008/4ae0f54c/attachment.pgp 


More information about the wine-patches mailing list