From c85282650705cfb7eacc58b09302597e715e6e79 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 13 Jul 2017 01:42:44 +0200 Subject: [PATCH] Rebase against 989a9dc91778c94d0cf0c769709f10dcc92a5ead. --- patches/patchinstall.sh | 53 +------------------ ...call-RegCloseKey-on-uninitialized-me.patch | 25 --------- ...ve-dead-code-in-read_attribute_value.patch | 28 ---------- ...n-size-when-calling-WSAIoctl-with-WS.patch | 47 ---------------- patches/ws2_32-WSAIoctl/definition | 1 - 5 files changed, 1 insertion(+), 153 deletions(-) delete mode 100644 patches/reg-Tests/0001-reg-tests-Don-t-call-RegCloseKey-on-uninitialized-me.patch delete mode 100644 patches/webservices-Dead_Code/0001-webservices-Remove-dead-code-in-read_attribute_value.patch delete mode 100644 patches/ws2_32-WSAIoctl/0001-ws2_32-Set-return-size-when-calling-WSAIoctl-with-WS.patch delete mode 100644 patches/ws2_32-WSAIoctl/definition diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 063fafaf..1df19c90 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "437c6674b06663908472d31ed68fcab6e2fdd5f7" + echo "989a9dc91778c94d0cf0c769709f10dcc92a5ead" } # Show version information @@ -313,7 +313,6 @@ patch_enable_all () enable_opengl32_glDebugMessageCallback="$1" enable_quartz_MediaSeeking_Positions="$1" enable_quartz_Silence_FIXMEs="$1" - enable_reg_Tests="$1" enable_riched20_Class_Tests="$1" enable_riched20_IText_Interface="$1" enable_secur32_Zero_Buffer_Length="$1" @@ -407,7 +406,6 @@ patch_enable_all () enable_wbemdisp_ISWbemSecurity="$1" enable_wbemprox_Printer="$1" enable_wbemprox_Win32_VideoController="$1" - enable_webservices_Dead_Code="$1" enable_wevtapi_EvtNext="$1" enable_widl_SLTG_Typelib_Support="$1" enable_windowscodecs_32bppGrayFloat="$1" @@ -487,7 +485,6 @@ patch_enable_all () enable_ws2_32_Tests="$1" enable_ws2_32_TransmitFile="$1" enable_ws2_32_WSACleanup="$1" - enable_ws2_32_WSAIoctl="$1" enable_ws2_32_WriteWatches="$1" enable_ws2_32_getsockopt="$1" enable_wtsapi32_EnumerateProcesses="$1" @@ -1195,9 +1192,6 @@ patch_enable () quartz-Silence_FIXMEs) enable_quartz_Silence_FIXMEs="$2" ;; - reg-Tests) - enable_reg_Tests="$2" - ;; riched20-Class_Tests) enable_riched20_Class_Tests="$2" ;; @@ -1477,9 +1471,6 @@ patch_enable () wbemprox-Win32_VideoController) enable_wbemprox_Win32_VideoController="$2" ;; - webservices-Dead_Code) - enable_webservices_Dead_Code="$2" - ;; wevtapi-EvtNext) enable_wevtapi_EvtNext="$2" ;; @@ -1717,9 +1708,6 @@ patch_enable () ws2_32-WSACleanup) enable_ws2_32_WSACleanup="$2" ;; - ws2_32-WSAIoctl) - enable_ws2_32_WSAIoctl="$2" - ;; ws2_32-WriteWatches) enable_ws2_32_WriteWatches="$2" ;; @@ -7040,18 +7028,6 @@ if test "$enable_quartz_Silence_FIXMEs" -eq 1; then ) >> "$patchlist" fi -# Patchset reg-Tests -# | -# | Modified files: -# | * programs/reg/tests/reg.c -# | -if test "$enable_reg_Tests" -eq 1; then - patch_apply reg-Tests/0001-reg-tests-Don-t-call-RegCloseKey-on-uninitialized-me.patch - ( - printf '%s\n' '+ { "Sebastian Lackner", "reg/tests: Don'\''t call RegCloseKey on uninitialized memory.", 1 },'; - ) >> "$patchlist" -fi - # Patchset riched20-Class_Tests # | # | Modified files: @@ -8630,18 +8606,6 @@ if test "$enable_wbemprox_Win32_VideoController" -eq 1; then ) >> "$patchlist" fi -# Patchset webservices-Dead_Code -# | -# | Modified files: -# | * dlls/webservices/reader.c -# | -if test "$enable_webservices_Dead_Code" -eq 1; then - patch_apply webservices-Dead_Code/0001-webservices-Remove-dead-code-in-read_attribute_value.patch - ( - printf '%s\n' '+ { "Sebastian Lackner", "webservices: Remove dead code in read_attribute_value_bin.", 1 },'; - ) >> "$patchlist" -fi - # Patchset wevtapi-EvtNext # | # | This patchset fixes the following Wine bugs: @@ -9960,21 +9924,6 @@ if test "$enable_ws2_32_WSACleanup" -eq 1; then ) >> "$patchlist" fi -# Patchset ws2_32-WSAIoctl -# | -# | This patchset fixes the following Wine bugs: -# | * [#43315] Set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER -# | -# | Modified files: -# | * dlls/ws2_32/socket.c, dlls/ws2_32/tests/sock.c -# | -if test "$enable_ws2_32_WSAIoctl" -eq 1; then - patch_apply ws2_32-WSAIoctl/0001-ws2_32-Set-return-size-when-calling-WSAIoctl-with-WS.patch - ( - printf '%s\n' '+ { "Kimmo Myllyvirta", "ws2_32: Set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ws2_32-getsockopt # | # | This patchset fixes the following Wine bugs: diff --git a/patches/reg-Tests/0001-reg-tests-Don-t-call-RegCloseKey-on-uninitialized-me.patch b/patches/reg-Tests/0001-reg-tests-Don-t-call-RegCloseKey-on-uninitialized-me.patch deleted file mode 100644 index bcfc30c3..00000000 --- a/patches/reg-Tests/0001-reg-tests-Don-t-call-RegCloseKey-on-uninitialized-me.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0d627c069b85cfcf18429e349b6a4166bd646451 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sun, 9 Jul 2017 15:59:59 +0200 -Subject: reg/tests: Don't call RegCloseKey on uninitialized memory. - ---- - programs/reg/tests/reg.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c -index af092908cbc..941d3257c95 100644 ---- a/programs/reg/tests/reg.c -+++ b/programs/reg/tests/reg.c -@@ -793,7 +793,7 @@ static void test_import(void) - DWORD r, dword = 0x123, type, size; - char test1_reg[MAX_PATH], test2_reg[MAX_PATH], cmdline[MAX_PATH]; - char test_string[] = "Test string", buffer[24]; -- HKEY hkey, subkey; -+ HKEY hkey, subkey = NULL; - LONG err; - BYTE hex[8]; - --- -2.13.1 - diff --git a/patches/webservices-Dead_Code/0001-webservices-Remove-dead-code-in-read_attribute_value.patch b/patches/webservices-Dead_Code/0001-webservices-Remove-dead-code-in-read_attribute_value.patch deleted file mode 100644 index 917c623f..00000000 --- a/patches/webservices-Dead_Code/0001-webservices-Remove-dead-code-in-read_attribute_value.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 497be9c7987e7cd08a70cd33864729d06b8d1882 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Wed, 12 Jul 2017 05:26:04 +0200 -Subject: webservices: Remove dead code in read_attribute_value_bin. - ---- - dlls/webservices/reader.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c -index 5bc862e5bf1..b94c35947c4 100644 ---- a/dlls/webservices/reader.c -+++ b/dlls/webservices/reader.c -@@ -1582,11 +1582,6 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE - return WS_E_NOT_SUPPORTED; - } - -- if (type >= RECORD_INT8_TEXT && type <= RECORD_INT64_TEXT) -- { -- attr->value = &text_int64->text; -- return S_OK; -- } - if (type >= RECORD_BYTES8_TEXT && type <= RECORD_BYTES32_TEXT) - { - attr->value = &text_base64->text; --- -2.13.1 - diff --git a/patches/ws2_32-WSAIoctl/0001-ws2_32-Set-return-size-when-calling-WSAIoctl-with-WS.patch b/patches/ws2_32-WSAIoctl/0001-ws2_32-Set-return-size-when-calling-WSAIoctl-with-WS.patch deleted file mode 100644 index 95372532..00000000 --- a/patches/ws2_32-WSAIoctl/0001-ws2_32-Set-return-size-when-calling-WSAIoctl-with-WS.patch +++ /dev/null @@ -1,47 +0,0 @@ -From bc57f2c994179bbb3d0e8e2048b7b6011a84e3ab Mon Sep 17 00:00:00 2001 -From: Kimmo Myllyvirta -Date: Tue, 11 Jul 2017 11:42:06 +0200 -Subject: ws2_32: Set return size when calling WSAIoctl with - WS_SIO_GET_EXTENSION_FUNCTION_POINTER. - ---- - dlls/ws2_32/socket.c | 1 + - dlls/ws2_32/tests/sock.c | 3 +++ - 2 files changed, 4 insertions(+) - -diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c -index 48d8f61553d..fac47d78527 100644 ---- a/dlls/ws2_32/socket.c -+++ b/dlls/ws2_32/socket.c -@@ -4985,6 +4985,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID - { - TRACE("-> got %s\n", guid_funcs[i].name); - *(void **)out_buff = guid_funcs[i].func_ptr; -+ total = sizeof(void *); - break; - } - -diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c -index c66d0d9ccd9..91f2525c174 100644 ---- a/dlls/ws2_32/tests/sock.c -+++ b/dlls/ws2_32/tests/sock.c -@@ -7704,6 +7704,7 @@ static void test_ConnectEx(void) - goto end; - } - -+ bytesReturned = 0xdeadbeef; - iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectExGuid, sizeof(connectExGuid), - &pConnectEx, sizeof(pConnectEx), &bytesReturned, NULL, NULL); - if (iret) { -@@ -7711,6 +7712,8 @@ static void test_ConnectEx(void) - goto end; - } - -+ ok(bytesReturned == sizeof(pConnectEx), "expected sizeof(pConnectEx), got %u\n", bytesReturned); -+ - bret = pConnectEx(INVALID_SOCKET, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "ConnectEx on invalid socket " - "returned %d + errno %d\n", bret, WSAGetLastError()); --- -2.13.1 - diff --git a/patches/ws2_32-WSAIoctl/definition b/patches/ws2_32-WSAIoctl/definition deleted file mode 100644 index 62ea77e6..00000000 --- a/patches/ws2_32-WSAIoctl/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [43315] Set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER