From b6406b6fbf423685e36382a19f2a568def553636 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 13 Mar 2018 13:15:49 +1100
Subject: [PATCH] Updated fltmgr.sys-filters patchset

---
 .../0001-include-ddk-Add-fltkernel.h.patch    | 25 ++++++++++++-----
 ...ltmgr.sys-Add-FltRegisterFilter-stub.patch | 27 +++++--------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/patches/fltmgr.sys-filters/0001-include-ddk-Add-fltkernel.h.patch b/patches/fltmgr.sys-filters/0001-include-ddk-Add-fltkernel.h.patch
index c839189f..55aadda3 100644
--- a/patches/fltmgr.sys-filters/0001-include-ddk-Add-fltkernel.h.patch
+++ b/patches/fltmgr.sys-filters/0001-include-ddk-Add-fltkernel.h.patch
@@ -1,19 +1,20 @@
-From 1251e9e48ba25b1cfe032e9f47f7f245e27b40d3 Mon Sep 17 00:00:00 2001
+From 239cad8d821ac952034f60ed563061e606d41257 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 9 Mar 2018 15:02:09 +1100
 Subject: [PATCH] include/ddk: Add fltkernel.h
 
-This also updates fltmgr.sys to use this new file.
+This also updates fltmgr.sys to make use this new file.
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
  dlls/fltmgr.sys/main.c  |   5 +-
+ include/Makefile.in     |   1 +
  include/ddk/fltkernel.h | 667 ++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 669 insertions(+), 3 deletions(-)
+ 3 files changed, 670 insertions(+), 3 deletions(-)
  create mode 100644 include/ddk/fltkernel.h
 
 diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c
-index 70ee30728f..09c89a1e2f 100644
+index 70ee307..09c89a1 100644
 --- a/dlls/fltmgr.sys/main.c
 +++ b/dlls/fltmgr.sys/main.c
 @@ -25,9 +25,8 @@
@@ -28,9 +29,21 @@ index 70ee30728f..09c89a1e2f 100644
  #include "wine/debug.h"
  
  WINE_DEFAULT_DEBUG_CHANNEL(fltmgr);
+diff --git a/include/Makefile.in b/include/Makefile.in
+index 72304d6..d5a3eeb 100644
+--- a/include/Makefile.in
++++ b/include/Makefile.in
+@@ -153,6 +153,7 @@ SOURCES = \
+ 	ddk/compstui.h \
+ 	ddk/csq.h \
+ 	ddk/d3dkmthk.h \
++	ddk/fltkernel.h \
+ 	ddk/hidclass.h \
+ 	ddk/hidpi.h \
+ 	ddk/hidport.h \
 diff --git a/include/ddk/fltkernel.h b/include/ddk/fltkernel.h
 new file mode 100644
-index 0000000000..fb0c4c3c3c
+index 0000000..fb0c4c3
 --- /dev/null
 +++ b/include/ddk/fltkernel.h
 @@ -0,0 +1,667 @@
@@ -702,5 +715,5 @@ index 0000000000..fb0c4c3c3c
 +
 +#endif
 -- 
-2.16.1
+1.9.1
 
diff --git a/patches/fltmgr.sys-filters/0002-fltmgr.sys-Add-FltRegisterFilter-stub.patch b/patches/fltmgr.sys-filters/0002-fltmgr.sys-Add-FltRegisterFilter-stub.patch
index 336897fb..e5f3da50 100644
--- a/patches/fltmgr.sys-filters/0002-fltmgr.sys-Add-FltRegisterFilter-stub.patch
+++ b/patches/fltmgr.sys-filters/0002-fltmgr.sys-Add-FltRegisterFilter-stub.patch
@@ -1,17 +1,16 @@
-From a4b5a66b53137496bdfa64b597f633f7520a82a2 Mon Sep 17 00:00:00 2001
+From 81b6451be78983d77108a5d7c70fde6e14caddd8 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Fri, 9 Mar 2018 21:41:10 +1100
-Subject: [PATCH 1/3] fltmgr.sys: Add FltRegisterFilter stub
+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 ++++++++++
- include/Makefile.in             |  1 +
- 3 files changed, 12 insertions(+), 1 deletion(-)
+ 2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec
-index ea84d81224..000368f47c 100644
+index ea84d81..000368f 100644
 --- a/dlls/fltmgr.sys/fltmgr.sys.spec
 +++ b/dlls/fltmgr.sys/fltmgr.sys.spec
 @@ -128,7 +128,7 @@
@@ -24,7 +23,7 @@ index ea84d81224..000368f47c 100644
  @ stub FltReleaseContext
  @ stub FltReleaseContexts
 diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c
-index 09c89a1e2f..efe9b7fde7 100644
+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 )
@@ -41,18 +40,6 @@ index 09c89a1e2f..efe9b7fde7 100644
 +
 +    return STATUS_SUCCESS;
 +}
-diff --git a/include/Makefile.in b/include/Makefile.in
-index bdda95592b..ccb571477b 100644
---- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -156,6 +156,7 @@ SOURCES = \
- 	ddk/compstui.h \
- 	ddk/csq.h \
- 	ddk/d3dkmthk.h \
-+	ddk/fltkernel.h \
- 	ddk/hidclass.h \
- 	ddk/hidpi.h \
- 	ddk/hidport.h \
 -- 
-2.16.1
+1.9.1