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
8159af76
Commit
8159af76
authored
Oct 24, 2017
by
Piotr Caban
Committed by
Alexandre Julliard
Oct 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Don't do the painting if combobox is not visible in CBPaintText.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f6f0be8f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
1 deletion
+20
-1
combo.c
dlls/user32/combo.c
+1
-1
msg.c
dlls/user32/tests/msg.c
+19
-0
No files found.
dlls/user32/combo.c
View file @
8159af76
...
@@ -733,7 +733,7 @@ static void CBPaintText(
...
@@ -733,7 +733,7 @@ static void CBPaintText(
if
(
lphc
->
wState
&
CBF_FOCUSED
)
if
(
lphc
->
wState
&
CBF_FOCUSED
)
SendMessageW
(
lphc
->
hWndEdit
,
EM_SETSEL
,
0
,
-
1
);
SendMessageW
(
lphc
->
hWndEdit
,
EM_SETSEL
,
0
,
-
1
);
}
}
else
/* paint text field ourselves */
else
if
(
IsWindowVisible
(
lphc
->
self
))
/* paint text field ourselves */
{
{
HDC
hdc
=
hdc_paint
?
hdc_paint
:
GetDC
(
lphc
->
self
);
HDC
hdc
=
hdc_paint
?
hdc_paint
:
GetDC
(
lphc
->
self
);
UINT
itemState
=
ODS_COMBOBOXEDIT
;
UINT
itemState
=
ODS_COMBOBOXEDIT
;
...
...
dlls/user32/tests/msg.c
View file @
8159af76
...
@@ -6613,6 +6613,18 @@ static const struct message SetCurSelComboSeq[] =
...
@@ -6613,6 +6613,18 @@ static const struct message SetCurSelComboSeq[] =
{
0
}
{
0
}
};
};
static
const
struct
message
SetCurSelComboSeq2
[]
=
{
{
CB_SETCURSEL
,
sent
|
wparam
|
lparam
,
0
,
0
},
{
LB_SETCURSEL
,
sent
|
wparam
|
lparam
,
0
,
0
},
{
LB_SETTOPINDEX
,
sent
|
wparam
|
lparam
,
0
,
0
},
{
LB_GETCURSEL
,
sent
|
wparam
|
lparam
,
0
,
0
},
{
LB_GETTEXTLEN
,
sent
|
wparam
|
lparam
,
0
,
0
},
{
LB_GETTEXTLEN
,
sent
|
wparam
|
lparam
|
optional
,
0
,
0
},
/* TODO: it's sent on all Windows versions */
{
LB_GETTEXT
,
sent
|
wparam
,
0
},
{
0
}
};
static
const
struct
message
WmKeyDownComboSeq
[]
=
static
const
struct
message
WmKeyDownComboSeq
[]
=
{
{
{
WM_KEYDOWN
,
sent
|
wparam
|
lparam
,
VK_DOWN
,
0
},
{
WM_KEYDOWN
,
sent
|
wparam
|
lparam
,
VK_DOWN
,
0
},
...
@@ -6939,6 +6951,13 @@ static void test_combobox_messages(void)
...
@@ -6939,6 +6951,13 @@ static void test_combobox_messages(void)
log_all_parent_messages
--
;
log_all_parent_messages
--
;
ok_sequence
(
SetCurSelComboSeq
,
"CB_SETCURSEL on a ComboBox"
,
FALSE
);
ok_sequence
(
SetCurSelComboSeq
,
"CB_SETCURSEL on a ComboBox"
,
FALSE
);
ShowWindow
(
combo
,
SW_HIDE
);
flush_sequence
();
log_all_parent_messages
++
;
SendMessageA
(
combo
,
CB_SETCURSEL
,
0
,
0
);
log_all_parent_messages
--
;
ok_sequence
(
SetCurSelComboSeq2
,
"CB_SETCURSEL on a ComboBox"
,
FALSE
);
DestroyWindow
(
combo
);
DestroyWindow
(
combo
);
DestroyWindow
(
parent
);
DestroyWindow
(
parent
);
}
}
...
...
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