Rebase against a2f2de1e960d37840bb0df541e31d64941e65197.

patches/kernel32-SetFileCompletionNotificationModes/0001-ntdll-Implement-FileIoCompletionNotificationInformat.patch

@@ -1,4 +1,4 @@
-From 624410b16ab0e56d0f87ce4cb2382df29710ba73 Mon Sep 17 00:00:00 2001
+From 3743bfb6a418605e3d30f9b4dad57ec8e498ed71 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 15 Oct 2016 19:50:46 +0200
 Subject: ntdll: Implement FileIoCompletionNotificationInformation info class.
@@ -16,10 +16,10 @@ FIXME: Could we use the existing wineserver call instead?
  6 files changed, 195 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
-index cc7ead1cdd6..5fe22686bb1 100644
+index 3e93b0dfd78..f4e63bcaae6 100644
 --- a/dlls/kernel32/file.c
 +++ b/dlls/kernel32/file.c
-@@ -1061,13 +1061,20 @@ BOOL WINAPI SetEndOfFile( HANDLE hFile )
+@@ -1064,13 +1064,20 @@ BOOL WINAPI SetEndOfFile( HANDLE hFile )
      return FALSE;
  }
  
@@ -44,10 +44,10 @@ index cc7ead1cdd6..5fe22686bb1 100644
  }
  
 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index c7669ee02fe..5560762b3cd 100644
+index fd7f3dd955a..00131f11cf7 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
-@@ -2787,6 +2787,23 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io,
+@@ -2802,6 +2802,23 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io,
              io->u.Status = STATUS_INVALID_PARAMETER_3;
          break;
  
@@ -72,7 +72,7 @@ index c7669ee02fe..5560762b3cd 100644
          io->u.Status = STATUS_INVALID_INFO_CLASS;
          break;
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index 57d7df9c00a..f9c61e2f25b 100644
+index 1a02ce5eaa5..0a114e7cc73 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
 @@ -3261,6 +3261,135 @@ static void test_file_all_name_information(void)
@@ -208,22 +208,22 @@ index 57d7df9c00a..f9c61e2f25b 100644
 +    CloseHandle(h);
 +}
 +
- static void test_query_volume_information_file(void)
+ static void test_file_id_information(void)
  {
-     NTSTATUS status;
-@@ -4260,6 +4389,7 @@ START_TEST(file)
+     BY_HANDLE_FILE_INFORMATION info;
+@@ -4299,6 +4428,7 @@ START_TEST(file)
      test_file_rename_information();
      test_file_link_information();
      test_file_disposition_information();
 +    test_file_completion_information();
+     test_file_id_information();
      test_query_volume_information_file();
      test_query_attribute_information_file();
- }
 diff --git a/include/winternl.h b/include/winternl.h
-index f35091cba1a..7613d8b9264 100644
+index 2f2ea866ae7..08af643b334 100644
 --- a/include/winternl.h
 +++ b/include/winternl.h
-@@ -725,6 +725,14 @@ typedef struct _FILE_ALL_INFORMATION {
+@@ -741,6 +741,14 @@ typedef struct _FILE_ALL_INFORMATION {
      FILE_NAME_INFORMATION      NameInformation;
  } FILE_ALL_INFORMATION, *PFILE_ALL_INFORMATION;
  

patches/kernel32-SetFileCompletionNotificationModes/0002-ntdll-Allow-to-query-file-IO-completion-notification.patch

@@ -1,4 +1,4 @@
-From 50ce3a32218828dafd18daea3649ca36a203f2a7 Mon Sep 17 00:00:00 2001
+From 723fa05be459725140a88f614b315b19f90cc235 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 5 Feb 2017 11:27:49 +0100
 Subject: ntdll: Allow to query file IO completion notification mode.
@@ -11,10 +11,10 @@ Subject: ntdll: Allow to query file IO completion notification mode.
  4 files changed, 51 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index 5560762b3cd..db65c2b40cd 100644
+index 00131f11cf7..fc72833e1a4 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
-@@ -2359,7 +2359,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io,
+@@ -2357,7 +2357,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io,
          0,                                             /* FileIdFullDirectoryInformation */
          0,                                             /* FileValidDataLengthInformation */
          0,                                             /* FileShortNameInformation */
@@ -23,7 +23,7 @@ index 5560762b3cd..db65c2b40cd 100644
          0,                                             /* FileIoStatusBlockRangeInformation */
          0,                                             /* FileIoPriorityHintInformation */
          0,                                             /* FileSfioReserveInformation */
-@@ -2612,6 +2612,22 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io,
+@@ -2617,6 +2617,22 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io,
              }
          }
          break;
@@ -43,11 +43,11 @@ index 5560762b3cd..db65c2b40cd 100644
 +            SERVER_END_REQ;
 +        }
 +        break;
-     default:
-         FIXME("Unsupported class (%d)\n", class);
-         io->u.Status = STATUS_NOT_IMPLEMENTED;
+     case FileIdInformation:
+         if (fd_get_file_info( fd, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus();
+         else
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index f9c61e2f25b..ee14f85d6b6 100644
+index 0a114e7cc73..214c51a726a 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
 @@ -3303,6 +3303,11 @@ static void test_file_completion_information(void)