Changeset 3758 in vbox for trunk/src/VBox

Timestamp:

Jul 21, 2007 8:55:37 PM (18 years ago)

Author:

vboxsync

Message:

More USBFILTER changes.

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (4 diffs)
• Makefile.kmk (modified) (1 diff)
• USBControllerImpl.cpp (modified) (5 diffs)
• USBProxyService.cpp (modified) (2 diffs)
• include/USBProxyService.h (modified) (3 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -939 +939 @@
     {
         ComAssertRet (filter->id() == NULL, E_FAIL);
+#ifndef VBOX_WITH_USBFILTER
         filter->id() =
             mUSBProxyService->insertFilter (ComPtr <IUSBDeviceFilter> (aFilter));
+#else
+        filter->id() = mUSBProxyService->insertFilter (&filter->data().mUSBFilter);
+#endif
     }
 
@@ -1028 +1032 @@
             {
                 ComAssertRet (aFilter->id() == NULL, E_FAIL);
+#ifndef VBOX_WITH_USBFILTER
                 aFilter->id() =
                     mUSBProxyService->insertFilter (ComPtr <IUSBDeviceFilter> (aFilter));
+#else
+                aFilter->id() = mUSBProxyService->insertFilter (&aFilter->data().mUSBFilter);
+#endif
             }
             else
@@ -1045 +1053 @@
                 ComAssertRet (aFilter->id() != NULL, E_FAIL);
                 mUSBProxyService->removeFilter (aFilter->id());
+#ifndef VBOX_WITH_USBFILTER
                 aFilter->id() =
                     mUSBProxyService->insertFilter (ComPtr <IUSBDeviceFilter> (aFilter));
+#else
+                aFilter->id() = mUSBProxyService->insertFilter (&aFilter->data().mUSBFilter);
+#endif
             }
         }
@@ -1127 +1139 @@
             {
                 HostUSBDeviceFilter *flt = filterObj; // resolve ambiguity
+#ifndef VBOX_WITH_USBFILTER
                 flt->id() =
                     mUSBProxyService->insertFilter (ComPtr <IUSBDeviceFilter> (flt));
+#else
+                flt->id() = mUSBProxyService->insertFilter (&filterObj->data().mUSBFilter);
+#endif
             }
         }

trunk/src/VBox/Main/Makefile.kmk

@@ -222 +222 @@
 #ifeq ($(filter-out darwin,$(BUILD_TARGET)),)
 #VBoxSVC_DEFS += VBOX_WITH_USBFILTER
-#VBoxSVC_LIBS += $(PATH_LIB)/USBFilter$(VBOX_SUFF_LIB)
+#VBoxSVC_LIBS += $(PATH_LIB)/USBLib$(VBOX_SUFF_LIB)
 #endif
 

trunk/src/VBox/Main/USBControllerImpl.cpp

@@ -368 +368 @@
 
         ComAssertRet (filter->id() == NULL, E_FAIL);
+#ifndef VBOX_WITH_USBFILTER
         filter->id() = service->insertFilter (ComPtr <IUSBDeviceFilter> (aFilter));
+#else
+        filter->id() = service->insertFilter (&filter->data().mUSBFilter);
+#endif
     }
 
@@ -786 +790 @@
                         USBDeviceFilter *flt = *it; /* resolve ambiguity */
                         ComAssertRet (flt->id() == NULL, false);
+#ifndef VBOX_WITH_USBFILTER
                         flt->id() = service->insertFilter
                             (ComPtr <IUSBDeviceFilter> (flt));
+#else
+                        flt->id() = service->insertFilter (&flt->data().mUSBFilter);
+#endif
                     }
                 }
@@ -1010 +1018 @@
             {
                 ComAssertRet (aFilter->id() == NULL, E_FAIL);
+#ifndef VBOX_WITH_USBFILTER
                 aFilter->id() = service->insertFilter
                     (ComPtr <IUSBDeviceFilter> (aFilter));
+#else
+                aFilter->id() = service->insertFilter (&aFilter->data().mUSBFilter);
+#endif
             }
             else
@@ -1027 +1039 @@
                 ComAssertRet (aFilter->id() != NULL, E_FAIL);
                 service->removeFilter (aFilter->id());
+#ifndef VBOX_WITH_USBFILTER
                 aFilter->id() = service->insertFilter
                     (ComPtr <IUSBDeviceFilter> (aFilter));
+#else
+                aFilter->id() = service->insertFilter (&aFilter->data().mUSBFilter);
+#endif
             }
         }
@@ -1247 +1263 @@
             {
                 AssertReturn (flt->id() == NULL, E_FAIL);
+#ifndef VBOX_WITH_USBFILTER
                 flt->id() = service->insertFilter
                     (ComPtr <IUSBDeviceFilter> (flt));
+#else
+                flt->id() = service->insertFilter (&flt->data().mUSBFilter);
+#endif
             }
             else

trunk/src/VBox/Main/USBProxyService.cpp

@@ -539 +539 @@
  *  for those subclasses that don't reimplement this method.
  */
+#ifndef VBOX_WITH_USBFILTER
 void *USBProxyService::insertFilter (IUSBDeviceFilter * /* aFilter */)
+#else
+void *USBProxyService::insertFilter (PCUSBFILTER /* aFilter */)
+#endif
 {
     // return non-NULL to prevent failed assertions in Main
@@ -546 +550 @@
 
 
-void USBProxyService::removeFilter (void * /* aID */)
+void USBProxyService::removeFilter (void * /* aId */)
 {
 }

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

@@ -42 +42 @@
      * @return  ID of the inserted filter
      */
+#ifdef VBOX_WITH_USBFILTER
+    virtual void *insertFilter (PCUSBFILTER aFilter);
+#else
     virtual void *insertFilter (IUSBDeviceFilter *aFilter);
+#endif
 
     /**
      * A filter was removed.
      *
-     * @param   aID             ID of the filter to remove
-     */
-    virtual void removeFilter (void *aID);
+     * @param   aId             ID of the filter to remove
+     */
+    virtual void removeFilter (void *aId);
 
     /**
@@ -260 +264 @@
     ~USBProxyServiceDarwin();
 
+#ifdef VBOX_WITH_USBFILTER
+    virtual void *insertFilter (PCUSBFILTER aFilter);
+    virtual void removeFilter (void *aId);
+#endif
+
     virtual int captureDevice (HostUSBDevice *aDevice);
     virtual int holdDevice (HostUSBDevice *aDevice);
@@ -284 +293 @@
     /** Whether we've got a fake async event and should return without entering the runloop. */
     bool volatile mFakeAsync;
+    /** Whether we've successfully initialized the USBLib and should call USBLibTerm in the destructor. */
+    bool mUSBLibInitialized;
 };
 # endif /* RT_OS_DARWIN */