From 9e1a4bdb736333f3b60f55c0f066a31c6beb2411 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Fri, 8 Oct 2021 18:19:30 -0500
Subject: [PATCH] Rebase against 7554bd4b41a1429517eb86fd20dbe813cdd0550a.

---
 patches/bcrypt-ECDHSecretAgreement/definition |   2 +
 ...for-sys-eventfd.h-ppoll-and-shm_open.patch |  24 +--
 ...eventfd-based-objects-for-semaphores.patch |  22 +--
 ...tated-Arc-ArcTo-Chord-and-Pie-drawin.patch |  37 ++---
 .../0002-gdi32-fix-for-rotated-ellipse.patch  |  18 +--
 patches/mfplat-reverts/definition             |   1 +
 patches/mfplat-streaming-support/definition   |   1 +
 ...-support-for-junction-point-creation.patch |   8 +-
 patches/patchinstall.sh                       | 137 +-----------------
 ...inet-Allow-up-to-4K-for-data-buffers.patch |  27 ----
 patches/wininet-handle-403-error/definition   |   2 -
 staging/upstream-commit                       |   2 +-
 12 files changed, 55 insertions(+), 226 deletions(-)
 delete mode 100644 patches/wininet-handle-403-error/0002-wininet-Allow-up-to-4K-for-data-buffers.patch
 delete mode 100644 patches/wininet-handle-403-error/definition

