[PATCH 0/1] MR3044: imm32: Avoid resizing IMCC to zero-size buffer.

[Rémi Bernon]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55027

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3044

[PATCH 1/1] imm32: Avoid resizing IMCC to zero-size buffer.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55027
---
 dlls/imm32/ime.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c
index fa8e94acb21..b5c4fc5b2e1 100644
--- a/dlls/imm32/ime.c
+++ b/dlls/imm32/ime.c
@@ -366,7 +366,9 @@ static UINT ime_set_comp_string( HIMC himc, LPARAM lparam )
     if (!(ctx = ImmLockIMC( himc ))) return 0;
 
     count = ImeToAsciiEx( VK_PROCESSKEY, lparam, NULL, &buffer.list, 0, himc );
-    if (count >= buffer.uMsgCount)
+    if (!count)
+        TRACE( "ImeToAsciiEx returned no messages\n" );
+    else if (count >= buffer.uMsgCount)
         WARN( "ImeToAsciiEx returned %#x messages\n", count );
     else if (!(himcc = ImmReSizeIMCC( ctx->hMsgBuf, (ctx->dwNumMsgBuf + count) * sizeof(*msgs) )))
         WARN( "Failed to resize input context message buffer\n" );
@@ -534,7 +536,7 @@ UINT WINAPI ImeToAsciiEx( UINT vkey, UINT vsc, BYTE *state, TRANSMSGLIST *msgs,
 
     if (!(ctx = ImmLockIMC( himc ))) return 0;
     if (!(compstr = ImmLockIMCC( ctx->hCompStr ))) goto done;
-    size = compstr->dwSize;
+    size = max( compstr->dwSize, sizeof(COMPOSITIONSTRING) );
 
     do
     {
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3044

[PATCH 1/1] imm32: Avoid resizing IMCC to zero-size buffer.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=133689

Your paranoid android.


=== debian11 (32 bit report) ===

user32:
msg.c:6897: Test failed: SetFocus(hwnd) on a button: 4: the msg 0x0007 was expected, but got msg 0x0005 instead
msg.c:6897: Test failed: SetFocus(hwnd) on a button: 5: the msg 0x0135 was expected, but got msg 0x030f instead
msg.c:6897: Test failed: SetFocus(hwnd) on a button: 6: the msg 0x0111 was expected, but got msg 0x001c instead
msg.c:6897: Test failed: SetFocus(hwnd) on a button: 7: the msg 0x8000 was expected, but got msg 0x0086 instead
msg.c:6897: Test failed: SetFocus(hwnd) on a button: 8: the msg sequence is not complete: expected 0000 - actual 0006