Rebase against 432858b285d2b63eca6f99a162c9a13dd6e6ac71.

patches/ddraw-Texture_Wrong_Caps/0001-ddraw-Allow-setting-texture-without-DDSCAPS_TEXTURE-.patch

@@ -1,4 +1,4 @@
-From 17363db79c4a12613236ef88386b2294920cc9bc Mon Sep 17 00:00:00 2001
+From 5706ea39b9a1074431d13e4c7354e0432af819a3 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <gofmanp@gmail.com>
 Date: Thu, 4 Apr 2019 02:25:00 +0300
 Subject: [PATCH] ddraw: Allow setting texture without DDSCAPS_TEXTURE for
@@ -11,7 +11,7 @@ Signed-off-by: Paul Gofman <gofmanp@gmail.com>
  2 files changed, 141 insertions(+), 7 deletions(-)
 
 diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
-index 5bd5b2c70911..010fed303969 100644
+index 5bd5b2c7091..010fed30396 100644
 --- a/dlls/ddraw/device.c
 +++ b/dlls/ddraw/device.c
 @@ -4776,7 +4776,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
@@ -59,7 +59,7 @@ index 5bd5b2c70911..010fed303969 100644
  
  static const struct tss_lookup
 diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
-index 5dc2b4e7e527..d0a1f59c0a59 100644
+index d438132764f..1c6c227cc6b 100644
 --- a/dlls/ddraw/tests/ddraw4.c
 +++ b/dlls/ddraw/tests/ddraw4.c
 @@ -359,7 +359,7 @@ static IDirectDraw4 *create_ddraw(void)
@@ -121,8 +121,8 @@ index 5dc2b4e7e527..d0a1f59c0a59 100644
  static IDirect3DViewport3 *create_viewport(IDirect3DDevice3 *device, UINT x, UINT y, UINT w, UINT h)
  {
      IDirect3DViewport3 *viewport;
-@@ -17530,6 +17541,116 @@ static void test_get_display_mode(void)
-     EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0);
+@@ -17867,6 +17878,116 @@ done:
+     IDirectDraw4_Release(ddraw);
  }
  
 +static void test_texture_wrong_caps_(BOOL software)
@@ -238,7 +238,7 @@ index 5dc2b4e7e527..d0a1f59c0a59 100644
  START_TEST(ddraw4)
  {
      DDDEVICEIDENTIFIER identifier;
-@@ -17662,6 +17783,7 @@ START_TEST(ddraw4)
+@@ -17999,6 +18120,7 @@ START_TEST(ddraw4)
      test_gdi_surface();
      test_alphatest();
      test_clipper_refcount();
@@ -247,5 +247,5 @@ index 5dc2b4e7e527..d0a1f59c0a59 100644
      test_d32_support();
      test_surface_format_conversion_alpha();
 -- 
-2.26.2
+2.28.0
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "314368e6c442f043ebfc22b70c1113e4e6232c04"
+	echo "432858b285d2b63eca6f99a162c9a13dd6e6ac71"
 }
 
 # Show version information

staging/upstream-commit

@@ -1 +1 @@
-314368e6c442f043ebfc22b70c1113e4e6232c04
+432858b285d2b63eca6f99a162c9a13dd6e6ac71