Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
26d2d2c4
Commit
26d2d2c4
authored
Apr 06, 2023
by
Rémi Bernon
Committed by
Alexandre Julliard
Apr 11, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
imm32: Compare open status values in ImmSetOpenStatus.
parent
6e51928a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
11 deletions
+7
-11
imm.c
dlls/imm32/imm.c
+1
-1
imm32.c
dlls/imm32/tests/imm32.c
+6
-10
No files found.
dlls/imm32/imm.c
View file @
26d2d2c4
...
...
@@ -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
);
...
...
dlls/imm32/tests/imm32.c
View file @
26d2d2c4
...
...
@@ -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 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment