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
4445fd14
Commit
4445fd14
authored
Apr 03, 2023
by
Rémi Bernon
Committed by
Alexandre Julliard
Apr 04, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
imm32: Fix mixed-up HIMC / imc pointers in ImmTranslateMessage.
parent
7f0c2c48
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
imm.c
dlls/imm32/imm.c
+4
-5
No files found.
dlls/imm32/imm.c
View file @
4445fd14
...
...
@@ -3018,7 +3018,6 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD
{
struct
imc
*
data
;
struct
ime
*
ime
;
HIMC
imc
=
ImmGetContext
(
hwnd
);
BYTE
state
[
256
];
UINT
scancode
;
TRANSMSGLIST
*
list
=
NULL
;
...
...
@@ -3028,8 +3027,8 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD
TRACE
(
"%p %x %x %x
\n
"
,
hwnd
,
msg
,
(
UINT
)
wParam
,
(
UINT
)
lKeyData
);
if
(
!
(
data
=
get_imc_data
(
imc
)))
return
FALSE
;
if
(
!
(
ime
=
imc_select_ime
(
imc
)))
return
FALSE
;
if
(
!
(
data
=
get_imc_data
(
ImmGetContext
(
hwnd
)
)))
return
FALSE
;
if
(
!
(
ime
=
imc_select_ime
(
data
)))
return
FALSE
;
if
(
data
->
lastVK
==
VK_PROCESSKEY
)
return
FALSE
;
GetKeyboardState
(
state
);
...
...
@@ -3051,12 +3050,12 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD
else
uVirtKey
=
data
->
lastVK
;
msg_count
=
ime
->
pImeToAsciiEx
(
uVirtKey
,
scancode
,
state
,
list
,
0
,
imc
);
msg_count
=
ime
->
pImeToAsciiEx
(
uVirtKey
,
scancode
,
state
,
list
,
0
,
data
->
handle
);
TRACE
(
"%i messages generated
\n
"
,
msg_count
);
if
(
msg_count
&&
msg_count
<=
list_count
)
for
(
i
=
0
;
i
<
msg_count
;
i
++
)
imc_post_message
(
data
,
list
->
TransMsg
+
i
);
else
if
(
msg_count
>
list_count
)
ImmGenerateMessage
(
imc
);
ImmGenerateMessage
(
data
->
handle
);
free
(
list
);
...
...
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