Rebase against a0febe909780189fa2441635484cb592b9ab64b5.

patches/ntdll-Junction_Points/0024-ntdll-Succeed-with-no-data-for-NtReadFile-on-reparse.patch

@@ -1,7 +1,7 @@
-From 88fc8873bb68ef3d9b816a5cae76c5d7e12a82f1 Mon Sep 17 00:00:00 2001
+From 92381fe379f4e971168e1e3d9c67394eb8d0f697 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
 Date: Mon, 23 Nov 2020 13:08:02 -0700
-Subject: ntdll: Succeed with no data for NtReadFile on reparse points.
+Subject: [PATCH] ntdll: Succeed with no data for NtReadFile on reparse points.
 
 Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
 ---
@@ -12,10 +12,10 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
  4 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index ebed2600920..cb9a9506aba 100644
+index 92cff9d9b2e..1e867146cd9 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
-@@ -5581,7 +5581,7 @@ static void test_reparse_points(void)
+@@ -5591,7 +5591,7 @@ static void test_reparse_points(void)
      ok(handle != INVALID_HANDLE_VALUE, "Failed to open symlink file.\n");
      todo_wine ok(GetFileSize(handle, NULL) == 0, "symlink size is not zero\n");
      bret = ReadFile(handle, &buf, sizeof(buf), &dwLen, NULL);
@@ -25,12 +25,12 @@ index ebed2600920..cb9a9506aba 100644
      CloseHandle(handle);
  
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index 49412c99d3c..f7ff9f4b5ed 100644
+index 0d6f08072a7..d7e0be3f65c 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
-@@ -5414,6 +5414,11 @@ NTSTATUS WINAPI NtReadFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, vo
-             goto done;
-         }
+@@ -5415,6 +5415,11 @@ NTSTATUS WINAPI NtReadFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, vo
+         if (needs_close) close( unix_handle );
+         return status;
      }
 +    else if (type == FD_TYPE_SYMLINK)
 +    {
@@ -41,7 +41,7 @@ index 49412c99d3c..f7ff9f4b5ed 100644
      if (type == FD_TYPE_SERIAL && async_read && length)
      {
 diff --git a/server/file.c b/server/file.c
-index 062322f685d..3079afdbdfd 100644
+index eb2dc5696ed..b9d0eb2d5f4 100644
 --- a/server/file.c
 +++ b/server/file.c
 @@ -294,6 +294,7 @@ static enum server_fd_type file_get_fd_type( struct fd *fd )
@@ -53,10 +53,10 @@ index 062322f685d..3079afdbdfd 100644
      if (S_ISDIR(file->mode)) return FD_TYPE_DIR;
      return FD_TYPE_CHAR;
 diff --git a/server/protocol.def b/server/protocol.def
-index 385420eedda..0c259ed063f 100644
+index 93c17e091cb..238e23b0a85 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -1366,6 +1366,7 @@ enum server_fd_type
+@@ -1382,6 +1382,7 @@ enum server_fd_type
  {
      FD_TYPE_INVALID,  /* invalid file (no associated fd) */
      FD_TYPE_FILE,     /* regular file */
@@ -65,5 +65,5 @@ index 385420eedda..0c259ed063f 100644
      FD_TYPE_SOCKET,   /* socket */
      FD_TYPE_SERIAL,   /* serial port */
 -- 
-2.17.1
+2.35.1
 

patches/patchinstall.sh

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

staging/upstream-commit

@@ -1 +1 @@
-7ff508838ec6631b9def78ae391ff266fcc0d80e
+a0febe909780189fa2441635484cb592b9ab64b5