diff --git a/patches/bcrypt-ECDHSecretAgreement/definition b/patches/bcrypt-ECDHSecretAgreement/definition
index f5249a22..862b8b44 100644
--- a/patches/bcrypt-ECDHSecretAgreement/definition
+++ b/patches/bcrypt-ECDHSecretAgreement/definition
@@ -2,3 +2,5 @@ Fixes: [47699] Multiple games fail to connect to online services (missing BCrypt
 # Needs to be moved to the unix lib, but that's a nontrivial amount of work, and
 # using gcrypt is the wrong way forward (we should expose the missing APIs from
 # gnutls instead).
+# Temporarily disabled pending a rebase from author.
+Disabled: true
\ No newline at end of file
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 c9c5b7c5..08568f99 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 4b23aac811b441d63bc451bb2126d2da04734201 Mon Sep 17 00:00:00 2001
+From d6b29a6153e786ff7a79bdbb7c33977e19c6e267 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().
@@ -13,7 +13,7 @@ Although perhaps we shouldn't since the server doesn't do this.
  3 files changed, 89 insertions(+)
 
 diff --git a/configure b/configure
-index c99ee5858e7..e1cc8737eb1 100755
+index ec425d91f63..200b42b7fe7 100755
 --- a/configure
 +++ b/configure
 @@ -7525,6 +7525,7 @@ for ac_header in \
@@ -31,8 +31,8 @@ index c99ee5858e7..e1cc8737eb1 100755
 +	ppoll \
  	prctl \
  	proc_pidinfo \
- 	sched_yield \
-@@ -18257,6 +18259,72 @@ fi
+ 	setproctitle \
+@@ -18255,6 +18257,72 @@ fi
      ;;
  esac
  
@@ -106,10 +106,10 @@ index c99ee5858e7..e1cc8737eb1 100755
  then
          if ${LDAP_CFLAGS:+false} :; then :
 diff --git a/configure.ac b/configure.ac
-index bf9e8103606..adddfacc6fd 100644
+index 718ab1ca50e..d5f82ad2af4 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -498,6 +498,7 @@ AC_CHECK_HEADERS(\
+@@ -496,6 +496,7 @@ AC_CHECK_HEADERS(\
  	sys/cdio.h \
  	sys/epoll.h \
  	sys/event.h \
@@ -117,7 +117,7 @@ index bf9e8103606..adddfacc6fd 100644
  	sys/filio.h \
  	sys/ioctl.h \
  	sys/ipc.h \
-@@ -2173,6 +2174,7 @@ AC_CHECK_FUNCS(\
+@@ -2158,6 +2159,7 @@ AC_CHECK_FUNCS(\
  	port_create \
  	posix_fadvise \
  	posix_fallocate \
@@ -125,7 +125,7 @@ index bf9e8103606..adddfacc6fd 100644
  	prctl \
  	proc_pidinfo \
  	renameat \
-@@ -2215,6 +2217,16 @@ case $host_os in
+@@ -2199,6 +2201,16 @@ case $host_os in
      ;;
  esac
  
@@ -143,10 +143,10 @@ index bf9e8103606..adddfacc6fd 100644
  if test "x$with_ldap" != "xno"
  then
 diff --git a/include/config.h.in b/include/config.h.in
-index fc3749895a3..608a255f1f7 100644
+index e975ca8a55d..a19789dad8c 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -486,6 +486,9 @@
+@@ -474,6 +474,9 @@
  /* Define to 1 if you have the `posix_fallocate' function. */
  #undef HAVE_POSIX_FALLOCATE
  
@@ -156,7 +156,7 @@ index fc3749895a3..608a255f1f7 100644
  /* Define to 1 if you have the `prctl' function. */
  #undef HAVE_PRCTL
  
-@@ -561,6 +564,9 @@
+@@ -546,6 +549,9 @@
  /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
  #undef HAVE_SG_IO_HDR_T_INTERFACE_ID
  
@@ -166,7 +166,7 @@ index fc3749895a3..608a255f1f7 100644
  /* Define if sigaddset is supported */
  #undef HAVE_SIGADDSET
  
-@@ -716,6 +722,9 @@
+@@ -695,6 +701,9 @@
  /* Define to 1 if you have the <sys/epoll.h> header file. */
  #undef HAVE_SYS_EPOLL_H
  
diff --git a/patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch b/patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch
index 2b6223af..0d157bbe 100644
--- a/patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch
+++ b/patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch
@@ -1,4 +1,4 @@
-From 402e89a3813766ac3ba38525b52e9c5a42a92eee Mon Sep 17 00:00:00 2001
+From b569bf796e685232a6858b1daa2950408c422adf Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 12:09:22 -0500
 Subject: [PATCH] ntdll: Create eventfd-based objects for semaphores.
@@ -16,7 +16,7 @@ Subject: [PATCH] ntdll: Create eventfd-based objects for semaphores.
  create mode 100644 dlls/ntdll/unix/esync.h
 
 diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
-index 6dfe2eb12f9..d86dafbddf9 100644
+index aac7f8eead7..7ea80f19481 100644
 --- a/dlls/ntdll/Makefile.in
 +++ b/dlls/ntdll/Makefile.in
 @@ -45,6 +45,7 @@ C_SRCS = \
@@ -348,7 +348,7 @@ index 00000000000..a50a755149a
 +
 +extern int receive_fd( obj_handle_t *handle ) DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
-index 1830c4fb392..8ae1a7548bf 100644
+index dfc0d4c9a09..310556948aa 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
 @@ -86,6 +86,7 @@
@@ -359,7 +359,7 @@ index 1830c4fb392..8ae1a7548bf 100644
  #include "wine/list.h"
  #include "wine/debug.h"
  
-@@ -1867,6 +1868,7 @@ static void start_main_thread(void)
+@@ -2190,6 +2191,7 @@ static void start_main_thread(void)
      signal_init_thread( teb );
      dbg_init();
      startup_info_size = server_init_process();
@@ -368,7 +368,7 @@ index 1830c4fb392..8ae1a7548bf 100644
      init_cpu_info();
      init_files();
 diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
-index cec2ef250a3..a5e9eff6f96 100644
+index 53d34e1858a..43b470fc10a 100644
 --- a/dlls/ntdll/unix/server.c
 +++ b/dlls/ntdll/unix/server.c
 @@ -114,7 +114,7 @@ timeout_t server_start_time = 0;  /* time of server startup */
@@ -380,7 +380,7 @@ index cec2ef250a3..a5e9eff6f96 100644
  
  /* atomically exchange a 64-bit value */
  static inline LONG64 interlocked_xchg64( LONG64 *dest, LONG64 val )
-@@ -821,7 +821,7 @@ void wine_server_send_fd( int fd )
+@@ -828,7 +828,7 @@ void wine_server_send_fd( int fd )
   *
   * Receive a file descriptor passed from the server.
   */
@@ -390,18 +390,18 @@ index cec2ef250a3..a5e9eff6f96 100644
      struct iovec vec;
      struct msghdr msghdr;
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index 16635ee42fa..2c795ea5ee8 100644
+index 86a836a908f..871fe7fb42e 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -72,6 +72,7 @@
- #include "wine/exception.h"
+@@ -71,6 +71,7 @@
+ #include "wine/server.h"
  #include "wine/debug.h"
  #include "unix_private.h"
 +#include "esync.h"
  
  WINE_DEFAULT_DEBUG_CHANNEL(sync);
  
-@@ -322,6 +323,9 @@ NTSTATUS WINAPI NtCreateSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJ
+@@ -324,6 +325,9 @@ NTSTATUS WINAPI NtCreateSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJ
      if (max <= 0 || initial < 0 || initial > max) return STATUS_INVALID_PARAMETER;
      if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret;
  
@@ -424,5 +424,5 @@ index a571855c70a..e41bbbf9349 100644
  int do_esync(void)
  {
 -- 
-2.30.2
+2.33.0
 
diff --git a/patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch b/patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch
index e374ec41..ffeba63a 100644
--- a/patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch
+++ b/patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch
@@ -1,4 +1,4 @@
-From 16e4ec7b0a93b164e54a6665af39a25def99bfc8 Mon Sep 17 00:00:00 2001
+From dc2aaa6a25ebccc30c7903fa68235d5971f8d6b8 Mon Sep 17 00:00:00 2001
 From: Daniel Wendt <daniel.wendt@linux.com>
 Date: Fri, 15 Nov 2013 12:52:37 +0100
 Subject: [PATCH] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing
@@ -6,22 +6,21 @@ Subject: [PATCH] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing
 
 Wine-Bug: http://bugs.winehq.org/show_bug.cgi?id=34579
 ---
- dlls/gdi32/dibdrv/graphics.c | 80 ++++++++++++++++++++++++++++++++++++
- dlls/gdi32/gdi_private.h     |  3 ++
- 2 files changed, 83 insertions(+)
+ dlls/win32u/dibdrv/graphics.c | 80 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 80 insertions(+)
 
-diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c
-index 875ae308546..ea03cac886f 100644
---- a/dlls/gdi32/dibdrv/graphics.c
-+++ b/dlls/gdi32/dibdrv/graphics.c
-@@ -316,6 +316,60 @@ static int get_arc_points( int arc_dir, const RECT *rect, POINT start, POINT end
+diff --git a/dlls/win32u/dibdrv/graphics.c b/dlls/win32u/dibdrv/graphics.c
+index 410f29e8f19..3a6f8184009 100644
+--- a/dlls/win32u/dibdrv/graphics.c
++++ b/dlls/win32u/dibdrv/graphics.c
+@@ -310,6 +310,60 @@ static int get_arc_points( int arc_dir, const RECT *rect, POINT start, POINT end
      return pos - count;
  }
  
 +/*
 + Check if matrix has uniform scale and shear and contains a rotation.
 +*/
-+BOOL xform_has_rotate_and_uniform_scale_and_shear( const XFORM *xform )
++static BOOL xform_has_rotate_and_uniform_scale_and_shear( const XFORM *xform )
 +{
 +    return xform->eM21 != 0 && xform->eM11 == xform->eM22 && -xform->eM21 == xform->eM12;
 +}
@@ -35,7 +34,7 @@ index 875ae308546..ea03cac886f 100644
 +       which has to be checked by a call to xform_has_rotate_and_uniform_scale_and_shear().
 +       Hints how to get unique values for non-uniform matrixes are welcome.
 +*/
-+BOOL xform_decompose_rotation_and_translation( XFORM *xform, XFORM *rotation_and_translation )
++static BOOL xform_decompose_rotation_and_translation( XFORM *xform, XFORM *rotation_and_translation )
 +{
 +    XFORM inverse_matrix_scale;
 +    XFORM origin_matrix = *xform;
@@ -75,7 +74,7 @@ index 875ae308546..ea03cac886f 100644
  /* backend for arc functions; extra_lines is -1 for ArcTo, 0 for Arc, 1 for Chord, 2 for Pie */
  static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
                        INT start_x, INT start_y, INT end_x, INT end_y, INT extra_lines )
-@@ -328,6 +382,22 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
+@@ -322,6 +376,22 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
      BOOL ret = TRUE;
      HRGN outline = 0, interior = 0;
  
@@ -98,7 +97,7 @@ index 875ae308546..ea03cac886f 100644
      if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE;
  
      width = rect.right - rect.left;
-@@ -361,6 +431,16 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
+@@ -355,6 +425,16 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
          points[count].y = rect.top + height / 2;
          count++;
      }
@@ -115,18 +114,6 @@ index 875ae308546..ea03cac886f 100644
      if (count < 2)
      {
          free( points );
-diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
-index 45bd5431a23..3f04d02f7a1 100644
---- a/dlls/gdi32/gdi_private.h
-+++ b/dlls/gdi32/gdi_private.h
-@@ -303,4 +303,7 @@ static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse )
- 
- extern HMODULE gdi32_module DECLSPEC_HIDDEN;
- 
-+BOOL xform_has_rotate_and_uniform_scale_and_shear( const XFORM *xform ) DECLSPEC_HIDDEN;
-+BOOL xform_decompose_rotation_and_translation( XFORM *xform, XFORM *rotation_and_translation ) DECLSPEC_HIDDEN;
-+
- #endif /* __WINE_GDI_PRIVATE_H */
 -- 
 2.33.0
 
diff --git a/patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch b/patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch
index 714bf249..5ddeda0c 100644
--- a/patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch
+++ b/patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch
@@ -1,18 +1,18 @@
-From f678f5184cb4eef1ab47a4f8b4949c83f1af9791 Mon Sep 17 00:00:00 2001
+From 5dcb80fe0d35101804bb978e507e6db361a949af Mon Sep 17 00:00:00 2001
 From: Daniel Wendt <daniel.wendt@linux.com>
 Date: Tue, 10 Dec 2013 14:55:32 +0100
 Subject: [PATCH] gdi32: fix for rotated ellipse
 
 Bug: http://bugs.winehq.org/show_bug.cgi?id=35331
 ---
- dlls/gdi32/dibdrv/graphics.c | 60 +++++++++++++++++++++++++-----------
+ dlls/win32u/dibdrv/graphics.c | 60 ++++++++++++++++++++++++-----------
  1 file changed, 42 insertions(+), 18 deletions(-)
 
-diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c
-index ea03cac886f..412d19249f0 100644
---- a/dlls/gdi32/dibdrv/graphics.c
-+++ b/dlls/gdi32/dibdrv/graphics.c
-@@ -1541,6 +1541,23 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
+diff --git a/dlls/win32u/dibdrv/graphics.c b/dlls/win32u/dibdrv/graphics.c
+index 3a6f8184009..b5231636261 100644
+--- a/dlls/win32u/dibdrv/graphics.c
++++ b/dlls/win32u/dibdrv/graphics.c
+@@ -1535,6 +1535,23 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
      BOOL ret = TRUE;
      HRGN outline = 0, interior = 0;
  
@@ -36,7 +36,7 @@ index ea03cac886f..412d19249f0 100644
      if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE;
  
      pt[0].x = pt[0].y = 0;
-@@ -1561,23 +1578,6 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
+@@ -1555,23 +1572,6 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
          return FALSE;
      }
  
@@ -60,7 +60,7 @@ index ea03cac886f..412d19249f0 100644
      count = ellipse_first_quadrant( ellipse_width, ellipse_height, points );
  
      if (dc->attr->arc_direction == AD_CLOCKWISE)
-@@ -1621,13 +1621,37 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
+@@ -1615,13 +1615,37 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
      }
      count = end + 1;
  
diff --git a/patches/mfplat-reverts/definition b/patches/mfplat-reverts/definition
index bc488b8a..0198aede 100644
--- a/patches/mfplat-reverts/definition
+++ b/patches/mfplat-reverts/definition
@@ -1,2 +1,3 @@
 # This is just a revert of update mfplat patches until it's new versions
 # of the mfplat have been merged upstream.
+Disabled: true
\ No newline at end of file
diff --git a/patches/mfplat-streaming-support/definition b/patches/mfplat-streaming-support/definition
index 9ca1daa3..2d66342c 100644
--- a/patches/mfplat-streaming-support/definition
+++ b/patches/mfplat-streaming-support/definition
@@ -1,2 +1,3 @@
 Fixes: [49692] Multiple applications need a Media Foundation media source implementation
 Depends: mfplat-reverts
+Disabled: true
\ No newline at end of file
diff --git a/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch b/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch
index b5101a66..7c9de096 100644
--- a/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch
+++ b/patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch
@@ -1,4 +1,4 @@
-From eb4503d43fbe4282eb8bf3036bc0a7a0f299691c Mon Sep 17 00:00:00 2001
+From 62fa6a8ef11039fa44cd668ab2fd9964741d5a2b Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Thu, 16 Jan 2014 20:56:49 -0700
 Subject: [PATCH] ntdll: Add support for junction point creation.
@@ -14,18 +14,18 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
  create mode 100644 include/ntifs.h
 
 diff --git a/configure.ac b/configure.ac
-index ecc9f1c8af5..2b68bdde1d2 100644
+index 9bf053ff39d..f7dc85cb13d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2175,6 +2175,8 @@ AC_CHECK_FUNCS(\
+@@ -2160,6 +2160,8 @@ AC_CHECK_FUNCS(\
  	posix_fallocate \
  	prctl \
  	proc_pidinfo \
 +	renameat \
 +	renameat2 \
- 	sched_yield \
  	setproctitle \
  	setprogname \
+ 	sigprocmask \
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
 index 46037546e6e..7a01e947e13 100644
 --- a/dlls/ntdll/tests/file.c
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index da94476f..7954365d 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "3660176e09bc02e71586b4cf42f58c9498481af6"
+	echo "5636088871714f2a2de9e543eb66f944ce188edc"
 }
 
 # Show version information
@@ -87,7 +87,6 @@ patch_enable_all ()
 	enable_Staging="$1"
 	enable_advapi32_LsaLookupPrivilegeName="$1"
 	enable_api_ms_win_Stub_DLLs="$1"
-	enable_bcrypt_ECDHSecretAgreement="$1"
 	enable_cmd_launch_association="$1"
 	enable_comctl32_rebar_capture="$1"
 	enable_comctl32_version_6="$1"
@@ -136,8 +135,6 @@ patch_enable_all ()
 	enable_krnl386_exe16_Invalid_Console_Handles="$1"
 	enable_libs_Unicode_Collation="$1"
 	enable_loader_KeyboardLayouts="$1"
-	enable_mfplat_reverts="$1"
-	enable_mfplat_streaming_support="$1"
 	enable_mmsystem_dll16_MIDIHDR_Refcount="$1"
 	enable_mountmgr_DosDevices="$1"
 	enable_mscoree_CorValidateImage="$1"
@@ -271,7 +268,6 @@ patch_enable_all ()
 	enable_winex11_wglShareLists="$1"
 	enable_winex11_drv_Query_server_position="$1"
 	enable_wininet_Cleanup="$1"
-	enable_wininet_handle_403_error="$1"
 	enable_winmm_mciSendCommandA="$1"
 	enable_wintab32_improvements="$1"
 	enable_wintrust_WTHelperGetProvCertFromChain="$1"
@@ -300,9 +296,6 @@ patch_enable ()
 		api-ms-win-Stub_DLLs)
 			enable_api_ms_win_Stub_DLLs="$2"
 			;;
-		bcrypt-ECDHSecretAgreement)
-			enable_bcrypt_ECDHSecretAgreement="$2"
-			;;
 		cmd-launch-association)
 			enable_cmd_launch_association="$2"
 			;;
@@ -447,12 +440,6 @@ patch_enable ()
 		loader-KeyboardLayouts)
 			enable_loader_KeyboardLayouts="$2"
 			;;
-		mfplat-reverts)
-			enable_mfplat_reverts="$2"
-			;;
-		mfplat-streaming-support)
-			enable_mfplat_streaming_support="$2"
-			;;
 		mmsystem.dll16-MIDIHDR_Refcount)
 			enable_mmsystem_dll16_MIDIHDR_Refcount="$2"
 			;;
