Rebase agains 3263d51a1fd86abf195c5be224f6fdb4db284b53

patches/fltmgr.sys-filters/0002-fltmgr.sys-Add-FltRegisterFilter-stub.patch

@@ -1,45 +0,0 @@
-From 81b6451be78983d77108a5d7c70fde6e14caddd8 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 13 Mar 2018 11:30:09 +1100
-Subject: [PATCH] fltmgr.sys: Add FltRegisterFilter stub
-
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- dlls/fltmgr.sys/fltmgr.sys.spec |  2 +-
- dlls/fltmgr.sys/main.c          | 10 ++++++++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec
-index ea84d81..000368f 100644
---- a/dlls/fltmgr.sys/fltmgr.sys.spec
-+++ b/dlls/fltmgr.sys/fltmgr.sys.spec
-@@ -128,7 +128,7 @@
- @ stub FltReadFile
- @ stub FltReferenceContext
- @ stub FltReferenceFileNameInformation
--@ stub FltRegisterFilter
-+@ stdcall FltRegisterFilter(ptr ptr ptr)
- @ stub FltReissueSynchronousIo
- @ stub FltReleaseContext
- @ stub FltReleaseContexts
-diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c
-index 09c89a1..efe9b7f 100644
---- a/dlls/fltmgr.sys/main.c
-+++ b/dlls/fltmgr.sys/main.c
-@@ -42,3 +42,13 @@ void WINAPI FltInitializePushLock( EX_PUSH_LOCK *lock )
- {
-     FIXME( "(%p): stub\n", lock );
- }
-+
-+NTSTATUS WINAPI FltRegisterFilter (PDRIVER_OBJECT driver, const FLT_REGISTRATION *reg, PFLT_FILTER *filter)
-+{
-+    FIXME( "(%p,%p,%p): stub\n", driver, reg, filter );
-+
-+    if(filter)
-+        *filter = UlongToHandle(0xdeadbeaf);
-+
-+    return STATUS_SUCCESS;
-+}
--- 
-1.9.1
-

patches/fltmgr.sys-filters/0003-fltmgr.sys-Add-FltStartFiltering-stub.patch

@@ -1,42 +0,0 @@
-From b6d7aa902c272e679cf9f4010e1bab35b04aeae2 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Fri, 9 Mar 2018 21:42:40 +1100
-Subject: [PATCH 2/3] fltmgr.sys: Add FltStartFiltering stub
-
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +-
- dlls/fltmgr.sys/main.c          | 7 +++++++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec
-index 000368f47c..0a3b1c69c7 100644
---- a/dlls/fltmgr.sys/fltmgr.sys.spec
-+++ b/dlls/fltmgr.sys/fltmgr.sys.spec
-@@ -150,7 +150,7 @@
- @ stub FltSetStreamHandleContext
- @ stub FltSetVolumeContext
- @ stub FltSetVolumeInformation
--@ stub FltStartFiltering
-+@ stdcall FltStartFiltering(ptr)
- @ stub FltSupportsFileContexts
- @ stub FltSupportsStreamContexts
- @ stub FltSupportsStreamHandleContexts
-diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c
-index efe9b7fde7..08beb0265d 100644
---- a/dlls/fltmgr.sys/main.c
-+++ b/dlls/fltmgr.sys/main.c
-@@ -52,3 +52,10 @@ NTSTATUS WINAPI FltRegisterFilter (PDRIVER_OBJECT driver, const FLT_REGISTRATION
- 
-     return STATUS_SUCCESS;
- }
-+
-+NTSTATUS WINAPI FltStartFiltering (PFLT_FILTER filter)
-+{
-+    FIXME( "(%p): stub\n", filter );
-+
-+    return STATUS_SUCCESS;
-+}
--- 
-2.16.1
-

patches/fltmgr.sys-filters/0004-fltmgr.sys-Add-FltUnregisterFilter-stub.patch

@@ -1,39 +0,0 @@
-From a63690aa1e35968c0ea6bb1abc05457c048f9ee0 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Fri, 9 Mar 2018 21:43:33 +1100
-Subject: [PATCH 3/3] fltmgr.sys: Add FltUnregisterFilter stub
-
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +-
- dlls/fltmgr.sys/main.c          | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec
-index 0a3b1c69c7..c217ad3891 100644
---- a/dlls/fltmgr.sys/fltmgr.sys.spec
-+++ b/dlls/fltmgr.sys/fltmgr.sys.spec
-@@ -158,6 +158,6 @@
- @ stub FltUninitializeFileLock
- @ stub FltUninitializeOplock
- @ stub FltUnloadFilter
--@ stub FltUnregisterFilter
-+@ stdcall FltUnregisterFilter(ptr)
- @ stub FltUntagFile
- @ stub FltWriteFile
-diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c
-index 08beb0265d..cedcdb115a 100644
---- a/dlls/fltmgr.sys/main.c
-+++ b/dlls/fltmgr.sys/main.c
-@@ -59,3 +59,8 @@ NTSTATUS WINAPI FltStartFiltering (PFLT_FILTER filter)
- 
-     return STATUS_SUCCESS;
- }
-+
-+void WINAPI FltUnregisterFilter (PFLT_FILTER filter)
-+{
-+    FIXME( "(%p): stub\n", filter );
-+}
--- 
-2.16.1
-

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "2986e895015b9785d61e7265763efacc053d7ad6"
+	echo "3263d51a1fd86abf195c5be224f6fdb4db284b53"
 }
 
 # Show version information
@@ -3863,19 +3863,11 @@ fi
 # |   *	[#44500] Add stubs for FltRegisterFilter, FltStartFiltering, FltUnregisterFilter
 # |
 # | Modified files:
-# |   *	dlls/fltmgr.sys/fltmgr.sys.spec, dlls/fltmgr.sys/main.c, include/Makefile.in, include/ddk/fltkernel.h
+# |   *	dlls/fltmgr.sys/fltmgr.sys.spec, dlls/fltmgr.sys/main.c
 # |
 if test "$enable_fltmgr_sys_filters" -eq 1; then
-	patch_apply fltmgr.sys-filters/0001-include-ddk-Add-fltkernel.h.patch
-	patch_apply fltmgr.sys-filters/0002-fltmgr.sys-Add-FltRegisterFilter-stub.patch
-	patch_apply fltmgr.sys-filters/0003-fltmgr.sys-Add-FltStartFiltering-stub.patch
-	patch_apply fltmgr.sys-filters/0004-fltmgr.sys-Add-FltUnregisterFilter-stub.patch
 	patch_apply fltmgr.sys-filters/0005-fltmgr.sys-Implement-FltGetRoutineAddress.patch
 	(
-		printf '%s\n' '+    { "Alistair Leslie-Hughes", "include/ddk: Add fltkernel.h.", 1 },';
-		printf '%s\n' '+    { "Alistair Leslie-Hughes", "fltmgr.sys: Add FltRegisterFilter stub.", 1 },';
-		printf '%s\n' '+    { "Alistair Leslie-Hughes", "fltmgr.sys: Add FltStartFiltering stub.", 1 },';
-		printf '%s\n' '+    { "Alistair Leslie-Hughes", "fltmgr.sys: Add FltUnregisterFilter stub.", 1 },';
 		printf '%s\n' '+    { "Alistair Leslie-Hughes", "fltmgr.sys: Implement FltGetRoutineAddress.", 1 },';
 	) >> "$patchlist"
 fi