From 3b6b470bcaf1e77bc9ba851b80a35fd4778e40fe Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 14 Nov 2020 17:15:39 +1100 Subject: [PATCH] Rebase against cf49617c1a378dd4a37ab7226187708c501b046f. --- patches/eventfd_synchronization/definition | 1 + patches/patchinstall.sh | 327 ++++++------------ ...Blacklist-desktop-integration-for-ce.patch | 12 +- staging/upstream-commit | 2 +- 4 files changed, 120 insertions(+), 222 deletions(-) diff --git a/patches/eventfd_synchronization/definition b/patches/eventfd_synchronization/definition index c0b18001..cb8be882 100644 --- a/patches/eventfd_synchronization/definition +++ b/patches/eventfd_synchronization/definition @@ -3,3 +3,4 @@ Depends: server-Realtime_Priority Depends: ntdll-Junction_Points Depends: server-PeekMessage Depends: server-Signal_Thread +Disabled: true diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 589845ec..4cc4dfdc 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "1f15ddce9c7d0ee71521d7b98c698488b76d3f01" + echo "cf49617c1a378dd4a37ab7226187708c501b046f" } # Show version information @@ -125,7 +125,6 @@ patch_enable_all () enable_dwrite_FontFallback="$1" enable_dxdiagn_Enumerate_DirectSound="$1" enable_dxdiagn_GetChildContainer_Leaf_Nodes="$1" - enable_eventfd_synchronization="$1" enable_explorer_Video_Registry_Key="$1" enable_fonts_Missing_Fonts="$1" enable_gdi32_rotation="$1" @@ -459,9 +458,6 @@ patch_enable () dxdiagn-GetChildContainer_Leaf_Nodes) enable_dxdiagn_GetChildContainer_Leaf_Nodes="$2" ;; - eventfd_synchronization) - enable_eventfd_synchronization="$2" - ;; explorer-Video_Registry_Key) enable_explorer_Video_Registry_Key="$2" ;; @@ -1576,6 +1572,17 @@ if test "$enable_ntdll_NtDevicePath" -eq 1; then enable_ntdll_Pipe_SpecialCharacters=1 fi +if test "$enable_ntdll_Junction_Points" -eq 1; then + if test "$enable_ntdll_DOS_Attributes" -gt 1; then + abort "Patchset ntdll-DOS_Attributes disabled, but ntdll-Junction_Points depends on that." + fi + if test "$enable_ntdll_NtQueryEaFile" -gt 1; then + abort "Patchset ntdll-NtQueryEaFile disabled, but ntdll-Junction_Points depends on that." + fi + enable_ntdll_DOS_Attributes=1 + enable_ntdll_NtQueryEaFile=1 +fi + if test "$enable_ntdll_Builtin_Prot" -eq 1; then if test "$enable_ntdll_WRITECOPY" -gt 1; then abort "Patchset ntdll-WRITECOPY disabled, but ntdll-Builtin_Prot depends on that." @@ -1604,36 +1611,6 @@ if test "$enable_kernel32_CopyFileEx" -eq 1; then enable_ntdll_FileDispositionInformation=1 fi -if test "$enable_eventfd_synchronization" -eq 1; then - if test "$enable_ntdll_Junction_Points" -gt 1; then - abort "Patchset ntdll-Junction_Points disabled, but eventfd_synchronization depends on that." - fi - if test "$enable_server_PeekMessage" -gt 1; then - abort "Patchset server-PeekMessage disabled, but eventfd_synchronization depends on that." - fi - if test "$enable_server_Realtime_Priority" -gt 1; then - abort "Patchset server-Realtime_Priority disabled, but eventfd_synchronization depends on that." - fi - if test "$enable_server_Signal_Thread" -gt 1; then - abort "Patchset server-Signal_Thread disabled, but eventfd_synchronization depends on that." - fi - enable_ntdll_Junction_Points=1 - enable_server_PeekMessage=1 - enable_server_Realtime_Priority=1 - enable_server_Signal_Thread=1 -fi - -if test "$enable_ntdll_Junction_Points" -eq 1; then - if test "$enable_ntdll_DOS_Attributes" -gt 1; then - abort "Patchset ntdll-DOS_Attributes disabled, but ntdll-Junction_Points depends on that." - fi - if test "$enable_ntdll_NtQueryEaFile" -gt 1; then - abort "Patchset ntdll-NtQueryEaFile disabled, but ntdll-Junction_Points depends on that." - fi - enable_ntdll_DOS_Attributes=1 - enable_ntdll_NtQueryEaFile=1 -fi - if test "$enable_dxdiagn_GetChildContainer_Leaf_Nodes" -eq 1; then if test "$enable_dxdiagn_Enumerate_DirectSound" -gt 1; then abort "Patchset dxdiagn-Enumerate_DirectSound disabled, but dxdiagn-GetChildContainer_Leaf_Nodes depends on that." @@ -2380,186 +2357,6 @@ if test "$enable_dxdiagn_GetChildContainer_Leaf_Nodes" -eq 1; then patch_apply dxdiagn-GetChildContainer_Leaf_Nodes/0001-dxdiagn-Calling-GetChildContainer-with-an-empty-stri.patch fi -# Patchset ntdll-DOS_Attributes -# | -# | This patchset fixes the following Wine bugs: -# | * [#9158] Support for DOS hidden/system file attributes -# | * [#15679] cygwin symlinks not working in wine -# | -# | Modified files: -# | * configure.ac, dlls/ntdll/tests/directory.c, dlls/ntdll/tests/file.c, dlls/ntdll/unix/file.c -# | -if test "$enable_ntdll_DOS_Attributes" -eq 1; then - patch_apply ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-fd_-get.patch - patch_apply ntdll-DOS_Attributes/0003-ntdll-Implement-storing-DOS-attributes-in-NtSetInfor.patch - patch_apply ntdll-DOS_Attributes/0004-ntdll-Implement-storing-DOS-attributes-in-NtCreateFi.patch - patch_apply ntdll-DOS_Attributes/0005-libport-Add-support-for-Mac-OS-X-style-extended-attr.patch - patch_apply ntdll-DOS_Attributes/0006-libport-Add-support-for-FreeBSD-style-extended-attri.patch - patch_apply ntdll-DOS_Attributes/0007-ntdll-Perform-the-Unix-style-hidden-file-check-withi.patch - patch_apply ntdll-DOS_Attributes/0008-ntdll-Always-store-SAMBA_XATTR_DOS_ATTRIB-when-path-.patch -fi - -# Patchset ntdll-NtQueryEaFile -# | -# | Modified files: -# | * dlls/ntdll/tests/file.c, dlls/ntdll/unix/file.c -# | -if test "$enable_ntdll_NtQueryEaFile" -eq 1; then - patch_apply ntdll-NtQueryEaFile/0001-ntdll-Improve-stub-of-NtQueryEaFile.patch -fi - -# Patchset ntdll-Junction_Points -# | -# | This patchset has the following (direct or indirect) dependencies: -# | * ntdll-DOS_Attributes, ntdll-NtQueryEaFile -# | -# | This patchset fixes the following Wine bugs: -# | * [#12401] NET Framework 2.0, 3.0, 4.0 installers and other apps that make use of GAC API for managed assembly -# | installation on NTFS filesystems need reparse point/junction API support -# | (FSCTL_SET_REPARSE_POINT/FSCTL_GET_REPARSE_POINT) -# | * [#44948] Multiple apps (Spine (Mod starter for Gothic), MS Office 365 installer) need CreateSymbolicLinkW implementation -# | -# | Modified files: -# | * configure.ac, dlls/kernel32/path.c, dlls/kernel32/tests/path.c, dlls/kernelbase/file.c, dlls/msvcp120/tests/msvcp120.c, -# | dlls/msvcp140/tests/msvcp140.c, dlls/ntdll/tests/file.c, dlls/ntdll/unix/file.c, include/Makefile.in, include/ntifs.h, -# | include/winternl.h, programs/cmd/builtins.c, programs/cmd/directory.c, server/fd.c, server/protocol.def -# | -if test "$enable_ntdll_Junction_Points" -eq 1; then - patch_apply ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch - patch_apply ntdll-Junction_Points/0002-ntdll-Add-support-for-reading-junction-points.patch - patch_apply ntdll-Junction_Points/0003-ntdll-Add-support-for-deleting-junction-points.patch - patch_apply ntdll-Junction_Points/0004-ntdll-Add-a-test-for-junction-point-advertisement.patch - patch_apply ntdll-Junction_Points/0005-server-Add-support-for-deleting-junction-points-with.patch - patch_apply ntdll-Junction_Points/0007-ntdll-Add-support-for-absolute-symlink-creation.patch - patch_apply ntdll-Junction_Points/0008-ntdll-Add-support-for-reading-absolute-symlinks.patch - patch_apply ntdll-Junction_Points/0009-ntdll-Add-support-for-deleting-symlinks.patch - patch_apply ntdll-Junction_Points/0010-ntdll-Add-support-for-relative-symlink-creation.patch - patch_apply ntdll-Junction_Points/0011-ntdll-Add-support-for-reading-relative-symlinks.patch - patch_apply ntdll-Junction_Points/0012-ntdll-Add-support-for-file-symlinks.patch - patch_apply ntdll-Junction_Points/0013-ntdll-Allow-creation-of-dangling-reparse-points-to-n.patch - patch_apply ntdll-Junction_Points/0014-ntdll-Correctly-report-file-symbolic-links-as-files.patch - patch_apply ntdll-Junction_Points/0015-kernel32-Set-error-code-when-attempting-to-delete-fi.patch - patch_apply ntdll-Junction_Points/0016-server-Properly-handle-file-symlink-deletion.patch - patch_apply ntdll-Junction_Points/0017-ntdll-Always-report-symbolic-links-as-containing-zer.patch - patch_apply ntdll-Junction_Points/0018-ntdll-Find-dangling-symlinks-quickly.patch - patch_apply ntdll-Junction_Points/0019-kernel32-Implement-CreateSymbolicLink-A-W-with-ntdll.patch - patch_apply ntdll-Junction_Points/0020-kernel32-Add-reparse-support-to-FindNextFile.patch - patch_apply ntdll-Junction_Points/0021-wcmd-Display-reparse-point-type-in-directory-listing.patch - patch_apply ntdll-Junction_Points/0022-wcmd-Show-reparse-point-target-in-directory-listing.patch - patch_apply ntdll-Junction_Points/0023-wcmd-Add-junction-point-support-to-mklink.patch - patch_apply ntdll-Junction_Points/0024-server-Fix-obtaining-information-about-a-symlink.patch -fi - -# Patchset server-PeekMessage -# | -# | This patchset fixes the following Wine bugs: -# | * [#28884] GetMessage should remove already seen messages with higher priority -# | -# | Modified files: -# | * dlls/user32/tests/msg.c, server/queue.c -# | -if test "$enable_server_PeekMessage" -eq 1; then - patch_apply server-PeekMessage/0001-server-Fix-handling-of-GetMessage-after-previous-Pee.patch -fi - -# Patchset server-Realtime_Priority -# | -# | Modified files: -# | * server/Makefile.in, server/main.c, server/scheduler.c, server/thread.c, server/thread.h -# | -if test "$enable_server_Realtime_Priority" -eq 1; then - patch_apply server-Realtime_Priority/0001-wineserver-Draft-to-implement-priority-levels-throug.patch -fi - -# Patchset server-Signal_Thread -# | -# | Modified files: -# | * server/thread.c, server/thread.h -# | -if test "$enable_server_Signal_Thread" -eq 1; then - patch_apply server-Signal_Thread/0001-server-Do-not-signal-thread-until-it-is-really-gone.patch -fi - -# Patchset eventfd_synchronization -# | -# | This patchset has the following (direct or indirect) dependencies: -# | * ntdll-DOS_Attributes, ntdll-NtQueryEaFile, ntdll-Junction_Points, server-PeekMessage, server-Realtime_Priority, server- -# | Signal_Thread -# | -# | This patchset fixes the following Wine bugs: -# | * [#36692] Many multi-threaded applications have poor performance due to heavy use of synchronization primitives -# | -# | Modified files: -# | * README.esync, configure, configure.ac, dlls/kernel32/tests/sync.c, dlls/ntdll/Makefile.in, dlls/ntdll/unix/esync.c, -# | dlls/ntdll/unix/esync.h, dlls/ntdll/unix/loader.c, dlls/ntdll/unix/server.c, dlls/ntdll/unix/sync.c, -# | dlls/ntdll/unix/unix_private.h, dlls/ntdll/unix/virtual.c, dlls/rpcrt4/rpc_server.c, include/config.h.in, -# | server/Makefile.in, server/async.c, server/atom.c, server/change.c, server/clipboard.c, server/completion.c, -# | server/console.c, server/debugger.c, server/device.c, server/directory.c, server/esync.c, server/esync.h, -# | server/event.c, server/fd.c, server/file.c, server/file.h, server/handle.c, server/hook.c, server/mailslot.c, -# | server/main.c, server/mapping.c, server/mutex.c, server/named_pipe.c, server/object.h, server/process.c, -# | server/process.h, server/protocol.def, server/queue.c, server/registry.c, server/request.c, server/semaphore.c, -# | server/serial.c, server/signal.c, server/sock.c, server/symlink.c, server/thread.c, server/thread.h, server/timer.c, -# | server/token.c, server/winstation.c -# | -if test "$enable_eventfd_synchronization" -eq 1; then - patch_apply eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch - patch_apply eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch - patch_apply eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch - patch_apply eventfd_synchronization/0004-ntdll-Implement-NtReleaseSemaphore.patch - patch_apply eventfd_synchronization/0005-ntdll-Implement-NtClose.patch - patch_apply eventfd_synchronization/0006-ntdll-Implement-NtWaitForMultipleObjects.patch - patch_apply eventfd_synchronization/0007-ntdll-server-Implement-NtCreateEvent.patch - patch_apply eventfd_synchronization/0008-ntdll-Implement-NtSetEvent.patch - patch_apply eventfd_synchronization/0009-ntdll-Implement-NtResetEvent.patch - patch_apply eventfd_synchronization/0010-ntdll-Implement-waiting-on-manual-reset-events.patch - patch_apply eventfd_synchronization/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch - patch_apply eventfd_synchronization/0012-server-Add-a-request-to-get-the-eventfd-file-descrip.patch - patch_apply eventfd_synchronization/0013-server-Create-eventfd-file-descriptors-for-process-o.patch - patch_apply eventfd_synchronization/0014-ntdll-server-Implement-waiting-on-server-bound-objec.patch - patch_apply eventfd_synchronization/0015-server-Create-eventfd-file-descriptors-for-event-obj.patch - patch_apply eventfd_synchronization/0016-server-Allow-re-setting-esync-events-on-the-server-s.patch - patch_apply eventfd_synchronization/0017-ntdll-Try-again-if-poll-returns-EINTR.patch - patch_apply eventfd_synchronization/0018-server-Create-eventfd-file-descriptors-for-thread-ob.patch - patch_apply eventfd_synchronization/0019-rpcrt4-Avoid-closing-the-server-thread-handle-while-.patch - patch_apply eventfd_synchronization/0020-server-Create-eventfd-file-descriptors-for-message-q.patch - patch_apply eventfd_synchronization/0021-server-ntdll-Implement-message-waits.patch - patch_apply eventfd_synchronization/0022-server-Create-eventfd-descriptors-for-device-manager.patch - patch_apply eventfd_synchronization/0023-ntdll-server-Implement-NtCreateMutant.patch - patch_apply eventfd_synchronization/0024-ntdll-Implement-NtReleaseMutant.patch - patch_apply eventfd_synchronization/0025-ntdll-Implement-waiting-on-mutexes.patch - patch_apply eventfd_synchronization/0026-ntdll-Implement-wait-all.patch - patch_apply eventfd_synchronization/0027-esync-Add-a-README.patch - patch_apply eventfd_synchronization/0028-ntdll-Implement-NtSignalAndWaitForSingleObject.patch - patch_apply eventfd_synchronization/0029-ntdll-Implement-NtOpenSemaphore.patch - patch_apply eventfd_synchronization/0030-ntdll-Implement-NtOpenEvent.patch - patch_apply eventfd_synchronization/0031-ntdll-Implement-NtOpenMutant.patch - patch_apply eventfd_synchronization/0032-server-Implement-esync_map_access.patch - patch_apply eventfd_synchronization/0033-server-Implement-NtDuplicateObject.patch - patch_apply eventfd_synchronization/0034-server-Create-eventfd-descriptors-for-timers.patch - patch_apply eventfd_synchronization/0035-ntdll-server-Implement-alertable-waits.patch - patch_apply eventfd_synchronization/0036-esync-Update-README.patch - patch_apply eventfd_synchronization/0037-kernel32-tests-Mark-some-existing-tests-as-failing-u.patch - patch_apply eventfd_synchronization/0038-kernel32-tests-Add-some-semaphore-tests.patch - patch_apply eventfd_synchronization/0039-kernel32-tests-Add-some-event-tests.patch - patch_apply eventfd_synchronization/0040-kernel32-tests-Add-some-mutex-tests.patch - patch_apply eventfd_synchronization/0041-kernel32-tests-Add-some-tests-for-wait-timeouts.patch - patch_apply eventfd_synchronization/0042-kernel32-tests-Zigzag-test.patch - patch_apply eventfd_synchronization/0043-ntdll-Implement-NtQuerySemaphore.patch - patch_apply eventfd_synchronization/0044-ntdll-Implement-NtQueryEvent.patch - patch_apply eventfd_synchronization/0045-ntdll-Implement-NtQueryMutant.patch - patch_apply eventfd_synchronization/0046-server-Create-eventfd-descriptors-for-pseudo-fd-obje.patch - patch_apply eventfd_synchronization/0047-esync-Update-README.patch - patch_apply eventfd_synchronization/0048-esync-Add-note-about-file-limits-not-being-raised-wh.patch - patch_apply eventfd_synchronization/0049-ntdll-Try-to-avoid-poll-for-uncontended-objects.patch - patch_apply eventfd_synchronization/0050-ntdll-server-Try-to-avoid-poll-for-signaled-events.patch - patch_apply eventfd_synchronization/0051-esync-Update-README.patch - patch_apply eventfd_synchronization/0052-ntdll-Implement-NtPulseEvent.patch - patch_apply eventfd_synchronization/0053-esync-Update-README.patch - patch_apply eventfd_synchronization/0054-server-Create-esync-file-descriptors-for-true-file-o.patch - patch_apply eventfd_synchronization/0055-ntdll-server-Abandon-esync-mutexes-on-thread-exit.patch - patch_apply eventfd_synchronization/0056-server-Create-esync-file-descriptors-for-console-ser.patch -fi - # Patchset explorer-Video_Registry_Key # | # | Modified files: @@ -3069,6 +2866,25 @@ if test "$enable_ntdll_CriticalSection" -eq 1; then patch_apply ntdll-CriticalSection/0004-ntdll-Use-fast-CS-functions-for-threadpool-locking.patch fi +# Patchset ntdll-DOS_Attributes +# | +# | This patchset fixes the following Wine bugs: +# | * [#9158] Support for DOS hidden/system file attributes +# | * [#15679] cygwin symlinks not working in wine +# | +# | Modified files: +# | * configure.ac, dlls/ntdll/tests/directory.c, dlls/ntdll/tests/file.c, dlls/ntdll/unix/file.c +# | +if test "$enable_ntdll_DOS_Attributes" -eq 1; then + patch_apply ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-fd_-get.patch + patch_apply ntdll-DOS_Attributes/0003-ntdll-Implement-storing-DOS-attributes-in-NtSetInfor.patch + patch_apply ntdll-DOS_Attributes/0004-ntdll-Implement-storing-DOS-attributes-in-NtCreateFi.patch + patch_apply ntdll-DOS_Attributes/0005-libport-Add-support-for-Mac-OS-X-style-extended-attr.patch + patch_apply ntdll-DOS_Attributes/0006-libport-Add-support-for-FreeBSD-style-extended-attri.patch + patch_apply ntdll-DOS_Attributes/0007-ntdll-Perform-the-Unix-style-hidden-file-check-withi.patch + patch_apply ntdll-DOS_Attributes/0008-ntdll-Always-store-SAMBA_XATTR_DOS_ATTRIB-when-path-.patch +fi + # Patchset ntdll-Dealloc_Thread_Stack # | # | Modified files: @@ -3146,6 +2962,57 @@ if test "$enable_ntdll_Interrupt_0x2e" -eq 1; then patch_apply ntdll-Interrupt-0x2e/0001-ntdll-Catch-windows-int-0x2e-syscall-on-i386.patch fi +# Patchset ntdll-NtQueryEaFile +# | +# | Modified files: +# | * dlls/ntdll/tests/file.c, dlls/ntdll/unix/file.c +# | +if test "$enable_ntdll_NtQueryEaFile" -eq 1; then + patch_apply ntdll-NtQueryEaFile/0001-ntdll-Improve-stub-of-NtQueryEaFile.patch +fi + +# Patchset ntdll-Junction_Points +# | +# | This patchset has the following (direct or indirect) dependencies: +# | * ntdll-DOS_Attributes, ntdll-NtQueryEaFile +# | +# | This patchset fixes the following Wine bugs: +# | * [#12401] NET Framework 2.0, 3.0, 4.0 installers and other apps that make use of GAC API for managed assembly +# | installation on NTFS filesystems need reparse point/junction API support +# | (FSCTL_SET_REPARSE_POINT/FSCTL_GET_REPARSE_POINT) +# | * [#44948] Multiple apps (Spine (Mod starter for Gothic), MS Office 365 installer) need CreateSymbolicLinkW implementation +# | +# | Modified files: +# | * configure.ac, dlls/kernel32/path.c, dlls/kernel32/tests/path.c, dlls/kernelbase/file.c, dlls/msvcp120/tests/msvcp120.c, +# | dlls/msvcp140/tests/msvcp140.c, dlls/ntdll/tests/file.c, dlls/ntdll/unix/file.c, include/Makefile.in, include/ntifs.h, +# | include/winternl.h, programs/cmd/builtins.c, programs/cmd/directory.c, server/fd.c, server/protocol.def +# | +if test "$enable_ntdll_Junction_Points" -eq 1; then + patch_apply ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch + patch_apply ntdll-Junction_Points/0002-ntdll-Add-support-for-reading-junction-points.patch + patch_apply ntdll-Junction_Points/0003-ntdll-Add-support-for-deleting-junction-points.patch + patch_apply ntdll-Junction_Points/0004-ntdll-Add-a-test-for-junction-point-advertisement.patch + patch_apply ntdll-Junction_Points/0005-server-Add-support-for-deleting-junction-points-with.patch + patch_apply ntdll-Junction_Points/0007-ntdll-Add-support-for-absolute-symlink-creation.patch + patch_apply ntdll-Junction_Points/0008-ntdll-Add-support-for-reading-absolute-symlinks.patch + patch_apply ntdll-Junction_Points/0009-ntdll-Add-support-for-deleting-symlinks.patch + patch_apply ntdll-Junction_Points/0010-ntdll-Add-support-for-relative-symlink-creation.patch + patch_apply ntdll-Junction_Points/0011-ntdll-Add-support-for-reading-relative-symlinks.patch + patch_apply ntdll-Junction_Points/0012-ntdll-Add-support-for-file-symlinks.patch + patch_apply ntdll-Junction_Points/0013-ntdll-Allow-creation-of-dangling-reparse-points-to-n.patch + patch_apply ntdll-Junction_Points/0014-ntdll-Correctly-report-file-symbolic-links-as-files.patch + patch_apply ntdll-Junction_Points/0015-kernel32-Set-error-code-when-attempting-to-delete-fi.patch + patch_apply ntdll-Junction_Points/0016-server-Properly-handle-file-symlink-deletion.patch + patch_apply ntdll-Junction_Points/0017-ntdll-Always-report-symbolic-links-as-containing-zer.patch + patch_apply ntdll-Junction_Points/0018-ntdll-Find-dangling-symlinks-quickly.patch + patch_apply ntdll-Junction_Points/0019-kernel32-Implement-CreateSymbolicLink-A-W-with-ntdll.patch + patch_apply ntdll-Junction_Points/0020-kernel32-Add-reparse-support-to-FindNextFile.patch + patch_apply ntdll-Junction_Points/0021-wcmd-Display-reparse-point-type-in-directory-listing.patch + patch_apply ntdll-Junction_Points/0022-wcmd-Show-reparse-point-target-in-directory-listing.patch + patch_apply ntdll-Junction_Points/0023-wcmd-Add-junction-point-support-to-mklink.patch + patch_apply ntdll-Junction_Points/0024-server-Fix-obtaining-information-about-a-symlink.patch +fi + # Patchset ntdll-Manifest_Range # | # | This patchset fixes the following Wine bugs: @@ -3665,6 +3532,27 @@ if test "$enable_server_Object_Types" -eq 1; then patch_apply server-Object_Types/0010-ntdll-Mimic-object-type-behavior-for-different-windo.patch fi +# Patchset server-PeekMessage +# | +# | This patchset fixes the following Wine bugs: +# | * [#28884] GetMessage should remove already seen messages with higher priority +# | +# | Modified files: +# | * dlls/user32/tests/msg.c, server/queue.c +# | +if test "$enable_server_PeekMessage" -eq 1; then + patch_apply server-PeekMessage/0001-server-Fix-handling-of-GetMessage-after-previous-Pee.patch +fi + +# Patchset server-Realtime_Priority +# | +# | Modified files: +# | * server/Makefile.in, server/main.c, server/scheduler.c, server/thread.c, server/thread.h +# | +if test "$enable_server_Realtime_Priority" -eq 1; then + patch_apply server-Realtime_Priority/0001-wineserver-Draft-to-implement-priority-levels-throug.patch +fi + # Patchset server-Registry_Notifications # | # | Modified files: @@ -3675,6 +3563,15 @@ if test "$enable_server_Registry_Notifications" -eq 1; then patch_apply server-Registry_Notifications/0002-server-Introduce-refcounting-for-registry-notificati.patch fi +# Patchset server-Signal_Thread +# | +# | Modified files: +# | * server/thread.c, server/thread.h +# | +if test "$enable_server_Signal_Thread" -eq 1; then + patch_apply server-Signal_Thread/0001-server-Do-not-signal-thread-until-it-is-really-gone.patch +fi + # Patchset setupapi-DiskSpaceList # | # | Modified files: diff --git a/patches/winemenubuilder-integration/0001-winemenubuilder-Blacklist-desktop-integration-for-ce.patch b/patches/winemenubuilder-integration/0001-winemenubuilder-Blacklist-desktop-integration-for-ce.patch index 74e96b29..f6661234 100644 --- a/patches/winemenubuilder-integration/0001-winemenubuilder-Blacklist-desktop-integration-for-ce.patch +++ b/patches/winemenubuilder-integration/0001-winemenubuilder-Blacklist-desktop-integration-for-ce.patch @@ -1,4 +1,4 @@ -From 823ca34bded08b0a861641ba317400b5d8a47a50 Mon Sep 17 00:00:00 2001 +From be95736e06aba40bd61378be249c238ff3dcadb9 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Sun, 1 Mar 2020 17:58:12 -0700 Subject: [PATCH] winemenubuilder: Blacklist desktop integration for certain @@ -65,10 +65,10 @@ index 4a650b444fc..548739f4326 100644 ;; PS HKCR,"MIME\Database\Content Type\application/postscript","Extension",,".ps" diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index badbd9b4b5a..4784533301b 100644 +index 2759854396d..e867df57a22 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in -@@ -506,6 +506,16 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1 +@@ -514,6 +514,16 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1 HKCR,MIME\Database\Charset\visual,"AliasForCharset",,iso-8859-8 HKCR,MIME\Database\Charset\Windows-1254,"AliasForCharset",,iso-8859-9 @@ -86,7 +86,7 @@ index badbd9b4b5a..4784533301b 100644 HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}" HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"StemmerClass",,"" diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c -index 65fbecca526..28e86565c06 100644 +index 6545dabd668..405ce7942dc 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2479,7 +2479,7 @@ static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const ch @@ -168,7 +168,7 @@ index 65fbecca526..28e86565c06 100644 - executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, openW); if (executableW) - openWithIconA = extract_icon(executableW, 0, NULL, FALSE); + openWithIconA = compute_native_identifier(0, executableW); -- -2.27.0 +2.28.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index 556f9ae4..f4f638bc 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -1f15ddce9c7d0ee71521d7b98c698488b76d3f01 +cf49617c1a378dd4a37ab7226187708c501b046f