system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 16:47:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

imm32: Compare open status values in ImmSetOpenStatus.

Browse source
This commit is contained in:
Rémi Bernon 2023-04-06 00:54:42 +02:00 committed by Alexandre Julliard
parent 6e51928ae5
commit 26d2d2c438
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/imm32/imm.c
View file

@ -2688,7 +2688,7 @@ BOOL WINAPI ImmSetOpenStatus( HIMC himc, BOOL status )
if ((ui_hwnd = get_ime_ui_window())) SetWindowLongPtrW( ui_hwnd, IMMGWL_IMC, (LONG_PTR)himc );
if (!status != !ctx->fOpen)
if (status != ctx->fOpen)
{
ctx->fOpen = status;
ImmNotifyIME( himc, NI_CONTEXTUPDATED, 0, IMC_SETOPENSTATUS );

16
dlls/imm32/tests/imm32.c
View file

@ -4399,7 +4399,6 @@ static void test_ImmSetOpenStatus(void)
{
.hkl = expect_ime, .himc = default_himc,
.func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETOPENSTATUS},
.todo = TRUE,
},
{0},
};
@ -4408,17 +4407,14 @@ static void test_ImmSetOpenStatus(void)
{
.hkl = expect_ime, .himc = default_himc,
.func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0, .value = IMC_SETOPENSTATUS},
.todo = TRUE,
},
{
.hkl = expect_ime, .himc = default_himc,
.func = MSG_TEST_WIN, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETOPENSTATUS},
.todo = TRUE,
},
{
.hkl = expect_ime, .himc = default_himc,
.func = MSG_IME_UI, .message = {.msg = WM_IME_NOTIFY, .wparam = IMN_SETOPENSTATUS},
.todo = TRUE,
},
{0},
};
@ -4483,8 +4479,8 @@ static void test_ImmSetOpenStatus(void)
ok_seq( set_open_status_1_seq );
status = ImmGetOpenStatus( default_himc );
todo_wine ok_eq( 0xfeedcafe, status, UINT, "%#x" );
todo_wine ok_eq( 0xfeedcafe, ctx->fOpen, UINT, "%#x" );
ok_eq( 0xfeedcafe, status, UINT, "%#x" );
ok_eq( 0xfeedcafe, ctx->fOpen, UINT, "%#x" );
ctx->hWnd = hwnd;
ok_seq( empty_sequence );
@ -4492,15 +4488,15 @@ static void test_ImmSetOpenStatus(void)
ok_seq( set_open_status_2_seq );
status = ImmGetOpenStatus( default_himc );
todo_wine ok_eq( ~0, status, UINT, "%#x" );
todo_wine ok_eq( ~0, ctx->fOpen, UINT, "%#x" );
ok_eq( ~0, status, UINT, "%#x" );
ok_eq( ~0, ctx->fOpen, UINT, "%#x" );
ok_ret( 1, ImmSetOpenStatus( default_himc, ~0 ) );
ok_seq( empty_sequence );
status = ImmGetOpenStatus( default_himc );
todo_wine ok_eq( ~0, status, UINT, "%#x" );
todo_wine ok_eq( ~0, ctx->fOpen, UINT, "%#x" );
ok_eq( ~0, status, UINT, "%#x" );
ok_eq( ~0, ctx->fOpen, UINT, "%#x" );
/* status is cached between IME activations */