ByeongSik Jeon : imm32: Add the updated ImmTranslateMessage declaration.
Alexandre Julliard
julliard at winehq.org
Mon Apr 28 08:01:32 CDT 2008
Module: wine
Branch: master
Commit: 63d81263e2ce8c181a6fa202f80f2bfeced5f0b0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d81263e2ce8c181a6fa202f80f2bfeced5f0b0
Author: ByeongSik Jeon <bsjeon at hanmail.net>
Date: Sat Apr 26 00:19:15 2008 +0900
imm32: Add the updated ImmTranslateMessage declaration.
---
dlls/imm32/imm.c | 6 ++++--
include/ddk/imm.h | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index f89dd2a..0400939 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2233,7 +2233,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC)
* ImmTranslateMessage(IMM32.@)
* ( Undocumented, call internally and from user32.dll )
*/
-BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData)
+BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyData)
{
InputContextData *data;
HIMC imc = ImmGetContext(hwnd);
@@ -2244,7 +2244,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData)
UINT uVirtKey;
static const int list_count = 10;
- TRACE("%p %x %x %x\n",hwnd, msg, chr, (UINT)lKeyData);
+ TRACE("%p %x %x %x\n",hwnd, msg, (UINT)wParam, (UINT)lKeyData);
if (imc)
data = (InputContextData*)imc;
@@ -2262,6 +2262,8 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData)
if (data->immKbd->imeInfo.fdwProperty & IME_PROP_KBD_CHAR_FIRST)
{
+ WCHAR chr;
+
if (!is_himc_ime_unicode(data))
ToAscii(data->lastVK, scancode, state, &chr, 0);
else
diff --git a/include/ddk/imm.h b/include/ddk/imm.h
index a33073d..6e4d42f 100644
--- a/include/ddk/imm.h
+++ b/include/ddk/imm.h
@@ -144,7 +144,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC);
LRESULT WINAPI ImmRequestMessageA(HIMC, WPARAM, LPARAM);
LRESULT WINAPI ImmRequestMessageW(HIMC, WPARAM, LPARAM);
#define ImmRequestMessage WINELIB_NAME_AW(ImmRequestMessage);
-
+BOOL WINAPI ImmTranslateMessage(HWND, UINT, WPARAM, LPARAM);
HWND WINAPI ImmCreateSoftKeyboard(UINT, UINT, int, int);
BOOL WINAPI ImmDestroySoftKeyboard(HWND);
BOOL WINAPI ImmShowSoftKeyboard(HWND, int);
More information about the wine-cvs
mailing list