Changeset 41184 in vbox for trunk/src

Timestamp:

May 7, 2012 1:28:04 PM (13 years ago)

Author:

vboxsync

Message:

Main+Frontends: removed unused and confusing VirtualBoxErrorInfo implementation, and cleaned up lots of misleading comments and other leftovers about the earlier ErrorInfo mess

Location:

trunk/src/VBox

Files:

• Frontends/VBoxBFE/NetworkAdapterImpl.cpp (modified) (1 diff)
• Frontends/VBoxBFE/VirtualBoxBase.h (modified) (8 diffs)
• Main/Makefile.kmk (modified) (1 diff)
• Main/glue/VirtualBoxErrorInfo.cpp (deleted)
• Main/include/FramebufferImpl.h (modified) (2 diffs)
• Main/include/ProgressProxyImpl.h (modified) (2 diffs)
• Main/include/VirtualBoxBase.h (modified) (8 diffs)
• Main/src-all/ProgressImpl.cpp (modified) (1 diff)
• Main/src-all/VirtualBoxBase.cpp (modified) (1 diff)
• Main/src-all/VirtualBoxErrorInfoImpl.cpp (modified) (20 diffs)
• Main/src-server/USBControllerImpl.cpp (modified) (36 diffs)

trunk/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.cpp

@@ -187 +187 @@
         AssertMsgFailed(("Invalid file descriptor: %ld.\n", tapFileDescriptor));
 
-        //    setError  VirtualBoxSupportErrorInfoImplBase which
-        //       is a parent class of NetworAdapter in the COM flavored version
-        //    return setError (E_INVALIDARG,
-        //        tr ("Invalid file descriptor: %ld"), tapFileDescriptor);
-
-        return S_OK;
-
+        return setError (E_INVALIDARG,
+                tr ("Invalid file descriptor: %ld"), tapFileDescriptor);
     }
 

trunk/src/VBox/Frontends/VBoxBFE/VirtualBoxBase.h

@@ -81 +81 @@
 
 /**
- *  A special version of the Assert macro to be used within VirtualBoxBase
- *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
+ *  Assert macro wrapper.
  *
  *  In the debug build, this macro is equivalent to Assert.
- *  In the release build, this macro uses |setError (E_FAIL, ...)| to set the
- *  error info from the asserted expression.
- *
- *  @see VirtualBoxSupportErrorInfoImpl::setError
+ *  In the release build, this is a no-op.
  *
  *  @param   expr    Expression which should be true.
@@ -100 +96 @@
 
 /**
- *  A special version of the AssertMsg macro to be used within VirtualBoxBase
- *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
+ *  AssertMsg macro wrapper.
+ *
+ *  In the debug build, this macro is equivalent to AssertMsg.
+ *  In the release build, this is a no-op.
  *
  *  See ComAssert for more info.
@@ -116 +114 @@
 
 /**
- *  A special version of the AssertRC macro to be used within VirtualBoxBase
- *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
+ *  AssertRC macro wrapper.
+ *
+ *  In the debug build, this macro is equivalent to AssertRC.
+ *  In the release build, this is a no-op.
  *
  *  See ComAssert for more info.
@@ -130 +130 @@
 
 /**
- *  A special version of the AssertMsgRC macro to be used within VirtualBoxBase
- *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
+ *  AssertMsgRC macro wrapper.
+ *
+ *  In the debug build, this macro is equivalent to AssertMsgRC.
+ *  In the release build, this is a no-op.
  *
  *  See ComAssert for more info.
@@ -146 +148 @@
 
 /**
- *  A special version of the AssertFailed macro to be used within VirtualBoxBase
- *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
+ *  AssertFailed macro wrapper.
+ *
+ *  In the debug build, this macro is equivalent to AssertFailed.
+ *  In the release build, this is a no-op.
  *
  *  See ComAssert for more info.
@@ -159 +163 @@
 
 /**
- *  A special version of the AssertMsgFailed macro to be used within VirtualBoxBase
- *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
+ *  AssertMsgFailed macro wrapper.
+ *
+ *  In the debug build, this macro is equivalent to AssertMsgFailed.
+ *  In the release build, this is a no-op.
  *
  *  See ComAssert for more info.
@@ -174 +180 @@
 
 /**
- *  A special version of the AssertComRC macro to be used within VirtualBoxBase
- *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
+ *  AssertComRC macro wrapper.
+ *
+ *  In the debug build, this macro is equivalent to AssertComRC.
+ *  In the release build, this is a no-op.
  *
  *  See ComAssert for more info.
@@ -246 +254 @@
  *  This macro <b>must</b> be used at the beginning of all interface methods
  *  (right after entering the class lock) in classes derived from both
- *  VirtualBoxBase and VirtualBoxSupportErrorInfoImpl.
+ *  VirtualBoxBase.
  */
 #define CHECK_READY() \

trunk/src/VBox/Main/Makefile.kmk

