Changeset 8709

Timestamp:

05/08/08 15:43:21 (2 months ago)

Author:

vboxsync

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.

Files:

• trunk/src/VBox/Main/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Main/VirtualBoxBase.cpp (modified) (1 diff)
• trunk/src/VBox/Main/include/USBDeviceImpl.h (modified) (2 diffs)
• trunk/src/VBox/Main/include/VirtualBoxBase.h (modified) (10 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -48 +48 @@
- VBOX_MAIN_DEFS += VBOX_WITH_UNIXY_TAP_NETWORKING
-endif
-#
-#
-#
+
+
+
- ifneq ($(VBOX_VERSION_MAJOR)$(VBOX_VERSION_MINOR)$(VBOX_VERSION_BUILD),160)
-  VBOX_MAIN_DEFS += VBOX_MAIN_AUTOLOCK_TRAP
- endif
-#
+
-
-## @todo eliminate or expand VBOX_MAIN_DEFS.

trunk/src/VBox/Main/VirtualBoxBase.cpp

@@ -609 +609 @@
-    HRESULT aResultCode, const GUID &aIID,
-    const Bstr &aComponent, const Bstr &aText,
-
+, bool aLogIt
-{
-    /* whether multi-error mode is turned on */
-    bool preserve = ((uintptr_t) RTTlsGet (MultiResult::sCounter)) > 0;
-
-
-
-
-
+
+
+
+
+
-
-    /* these are mandatory, others -- not */

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

@@ -130 +130 @@
-        if (!found)
-        {
-
+NoLog
-                "Could not find a USB device with UUID {%s}"),
-                idToFind.toString().raw());
@@ -158 +158 @@
-
-        if (!found)
-
+NoLog
-                "Could not find a USB device with address '%ls'"),
-                aAddress);

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

@@ -1105 +1105 @@
-    static HRESULT setErrorInternal (HRESULT aResultCode, const GUID &aIID,
-                                     const Bstr &aComponent, const Bstr &aText,
-
+, bool aLogIt
-
-protected:
@@ -1233 +1233 @@
-
-    static HRESULT setError (HRESULT aResultCode, const GUID &aIID,
-
-
+
+
+
-    {
-        return setErrorInternal (aResultCode, aIID, aComponent, aText,
-
+, aLogIt
-    }
-
@@ -1245 +1246 @@
-    {
-        return setErrorInternal (aResultCode, aIID, aComponent, aText,
-
+, true /* aLogIt */
-    }
-
-    static HRESULT setError (HRESULT aResultCode, const GUID &aIID,
-                             const Bstr &aComponent,
-
+, bool aLogIt = true
-    {
-        return setErrorInternal (aResultCode, aIID, aComponent,
-                                 Utf8StrFmtVA (aText, aArgs),
-
+, aLogIt
-    }
-
@@ -1263 +1264 @@
-        return setErrorInternal (aResultCode, aIID, aComponent,
-                                 Utf8StrFmtVA (aText, aArgs),
-
+, true /* aLogIt */
-    }
-};
@@ -1382 +1383 @@
-        va_start (args, aText);
-        HRESULT rc = VirtualBoxSupportErrorInfoImplBase::setError
-
+, true /* aLogIt */
-        va_end (args);
-        return rc;
@@ -1436 +1437 @@
-        va_start (args, aText);
-        HRESULT rc = VirtualBoxSupportErrorInfoImplBase::setError
-
+, true /* aLogIt */
-        va_end (args);
-        return rc;
@@ -1473 +1474 @@
-    {
-        HRESULT rc = VirtualBoxSupportErrorInfoImplBase::setError
-
+, true /* aLogIt */
-        return rc;
-    }
@@ -1509 +1510 @@
-    {
-        HRESULT rc = VirtualBoxSupportErrorInfoImplBase::setError
-
+, true /* aLogIt */
-        return rc;
-    }
@@ -1544 +1545 @@
-        va_start (args, aText);
-        HRESULT rc = VirtualBoxSupportErrorInfoImplBase::setError
-
+, 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;