Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 02:57:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 110170

Browse Source 
IME COMPOSITION string was off by one
and not to use compStrLen in NS_IMM_GETCOMPOSITIONSTRING()
/r=ftang, /sr=alecf
This commit is contained in:
yokoyama%netscape.com 2001-11-15 23:42:00 +00:00
parent 1272590f7a
commit 4c489f275f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
widget/src/windows/nsWindow.cpp
View File

@ -5051,8 +5051,9 @@ BOOL nsWindow::OnIMEComposition(LPARAM aGCS)
mIMECompUnicode->SetCapacity((compStrLen / sizeof(WCHAR))+1);
long buflen = compStrLen + sizeof(WCHAR);
NS_IMM_GETCOMPOSITIONSTRINGW(hIMEContext, GCS_RESULTSTR,
(LPVOID)mIMECompUnicode->get(), compStrLen, compStrLen);
(LPVOID)mIMECompUnicode->get(), buflen, compStrLen);
compStrLen = compStrLen / sizeof(WCHAR);
mIMECompUnicode->SetLength(compStrLen);
} else {
@ -5060,8 +5061,9 @@ BOOL nsWindow::OnIMEComposition(LPARAM aGCS)
mIMECompString->SetCapacity(compStrLen+1);
long buflen = compStrLen + 1;
NS_IMM_GETCOMPOSITIONSTRING(hIMEContext, GCS_RESULTSTR,
(LPVOID)mIMECompString->get(), compStrLen+1, compStrLen);
(LPVOID)mIMECompString->get(), buflen, compStrLen);
mIMECompString->SetLength(compStrLen);
}
#ifdef DEBUG_IME
@ -5185,20 +5187,22 @@ BOOL nsWindow::OnIMEComposition(LPARAM aGCS)
mIMECompUnicode->SetCapacity((compStrLen / sizeof(WCHAR)) + 1);
long buflen = compStrLen + sizeof(WCHAR);
NS_IMM_GETCOMPOSITIONSTRINGW(hIMEContext,
GCS_COMPSTR,
(LPVOID)mIMECompUnicode->get(),
compStrLen, compStrLen);
buflen, compStrLen);
compStrLen = compStrLen / sizeof(WCHAR);
mIMECompUnicode->SetLength(compStrLen);
} else {
NS_IMM_GETCOMPOSITIONSTRING(hIMEContext, GCS_COMPSTR, NULL, 0, compStrLen);
mIMECompString->SetCapacity(compStrLen+1);
long buflen = compStrLen + 1;
NS_IMM_GETCOMPOSITIONSTRING(hIMEContext,
GCS_COMPSTR,
(char*)mIMECompString->get(),
compStrLen+1, compStrLen);
buflen, compStrLen);
mIMECompString->SetLength(compStrLen);
}
#ifdef DEBUG_IME