[PATCH] user32: When converting strings from A->W, ignore handles/resources

[Fabian Maurer]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51583
Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 dlls/user32/tests/msg.c | 3 +++
 dlls/user32/winproc.c   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 9867e319d58..5ea05b156d6 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -5991,6 +5991,9 @@ static void test_setwindowpos(void)
     expect(winY, rc.bottom);

     DestroyWindow(hwnd);
+
+    /* Test invalid text with WM_SETTEXT. This must not crash. */
+    SendMessageA(GetDesktopWindow(), WM_SETTEXT, 0, (LPARAM)55);
 }

 static void invisible_parent_tests(void)
diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c
index f83d8b61a63..f4cf9f6e748 100644
--- a/dlls/user32/winproc.c
+++ b/dlls/user32/winproc.c
@@ -494,6 +494,8 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg,
     case LB_ADDFILE:
     case EM_REPLACESEL:
         if (!lParam) ret = callback( hwnd, msg, wParam, lParam, result, arg );
+        else if (IS_INTRESOURCE(lParam)) /* Check for handles/IDs similar to DEFWND_SetTextA */
+            return 0;
         else
         {
             WCHAR *ptr, buffer[512];
--
2.32.0

[Chip Davis]

August 9, 2021 4:55 PM, "Fabian Maurer" <dark.shadow4(a)web.de> wrote:
> diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
> index 9867e319d58..5ea05b156d6 100644
> --- a/dlls/user32/tests/msg.c
> +++ b/dlls/user32/tests/msg.c
> @@ -5991,6 +5991,9 @@ static void test_setwindowpos(void)
>      expect(winY, rc.bottom);
>
> DestroyWindow(hwnd);
> +
> +    /* Test invalid text with WM_SETTEXT. This must not crash. */
> +    SendMessageA(GetDesktopWindow(), WM_SETTEXT, 0, (LPARAM)55);

That looks like the wrong place for that. From a botched merge, perhaps?

Chip

[Fabian Maurer]

Hi Chip,

thanks, didn't mean to put it in there. While where at that though, where
would it fit best?

Regards,
Fabian Maurer

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=95330

Your paranoid android.


=== w10pro64_zh_CN (64 bit report) ===

user32:
msg.c:12626: Test failed: message time not advanced: ee38 ee38
msg.c:12627: Test failed: coords not changed: (105 105) (105 105)