From 2d58cc0eb9975536f8adf291facf327ebd5c919a Mon Sep 17 00:00:00 2001 From: Elizabeth Figura Date: Mon, 3 Nov 2025 17:58:34 -0600 Subject: [PATCH] Rebase against 82275b13a24613947d1da00cd85209dbfaf5465f. --- ...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 272b211e..54180270 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,7 +1,7 @@ -From 8b0b5c98427224a7da7d4fe380bb8568aa43808c Mon Sep 17 00:00:00 2001 +From 6c90ff9b852f02712c34de1ca23125bdb2c9284b Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 6 Mar 2024 20:21:36 +1100 -Subject: [PATCH 1/2] user32/msgbox: Support WM_COPY Message +Subject: [PATCH] user32/msgbox: Support WM_COPY Message Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=17205 @@ -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 4d345777a10..6b5d867eb1f 100644 +index 12eea8e92d7..9534656378d 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -41,6 +41,11 @@ struct ThreadWindows @@ -63,7 +63,7 @@ index 4d345777a10..6b5d867eb1f 100644 + --------------------------- + */ + int len = ((wcslen(carriage) * 3) + (wcslen(line) * 4) + lenTitle + lenMsg) * sizeof(WCHAR); -+ WCHAR *text = heap_alloc(len); ++ WCHAR *text = malloc(len); + if(text) + { + lstrcpyW(text, line); @@ -111,7 +111,7 @@ index 4d345777a10..6b5d867eb1f 100644 + NtUserCloseClipboard(); + } + -+ heap_free(text); ++ free(text); + } +} @@ -130,7 +130,7 @@ index 4d345777a10..6b5d867eb1f 100644 case WM_COMMAND: switch (LOWORD(wParam)) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c -index 7ea0d13c0f3..41572b29ecc 100644 +index 49b8f1968a0..a3004cf9443 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2068,6 +2068,171 @@ static void test_MessageBoxFontTest(void) @@ -336,5 +336,5 @@ index a957e50689d..5056386ff0e 100644 } -- -2.43.0 +2.51.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index 293a7b00..ea78d815 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -1e998672cff00f8ff7628aaf9cda6026303b5ea3 +82275b13a24613947d1da00cd85209dbfaf5465f