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
6f07e8ab
Commit
6f07e8ab
authored
Sep 19, 2000
by
Andreas Mohr
Committed by
Alexandre Julliard
Sep 19, 2000
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed window lock problem in SetMenu().
parent
ab86a9e5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
menu.c
controls/menu.c
+7
-9
No files found.
controls/menu.c
View file @
6f07e8ab
...
...
@@ -4065,15 +4065,15 @@ BOOL16 WINAPI SetMenu16( HWND16 hWnd, HMENU16 hMenu )
BOOL
WINAPI
SetMenu
(
HWND
hWnd
,
HMENU
hMenu
)
{
WND
*
wndPtr
=
WIN_FindWndPtr
(
hWnd
);
BOOL
res
=
FALSE
;
TRACE
(
"(%04x, %04x);
\n
"
,
hWnd
,
hMenu
);
if
(
hMenu
&&
!
IsMenu
(
hMenu
))
{
WARN
(
"hMenu is not a menu handle
\n
"
);
return
FALSE
;
goto
exit
;
}
if
(
wndPtr
&&
!
(
wndPtr
->
dwStyle
&
WS_CHILD
))
{
...
...
@@ -4085,10 +4085,8 @@ BOOL WINAPI SetMenu( HWND hWnd, HMENU hMenu )
LPPOPUPMENU
lpmenu
;
if
(
!
(
lpmenu
=
MENU_GetMenu
(
hMenu
)))
{
WIN_ReleaseWndPtr
(
wndPtr
);
return
FALSE
;
}
goto
exit
;
lpmenu
->
hWnd
=
hWnd
;
lpmenu
->
wFlags
&=
~
MF_POPUP
;
/* Can't be a popup */
lpmenu
->
Height
=
0
;
/* Make sure we recalculate the size */
...
...
@@ -4096,11 +4094,11 @@ BOOL WINAPI SetMenu( HWND hWnd, HMENU hMenu )
if
(
IsWindowVisible
(
hWnd
))
SetWindowPos
(
hWnd
,
0
,
0
,
0
,
0
,
0
,
SWP_NOSIZE
|
SWP_NOMOVE
|
SWP_NOACTIVATE
|
SWP_NOZORDER
|
SWP_FRAMECHANGED
);
WIN_ReleaseWndPtr
(
wndPtr
);
return
TRUE
;
res
=
TRUE
;
}
exit:
WIN_ReleaseWndPtr
(
wndPtr
);
return
FALSE
;
return
res
;
}
...
...
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