Skip to content

W
wine-winehq
Commit 1b997a99 authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard
Browse files
Options

imm32: When updating a NULL HIMCC with NULL just return NULL. Handle the NULL…

imm32: When updating a NULL HIMCC with NULL just return NULL. Handle the NULL HIMCC for the compstr when doing a ImmNotifyIME for a reset.
parent bb8471be
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 6 deletions
dlls/imm32/imm.c
View file @ 1b997a99
......@@ -240,6 +240,9 @@ static HIMCC updateCompStr(HIMCC old, LPWSTR compstr, DWORD len)
TRACE("%s, %i\n",debugstr_wn(compstr,len),len);
if (old == NULL && compstr == NULL && len == 0)
return NULL;
if (old != NULL)
{
olddata = ImmLockIMCC(old);
......@@ -373,6 +376,9 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len)
TRACE("%s, %i\n",debugstr_wn(resultstr,len),len);
if (old == NULL && resultstr == NULL && len == 0)
return NULL;
if (old != NULL)
{
olddata = ImmLockIMCC(old);
......@@ -1419,7 +1425,7 @@ BOOL WINAPI ImmNotifyIME(
pX11DRV_ForceXIMReset(root_context->IMC.hWnd);
{
HIMCC newCompStr;
DWORD cplen;
DWORD cplen = 0;
LPWSTR cpstr;
LPCOMPOSITIONSTRING cs = NULL;
LPBYTE cdata = NULL;
......@@ -1429,11 +1435,14 @@ BOOL WINAPI ImmNotifyIME(
ImmDestroyIMCC(root_context->IMC.hCompStr);
root_context->IMC.hCompStr = newCompStr;
cdata = ImmLockIMCC(root_context->IMC.hCompStr);
cs = (LPCOMPOSITIONSTRING)cdata;
cplen = cs->dwCompStrLen;
cpstr = (LPWSTR)&(cdata[cs->dwCompStrOffset]);
ImmUnlockIMCC(root_context->IMC.hCompStr);
if (root_context->IMC.hCompStr)
{
cdata = ImmLockIMCC(root_context->IMC.hCompStr);
cs = (LPCOMPOSITIONSTRING)cdata;
cplen = cs->dwCompStrLen;
cpstr = (LPWSTR)&(cdata[cs->dwCompStrOffset]);
ImmUnlockIMCC(root_context->IMC.hCompStr);
}
if (cplen > 0)
{
WCHAR param = cpstr[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment