From 0d02a7aa9958e84c8663465e2d05606a6afb7831 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 7 Sep 2023 17:58:02 +1000
Subject: [PATCH] Rebase against 87b1cd12d609d8359dab10af976d20269912e196.

---
 ...Implement-FltBuildDefaultSecurityDescript.patch | 14 +++++++-------
 staging/upstream-commit                            |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0001-fltmgr.sys-Implement-FltBuildDefaultSecurityDescript.patch b/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0001-fltmgr.sys-Implement-FltBuildDefaultSecurityDescript.patch
index 20e57531..933cfb69 100644
--- a/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0001-fltmgr.sys-Implement-FltBuildDefaultSecurityDescript.patch
+++ b/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0001-fltmgr.sys-Implement-FltBuildDefaultSecurityDescript.patch
@@ -1,7 +1,7 @@
-From 93d33e5934d8d71db35025f5046d8d44ac1182cc Mon Sep 17 00:00:00 2001
+From 2a8ffcea70c41f013660d2b6168ab694c70246c0 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sun, 29 Aug 2021 13:26:53 +1000
-Subject: [PATCH 1/3] fltmgr.sys: Implement FltBuildDefaultSecurityDescriptor
+Subject: [PATCH] fltmgr.sys: Implement FltBuildDefaultSecurityDescriptor
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
@@ -12,7 +12,7 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  4 files changed, 79 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/fltmgr.sys/Makefile.in b/dlls/fltmgr.sys/Makefile.in
-index ba106a43831..bb1f34b4896 100644
+index 6ebd48d9412..ae0e812cb22 100644
 --- a/dlls/fltmgr.sys/Makefile.in
 +++ b/dlls/fltmgr.sys/Makefile.in
 @@ -1,5 +1,6 @@
@@ -20,8 +20,8 @@ index ba106a43831..bb1f34b4896 100644
  EXTRADLLFLAGS = -Wl,--subsystem,native
 +IMPORTS = ntoskrnl
  
- C_SRCS = \
- 	main.c
+ SOURCES = \
+ 	fltmgr.sys.spec \
 diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec
 index 39ce6798178..8943b9f85cf 100644
 --- a/dlls/fltmgr.sys/fltmgr.sys.spec
@@ -45,7 +45,7 @@ index 39ce6798178..8943b9f85cf 100644
  @ stub FltGetBottomInstance
  @ stub FltGetContexts
 diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c
-index e1016a4989c..79f810570da 100644
+index e1016a4989c..68f242ab8e8 100644
 --- a/dlls/fltmgr.sys/main.c
 +++ b/dlls/fltmgr.sys/main.c
 @@ -23,7 +23,6 @@
@@ -136,7 +136,7 @@ index e1016a4989c..79f810570da 100644
 +}
 \ No newline at end of file
 diff --git a/include/ddk/fltkernel.h b/include/ddk/fltkernel.h
-index 8ebebfa2e81..9ece0990810 100644
+index 49c9d55dbaa..e5483d5a3fa 100644
 --- a/include/ddk/fltkernel.h
 +++ b/include/ddk/fltkernel.h
 @@ -653,7 +653,8 @@ typedef struct _FLT_REGISTRATION
diff --git a/staging/upstream-commit b/staging/upstream-commit
index daa0b53f..e2033c8b 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-ce40b4d8fcb08d54df7ada430bc8dfe53392bd23
+87b1cd12d609d8359dab10af976d20269912e196