Changeset 8709 in vbox for trunk/src/VBox/Main/include/VirtualBoxBase.h

Timestamp:

May 8, 2008 1:43:21 PM (17 years ago)

Author:

vboxsync

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

30647

Message:

Added a setErrorNoLog method and aLogIt argument to the core setError methods (defaults to true) so that we can get rid of the disturbing release log errors caused by the USB drop down menu in the GUI.

File:

• trunk/src/VBox/Main/include/VirtualBoxBase.h (modified) (10 diffs)

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -1105 +1105 @@
     static HRESULT setErrorInternal (HRESULT aResultCode, const GUID &aIID,
                                      const Bstr &aComponent, const Bstr &aText,
-                                     bool aWarning);
+                                     bool aWarning, bool aLogIt);
 
 protected:
@@ -1233 +1233 @@
 
     static HRESULT setError (HRESULT aResultCode, const GUID &aIID,
-                                    const Bstr &aComponent,
-                                    const Bstr &aText)
+                             const Bstr &aComponent,
+                             const Bstr &aText,
+                             bool aLogIt = true)
     {
         return setErrorInternal (aResultCode, aIID, aComponent, aText,
-                                 false /* aWarning */);
+                                 false /* aWarning */, aLogIt);
     }
 
@@ -1245 +1246 @@
     {
         return setErrorInternal (aResultCode, aIID, aComponent, aText,
-                                 true /* aWarning */);
+                                 true /* aWarning */, true /* aLogIt */);
     }
 
     static HRESULT setError (HRESULT aResultCode, const GUID &aIID,
                              const Bstr &aComponent,
-                             const char *aText, va_list aArgs)
+                             const char *aText, va_list aArgs, bool aLogIt = true)
     {
         return setErrorInternal (aResultCode, aIID, aComponent,
                                  Utf8StrFmtVA (aText, aArgs),
-                                 false /* aWarning */);
+                                 false /* aWarning */, aLogIt);
     }
 
@@ -1263 +1264 @@
         return setErrorInternal (aResultCode, aIID, aComponent,
                                  Utf8StrFmtVA (aText, aArgs),
-                                 true /* aWarning */);
+                                 true /* aWarning */, true /* aLogIt */);
     }
 };
@@ -1382 +1383 @@
         va_start (args, aText);
         HRESULT rc = VirtualBoxSupportErrorInfoImplBase::setError
-            (aResultCode, aIID, aComponent, aText, args);
+            (aResultCode, aIID, aComponent, aText, args, true /* aLogIt */);
         va_end (args);
         return rc;
@@ -1436 +1437 @@
         va_start (args, aText);
         HRESULT rc = VirtualBoxSupportErrorInfoImplBase::setError
-            (aResultCode, COM_IIDOF(I), C::getComponentName(), aText, args);
+            (aResultCode, COM_IIDOF(I), C::getComponentName(), aText, args, true /* aLogIt */);
         va_end (args);
         return rc;
@@ -1473 +1474 @@
     {
         HRESULT rc = VirtualBoxSupportErrorInfoImplBase::setError
-            (aResultCode, COM_IIDOF(I), C::getComponentName(), aText, aArgs);
+            (aResultCode, COM_IIDOF(I), C::getComponentName(), aText, aArgs, true /* aLogIt */);
         return rc;
     }
@@ -1509 +1510 @@
     {
         HRESULT rc = VirtualBoxSupportErrorInfoImplBase::setError
-            (aResultCode, COM_IIDOF(I), C::getComponentName(), aText);
+            (aResultCode, COM_IIDOF(I), C::getComponentName(), aText, true /* aLogIt */);
         return rc;
     }
@@ -1544 +1545 @@
         va_start (args, aText);
         HRESULT rc = VirtualBoxSupportErrorInfoImplBase::setError
-            (aResultCode, aIID, C::getComponentName(), aText, args);
+            (aResultCode, aIID, C::getComponentName(), aText, args, true /* aLogIt */);
         va_end (args);
         return rc;
@@ -1565 +1566 @@
         HRESULT rc = VirtualBoxSupportErrorInfoImplBase::setWarning
             (aResultCode, aIID, C::getComponentName(), aText, args);
+        va_end (args);
+        return rc;
+    }
+
+    /**
+     *  Sets the error information for the current thread but doesn't put
+     *  anything in the release log. This is very useful for avoiding
+     *  harmless error from causing confusion.
+     *
+     *  It is otherwise identical to #setError (HRESULT, const char *text, ...).
+     */
+    static HRESULT setErrorNoLog (HRESULT aResultCode, const char *aText, ...)
+    {
+        va_list args;
+        va_start (args, aText);
+        HRESULT rc = VirtualBoxSupportErrorInfoImplBase::setError
+            (aResultCode, COM_IIDOF(I), C::getComponentName(), aText, args, false /* aLogIt */);
         va_end (args);
         return rc;