Rebase against 42cbc05e59d32228f4edd171ca66e4cbe5645d1d.

patches/kernel32-SetFileInformationByHandle/0002-include-Declare-a-couple-more-file-information-class.patch

@@ -1,19 +1,19 @@
-From df8e954e44bbaa2f4631a3fc71a23609fc704e5e Mon Sep 17 00:00:00 2001
+From 063e45518bfb5b0909c763bb0da10c03ae13c6cc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 26 Feb 2015 05:28:23 +0100
 Subject: include: Declare a couple more file information class structures.
 
 ---
- include/winbase.h | 37 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 37 insertions(+)
+ include/winbase.h | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
 
 diff --git a/include/winbase.h b/include/winbase.h
-index 4795d87..28313e3 100644
+index 823d9f4..373d0bb 100644
 --- a/include/winbase.h
 +++ b/include/winbase.h
-@@ -874,6 +874,43 @@ typedef struct _FILE_RENAME_INFO {
-     WCHAR FileName[1];
- } FILE_RENAME_INFO, *PFILE_RENAME_INFO;
+@@ -905,6 +905,29 @@ typedef struct _FILE_REMOTE_PROTOCOL_INFO {
+     } ProtocolSpecificReserved;
+ } FILE_REMOTE_PROTOCOL_INFO, *PFILE_REMOTE_PROTOCOL_INFO;
  
 +typedef struct _FILE_STREAM_INFO {
 +    DWORD NextEntryOffset;
@@ -23,20 +23,6 @@ index 4795d87..28313e3 100644
 +    WCHAR StreamName[1];
 +} FILE_STREAM_INFO, *PFILE_STREAM_INFO;
 +
-+typedef struct _FILE_COMPRESSION_INFO {
-+    LARGE_INTEGER CompressedFileSize;
-+    WORD CompressionFormat;
-+    UCHAR CompressionUnitShift;
-+    UCHAR ChunkShift;
-+    UCHAR ClusterShift;
-+    UCHAR Reserved[3];
-+} FILE_COMPRESSION_INFO, *PFILE_COMPRESSION_INFO;
-+
-+typedef struct _FILE_ATTRIBUTE_TAG_INFO {
-+    DWORD FileAttributes;
-+    DWORD ReparseTag;
-+} FILE_ATTRIBUTE_TAG_INFO, *PFILE_ATTRIBUTE_TAG_INFO;
-+
 +typedef struct _FILE_FULL_DIR_INFO {
 +    ULONG NextEntryOffset;
 +    ULONG FileIndex;

patches/patchinstall.sh

@@ -55,7 +55,7 @@ version()
 	echo "Copyright (C) 2014-2015 the Wine Staging project authors."
 	echo ""
 	echo "Patchset to be applied on upstream Wine:"
-	echo "  commit 0922865b377913a27cea568ac688787a8117d8a7"
+	echo "  commit 42cbc05e59d32228f4edd171ca66e4cbe5645d1d"
 	echo ""
 }