@@ -852,9 +839,6 @@ patch_enable ()
 		wininet-Cleanup)
 			enable_wininet_Cleanup="$2"
 			;;
-		wininet-handle-403-error)
-			enable_wininet_handle_403_error="$2"
-			;;
 		winmm-mciSendCommandA)
 			enable_winmm_mciSendCommandA="$2"
 			;;
@@ -1343,13 +1327,6 @@ if test "$enable_ntdll_WRITECOPY" -eq 1; then
 	enable_ntdll_ForceBottomUpAlloc=1
 fi
 
-if test "$enable_mfplat_streaming_support" -eq 1; then
-	if test "$enable_mfplat_reverts" -gt 1; then
-		abort "Patchset mfplat-reverts disabled, but mfplat-streaming-support depends on that."
-	fi
-	enable_mfplat_reverts=1
-fi
-
 if test "$enable_imm32_com_initialization" -eq 1; then
 	if test "$enable_winex11__NET_ACTIVE_WINDOW" -gt 1; then
 		abort "Patchset winex11-_NET_ACTIVE_WINDOW disabled, but imm32-com-initialization depends on that."
@@ -1512,22 +1489,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
 	patch_apply api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch
 fi
 
-# Patchset bcrypt-ECDHSecretAgreement
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#47699] Multiple games fail to connect to online services (missing BCryptSecretAgreement / BCryptDeriveKey
-# | 	implementation)
-# |
-# | Modified files:
-# |   *	configure.ac, dlls/bcrypt/Makefile.in, dlls/bcrypt/bcrypt_internal.h, dlls/bcrypt/bcrypt_main.c, dlls/bcrypt/gcrypt.c,
-# | 	dlls/bcrypt/gnutls.c, dlls/bcrypt/tests/bcrypt.c, dlls/bcrypt/unixlib.c
-# |
-if test "$enable_bcrypt_ECDHSecretAgreement" -eq 1; then
-	patch_apply bcrypt-ECDHSecretAgreement/0001-bcrypt-Allow-multiple-backends-to-coexist.patch
-	patch_apply bcrypt-ECDHSecretAgreement/0002-bcrypt-Implement-BCryptSecretAgreement-with-libgcryp.patch
-	patch_apply bcrypt-ECDHSecretAgreement/0003-bcrypt-Implement-BCRYPT_KDF_HASH.patch
-fi
-
 # Patchset cmd-launch-association
 # |
 # | This patchset fixes the following Wine bugs:
