From 7033cc60953448b547b92c6c2ab0ba1788cff277 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Wed, 23 Dec 2015 11:24:34 -0800
Subject: [PATCH] dll: Major refactoring: WIP

---
 build/VStudio/winfsp_dll.vcxproj         | 13 ++++++++++++
 build/VStudio/winfsp_dll.vcxproj.filters | 27 ++++++++++++++++++++++++
 inc/winfsp/winfsp.h                      |  2 ++
 {src0 => src}/dll/debug.c                |  0
 {src0 => src}/dll/library.c              |  0
 {src0 => src}/dll/library.h              |  0
 {src0 => src}/dll/ntstatus.c             |  0
 {src0 => src}/dll/ntstatus.i             |  0
 8 files changed, 42 insertions(+)
 rename {src0 => src}/dll/debug.c (100%)
 rename {src0 => src}/dll/library.c (100%)
 rename {src0 => src}/dll/library.h (100%)
 rename {src0 => src}/dll/ntstatus.c (100%)
 rename {src0 => src}/dll/ntstatus.i (100%)

diff --git a/build/VStudio/winfsp_dll.vcxproj b/build/VStudio/winfsp_dll.vcxproj
index 06bcac75..e4ee655d 100644
--- a/build/VStudio/winfsp_dll.vcxproj
+++ b/build/VStudio/winfsp_dll.vcxproj
@@ -18,6 +18,19 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\inc\winfsp\fsctl.h" />
+    <ClInclude Include="..\..\inc\winfsp\winfsp.h" />
+    <ClInclude Include="..\..\src\dll\library.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\dll\debug.c" />
+    <ClCompile Include="..\..\src\dll\library.c" />
+    <ClCompile Include="..\..\src\dll\ntstatus.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\src\dll\ntstatus.i" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{4A7C0B21-9E10-4C81-92DE-1493EFCF24EB}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
diff --git a/build/VStudio/winfsp_dll.vcxproj.filters b/build/VStudio/winfsp_dll.vcxproj.filters
index 1b8d3f22..77379d2c 100644
--- a/build/VStudio/winfsp_dll.vcxproj.filters
+++ b/build/VStudio/winfsp_dll.vcxproj.filters
@@ -13,4 +13,31 @@
       <UniqueIdentifier>{1d6501f4-cebd-4a00-a774-deb782b59fb5}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\inc\winfsp\fsctl.h">
+      <Filter>Include\winfsp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\inc\winfsp\winfsp.h">
+      <Filter>Include\winfsp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\dll\library.h">
+      <Filter>Source</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\dll\library.c">
+      <Filter>Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\dll\debug.c">
+      <Filter>Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\dll\ntstatus.c">
+      <Filter>Source</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\src\dll\ntstatus.i">
+      <Filter>Source</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/inc/winfsp/winfsp.h b/inc/winfsp/winfsp.h
index 80767c6d..768c23fd 100644
--- a/inc/winfsp/winfsp.h
+++ b/inc/winfsp/winfsp.h
@@ -21,6 +21,7 @@
 
 #include <winfsp/fsctl.h>
 
+#if 0
 typedef struct _FSP_FILE_SYSTEM FSP_FILE_SYSTEM;
 typedef NTSTATUS FSP_FILE_SYSTEM_PROCESSREQ(FSP_FILE_SYSTEM *, FSP_FSCTL_TRANSACT_REQ *);
 typedef VOID FSP_FILE_SYSTEM_OPERATION(FSP_FILE_SYSTEM *, FSP_FSCTL_TRANSACT_REQ *);
@@ -49,6 +50,7 @@ FSP_API NTSTATUS FspProduceResponse(FSP_FILE_SYSTEM *FileSystem,
     FSP_FSCTL_TRANSACT_RSP *Response);
 FSP_API NTSTATUS FspProduceResponseWithStatus(FSP_FILE_SYSTEM *FileSystem,
     FSP_FSCTL_TRANSACT_REQ *Request, NTSTATUS Result);
+#endif
 
 FSP_API NTSTATUS FspNtStatusFromWin32(DWORD Error);
 FSP_API VOID FspDebugLog(const char *format, ...);
diff --git a/src0/dll/debug.c b/src/dll/debug.c
similarity index 100%
rename from src0/dll/debug.c
rename to src/dll/debug.c
diff --git a/src0/dll/library.c b/src/dll/library.c
similarity index 100%
rename from src0/dll/library.c
rename to src/dll/library.c
diff --git a/src0/dll/library.h b/src/dll/library.h
similarity index 100%
rename from src0/dll/library.h
rename to src/dll/library.h
diff --git a/src0/dll/ntstatus.c b/src/dll/ntstatus.c
similarity index 100%
rename from src0/dll/ntstatus.c
rename to src/dll/ntstatus.c
diff --git a/src0/dll/ntstatus.i b/src/dll/ntstatus.i
similarity index 100%
rename from src0/dll/ntstatus.i
rename to src/dll/ntstatus.i