Commit 29e51aa3 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

imm32: Remove unnecessary threadDefault InputContextData member.

parent a7c2f4e5
...@@ -94,7 +94,6 @@ typedef struct tagInputContextData ...@@ -94,7 +94,6 @@ typedef struct tagInputContextData
struct ime *ime; struct ime *ime;
UINT lastVK; UINT lastVK;
BOOL threadDefault;
} InputContextData; } InputContextData;
#define WINE_IMC_VALID_MAGIC 0x56434D49 #define WINE_IMC_VALID_MAGIC 0x56434D49
...@@ -404,16 +403,6 @@ static void imm_coinit_thread(void) ...@@ -404,16 +403,6 @@ static void imm_coinit_thread(void)
InitOnceExecuteOnce(&init_ole32_once, init_ole32_funcs, NULL, NULL); InitOnceExecuteOnce(&init_ole32_once, init_ole32_funcs, NULL, NULL);
} }
static BOOL IMM_IsDefaultContext(HIMC imc)
{
InputContextData *data = get_imc_data(imc);
if (!data)
return FALSE;
return data->threadDefault;
}
static InputContextData *query_imc_data(HIMC handle) static InputContextData *query_imc_data(HIMC handle)
{ {
InputContextData *ret; InputContextData *ret;
...@@ -868,7 +857,6 @@ static InputContextData *create_input_context(HIMC default_imc) ...@@ -868,7 +857,6 @@ static InputContextData *create_input_context(HIMC default_imc)
new_context = calloc( 1, sizeof(InputContextData) ); new_context = calloc( 1, sizeof(InputContextData) );
/* Load the IME */ /* Load the IME */
new_context->threadDefault = !!default_imc;
if (!(new_context->ime = ime_acquire( GetKeyboardLayout( 0 ) ))) if (!(new_context->ime = ime_acquire( GetKeyboardLayout( 0 ) )))
{ {
TRACE("IME dll could not be loaded\n"); TRACE("IME dll could not be loaded\n");
...@@ -953,7 +941,8 @@ static BOOL IMM_DestroyContext(HIMC hIMC) ...@@ -953,7 +941,8 @@ static BOOL IMM_DestroyContext(HIMC hIMC)
*/ */
BOOL WINAPI ImmDestroyContext(HIMC hIMC) BOOL WINAPI ImmDestroyContext(HIMC hIMC)
{ {
if (!IMM_IsDefaultContext(hIMC) && !IMM_IsCrossThreadAccess(NULL, hIMC)) if ((UINT_PTR)hIMC == NtUserGetThreadInfo()->default_imc) return FALSE;
if (!IMM_IsCrossThreadAccess(NULL, hIMC))
return IMM_DestroyContext(hIMC); return IMM_DestroyContext(hIMC);
else else
return FALSE; return FALSE;
......
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