Changeset 89720 in vbox for trunk/include

Timestamp:

Jun 15, 2021 6:53:58 PM (4 years ago)

Author:

vboxsync

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

145171

Message:

com/errorprint: Teach it how to deal with warnings (print the message and continue as usual), using the appropriate flagging as warnings. bugref:3582

File:

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

trunk/include/VBox/com/errorprint.h

@@ -48 +48 @@
 // compiled only once for all front-ends
 void GluePrintErrorInfo(const com::ErrorInfo &info);
-void GluePrintErrorContext(const char *pcszContext, const char *pcszSourceFile, uint32_t uLine);
+void GluePrintErrorContext(const char *pcszContext, const char *pcszSourceFile, uint32_t uLine, bool fWarning = false);
 void GluePrintRCMessage(HRESULT rc);
 void GlueHandleComError(ComPtr<IUnknown> iface, const char *pcszContext, HRESULT rc, const char *pcszSourceFile, uint32_t uLine);
@@ -88 +88 @@
     if (1) { \
         type hrc = iface->method; \
-        if (SUCCEEDED(hrc)) \
+        if (SUCCEEDED(hrc) && !SUCCEEDED_WARNING(hrc)) \
         { /*likely*/ } \
         else \
         { \
             com::GlueHandleComError(iface, #method, (hrc), __FILE__, __LINE__); \
-            stmtError; \
+            if (!SUCCEEDED_WARNING(hrc)) \
+            { \
+                stmtError; \
+            } \
         } \
     } else do { /* nothing */ } while (0)
@@ -112 +115 @@
     do { \
         rc = iface->method; \
-        if (FAILED(rc)) \
+        if (FAILED(rc) || SUCCEEDED_WARNING(rc)) \
             com::GlueHandleComError(iface, #method, rc, __FILE__, __LINE__); \
     } while (0)
@@ -144 +147 @@
     do { \
         rc = iface->method; \
-        if (FAILED(rc)) \
-        { \
-            com::GlueHandleComError(iface, #method, rc, __FILE__, __LINE__); \
-            stmt; \
+        if (FAILED(rc) || SUCCEEDED_WARNING(rc)) \
+        { \
+            com::GlueHandleComError(iface, #method, rc, __FILE__, __LINE__); \
+            if (!SUCCEEDED_WARNING(rc) \
+            { \
+                stmt; \
+            } \
         } \
     } while (0)
@@ -183 +189 @@
     ({ \
         rc = iface->method; \
-        if (FAILED(rc)) \
-        { \
-            com::GlueHandleComError(iface, #method, rc, __FILE__, __LINE__); \
-            break; \
+        if (FAILED(rc) || SUCCEEDED_WARNING(rc)) \
+        { \
+            com::GlueHandleComError(iface, #method, rc, __FILE__, __LINE__); \
+            if (!SUCCEEDED_WARNING(rc)) \
+                break; \
         } \
     })
@@ -197 +204 @@
         { \
             com::GlueHandleComError(iface, #method, rc, __FILE__, __LINE__); \
-            break; \
+            if (!SUCCEEDED_WARNING(rc)) \
+                break; \
         } \
     } \
@@ -243 +251 @@
     do { \
         rc = iface->method; \
-        if (FAILED(rc)) \
-        { \
-            com::GlueHandleComError(iface, #method, rc, __FILE__, __LINE__); \
-            return (ret); \
+        if (FAILED(rc) || SUCCEEDED_WARNING(rc)) \
+        { \
+            com::GlueHandleComError(iface, #method, rc, __FILE__, __LINE__); \
+            if (!SUCCEEDED_WARNING(rc)) \
+                return (ret); \
         } \
     } while (0)