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
4870a9df
Commit
4870a9df
authored
May 11, 2023
by
Rémi Bernon
Committed by
Alexandre Julliard
May 12, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
imm32: Resize the composition string if the driver requested so.
parent
3cee423d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
5 deletions
+19
-5
ime.c
dlls/imm32/ime.c
+17
-5
imm_private.h
dlls/imm32/imm_private.h
+2
-0
No files found.
dlls/imm32/ime.c
View file @
4870a9df
...
...
@@ -457,9 +457,8 @@ BOOL WINAPI ImeProcessKey( HIMC himc, UINT vkey, LPARAM lparam, BYTE *state )
UINT
WINAPI
ImeToAsciiEx
(
UINT
vkey
,
UINT
vsc
,
BYTE
*
state
,
TRANSMSGLIST
*
msgs
,
UINT
flags
,
HIMC
himc
)
{
struct
ime_driver_call_params
params
=
{.
himc
=
himc
,
.
state
=
state
};
COMPOSITIONSTRING
*
compstr
;
UINT
count
=
0
;
UINT
size
,
count
=
0
;
INPUTCONTEXT
*
ctx
;
NTSTATUS
status
;
...
...
@@ -468,10 +467,23 @@ UINT WINAPI ImeToAsciiEx( UINT vkey, UINT vsc, BYTE *state, TRANSMSGLIST *msgs,
if
(
!
(
ctx
=
ImmLockIMC
(
himc
)))
return
0
;
if
(
!
(
compstr
=
ImmLockIMCC
(
ctx
->
hCompStr
)))
goto
done
;
size
=
compstr
->
dwSize
;
do
{
struct
ime_driver_call_params
params
=
{.
himc
=
himc
,
.
state
=
state
};
HIMCC
himcc
;
ImmUnlockIMCC
(
ctx
->
hCompStr
);
if
(
!
(
himcc
=
ImmReSizeIMCC
(
ctx
->
hCompStr
,
size
)))
goto
done
;
if
(
!
(
compstr
=
ImmLockIMCC
(
(
ctx
->
hCompStr
=
himcc
)
)))
goto
done
;
params
.
compstr
=
compstr
;
status
=
NtUserMessageCall
(
ctx
->
hWnd
,
WINE_IME_TO_ASCII_EX
,
vkey
,
vsc
,
&
params
,
NtUserImeDriverCall
,
FALSE
);
size
=
compstr
->
dwSize
;
}
while
(
status
==
STATUS_BUFFER_TOO_SMALL
);
params
.
compstr
=
compstr
;
status
=
NtUserMessageCall
(
ctx
->
hWnd
,
WINE_IME_TO_ASCII_EX
,
vkey
,
vsc
,
&
params
,
NtUserImeDriverCall
,
FALSE
);
if
(
status
)
WARN
(
"WINE_IME_TO_ASCII_EX returned status %#lx
\n
"
,
status
);
ImmUnlockIMCC
(
ctx
->
hCompStr
);
...
...
dlls/imm32/imm_private.h
View file @
4870a9df
...
...
@@ -19,6 +19,8 @@
#include <stdarg.h>
#include <stddef.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
...
...
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