imm32: Remove redundant IsWindow calls.

This commit is contained in:
Alexandre Julliard 2015-02-26 22:52:56 +09:00
parent c84fd8586a
commit c731ed30ac
1 changed files with 8 additions and 27 deletions

View File

@ -588,23 +588,9 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC)
if (!hIMC) if (!hIMC)
return old; return old;
if (IsWindow(data->IMC.hWnd)) SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL);
{
/*
* Post a message that your context is switching
*/
SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL);
}
data->IMC.hWnd = hWnd; data->IMC.hWnd = hWnd;
SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL);
if (IsWindow(data->IMC.hWnd))
{
/*
* Post a message that your context is switching
*/
SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL);
}
return old; return old;
} }
@ -2185,13 +2171,11 @@ LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam)
InputContextData *data = get_imc_data(hIMC); InputContextData *data = get_imc_data(hIMC);
TRACE("%p %ld %ld\n", hIMC, wParam, wParam); TRACE("%p %ld %ld\n", hIMC, wParam, wParam);
if (!data)
SetLastError(ERROR_INVALID_HANDLE);
if (data && IsWindow(data->IMC.hWnd)) if (data) return SendMessageA(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam);
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); TRACE("%p %ld %ld\n", hIMC, wParam, wParam);
if (!data) if (data) return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam);
SetLastError(ERROR_INVALID_HANDLE);
if (data && IsWindow(data->IMC.hWnd)) SetLastError(ERROR_INVALID_HANDLE);
return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); return 0;
return 0;
} }
/*********************************************************************** /***********************************************************************