diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index a9da2681..ef96ad75 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "594e431e36d65e470bcbe930eb3d0f2bbca17736" + echo "9fea10cceb0fbc0cf3111f462c98f7b994d5c893" } # Show version information diff --git a/patches/shell32-NewMenu_Interface/0001-shell32-Implement-NewMenu-with-new-folder-item.patch b/patches/shell32-NewMenu_Interface/0001-shell32-Implement-NewMenu-with-new-folder-item.patch index a057d85b..1dd78949 100644 --- a/patches/shell32-NewMenu_Interface/0001-shell32-Implement-NewMenu-with-new-folder-item.patch +++ b/patches/shell32-NewMenu_Interface/0001-shell32-Implement-NewMenu-with-new-folder-item.patch @@ -1,4 +1,4 @@ -From 9601c7ebe3adaef521073e4b5ab7728d9da3c8f7 Mon Sep 17 00:00:00 2001 +From 229c08d829424f218cb09b0b6e9cc8c2d8489359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 16 Aug 2015 17:34:22 +0200 Subject: [PATCH] shell32: Implement NewMenu with new folder item. @@ -21,10 +21,10 @@ Correct header issue when compiling i386 (var_arg) create mode 100644 dlls/shell32/shellnew.c diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in -index 04dd196cfe8..072d98b5fba 100644 +index bb03300f9c9..c52017a7490 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in -@@ -33,6 +33,7 @@ C_SRCS = \ +@@ -29,6 +29,7 @@ C_SRCS = \ shelldispatch.c \ shellitem.c \ shelllink.c \ @@ -49,7 +49,7 @@ index 22ef49ae5c7..699ad1a2f03 100644 threading(apartment), uuid(00bb2763-6a77-11d0-a535-00c04fd7d062) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h -index b98629298aa..d684d8759a7 100644 +index 388f6ace073..8a1bca0fa7c 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -102,6 +102,7 @@ HRESULT WINAPI RecycleBin_Constructor(IUnknown * pUnkOuter, REFIID riif, LPVOID @@ -564,7 +564,7 @@ index 00000000000..04d718f0f0d + return hr; +} diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c -index d1f1afc3780..e521b7e8f70 100644 +index 5b72fecf07e..fc29a73fbb7 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -73,6 +73,7 @@ static const struct { @@ -576,18 +576,18 @@ index d1f1afc3780..e521b7e8f70 100644 {&CLSID_QueryAssociations, QueryAssociations_Constructor}, {&CLSID_RecycleBin, RecycleBin_Constructor}, diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c -index f5d96c8d441..dbb24d93564 100644 +index 48ba72a4c0e..dbb24d93564 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1479,7 +1479,6 @@ static void test_newmenu(void) HRESULT hr; hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); --todo_wine +- todo_wine ok(hr == S_OK, "Failed to create NewMenu object, hr %#x.\n", hr); if (hr != S_OK) { -@@ -1491,6 +1490,14 @@ todo_wine +@@ -1491,6 +1490,14 @@ static void test_newmenu(void) ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); IUnknown_Release(unk2); @@ -603,5 +603,5 @@ index f5d96c8d441..dbb24d93564 100644 ok(hr == S_OK, "Failed to get IContextMenu3, hr %#x.\n", hr); IUnknown_Release(unk2); -- -2.33.0 +2.34.1 diff --git a/patches/ws2_32-SIO_IDEAL_SEND_BACKLOG_QUERY/0001-ws2_32-Return-a-valid-value-for-WSAIoctl-SIO_IDEAL_S.patch b/patches/ws2_32-SIO_IDEAL_SEND_BACKLOG_QUERY/0001-ws2_32-Return-a-valid-value-for-WSAIoctl-SIO_IDEAL_S.patch index d3d5f7fa..6340ec77 100644 --- a/patches/ws2_32-SIO_IDEAL_SEND_BACKLOG_QUERY/0001-ws2_32-Return-a-valid-value-for-WSAIoctl-SIO_IDEAL_S.patch +++ b/patches/ws2_32-SIO_IDEAL_SEND_BACKLOG_QUERY/0001-ws2_32-Return-a-valid-value-for-WSAIoctl-SIO_IDEAL_S.patch @@ -1,4 +1,4 @@ -From e09f13e07463f2009f7705f0fe6f4a4c15b9876b Mon Sep 17 00:00:00 2001 +From 3026d7b28f8c3647593895e605c2beecbd1aad6e Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 15 Sep 2020 19:44:38 +1000 Subject: [PATCH] ws2_32: Return a valid value for WSAIoctl @@ -6,25 +6,22 @@ Subject: [PATCH] ws2_32: Return a valid value for WSAIoctl Signed-off-by: Alistair Leslie-Hughes --- - dlls/ntdll/unix/socket.c | 22 ++++++++++++++++++++++ + dlls/ntdll/unix/socket.c | 19 +++++++++++++++++++ dlls/ws2_32/socket.c | 17 +++++++++++++++++ dlls/ws2_32/tests/sock.c | 13 ++++++++++++- include/wine/afd.h | 1 + - 4 files changed, 52 insertions(+), 1 deletion(-) + 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c -index 71dfcdd1114..cf52e53a236 100644 +index 71dfcdd1114..2111e9e12ff 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c -@@ -1422,6 +1422,28 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc +@@ -1422,6 +1422,25 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return STATUS_SUCCESS; } + case IOCTL_AFD_WINE_SEND_BACKLOG_QUERY: + { -+ if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) -+ return status; -+ + if (out_size < sizeof(DWORD)) + { + status = STATUS_BUFFER_TOO_SMALL; @@ -74,7 +71,7 @@ index fe7e4fb3464..9c133e94e60 100644 { DWORD ret; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c -index 054e597b719..35102265cbf 100644 +index b38357954b7..89a86cc3aa4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6065,8 +6065,9 @@ static void test_WSASendTo(void) diff --git a/staging/upstream-commit b/staging/upstream-commit index f86f3175..15ff28dc 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -85cb1ff91ed4d48559c5500e2ccb0b15801edc05 +9fea10cceb0fbc0cf3111f462c98f7b994d5c893