Alexandre Julliard : imm32: Remove redundant IsWindow calls.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Feb 26 09:17:00 CST 2015
Module: wine
Branch: master
Commit: c731ed30acb08fe6414230f376e629589e42eab7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c731ed30acb08fe6414230f376e629589e42eab7
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Feb 26 22:52:56 2015 +0900
imm32: Remove redundant IsWindow calls.
---
dlls/imm32/imm.c | 35 ++++++++---------------------------
1 file changed, 8 insertions(+), 27 deletions(-)
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 1fc553d..c4b44e4 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -588,23 +588,9 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC)
if (!hIMC)
return old;
- if (IsWindow(data->IMC.hWnd))
- {
- /*
- * Post a message that your context is switching
- */
- SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL);
- }
-
+ SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL);
data->IMC.hWnd = hWnd;
-
- if (IsWindow(data->IMC.hWnd))
- {
- /*
- * Post a message that your context is switching
- */
- SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL);
- }
+ SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL);
return old;
}
@@ -2185,13 +2171,11 @@ LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam)
InputContextData *data = get_imc_data(hIMC);
TRACE("%p %ld %ld\n", hIMC, wParam, wParam);
- if (!data)
- SetLastError(ERROR_INVALID_HANDLE);
- if (data && IsWindow(data->IMC.hWnd))
- return SendMessageA(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam);
+ if (data) return SendMessageA(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam);
- return 0;
+ SetLastError(ERROR_INVALID_HANDLE);
+ return 0;
}
/***********************************************************************
@@ -2203,13 +2187,10 @@ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam)
TRACE("%p %ld %ld\n", hIMC, wParam, wParam);
- if (!data)
- SetLastError(ERROR_INVALID_HANDLE);
-
- if (data && IsWindow(data->IMC.hWnd))
- return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam);
+ if (data) return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam);
- return 0;
+ SetLastError(ERROR_INVALID_HANDLE);
+ return 0;
}
/***********************************************************************
More information about the wine-cvs
mailing list