ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

This commit is contained in:
Aric Stewart 2008-01-02 13:34:46 -06:00 committed by Alexandre Julliard
parent bb8471beac
commit 1b997a9986
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/imm32/imm.c
View File

@ -240,6 +240,9 @@ static HIMCC updateCompStr(HIMCC old, LPWSTR compstr, DWORD len)
TRACE("%s, %i\n",debugstr_wn(compstr,len),len); TRACE("%s, %i\n",debugstr_wn(compstr,len),len);
if (old == NULL && compstr == NULL && len == 0)
return NULL;
if (old != NULL) if (old != NULL)
{ {
olddata = ImmLockIMCC(old); 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); TRACE("%s, %i\n",debugstr_wn(resultstr,len),len);
if (old == NULL && resultstr == NULL && len == 0)
return NULL;
if (old != NULL) if (old != NULL)
{ {
olddata = ImmLockIMCC(old); olddata = ImmLockIMCC(old);
@ -1419,7 +1425,7 @@ BOOL WINAPI ImmNotifyIME(
pX11DRV_ForceXIMReset(root_context->IMC.hWnd); pX11DRV_ForceXIMReset(root_context->IMC.hWnd);
{ {
HIMCC newCompStr; HIMCC newCompStr;
DWORD cplen; DWORD cplen = 0;
LPWSTR cpstr; LPWSTR cpstr;
LPCOMPOSITIONSTRING cs = NULL; LPCOMPOSITIONSTRING cs = NULL;
LPBYTE cdata = NULL; LPBYTE cdata = NULL;
@ -1429,11 +1435,14 @@ BOOL WINAPI ImmNotifyIME(
ImmDestroyIMCC(root_context->IMC.hCompStr); ImmDestroyIMCC(root_context->IMC.hCompStr);
root_context->IMC.hCompStr = newCompStr; root_context->IMC.hCompStr = newCompStr;
cdata = ImmLockIMCC(root_context->IMC.hCompStr); if (root_context->IMC.hCompStr)
cs = (LPCOMPOSITIONSTRING)cdata; {
cplen = cs->dwCompStrLen; cdata = ImmLockIMCC(root_context->IMC.hCompStr);
cpstr = (LPWSTR)&(cdata[cs->dwCompStrOffset]); cs = (LPCOMPOSITIONSTRING)cdata;
ImmUnlockIMCC(root_context->IMC.hCompStr); cplen = cs->dwCompStrLen;
cpstr = (LPWSTR)&(cdata[cs->dwCompStrOffset]);
ImmUnlockIMCC(root_context->IMC.hCompStr);
}
if (cplen > 0) if (cplen > 0)
{ {
WCHAR param = cpstr[0]; WCHAR param = cpstr[0];