April 2008 - Wine-commits - list.winehq.org

Aric Stewart : imm32: Make use of of the loaded IME for all processing.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 7fd05b01aeb7f0437c089c2b2fc6a47b0d8e02d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd05b01aeb7f0437c089c2b2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 7 09:38:24 2008 -0500 imm32: Make use of of the loaded IME for all processing. --- dlls/imm32/imm.c | 988 ++++-------------------------------------------------- 1 files changed, 61 insertions(+), 927 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fd05b01aeb7f0437c089…

1 0

Aric Stewart : imm: Default context and hwnd are per thread so store that data in a thread local storage .
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: b72dcd114d1c622b3046506563cc91fc38d40835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72dcd114d1c622b304650656… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 7 10:17:32 2008 -0500 imm: Default context and hwnd are per thread so store that data in a thread local storage. --- dlls/imm32/imm.c | 79 +++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 22 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 4d82398..beda98f 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -86,10 +86,13 @@ typedef struct _tagTRANSMSG { LPARAM lParam; } TRANSMSG, *LPTRANSMSG; -static InputContextData *root_context = NULL; -static HWND hwndDefault = NULL; -static HANDLE hImeInst; +typedef struct _tagIMMThreadData { + HIMC defaultContext; + HWND hwndDefault; +} IMMThreadData; +static HANDLE hImeInst; +static DWORD tlsIndex = 0; static struct list ImmHklList = LIST_INIT(ImmHklList); /* MSIME messages */ @@ -130,6 +133,29 @@ static inline CHAR *strdupWtoA( const WCHAR *str ) return ret; } +static IMMThreadData* IMM_GetThreadData(void) +{ + return (IMMThreadData*)TlsGetValue(tlsIndex); +} + +static void IMM_InitThreadData(void) +{ + IMMThreadData* data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(IMMThreadData)); + TlsSetValue(tlsIndex,data); + + TRACE("Thread Data Created\n"); +} + +static void IMM_FreeThreadData(void) +{ + IMMThreadData* data = TlsGetValue(tlsIndex); + ImmDestroyContext(data->defaultContext); + DestroyWindow(data->hwndDefault); + HeapFree(GetProcessHeap(),0,data); + TRACE("Thread Data Destroyed\n"); +} + static HMODULE LoadDefaultWineIME(void) { char buffer[MAX_PATH], libname[32], *name, *next; @@ -265,12 +291,21 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); hImeInst = hInstDLL; IMM_RegisterMessages(); + tlsIndex = TlsAlloc(); + IMM_InitThreadData(); + break; + case DLL_THREAD_ATTACH: + IMM_InitThreadData(); + break; + case DLL_THREAD_DETACH: + IMM_FreeThreadData(); break; case DLL_PROCESS_DETACH: + IMM_FreeThreadData(); IMM_FreeAllImmHkl(); + TlsFree(tlsIndex); break; } return TRUE; @@ -321,8 +356,8 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) TRACE("(%p, %p):\n", hWnd, hIMC); - if (!root_context) - root_context = ImmCreateContext(); + if (!IMM_GetThreadData()->defaultContext) + IMM_GetThreadData()->defaultContext = ImmCreateContext(); /* * If already associated just return @@ -335,11 +370,11 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) old = (HIMC)RemovePropW(hWnd,szwWineIMCProperty); if (old == NULL) - old = (HIMC)root_context; + old = IMM_GetThreadData()->defaultContext; else if (old == (HIMC)-1) old = NULL; - if (hIMC != (HIMC)root_context) + if (hIMC != IMM_GetThreadData()->defaultContext) { if (hIMC == NULL) /* Meaning disable imm for that window*/ SetPropW(hWnd,szwWineIMCProperty,(HANDLE)-1); @@ -499,8 +534,8 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) data->immKbd->uSelected --; data->immKbd->pImeSelect(hIMC, FALSE); - if (hwndDefault == data->imeWnd) - hwndDefault = NULL; + if (IMM_GetThreadData()->hwndDefault == data->imeWnd) + IMM_GetThreadData()->hwndDefault = NULL; DestroyWindow(data->imeWnd); ImmDestroyIMCC(data->IMC.hCompStr); @@ -913,14 +948,14 @@ HIMC WINAPI ImmGetContext(HWND hWnd) HIMC rc = NULL; TRACE("%p\n", hWnd); - if (!root_context) - root_context = ImmCreateContext(); + if (!IMM_GetThreadData()->defaultContext) + IMM_GetThreadData()->defaultContext = ImmCreateContext(); rc = (HIMC)GetPropW(hWnd,szwWineIMCProperty); if (rc == (HIMC)-1) rc = NULL; else if (rc == NULL) - rc = (HIMC)root_context; + rc = IMM_GetThreadData()->defaultContext; if (rc) { @@ -981,8 +1016,8 @@ BOOL WINAPI ImmGetConversionStatus( */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { - TRACE("Default is %x\n",(unsigned)hwndDefault); - return hwndDefault; + TRACE("Default is %x\n",(unsigned)IMM_GetThreadData()->hwndDefault); + return IMM_GetThreadData()->hwndDefault; } /*********************************************************************** @@ -1288,11 +1323,11 @@ BOOL WINAPI ImmIsUIMessageA( (msg == WM_MSIME_DOCUMENTFEED)) { - if (!hwndDefault) + if (!IMM_GetThreadData()->hwndDefault) ImmGetDefaultIMEWnd(NULL); if (hWndIME == NULL) - PostMessageA(hwndDefault, msg, wParam, lParam); + PostMessageA(IMM_GetThreadData()->hwndDefault, msg, wParam, lParam); rc = TRUE; } @@ -1306,7 +1341,7 @@ BOOL WINAPI ImmIsUIMessageW( HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) { BOOL rc = FALSE; - TRACE("(%p, %d, %ld, %ld): stub\n", hWndIME, msg, wParam, lParam); + TRACE("(%p, %d, %ld, %ld):\n", hWndIME, msg, wParam, lParam); if ((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) || (msg >= WM_IME_SETCONTEXT && msg <= WM_IME_KEYUP) || (msg == WM_MSIME_SERVICE) || @@ -1506,16 +1541,16 @@ BOOL WINAPI ImmSetCompositionWindow( data->IMC.cfCompForm = *lpCompForm; - if (IsWindowVisible(hwndDefault)) + if (IsWindowVisible(IMM_GetThreadData()->hwndDefault)) { reshow = TRUE; - ShowWindow(hwndDefault,SW_HIDE); + ShowWindow(IMM_GetThreadData()->hwndDefault,SW_HIDE); } /* FIXME: this is a partial stub */ if (reshow) - ShowWindow(hwndDefault,SW_SHOWNOACTIVATE); + ShowWindow(IMM_GetThreadData()->hwndDefault,SW_SHOWNOACTIVATE); ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONWINDOW, 0); return TRUE; @@ -1558,7 +1593,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, hImeInst, 0); SetWindowLongW(data->imeWnd, IMMGWL_IMC, (LONG)data); - hwndDefault = data->imeWnd; + IMM_GetThreadData()->hwndDefault = data->imeWnd; } data->IMC.fOpen = fOpen;

