Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
68636902
Commit
68636902
authored
Sep 07, 2016
by
Akihiro Sagawa
Committed by
Alexandre Julliard
Sep 07, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
imm32: Set the default IME window title and styles as in native.
Signed-off-by:
Akihiro Sagawa
<
sagawa.aki@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ab27cb48
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
4 deletions
+15
-4
imm.c
dlls/imm32/imm.c
+4
-2
imm32.c
dlls/imm32/tests/imm32.c
+9
-0
misc.c
dlls/user32/misc.c
+2
-2
No files found.
dlls/imm32/imm.c
View file @
68636902
...
...
@@ -109,6 +109,7 @@ static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t
static
const
WCHAR
szImeRegFmt
[]
=
{
'S'
,
'y'
,
's'
,
't'
,
'e'
,
'm'
,
'\\'
,
'C'
,
'u'
,
'r'
,
'r'
,
'e'
,
'n'
,
't'
,
'C'
,
'o'
,
'n'
,
't'
,
'r'
,
'o'
,
'l'
,
'S'
,
'e'
,
't'
,
'\\'
,
'C'
,
'o'
,
'n'
,
't'
,
'r'
,
'o'
,
'l'
,
'\\'
,
'K'
,
'e'
,
'y'
,
'b'
,
'o'
,
'a'
,
'r'
,
'd'
,
' '
,
'L'
,
'a'
,
'y'
,
'o'
,
'u'
,
't'
,
's'
,
'\\'
,
'%'
,
'0'
,
'8'
,
'l'
,
'x'
,
0
};
static
const
WCHAR
szwIME
[]
=
{
'I'
,
'M'
,
'E'
,
0
};
static
const
WCHAR
szwDefaultIME
[]
=
{
'D'
,
'e'
,
'f'
,
'a'
,
'u'
,
'l'
,
't'
,
' '
,
'I'
,
'M'
,
'E'
,
0
};
static
CRITICAL_SECTION
threaddata_cs
;
static
CRITICAL_SECTION_DEBUG
critsect_debug
=
...
...
@@ -1662,8 +1663,9 @@ BOOL WINAPI __wine_register_window(HWND hwnd)
{
/* Do not create the window inside of a critical section */
LeaveCriticalSection
(
&
threaddata_cs
);
new
=
CreateWindowExW
(
WS_EX_TOOLWINDOW
,
szwIME
,
NULL
,
WS_POPUP
,
0
,
0
,
1
,
1
,
0
,
0
,
0
,
0
);
new
=
CreateWindowExW
(
0
,
szwIME
,
szwDefaultIME
,
WS_POPUP
|
WS_DISABLED
|
WS_CLIPSIBLINGS
,
0
,
0
,
1
,
1
,
0
,
0
,
0
,
0
);
/* thread_data is in the current thread so we can assume it's still valid */
EnterCriticalSection
(
&
threaddata_cs
);
/* See if anyone beat us */
...
...
dlls/imm32/tests/imm32.c
View file @
68636902
...
...
@@ -866,6 +866,8 @@ static void test_ImmDefaultHwnd(void)
HWND
def1
,
def3
;
HANDLE
thread
;
HWND
hwnd
;
char
title
[
16
];
LONG
style
;
hwnd
=
CreateWindowExA
(
WS_EX_CLIENTEDGE
,
"EDIT"
,
"Wine imm32.dll test"
,
WS_OVERLAPPEDWINDOW
,
CW_USEDEFAULT
,
CW_USEDEFAULT
,
...
...
@@ -882,6 +884,13 @@ static void test_ImmDefaultHwnd(void)
def1
=
ImmGetDefaultIMEWnd
(
hwnd
);
GetWindowTextA
(
def1
,
title
,
sizeof
(
title
));
ok
(
!
strcmp
(
title
,
"Default IME"
),
"got %s
\n
"
,
title
);
style
=
GetWindowLongA
(
def1
,
GWL_STYLE
);
ok
(
style
==
(
WS_DISABLED
|
WS_POPUP
|
WS_CLIPSIBLINGS
),
"got %08x
\n
"
,
style
);
style
=
GetWindowLongA
(
def1
,
GWL_EXSTYLE
);
ok
(
style
==
0
,
"got %08x
\n
"
,
style
);
imc2
=
ImmCreateContext
();
ImmSetOpenStatus
(
imc2
,
TRUE
);
...
...
dlls/user32/misc.c
View file @
68636902
...
...
@@ -882,7 +882,7 @@ LRESULT WINAPI ImeWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )
{
HWND
uiwnd
;
if
(
msg
==
WM_CREATE
||
msg
==
WM_NCCREATE
)
if
(
msg
==
WM_CREATE
)
return
TRUE
;
if
(
imm_get_ui_window
&&
is_ime_ui_msg
(
msg
))
...
...
@@ -899,7 +899,7 @@ LRESULT WINAPI ImeWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )
{
HWND
uiwnd
;
if
(
msg
==
WM_CREATE
||
msg
==
WM_NCCREATE
)
if
(
msg
==
WM_CREATE
)
return
TRUE
;
if
(
imm_get_ui_window
&&
is_ime_ui_msg
(
msg
))
...
...
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