reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-18 03:48:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winex11.drv: Fix crash by long preedit text.

Browse Source
This commit is contained in:
Kusanagi Kouichi 2008-03-21 04:52:49 +09:00 committed by Alexandre Julliard
parent ee08320d50
commit 53b9a53c27
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/winex11.drv/xim.c
View File

@ -293,9 +293,6 @@ static void XIMPreEditDoneCallback(XIC ic, XPointer client_data, XPointer call_d
static void XIMPreEditDrawCallback(XIM ic, XPointer client_data, static void XIMPreEditDrawCallback(XIM ic, XPointer client_data,
XIMPreeditDrawCallbackStruct *P_DR) XIMPreeditDrawCallbackStruct *P_DR)
{ {
DWORD dwOutput;
WCHAR wcOutput[64];
TRACE("PreEditDrawCallback %p\n",ic); TRACE("PreEditDrawCallback %p\n",ic);
if (P_DR) if (P_DR)
@ -306,14 +303,25 @@ static void XIMPreEditDrawCallback(XIM ic, XPointer client_data,
{ {
if (! P_DR->text->encoding_is_wchar) if (! P_DR->text->encoding_is_wchar)
{ {
DWORD dwOutput;
WCHAR *wcOutput;
TRACE("multibyte\n"); TRACE("multibyte\n");
dwOutput = MultiByteToWideChar(CP_UNIXCP, 0, dwOutput = MultiByteToWideChar(CP_UNIXCP, 0,
P_DR->text->string.multi_byte, -1, P_DR->text->string.multi_byte, -1,
wcOutput, 64); NULL, 0);
wcOutput = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR) * dwOutput);
if (wcOutput)
{
dwOutput = MultiByteToWideChar(CP_UNIXCP, 0,
P_DR->text->string.multi_byte, -1,
wcOutput, dwOutput);
/* ignore null */ /* ignore null */
dwOutput --; dwOutput --;
X11DRV_ImmSetInternalString (GCS_COMPSTR, sel, len, wcOutput, dwOutput); X11DRV_ImmSetInternalString (GCS_COMPSTR, sel, len, wcOutput, dwOutput);
HeapFree(GetProcessHeap(), 0, wcOutput);
}
} }
else else
{ {