From 6b83748d898e6b526da6bf29cd488ec4eb1f2573 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Fri, 14 Jun 2019 20:53:09 -0700
Subject: [PATCH] sys: fsext: WIP

---
 build/VStudio/winfsp_sys.vcxproj         |  10 ++++----
 build/VStudio/winfsp_sys.vcxproj.filters |   6 +++++
 opt/fsext/inc/winfsp/fsext.h             |   2 +-
 opt/fsext/lib/winfsp-x64.lib             | Bin 2270 -> 2270 bytes
 opt/fsext/lib/winfsp-x86.lib             | Bin 2312 -> 2312 bytes
 src/sys/fsext.c                          |  28 +++++++++++++++++++++++
 6 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 src/sys/fsext.c

diff --git a/build/VStudio/winfsp_sys.vcxproj b/build/VStudio/winfsp_sys.vcxproj
index 5b1a4322..2f04da2c 100644
--- a/build/VStudio/winfsp_sys.vcxproj
+++ b/build/VStudio/winfsp_sys.vcxproj
@@ -101,7 +101,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\src;..\..\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src;..\..\opt\fsext\inc;..\..\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions> _X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -114,7 +114,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\src;..\..\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src;..\..\opt\fsext\inc;..\..\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions> _X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -127,7 +127,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\src;..\..\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src;..\..\opt\fsext\inc;..\..\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions> _WIN64;_AMD64_;AMD64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -140,7 +140,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\src;..\..\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src;..\..\opt\fsext\inc;..\..\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions> _WIN64;_AMD64_;AMD64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -169,6 +169,7 @@
     <ClCompile Include="..\..\src\sys\fileinfo.c" />
     <ClCompile Include="..\..\src\sys\flush.c" />
     <ClCompile Include="..\..\src\sys\fsctl.c" />
+    <ClCompile Include="..\..\src\sys\fsext.c" />
     <ClCompile Include="..\..\src\sys\iop.c" />
     <ClCompile Include="..\..\src\sys\ioq.c" />
     <ClCompile Include="..\..\src\sys\lockctl.c" />
@@ -188,6 +189,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\inc\winfsp\fsctl.h" />
+    <ClInclude Include="..\..\opt\fsext\inc\winfsp\fsext.h" />
     <ClInclude Include="..\..\src\sys\driver.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/build/VStudio/winfsp_sys.vcxproj.filters b/build/VStudio/winfsp_sys.vcxproj.filters
index 3bad7aa5..866dfa01 100644
--- a/build/VStudio/winfsp_sys.vcxproj.filters
+++ b/build/VStudio/winfsp_sys.vcxproj.filters
@@ -104,6 +104,9 @@
     <ClCompile Include="..\..\src\sys\mup.c">
       <Filter>Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\sys\fsext.c">
+      <Filter>Source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\sys\driver.h">
@@ -112,6 +115,9 @@
     <ClInclude Include="..\..\inc\winfsp\fsctl.h">
       <Filter>Include\winfsp</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\opt\fsext\inc\winfsp\fsext.h">
+      <Filter>Include\winfsp</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\sys\version.rc">
diff --git a/opt/fsext/inc/winfsp/fsext.h b/opt/fsext/inc/winfsp/fsext.h
index 21bbe62a..2d16a515 100644
--- a/opt/fsext/inc/winfsp/fsext.h
+++ b/opt/fsext/inc/winfsp/fsext.h
@@ -51,7 +51,7 @@ typedef struct
     UINT32 DeviceExtensionOffset;
 } FSP_FSEXT_PROVIDER;
 