@@ -2242,7 +2203,7 @@ fi
 # |   *	[#35331] gdi32: fix for rotated ellipse
 # |
 # | Modified files:
-# |   *	dlls/gdi32/dibdrv/graphics.c, dlls/gdi32/gdi_private.h
+# |   *	dlls/win32u/dibdrv/graphics.c
 # |
 if test "$enable_gdi32_rotation" -eq 1; then
 	patch_apply gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch
@@ -2423,88 +2384,6 @@ if test "$enable_loader_KeyboardLayouts" -eq 1; then
 	patch_apply loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch
 fi
 
-# Patchset mfplat-reverts
-# |
-# | Modified files:
-# |   *	dlls/winegstreamer/Makefile.in, dlls/winegstreamer/gst_private.h, dlls/winegstreamer/main.c,
-# | 	dlls/winegstreamer/media_source.c, dlls/winegstreamer/quartz_parser.c, dlls/winegstreamer/unixlib.h,
-# | 	dlls/winegstreamer/wg_parser.c
-# |
-if test "$enable_mfplat_reverts" -eq 1; then
-	patch_apply mfplat-reverts/0001-Revert-winegstreamer-Trace-the-unfiltered-caps-in-si.patch
-	patch_apply mfplat-reverts/0002-Revert-winegstreamer-Avoid-seeking-past-the-end-of-a.patch
-	patch_apply mfplat-reverts/0003-Revert-winegstreamer-Avoid-passing-a-NULL-buffer-to-.patch
-	patch_apply mfplat-reverts/0004-Revert-winegstreamer-Use-array_reserve-to-reallocate.patch
-	patch_apply mfplat-reverts/0005-Revert-winegstreamer-Handle-zero-length-reads-in-src.patch
-	patch_apply mfplat-reverts/0006-Revert-winegstreamer-Convert-the-Unix-library-to-the.patch
-	patch_apply mfplat-reverts/0007-Revert-winegstreamer-Return-void-from-wg_parser_stre.patch
-	patch_apply mfplat-reverts/0008-Revert-winegstreamer-Move-Unix-library-definitions-i.patch
-	patch_apply mfplat-reverts/0009-Revert-winegstreamer-Remove-the-no-longer-used-start.patch
-	patch_apply mfplat-reverts/0010-Revert-winegstreamer-Set-unlimited-buffering-using-a.patch
-	patch_apply mfplat-reverts/0011-Revert-winegstreamer-Initialize-GStreamer-in-wg_pars.patch
-	patch_apply mfplat-reverts/0012-Revert-winegstreamer-Use-a-single-wg_parser_create-e.patch
-	patch_apply mfplat-reverts/0013-Revert-winegstreamer-Fix-return-code-in-init_gst-fai.patch
-	patch_apply mfplat-reverts/0014-Revert-winegstreamer-Allocate-source-media-buffers-i.patch
-	patch_apply mfplat-reverts/0015-Revert-winegstreamer-Duplicate-source-shutdown-path-.patch
-	patch_apply mfplat-reverts/0016-Revert-winegstreamer-Properly-clean-up-from-failure-.patch
-	patch_apply mfplat-reverts/0017-Revert-winegstreamer-Factor-out-more-of-the-init_gst.patch
-fi
-
-# Patchset mfplat-streaming-support
-# |
-# | This patchset has the following (direct or indirect) dependencies:
-# |   *	mfplat-reverts
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#49692] Multiple applications need a Media Foundation media source implementation
-# |
-# | Modified files:
-# |   *	dlls/mf/topology.c, dlls/mfplat/main.c, dlls/winegstreamer/Makefile.in, dlls/winegstreamer/audioconvert.c,
-# | 	dlls/winegstreamer/colorconvert.c, dlls/winegstreamer/decode_transform.c, dlls/winegstreamer/gst_private.h,
-# | 	dlls/winegstreamer/media_source.c, dlls/winegstreamer/mfplat.c, dlls/winegstreamer/quartz_parser.c,
-# | 	dlls/winegstreamer/wg_parser.c, dlls/winegstreamer/winegstreamer_classes.idl, include/mfidl.idl, include/wmcodecdsp.idl
-# |
-if test "$enable_mfplat_streaming_support" -eq 1; then
-	patch_apply mfplat-streaming-support/0001-winegstreamer-Activate-source-pad-in-push-mode-if-it.patch
-	patch_apply mfplat-streaming-support/0002-winegstreamer-Push-stream-start-and-segment-events-i.patch
-	patch_apply mfplat-streaming-support/0003-winegstreamer-Introduce-H.264-decoder-transform.patch
-	patch_apply mfplat-streaming-support/0004-winegstreamer-Implement-GetInputAvailableType-for-de.patch
-	patch_apply mfplat-streaming-support/0005-winegstreamer-Implement-GetOutputAvailableType-for-d.patch
-	patch_apply mfplat-streaming-support/0006-winegstreamer-Implement-SetInputType-for-decode-tran.patch
-	patch_apply mfplat-streaming-support/0007-winegstreamer-Implement-SetOutputType-for-decode-tra.patch
-	patch_apply mfplat-streaming-support/0008-winegstreamer-Implement-Get-Input-Output-StreamInfo-.patch
-	patch_apply mfplat-streaming-support/0009-winegstreamer-Add-push-mode-path-for-wg_parser.patch
-	patch_apply mfplat-streaming-support/0010-winegstreamer-Implement-Process-Input-Output-for-dec.patch
-	patch_apply mfplat-streaming-support/0011-winestreamer-Implement-ProcessMessage-for-decoder-tr.patch
-	patch_apply mfplat-streaming-support/0012-winegstreamer-Semi-stub-GetAttributes-for-decoder-tr.patch
-	patch_apply mfplat-streaming-support/0013-winegstreamer-Register-the-H.264-decoder-transform.patch
-	patch_apply mfplat-streaming-support/0014-winegstreamer-Introduce-AAC-decoder-transform.patch
-	patch_apply mfplat-streaming-support/0015-winegstreamer-Register-the-AAC-decoder-transform.patch
-	patch_apply mfplat-streaming-support/0016-winegstreamer-Rename-GStreamer-objects-to-be-more-ge.patch
-	patch_apply mfplat-streaming-support/0017-winegstreamer-Report-streams-backwards-in-media-sour.patch
-	patch_apply mfplat-streaming-support/0018-winegstreamer-Implement-Process-Input-Output-for-aud.patch
-	patch_apply mfplat-streaming-support/0019-winegstreamer-Implement-Get-Input-Output-StreamInfo-.patch
-	patch_apply mfplat-streaming-support/0020-winegstreamer-Semi-stub-Get-Attributes-functions-for.patch
-	patch_apply mfplat-streaming-support/0021-winegstreamer-Introduce-color-conversion-transform.patch
-	patch_apply mfplat-streaming-support/0022-winegstreamer-Register-the-color-conversion-transfor.patch
-	patch_apply mfplat-streaming-support/0023-winegstreamer-Implement-GetInputAvailableType-for-co.patch
-	patch_apply mfplat-streaming-support/0024-winegstreamer-Implement-SetInputType-for-color-conve.patch
-	patch_apply mfplat-streaming-support/0025-winegstreamer-Implement-GetOutputAvailableType-for-c.patch
-	patch_apply mfplat-streaming-support/0026-winegstreamer-Implement-SetOutputType-for-color-conv.patch
-	patch_apply mfplat-streaming-support/0027-winegstreamer-Implement-Process-Input-Output-for-col.patch
-	patch_apply mfplat-streaming-support/0028-winegstreamer-Implement-ProcessMessage-for-color-con.patch
-	patch_apply mfplat-streaming-support/0029-winegstreamer-Implement-Get-Input-Output-StreamInfo-.patch
-	patch_apply mfplat-streaming-support/0030-mf-topology-Forward-failure-from-SetOutputType-when-.patch
-	patch_apply mfplat-streaming-support/0031-winegstreamer-Handle-flush-command-in-audio-converst.patch
-	patch_apply mfplat-streaming-support/0032-winegstreamer-In-the-default-configuration-select-on.patch
-	patch_apply mfplat-streaming-support/0033-winegstreamer-Implement-MF_SD_LANGUAGE.patch
-	patch_apply mfplat-streaming-support/0034-winegstreamer-Only-require-videobox-element-for-pars.patch
-	patch_apply mfplat-streaming-support/0035-winegstreamer-Don-t-rely-on-max_size-in-unseekable-p.patch
-	patch_apply mfplat-streaming-support/0036-winegstreamer-Implement-MFT_MESSAGE_COMMAND_FLUSH-fo.patch
-	patch_apply mfplat-streaming-support/0037-winegstreamer-Default-Frame-size-if-one-isn-t-availa.patch
-	patch_apply mfplat-streaming-support/0038-mfplat-Stub-out-MFCreateDXGIDeviceManager-to-avoid-t.patch
-fi
-
 # Patchset mmsystem.dll16-MIDIHDR_Refcount
 # |
 # | This patchset fixes the following Wine bugs:
