Hider: Introduce header file with registry layout

Signed-off-by: Kirill Moizik <[email protected]> Signed-off-by: Dmitry Fleytman <[email protected]>
bkyunding · Mar 23, 2015 · 73ba48b · 73ba48b
1 parent 2516f17
commit 73ba48b
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 15 deletions.
diff --git a/UsbDk/ControlDevice.cpp b/UsbDk/ControlDevice.cpp
@@ -630,7 +630,8 @@ NTSTATUS CUsbDkControlDevice::AddHideRule(const USB_DK_HIDE_RULE &UsbDkRule)
     TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_CONTROLDEVICE, "%!FUNC! entry");
 
     auto MatchAllMapper = [](ULONG64 Value) -> ULONG
-    { return Value == USB_DK_HIDE_RULE_MATCH_ALL ? CUsbDkHideRule::MATCH_ALL : static_cast<ULONG>(Value); };
+    { return Value == USB_DK_HIDE_RULE_MATCH_ALL ? USBDK_REG_HIDE_RULE_MATCH_ALL
+                                                 : static_cast<ULONG>(Value); };
 
     CObjHolder<CUsbDkHideRule> NewRule(new CUsbDkHideRule(UsbDkRule.Hide ? true : false,
                                                           MatchAllMapper(UsbDkRule.Class),
@@ -792,7 +793,7 @@ class CRegHideRule final : private CRegKey
 
         if (NT_SUCCESS(status))
         {
-            Value = !!RawValue;
+            Value = HideRuleBoolFromRegistry(RawValue);
         }
 
         return status;
@@ -805,8 +806,7 @@ class CRegHideRule final : private CRegKey
 
         if (NT_SUCCESS(status))
         {
-            Value = (RawValue == CUsbDkHideRule::MATCH_ALL) ? USB_DK_HIDE_RULE_MATCH_ALL
-                                                            : RawValue;
+            Value = HideRuleUlongMaskFromRegistry(RawValue);
         }
 
         return status;

diff --git a/UsbDk/ControlDevice.h b/UsbDk/ControlDevice.h
@@ -29,6 +29,7 @@
 #include "FilterDevice.h"
 #include "HiderDevice.h"
 #include "UsbDkDataHider.h"
+#include "HideRulesRegPublic.h"
 
 typedef struct tag_USB_DK_DEVICE_ID USB_DK_DEVICE_ID;
 typedef struct tag_USB_DK_DEVICE_INFO USB_DK_DEVICE_INFO;
@@ -74,7 +75,6 @@ class CUsbDkControlDeviceQueue : public CWdfDefaultQueue, public CAllocatable<Pa
 class CUsbDkHideRule : public CAllocatable < NonPagedPool, 'RHHR' >
 {
 public:
-    static const ULONG MATCH_ALL = ULONG(-1);
 
     CUsbDkHideRule(bool Hide, ULONG Class, ULONG VID, ULONG PID, ULONG BCD)
         : m_Hide(Hide)
@@ -118,7 +118,7 @@ class CUsbDkHideRule : public CAllocatable < NonPagedPool, 'RHHR' >
 private:
     bool MatchCharacteristic(ULONG CharacteristicFilter, ULONG CharacteristicValue) const
     {
-        return (CharacteristicFilter == MATCH_ALL)                  ||
+        return (CharacteristicFilter == USBDK_REG_HIDE_RULE_MATCH_ALL) ||
                (CharacteristicValue == CharacteristicFilter);
     }
 

diff --git a/UsbDk/HideRulesRegPublic.h b/UsbDk/HideRulesRegPublic.h
@@ -0,0 +1,51 @@
+/**********************************************************************
+* Copyright (c) 2013-2014  Red Hat, Inc.
+*
+* Developed by Daynix Computing LTD.
+*
+* Authors:
+*     Dmitry Fleytman <[email protected]>
+*     Pavel Gurvich <[email protected]>
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+**********************************************************************/
+
+#pragma once
+
+#define USBDK_PARAMS_SUBKEY_NAME        TEXT("Parameters")
+#define USBDK_HIDE_RULES_SUBKEY_NAME    TEXT("HideRules")
+
+#define USBDK_HIDE_RULE_SHOULD_HIDE     TEXT("ShouldHide")
+#define USBDK_HIDE_RULE_VID             TEXT("VID")
+#define USBDK_HIDE_RULE_PID             TEXT("PID")
+#define USBDK_HIDE_RULE_BCD             TEXT("BCD")
+#define USBDK_HIDE_RULE_CLASS           TEXT("Class")
+
+#define USBDK_HIDE_RULES_PATH    TEXT("SYSTEM\\CurrentControlSet\\Services\\") \
+                                 USBDK_DRIVER_NAME TEXT("\\")                  \
+                                 USBDK_PARAMS_SUBKEY_NAME TEXT("\\")           \
+                                 USBDK_HIDE_RULES_SUBKEY_NAME TEXT("\\")
+
+#define USBDK_REG_HIDE_RULE_MATCH_ALL ULONG(-1)
+
+static inline ULONG64 HideRuleUlongMaskFromRegistry(DWORD Value)
+{
+    return (Value == USBDK_REG_HIDE_RULE_MATCH_ALL) ? USB_DK_HIDE_RULE_MATCH_ALL
+                                                    : Value;
+}
+
+static inline ULONG64 HideRuleBoolFromRegistry(DWORD Value)
+{
+    return !!Value;
+}
diff --git a/UsbDk/UsbDk.vcxproj b/UsbDk/UsbDk.vcxproj
@@ -94,6 +94,7 @@
     <ClInclude Include="FilterDevice.h" />
     <ClInclude Include="FilterStrategy.h" />
     <ClInclude Include="HiderDevice.h" />
+    <ClInclude Include="HideRulesRegPublic.h" />
     <ClInclude Include="Irp.h" />
     <ClInclude Include="MemoryBuffer.h" />
     <ClInclude Include="Public.h" />

diff --git a/UsbDk/UsbDk.vcxproj.filters b/UsbDk/UsbDk.vcxproj.filters
@@ -97,6 +97,9 @@
     <ClInclude Include="Registry.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="HideRulesRegPublic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Driver.cpp">

diff --git a/UsbDk/UsbDkNames.h b/UsbDk/UsbDkNames.h
@@ -34,12 +34,3 @@
 #define USBDK_HIDER_DEVICE_NAME     TEXT("\\Device\\") _USBDK_HIDER_NAME
 #define USBDK_DOS_HIDER_DEVICE_NAME TEXT("\\DosDevices\\") _USBDK_HIDER_NAME
 #define USBDK_USERMODE_HIDER_NAME   TEXT("\\\\.\\") _USBDK_HIDER_NAME
-
-#define USBDK_PARAMS_SUBKEY_NAME        TEXT("Parameters")
-#define USBDK_HIDE_RULES_SUBKEY_NAME    TEXT("HideRules")
-
-#define USBDK_HIDE_RULE_SHOULD_HIDE     TEXT("ShouldHide")
-#define USBDK_HIDE_RULE_VID             TEXT("VID")
-#define USBDK_HIDE_RULE_PID             TEXT("PID")
-#define USBDK_HIDE_RULE_BCD             TEXT("BCD")
-#define USBDK_HIDE_RULE_CLASS           TEXT("Class")