Changeset 95140 in vbox for trunk/include/VBox/com

Timestamp:

May 31, 2022 9:11:39 AM (3 years ago)

Author:

vboxsync

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

151631

Message:

Frontends + Main: Adjust to the new rules wrt. to rc -> hrc,vrc usage. This also fixes quite a few bugs wrt shadow variables, wrong return values and output error translations / exit codes. Also see @todos added. ​​bugref:10223

File:

• trunk/include/VBox/com/errorprint.h (modified) (8 diffs)

trunk/include/VBox/com/errorprint.h

@@ -114 +114 @@
 #define CHECK_ERROR(iface, method) \
     do { \
-        rc = iface->method; \
-        if (FAILED(rc) || SUCCEEDED_WARNING(rc)) \
-            com::GlueHandleComError(iface, #method, rc, __FILE__, __LINE__); \
+        hrc = iface->method; \
+        if (FAILED(hrc) || SUCCEEDED_WARNING(hrc)) \
+            com::GlueHandleComError(iface, #method, hrc, __FILE__, __LINE__); \
     } while (0)
 /**
@@ -146 +146 @@
 #define CHECK_ERROR_STMT(iface, method, stmt) \
     do { \
-        rc = iface->method; \
-        if (FAILED(rc) || SUCCEEDED_WARNING(rc)) \
-        { \
-            com::GlueHandleComError(iface, #method, rc, __FILE__, __LINE__); \
-            if (!SUCCEEDED_WARNING(rc) \
+        hrc = iface->method; \
+        if (FAILED(hrc) || SUCCEEDED_WARNING(hrc)) \
+        { \
+            com::GlueHandleComError(iface, #method, hrc, __FILE__, __LINE__); \
+            if (!SUCCEEDED_WARNING(hrc) \
             { \
                 stmt; \
@@ -188 +188 @@
     __extension__ \
     ({ \
-        rc = iface->method; \
-        if (FAILED(rc) || SUCCEEDED_WARNING(rc)) \
-        { \
-            com::GlueHandleComError(iface, #method, rc, __FILE__, __LINE__); \
-            if (!SUCCEEDED_WARNING(rc)) \
+        hrc = iface->method; \
+        if (FAILED(hrc) || SUCCEEDED_WARNING(hrc)) \
+        { \
+            com::GlueHandleComError(iface, #method, hrc, __FILE__, __LINE__); \
+            if (!SUCCEEDED_WARNING(hrc)) \
                 break; \
         } \
@@ -200 +200 @@
     if (1) \
     { \
-        rc = iface->method; \
-        if (FAILED(rc)) \
-        { \
-            com::GlueHandleComError(iface, #method, rc, __FILE__, __LINE__); \
-            if (!SUCCEEDED_WARNING(rc)) \
+        hrc = iface->method; \
+        if (FAILED(hrc)) \
+        { \
+            com::GlueHandleComError(iface, #method, hrc, __FILE__, __LINE__); \
+            if (!SUCCEEDED_WARNING(hrc)) \
                 break; \
         } \
@@ -250 +250 @@
 #define CHECK_ERROR_RET(iface, method, ret) \
     do { \
-        rc = iface->method; \
-        if (FAILED(rc) || SUCCEEDED_WARNING(rc)) \
-        { \
-            com::GlueHandleComError(iface, #method, rc, __FILE__, __LINE__); \
-            if (!SUCCEEDED_WARNING(rc)) \
+        hrc = iface->method; \
+        if (FAILED(hrc) || SUCCEEDED_WARNING(hrc)) \
+        { \
+            com::GlueHandleComError(iface, #method, hrc, __FILE__, __LINE__); \
+            if (!SUCCEEDED_WARNING(hrc)) \
                 return (ret); \
         } \
@@ -289 +289 @@
     do { \
         LONG iRc; \
-        rc = progress->COMGETTER(ResultCode)(&iRc); \
-        if (FAILED(rc) || FAILED(iRc)) \
-        { \
-            if (SUCCEEDED(rc)) rc = iRc; else iRc = rc; \
+        hrc = progress->COMGETTER(ResultCode)(&iRc); \
+        if (FAILED(hrc) || FAILED(iRc)) \
+        { \
+            if (SUCCEEDED(hrc)) hrc = iRc; else iRc = hrc; \
             RTMsgError msg; \
             com::GlueHandleComErrorProgress(progress, __PRETTY_FUNCTION__, iRc, __FILE__, __LINE__); \
@@ -308 +308 @@
     ({ \
         LONG iRc; \
-        rc = progress->COMGETTER(ResultCode)(&iRc); \
-        if (FAILED(rc) || FAILED(iRc)) \
-        { \
-            if (SUCCEEDED(rc)) rc = iRc; else iRc = rc; \
+        hrc = progress->COMGETTER(ResultCode)(&iRc); \
+        if (FAILED(hrc) || FAILED(iRc)) \
+        { \
+            if (SUCCEEDED(hrc)) hrc = iRc; else iRc = hrc; \
             RTMsgError msg; \
             com::GlueHandleComErrorProgress(progress, __PRETTY_FUNCTION__, iRc, __FILE__, __LINE__); \
@@ -322 +322 @@
     { \
         LONG iRc; \
-        rc = progress->COMGETTER(ResultCode)(&iRc); \
-        if (FAILED(rc) || FAILED(iRc)) \
-        { \
-            if (SUCCEEDED(rc)) rc = iRc; else iRc = rc; \
+        hrc = progress->COMGETTER(ResultCode)(&iRc); \
+        if (FAILED(hrc) || FAILED(iRc)) \
+        { \
+            if (SUCCEEDED(hrc)) hrc = iRc; else iRc = hrc; \
             RTMsgError msg; \
             com::GlueHandleComErrorProgress(progress, __PRETTY_FUNCTION__, iRc, __FILE__, __LINE__); \