1 0

Aric Stewart : imm32: Properly handle unicode and non unicode IMEs with SetCompositionString.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: e7c00ca727fe08f5d98171af18df248c6c307340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c00ca727fe08f5d98171af1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 7 10:45:22 2008 -0500 imm32: Properly handle unicode and non unicode IMEs with SetCompositionString. --- dlls/imm32/imm.c | 51 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index beda98f..0995fb6 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1472,10 +1472,18 @@ BOOL WINAPI ImmSetCompositionStringA( WCHAR *CompBuffer = NULL; WCHAR *ReadBuffer = NULL; BOOL rc; + InputContextData *data = (InputContextData*)hIMC; TRACE("(%p, %d, %p, %d, %p, %d):\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); + if (!data) + return FALSE; + + if (!is_himc_ime_unicode(data)) + return data->immKbd->pImeSetCompositionString(hIMC, dwIndex, lpComp, + dwCompLen, lpRead, dwReadLen); + comp_len = MultiByteToWideChar(CP_ACP, 0, lpComp, dwCompLen, NULL, 0); if (comp_len) { @@ -1507,19 +1515,48 @@ BOOL WINAPI ImmSetCompositionStringW( LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen) { - InputContextData *data = (InputContextData*)hIMC; + DWORD comp_len; + DWORD read_len; + CHAR *CompBuffer = NULL; + CHAR *ReadBuffer = NULL; + BOOL rc; + InputContextData *data = (InputContextData*)hIMC; - TRACE("(%p, %d, %p, %d, %p, %d):\n", - hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); + TRACE("(%p, %d, %p, %d, %p, %d):\n", + hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); - if (!data) + if (!data) return FALSE; - if (is_himc_ime_unicode(data)) + if (is_himc_ime_unicode(data)) return data->immKbd->pImeSetCompositionString(hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); - else - return FALSE; + + comp_len = WideCharToMultiByte(CP_ACP, 0, lpComp, dwCompLen, NULL, 0, NULL, + NULL); + if (comp_len) + { + CompBuffer = HeapAlloc(GetProcessHeap(),0,comp_len); + WideCharToMultiByte(CP_ACP, 0, lpComp, dwCompLen, CompBuffer, comp_len, + NULL, NULL); + } + + read_len = WideCharToMultiByte(CP_ACP, 0, lpRead, dwReadLen, NULL, 0, NULL, + NULL); + if (read_len) + { + ReadBuffer = HeapAlloc(GetProcessHeap(),0,read_len); + WideCharToMultiByte(CP_ACP, 0, lpRead, dwReadLen, ReadBuffer, read_len, + NULL, NULL); + } + + rc = ImmSetCompositionStringA(hIMC, dwIndex, CompBuffer, comp_len, + ReadBuffer, read_len); + + HeapFree(GetProcessHeap(), 0, CompBuffer); + HeapFree(GetProcessHeap(), 0, ReadBuffer); + + return rc; } /***********************************************************************

1 0

Aric Stewart : winex11: Have all xim interaction pass through the new x11drv IME interface.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 26b8aa43a0a996b28805175bdb2ad47b14b8dae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b8aa43a0a996b28805175bd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 7 08:35:42 2008 -0500 winex11: Have all xim interaction pass through the new x11drv IME interface. --- dlls/winex11.drv/xim.c | 104 ++++++------------------------------------------ 1 files changed, 12 insertions(+), 92 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 44aefa8..4505ecd 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -35,23 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); -/* this must match with imm32/imm.c */ -#define FROM_IME 0xcafe1337 - BOOL ximInComposeMode=FALSE; -typedef struct tagInputContextData -{ - BOOL bInternalState; - BOOL bRead; - BOOL bInComposition; - HFONT textfont; - - DWORD dwLock; - INPUTCONTEXT IMC; -} InputContextData; - -static HIMC root_context; static XIMStyle ximStyle = 0; static XIMStyle ximStyleRoot = 0; @@ -63,17 +48,6 @@ static LPBYTE ResultString = NULL; static DWORD dwResultStringSize = 0; static DWORD dwPreeditPos = 0; -static HMODULE hImmDll = NULL; -static HIMC (WINAPI *pImmAssociateContext)(HWND,HIMC); -static HIMC (WINAPI *pImmCreateContext)(void); -static VOID (WINAPI *pImmSetOpenStatus)(HIMC,BOOL); -static BOOL (WINAPI *pImmSetCompositionString)(HIMC, DWORD, LPWSTR, - DWORD, LPWSTR, DWORD); -static LONG (WINAPI *pImmGetCompositionString)(HIMC, DWORD, LPVOID, DWORD); -static VOID (WINAPI *pImmNotifyIME)(HIMC, DWORD, DWORD, DWORD); - -/* WINE specific messages from the xim in x11drv level */ - #define STYLE_OFFTHESPOT (XIMPreeditArea | XIMStatusArea) #define STYLE_OVERTHESPOT (XIMPreeditPosition | XIMStatusNothing) #define STYLE_ROOT (XIMPreeditNothing | XIMStatusNothing) @@ -82,41 +56,6 @@ static VOID (WINAPI *pImmNotifyIME)(HIMC, DWORD, DWORD, DWORD); /* inorder to enable deadkey support */ #define STYLE_NONE (XIMPreeditNothing | XIMStatusNothing) -/* - * here are the functions that sort of marshall calls into IMM32.DLL - */ -static void LoadImmDll(void) -{ - hImmDll = LoadLibraryA("imm32.dll"); - - pImmAssociateContext = (void *)GetProcAddress(hImmDll, "ImmAssociateContext"); - if (!pImmAssociateContext) - WARN("IMM: pImmAssociateContext not found in DLL\n"); - - pImmCreateContext = (void *)GetProcAddress(hImmDll, "ImmCreateContext"); - if (!pImmCreateContext) - WARN("IMM: pImmCreateContext not found in DLL\n"); - - pImmSetOpenStatus = (void *)GetProcAddress( hImmDll, "ImmSetOpenStatus"); - if (!pImmSetOpenStatus) - WARN("IMM: pImmSetOpenStatus not found in DLL\n"); - - pImmSetCompositionString =(void *)GetProcAddress(hImmDll, "ImmSetCompositionStringW"); - - if (!pImmSetCompositionString) - WARN("IMM: pImmSetCompositionStringW not found in DLL\n"); - - pImmGetCompositionString =(void *)GetProcAddress(hImmDll, "ImmGetCompositionStringW"); - - if (!pImmGetCompositionString) - WARN("IMM: pImmGetCompositionStringW not found in DLL\n"); - - pImmNotifyIME = (void *)GetProcAddress( hImmDll, "ImmNotifyIME"); - - if (!pImmNotifyIME) - WARN("IMM: pImmNotifyIME not found in DLL\n"); -} - static BOOL X11DRV_ImmSetInternalString(DWORD dwIndex, DWORD dwOffset, DWORD selLength, LPWSTR lpComp, DWORD dwCompLen) { @@ -211,10 +150,8 @@ static BOOL X11DRV_ImmSetInternalString(DWORD dwIndex, DWORD dwOffset, } } - if (pImmSetCompositionString) - rc = pImmSetCompositionString((HIMC)FROM_IME, SCS_SETSTR, - (LPWSTR)CompositionString, dwCompStringLength, - NULL, 0); + rc = IME_SetCompositionString(SCS_SETSTR, (LPWSTR)CompositionString, + dwCompStringLength, NULL, 0); } else if ((dwIndex == GCS_RESULTSTR) && (lpComp) && (dwCompLen)) { @@ -224,13 +161,10 @@ static BOOL X11DRV_ImmSetInternalString(DWORD dwIndex, DWORD dwOffset, ResultString= HeapAlloc(GetProcessHeap(),0,byte_length); memcpy(ResultString,lpComp,byte_length); - if (pImmSetCompositionString) - rc = pImmSetCompositionString((HIMC)FROM_IME, SCS_SETSTR, - (LPWSTR)ResultString, dwResultStringSize, - NULL, 0); + rc = IME_SetCompositionString(SCS_SETSTR, (LPWSTR)ResultString, + dwResultStringSize, NULL, 0); - if (pImmNotifyIME) - pImmNotifyIME((HIMC)FROM_IME, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + IME_NotifyIME( NI_COMPOSITIONSTR, CPS_COMPLETE, 0); } return rc; @@ -244,8 +178,8 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) dwOutput = MultiByteToWideChar(CP_UNIXCP, 0, str, count, wcOutput, sizeof(wcOutput)/sizeof(WCHAR)); - if (pImmAssociateContext && (focus = GetFocus())) - pImmAssociateContext(focus,root_context); + if ((focus = GetFocus())) + IME_UpdateAssociation(focus); X11DRV_ImmSetInternalString(GCS_RESULTSTR,0,0,wcOutput,dwOutput); } @@ -268,8 +202,7 @@ static void X11DRV_ImmSetOpenStatus(BOOL fOpen) ResultString = NULL; } - if (pImmSetOpenStatus) - pImmSetOpenStatus((HIMC)FROM_IME,fOpen); + IME_SetOpenStatus(fOpen); } static int XIMPreEditStartCallback(XIC ic, XPointer client_data, XPointer call_data) @@ -277,8 +210,7 @@ static int XIMPreEditStartCallback(XIC ic, XPointer client_data, XPointer call_d TRACE("PreEditStartCallback %p\n",ic); X11DRV_ImmSetOpenStatus(TRUE); ximInComposeMode = TRUE; - SendMessageW(((InputContextData*)root_context)->IMC.hWnd, - EM_GETSEL, 0, (LPARAM)&dwPreeditPos); + IME_SendMessageToSelectedHWND(EM_GETSEL, 0, (LPARAM)&dwPreeditPos); return -1; } @@ -344,7 +276,7 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data, if (P_C) { - int pos = pImmGetCompositionString(root_context, GCS_CURSORPOS, NULL, 0); + int pos = IME_GetCursorPos(); TRACE("pos: %d\n", pos); switch(P_C->direction) { @@ -373,8 +305,8 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data, FIXME("Not implemented\n"); break; } - SendMessageW(((InputContextData*)root_context)->IMC.hWnd, - EM_SETSEL, dwPreeditPos + pos, dwPreeditPos + pos); + IME_SendMessageToSelectedHWND( EM_SETSEL, dwPreeditPos + pos, + dwPreeditPos + pos); P_C->position = pos; } TRACE("Finished\n"); @@ -503,18 +435,6 @@ XIM X11DRV_SetupXIM(Display *display, const char *input_style) IME_XIMPresent(TRUE); IME_UpdateAssociation(NULL); - if(!hImmDll) - { - LoadImmDll(); - - if (pImmCreateContext) - { - root_context = pImmCreateContext(); - if (pImmAssociateContext) - pImmAssociateContext(0,root_context); - } - } - return xim; err:

1 0

Aric Stewart : imm32: Implement ImmGetImeMenuItems using loaded IME.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: f4fd36e543bba5293baf3b2981abcb952fdc366c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4fd36e543bba5293baf3b298… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 3 11:21:15 2008 -0500 imm32: Implement ImmGetImeMenuItems using loaded IME. --- dlls/imm32/imm.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 109 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 4d49530..1b24cb9 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -122,6 +122,7 @@ static void ImmInternalPostIMEMessage(InputContextData*, UINT, WPARAM, LPARAM); static void ImmInternalSetOpenStatus(BOOL fOpen); static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len); +#define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) #define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) static inline WCHAR *strdupAtoW( const char *str ) @@ -2233,9 +2234,61 @@ DWORD WINAPI ImmGetImeMenuItemsA( HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOA lpImeParentMenu, LPIMEMENUITEMINFOA lpImeMenu, DWORD dwSize) { - FIXME("(%p, %i, %i, %p, %p, %i): stub\n", hIMC, dwFlags, dwType, - lpImeParentMenu, lpImeMenu, dwSize); - return 0; + InputContextData *data = (InputContextData*)hIMC; + TRACE("(%p, %i, %i, %p, %p, %i):\n", hIMC, dwFlags, dwType, + lpImeParentMenu, lpImeMenu, dwSize); + if (data->immKbd->hIME && data->immKbd->pImeGetImeMenuItems) + { + if (!is_himc_ime_unicode(data) || (!lpImeParentMenu && !lpImeMenu)) + return data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, + (IMEMENUITEMINFOW*)lpImeParentMenu, + (IMEMENUITEMINFOW*)lpImeMenu, dwSize); + else + { + IMEMENUITEMINFOW lpImeParentMenuW; + IMEMENUITEMINFOW *lpImeMenuW, *parent = NULL; + DWORD rc; + + if (lpImeParentMenu) + parent = &lpImeParentMenuW; + if (lpImeMenu) + { + int count = dwSize / sizeof(LPIMEMENUITEMINFOA); + dwSize = count * sizeof(IMEMENUITEMINFOW); + lpImeMenuW = HeapAlloc(GetProcessHeap(), 0, dwSize); + } + else + lpImeMenuW = NULL; + + rc = data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, + parent, lpImeMenuW, dwSize); + + if (lpImeParentMenu) + { + memcpy(lpImeParentMenu,&lpImeParentMenuW,sizeof(IMEMENUITEMINFOA)); + lpImeParentMenu->hbmpItem = lpImeParentMenuW.hbmpItem; + WideCharToMultiByte(CP_ACP, 0, lpImeParentMenuW.szString, + -1, lpImeParentMenu->szString, IMEMENUITEM_STRING_SIZE, + NULL, NULL); + } + if (lpImeMenu && rc) + { + int i; + for (i = 0; i < rc; i++) + { + memcpy(&lpImeMenu[i],&lpImeMenuW[1],sizeof(IMEMENUITEMINFOA)); + lpImeMenu[i].hbmpItem = lpImeMenuW[i].hbmpItem; + WideCharToMultiByte(CP_ACP, 0, lpImeMenuW[i].szString, + -1, lpImeMenu[i].szString, IMEMENUITEM_STRING_SIZE, + NULL, NULL); + } + } + HeapFree(GetProcessHeap(),0,lpImeMenuW); + return rc; + } + } + else + return 0; } /*********************************************************************** @@ -2245,9 +2298,59 @@ DWORD WINAPI ImmGetImeMenuItemsW( HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize) { - FIXME("(%p, %i, %i, %p, %p, %i): stub\n", hIMC, dwFlags, dwType, - lpImeParentMenu, lpImeMenu, dwSize); - return 0; + InputContextData *data = (InputContextData*)hIMC; + TRACE("(%p, %i, %i, %p, %p, %i):\n", hIMC, dwFlags, dwType, + lpImeParentMenu, lpImeMenu, dwSize); + if (data->immKbd->hIME && data->immKbd->pImeGetImeMenuItems) + { + if (is_himc_ime_unicode(data) || (!lpImeParentMenu && !lpImeMenu)) + return data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, + lpImeParentMenu, lpImeMenu, dwSize); + else + { + IMEMENUITEMINFOA lpImeParentMenuA; + IMEMENUITEMINFOA *lpImeMenuA, *parent = NULL; + DWORD rc; + + if (lpImeParentMenu) + parent = &lpImeParentMenuA; + if (lpImeMenu) + { + int count = dwSize / sizeof(LPIMEMENUITEMINFOW); + dwSize = count * sizeof(IMEMENUITEMINFOA); + lpImeMenuA = HeapAlloc(GetProcessHeap(), 0, dwSize); + } + else + lpImeMenuA = NULL; + + rc = data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, + (IMEMENUITEMINFOW*)parent, + (IMEMENUITEMINFOW*)lpImeMenuA, dwSize); + + if (lpImeParentMenu) + { + memcpy(lpImeParentMenu,&lpImeParentMenuA,sizeof(IMEMENUITEMINFOA)); + lpImeParentMenu->hbmpItem = lpImeParentMenuA.hbmpItem; + MultiByteToWideChar(CP_ACP, 0, lpImeParentMenuA.szString, + -1, lpImeParentMenu->szString, IMEMENUITEM_STRING_SIZE); + } + if (lpImeMenu && rc) + { + int i; + for (i = 0; i < rc; i++) + { + memcpy(&lpImeMenu[i],&lpImeMenuA[1],sizeof(IMEMENUITEMINFOA)); + lpImeMenu[i].hbmpItem = lpImeMenuA[i].hbmpItem; + MultiByteToWideChar(CP_ACP, 0, lpImeMenuA[i].szString, + -1, lpImeMenu[i].szString, IMEMENUITEM_STRING_SIZE); + } + } + HeapFree(GetProcessHeap(),0,lpImeMenuA); + return rc; + } + } + else + return 0; } /***********************************************************************

