Rebase against adde9fadebe07c30ecc9f12685751fb78b3473c5.

[server-BaseNamedObjects]
Removed patch to provide symlink to BaseNamedObjects in \Sessions\1 (accepted
upstream).
This commit is contained in:
Sebastian Lackner
2016-07-18 20:02:57 +02:00
parent 6455c8e654
commit 5125d3edeb
4 changed files with 9 additions and 137 deletions

View File

@@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "fec0b697c74a8e016b41968b342f9fc9fe11bf74"
echo "adde9fadebe07c30ecc9f12685751fb78b3473c5"
}
# Show version information
@@ -271,7 +271,6 @@ patch_enable_all ()
enable_rpcrt4_Pipe_Transport="$1"
enable_rpcrt4_RpcBindingServerFromClient="$1"
enable_secur32_Zero_Buffer_Length="$1"
enable_server_BaseNamedObjects="$1"
enable_server_ClipCursor="$1"
enable_server_CreateProcess_ACLs="$1"
enable_server_Desktop_Refcount="$1"
@@ -989,9 +988,6 @@ patch_enable ()
secur32-Zero_Buffer_Length)
enable_secur32_Zero_Buffer_Length="$2"
;;
server-BaseNamedObjects)
enable_server_BaseNamedObjects="$2"
;;
server-ClipCursor)
enable_server_ClipCursor="$2"
;;
@@ -5809,21 +5805,6 @@ if test "$enable_secur32_Zero_Buffer_Length" -eq 1; then
) >> "$patchlist"
fi
# Patchset server-BaseNamedObjects
# |
# | This patchset fixes the following Wine bugs:
# | * [#40875] Provide symlink to BaseNamedObjects in \Sessions\1
# |
# | Modified files:
# | * server/directory.c
# |
if test "$enable_server_BaseNamedObjects" -eq 1; then
patch_apply server-BaseNamedObjects/0001-server-Move-the-BaseNamedObjects-symlink-in-Sessions.patch
(
echo '+ { "Piotr Chruściel", "server: Move the \\\\BaseNamedObjects symlink in \\\\Sessions\\\\0 to \\\\Sessions\\\\1\\\\BaseNamedObjects.", 1 },';
) >> "$patchlist"
fi
# Patchset server-ClipCursor
# |
# | This patchset fixes the following Wine bugs: