Changeset 8744 in vbox for trunk/src/VBox/Main/include

Timestamp:

May 9, 2008 2:51:58 PM (17 years ago)

Author:

vboxsync

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

30699

Message:

Moved the filter running over to USBProxyService (from Host). Split up the USBProxyService construction using an init() method like the rest of the classes.

Location:

trunk/src/VBox/Main/include

Files:

• HostImpl.h (modified) (4 diffs)
• VirtualBoxBase.h (modified) (1 diff)

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

@@ -28 +28 @@
 # include "USBDeviceFilterImpl.h"
 # include "USBProxyService.h"
+# include "VirtualBoxImpl.h"
 #else
 class USBProxyService;
@@ -106 +107 @@
 
 #ifdef VBOX_WITH_USB
-    /** @name To be moved, they don't belong here.
-     * @{ */
-    void onUSBDeviceAttached (HostUSBDevice *aDevice);
-    void onUSBDeviceDetached (HostUSBDevice *aDevice);
-    void onUSBDeviceStateChanged(HostUSBDevice *aDevice, bool aRunFilters, SessionMachine *aIgnoreMachine);
-    /** @} */
+    typedef std::list <ComObjPtr <HostUSBDeviceFilter> > USBDeviceFilterList;
+
+    /** Must be called from under this object's lock. */
+    USBProxyService *usbProxyService() { return mUSBProxyService; }
 
     HRESULT onUSBDeviceFilterChange (HostUSBDeviceFilter *aFilter, BOOL aActiveChanged = FALSE);
-
-    /* must be called from under this object's lock */
-    USBProxyService *usbProxyService() { return mUSBProxyService; }
-#else  /* !VBOX_WITH_USB */
-    USBProxyService *usbProxyService() { return NULL; }
+    void getUSBFilters(USBDeviceFilterList *aGlobalFiltes, VirtualBox::SessionMachineVector *aMachines);
+    HRESULT checkUSBProxyService();
 #endif /* !VBOX_WITH_USB */
-
-    HRESULT checkUSBProxyService();
 
 #ifdef RT_OS_WINDOWS
@@ -151 +145 @@
                      : NULL;
     }
-
-public:  //temporary - will be moved soon.
-    HRESULT applyAllUSBFilters (ComObjPtr <HostUSBDevice> &aDevice,
-                                SessionMachine *aMachine = NULL);
-
-    bool applyMachineUSBFilters (SessionMachine *aMachine,
-                                 ComObjPtr <HostUSBDevice> &aDevice);
-private: //temporary
 #endif /* VBOX_WITH_USB */
 
@@ -176 +162 @@
 
 #ifdef VBOX_WITH_USB
-    typedef std::list <ComObjPtr <HostUSBDeviceFilter> > USBDeviceFilterList;
     USBDeviceFilterList mUSBDeviceFilters;
 

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

@@ -1686 +1686 @@
         //  child's uninit() from under the children map lock should not produce
         //  dead-locks any more).
-        Assert (!child->isWriteLockOnCurrentThread());
+        Assert (!child->isWriteLockOnCurrentThread() || child->lockHandle() == lockHandle());
         removeDependentChild (ComPtr <IUnknown> (child));
     }