1 0

Aric Stewart : imm32: Implement ImmConfigureIME using the loaded IME.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 467ab8a0650486346ef21adb2d6c254a645ee752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=467ab8a0650486346ef21adb2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 2 13:46:45 2008 -0500 imm32: Implement ImmConfigureIME using the loaded IME. --- dlls/imm32/imm.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 74 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 4ba1d63..ba8dbfc 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -121,6 +121,32 @@ static void ImmInternalPostIMEMessage(InputContextData*, UINT, WPARAM, LPARAM); static void ImmInternalSetOpenStatus(BOOL fOpen); static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len); +#define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) + +static inline WCHAR *strdupAtoW( const char *str ) +{ + WCHAR *ret = NULL; + if (str) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); + } + return ret; +} + +static inline CHAR *strdupWtoA( const WCHAR *str ) +{ + CHAR *ret = NULL; + if (str) + { + DWORD len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); + if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) + WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); + } + return ret; +} + /* ImmHkl loading and freeing */ #define LOAD_FUNCPTR(f) if((ptr->p##f = (LPVOID)GetProcAddress(ptr->hIME, #f)) == NULL){WARN("Can't find function %s in ime\n", #f);} static ImmHkl *IMM_GetImmHkl(HKL hkl) @@ -702,11 +728,30 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) BOOL WINAPI ImmConfigureIMEA( HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { - FIXME("(%p, %p, %d, %p): stub\n", - hKL, hWnd, dwMode, lpData - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + + TRACE("(%p, %p, %d, %p):\n", hKL, hWnd, dwMode, lpData); + + if (immHkl->hIME && immHkl->pImeConfigure) + { + if (dwMode != IME_CONFIG_REGISTERWORD || !is_kbd_ime_unicode(immHkl)) + return immHkl->pImeConfigure(hKL,hWnd,dwMode,lpData); + else + { + REGISTERWORDW rww; + REGISTERWORDA *rwa = (REGISTERWORDA*)lpData; + BOOL rc; + + rww.lpReading = strdupAtoW(rwa->lpReading); + rww.lpWord = strdupAtoW(rwa->lpWord); + rc = immHkl->pImeConfigure(hKL,hWnd,dwMode,&rww); + HeapFree(GetProcessHeap(),0,rww.lpReading); + HeapFree(GetProcessHeap(),0,rww.lpWord); + return rc; + } + } + else + return FALSE; } /*********************************************************************** @@ -715,11 +760,30 @@ BOOL WINAPI ImmConfigureIMEA( BOOL WINAPI ImmConfigureIMEW( HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { - FIXME("(%p, %p, %d, %p): stub\n", - hKL, hWnd, dwMode, lpData - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + + TRACE("(%p, %p, %d, %p):\n", hKL, hWnd, dwMode, lpData); + + if (immHkl->hIME && immHkl->pImeConfigure) + { + if (dwMode != IME_CONFIG_REGISTERWORD || is_kbd_ime_unicode(immHkl)) + return immHkl->pImeConfigure(hKL,hWnd,dwMode,lpData); + else + { + REGISTERWORDW *rww = (REGISTERWORDW*)lpData; + REGISTERWORDA rwa; + BOOL rc; + + rwa.lpReading = strdupWtoA(rww->lpReading); + rwa.lpWord = strdupWtoA(rww->lpWord); + rc = immHkl->pImeConfigure(hKL,hWnd,dwMode,&rwa); + HeapFree(GetProcessHeap(),0,rwa.lpReading); + HeapFree(GetProcessHeap(),0,rwa.lpWord); + return rc; + } + } + else + return FALSE; } /***********************************************************************

