diff --git a/patches/kernel32-CopyFileEx/definition b/patches/kernel32-CopyFileEx/definition index 3758841b..b64a7dfb 100644 --- a/patches/kernel32-CopyFileEx/definition +++ b/patches/kernel32-CopyFileEx/definition @@ -1,4 +1,3 @@ Fixes: [22692] Add support for CopyFileEx progress callback Fixes: [22690] Allow to cancel a file operation via progress callback Depends: ntdll-FileDispositionInformation -Depends: kernel32-SetFileInformationByHandle diff --git a/patches/kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch b/patches/kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch deleted file mode 100644 index 8d03cf0d..00000000 --- a/patches/kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 063e45518bfb5b0909c763bb0da10c03ae13c6cc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Thu, 26 Feb 2015 05:28:23 +0100 -Subject: include: Declare a couple more file information class structures. - ---- - include/winbase.h | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - -diff --git a/include/winbase.h b/include/winbase.h -index 823d9f4..373d0bb 100644 ---- a/include/winbase.h -+++ b/include/winbase.h -@@ -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; -+ DWORD StreamNameLength; -+ LARGE_INTEGER StreamSize; -+ LARGE_INTEGER StreamAllocationSize; -+ WCHAR StreamName[1]; -+} FILE_STREAM_INFO, *PFILE_STREAM_INFO; -+ -+typedef struct _FILE_FULL_DIR_INFO { -+ ULONG NextEntryOffset; -+ ULONG FileIndex; -+ LARGE_INTEGER CreationTime; -+ LARGE_INTEGER LastAccessTime; -+ LARGE_INTEGER LastWriteTime; -+ LARGE_INTEGER ChangeTime; -+ LARGE_INTEGER EndOfFile; -+ LARGE_INTEGER AllocationSize; -+ ULONG FileAttributes; -+ ULONG FileNameLength; -+ ULONG EaSize; -+ WCHAR FileName[1]; -+} FILE_FULL_DIR_INFO, *PFILE_FULL_DIR_INFO; -+ - #define PIPE_ACCESS_INBOUND 1 - #define PIPE_ACCESS_OUTBOUND 2 - #define PIPE_ACCESS_DUPLEX 3 --- -2.4.2 - diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 89210477..777e741b 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -193,7 +193,6 @@ patch_enable_all () enable_kernel32_Profile="$1" enable_kernel32_SCSI_Sysfs="$1" enable_kernel32_SetFileCompletionNotificationModes="$1" - enable_kernel32_SetFileInformationByHandle="$1" enable_kernel32_TimezoneInformation_Registry="$1" enable_kernel32_UmsStubs="$1" enable_kernel32_VerifyVersionInfo="$1" @@ -808,9 +807,6 @@ patch_enable () kernel32-SetFileCompletionNotificationModes) enable_kernel32_SetFileCompletionNotificationModes="$2" ;; - kernel32-SetFileInformationByHandle) - enable_kernel32_SetFileInformationByHandle="$2" - ;; kernel32-TimezoneInformation_Registry) enable_kernel32_TimezoneInformation_Registry="$2" ;; @@ -2435,13 +2431,9 @@ if test "$enable_kernel32_GetPackageFullName" -eq 1; then fi if test "$enable_kernel32_CopyFileEx" -eq 1; then - if test "$enable_kernel32_SetFileInformationByHandle" -gt 1; then - abort "Patchset kernel32-SetFileInformationByHandle disabled, but kernel32-CopyFileEx depends on that." - fi if test "$enable_ntdll_FileDispositionInformation" -gt 1; then abort "Patchset ntdll-FileDispositionInformation disabled, but kernel32-CopyFileEx depends on that." fi - enable_kernel32_SetFileInformationByHandle=1 enable_ntdll_FileDispositionInformation=1 fi @@ -4444,18 +4436,6 @@ if test "$enable_kernel32_COMSPEC" -eq 1; then ) >> "$patchlist" fi -# Patchset kernel32-SetFileInformationByHandle -# | -# | Modified files: -# | * include/winbase.h -# | -if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then - patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch - ( - printf '%s\n' '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },'; - ) >> "$patchlist" -fi - # Patchset server-File_Permissions # | # | This patchset fixes the following Wine bugs: @@ -4507,7 +4487,7 @@ fi # Patchset kernel32-CopyFileEx # | # | This patchset has the following (direct or indirect) dependencies: -# | * kernel32-SetFileInformationByHandle, server-File_Permissions, ntdll-FileDispositionInformation +# | * server-File_Permissions, ntdll-FileDispositionInformation # | # | This patchset fixes the following Wine bugs: # | * [#22692] Add support for CopyFileEx progress callback @@ -7262,8 +7242,7 @@ fi # Patchset shell32-Progress_Dialog # | # | This patchset has the following (direct or indirect) dependencies: -# | * kernel32-SetFileInformationByHandle, server-File_Permissions, ntdll-FileDispositionInformation, kernel32-CopyFileEx, -# | shell32-SHFileOperation_Move +# | * server-File_Permissions, ntdll-FileDispositionInformation, kernel32-CopyFileEx, shell32-SHFileOperation_Move # | # | Modified files: # | * dlls/shell32/shell32.rc, dlls/shell32/shlfileop.c, dlls/shell32/shresdef.h @@ -7328,8 +7307,8 @@ fi # Patchset shell32-SHFileOperation_Win9x # | # | This patchset has the following (direct or indirect) dependencies: -# | * kernel32-SetFileInformationByHandle, server-File_Permissions, ntdll-FileDispositionInformation, kernel32-CopyFileEx, -# | shell32-SHFileOperation_Move, shell32-Progress_Dialog +# | * server-File_Permissions, ntdll-FileDispositionInformation, kernel32-CopyFileEx, shell32-SHFileOperation_Move, +# | shell32-Progress_Dialog # | # | This patchset fixes the following Wine bugs: # | * [#37916] Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW