Rebase against 876742bf2bf23765cd8a845a20b297cdf7803c67.

patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch

@@ -1,4 +1,4 @@
-From 3069c254173b551cde229830af857fc5e3abd911 Mon Sep 17 00:00:00 2001
+From d3262875b2ce7d2a6746f2139ca00e3d0f13fb33 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 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 f4e454ae217..de28e5228e9 100644
+index 3be31e40cf6..0a2cdc0dfcd 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -464,6 +464,7 @@ AC_CHECK_HEADERS(\
+@@ -453,6 +453,7 @@ AC_CHECK_HEADERS(\
  	sys/cdio.h \
  	sys/epoll.h \
  	sys/event.h \
@@ -23,7 +23,7 @@ index f4e454ae217..de28e5228e9 100644
  	sys/extattr.h \
  	sys/filio.h \
  	sys/ipc.h \
-@@ -2044,6 +2045,7 @@ AC_CHECK_FUNCS(\
+@@ -2024,6 +2025,7 @@ AC_CHECK_FUNCS(\
  	port_create \
  	posix_fadvise \
  	posix_fallocate \
@@ -31,7 +31,7 @@ index f4e454ae217..de28e5228e9 100644
  	prctl \
  	proc_pidinfo \
  	sched_yield \
-@@ -2085,6 +2087,12 @@ case $host_os in
+@@ -2049,6 +2051,12 @@ case $host_os in
      ;;
  esac
  
@@ -45,10 +45,10 @@ index f4e454ae217..de28e5228e9 100644
                  AC_LINK_IFELSE([AC_LANG_PROGRAM(
  [[#include <sched.h>]], [[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 509dd2869bf..d6b19f96a9c 100644
+index fe2fc36a914..8e8c57d711c 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -335,6 +335,9 @@
+@@ -309,6 +309,9 @@
  /* Define to 1 if you have the `posix_fallocate' function. */
  #undef HAVE_POSIX_FALLOCATE
  
@@ -58,17 +58,17 @@ index 509dd2869bf..d6b19f96a9c 100644
  /* Define to 1 if you have the `prctl' function. */
  #undef HAVE_PRCTL
  
-@@ -404,6 +407,9 @@
+@@ -375,6 +378,9 @@
  /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
  #undef HAVE_SG_IO_HDR_T_INTERFACE_ID
  
 +/* Define to 1 if you have the `shm_open' function. */
 +#undef HAVE_SHM_OPEN
 +
- /* Define if sigaddset is supported */
- #undef HAVE_SIGADDSET
+ /* Define to 1 if `si_fd' is a member of `siginfo_t'. */
+ #undef HAVE_SIGINFO_T_SI_FD
  
-@@ -553,6 +559,9 @@
+@@ -510,6 +516,9 @@
  /* Define to 1 if you have the <sys/epoll.h> header file. */
  #undef HAVE_SYS_EPOLL_H
  
@@ -79,5 +79,5 @@ index 509dd2869bf..d6b19f96a9c 100644
  #undef HAVE_SYS_EVENT_H
  
 -- 
-2.38.1
+2.39.0
 

patches/msxml3-FreeThreadedXMLHTTP60/0004-include-Add-_XHR-enum-values.patch

@@ -1,37 +0,0 @@
-From 5aa6c213ced971079f236acfe25437f5d49cebbf Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 10 Jan 2023 16:22:14 +1100
-Subject: [PATCH 1/4] include: Add _XHR enum values
-
----
- include/msxml6.idl | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/include/msxml6.idl b/include/msxml6.idl
-index 4672ae80626..aa03a8a310a 100644
---- a/include/msxml6.idl
-+++ b/include/msxml6.idl
-@@ -256,6 +256,20 @@ typedef enum _SCHEMATYPEVARIETY
- } SCHEMATYPEVARIETY;
- cpp_quote("#endif /* __msxml_som_enums__ */")
- 
-+typedef [v1_enum] enum _XHR_CRED_PROMPT
-+{
-+    XHR_CRED_PROMPT_ALL   = 0x0,
-+    XHR_CRED_PROMPT_NONE  = 0x1,
-+    XHR_CRED_PROMPT_PROXY = 0x2,
-+} XHR_CRED_PROMPT;
-+
-+typedef [v1_enum] enum _XHR_AUTH
-+{
-+    XHR_AUTH_ALL   = 0x0,
-+    XHR_AUTH_NONE  = 0x1,
-+    XHR_AUTH_PROXY = 0x2,
-+} XHR_AUTH;
-+
- typedef [v1_enum] enum _XHR_PROPERTY
- {
-     XHR_PROP_NO_CRED_PROMPT,
--- 
-2.39.0
-

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "be57ebe01581f709b0e52a29304668eaaf6f0634"
+	echo "876742bf2bf23765cd8a845a20b297cdf7803c67"
 }
 
 # Show version information
@@ -2046,7 +2046,6 @@ fi
 if test "$enable_msxml3_FreeThreadedXMLHTTP60" -eq 1; then
 	patch_apply msxml3-FreeThreadedXMLHTTP60/0001-include-Remove-interfaces-already-define-in-msxml6.i.patch
 	patch_apply msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch
-	patch_apply msxml3-FreeThreadedXMLHTTP60/0004-include-Add-_XHR-enum-values.patch
 	patch_apply msxml3-FreeThreadedXMLHTTP60/0005-msxml3-Implement-IXMLHTTPRequest3-SetProperty.patch
 	patch_apply msxml3-FreeThreadedXMLHTTP60/0006-msxml3-Copy-body-size-to-request-object.patch
 	patch_apply msxml3-FreeThreadedXMLHTTP60/0007-msxml3-Correct-xml_http_request_2_GetResponseHeader.patch

staging/upstream-commit

@@ -1 +1 @@
-be57ebe01581f709b0e52a29304668eaaf6f0634
+876742bf2bf23765cd8a845a20b297cdf7803c67