Alexandre Julliard : user32: Use delayed imports to call the imm32 functions.
Alexandre Julliard
julliard at winehq.org
Tue Feb 11 13:32:39 CST 2014
Module: wine
Branch: master
Commit: ea9ed542becb4aaa55739d2d3efea005c95af521
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9ed542becb4aaa55739d2d3efea005c95af521
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Feb 10 20:11:02 2014 +0100
user32: Use delayed imports to call the imm32 functions.
---
dlls/user32/defwnd.c | 88 ++++----------------------------------------------
1 file changed, 7 insertions(+), 81 deletions(-)
diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c
index eb64666..b359c06 100644
--- a/dlls/user32/defwnd.c
+++ b/dlls/user32/defwnd.c
@@ -29,6 +29,7 @@
#include "winbase.h"
#include "wingdi.h"
#include "winnls.h"
+#include "imm.h"
#include "win.h"
#include "user_private.h"
#include "controls.h"
@@ -47,7 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win);
static short iF10Key = 0;
static short iMenuSysKey = 0;
-static const WCHAR imm32W[] = { 'i','m','m','3','2','\0' };
/***********************************************************************
* DEFWND_HandleWindowPosChanged
@@ -223,70 +223,6 @@ static void DEFWND_Print( HWND hwnd, HDC hdc, ULONG uFlags)
}
-/*
- * helpers for calling IMM32
- *
- * WM_IME_* messages are generated only by IMM32,
- * so I assume imm32 is already LoadLibrary-ed.
- */
-static HWND DEFWND_ImmGetDefaultIMEWnd( HWND hwnd )
-{
- HINSTANCE hInstIMM = GetModuleHandleW( imm32W );
- HWND (WINAPI *pFunc)(HWND);
- HWND hwndRet = 0;
-
- if (!hInstIMM)
- {
- ERR( "cannot get IMM32 handle\n" );
- return 0;
- }
-
- pFunc = (void*)GetProcAddress(hInstIMM,"ImmGetDefaultIMEWnd");
- if ( pFunc != NULL )
- hwndRet = (*pFunc)( hwnd );
-
- return hwndRet;
-}
-
-static BOOL DEFWND_ImmIsUIMessageA( HWND hwndIME, UINT msg, WPARAM wParam, LPARAM lParam )
-{
- HINSTANCE hInstIMM = GetModuleHandleW( imm32W );
- BOOL (WINAPI *pFunc)(HWND,UINT,WPARAM,LPARAM);
- BOOL fRet = FALSE;
-
- if (!hInstIMM)
- {
- ERR( "cannot get IMM32 handle\n" );
- return FALSE;
- }
-
- pFunc = (void*)GetProcAddress(hInstIMM,"ImmIsUIMessageA");
- if ( pFunc != NULL )
- fRet = (*pFunc)( hwndIME, msg, wParam, lParam );
-
- return fRet;
-}
-
-static BOOL DEFWND_ImmIsUIMessageW( HWND hwndIME, UINT msg, WPARAM wParam, LPARAM lParam )
-{
- HINSTANCE hInstIMM = GetModuleHandleW( imm32W );
- BOOL (WINAPI *pFunc)(HWND,UINT,WPARAM,LPARAM);
- BOOL fRet = FALSE;
-
- if (!hInstIMM)
- {
- ERR( "cannot get IMM32 handle\n" );
- return FALSE;
- }
-
- pFunc = (void*)GetProcAddress(hInstIMM,"ImmIsUIMessageW");
- if ( pFunc != NULL )
- fRet = (*pFunc)( hwndIME, msg, wParam, lParam );
-
- return fRet;
-}
-
-
/***********************************************************************
* DEFWND_DefWinProc
@@ -896,20 +832,15 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
case WM_IME_SELECT:
case WM_IME_NOTIFY:
{
- HWND hwndIME;
-
- hwndIME = DEFWND_ImmGetDefaultIMEWnd( hwnd );
+ HWND hwndIME = ImmGetDefaultIMEWnd( hwnd );
if (hwndIME)
result = SendMessageA( hwndIME, msg, wParam, lParam );
}
break;
case WM_IME_SETCONTEXT:
{
- HWND hwndIME;
-
- hwndIME = DEFWND_ImmGetDefaultIMEWnd( hwnd );
- if (hwndIME)
- result = DEFWND_ImmIsUIMessageA( hwndIME, msg, wParam, lParam );
+ HWND hwndIME = ImmGetDefaultIMEWnd( hwnd );
+ if (hwndIME) result = ImmIsUIMessageA( hwndIME, msg, wParam, lParam );
}
break;
@@ -1042,11 +973,8 @@ LRESULT WINAPI DefWindowProcW(
case WM_IME_SETCONTEXT:
{
- HWND hwndIME;
-
- hwndIME = DEFWND_ImmGetDefaultIMEWnd( hwnd );
- if (hwndIME)
- result = DEFWND_ImmIsUIMessageW( hwndIME, msg, wParam, lParam );
+ HWND hwndIME = ImmGetDefaultIMEWnd( hwnd );
+ if (hwndIME) result = ImmIsUIMessageW( hwndIME, msg, wParam, lParam );
}
break;
@@ -1056,9 +984,7 @@ LRESULT WINAPI DefWindowProcW(
case WM_IME_SELECT:
case WM_IME_NOTIFY:
{
- HWND hwndIME;
-
- hwndIME = DEFWND_ImmGetDefaultIMEWnd( hwnd );
+ HWND hwndIME = ImmGetDefaultIMEWnd( hwnd );
if (hwndIME)
result = SendMessageW( hwndIME, msg, wParam, lParam );
}
More information about the wine-cvs
mailing list