1 0

Aric Stewart : imm32: Load a default IME if a specific one is not specified . This defaults to x11.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 2a8a18fc5b35bcc66a842bb62fc03aab31f04c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8a18fc5b35bcc66a842bb62… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 3 09:31:47 2008 -0500 imm32: Load a default IME if a specific one is not specified. This defaults to x11. --- dlls/imm32/imm.c | 83 +++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 66 insertions(+), 17 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index ba8dbfc..4d49530 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -147,6 +148,37 @@ static inline CHAR *strdupWtoA( const WCHAR *str ) return ret; } +static HMODULE LoadDefaultWineIME(void) +{ + char buffer[MAX_PATH], libname[32], *name, *next; + HMODULE module = 0; + HKEY hkey; + + TRACE("Attempting to fall back to wine default IME\n"); + + strcpy( buffer, "x11" ); /* default value */ + /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ + if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) + { + DWORD type, count = sizeof(buffer); + RegQueryValueExA( hkey, "Ime", 0, &type, (LPBYTE) buffer, &count ); + RegCloseKey( hkey ); + } + + name = buffer; + while (name) + { + next = strchr( name, ',' ); + if (next) *next++ = 0; + + snprintf( libname, sizeof(libname), "wine%s.drv", name ); + if ((module = LoadLibraryA( libname )) != 0) break; + name = next; + } + + return module; +} + /* ImmHkl loading and freeing */ #define LOAD_FUNCPTR(f) if((ptr->p##f = (LPVOID)GetProcAddress(ptr->hIME, #f)) == NULL){WARN("Can't find function %s in ime\n", #f);} static ImmHkl *IMM_GetImmHkl(HKL hkl) @@ -167,32 +199,49 @@ static ImmHkl *IMM_GetImmHkl(HKL hkl) ptr->hkl = hkl; if (ImmGetIMEFileNameW(hkl, filename, MAX_PATH)) ptr->hIME = LoadLibraryW(filename); + if (!ptr->hIME) + ptr->hIME = LoadDefaultWineIME(); if (ptr->hIME) { LOAD_FUNCPTR(ImeInquire); - LOAD_FUNCPTR(ImeDestroy); - LOAD_FUNCPTR(ImeSelect); - if (!ptr->pImeInquire || !ptr->pImeDestroy || !ptr->pImeSelect) + if (!ptr->pImeInquire || !ptr->pImeInquire(&ptr->imeInfo, ptr->imeClassName, NULL)) { FreeLibrary(ptr->hIME); ptr->hIME = NULL; } else { - ptr->pImeInquire(&ptr->imeInfo, ptr->imeClassName, NULL); - LOAD_FUNCPTR(ImeConfigure); - LOAD_FUNCPTR(ImeEscape); - LOAD_FUNCPTR(ImeSetActiveContext); - LOAD_FUNCPTR(ImeToAsciiEx); - LOAD_FUNCPTR(NotifyIME); - LOAD_FUNCPTR(ImeRegisterWord); - LOAD_FUNCPTR(ImeUnregisterWord); - LOAD_FUNCPTR(ImeEnumRegisterWord); - LOAD_FUNCPTR(ImeSetCompositionString); - LOAD_FUNCPTR(ImeConversionList); - LOAD_FUNCPTR(ImeProcessKey); - LOAD_FUNCPTR(ImeGetRegisterWordStyle); - LOAD_FUNCPTR(ImeGetImeMenuItems); + LOAD_FUNCPTR(ImeDestroy); + LOAD_FUNCPTR(ImeSelect); + if (!ptr->pImeSelect || !ptr->pImeDestroy) + { + FreeLibrary(ptr->hIME); + ptr->hIME = NULL; + } + else + { + LOAD_FUNCPTR(ImeConfigure); + LOAD_FUNCPTR(ImeEscape); + LOAD_FUNCPTR(ImeSetActiveContext); + LOAD_FUNCPTR(ImeToAsciiEx); + LOAD_FUNCPTR(NotifyIME); + LOAD_FUNCPTR(ImeRegisterWord); + LOAD_FUNCPTR(ImeUnregisterWord); + LOAD_FUNCPTR(ImeEnumRegisterWord); + LOAD_FUNCPTR(ImeSetCompositionString); + LOAD_FUNCPTR(ImeConversionList); + LOAD_FUNCPTR(ImeProcessKey); + LOAD_FUNCPTR(ImeGetRegisterWordStyle); + LOAD_FUNCPTR(ImeGetImeMenuItems); + /* make sure our classname is WCHAR */ + if (!is_kbd_ime_unicode(ptr)) + { + WCHAR bufW[17]; + MultiByteToWideChar(CP_ACP, 0, (LPSTR)ptr->imeClassName, + -1, bufW, 17); + lstrcpyW(ptr->imeClassName, bufW); + } + } } } list_add_head(&ImmHklList,&ptr->entry);

