Rebase against 52a83ffe4ef1ef58520b09f8d2144dcf291b622b.

patches/ntdll-WRITECOPY/0007-ntdll-Report-unmodified-WRITECOPY-pages-as-shared.patch

@@ -1,4 +1,4 @@
-From 94c657aca5daa972b3c8ce07642471c2b47818ef Mon Sep 17 00:00:00 2001
+From 52baf4b2f68a78a2d0a0ad16fac8e25af70400ff Mon Sep 17 00:00:00 2001
 From: Andrew Wesie <awesie@gmail.com>
 Date: Fri, 24 Apr 2020 14:55:17 -0500
 Subject: [PATCH] ntdll: Report unmodified WRITECOPY pages as shared.
@@ -13,10 +13,10 @@ Signed-off-by: Andrew Wesie <awesie@gmail.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index 0f0fcc4517b..3c74585d160 100644
+index 6c530304442..05d4d517aeb 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -2509,6 +2509,8 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena
+@@ -2441,6 +2441,8 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena
                             ptr + sec->VirtualAddress + file_size,
                             ptr + sec->VirtualAddress + end );
              memset( ptr + sec->VirtualAddress + file_size, 0, end - file_size );
@@ -25,9 +25,9 @@ index 0f0fcc4517b..3c74585d160 100644
          }
      }
  
-@@ -4431,7 +4433,7 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr,
-             (vprot & VPROT_COMMITTED))
-         {
+@@ -4420,7 +4422,7 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr,
+             }
+ 
              p->VirtualAttributes.Valid = !(vprot & VPROT_GUARD) && (vprot & 0x0f) && (pagemap >> 63);
 -            p->VirtualAttributes.Shared = !is_view_valloc( view ) && ((pagemap >> 61) & 1);
 +            p->VirtualAttributes.Shared = (!is_view_valloc( view ) && ((pagemap >> 61) & 1)) || ((view->protect & VPROT_WRITECOPY) && !(vprot & VPROT_WRITTEN));
@@ -35,5 +35,5 @@ index 0f0fcc4517b..3c74585d160 100644
                  p->VirtualAttributes.ShareCount = 1; /* FIXME */
              if (p->VirtualAttributes.Valid)
 -- 
-2.33.0
+2.35.1
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "e2a5bf7540a3b1f5b3889f6339795e5edf7f590f"
+	echo "52a83ffe4ef1ef58520b09f8d2144dcf291b622b"
 }
 
 # Show version information

staging/upstream-commit

@@ -1 +1 @@
-e2a5bf7540a3b1f5b3889f6339795e5edf7f590f
+52a83ffe4ef1ef58520b09f8d2144dcf291b622b