Changeset 25149 in vbox for trunk/src/VBox/Main/DisplayImpl.cpp

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)

File:

• trunk/src/VBox/Main/DisplayImpl.cpp (modified) (21 diffs)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -224 +224 @@
                 return;
             }
-            
+
             pCtx->pu8PNG = (uint8_t *)pNew;
             pCtx->cbAllocated = cbNew;
@@ -373 +373 @@
                 }
 
-                png_destroy_write_struct(&png_ptr, info_ptr ? &info_ptr 
+                png_destroy_write_struct(&png_ptr, info_ptr ? &info_ptr
                                                             : (png_infopp)NULL);
             }
@@ -1247 +1247 @@
 }
 #endif /* VBOX_WITH_OLD_VBVA_LOCK */
-    
+
 /**
  * @thread EMT
@@ -1940 +1940 @@
 
     AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoWriteLock alock(this);
@@ -1962 +1962 @@
 
     AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoWriteLock alock(this);
@@ -1985 +1985 @@
 
     AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoWriteLock alock(this);
@@ -2012 +2012 @@
 
     AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoWriteLock alock(this);
@@ -2049 +2049 @@
 
     AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoWriteLock alock(this);
@@ -2071 +2071 @@
 {
     AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoWriteLock alock(this);
@@ -2121 +2121 @@
 {
     AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoWriteLock alock(this);
@@ -2218 +2218 @@
 
     AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoWriteLock alock(this);
@@ -2224 +2224 @@
     CHECK_CONSOLE_DRV (mpDrv);
 
-    Console::SafeVMPtr pVM (mParent);
-    CheckComRCReturnRC(pVM.rc());
+    Console::SafeVMPtr pVM(mParent);
+    if (FAILED(pVM.rc())) return pVM.rc();
 
     HRESULT rc = S_OK;
@@ -2268 +2268 @@
 
     AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoWriteLock alock(this);
@@ -2274 +2274 @@
     CHECK_CONSOLE_DRV (mpDrv);
 
-    Console::SafeVMPtr pVM (mParent);
-    CheckComRCReturnRC(pVM.rc());
+    Console::SafeVMPtr pVM(mParent);
+    if (FAILED(pVM.rc())) return pVM.rc();
 
     HRESULT rc = S_OK;
@@ -2361 +2361 @@
 
     AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoWriteLock alock(this);
@@ -2367 +2367 @@
     CHECK_CONSOLE_DRV (mpDrv);
 
-    Console::SafeVMPtr pVM (mParent);
-    CheckComRCReturnRC(pVM.rc());
+    Console::SafeVMPtr pVM(mParent);
+    if (FAILED(pVM.rc())) return pVM.rc();
 
     /*
@@ -2427 +2427 @@
 
     AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoWriteLock alock(this);
@@ -2433 +2433 @@
     CHECK_CONSOLE_DRV (mpDrv);
 
-    Console::SafeVMPtr pVM (mParent);
-    CheckComRCReturnRC(pVM.rc());
+    Console::SafeVMPtr pVM(mParent);
+    if (FAILED(pVM.rc())) return pVM.rc();
 
     HRESULT rc = S_OK;
@@ -2481 +2481 @@
     //  milliseconds).
     AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     /* this is only valid for external framebuffers */
@@ -2517 +2517 @@
     //  milliseconds).
     AutoCaller autoCaller(this);
-    CheckComRCReturnRC(autoCaller.rc());
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     /* this is only valid for external framebuffers */
@@ -2646 +2646 @@
 
     AutoCaller autoCaller(that);
-    CheckComRCReturnRC(autoCaller.rc());
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoWriteLock alock(that);