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

Timestamp:

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

Author:

vboxsync

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/src/VBox/Main/glue/errorprint.cpp (modified) (8 diffs)

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

@@ -47 +47 @@
     try
     {
+        HRESULT rc = S_OK;
         Utf8Str str;
         RTCList<Utf8Str> comp;
@@ -55 +56 @@
                              bstrDetailsText.raw());
         if (haveResultCode)
-            comp.append(Utf8StrFmt("code %Rhrc (0x%RX32)",
-                                   info.getResultCode(),
-                                   info.getResultCode()));
+        {
+            rc = info.getResultCode();
+            comp.append(Utf8StrFmt("code %Rhrc (0x%RX32)", rc, rc));
+        }
         if (haveComponent)
             comp.append(Utf8StrFmt("component %ls",
@@ -78 +80 @@
 
         // print and log
-        RTMsgError("%s", str.c_str());
-        Log(("ERROR: %s", str.c_str()));
+        if (FAILED(rc))
+        {
+            RTMsgError("%s", str.c_str());
+            Log(("ERROR: %s", str.c_str()));
+        }
+        else
+        {
+            RTMsgWarning("%s", str.c_str());
+            Log(("WARNING: %s", str.c_str()));
+        }
     }
     catch (std::bad_alloc &)
@@ -88 +98 @@
 }
 
-void GluePrintErrorContext(const char *pcszContext, const char *pcszSourceFile, uint32_t ulLine)
+void GluePrintErrorContext(const char *pcszContext, const char *pcszSourceFile, uint32_t ulLine, bool fWarning /* = false */)
 {
     // pcszSourceFile comes from __FILE__ macro, which always contains the full path,
@@ -94 +104 @@
     // print and log
     const char *pszFilenameOnly = RTPathFilename(pcszSourceFile);
-    RTMsgError("Context: \"%s\" at line %d of file %s\n", pcszContext, ulLine, pszFilenameOnly);
-    Log(("Context: \"%s\" at line %d of file %s\n", pcszContext, ulLine, pszFilenameOnly));
+    if (!fWarning)
+    {
+        RTMsgError("Context: \"%s\" at line %d of file %s\n", pcszContext, ulLine, pszFilenameOnly);
+        Log(("ERROR: Context: \"%s\" at line %d of file %s\n", pcszContext, ulLine, pszFilenameOnly));
+    }
+    else
+    {
+        RTMsgWarning("Context: \"%s\" at line %d of file %s\n", pcszContext, ulLine, pszFilenameOnly);
+        Log(("WARNING: Context: \"%s\" at line %d of file %s\n", pcszContext, ulLine, pszFilenameOnly));
+    }
 }
 
@@ -101 +119 @@
 {
     // print and log
-    RTMsgError("Code %Rhra (extended info not available)\n", rc);
-    Log(("ERROR: Code %Rhra (extended info not available)\n", rc));
+    if (FAILED(rc))
+    {
+        RTMsgError("Code %Rhra (extended info not available)\n", rc);
+        Log(("ERROR: Code %Rhra (extended info not available)\n", rc));
+    }
+    else
+    {
+        RTMsgWarning("Code %Rhra (extended info not available)\n", rc);
+        Log(("WARNING: Code %Rhra (extended info not available)\n", rc));
+    }
 }
 
@@ -117 +143 @@
         {
             GluePrintErrorInfo(*pInfo);
+
+            /* Use rc for figuring out if there were just warnings. */
+            HRESULT rc2 = pInfo->getResultCode();
+            if (   (SUCCEEDED_WARNING(rc) && FAILED(rc2))
+                || (SUCCEEDED(rc) && (FAILED(rc2) || SUCCEEDED_WARNING(rc2))))
+                rc = rc2;
 
             pInfo = pInfo->getNext();
@@ -136 +168 @@
 
     if (pcszContext != NULL || pcszSourceFile != NULL)
-        GluePrintErrorContext(pcszContext, pcszSourceFile, ulLine);
+        GluePrintErrorContext(pcszContext, pcszSourceFile, ulLine, SUCCEEDED_WARNING(rc));
 }