Skip to content

W
wine-winehq
Commit c731ed30 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

imm32: Remove redundant IsWindow calls.

parent c84fd858
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 27 deletions
dlls/imm32/imm.c
View file @ c731ed30
...@@ -588,23 +588,9 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) ...@@ -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) ...@@ -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) ...@@ -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))
return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam);
return 0; SetLastError(ERROR_INVALID_HANDLE);
return 0;
} }
/*********************************************************************** /***********************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment