Changeset 25149 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Dec 2, 2009 2:34:47 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

55564

Message:

Main: cleanup: remove all CheckComRC* macros (no functional change)

Location:

trunk/src/VBox/Main/glue

Files:

• SupportErrorInfo.cpp (modified) (10 diffs)
• VirtualBoxErrorInfo.cpp (modified) (4 diffs)

trunk/src/VBox/Main/glue/SupportErrorInfo.cpp

@@ -144 +144 @@
             ComPtr<IErrorInfo> err;
             rc = ::GetErrorInfo (0, err.asOutParam());
-            CheckComRCBreakRC (rc);
+            if (FAILED(rc)) break;
             rc = err.queryInterfaceTo(curInfo.asOutParam());
             if (FAILED (rc))
@@ -161 +161 @@
         }
         /* On failure, curInfo will stay null */
-        Assert (SUCCEEDED(rc) || curInfo.isNull());
+        Assert(SUCCEEDED(rc) || curInfo.isNull());
 
         /* set the current error info and preserve the previous one if any */
@@ -174 +174 @@
                 ComObjPtr<VirtualBoxErrorInfoGlue> infoObj;
                 rc = infoObj.createObject();
-                CheckComRCBreakRC (rc);
+                if (FAILED(rc)) break;
 
                 rc = infoObj->init (aInfo, curInfo);
-                CheckComRCBreakRC (rc);
+                if (FAILED(rc)) break;
 
                 info = infoObj;
@@ -184 +184 @@
             /* we want to return the head's result code */
             rc = info->COMGETTER(ResultCode) (&aResultCode);
-            CheckComRCBreakRC (rc);
+            if (FAILED(rc)) break;
         }
         else
@@ -190 +190 @@
             ComObjPtr<VirtualBoxErrorInfo> infoObj;
             rc = infoObj.createObject();
-            CheckComRCBreakRC (rc);
+            if (FAILED(rc)) break;
 
             rc = infoObj->init (aResultCode, aIID, aComponent, strText.c_str(), curInfo);
-            CheckComRCBreakRC (rc);
+            if (FAILED(rc)) break;
 
             info = infoObj;
@@ -211 +211 @@
             nsCOMPtr <nsIExceptionManager> em;
             rc = es->GetCurrentExceptionManager (getter_AddRefs (em));
-            CheckComRCBreakRC (rc);
+            if (FAILED(rc)) break;
 
             ComPtr<IVirtualBoxErrorInfo> curInfo;
@@ -219 +219 @@
                 ComPtr<nsIException> ex;
                 rc = em->GetCurrentException (ex.asOutParam());
-                CheckComRCBreakRC (rc);
+                if (FAILED(rc)) break;
                 rc = ex.queryInterfaceTo(curInfo.asOutParam());
                 if (FAILED (rc))
@@ -249 +249 @@
                     ComObjPtr<VirtualBoxErrorInfoGlue> infoObj;
                     rc = infoObj.createObject();
-                    CheckComRCBreakRC (rc);
+                    if (FAILED(rc)) break;
 
                     rc = infoObj->init (aInfo, curInfo);
-                    CheckComRCBreakRC (rc);
+                    if (FAILED(rc)) break;
 
                     info = infoObj;
@@ -260 +260 @@
                 PRInt32 lrc;
                 rc = info->COMGETTER(ResultCode) (&lrc); aResultCode = lrc;
-                CheckComRCBreakRC (rc);
+                if (FAILED(rc)) break;
             }
             else
@@ -266 +266 @@
                 ComObjPtr<VirtualBoxErrorInfo> infoObj;
                 rc = infoObj.createObject();
-                CheckComRCBreakRC (rc);
+                if (FAILED(rc)) break;
 
                 rc = infoObj->init(aResultCode, aIID, aComponent, strText, curInfo);
-                CheckComRCBreakRC (rc);
+                if (FAILED(rc)) break;
 
                 info = infoObj;

trunk/src/VBox/Main/glue/VirtualBoxErrorInfo.cpp

@@ -254 +254 @@
     ComPtr<IVirtualBoxErrorInfo> info;
     nsresult rv = COMGETTER(Next) (info.asOutParam());
-    CheckComRCReturnRC(rv);
+    if (FAILED(rv)) return rv;
     return info.queryInterfaceTo(aInner);
 }
@@ -305 +305 @@
         ComPtr<IVirtualBoxErrorInfo> next;
         rc = cur->COMGETTER(Next) (next.asOutParam());
-        CheckComRCReturnRC(rc);
+        if (FAILED(rc)) return rc;
 
         if (next.isNull())
@@ -327 +327 @@
         ComObjPtr<VirtualBoxErrorInfoGlue> wrapper;
         rc = wrapper.createObject();
-        CheckComRCBreakRC (rc);
+        if (FAILED(rc)) break;
 
         -- prev;
@@ -338 +338 @@
         *prev = wrapper;
 
-        CheckComRCBreakRC (rc);
+        if (FAILED(rc)) break;
     }