From b56e74f39d5cb7a1d5c54b82bb51602d9801294d Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 13 Oct 2018 18:01:42 +1100 Subject: [PATCH] Added kernel32-Disable-GetQueuedCompletionStatusEx patchset --- ...e-export-GetQueuedCompletionStatusEx.patch | 28 +++++++++++++++++++ .../definition | 1 + patches/patchinstall.sh | 21 +++++++++++++- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 patches/kernel32-Disable-GetQueuedCompletionStatusEx/0001-kernel32-Disable-export-GetQueuedCompletionStatusEx.patch create mode 100644 patches/kernel32-Disable-GetQueuedCompletionStatusEx/definition diff --git a/patches/kernel32-Disable-GetQueuedCompletionStatusEx/0001-kernel32-Disable-export-GetQueuedCompletionStatusEx.patch b/patches/kernel32-Disable-GetQueuedCompletionStatusEx/0001-kernel32-Disable-export-GetQueuedCompletionStatusEx.patch new file mode 100644 index 00000000..4742e65c --- /dev/null +++ b/patches/kernel32-Disable-GetQueuedCompletionStatusEx/0001-kernel32-Disable-export-GetQueuedCompletionStatusEx.patch @@ -0,0 +1,28 @@ +From 759be4301daf53d4746e3444f285bbcec5dc5eb3 Mon Sep 17 00:00:00 2001 +From: Alistair Leslie-Hughes +Date: Fri, 12 Oct 2018 13:27:00 +1100 +Subject: [PATCH] kernel32: Disable export GetQueuedCompletionStatusEx + +This is causing a regression with steam not being able to login. + +Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45948 +--- + dlls/kernel32/kernel32.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec +index e17ee97..0716854 100644 +--- a/dlls/kernel32/kernel32.spec ++++ b/dlls/kernel32/kernel32.spec +@@ -804,7 +804,7 @@ + @ stdcall GetProfileStringA(str str str ptr long) + @ stdcall GetProfileStringW(wstr wstr wstr ptr long) + @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) +-@ stdcall GetQueuedCompletionStatusEx(ptr ptr long ptr long long) ++#@ stdcall GetQueuedCompletionStatusEx(ptr ptr long ptr long long) + @ stub -i386 GetSLCallbackTarget + @ stub -i386 GetSLCallbackTemplate + @ stdcall GetShortPathNameA(str ptr long) +-- +1.9.1 + diff --git a/patches/kernel32-Disable-GetQueuedCompletionStatusEx/definition b/patches/kernel32-Disable-GetQueuedCompletionStatusEx/definition new file mode 100644 index 00000000..57252278 --- /dev/null +++ b/patches/kernel32-Disable-GetQueuedCompletionStatusEx/definition @@ -0,0 +1 @@ +Fixes: [45948] Disbale export GetQueuedCompletionStatusEx to stop regression with Steam. diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 4574cf15..1ed2aa8f 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "b0c5a77e26c51f60b7d5e4df557f969a044b7fd4" + echo "3f4455c0f043650151873d899e6f7526b994fa93" } # Show version information @@ -159,6 +159,7 @@ patch_enable_all () enable_iphlpapi_TCP_Table="$1" enable_kernel32_CopyFileEx="$1" enable_kernel32_Debugger="$1" + enable_kernel32_Disable_GetQueuedCompletionStatusEx="$1" enable_kernel32_FindFirstFile="$1" enable_kernel32_GetShortPathName="$1" enable_kernel32_Job_Tests="$1" @@ -642,6 +643,9 @@ patch_enable () kernel32-Debugger) enable_kernel32_Debugger="$2" ;; + kernel32-Disable-GetQueuedCompletionStatusEx) + enable_kernel32_Disable_GetQueuedCompletionStatusEx="$2" + ;; kernel32-FindFirstFile) enable_kernel32_FindFirstFile="$2" ;; @@ -3903,6 +3907,21 @@ if test "$enable_kernel32_Debugger" -eq 1; then ) >> "$patchlist" fi +# Patchset kernel32-Disable-GetQueuedCompletionStatusEx +# | +# | This patchset fixes the following Wine bugs: +# | * [#45948] Disbale export GetQueuedCompletionStatusEx to stop regression with Steam. +# | +# | Modified files: +# | * dlls/kernel32/kernel32.spec +# | +if test "$enable_kernel32_Disable_GetQueuedCompletionStatusEx" -eq 1; then + patch_apply kernel32-Disable-GetQueuedCompletionStatusEx/0001-kernel32-Disable-export-GetQueuedCompletionStatusEx.patch + ( + printf '%s\n' '+ { "Alistair Leslie-Hughes", "kernel32: Disable export GetQueuedCompletionStatusEx.", 1 },'; + ) >> "$patchlist" +fi + # Patchset kernel32-FindFirstFile # | # | This patchset fixes the following Wine bugs: