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
47533974
Commit
47533974
authored
Mar 27, 2023
by
Rémi Bernon
Committed by
Alexandre Julliard
Mar 28, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
imm32: Call ActivateKeyboardLayout from ImmActivateLayout.
parent
ca97db75
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
imm.c
dlls/imm32/imm.c
+6
-2
imm32.c
dlls/imm32/tests/imm32.c
+3
-4
No files found.
dlls/imm32/imm.c
View file @
47533974
...
...
@@ -566,8 +566,12 @@ static void ime_release( struct ime *ime )
BOOL
WINAPI
ImmActivateLayout
(
HKL
hkl
)
{
FIXME
(
"hkl %p stub!
\n
"
,
hkl
);
return
FALSE
;
FIXME
(
"hkl %p semi-stub!
\n
"
,
hkl
);
if
(
hkl
==
GetKeyboardLayout
(
0
))
return
TRUE
;
if
(
!
ActivateKeyboardLayout
(
hkl
,
0
))
return
FALSE
;
return
TRUE
;
}
static
BOOL
free_input_context_data
(
HIMC
hIMC
)
...
...
dlls/imm32/tests/imm32.c
View file @
47533974
...
...
@@ -3820,7 +3820,6 @@ static void test_ImmActivateLayout(void)
SET_ENABLE
(
ImeInquire
,
TRUE
);
SET_ENABLE
(
ImeDestroy
,
TRUE
);
todo_wine
ok_ret
(
1
,
ImmActivateLayout
(
old_hkl
)
);
ime_info
.
fdwProperty
=
IME_PROP_END_UNLOAD
|
IME_PROP_UNICODE
;
...
...
@@ -3840,16 +3839,16 @@ static void test_ImmActivateLayout(void)
/* ImmActivateLayout changes active HKL */
SET_EXPECT
(
ImeInquire
);
todo_wine
ok_ret
(
1
,
ImmActivateLayout
(
hkl
)
);
ok_seq
(
activate_seq
);
todo_wine
CHECK_CALLED
(
ImeInquire
);
todo_wine
ok_eq
(
hkl
,
GetKeyboardLayout
(
0
),
HKL
,
"%p"
);
todo_wine
ok_ret
(
1
,
ImmActivateLayout
(
hkl
)
);
ok_seq
(
empty_sequence
);
ok_ret
(
1
,
ImmActivateLayout
(
old_hkl
)
);
ok_seq
(
deactivate_seq
);
...
...
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