Rebase against 9bc3a9f78bf5e6a09d4e9811f645def4a477f3d0.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "4ac05afd39aff3030e3379ee06e32d6544ef5d62"
+	echo "9bc3a9f78bf5e6a09d4e9811f645def4a477f3d0"
 }
 
 # Show version information

patches/user32-msgbox-Support-WM_COPY-mesg/0001-user32-msgbox-Support-WM_COPY-Message.patch

@@ -1,4 +1,4 @@
-From 48940cf80a165efd218fed37d4d964197cccf36a Mon Sep 17 00:00:00 2001
+From 80a3f0f4b75754f76e6644e43c637ea385889e5c Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 7 Apr 2016 16:04:36 +1000
 Subject: [PATCH] user32/msgbox: Support WM_COPY Message
@@ -7,12 +7,12 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=17205
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
- dlls/user32/msgbox.c       |  86 +++++++++++++++++++--
- dlls/user32/tests/dialog.c | 183 +++++++++++++++++++++++++++++++++++++++++++++
+ dlls/user32/msgbox.c       |  86 ++++++++++++++++-
+ dlls/user32/tests/dialog.c | 183 +++++++++++++++++++++++++++++++++++++
  2 files changed, 264 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c
-index 457c3ae..8a1b89f 100644
+index 3da1c0a3445..b29af2161b6 100644
 --- a/dlls/user32/msgbox.c
 +++ b/dlls/user32/msgbox.c
 @@ -41,6 +41,11 @@ struct ThreadWindows
@@ -130,10 +130,10 @@ index 457c3ae..8a1b89f 100644
     case WM_COMMAND:
      switch (LOWORD(wParam))
 diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c
-index 8c9bd21..139d589 100644
+index 46a12443a93..4fd5d211bea 100644
 --- a/dlls/user32/tests/dialog.c
 +++ b/dlls/user32/tests/dialog.c
-@@ -40,6 +40,7 @@
+@@ -38,6 +38,7 @@
  #include "winbase.h"
  #include "wingdi.h"
  #include "winuser.h"
@@ -141,7 +141,7 @@ index 8c9bd21..139d589 100644
  
  #define MAXHWNDS 1024
  static HWND hwnd [MAXHWNDS];
-@@ -1973,6 +1974,187 @@ static void test_MessageBoxFontTest(void)
+@@ -1990,6 +1991,187 @@ static void test_MessageBoxFontTest(void)
      DestroyWindow(hDlg);
  }
  
@@ -329,12 +329,12 @@ index 8c9bd21..139d589 100644
  static void test_SaveRestoreFocus(void)
  {
      HWND hDlg;
-@@ -2176,4 +2358,5 @@ START_TEST(dialog)
-     test_SaveRestoreFocus();
+@@ -2383,4 +2565,5 @@ START_TEST(dialog)
      test_timer_message();
      test_MessageBox();
+     test_capture_release();
 +    test_MessageBox_WM_COPY_Test();
  }
 -- 
-1.9.1
+2.29.2
 

staging/upstream-commit

@@ -1 +1 @@
-4ac05afd39aff3030e3379ee06e32d6544ef5d62
+9bc3a9f78bf5e6a09d4e9811f645def4a477f3d0