UsbDk: Implement hider logic via patching device IDs

Wiping PDOs from BusRelations list has side effect of absence of hotplug events from the OS. This is not good for applications that want devices appear hidden and start redirection process on plug at the same time. Following patches will retire old hiding logic. Signed-off-by: Dmitry Fleytman <[email protected]>
netusb · Jun 29, 2016 · a9bbb92 · a9bbb92
1 parent c80effc
commit a9bbb92
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/UsbDk/FilterDevice.cpp b/UsbDk/FilterDevice.cpp
@@ -444,7 +444,8 @@ bool CUsbDkHubFilterStrategy::FetchConfigurationDescriptors(CWdmUsbDeviceAccess
 
 void CUsbDkHubFilterStrategy::ApplyRedirectionPolicy(CUsbDkChildDevice &Device)
 {
-    if (m_ControlDevice->ShouldRedirect(Device))
+    if (m_ControlDevice->ShouldRedirect(Device) ||
+        m_ControlDevice->ShouldHide(Device.DeviceDescriptor()))
     {
         if (Device.MakeRedirected())
         {
@@ -628,21 +629,30 @@ bool CUsbDkFilterDevice::CStrategist::SelectStrategy(PDEVICE_OBJECT DevObj)
         return true;
     }
 
-    // Configuration doesn't tell to redirect or device already redirected -> no strategy
-    if (!m_Strategy->GetControlDevice()->ShouldRedirect(ID))
+    // Configuration tells to redirect -> redirector strategy
+    if (m_Strategy->GetControlDevice()->ShouldRedirect(ID))
     {
-        TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_FILTERDEVICE, "%!FUNC! Do not redirect or already redirected device, no strategy assigned");
-        return false;
+        TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_FILTERDEVICE, "%!FUNC! Assigning redirected USB device strategy");
+        m_DevStrategy.SetDeviceID(DevID.detach());
+        m_DevStrategy.SetInstanceID(InstanceID.detach());
+        m_Strategy->Delete();
+        m_Strategy = &m_DevStrategy;
+        return true;
     }
 
-    // Redirector strategy
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_FILTERDEVICE, "%!FUNC! Assigning redirected USB device strategy");
-    m_DevStrategy.SetDeviceID(DevID.detach());
-    m_DevStrategy.SetInstanceID(InstanceID.detach());
-    m_Strategy->Delete();
-    m_Strategy = &m_DevStrategy;
+    // Should be hidden -> hider strategy
+    if (m_Strategy->GetControlDevice()->ShouldHide(DevDescr))
+    {
+        TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_FILTERDEVICE, "%!FUNC! Assigning hidden USB device strategy");
+        m_Strategy->Delete();
+        m_Strategy = &m_HiderStrategy;
+        return true;
+    }
 
-    return true;
+    // No strategy
+    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_FILTERDEVICE, "%!FUNC! Do not redirect or already redirected device, no strategy assigned");
+
+    return false;
 }
 
 size_t CUsbDkFilterDevice::CStrategist::GetRequestContextSize()

diff --git a/UsbDk/FilterDevice.h b/UsbDk/FilterDevice.h
@@ -213,6 +213,7 @@ class CUsbDkFilterDevice : public CWdfDevice,
         CUsbDkFilterStrategy *m_Strategy = nullptr;
         CUsbDkNullFilterStrategy m_NullStrategy;
         CUsbDkHubFilterStrategy m_HubStrategy;
+        CUsbDkHiderStrategy m_HiderStrategy;
         CUsbDkRedirectorStrategy m_DevStrategy;
     } m_Strategy;