From: "黄巍" Subject: user32: Fix unicode multi-byte message convert Message-Id: <760194684.21037325.1415069076156.JavaMail.gzhuangwei@corp.netease.com> Date: Tue, 4 Nov 2014 10:44:34 +0800 Bug 35592 - Chinese input encoding error in multi-byte character set exe with mac driver --- dlls/user32/message.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index b75c7e9..a55ee0e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -588,9 +588,8 @@ DWORD get_input_codepage( void ) { DWORD cp; int ret; - HKL hkl = GetKeyboardLayout( 0 ); - ret = GetLocaleInfoW( LOWORD(hkl), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + ret = GetLocaleInfoW( LOCALE_USER_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR *)&cp, sizeof(cp) / sizeof(WCHAR) ); if (!ret) cp = CP_ACP; return cp; -- 1.9.3 (Apple Git-50)