Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
6baf1198
Commit
6baf1198
authored
Aug 12, 2022
by
Zhiyi Zhang
Committed by
Alexandre Julliard
Aug 18, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32/edit: Implement EM_SETIMESTATUS.
Signed-off-by:
Zhiyi Zhang
<
zzhang@codeweavers.com
>
parent
d06f4a5e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
edit.c
dlls/user32/edit.c
+9
-1
msg.c
dlls/user32/tests/msg.c
+0
-10
No files found.
dlls/user32/edit.c
View file @
6baf1198
...
...
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*
* TODO:
* - EM_GETIMESTATUS
, EM_SETIMESTATUS
* - EM_GETIMESTATUS
* - EN_ALIGN_LTR_EC
* - EN_ALIGN_RTL_EC
* - ES_OEMCONVERT
...
...
@@ -138,6 +138,7 @@ typedef struct
*/
UINT
composition_len
;
/* length of composition, 0 == no composition */
int
composition_start
;
/* the character position for the composition */
UINT
ime_status
;
/* IME status flag */
/*
* Uniscribe Data
*/
...
...
@@ -4928,6 +4929,13 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B
result
=
EDIT_EM_CharFromPos
(
es
,
(
short
)
LOWORD
(
lParam
),
(
short
)
HIWORD
(
lParam
));
break
;
case
EM_SETIMESTATUS
:
if
(
wParam
==
EMSIS_COMPOSITIONSTRING
)
es
->
ime_status
=
lParam
&
0xFFFF
;
result
=
1
;
break
;
/* End of the EM_ messages which were in numerical order; what order
* are these in? vaguely alphabetical?
*/
...
...
dlls/user32/tests/msg.c
View file @
6baf1198
...
...
@@ -12199,21 +12199,18 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg)
/* Note that EM_SETIMESTATUS always return 1, which is contrary to what MSDN says about
* returning the previous LPARAM value */
lr
=
SendMessageA
(
hwnd
,
EM_SETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
EIMES_GETCOMPSTRATONCE
);
todo_wine
ok
(
lr
==
1
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_GETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
0
);
todo_wine
ok
(
lr
==
EIMES_GETCOMPSTRATONCE
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_SETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
EIMES_CANCELCOMPSTRINFOCUS
);
todo_wine
ok
(
lr
==
1
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_GETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
0
);
todo_wine
ok
(
lr
==
EIMES_CANCELCOMPSTRINFOCUS
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_SETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
EIMES_COMPLETECOMPSTRKILLFOCUS
);
todo_wine
ok
(
lr
==
1
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_GETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
0
);
todo_wine
...
...
@@ -12221,7 +12218,6 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg)
lr
=
SendMessageA
(
hwnd
,
EM_SETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
EIMES_GETCOMPSTRATONCE
|
EIMES_CANCELCOMPSTRINFOCUS
|
EIMES_COMPLETECOMPSTRKILLFOCUS
);
todo_wine
ok
(
lr
==
1
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_GETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
0
);
todo_wine
...
...
@@ -12229,7 +12225,6 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg)
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_SETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
0
);
todo_wine
ok
(
lr
==
1
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_GETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
0
);
ok
(
lr
==
0
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
...
...
@@ -12244,26 +12239,22 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg)
ok
(
lr
==
1
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_SETIMESTATUS
,
0
,
EIMES_GETCOMPSTRATONCE
);
todo_wine
ok
(
lr
==
1
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_GETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
0
);
ok
(
lr
==
0
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_SETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
+
1
,
EIMES_GETCOMPSTRATONCE
);
todo_wine
ok
(
lr
==
1
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_GETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
0
);
ok
(
lr
==
0
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_SETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
0xFFFFFFFF
);
todo_wine
ok
(
lr
==
1
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_GETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
0
);
todo_wine
ok
(
lr
==
0xFFFF
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_SETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
0
);
todo_wine
ok
(
lr
==
1
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_GETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
0
);
ok
(
lr
==
0
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
...
...
@@ -12291,7 +12282,6 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg)
/* Test IME messages when EIMES_GETCOMPSTRATONCE is set */
lr
=
SendMessageA
(
hwnd
,
EM_SETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
EIMES_GETCOMPSTRATONCE
);
todo_wine
ok
(
lr
==
1
,
"Got unexpected lr %#Ix.
\n
"
,
lr
);
lr
=
SendMessageA
(
hwnd
,
EM_GETIMESTATUS
,
EMSIS_COMPOSITIONSTRING
,
0
);
todo_wine
...
...
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