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
6fd3bd9b
Commit
6fd3bd9b
authored
Mar 28, 2023
by
Rémi Bernon
Committed by
Alexandre Julliard
Mar 30, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32u: Ignore IME messages from IME UI windows in DefWindowProc.
parent
5c98617e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
5 deletions
+1
-5
imm32.c
dlls/imm32/tests/imm32.c
+0
-4
defwnd.c
dlls/win32u/defwnd.c
+1
-1
No files found.
dlls/imm32/tests/imm32.c
View file @
6fd3bd9b
...
@@ -2505,7 +2505,6 @@ static WCHAR ime_path[MAX_PATH];
...
@@ -2505,7 +2505,6 @@ static WCHAR ime_path[MAX_PATH];
static
HIMC
default_himc
;
static
HIMC
default_himc
;
static
HKL
default_hkl
;
static
HKL
default_hkl
;
static
HKL
expect_ime
=
(
HKL
)(
int
)
0xe020047f
;
static
HKL
expect_ime
=
(
HKL
)(
int
)
0xe020047f
;
static
BOOL
skip_DefWindowProc
;
enum
ime_function
enum
ime_function
{
{
...
@@ -2704,7 +2703,6 @@ static LRESULT CALLBACK ime_ui_window_proc( HWND hwnd, UINT msg, WPARAM wparam,
...
@@ -2704,7 +2703,6 @@ static LRESULT CALLBACK ime_ui_window_proc( HWND hwnd, UINT msg, WPARAM wparam,
ok
(
!
ptr
,
"got IMMGWL_PRIVATE %#Ix
\n
"
,
ptr
);
ok
(
!
ptr
,
"got IMMGWL_PRIVATE %#Ix
\n
"
,
ptr
);
ime_calls
[
ime_call_count
++
]
=
call
;
ime_calls
[
ime_call_count
++
]
=
call
;
if
(
skip_DefWindowProc
)
return
0
;
return
DefWindowProcW
(
hwnd
,
msg
,
wparam
,
lparam
);
return
DefWindowProcW
(
hwnd
,
msg
,
wparam
,
lparam
);
}
}
...
@@ -4431,7 +4429,6 @@ static void test_DefWindowProc(void)
...
@@ -4431,7 +4429,6 @@ static void test_DefWindowProc(void)
memset
(
ime_calls
,
0
,
sizeof
(
ime_calls
)
);
memset
(
ime_calls
,
0
,
sizeof
(
ime_calls
)
);
ime_call_count
=
0
;
ime_call_count
=
0
;
skip_DefWindowProc
=
TRUE
;
ok_ret
(
0
,
DefWindowProcW
(
hwnd
,
WM_IME_STARTCOMPOSITION
,
0
,
0
)
);
ok_ret
(
0
,
DefWindowProcW
(
hwnd
,
WM_IME_STARTCOMPOSITION
,
0
,
0
)
);
ok_seq
(
start_composition_seq
);
ok_seq
(
start_composition_seq
);
ok_ret
(
0
,
DefWindowProcW
(
hwnd
,
WM_IME_ENDCOMPOSITION
,
0
,
0
)
);
ok_ret
(
0
,
DefWindowProcW
(
hwnd
,
WM_IME_ENDCOMPOSITION
,
0
,
0
)
);
...
@@ -4462,7 +4459,6 @@ static void test_DefWindowProc(void)
...
@@ -4462,7 +4459,6 @@ static void test_DefWindowProc(void)
todo_wine
todo_wine
ok_ret
(
0
,
ret
);
ok_ret
(
0
,
ret
);
ok_seq
(
empty_sequence
);
ok_seq
(
empty_sequence
);
skip_DefWindowProc
=
FALSE
;
ok_ret
(
1
,
ImmActivateLayout
(
old_hkl
)
);
ok_ret
(
1
,
ImmActivateLayout
(
old_hkl
)
);
ok_ret
(
1
,
DestroyWindow
(
hwnd
)
);
ok_ret
(
1
,
DestroyWindow
(
hwnd
)
);
...
...
dlls/win32u/defwnd.c
View file @
6fd3bd9b
...
@@ -2927,7 +2927,7 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam,
...
@@ -2927,7 +2927,7 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam,
case
WM_IME_CONTROL
:
case
WM_IME_CONTROL
:
{
{
HWND
ime_hwnd
=
get_default_ime_window
(
hwnd
);
HWND
ime_hwnd
=
get_default_ime_window
(
hwnd
);
if
(
ime_hwnd
)
if
(
ime_hwnd
&&
ime_hwnd
!=
NtUserGetParent
(
hwnd
)
)
result
=
NtUserMessageCall
(
ime_hwnd
,
msg
,
wparam
,
lparam
,
result
=
NtUserMessageCall
(
ime_hwnd
,
msg
,
wparam
,
lparam
,
0
,
NtUserSendMessage
,
ansi
);
0
,
NtUserSendMessage
,
ansi
);
}
}
...
...
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