Rebase against b65ef71fc0a7044557e0ba530e3b95497644867c.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "be0684dad50ffbc93b3ded4fbfebf1d1e4690589"
+	echo "b65ef71fc0a7044557e0ba530e3b95497644867c"
 }
 
 # Show version information

patches/user32-msgbox-Support-WM_COPY-mesg/0002-user32-msgbox-Use-a-windows-hook-to-trap-Ctrl-C.patch

@@ -1,4 +1,4 @@
-From 27c59d8785c0c81039c4c307496c1e64d896a333 Mon Sep 17 00:00:00 2001
+From c3e66bc7df99730a39c54b4f696c2c72e3c5709e Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 10 Jan 2019 16:17:33 +1100
 Subject: [PATCH] user32/msgbox: Use a windows hook to trap Ctrl+C
@@ -8,7 +8,7 @@ Subject: [PATCH] user32/msgbox: Use a windows hook to trap Ctrl+C
  1 file changed, 20 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c
-index 8a1b89f..52b0852 100644
+index b29af2161b6..34f93cdc49d 100644
 --- a/dlls/user32/msgbox.c
 +++ b/dlls/user32/msgbox.c
 @@ -388,6 +388,22 @@ static void MSGBOX_CopyToClipbaord( HWND hwnd )
@@ -22,7 +22,7 @@ index 8a1b89f..52b0852 100644
 +    MSG *msg = (MSG *)lParam;
 +    if (nCode == MSGF_DIALOGBOX && msg->message == WM_KEYUP)
 +    {
-+        if ( (msg->wParam == 'C' || msg->wParam == 'c') && (GetKeyState(VK_CONTROL) & 0x8000))
++        if ( (msg->wParam == 'C' || msg->wParam == 'c') && (NtUserGetKeyState(VK_CONTROL) & 0x8000))
 +        {
 +            MSGBOX_CopyToClipbaord(GetParent(msg->hwnd));
 +        }
@@ -61,5 +61,5 @@ index 8a1b89f..52b0852 100644
   *		MessageBoxA (USER32.@)
   */
 -- 
-1.9.1
+2.33.0
 

patches/wined3d-mesa_texture_download/0001-wined3d-Use-glReadPixels-for-RT-texture-download.patch

@@ -1,4 +1,4 @@
-From a90132c381702bd5ab4feea5df55c9aae5b70f38 Mon Sep 17 00:00:00 2001
+From 4b886ea84a59520ca70cff929e396577fda52c74 Mon Sep 17 00:00:00 2001
 From: Andrew Wesie <awesie@gmail.com>
 Date: Sun, 30 Sep 2018 12:02:00 -0500
 Subject: [PATCH] wined3d: Use glReadPixels for RT texture download.
@@ -9,18 +9,18 @@ Signed-off-by: Andrew Wesie <awesie@gmail.com>
  1 file changed, 19 insertions(+)
 
 diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
-index fcab1d5d773..7e2dccd280a 100644
+index 7e2da350f5a..1b3b9ca0b3a 100644
 --- a/dlls/wined3d/texture.c
 +++ b/dlls/wined3d/texture.c
-@@ -2456,6 +2456,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context,
-     struct wined3d_bo_gl *dst_bo;
+@@ -2827,6 +2827,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context,
+     struct wined3d_bo *dst_bo;
      BOOL srgb = FALSE;
      GLenum target;
 +    struct wined3d_texture_sub_resource *sub_resource;
  
      TRACE("context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_box %s, dst_bo_addr %s, "
              "dst_format %s, dst_x %u, dst_y %u, dst_z %u, dst_row_pitch %u, dst_slice_pitch %u.\n",
-@@ -2510,6 +2511,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context,
+@@ -2881,6 +2882,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context,
  
      format_gl = wined3d_format_gl(src_texture->resource.format);
      target = wined3d_texture_gl_get_sub_resource_target(src_texture_gl, src_sub_resource_idx);
@@ -28,7 +28,7 @@ index fcab1d5d773..7e2dccd280a 100644
  
      if ((src_texture->resource.type == WINED3D_RTYPE_TEXTURE_2D
              && (target == GL_TEXTURE_2D_ARRAY || format_gl->f.conv_byte_count
-@@ -2542,6 +2544,23 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context,
+@@ -2913,6 +2915,23 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context,
          GL_EXTCALL(glGetCompressedTexImage(target, src_level, dst_bo_addr->addr));
          checkGLcall("glGetCompressedTexImage");
      }
@@ -53,5 +53,5 @@ index fcab1d5d773..7e2dccd280a 100644
      {
          TRACE("Downloading texture %p, %u, level %u, format %#x, type %#x, data %p.\n",
 -- 
-2.26.1
+2.33.0
 

staging/upstream-commit

@@ -1 +1 @@
-be0684dad50ffbc93b3ded4fbfebf1d1e4690589
+b65ef71fc0a7044557e0ba530e3b95497644867c