stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6741364: Some input method problems after the fix for 6585765

Browse Source 
The fix for 6585765 is corrected

Reviewed-by: uta
This commit is contained in:
Artem Ananiev 2008-08-26 16:31:13 +04:00
parent e4f977c0a1
commit 4bdcbbe0b6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jdk/src/windows/native/sun/windows/awt_InputTextInfor.cpp
View File

@ -131,7 +131,7 @@ AwtInputTextInfor::GetContextData(HIMC hIMC, const LPARAM flags) {
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
if (m_cStrW > 0) {
m_jtext = MakeJavaString(env, m_lpStrW);
m_jtext = MakeJavaString(env, m_lpStrW, m_cStrW);
}
// Merge the string if necessary
@ -182,12 +182,12 @@ AwtInputTextInfor::~AwtInputTextInfor() {
}
jstring AwtInputTextInfor::MakeJavaString(JNIEnv* env, LPWSTR lpStrW) {
jstring AwtInputTextInfor::MakeJavaString(JNIEnv* env, LPWSTR lpStrW, int cStrW) {
if (env == NULL || lpStrW == NULL) {
if (env == NULL || lpStrW == NULL || cStrW == 0) {
return NULL;
} else {
return JNU_NewStringPlatform(env, lpStrW);
return env->NewString(reinterpret_cast<jchar*>(lpStrW), cStrW);
}
}
@ -246,14 +246,14 @@ int AwtInputTextInfor::GetClauseInfor(int*& lpBndClauseW, jstring*& lpReadingCla
}
::LCMapString(lcJPN, LCMAP_FULLWIDTH, lpHWStrW, cHWStrW, lpFWStrW, cFWStrW);
readingClauseW[cls] = MakeJavaString(env, lpFWStrW);
readingClauseW[cls] = MakeJavaString(env, lpFWStrW, cFWStrW);
delete [] lpFWStrW;
} else {
readingClauseW[cls] = MakeJavaString(env, lpHWStrW);
readingClauseW[cls] = MakeJavaString(env, lpHWStrW, cHWStrW);
}
}
else {
readingClauseW[cls] = MakeJavaString(env, (LPWSTR)NULL);
readingClauseW[cls] = NULL;
}
}

2
jdk/src/windows/native/sun/windows/awt_InputTextInfor.h
View File

@ -58,7 +58,7 @@ class AwtInputTextInfor {
~AwtInputTextInfor();
private:
/* helper function to return a java string.*/
static jstring MakeJavaString(JNIEnv* env, LPWSTR lpStrW);
static jstring MakeJavaString(JNIEnv* env, LPWSTR lpStrW, int cStrW);
LPARAM m_flags; /* The message LPARAM. */