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
dcdf4dbf
Commit
dcdf4dbf
authored
Sep 23, 2014
by
Piotr Caban
Committed by
Alexandre Julliard
Sep 23, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Return early on child windows in DrawMenuBar.
parent
9d0f924d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
menu.c
dlls/user32/menu.c
+2
-0
msg.c
dlls/user32/tests/msg.c
+12
-0
No files found.
dlls/user32/menu.c
View file @
dcdf4dbf
...
...
@@ -4360,6 +4360,8 @@ BOOL WINAPI DrawMenuBar( HWND hWnd )
if
(
!
IsWindow
(
hWnd
))
return
FALSE
;
if
(
!
WIN_ALLOWED_MENU
(
GetWindowLongW
(
hWnd
,
GWL_STYLE
)))
return
TRUE
;
if
((
hMenu
=
GetMenu
(
hWnd
))
&&
(
lppop
=
MENU_GetMenu
(
hMenu
)))
{
lppop
->
Height
=
0
;
/* Make sure we call MENU_MenuBarCalcSize */
...
...
dlls/user32/tests/msg.c
View file @
dcdf4dbf
...
...
@@ -4871,6 +4871,18 @@ static void test_messages(void)
flush_events
();
ok_sequence
(
WmDrawMenuBarSeq
,
"DrawMenuBar"
,
FALSE
);
ok
(
SetCursorPos
(
pos
.
x
,
pos
.
y
),
"SetCursorPos failed
\n
"
);
DestroyWindow
(
hwnd
);
hwnd
=
CreateWindowExA
(
0
,
"TestDialogClass"
,
NULL
,
WS_CHILD
|
WS_VISIBLE
,
0
,
0
,
100
,
100
,
hparent
,
0
,
GetModuleHandleA
(
0
),
NULL
);
ok
(
hwnd
!=
0
,
"Failed to create custom dialog window
\n
"
);
flush_events
();
flush_sequence
();
ok
(
DrawMenuBar
(
hwnd
),
"DrawMenuBar failed: %d
\n
"
,
GetLastError
());
flush_events
();
ok_sequence
(
WmEmptySeq
,
"DrawMenuBar for a child window"
,
FALSE
);
DestroyWindow
(
hwnd
);
flush_sequence
();
...
...
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