@@ -706 +706 @@
         glue/EventQueue.cpp \
         glue/ErrorInfo.cpp \
-        glue/errorprint.cpp \
-        glue/VirtualBoxErrorInfo.cpp
+        glue/errorprint.cpp
 VBoxCOM_INCS          += \
         include

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

@@ -26 +26 @@
 class ATL_NO_VTABLE Framebuffer :
     public VirtualBoxBase,
-    public VirtualBoxSupportErrorInfoImpl<Framebuffer, IFramebuffer>,
     public VirtualBoxSupportTranslation<Framebuffer>,
     VBOX_SCRIPTABLE_IMPL(IFramebuffer)
@@ -73 +72 @@
 
     STDMETHOD(ProcessVHWACommand)(BYTE *pCommand) = 0;
-
-    // for VirtualBoxSupportErrorInfoImpl
-    static const wchar_t *getComponentName() { return L"Framebuffer"; }
-
 };
 

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

@@ -28 +28 @@
  */
 class ATL_NO_VTABLE ProgressProxy :
-    //public com::SupportErrorInfoDerived<Progress, ProgressProxy, IProgress>,
     public Progress
 {
@@ -94 +93 @@
     bool setOtherProgressObject(IProgress *pOtherProgress);
 
-    /** For com::SupportErrorInfoImpl. */
-    static const char *ComponentName() { return "ProgressProxy"; }
-
 protected:
     void clearOtherProgressObjectInternal(bool fEarly);

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

@@ -146 +146 @@
 /**
  *  Special version of the Assert macro to be used within VirtualBoxBase
- *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
+ *  subclasses.
  *
  *  In the debug build, this macro is equivalent to Assert.
@@ -152 +152 @@
  *  error info from the asserted expression.
  *
- *  @see VirtualBoxSupportErrorInfoImpl::setError
+ *  @see VirtualBoxBase::setError
  *
  *  @param   expr    Expression which should be true.
@@ -170 +170 @@
 /**
  *  Special version of the AssertFailed macro to be used within VirtualBoxBase
- *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
+ *  subclasses.
  *
  *  In the debug build, this macro is equivalent to AssertFailed.
@@ -176 +176 @@
  *  error info from the asserted expression.
  *
- *  @see VirtualBoxSupportErrorInfoImpl::setError
+ *  @see VirtualBoxBase::setError
  *
  */
@@ -192 +192 @@
 /**
  *  Special version of the AssertMsg macro to be used within VirtualBoxBase
- *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
+ *  subclasses.
  *
  *  See ComAssert for more info.
@@ -213 +213 @@
 /**
  *  Special version of the AssertRC macro to be used within VirtualBoxBase
- *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
+ *  subclasses.
  *
  *  See ComAssert for more info.
@@ -227 +227 @@
 /**
  *  Special version of the AssertMsgRC macro to be used within VirtualBoxBase
- *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
+ *  subclasses.
  *
  *  See ComAssert for more info.
@@ -242 +242 @@
 /**
  *  Special version of the AssertComRC macro to be used within VirtualBoxBase
- *  subclasses that also inherit the VirtualBoxSupportErrorInfoImpl template.
+ *  subclasses.
  *
  *  See ComAssert for more info.

trunk/src/VBox/Main/src-all/ProgressImpl.cpp

@@ -1235 +1235 @@
  * Marks the operation as complete and attaches full error info.
  *
- * See com::SupportErrorInfoImpl::setError(HRESULT, const GUID &, const wchar_t
+ * See VirtualBoxBase::setError(HRESULT, const GUID &, const wchar_t
  * *, const char *, ...) for more info.
  *

trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp

@@ -739 +739 @@
 
 /**
- * Places the managed VirtualBoxBase object to  Ready/Limited state if the
+ * Places the managed VirtualBoxBase object to Ready/Limited state if the
  * initialization succeeded or partly succeeded, or places it to InitFailed
  * state and calls the object's uninit() method.

trunk/src/VBox/Main/src-all/VirtualBoxErrorInfoImpl.cpp

@@ -1 +1 @@
 /** @file
  *
- * VirtualBoxErrorInfo COM classe implementation
+ * VirtualBoxErrorInfo COM class implementation
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -66 +66 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(ResultCode) (LONG *aResultCode)
+STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(ResultCode)(LONG *aResultCode)
 {
     CheckComArgOutPointerValid(aResultCode);
@@ -74 +74 @@
 }
 
-STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(InterfaceID) (BSTR *aIID)
+STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(InterfaceID)(BSTR *aIID)
 {
     CheckComArgOutPointerValid(aIID);
@@ -82 +82 @@
 }
 
-STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(Component) (BSTR *aComponent)
+STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(Component)(BSTR *aComponent)
 {
     CheckComArgOutPointerValid(aComponent);
@@ -90 +90 @@
 }
 
-STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(Text) (BSTR *aText)
+STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(Text)(BSTR *aText)
 {
     CheckComArgOutPointerValid(aText);
@@ -98 +98 @@
 }
 
-STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(Next) (IVirtualBoxErrorInfo **aNext)
+STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(Next)(IVirtualBoxErrorInfo **aNext)
 {
     CheckComArgOutPointerValid(aNext);
@@ -112 +112 @@
  *  object.
  */
-HRESULT VirtualBoxErrorInfo::init (IErrorInfo *aInfo)
+HRESULT VirtualBoxErrorInfo::init(IErrorInfo *aInfo)
 {
     AssertReturn(aInfo, E_FAIL);
@@ -124 +124 @@
     m_resultCode = S_OK;
     rc = aInfo->GetGUID(m_IID.asOutParam());
-    AssertComRC (rc);
+    AssertComRC(rc);
     Bstr bstrComponent;
     rc = aInfo->GetSource(bstrComponent.asOutParam());
-    AssertComRC (rc);
+    AssertComRC(rc);
     m_strComponent = bstrComponent;
     Bstr bstrText;
     rc = aInfo->GetDescription(bstrText.asOutParam());
-    AssertComRC (rc);
+    AssertComRC(rc);
     m_strText = bstrText;
 
@@ -140 +140 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP VirtualBoxErrorInfo::GetDescription (BSTR *description)
-{
-    return COMGETTER(Text) (description);
-}
-
-STDMETHODIMP VirtualBoxErrorInfo::GetGUID (GUID *guid)
+STDMETHODIMP VirtualBoxErrorInfo::GetDescription(BSTR *description)
+{
+    return COMGETTER(Text)(description);
+}
+
+STDMETHODIMP VirtualBoxErrorInfo::GetGUID(GUID *guid)
 {
     Bstr iid;
-    HRESULT rc = COMGETTER(InterfaceID) (iid.asOutParam());
+    HRESULT rc = COMGETTER(InterfaceID)(iid.asOutParam());
     if (SUCCEEDED(rc))
         *guid = Guid(iid).ref();
@@ -154 +154 @@
 }
 
-STDMETHODIMP VirtualBoxErrorInfo::GetHelpContext (DWORD *pdwHelpContext)
+STDMETHODIMP VirtualBoxErrorInfo::GetHelpContext(DWORD *pdwHelpContext)
 {
     return E_NOTIMPL;
 }
 
-STDMETHODIMP VirtualBoxErrorInfo::GetHelpFile (BSTR *pbstrHelpFile)
+STDMETHODIMP VirtualBoxErrorInfo::GetHelpFile(BSTR *pbstrHelpFile)
 {
     return E_NOTIMPL;
 }
 
-STDMETHODIMP VirtualBoxErrorInfo::GetSource (BSTR *source)
-{
-    return COMGETTER(Component) (source);
+STDMETHODIMP VirtualBoxErrorInfo::GetSource(BSTR *source)
+{
+    return COMGETTER(Component)(source);
 }
 
@@ -206 +206 @@
 
 /* readonly attribute string message; */
-NS_IMETHODIMP VirtualBoxErrorInfo::GetMessage (char **aMessage)
+NS_IMETHODIMP VirtualBoxErrorInfo::GetMessage(char **aMessage)
 {
     CheckComArgOutPointerValid(aMessage);
@@ -215 +215 @@
 
 /* readonly attribute nsresult result; */
-NS_IMETHODIMP VirtualBoxErrorInfo::GetResult (nsresult *aResult)
+NS_IMETHODIMP VirtualBoxErrorInfo::GetResult(nsresult *aResult)
 {
     if (!aResult)
@@ -221 +221 @@
 
     PRInt32 lrc;
-    nsresult rc = COMGETTER(ResultCode) (&lrc);
+    nsresult rc = COMGETTER(ResultCode)(&lrc);
     if (SUCCEEDED(rc))
       *aResult = lrc;
@@ -228 +228 @@
 
 /* readonly attribute string name; */
-NS_IMETHODIMP VirtualBoxErrorInfo::GetName (char ** /* aName */)
+NS_IMETHODIMP VirtualBoxErrorInfo::GetName(char ** /* aName */)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
@@ -234 +234 @@
 
 /* readonly attribute string filename; */
-NS_IMETHODIMP VirtualBoxErrorInfo::GetFilename (char ** /* aFilename */)
+NS_IMETHODIMP VirtualBoxErrorInfo::GetFilename(char ** /* aFilename */)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
@@ -240 +240 @@
 
 /* readonly attribute PRUint32 lineNumber; */
-NS_IMETHODIMP VirtualBoxErrorInfo::GetLineNumber (PRUint32 * /* aLineNumber */)
+NS_IMETHODIMP VirtualBoxErrorInfo::GetLineNumber(PRUint32 * /* aLineNumber */)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
@@ -246 +246 @@
 
 /* readonly attribute PRUint32 columnNumber; */
-NS_IMETHODIMP VirtualBoxErrorInfo::GetColumnNumber (PRUint32 * /*aColumnNumber */)
+NS_IMETHODIMP VirtualBoxErrorInfo::GetColumnNumber(PRUint32 * /*aColumnNumber */)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
@@ -252 +252 @@
 
 /* readonly attribute nsIStackFrame location; */
-NS_IMETHODIMP VirtualBoxErrorInfo::GetLocation (nsIStackFrame ** /* aLocation */)
+NS_IMETHODIMP VirtualBoxErrorInfo::GetLocation(nsIStackFrame ** /* aLocation */)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
@@ -258 +258 @@
 
 /* readonly attribute nsIException inner; */
-NS_IMETHODIMP VirtualBoxErrorInfo::GetInner (nsIException **aInner)
+NS_IMETHODIMP VirtualBoxErrorInfo::GetInner(nsIException **aInner)
 {
     ComPtr<IVirtualBoxErrorInfo> info;
-    nsresult rv = COMGETTER(Next) (info.asOutParam());
+    nsresult rv = COMGETTER(Next)(info.asOutParam());
     if (FAILED(rv)) return rv;
     return info.queryInterfaceTo(aInner);
@@ -267 +267 @@
 
 /* readonly attribute nsISupports data; */
-NS_IMETHODIMP VirtualBoxErrorInfo::GetData (nsISupports ** /* aData */)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* string toString (); */
-NS_IMETHODIMP VirtualBoxErrorInfo::ToString (char ** /* retval */)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS2 (VirtualBoxErrorInfo,
-                               nsIException, IVirtualBoxErrorInfo)
+NS_IMETHODIMP VirtualBoxErrorInfo::GetData(nsISupports ** /* aData */)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* string toString(); */
+NS_IMETHODIMP VirtualBoxErrorInfo::ToString(char ** /* retval */)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMPL_THREADSAFE_ISUPPORTS2(VirtualBoxErrorInfo,
+                              nsIException, IVirtualBoxErrorInfo)
 
 #endif // defined(VBOX_WITH_XPCOM)

trunk/src/VBox/Main/src-server/USBControllerImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -86 +86 @@
 /////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR (USBController)
+DEFINE_EMPTY_CTOR_DTOR(USBController)
 
 HRESULT USBController::FinalConstruct()
@@ -262 +262 @@
 /////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP USBController::COMGETTER(Enabled) (BOOL *aEnabled)
+STDMETHODIMP USBController::COMGETTER(Enabled)(BOOL *aEnabled)
 {
     CheckComArgOutPointerValid(aEnabled);
@@ -277 +277 @@
 
 
-STDMETHODIMP USBController::COMSETTER(Enabled) (BOOL aEnabled)
+STDMETHODIMP USBController::COMSETTER(Enabled)(BOOL aEnabled)
 {
     LogFlowThisFunc(("aEnabled=%RTbool\n", aEnabled));
@@ -308 +308 @@
 }
 
-STDMETHODIMP USBController::COMGETTER(EnabledEhci) (BOOL *aEnabled)
+STDMETHODIMP USBController::COMGETTER(EnabledEhci)(BOOL *aEnabled)
 {
     CheckComArgOutPointerValid(aEnabled);
@@ -322 +322 @@
 }
 
-STDMETHODIMP USBController::COMSETTER(EnabledEhci) (BOOL aEnabled)
+STDMETHODIMP USBController::COMSETTER(EnabledEhci)(BOOL aEnabled)
 {
     LogFlowThisFunc(("aEnabled=%RTbool\n", aEnabled));
@@ -353 +353 @@
 }
 
-STDMETHODIMP USBController::COMGETTER(ProxyAvailable) (BOOL *aEnabled)
+STDMETHODIMP USBController::COMGETTER(ProxyAvailable)(BOOL *aEnabled)
 {
     CheckComArgOutPointerValid(aEnabled);
@@ -371 +371 @@
 }
 
-STDMETHODIMP USBController::COMGETTER(USBStandard) (USHORT *aUSBStandard)
+STDMETHODIMP USBController::COMGETTER(USBStandard)(USHORT *aUSBStandard)
 {
     CheckComArgOutPointerValid(aUSBStandard);
@@ -399 +399 @@
     DECLARE_PROTECT_FINAL_CONSTRUCT()
     BEGIN_COM_MAP(USBDeviceFilter)
-        COM_INTERFACE_ENTRY(ISupportErrorInfo)
-        COM_INTERFACE_ENTRY(IUSBDeviceFilter)
+        VBOX_DEFAULT_INTERFACE_ENTRIES(IUSBDeviceFilter)
     END_COM_MAP()
 
-    DECLARE_EMPTY_CTOR_DTOR (USBDeviceFilter)
+    DECLARE_EMPTY_CTOR_DTOR(USBDeviceFilter)
 
     // IUSBDeviceFilter properties
-    STDMETHOD(COMGETTER(Name)) (BSTR *aName);
-    STDMETHOD(COMSETTER(Name)) (IN_BSTR aName);
-    STDMETHOD(COMGETTER(Active)) (BOOL *aActive);
-    STDMETHOD(COMSETTER(Active)) (BOOL aActive);
-    STDMETHOD(COMGETTER(VendorId)) (BSTR *aVendorId);
-    STDMETHOD(COMSETTER(VendorId)) (IN_BSTR aVendorId);
-    STDMETHOD(COMGETTER(ProductId)) (BSTR *aProductId);
-    STDMETHOD(COMSETTER(ProductId)) (IN_BSTR aProductId);
-    STDMETHOD(COMGETTER(Revision)) (BSTR *aRevision);
-    STDMETHOD(COMSETTER(Revision)) (IN_BSTR aRevision);
-    STDMETHOD(COMGETTER(Manufacturer)) (BSTR *aManufacturer);
-    STDMETHOD(COMSETTER(Manufacturer)) (IN_BSTR aManufacturer);
-    STDMETHOD(COMGETTER(Product)) (BSTR *aProduct);
-    STDMETHOD(COMSETTER(Product)) (IN_BSTR aProduct);
-    STDMETHOD(COMGETTER(SerialNumber)) (BSTR *aSerialNumber);
-    STDMETHOD(COMSETTER(SerialNumber)) (IN_BSTR aSerialNumber);
-    STDMETHOD(COMGETTER(Port)) (BSTR *aPort);
-    STDMETHOD(COMSETTER(Port)) (IN_BSTR aPort);
-    STDMETHOD(COMGETTER(Remote)) (BSTR *aRemote);
-    STDMETHOD(COMSETTER(Remote)) (IN_BSTR aRemote);
-    STDMETHOD(COMGETTER(MaskedInterfaces)) (ULONG *aMaskedIfs);
-    STDMETHOD(COMSETTER(MaskedInterfaces)) (ULONG aMaskedIfs);
+    STDMETHOD(COMGETTER(Name))(BSTR *aName);
+    STDMETHOD(COMSETTER(Name))(IN_BSTR aName);
+    STDMETHOD(COMGETTER(Active))(BOOL *aActive);
+    STDMETHOD(COMSETTER(Active))(BOOL aActive);
+    STDMETHOD(COMGETTER(VendorId))(BSTR *aVendorId);
+    STDMETHOD(COMSETTER(VendorId))(IN_BSTR aVendorId);
+    STDMETHOD(COMGETTER(ProductId))(BSTR *aProductId);
+    STDMETHOD(COMSETTER(ProductId))(IN_BSTR aProductId);
+    STDMETHOD(COMGETTER(Revision))(BSTR *aRevision);
+    STDMETHOD(COMSETTER(Revision))(IN_BSTR aRevision);
+    STDMETHOD(COMGETTER(Manufacturer))(BSTR *aManufacturer);
+    STDMETHOD(COMSETTER(Manufacturer))(IN_BSTR aManufacturer);
+    STDMETHOD(COMGETTER(Product))(BSTR *aProduct);
+    STDMETHOD(COMSETTER(Product))(IN_BSTR aProduct);
+    STDMETHOD(COMGETTER(SerialNumber))(BSTR *aSerialNumber);
+    STDMETHOD(COMSETTER(SerialNumber))(IN_BSTR aSerialNumber);
+    STDMETHOD(COMGETTER(Port))(BSTR *aPort);
+    STDMETHOD(COMSETTER(Port))(IN_BSTR aPort);
+    STDMETHOD(COMGETTER(Remote))(BSTR *aRemote);
+    STDMETHOD(COMSETTER(Remote))(IN_BSTR aRemote);
+    STDMETHOD(COMGETTER(MaskedInterfaces))(ULONG *aMaskedIfs);
+    STDMETHOD(COMSETTER(MaskedInterfaces))(ULONG aMaskedIfs);
 };
 #endif /* !VBOX_WITH_USB */
 
 
-STDMETHODIMP USBController::COMGETTER(DeviceFilters) (ComSafeArrayOut(IUSBDeviceFilter *, aDevicesFilters))
+STDMETHODIMP USBController::COMGETTER(DeviceFilters)(ComSafeArrayOut(IUSBDeviceFilter *, aDevicesFilters))
 {
 #ifdef VBOX_WITH_USB
@@ -438 +437 @@
 
     AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+    if(FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    SafeIfaceArray<IUSBDeviceFilter> collection (*m->llDeviceFilters.data());
+    SafeIfaceArray<IUSBDeviceFilter> collection(*m->llDeviceFilters.data());
     collection.detachTo(ComSafeArrayOutArg(aDevicesFilters));
 
@@ -458 +457 @@
 /////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP USBController::CreateDeviceFilter (IN_BSTR aName,
-                                                IUSBDeviceFilter **aFilter)
+STDMETHODIMP USBController::CreateDeviceFilter(IN_BSTR aName,
+                                               IUSBDeviceFilter **aFilter)
 {
 #ifdef VBOX_WITH_USB
@@ -477 +476 @@
     ComObjPtr<USBDeviceFilter> filter;
     filter.createObject();
-    HRESULT rc = filter->init (this, aName);
-    ComAssertComRCRetRC (rc);
+    HRESULT rc = filter->init(this, aName);
+    ComAssertComRCRetRC(rc);
     rc = filter.queryInterfaceTo(aFilter);
     AssertComRCReturnRC(rc);
@@ -509 +508 @@
     // @todo r=dj make sure the input object is actually from us
 //     if (!filter)
-//         return setError (E_INVALIDARG,
-//             tr ("The given USB device filter is not created within "
+//         return setError(E_INVALIDARG,
+//             tr("The given USB device filter is not created within "
 //                 "this VirtualBox instance"));
 
@@ -525 +524 @@
     {
         it = m->llDeviceFilters->begin();
-        std::advance (it, aPosition);
+        std::advance(it, aPosition);
     }
     else
         it = m->llDeviceFilters->end();
     /* ...and insert */
-    m->llDeviceFilters->insert (it, filter);
+    m->llDeviceFilters->insert(it, filter);
     filter->mInList = true;
 
     /* notify the proxy (only when it makes sense) */
     if (filter->getData().mActive && Global::IsOnline(adep.machineState())
-        && filter->getData().mRemote.isMatch (false))
+        && filter->getData().mRemote.isMatch(false))
     {
         USBProxyService *service = m->pHost->usbProxyService();
@@ -541 +540 @@
 
         ComAssertRet(filter->getId() == NULL, E_FAIL);
-        filter->getId() = service->insertFilter (&filter->getData().mUSBFilter);
+        filter->getId() = service->insertFilter(&filter->getData().mUSBFilter);
     }
 
@@ -592 +591 @@
         /* iterate to the position... */
         DeviceFilterList::iterator it = m->llDeviceFilters->begin();
-        std::advance (it, aPosition);
+        std::advance(it, aPosition);
         /* ...get an element from there... */
         filter = *it;
         /* ...and remove */
         filter->mInList = false;
-        m->llDeviceFilters->erase (it);
+        m->llDeviceFilters->erase(it);
     }
 
@@ -607 +606 @@
     /* notify the proxy (only when it makes sense) */
     if (filter->getData().mActive && Global::IsOnline(adep.machineState())
-        && filter->getData().mRemote.isMatch (false))
+        && filter->getData().mRemote.isMatch(false))
     {
         USBProxyService *service = m->pHost->usbProxyService();
@@ -719 +718 @@
         (*it)->COMGETTER(ProductId)(str.asOutParam());
         f.strProductId = str;
-        (*it)->COMGETTER (Revision) (str.asOutParam());
+        (*it)->COMGETTER(Revision)(str.asOutParam());
         f.strRevision = str;
-        (*it)->COMGETTER (Manufacturer) (str.asOutParam());
+        (*it)->COMGETTER(Manufacturer)(str.asOutParam());
         f.strManufacturer = str;
-        (*it)->COMGETTER (Product) (str.asOutParam());
+        (*it)->COMGETTER(Product)(str.asOutParam());
         f.strProduct = str;
-        (*it)->COMGETTER (SerialNumber) (str.asOutParam());
+        (*it)->COMGETTER(SerialNumber)(str.asOutParam());
         f.strSerialNumber = str;
-        (*it)->COMGETTER (Port) (str.asOutParam());
+        (*it)->COMGETTER(Port)(str.asOutParam());
         f.strPort = str;
         f.strRemote = filterData.mRemote.string();
@@ -765 +764 @@
         while (it != m->llDeviceFilters->end())
         {
-            if (std::find (backedList->begin(), backedList->end(), *it) ==
+            if (std::find(backedList->begin(), backedList->end(), *it) ==
                 backedList->end())
             {
                 /* notify the proxy (only when it makes sense) */
                 if ((*it)->getData().mActive &&
-                    Global::IsOnline (adep.machineState())
-                    && (*it)->getData().mRemote.isMatch (false))
+                    Global::IsOnline(adep.machineState())
+                    && (*it)->getData().mRemote.isMatch(false))
                 {
                     USBDeviceFilter *filter = *it;
@@ -784 +783 @@
         }
 
-        if (Global::IsOnline (adep.machineState()))
+        if (Global::IsOnline(adep.machineState()))
         {
             /* find all removed old filters (absent in the new list)
@@ -791 +790 @@
             while (it != backedList->end())
             {
-                if (std::find (m->llDeviceFilters->begin(), m->llDeviceFilters->end(), *it) ==
+                if (std::find(m->llDeviceFilters->begin(), m->llDeviceFilters->end(), *it) ==
                     m->llDeviceFilters->end())
                 {
                     /* notify the proxy (only when necessary) */
                     if ((*it)->getData().mActive
-                            && (*it)->getData().mRemote.isMatch (false))
+                            && (*it)->getData().mRemote.isMatch(false))
                     {
                         USBDeviceFilter *flt = *it; /* resolve ambiguity */
@@ -838 +837 @@
     /* sanity */
     AutoCaller autoCaller(this);
-    AssertComRCReturnVoid (autoCaller.rc());
+    AssertComRCReturnVoid(autoCaller.rc());
 
     /* sanity too */
     AutoCaller peerCaller(m->pPeer);
-    AssertComRCReturnVoid (peerCaller.rc());
+    AssertComRCReturnVoid(peerCaller.rc());
 
     /* lock both for writing since we modify both (mPeer is "master" so locked
@@ -894 +893 @@
                 }
                 /* and add it to the new list */
-                newList->push_back (peer);
+                newList->push_back(peer);
 
                 ++ it;
@@ -940 +939 @@
  *  represented by @a aThat (locked for reading).
  */
-void USBController::copyFrom (USBController *aThat)
-{
-    AssertReturnVoid (aThat != NULL);
+void USBController::copyFrom(USBController *aThat)
+{
+    AssertReturnVoid(aThat != NULL);
 
     /* sanity */
     AutoCaller autoCaller(this);
-    AssertComRCReturnVoid (autoCaller.rc());
+    AssertComRCReturnVoid(autoCaller.rc());
 
     /* sanity too */
-    AutoCaller thatCaller (aThat);
-    AssertComRCReturnVoid (thatCaller.rc());
+    AutoCaller thatCaller(aThat);
+    AssertComRCReturnVoid(thatCaller.rc());
 
     /* even more sanity */
     AutoAnyStateDependency adep(m->pParent);
-    AssertComRCReturnVoid (adep.rc());
+    AssertComRCReturnVoid(adep.rc());
     /* Machine::copyFrom() may not be called when the VM is running */
-    AssertReturnVoid (!Global::IsOnline (adep.machineState()));
+    AssertReturnVoid(!Global::IsOnline(adep.machineState()));
 
     /* peer is not modified, lock it for reading (aThat is "master" so locked
@@ -980 +979 @@
         ComObjPtr<USBDeviceFilter> filter;
         filter.createObject();
-        filter->initCopy (this, *it);
-        m->llDeviceFilters->push_back (filter);
+        filter->initCopy(this, *it);
+        m->llDeviceFilters->push_back(filter);
     }
 
@@ -994 +993 @@
  *  @note Locks nothing.
  */
-HRESULT USBController::onDeviceFilterChange (USBDeviceFilter *aFilter,
-                                             BOOL aActiveChanged /* = FALSE */)
+HRESULT USBController::onDeviceFilterChange(USBDeviceFilter *aFilter,
+                                            BOOL aActiveChanged /* = FALSE */)
 {
     AutoCaller autoCaller(this);
@@ -1005 +1004 @@
 
     /* nothing to do if the machine isn't running */
-    if (!Global::IsOnline (adep.machineState()))
+    if (!Global::IsOnline(adep.machineState()))
         return S_OK;
 
@@ -1018 +1017 @@
         if (aActiveChanged)
         {
-            if (aFilter->getData().mRemote.isMatch (false))
+            if (aFilter->getData().mRemote.isMatch(false))
             {
                 /* insert/remove the filter from the proxy */
@@ -1041 +1040 @@
                 ComAssertRet(aFilter->getId() != NULL, E_FAIL);
                 service->removeFilter(aFilter->getId());
-                if (aFilter->getData().mRemote.isMatch (false))
+                if (aFilter->getData().mRemote.isMatch(false))
                 {
                     aFilter->getId() = service->insertFilter(&aFilter->getData().mUSBFilter);
@@ -1060 +1059 @@
  *  @note Locks this object for reading.
  */
-bool USBController::hasMatchingFilter (const ComObjPtr<HostUSBDevice> &aDevice, ULONG *aMaskedIfs)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), false);
+bool USBController::hasMatchingFilter(const ComObjPtr<HostUSBDevice> &aDevice, ULONG *aMaskedIfs)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), false);
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1099 +1098 @@
  *  @note Locks this object for reading.
  */
-bool USBController::hasMatchingFilter (IUSBDevice *aUSBDevice, ULONG *aMaskedIfs)
+bool USBController::hasMatchingFilter(IUSBDevice *aUSBDevice, ULONG *aMaskedIfs)
 {
     LogFlowThisFuncEnter();
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), false);
+    AssertComRCReturn(autoCaller.rc(), false);
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1116 +1115 @@
     /* query fields */
     USBFILTER dev;
-    USBFilterInit (&dev, USBFILTERTYPE_CAPTURE);
+    USBFilterInit(&dev, USBFILTERTYPE_CAPTURE);
 
     USHORT vendorId = 0;
-    rc = aUSBDevice->COMGETTER(VendorId) (&vendorId);
+    rc = aUSBDevice->COMGETTER(VendorId)(&vendorId);
     ComAssertComRCRet(rc, false);
     ComAssertRet(vendorId, false);
-    int vrc = USBFilterSetNumExact (&dev, USBFILTERIDX_VENDOR_ID, vendorId, true); AssertRC(vrc);
+    int vrc = USBFilterSetNumExact(&dev, USBFILTERIDX_VENDOR_ID, vendorId, true); AssertRC(vrc);
 
     USHORT productId = 0;
-    rc = aUSBDevice->COMGETTER(ProductId) (&productId);
+    rc = aUSBDevice->COMGETTER(ProductId)(&productId);
     ComAssertComRCRet(rc, false);
-    vrc = USBFilterSetNumExact (&dev, USBFILTERIDX_PRODUCT_ID, productId, true); AssertRC(vrc);
+    vrc = USBFilterSetNumExact(&dev, USBFILTERIDX_PRODUCT_ID, productId, true); AssertRC(vrc);
 
     USHORT revision;
-    rc = aUSBDevice->COMGETTER(Revision) (&revision);
+    rc = aUSBDevice->COMGETTER(Revision)(&revision);
     ComAssertComRCRet(rc, false);
-    vrc = USBFilterSetNumExact (&dev, USBFILTERIDX_DEVICE, revision, true); AssertRC(vrc);
+    vrc = USBFilterSetNumExact(&dev, USBFILTERIDX_DEVICE, revision, true); AssertRC(vrc);
 
     Bstr manufacturer;
-    rc = aUSBDevice->COMGETTER(Manufacturer) (manufacturer.asOutParam());
+    rc = aUSBDevice->COMGETTER(Manufacturer)(manufacturer.asOutParam());
     ComAssertComRCRet(rc, false);
     if (!manufacturer.isEmpty())
-        USBFilterSetStringExact (&dev, USBFILTERIDX_MANUFACTURER_STR, Utf8Str(manufacturer).c_str(), true);
+        USBFilterSetStringExact(&dev, USBFILTERIDX_MANUFACTURER_STR, Utf8Str(manufacturer).c_str(), true);
 
     Bstr product;
-    rc = aUSBDevice->COMGETTER(Product) (product.asOutParam());
+    rc = aUSBDevice->COMGETTER(Product)(product.asOutParam());
     ComAssertComRCRet(rc, false);
     if (!product.isEmpty())
-        USBFilterSetStringExact (&dev, USBFILTERIDX_PRODUCT_STR, Utf8Str(product).c_str(), true);
+        USBFilterSetStringExact(&dev, USBFILTERIDX_PRODUCT_STR, Utf8Str(product).c_str(), true);
 
     Bstr serialNumber;
-    rc = aUSBDevice->COMGETTER(SerialNumber) (serialNumber.asOutParam());
+    rc = aUSBDevice->COMGETTER(SerialNumber)(serialNumber.asOutParam());
     ComAssertComRCRet(rc, false);
     if (!serialNumber.isEmpty())
-        USBFilterSetStringExact (&dev, USBFILTERIDX_SERIAL_NUMBER_STR, Utf8Str(serialNumber).c_str(), true);
+        USBFilterSetStringExact(&dev, USBFILTERIDX_SERIAL_NUMBER_STR, Utf8Str(serialNumber).c_str(), true);
 
     Bstr address;
-    rc = aUSBDevice->COMGETTER(Address) (address.asOutParam());
+    rc = aUSBDevice->COMGETTER(Address)(address.asOutParam());
     ComAssertComRCRet(rc, false);
 
@@ -1159 +1158 @@
     rc = aUSBDevice->COMGETTER(Port)(&port);
     ComAssertComRCRet(rc, false);
-    USBFilterSetNumExact (&dev, USBFILTERIDX_PORT, port, true);
+    USBFilterSetNumExact(&dev, USBFILTERIDX_PORT, port, true);
 
     BOOL remote = FALSE;
@@ -1178 +1177 @@
         if (!aData.mActive)
             continue;
-        if (!aData.mRemote.isMatch (remote))
+        if (!aData.mRemote.isMatch(remote))
             continue;
-        if (!USBFilterMatch (&aData.mUSBFilter, &dev))
+        if (!USBFilterMatch(&aData.mUSBFilter, &dev))
             continue;
 
@@ -1202 +1201 @@
  *  @note Locks this object for reading.
  */
-HRESULT USBController::notifyProxy (bool aInsertFilters)
+HRESULT USBController::notifyProxy(bool aInsertFilters)
 {
     LogFlowThisFunc(("aInsertFilters=%RTbool\n", aInsertFilters));
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), false);
+    AssertComRCReturn(autoCaller.rc(), false);
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1221 +1220 @@
         /* notify the proxy (only if the filter is active) */
         if (flt->getData().mActive
-                && flt->getData().mRemote.isMatch (false) /* and if the filter is NOT remote */
+                && flt->getData().mRemote.isMatch(false) /* and if the filter is NOT remote */
                 )
         {