From da6c42770b9a57f4951020540ca2279a9a814faf Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 27 Nov 2025 13:39:58 +1100 Subject: [PATCH] Rebase against f5944829dc8620b48f8ebde59a9ee8a7734a7f8d. --- ...001-user32-msgbox-Support-WM_COPY-Message.patch | 14 +++++++------- staging/upstream-commit | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/user32-msgbox-Support-WM_COPY-mesg/0001-user32-msgbox-Support-WM_COPY-Message.patch b/patches/user32-msgbox-Support-WM_COPY-mesg/0001-user32-msgbox-Support-WM_COPY-Message.patch index 54180270..8c3dffb2 100644 --- a/patches/user32-msgbox-Support-WM_COPY-mesg/0001-user32-msgbox-Support-WM_COPY-Message.patch +++ b/patches/user32-msgbox-Support-WM_COPY-mesg/0001-user32-msgbox-Support-WM_COPY-Message.patch @@ -1,4 +1,4 @@ -From 6c90ff9b852f02712c34de1ca23125bdb2c9284b Mon Sep 17 00:00:00 2001 +From 702653b1539507e6033d123a57f16f7206d78bb0 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 6 Mar 2024 20:21:36 +1100 Subject: [PATCH] user32/msgbox: Support WM_COPY Message @@ -13,7 +13,7 @@ Signed-off-by: Alistair Leslie-Hughes 3 files changed, 257 insertions(+), 5 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c -index 12eea8e92d7..9534656378d 100644 +index 009f3858c60..a21f210a2fd 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -41,6 +41,11 @@ struct ThreadWindows @@ -130,10 +130,10 @@ index 12eea8e92d7..9534656378d 100644 case WM_COMMAND: switch (LOWORD(wParam)) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c -index 49b8f1968a0..a3004cf9443 100644 +index 20e21bea0bc..c3ba83c4893 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c -@@ -2068,6 +2068,171 @@ static void test_MessageBoxFontTest(void) +@@ -2081,6 +2081,171 @@ static void test_MessageBoxFontTest(void) DestroyWindow(hDlg); } @@ -305,9 +305,9 @@ index 49b8f1968a0..a3004cf9443 100644 static void test_SaveRestoreFocus(void) { HWND hDlg; -@@ -2440,6 +2605,7 @@ START_TEST(dialog) - - if (!RegisterWindowClasses()) assert(0); +@@ -2536,6 +2701,7 @@ START_TEST(dialog) + return; + } + test_MessageBox_WM_COPY_Test(); test_dialog_custom_data(); diff --git a/staging/upstream-commit b/staging/upstream-commit index 4ed0a8e8..23e5c1ce 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -f41f67806b9d630e7fbb0e31e3a166e84212dc9b +f5944829dc8620b48f8ebde59a9ee8a7734a7f8d