diff --git a/patches/Compiler_Warnings/0010-oleaut32-typelib.c-fix-cursor2-having-the-wrong-type.patch b/patches/Compiler_Warnings/0010-oleaut32-typelib.c-fix-cursor2-having-the-wrong-type.patch deleted file mode 100644 index 0f52e86c..00000000 --- a/patches/Compiler_Warnings/0010-oleaut32-typelib.c-fix-cursor2-having-the-wrong-type.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9d0f651d9cb5c3ae68810e37dd6030373c7aeab6 Mon Sep 17 00:00:00 2001 -From: Nils Kuhnhenn -Date: Wed, 24 Aug 2016 19:56:00 +0200 -Subject: oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro. - ---- - dlls/oleaut32/typelib.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c -index b9318fba423..5a6dad496ed 100644 ---- a/dlls/oleaut32/typelib.c -+++ b/dlls/oleaut32/typelib.c -@@ -4830,10 +4830,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) - if (!ref) - { - TLBImpLib *pImpLib, *pImpLibNext; -- TLBRefType *ref_type; -+ TLBRefType *ref_type, *ref_type_next; - TLBString *tlbstr, *tlbstr_next; - TLBGuid *tlbguid, *tlbguid_next; -- void *cursor2; - int i; - - /* remove cache entry */ -@@ -4883,7 +4882,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) - heap_free(pImpLib); - } - -- LIST_FOR_EACH_ENTRY_SAFE(ref_type, cursor2, &This->ref_list, TLBRefType, entry) -+ LIST_FOR_EACH_ENTRY_SAFE(ref_type, ref_type_next, &This->ref_list, TLBRefType, entry) - { - list_remove(&ref_type->entry); - heap_free(ref_type); --- -2.13.1 - diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 5f63c537..f06c4d9c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "c7f0777fc55229d910461a7a38e21f1e17c8913a" + echo "95a49bdce6cd5a35d5035456e576ab81239fb081" } # Show version information @@ -2704,9 +2704,9 @@ fi # | dlls/d3d9/tests/visual.c, dlls/d3d9/texture.c, dlls/ddraw/viewport.c, dlls/dsound/primary.c, dlls/dwrite/font.c, # | dlls/dwrite/layout.c, dlls/fusion/tests/asmenum.c, dlls/fusion/tests/asmname.c, dlls/gdiplus/image.c, # | dlls/kernel32/oldconfig.c, dlls/kernel32/tests/heap.c, dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, -# | dlls/ole32/storage32.h, dlls/oleaut32/oleaut.c, dlls/oleaut32/typelib.c, dlls/rpcrt4/cstub.c, dlls/rsaenh/rsaenh.c, -# | dlls/shell32/shfldr_fs.c, dlls/vbscript/vbdisp.c, dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, -# | dlls/ws2_32/tests/sock.c, include/wine/list.h, include/wine/rbtree.h, include/winnt.h, tools/makedep.c +# | dlls/ole32/storage32.h, dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c, dlls/rsaenh/rsaenh.c, dlls/shell32/shfldr_fs.c, +# | dlls/vbscript/vbdisp.c, dlls/winealsa.drv/mmdevdrv.c, dlls/wined3d/glsl_shader.c, dlls/ws2_32/tests/sock.c, +# | include/wine/list.h, include/wine/rbtree.h, include/winnt.h, tools/makedep.c # | if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch @@ -2717,7 +2717,6 @@ if test "$enable_Compiler_Warnings" -eq 1; then patch_apply Compiler_Warnings/0007-rsaenh-tests-Avoid-compiler-warnings-with-GCC-7.patch patch_apply Compiler_Warnings/0008-kernel32-Avoid-compiler-warnings-with-GCC-7.patch patch_apply Compiler_Warnings/0009-ws2_32-tests-Work-around-an-incorrect-detection-in-G.patch - patch_apply Compiler_Warnings/0010-oleaut32-typelib.c-fix-cursor2-having-the-wrong-type.patch patch_apply Compiler_Warnings/0011-gdiplus-Initialize-containers-list-in-GdipCloneImage.patch patch_apply Compiler_Warnings/0018-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch patch_apply Compiler_Warnings/0019-dsound-Avoid-implicit-cast-of-interface-pointer.patch @@ -2742,7 +2741,6 @@ if test "$enable_Compiler_Warnings" -eq 1; then printf '%s\n' '+ { "Sebastian Lackner", "rsaenh/tests: Avoid compiler warnings with GCC 7.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "kernel32: Avoid compiler warnings with GCC 7.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "ws2_32/tests: Work around an incorrect detection in GCC 7.", 1 },'; - printf '%s\n' '+ { "Nils Kuhnhenn", "oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "gdiplus: Initialize containers list in GdipCloneImage.", 1 },'; printf '%s\n' '+ { "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "dsound: Avoid implicit cast of interface pointer.", 1 },'; diff --git a/patches/ws2_32-TransmitFile/0001-ws2_32-Add-support-for-TF_DISCONNECT-to-TransmitFile.patch b/patches/ws2_32-TransmitFile/0001-ws2_32-Add-support-for-TF_DISCONNECT-to-TransmitFile.patch index 56a2b587..7eebe3fa 100644 --- a/patches/ws2_32-TransmitFile/0001-ws2_32-Add-support-for-TF_DISCONNECT-to-TransmitFile.patch +++ b/patches/ws2_32-TransmitFile/0001-ws2_32-Add-support-for-TF_DISCONNECT-to-TransmitFile.patch @@ -1,4 +1,4 @@ -From a30764f2b6ae3311242b881ecfaf5a243e3ac387 Mon Sep 17 00:00:00 2001 +From a6ac9b12f875e5ff57d4b837f66d1d62639fe93a Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Wed, 4 Mar 2015 13:16:20 -0700 Subject: ws2_32: Add support for TF_DISCONNECT to TransmitFile. @@ -9,10 +9,10 @@ Subject: ws2_32: Add support for TF_DISCONNECT to TransmitFile. 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c -index 4977bbfa592..ecec3dc5314 100644 +index bd080a0b16..eebf3e02eb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c -@@ -3032,7 +3032,16 @@ static NTSTATUS WS2_transmitfile_base( int fd, struct ws2_transmitfile_async *ws +@@ -3030,7 +3030,16 @@ static NTSTATUS WS2_transmitfile_base( int fd, struct ws2_transmitfile_async *ws return wsaErrStatus(); } @@ -30,15 +30,15 @@ index 4977bbfa592..ecec3dc5314 100644 } /*********************************************************************** -@@ -3069,6 +3078,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD +@@ -3066,6 +3075,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD LPOVERLAPPED overlapped, LPTRANSMIT_FILE_BUFFERS buffers, DWORD flags ) { + DWORD unsupported_flags = flags & ~(TF_DISCONNECT); union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = sizeof(uaddr); + socklen_t uaddrlen = sizeof(uaddr); struct ws2_transmitfile_async *wsa; -@@ -3090,8 +3100,8 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD +@@ -3087,8 +3097,8 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD WSASetLastError( WSAENOTCONN ); return FALSE; } @@ -50,10 +50,10 @@ index 4977bbfa592..ecec3dc5314 100644 if (h && GetFileType( h ) != FILE_TYPE_DISK) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c -index 720808887cf..2084dceb987 100644 +index 23464ac1f1..57e2dd97d9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c -@@ -8404,6 +8404,17 @@ static void test_TransmitFile(void) +@@ -8682,6 +8682,17 @@ static void test_TransmitFile(void) ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)) == 0, "TransmitFile footer buffer did not match!\n"); @@ -72,5 +72,5 @@ index 720808887cf..2084dceb987 100644 closesocket(client); client = socket(AF_INET, SOCK_DGRAM, 0); -- -2.11.0 +2.13.1 diff --git a/patches/ws2_32-TransmitFile/0002-ws2_32-Add-support-for-TF_REUSE_SOCKET-to-TransmitFi.patch b/patches/ws2_32-TransmitFile/0002-ws2_32-Add-support-for-TF_REUSE_SOCKET-to-TransmitFi.patch index 67e39fcc..3e46da4e 100644 --- a/patches/ws2_32-TransmitFile/0002-ws2_32-Add-support-for-TF_REUSE_SOCKET-to-TransmitFi.patch +++ b/patches/ws2_32-TransmitFile/0002-ws2_32-Add-support-for-TF_REUSE_SOCKET-to-TransmitFi.patch @@ -1,4 +1,4 @@ -From c9763b1c3d31bdf050339d03935c014ec187e9a4 Mon Sep 17 00:00:00 2001 +From 07fe34fdfb46c17db9aeb46c2ce44ba2a7db9698 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Thu, 16 Jan 2014 19:08:30 -0700 Subject: ws2_32: Add support for TF_REUSE_SOCKET to TransmitFile. @@ -12,10 +12,10 @@ Subject: ws2_32: Add support for TF_REUSE_SOCKET to TransmitFile. 5 files changed, 75 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c -index cb0e45d29d..22311e8694 100644 +index eebf3e02eb..da82a35740 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c -@@ -3019,6 +3019,17 @@ static NTSTATUS WS2_transmitfile_base( int fd, struct ws2_transmitfile_async *ws +@@ -3033,6 +3033,17 @@ static NTSTATUS WS2_transmitfile_base( int fd, struct ws2_transmitfile_async *ws if (status != STATUS_SUCCESS) return status; @@ -33,20 +33,20 @@ index cb0e45d29d..22311e8694 100644 if (wsa->flags & TF_DISCONNECT) { /* we can't use WS_closesocket because it modifies the last error */ -@@ -3061,7 +3072,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD +@@ -3075,7 +3086,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD LPOVERLAPPED overlapped, LPTRANSMIT_FILE_BUFFERS buffers, DWORD flags ) { - DWORD unsupported_flags = flags & ~(TF_DISCONNECT); + DWORD unsupported_flags = flags & ~(TF_DISCONNECT|TF_REUSE_SOCKET); union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = sizeof(uaddr); + socklen_t uaddrlen = sizeof(uaddr); struct ws2_transmitfile_async *wsa; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c -index 3c68cf597d..1f3d55d202 100644 +index 57e2dd97d9..d4f967df42 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c -@@ -8580,7 +8580,6 @@ static void test_TransmitFile(void) +@@ -8694,7 +8694,6 @@ static void test_TransmitFile(void) err, WSAENOTSOCK); /* Test TransmitFile with a UDP datagram socket */ @@ -67,10 +67,10 @@ index cf9adf57eb..2feb22466e 100644 #define FD_WINE_NONBLOCKING 0x20000000 #define FD_WINE_CONNECTED 0x40000000 diff --git a/server/protocol.def b/server/protocol.def -index 87285a4038..cf5f5376ca 100644 +index 1f88c6a5c8..e192011d46 100644 --- a/server/protocol.def +++ b/server/protocol.def -@@ -1299,6 +1299,12 @@ enum server_fd_type +@@ -1312,6 +1312,12 @@ enum server_fd_type @END @@ -196,5 +196,5 @@ index 1625ed3a42..076c606f5d 100644 DECL_HANDLER(set_socket_event) { -- -2.11.0 +2.13.1