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
3ff27f35
Commit
3ff27f35
authored
Oct 10, 2013
by
Andrew Eikum
Committed by
Alexandre Julliard
Oct 11, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Don't try to paint during WM_SETFOCUS if the edit control is not visible.
parent
f4f50c9e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletion
+16
-1
edit.c
dlls/user32/edit.c
+1
-1
msg.c
dlls/user32/tests/msg.c
+15
-0
No files found.
dlls/user32/edit.c
View file @
3ff27f35
...
@@ -3791,7 +3791,7 @@ static void EDIT_WM_SetFocus(EDITSTATE *es)
...
@@ -3791,7 +3791,7 @@ static void EDIT_WM_SetFocus(EDITSTATE *es)
EDIT_InvalidateText
(
es
,
es
->
selection_start
,
es
->
selection_end
);
EDIT_InvalidateText
(
es
,
es
->
selection_start
,
es
->
selection_end
);
/* single line edit updates itself */
/* single line edit updates itself */
if
(
!
(
es
->
style
&
ES_MULTILINE
))
if
(
IsWindowVisible
(
es
->
hwndSelf
)
&&
!
(
es
->
style
&
ES_MULTILINE
))
{
{
HDC
hdc
=
GetDC
(
es
->
hwndSelf
);
HDC
hdc
=
GetDC
(
es
->
hwndSelf
);
EDIT_WM_Paint
(
es
,
hdc
);
EDIT_WM_Paint
(
es
,
hdc
);
...
...
dlls/user32/tests/msg.c
View file @
3ff27f35
...
@@ -9453,6 +9453,17 @@ static const struct message sl_edit_setfocus[] =
...
@@ -9453,6 +9453,17 @@ static const struct message sl_edit_setfocus[] =
{
WM_COMMAND
,
sent
|
parent
|
wparam
,
MAKEWPARAM
(
ID_EDIT
,
EN_SETFOCUS
)
},
{
WM_COMMAND
,
sent
|
parent
|
wparam
,
MAKEWPARAM
(
ID_EDIT
,
EN_SETFOCUS
)
},
{
0
}
{
0
}
};
};
static
const
struct
message
sl_edit_invisible
[]
=
{
{
HCBT_SETFOCUS
,
hook
},
{
WM_IME_SETCONTEXT
,
sent
|
wparam
|
optional
,
1
},
{
WM_IME_NOTIFY
,
sent
|
wparam
|
defwinproc
|
optional
,
2
},
{
EVENT_OBJECT_FOCUS
,
winevent_hook
|
wparam
|
lparam
,
OBJID_CLIENT
,
0
},
{
WM_KILLFOCUS
,
sent
|
parent
},
{
WM_SETFOCUS
,
sent
},
{
WM_COMMAND
,
sent
|
parent
|
wparam
,
MAKEWPARAM
(
ID_EDIT
,
EN_SETFOCUS
)
},
{
0
}
};
static
const
struct
message
ml_edit_setfocus
[]
=
static
const
struct
message
ml_edit_setfocus
[]
=
{
{
{
HCBT_SETFOCUS
,
hook
},
{
HCBT_SETFOCUS
,
hook
},
...
@@ -9602,6 +9613,10 @@ static void test_edit_messages(void)
...
@@ -9602,6 +9613,10 @@ static void test_edit_messages(void)
dlg_code
=
SendMessageA
(
hwnd
,
WM_GETDLGCODE
,
0
,
0
);
dlg_code
=
SendMessageA
(
hwnd
,
WM_GETDLGCODE
,
0
,
0
);
ok
(
dlg_code
==
(
DLGC_WANTCHARS
|
DLGC_HASSETSEL
|
DLGC_WANTARROWS
),
"wrong dlg_code %08x
\n
"
,
dlg_code
);
ok
(
dlg_code
==
(
DLGC_WANTCHARS
|
DLGC_HASSETSEL
|
DLGC_WANTARROWS
),
"wrong dlg_code %08x
\n
"
,
dlg_code
);
flush_sequence
();
SetFocus
(
hwnd
);
ok_sequence
(
sl_edit_invisible
,
"SetFocus(hwnd) on an invisible edit"
,
FALSE
);
ShowWindow
(
hwnd
,
SW_SHOW
);
ShowWindow
(
hwnd
,
SW_SHOW
);
UpdateWindow
(
hwnd
);
UpdateWindow
(
hwnd
);
SetFocus
(
0
);
SetFocus
(
0
);
...
...
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