1 0

Reece Dunn : tools/msvcmaker: Suppress deprecation warnings on VC8 and above.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: d03f4d2a49aeada7f53e877d691c881180a474a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03f4d2a49aeada7f53e877d6… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Apr 6 14:27:30 2008 +0100 tools/msvcmaker: Suppress deprecation warnings on VC8 and above. --- tools/winapi/msvcmaker | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 325339b..132d655 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -603,22 +603,22 @@ sub _generate_dsp($$) { print OUT " /c"; print OUT "\r\n"; - my @defines2; + my @defines2 = qw(_CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE); if($debug) { if($lib) { print OUT "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od"; - @defines2 = qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 _DEBUG _WINDOWS _MBCS _LIB); + push @defines2, qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 _DEBUG _WINDOWS _MBCS _LIB); } else { print OUT "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od"; - @defines2 = qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x700 _DEBUG WIN32 _WINDOWS _MBCS _USRDLL); + push @defines2, qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x700 _DEBUG WIN32 _WINDOWS _MBCS _USRDLL); } } else { if($lib) { print OUT "# ADD CPP /nologo /MD /W3 /GX /O2"; - @defines2 = qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 NDEBUG _WINDOWS _MBCS _LIB); + push @defines2, qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 WIN32 NDEBUG _WINDOWS _MBCS _LIB); } else { print OUT "# ADD CPP /nologo /MD /W3 /GX /O2"; - @defines2 = qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 NDEBUG WIN32 _WINDOWS _MBCS _USRDLL); + push @defines2, qw(WINVER=0x0600 _WIN32_WINNT=0x0600 _WIN32_IE=0x0700 NDEBUG WIN32 _WINDOWS _MBCS _USRDLL); } }