@@ -4168,18 +4047,6 @@ if test "$enable_wininet_Cleanup" -eq 1; then
 	patch_apply wininet-Cleanup/0005-wininet-Replacing-header-fields-should-fail-if-they-.patch
 fi
 
-# Patchset wininet-handle-403-error
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#47505] Stop LevelHead disconnection on startup.
-# |
-# | Modified files:
-# |   *	dlls/wininet/internet.h
-# |
-if test "$enable_wininet_handle_403_error" -eq 1; then
-	patch_apply wininet-handle-403-error/0002-wininet-Allow-up-to-4K-for-data-buffers.patch
-fi
-
 # Patchset winmm-mciSendCommandA
 # |
 # | Modified files:
diff --git a/patches/wininet-handle-403-error/0002-wininet-Allow-up-to-4K-for-data-buffers.patch b/patches/wininet-handle-403-error/0002-wininet-Allow-up-to-4K-for-data-buffers.patch
deleted file mode 100644
index 596eea77..00000000
--- a/patches/wininet-handle-403-error/0002-wininet-Allow-up-to-4K-for-data-buffers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3df5bdd129bc76c94567eb36a3e2cb870b023422 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Thu, 23 Sep 2021 10:36:06 +1000
-Subject: [PATCH] wininet: Allow up to 4K for data buffers
-
-LevelHead includes a Header value, that is > 3K in length which
-causes a crash after linking your account.
----
- dlls/wininet/internet.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
-index e9d68e2c2d9..8538699811c 100644
---- a/dlls/wininet/internet.h
-+++ b/dlls/wininet/internet.h
-@@ -462,7 +462,7 @@ void free_authorization_cache(void) DECLSPEC_HIDDEN;
- 
- void init_winsock(void) DECLSPEC_HIDDEN;
- 
--#define MAX_REPLY_LEN	 	0x5B4
-+#define MAX_REPLY_LEN	 	0x1000
- 
- /* Used for debugging - maybe need to be shared in the Wine debugging code ? */
- typedef struct
--- 
-2.33.0
-
diff --git a/patches/wininet-handle-403-error/definition b/patches/wininet-handle-403-error/definition
deleted file mode 100644
index 647e9713..00000000
--- a/patches/wininet-handle-403-error/definition
+++ /dev/null
@@ -1,2 +0,0 @@
-# This is only a partial fix, a crash can still occur on the initial screen.
-Fixes: [47505] Stop LevelHead disconnection on startup.
diff --git a/staging/upstream-commit b/staging/upstream-commit
index c782c843..a423df3b 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-3660176e09bc02e71586b4cf42f58c9498481af6
+7554bd4b41a1429517eb86fd20dbe813cdd0550a