-FSP_DDI_DEF(NTSTATUS, FspFsextRegisterProvider, FSP_FSEXT_PROVIDER *Provider)
+FSP_DDI_DEF(NTSTATUS, FspFsextProviderRegister, FSP_FSEXT_PROVIDER *Provider)
 
 FSP_DDI_DEF(NTSTATUS, FspPosixMapSidToUid, PSID Sid, PUINT32 PUid)
 FSP_DDI_DEF(NTSTATUS, FspPosixMapWindowsToPosixPathEx, PWSTR WindowsPath, char **PPosixPath,
diff --git a/opt/fsext/lib/winfsp-x64.lib b/opt/fsext/lib/winfsp-x64.lib
index dfc37e8b78005675c6ce49460db0198abaec22cb..a471199d23338a318208572c7668bc324921c365 100644
GIT binary patch
delta 318
zcmca7cu#PGEUUSJv8CZ;2R4a`R&DwLMfqi!DXB$4sp*-;C8<RW@$s3t1@Ugh1#ZQu
z6(#7>lN~ukC-*Q3PW;U|`9Gu5WCun|xOw7}r!u+<VAb)TF^LaVVsbuH0bHlp<X=nz
zOyXIad6<7P!bQbJOe_^3Ab~5Tjfp`#izRl)<ZL$i$sw%I;mXuN8Z+3m5gNrNuVWWc
p0;yJE009;T?B1FDgk2eKjM!u)4iTVHlPx&xkpw3}1XpmF0RYhWUhDt>

delta 318
zcmca7cu#PGEUTHJrK!ba2R4a`R&Dx0sp*-;C8<RLMfqi!DXB#a@$s3t1@Ugh1#ZQu
z6(#7>lN~ukC-*Q3PW;U|`9Gu5WCun|xOw7}r!u+<VAb)TF^LaVVsbuH0bHlp<X=nz
zOlqE+d6<7P!bQbJOe_^3Ab~5Tjfp|clO=Y?<ZL$i$sw%I;mXuN8Z+3m5gNrNuVWWc
p0;yJE009;T?B1FDgk2eKjM!u)4iTVHlPx&xkpw3}1XpmF0RYsKUdR9d

diff --git a/opt/fsext/lib/winfsp-x86.lib b/opt/fsext/lib/winfsp-x86.lib
index 9e47ca0937409b48ac56217a3879a2a2d2717a82..5d2065590898e388512019a2cf8f6a9940defad6 100644
GIT binary patch
delta 311
zcmeAW>JXYB%W7_5VqiGgfJ1DeMW;bPQGQuwN@`J1YI<gINotXU2}68*W^O@zyjyXB
zTXAYd395>TALk$pn7o3~oey1JcCt33>STK+M>LtqeN2@It&%2|1_}_6z~#fp%%GUX
z63fNNz`!v%kyUzg81r>TgyP8_tO87mS(~F+Igv%{*ubI_*pv~X;*-y_3oC;RQ)d7H
i76u$1nas+e2Dd>AX!_(B4oA3v*yJ4?A|SzY999657gxdn

delta 311
zcmeAW>JXYB%W7t5X>K&xfJ1DeMW;bfYI<gINor9*QGQuwN@|gV2}68*W^O@zyjyXB
zTXAYd395>TALk$pn7o3~oey1JcCt33>STK+M>LtqeN2@It&%2|1_}_6z~#fp%wXcl
z63fNNz`!v%kyUzg81r>TgyP8_tO86Xo|~gsIgv%{*ubI_*pv~X;*-y_3oC;RQ)d7H
i76u$1nas+e2Dd>AX!_(B4oA3v*yJ4?A|SzY9996YC|A}1

diff --git a/src/sys/fsext.c b/src/sys/fsext.c
new file mode 100644
index 00000000..58459c1e
--- /dev/null
+++ b/src/sys/fsext.c
@@ -0,0 +1,28 @@
+/**
+ * @file sys/fsext.c
+ *
+ * @copyright 2015-2019 Bill Zissimopoulos
+ */
+/*
+ * This file is part of WinFsp.
+ *
+ * You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License version 3 as published by the Free Software
+ * Foundation.
+ *
+ * Licensees holding a valid commercial license may use this software
+ * in accordance with the commercial license agreement provided in
+ * conjunction with the software.  The terms and conditions of any such
+ * commercial license agreement shall govern, supersede, and render
+ * ineffective any application of the GPLv3 license to this software,
+ * notwithstanding of any reference thereto in the software or
+ * associated repository.
+ */
+
+#include <sys/driver.h>
+#include <winfsp/fsext.h>
+
+NTSTATUS FspFsextProviderRegister(FSP_FSEXT_PROVIDER *Provider)
+{
+    return STATUS_TOO_LATE;
+}