From 8a5220955b9400ed9d66c522d7d2b0b7bd02485e Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 16 Nov 2022 10:25:40 +1100 Subject: [PATCH] Rebase against 623bc9fa54311d941d09760dc5300697ba11debe. --- ...d-implicit-cast-of-interface-pointer.patch | 32 +++++++++---------- ...for-sys-eventfd.h-ppoll-and-shm_open.patch | 26 +++++++-------- patches/patchinstall.sh | 2 +- ...pt-Support-VT_BSTR-VT_ARRAY-Iterator.patch | 14 ++++---- staging/upstream-commit | 2 +- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch b/patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch index 308db3a0..83eb1b5e 100644 --- a/patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch +++ b/patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch @@ -1,4 +1,4 @@ -From 92914d4648be5dd7ee62b35d3ca2fc7376d0dbd0 Mon Sep 17 00:00:00 2001 +From 4edf58f26172ec7f931eab57d14aca564d8b58e3 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 22 Mar 2016 21:54:26 +0100 Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer. @@ -13,10 +13,10 @@ Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer. 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c -index 971e3c7ff6b..fcd96eb6374 100644 +index 1cba26f5ca4..df88fb70469 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c -@@ -646,5 +646,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) +@@ -762,5 +762,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) if (!iface) return NULL; assert(iface->lpVtbl == (ID2D1BitmapVtbl *)&d2d_bitmap_vtbl); @@ -24,7 +24,7 @@ index 971e3c7ff6b..fcd96eb6374 100644 + return CONTAINING_RECORD((ID2D1Bitmap1*)iface, struct d2d_bitmap, ID2D1Bitmap1_iface); } diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c -index b9a673fe54c..c5a52db6b01 100644 +index 98aa889aa5f..52fc0a9854a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -259,7 +259,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, @@ -64,7 +64,7 @@ index b9a673fe54c..c5a52db6b01 100644 static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush1 *iface, diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c -index e7e0fa57ed7..1166ae204c2 100644 +index 30eafe361d1..0a38aa8613a 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -77,10 +77,10 @@ index e7e0fa57ed7..1166ae204c2 100644 static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c -index e97bae0b54a..661387b570b 100644 +index d6ee91de005..781e9aa8511 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c -@@ -3356,7 +3356,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = +@@ -3360,7 +3360,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = static inline struct d2d_geometry *impl_from_ID2D1PathGeometry1(ID2D1PathGeometry1 *iface) { @@ -89,7 +89,7 @@ index e97bae0b54a..661387b570b 100644 } static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry1 *iface, REFIID iid, void **out) -@@ -4229,7 +4229,7 @@ fail: +@@ -4233,7 +4233,7 @@ fail: static inline struct d2d_geometry *impl_from_ID2D1RectangleGeometry(ID2D1RectangleGeometry *iface) { @@ -98,7 +98,7 @@ index e97bae0b54a..661387b570b 100644 } static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_QueryInterface(ID2D1RectangleGeometry *iface, -@@ -4941,7 +4941,7 @@ fail: +@@ -4945,7 +4945,7 @@ fail: static inline struct d2d_geometry *impl_from_ID2D1TransformedGeometry(ID2D1TransformedGeometry *iface) { @@ -107,7 +107,7 @@ index e97bae0b54a..661387b570b 100644 } static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_QueryInterface(ID2D1TransformedGeometry *iface, -@@ -5225,7 +5225,7 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * +@@ -5229,7 +5229,7 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * static inline struct d2d_geometry *impl_from_ID2D1GeometryGroup(ID2D1GeometryGroup *iface) { @@ -117,7 +117,7 @@ index e97bae0b54a..661387b570b 100644 static HRESULT STDMETHODCALLTYPE d2d_geometry_group_QueryInterface(ID2D1GeometryGroup *iface, diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c -index 4ce220bf433..32eeaf02c9f 100644 +index 4d3fe43a1b3..ccb7067fabf 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -130,16 +130,16 @@ index 4ce220bf433..32eeaf02c9f 100644 static HRESULT d2d_hwnd_render_target_present(IUnknown *outer_unknown) diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c -index 114a3efd883..4f662be4549 100644 +index 770c165fd90..a3b48095436 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c -@@ -187,5 +187,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat - if (!iface) +@@ -191,5 +191,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat + WARN("Unexpected state block vtbl %p.\n", iface->lpVtbl); return NULL; - assert(iface->lpVtbl == (ID2D1DrawingStateBlockVtbl *)&d2d_state_block_vtbl); + } - return CONTAINING_RECORD(iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface); + return CONTAINING_RECORD((ID2D1DrawingStateBlock1*)iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface); } -- -2.35.1 +2.38.1 diff --git a/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch b/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch index 614f2c4e..c76a831a 100644 --- a/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch +++ b/patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch @@ -1,4 +1,4 @@ -From f2fe168b2ca8099c7afd06873ec77daef2ddf243 Mon Sep 17 00:00:00 2001 +From 3069c254173b551cde229830af857fc5e3abd911 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 13 Jun 2018 10:44:49 -0500 Subject: [PATCH] configure: Check for sys/eventfd.h, ppoll(), and shm_open(). @@ -12,10 +12,10 @@ Although perhaps we shouldn't since the server doesn't do this. 2 files changed, 17 insertions(+) diff --git a/configure.ac b/configure.ac -index fe6a773d1c3..3e8eaca6b7c 100644 +index f4e454ae217..de28e5228e9 100644 --- a/configure.ac +++ b/configure.ac -@@ -467,6 +467,7 @@ AC_CHECK_HEADERS(\ +@@ -464,6 +464,7 @@ AC_CHECK_HEADERS(\ sys/cdio.h \ sys/epoll.h \ sys/event.h \ @@ -23,7 +23,7 @@ index fe6a773d1c3..3e8eaca6b7c 100644 sys/extattr.h \ sys/filio.h \ sys/ipc.h \ -@@ -2039,6 +2040,7 @@ AC_CHECK_FUNCS(\ +@@ -2044,6 +2045,7 @@ AC_CHECK_FUNCS(\ port_create \ posix_fadvise \ posix_fallocate \ @@ -31,7 +31,7 @@ index fe6a773d1c3..3e8eaca6b7c 100644 prctl \ proc_pidinfo \ sched_yield \ -@@ -2078,6 +2080,12 @@ case $host_os in +@@ -2085,6 +2087,12 @@ case $host_os in ;; esac @@ -41,14 +41,14 @@ index fe6a773d1c3..3e8eaca6b7c 100644 + test "$ac_res" = "none required" || AC_SUBST(RT_LIBS,"$ac_res")]) +LIBS=$ac_save_LIBS + - dnl **** Check for OpenLDAP *** - if test "x$with_ldap" != "xno" - then + AC_CACHE_CHECK([for sched_setaffinity],wine_cv_have_sched_setaffinity, + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[#include ]], [[sched_setaffinity(0, 0, 0);]])],[wine_cv_have_sched_setaffinity=yes],[wine_cv_have_sched_setaffinity=no])) diff --git a/include/config.h.in b/include/config.h.in -index 3a06d36bd02..b29582c6029 100644 +index 509dd2869bf..d6b19f96a9c 100644 --- a/include/config.h.in +++ b/include/config.h.in -@@ -344,6 +344,9 @@ +@@ -335,6 +335,9 @@ /* Define to 1 if you have the `posix_fallocate' function. */ #undef HAVE_POSIX_FALLOCATE @@ -58,7 +58,7 @@ index 3a06d36bd02..b29582c6029 100644 /* Define to 1 if you have the `prctl' function. */ #undef HAVE_PRCTL -@@ -416,6 +419,9 @@ +@@ -404,6 +407,9 @@ /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */ #undef HAVE_SG_IO_HDR_T_INTERFACE_ID @@ -68,7 +68,7 @@ index 3a06d36bd02..b29582c6029 100644 /* Define if sigaddset is supported */ #undef HAVE_SIGADDSET -@@ -565,6 +571,9 @@ +@@ -553,6 +559,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_EPOLL_H @@ -79,5 +79,5 @@ index 3a06d36bd02..b29582c6029 100644 #undef HAVE_SYS_EVENT_H -- -2.35.1 +2.38.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index b518fbe9..f93bc774 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "a8c1d5c108fc57e4d78e9db126f395c89083a83d" + echo "623bc9fa54311d941d09760dc5300697ba11debe" } # Show version information diff --git a/patches/wbemdisp-ISWbemObject-Invoke/0002-vbscript-Support-VT_BSTR-VT_ARRAY-Iterator.patch b/patches/wbemdisp-ISWbemObject-Invoke/0002-vbscript-Support-VT_BSTR-VT_ARRAY-Iterator.patch index 07aada9f..19d58ed7 100644 --- a/patches/wbemdisp-ISWbemObject-Invoke/0002-vbscript-Support-VT_BSTR-VT_ARRAY-Iterator.patch +++ b/patches/wbemdisp-ISWbemObject-Invoke/0002-vbscript-Support-VT_BSTR-VT_ARRAY-Iterator.patch @@ -1,7 +1,7 @@ -From 74016f3aae967c669ee1cebdf4d1ebc15c3719b0 Mon Sep 17 00:00:00 2001 +From 8850da28b9f319acffafb09f660db62d37b3cf29 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 17 May 2021 18:18:44 +1000 -Subject: [PATCH 2/4] vbscript: Support VT_BSTR|VT_ARRAY Iterator +Subject: [PATCH] vbscript: Support VT_BSTR|VT_ARRAY Iterator This isn't correct and the patch 4 show that this is the case. @@ -15,10 +15,10 @@ Signed-off-by: Alistair Leslie-Hughes 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c -index 11d95e57758..35a6165a819 100644 +index 4cfe9596b0c..0117eedcb76 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c -@@ -1422,6 +1422,7 @@ static HRESULT interp_newenum(exec_ctx_t *ctx) +@@ -1456,6 +1456,7 @@ static HRESULT interp_newenum(exec_ctx_t *ctx) V_UNKNOWN(r) = (IUnknown*)iter; break; } @@ -27,7 +27,7 @@ index 11d95e57758..35a6165a819 100644 case VT_VARIANT|VT_ARRAY|VT_BYREF: { IEnumVARIANT *iter; diff --git a/dlls/vbscript/utils.c b/dlls/vbscript/utils.c -index d30842c52eb..c0b8b749038 100644 +index 03b1abde481..7350a822b37 100644 --- a/dlls/vbscript/utils.c +++ b/dlls/vbscript/utils.c @@ -106,11 +106,20 @@ static HRESULT WINAPI safearray_iter_IEnumVARIANT_Next(IEnumVARIANT *iface, @@ -65,9 +65,9 @@ index d30842c52eb..c0b8b749038 100644 - return E_NOTIMPL; - } - - iter = heap_alloc(sizeof(*iter)); + iter = malloc(sizeof(*iter)); if(!iter) return E_OUTOFMEMORY; -- -2.30.2 +2.38.1 diff --git a/staging/upstream-commit b/staging/upstream-commit index f450c63c..92083883 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -a8c1d5c108fc57e4d78e9db126f395c89083a83d +623bc9fa54311d941d09760dc5300697ba11debe