1 0

Aric Stewart : winex11: Add IME functionality to winex11drv.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 6dca48feaf8ea0cedd2df88af98f28179d096c02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dca48feaf8ea0cedd2df88af… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 2 10:13:59 2008 -0500 winex11: Add IME functionality to winex11drv. All XIM interaction will soon pass through this functionality instead of directly to imm32. --- dlls/winex11.drv/Makefile.in | 3 +- dlls/winex11.drv/ime.c | 1425 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winex11.drv.spec | 18 + dlls/winex11.drv/x11drv.h | 14 + dlls/winex11.drv/x11drv_main.c | 2 + dlls/winex11.drv/xim.c | 2 + 6 files changed, 1463 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6dca48feaf8ea0cedd2df…

1 0

Alexandre Julliard : winex11: Don't set NET_WM_STATE on the desktop window.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 334e88bc02305362c473ad362521f7801cdb86e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=334e88bc02305362c473ad362… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 7 17:34:47 2008 +0200 winex11: Don't set NET_WM_STATE on the desktop window. --- dlls/winex11.drv/winpos.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 0ef4601..065c501 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -179,6 +179,7 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data DWORD i, style, ex_style, new_state = 0; if (!data->managed) return; + if (data->whole_window == root_window) return; style = GetWindowLongW( data->hwnd, GWL_STYLE ); if (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width &&

1 0