https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0deab6d9dd2fe96c61bb2600c4ed22ecba1547d
commit c0deab6d9dd2fe96c61bb2600c4ed22ecba1547d Author: Amine Khaldi <[email protected]> AuthorDate: Sat Jan 26 13:10:01 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sat Jan 26 13:10:01 2019 +0100 [IMM32] Sync with Wine Staging 4.0. CORE-15682 --- dll/win32/imm32/imm.c | 9 ++++++--- media/doc/README.WINE | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 28eb00f355..4255e98078 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -608,9 +608,12 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (!hIMC) return old; - SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL); - data->IMC.hWnd = hWnd; - SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL); + if(GetActiveWindow() == data->IMC.hWnd) + { + SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL); + data->IMC.hWnd = hWnd; + SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL); + } return old; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 884392fa06..5d821d721b 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -77,7 +77,7 @@ reactos/dll/win32/iccvid # Synced to WineStaging-4.0 reactos/dll/win32/ieframe # Synced to WineStaging-4.0 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-4.0 reactos/dll/win32/imagehlp # Synced to WineStaging-3.3 -reactos/dll/win32/imm32 # Synced to WineStaging-3.17 +reactos/dll/win32/imm32 # Synced to WineStaging-4.0 reactos/dll/win32/inetcomm # Synced to WineStaging-3.17 reactos/dll/win32/inetmib1 # Synced to WineStaging-3.17 reactos/dll/win32/initpki # Synced to WineStaging-3.3
