Rebase against 61db4aa66df85574b7c2e21325b5527ed795dae8.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "781277de62822c2bac23dc892a99665cdb140a5e"
+	echo "61db4aa66df85574b7c2e21325b5527ed795dae8"
 }
 
 # Show version information
@@ -169,7 +169,6 @@ patch_enable_all ()
 	enable_packager_DllMain="$1"
 	enable_programs_findstr="$1"
 	enable_programs_systeminfo="$1"
-	enable_riched20_Class_Tests="$1"
 	enable_riched20_IText_Interface="$1"
 	enable_sapi_ISpObjectToken_CreateInstance="$1"
 	enable_sapi_iteration_tokens="$1"
@@ -538,9 +537,6 @@ patch_enable ()
 		programs-systeminfo)
 			enable_programs_systeminfo="$2"
 			;;
-		riched20-Class_Tests)
-			enable_riched20_Class_Tests="$2"
-			;;
 		riched20-IText_Interface)
 			enable_riched20_IText_Interface="$2"
 			;;
@@ -2756,15 +2752,6 @@ if test "$enable_programs_systeminfo" -eq 1; then
 	patch_apply programs-systeminfo/0001-systeminfo-add-basic-functionality.patch
 fi
 
-# Patchset riched20-Class_Tests
-# |
-# | Modified files:
-# |   *	dlls/riched20/tests/editor.c
-# |
-if test "$enable_riched20_Class_Tests" -eq 1; then
-	patch_apply riched20-Class_Tests/0001-riched20-tests-Add-a-test-to-see-what-richedit-class.patch
-fi
-
 # Patchset riched20-IText_Interface
 # |
 # | Modified files:

patches/riched20-Class_Tests/0001-riched20-tests-Add-a-test-to-see-what-richedit-class.patch

@@ -1,64 +0,0 @@
-From 9de7ee8f985782ec2205b5094b85e981f144d88f Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Fri, 13 May 2016 16:05:13 +0800
-Subject: [PATCH] riched20/tests: Add a test to see what richedit class
- flavours should be available.
-
----
- dlls/riched20/tests/editor.c | 33 +++++++++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-
-diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
-index 4c87869c4a3..789d6617cb9 100644
---- a/dlls/riched20/tests/editor.c
-+++ b/dlls/riched20/tests/editor.c
-@@ -8957,6 +8957,38 @@ static void test_EM_SELECTIONTYPE(void)
-     DestroyWindow(hwnd);
- }
- 
-+static void test_window_classes(void)
-+{
-+    static const struct
-+    {
-+        const char *class;
-+        BOOL success;
-+    } test[] =
-+    {
-+        { "RichEdit", FALSE },
-+        { "RichEdit20A", TRUE },
-+        { "RichEdit20W", TRUE },
-+        { "RichEdit50A", FALSE },
-+        { "RichEdit50W", FALSE }
-+    };
-+    int i;
-+    HWND hwnd;
-+
-+    for (i = 0; i < sizeof(test)/sizeof(test[0]); i++)
-+    {
-+        SetLastError(0xdeadbeef);
-+        hwnd = CreateWindowExA(0, test[i].class, NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL);
-+todo_wine_if(!strcmp(test[i].class, "RichEdit50A") || !strcmp(test[i].class, "RichEdit50W"))
-+        ok(!hwnd == !test[i].success, "CreateWindow(%s) should %s\n",
-+           test[i].class, test[i].success ? "succeed" : "fail");
-+        if (!hwnd)
-+todo_wine
-+            ok(GetLastError() == ERROR_CANNOT_FIND_WND_CLASS, "got %d\n", GetLastError());
-+        else
-+            DestroyWindow(hwnd);
-+    }
-+}
-+
- START_TEST( editor )
- {
-   BOOL ret;
-@@ -8966,6 +8998,7 @@ START_TEST( editor )
-   ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError());
-   is_lang_japanese = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_JAPANESE);
- 
-+  test_window_classes();
-   test_WM_CHAR();
-   test_EM_FINDTEXT(FALSE);
-   test_EM_FINDTEXT(TRUE);
--- 
-2.30.1
-

patches/stdole32.tlb-SLTG_Typelib/0020-stdole32.tlb-Compile-typelib-with-oldtlb.patch

@@ -1,22 +1,22 @@
-From a004652281da81bace202bed4fe451f1d60f83f0 Mon Sep 17 00:00:00 2001
+From 3b5acd9461f17303e745f6d90b39603beb62df01 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 21 Jan 2016 02:53:22 +0100
-Subject: stdole32.tlb: Compile typelib with --oldtlb.
+Subject: [PATCH] stdole32.tlb: Compile typelib with --oldtlb.
 
 ---
  dlls/stdole32.tlb/Makefile.in | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/dlls/stdole32.tlb/Makefile.in b/dlls/stdole32.tlb/Makefile.in
-index 6422325..226235a 100644
+index 9fc649ee5a4..216760922b6 100644
 --- a/dlls/stdole32.tlb/Makefile.in
 +++ b/dlls/stdole32.tlb/Makefile.in
 @@ -1,4 +1,5 @@
  MODULE    = stdole32.tlb
 +EXTRAIDLFLAGS = --oldtlb
  
- RC_SRCS = rsrc.rc
- IDL_SRCS = std_ole_v1.idl
+ EXTRADLLFLAGS = -Wb,--data-only
+ 
 -- 
-2.6.4
+2.34.1
 

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

@@ -1,14 +1,14 @@
-From c3e66bc7df99730a39c54b4f696c2c72e3c5709e Mon Sep 17 00:00:00 2001
+From 455aefaf6f4e5b3b631722be3ad0911dbe015952 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
 
 ---
- dlls/user32/msgbox.c | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
+ dlls/user32/msgbox.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
 
 diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c
-index b29af2161b6..34f93cdc49d 100644
+index d47d9eaac22..db036b28b69 100644
 --- a/dlls/user32/msgbox.c
 +++ b/dlls/user32/msgbox.c
 @@ -388,6 +388,22 @@ static void MSGBOX_CopyToClipbaord( HWND hwnd )
@@ -47,19 +47,11 @@ index b29af2161b6..34f93cdc49d 100644
          break;
     }
 +   case WM_DESTROY:
-+       UnhookWindowsHookEx(msghook_handle);
++       NtUserUnhookWindowsHookEx(msghook_handle);
 +       break;
  
     case WM_COMMAND:
      switch (LOWORD(wParam))
-@@ -454,7 +474,6 @@ static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message,
-   return 0;
- }
- 
--
- /**************************************************************************
-  *		MessageBoxA (USER32.@)
-  */
 -- 
-2.33.0
+2.34.1
 

staging/upstream-commit

@@ -1 +1 @@
-781277de62822c2bac23dc892a99665cdb140a5e
+61db4aa66df85574b7c2e21325b5527ed795dae8