Rebase against fdd9e257e2913ecb53fa3c31bfa9ed1ec65fce3c.

patches/server-default_integrity/0007-ntdll-Elevate-processes-if-requested-in-RtlCreateUse.patch

@@ -1,4 +1,4 @@
-From 20e95575948faec1eca2e88967e985539a512cd5 Mon Sep 17 00:00:00 2001
+From 1754d90b8cc833d55e6d3f3de23cdf89dffd37aa Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Sun, 18 Apr 2021 17:46:44 -0500
 Subject: [PATCH] ntdll: Elevate processes if requested in
@@ -6,24 +6,26 @@ Subject: [PATCH] ntdll: Elevate processes if requested in
 
 Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
 ---
- dlls/ntdll/process.c | 79 +++++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 74 insertions(+), 5 deletions(-)
+ dlls/ntdll/process.c | 81 +++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 76 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
-index 160b1f549c9..fd437ea07d4 100644
+index dcdb26f81d1..ed1b2a20311 100644
 --- a/dlls/ntdll/process.c
 +++ b/dlls/ntdll/process.c
-@@ -39,6 +39,9 @@
- WINE_DEFAULT_DEBUG_CHANNEL(process);
+@@ -37,6 +37,11 @@
+ #include "wine/exception.h"
  
  
 +/* we don't want to include winuser.h */
 +#define CREATEPROCESS_MANIFEST_RESOURCE_ID ((ULONG_PTR)1)
++
++WINE_DEFAULT_DEBUG_CHANNEL(process);
 +
  /******************************************************************************
   *  RtlGetCurrentPeb  [NTDLL.@]
   *
-@@ -82,6 +85,63 @@ NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG disable, ULONG *old_value )
+@@ -89,6 +94,63 @@ NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG disable, ULONG *old_value )
  }
  
  
@@ -87,7 +89,7 @@ index 160b1f549c9..fd437ea07d4 100644
  /**********************************************************************
   *           RtlWow64GetCurrentMachine  (NTDLL.@)
   */
-@@ -294,8 +354,15 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes,
+@@ -461,8 +523,15 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes,
      PS_CREATE_INFO create_info;
      ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[6] ) / sizeof(ULONG_PTR)];
      PS_ATTRIBUTE_LIST *attr = (PS_ATTRIBUTE_LIST *)buffer;
@@ -103,7 +105,7 @@ index 160b1f549c9..fd437ea07d4 100644
      RtlNormalizeProcessParams( params );
  
      attr->Attributes[pos].Attribute    = PS_ATTRIBUTE_IMAGE_NAME;
-@@ -342,11 +409,13 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes,
+@@ -509,11 +578,13 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes,
      InitializeObjectAttributes( &process_attr, NULL, 0, NULL, process_descr );
      InitializeObjectAttributes( &thread_attr, NULL, 0, NULL, thread_descr );
  
@@ -123,5 +125,5 @@ index 160b1f549c9..fd437ea07d4 100644
  
  /***********************************************************************
 -- 
-2.32.0
+2.43.0
 

staging/upstream-commit

@@ -1 +1 @@
-c963c4141a0d4f6601c37f11d79de186be0da6a9
+fdd9e257e2913ecb53fa3c31bfa9ed1ec65fce3c