From 7f503dd5f159525e163a6eaa48872f533e9f3e02 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 26 Nov 2014 18:28:06 +0100 Subject: [PATCH] Update several patches and include changes from tools/make_specfiles and tools/make_makefiles. --- debian/changelog | 2 ++ patches/Makefile | 10 +++--- ...2-Implement-GetFinalPathNameByHandle.patch | 36 +++++++++++++------ ...-support-for-junction-point-creation.patch | 27 ++++++++++---- ...LZNT1-algorithm-for-RtlDecompressBuf.patch | 28 +++++++++++---- ...l.exe-Add-a-stub-for-IoCsqInitialize.patch | 17 +++++++-- 6 files changed, 90 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index dd7a958c..83d7fe22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ wine-compholio (1.7.32) UNRELEASED; urgency=low * Update patch for SO_CONNECT_TIME and adding better tests. + * Update patch for FD Cache and use faster method on x86_64. * Added patch to ensure dbghelp always checks for debug symbols in BINDIR. * Added patch for pulseaudio exclusive mode support. * Added patch to take abs() of vertex z coordinate as FFP fog coordinate. @@ -11,6 +12,7 @@ wine-compholio (1.7.32) UNRELEASED; urgency=low * Added patch to avoid sending unexpected wakeup with uninitialized cookie value. * Added patch to fix issues with dragging layers between images in Adobe Photoshop 7.0. * Added patch to ensure wintrust resets data->pWintrustData->u.pFile->hFile after closing handle. + * Added patch to add additional format conversions for DXT1 and DXT3. * Removed patch to close server fd is there is no space in thread inflight fd list (accepted upstream). * Removed patch to fix bugs in StrStr functions (accepted upstream). * Removed patches to avoid sending messages in FindWindowExW (accepted upstream). diff --git a/patches/Makefile b/patches/Makefile index 79f55f21..1d59e345 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -589,7 +589,8 @@ iphlpapi-TCP_Table.ok: # | * [#36073] Support for GetFinalPathNameByHandle # | # | Modified files: -# | * dlls/kernel32/file.c, dlls/kernel32/kernel32.spec, dlls/kernel32/tests/file.c, include/fileapi.h +# | * dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec, dlls/kernel32/file.c, dlls/kernel32/kernel32.spec, +# | dlls/kernel32/tests/file.c, include/fileapi.h # | .INTERMEDIATE: kernel32-GetFinalPathNameByHandle.ok kernel32-GetFinalPathNameByHandle.ok: @@ -900,7 +901,8 @@ ntdll-Heap_FreeLists.ok: # | * [#12401] Support for Junction Points # | # | Modified files: -# | * dlls/kernel32/path.c, dlls/kernel32/volume.c, dlls/ntdll/file.c, dlls/ntdll/tests/file.c, include/ntifs.h +# | * dlls/kernel32/path.c, dlls/kernel32/volume.c, dlls/ntdll/file.c, dlls/ntdll/tests/file.c, include/Makefile.in, +# | include/ntifs.h # | .INTERMEDIATE: ntdll-Junction_Points.ok ntdll-Junction_Points.ok: ntdll-Fix_Free.ok @@ -927,7 +929,7 @@ ntdll-Junction_Points.ok: ntdll-Fix_Free.ok # | * [#37449] Support for RtlDecompressBuffer # | # | Modified files: -# | * dlls/ntdll/ntdll.spec, dlls/ntdll/rtl.c, dlls/ntdll/tests/rtl.c, include/winnt.h +# | * dlls/ntdll/ntdll.spec, dlls/ntdll/rtl.c, dlls/ntdll/tests/rtl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/winnt.h # | .INTERMEDIATE: ntdll-LZNT1_Compression.ok ntdll-LZNT1_Compression.ok: @@ -1069,7 +1071,7 @@ ntoskrnl-Emulator.ok: ntdll-User_Shared_Data.ok # | * [#36777] vSphere needs IoCsqInitialize # | # | Modified files: -# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/ddk/csq.h +# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/Makefile.in, include/ddk/csq.h # | .INTERMEDIATE: ntoskrnl-IoCsqInitialize.ok ntoskrnl-IoCsqInitialize.ok: diff --git a/patches/kernel32-GetFinalPathNameByHandle/0001-kernel32-Implement-GetFinalPathNameByHandle.patch b/patches/kernel32-GetFinalPathNameByHandle/0001-kernel32-Implement-GetFinalPathNameByHandle.patch index 5cfb53be..bd65e30b 100644 --- a/patches/kernel32-GetFinalPathNameByHandle/0001-kernel32-Implement-GetFinalPathNameByHandle.patch +++ b/patches/kernel32-GetFinalPathNameByHandle/0001-kernel32-Implement-GetFinalPathNameByHandle.patch @@ -1,19 +1,35 @@ -From 7f9ec61d451223868ef2b1b20b16c59a11706412 Mon Sep 17 00:00:00 2001 +From 2bde361904bbd2463c8de66941e725add7a239e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 12 Aug 2014 20:24:14 +0200 Subject: kernel32: Implement GetFinalPathNameByHandle. --- - dlls/kernel32/file.c | 182 ++++++++++++++++++++++++++++++++++++++++++++ - dlls/kernel32/kernel32.spec | 2 + - include/fileapi.h | 8 ++ - 3 files changed, 192 insertions(+) + .../api-ms-win-core-file-l1-2-0.spec | 4 +- + dlls/kernel32/file.c | 182 +++++++++++++++++++++ + dlls/kernel32/kernel32.spec | 2 + + include/fileapi.h | 8 + + 4 files changed, 194 insertions(+), 2 deletions(-) +diff --git a/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec +index ebfd52e..cddf112 100644 +--- a/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec ++++ b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec +@@ -39,8 +39,8 @@ + @ stdcall GetFileSizeEx(long ptr) kernel32.GetFileSizeEx + @ stdcall GetFileTime(long ptr ptr ptr) kernel32.GetFileTime + @ stdcall GetFileType(long) kernel32.GetFileType +-@ stub GetFinalPathNameByHandleA +-@ stub GetFinalPathNameByHandleW ++@ stdcall GetFinalPathNameByHandleA(long ptr long long) kernel32.GetFinalPathNameByHandleA ++@ stdcall GetFinalPathNameByHandleW(long ptr long long) kernel32.GetFinalPathNameByHandleW + @ stdcall GetFullPathNameA(str long ptr ptr) kernel32.GetFullPathNameA + @ stdcall GetFullPathNameW(wstr long ptr ptr) kernel32.GetFullPathNameW + @ stdcall GetLogicalDriveStringsW(long ptr) kernel32.GetLogicalDriveStringsW diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c -index 412659b..4646217 100644 +index 006db1c..b3cc8c3 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c -@@ -2810,3 +2810,185 @@ DWORD WINAPI K32GetDeviceDriverFileNameW(void *image_base, LPWSTR file_name, DWO +@@ -2829,3 +2829,185 @@ DWORD WINAPI K32GetDeviceDriverFileNameW(void *image_base, LPWSTR file_name, DWO return 0; } @@ -201,10 +217,10 @@ index 412659b..4646217 100644 +} \ No newline at end of file diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec -index 2de2119..10a5ef3 100644 +index c072780..d6955d3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec -@@ -538,6 +538,8 @@ +@@ -539,6 +539,8 @@ @ stdcall GetFileAttributesW(wstr) @ stdcall GetFileInformationByHandle(long ptr) @ stdcall GetFileInformationByHandleEx(long long ptr long) @@ -233,5 +249,5 @@ index 02bbbd4..0ccf9e9 100644 } #endif -- -2.1.0 +2.1.3 diff --git a/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch b/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch index 2110a75d..bc0368b1 100644 --- a/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch +++ b/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch @@ -1,17 +1,18 @@ -From 8e81030f67159f359e94180289d2e3dc0d0cb436 Mon Sep 17 00:00:00 2001 +From c67c9f74f97bb78a2bc8e97aab32adb236aff3da Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Thu, 16 Jan 2014 20:56:49 -0700 Subject: ntdll: Add support for junction point creation. --- - dlls/ntdll/file.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ - dlls/ntdll/tests/file.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++ - include/ntifs.h | 52 ++++++++++++++++++++++++++ - 3 files changed, 235 insertions(+) + dlls/ntdll/file.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++ + dlls/ntdll/tests/file.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++ + include/Makefile.in | 1 + + include/ntifs.h | 52 +++++++++++++++++++++++++++ + 4 files changed, 236 insertions(+) create mode 100644 include/ntifs.h diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c -index 92d9829..8413ad1 100644 +index 56ea398..444831f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -89,12 +89,14 @@ @@ -247,6 +248,18 @@ index d70ed6b..90e753d 100644 test_query_attribute_information_file(); + test_junction_points(); } +diff --git a/include/Makefile.in b/include/Makefile.in +index e8d2379..d81aac0 100644 +--- a/include/Makefile.in ++++ b/include/Makefile.in +@@ -466,6 +466,7 @@ SRCDIR_INCLUDES = \ + ntddscsi.h \ + ntddstor.h \ + ntdsapi.h \ ++ ntifs.h \ + ntquery.h \ + ntsecapi.h \ + ntsecpkg.h \ diff --git a/include/ntifs.h b/include/ntifs.h new file mode 100644 index 0000000..db07c28 @@ -306,5 +319,5 @@ index 0000000..db07c28 + +#endif /* __WINE_NTIFS_H */ -- -1.7.9.5 +2.1.3 diff --git a/patches/ntdll-LZNT1_Compression/0003-ntdll-Implement-LZNT1-algorithm-for-RtlDecompressBuf.patch b/patches/ntdll-LZNT1_Compression/0003-ntdll-Implement-LZNT1-algorithm-for-RtlDecompressBuf.patch index d3b26fd6..23812348 100644 --- a/patches/ntdll-LZNT1_Compression/0003-ntdll-Implement-LZNT1-algorithm-for-RtlDecompressBuf.patch +++ b/patches/ntdll-LZNT1_Compression/0003-ntdll-Implement-LZNT1-algorithm-for-RtlDecompressBuf.patch @@ -1,4 +1,4 @@ -From 20d7a57c882c47dea7060b3a0e397f8092fdeddc Mon Sep 17 00:00:00 2001 +From ac70c24f5e811828739b6e8c51d1b3e26c6a5d04 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 30 Oct 2014 17:26:42 +0100 Subject: ntdll: Implement LZNT1 algorithm for RtlDecompressBuffer. @@ -8,15 +8,16 @@ Content-Transfer-Encoding: 8bit Based on a patch by Michael Müller. --- - dlls/ntdll/ntdll.spec | 2 +- - dlls/ntdll/rtl.c | 229 ++++++++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 223 insertions(+), 8 deletions(-) + dlls/ntdll/ntdll.spec | 2 +- + dlls/ntdll/rtl.c | 229 ++++++++++++++++++++++++++++++++++-- + dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- + 3 files changed, 224 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 5bac269..785d5ed 100644 +index 7e95969..c79e942 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec -@@ -510,7 +510,7 @@ +@@ -511,7 +511,7 @@ @ stdcall RtlDecodePointer(ptr) # @ stub RtlDecodeSystemPointer @ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) @@ -269,6 +270,19 @@ index b790910..c9715df 100644 } /*********************************************************************** +diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +index 4ead907..bfc3c59 100644 +--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec ++++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +@@ -977,7 +977,7 @@ + @ stub RtlCustomCPToUnicodeN + @ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) ntdll.RtlDecompressBuffer + @ stub RtlDecompressChunks +-@ stub RtlDecompressFragment ++@ stdcall RtlDecompressFragment(long ptr long ptr long long ptr ptr) ntdll.RtlDecompressFragment + @ stub RtlDelete + @ stdcall RtlDeleteAce(ptr long) ntdll.RtlDeleteAce + @ stdcall RtlDeleteAtomFromAtomTable(ptr long) ntdll.RtlDeleteAtomFromAtomTable -- -2.1.2 +2.1.3 diff --git a/patches/ntoskrnl-IoCsqInitialize/0001-ntoskrnl.exe-Add-a-stub-for-IoCsqInitialize.patch b/patches/ntoskrnl-IoCsqInitialize/0001-ntoskrnl.exe-Add-a-stub-for-IoCsqInitialize.patch index 47f762c6..9fc5f6b7 100644 --- a/patches/ntoskrnl-IoCsqInitialize/0001-ntoskrnl.exe-Add-a-stub-for-IoCsqInitialize.patch +++ b/patches/ntoskrnl-IoCsqInitialize/0001-ntoskrnl.exe-Add-a-stub-for-IoCsqInitialize.patch @@ -1,4 +1,4 @@ -From 499c08a3b6c1c05c5fb8edefc571feedac3dc85a Mon Sep 17 00:00:00 2001 +From 4be020848661860f46ea2ce1091279ea25dc021a Mon Sep 17 00:00:00 2001 From: Austin English Date: Tue, 4 Nov 2014 18:29:11 -0600 Subject: ntoskrnl.exe: Add a stub for IoCsqInitialize. @@ -6,8 +6,9 @@ Subject: ntoskrnl.exe: Add a stub for IoCsqInitialize. --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- + include/Makefile.in | 1 + include/ddk/csq.h | 33 +++++++++++++++++++++++++++++++++ - 3 files changed, 46 insertions(+), 1 deletion(-) + 4 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 include/ddk/csq.h diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -50,6 +51,18 @@ index 4ead907..ddb6b72 100644 @ stub IoCsqInsertIrp @ stub IoCsqRemoveIrp @ stub IoCsqRemoveNextIrp +diff --git a/include/Makefile.in b/include/Makefile.in +index e8d2379..633c09d 100644 +--- a/include/Makefile.in ++++ b/include/Makefile.in +@@ -244,6 +244,7 @@ SRCDIR_INCLUDES = \ + dde.rh \ + ddeml.h \ + ddk/compstui.h \ ++ ddk/csq.h \ + ddk/hidsdi.h \ + ddk/imm.h \ + ddk/mountmgr.h \ diff --git a/include/ddk/csq.h b/include/ddk/csq.h new file mode 100644 index 0000000..6c75e5c