From d65b779fee2ebc70b50af78acabf288fe1ad8a1d Mon Sep 17 00:00:00 2001
From: Dmitry Fleytman <dfleytma@redhat.com>
Date: Tue, 1 Apr 2014 11:54:10 +0300
Subject: [PATCH] UsbDk: Move device names to a separate file

Move name strings definitions into a separate header
file to avoid unnecessary interdependencies while
accessing those strings from driver

Signed-off-by: Dmitry Fleytman <dfleytma@redhat.com>
---
 UsbDk/Public.h              |  8 +-------
 UsbDk/UsbDk.vcxproj         |  1 +
 UsbDk/UsbDk.vcxproj.filters |  3 +++
 UsbDk/UsbDkNames.h          | 18 ++++++++++++++++++
 4 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 UsbDk/UsbDkNames.h

diff --git a/UsbDk/Public.h b/UsbDk/Public.h
index d7d358c..09e391c 100644
--- a/UsbDk/Public.h
+++ b/UsbDk/Public.h
@@ -11,13 +11,7 @@
 #pragma once
 
 #include "UsbDkData.h"
-
-#define USBDK_DRIVER_NAME       TEXT("UsbDk")
-#define USBDK_DRIVER_FILE_NAME  USBDK_DRIVER_NAME TEXT(".sys")
-#define USBDK_DRIVER_INF_NAME   USBDK_DRIVER_NAME TEXT(".inf")
-#define USBDK_DEVICE_NAME       TEXT("\\Device\\") USBDK_DRIVER_NAME
-#define USBDK_DOSDEVICE_NAME    TEXT("\\DosDevices\\") USBDK_DRIVER_NAME
-#define USBDK_USERMODE_NAME     TEXT("\\\\.\\") USBDK_DRIVER_NAME
+#include "UsbDkNames.h"
 
 #define USBDK_DEVICE_TYPE 50000
 
diff --git a/UsbDk/UsbDk.vcxproj b/UsbDk/UsbDk.vcxproj
index 8ff7641..8e3e06e 100644
--- a/UsbDk/UsbDk.vcxproj
+++ b/UsbDk/UsbDk.vcxproj
@@ -73,6 +73,7 @@
     <ClInclude Include="Public.h" />
     <ClInclude Include="RegText.h" />
     <ClInclude Include="UsbDkData.h" />
+    <ClInclude Include="UsbDkNames.h" />
     <ClInclude Include="UsbDkUtil.h" />
     <ClInclude Include="Trace.h" />
     <ClInclude Include="WdfDevice.h" />
diff --git a/UsbDk/UsbDk.vcxproj.filters b/UsbDk/UsbDk.vcxproj.filters
index a44c096..bc797bf 100644
--- a/UsbDk/UsbDk.vcxproj.filters
+++ b/UsbDk/UsbDk.vcxproj.filters
@@ -64,6 +64,9 @@
     <ClInclude Include="WdfRequest.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="UsbDkNames.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Driver.cpp">
diff --git a/UsbDk/UsbDkNames.h b/UsbDk/UsbDkNames.h
new file mode 100644
index 0000000..209df87
--- /dev/null
+++ b/UsbDk/UsbDkNames.h
@@ -0,0 +1,18 @@
+/*
+* UsbDk filter/redirector driver
+*
+* Copyright (c) 2013  Red Hat, Inc.
+*
+* Authors:
+*  Dmitry Fleytman  <dfleytma@redhat.com>
+*
+*/
+
+#pragma once
+
+#define USBDK_DRIVER_NAME       TEXT("UsbDk")
+#define USBDK_DRIVER_FILE_NAME  USBDK_DRIVER_NAME TEXT(".sys")
+#define USBDK_DRIVER_INF_NAME   USBDK_DRIVER_NAME TEXT(".inf")
+#define USBDK_DEVICE_NAME       TEXT("\\Device\\") USBDK_DRIVER_NAME
+#define USBDK_DOSDEVICE_NAME    TEXT("\\DosDevices\\") USBDK_DRIVER_NAME
+#define USBDK_USERMODE_NAME     TEXT("\\\\.\\") USBDK_DRIVER_NAME