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
07b9f3f6
Commit
07b9f3f6
authored
May 14, 2021
by
Rémi Bernon
Committed by
Alexandre Julliard
May 17, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Factor IsRectEmpty driver check in ShowWindow.
Signed-off-by:
Rémi Bernon
<
rbernon@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c5ed4893
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
5 deletions
+4
-5
winpos.c
dlls/user32/winpos.c
+4
-2
window.c
dlls/wineandroid.drv/window.c
+0
-1
window.c
dlls/winemac.drv/window.c
+0
-1
window.c
dlls/winex11.drv/window.c
+0
-1
No files found.
dlls/user32/winpos.c
View file @
07b9f3f6
...
...
@@ -1044,7 +1044,7 @@ static BOOL show_window( HWND hwnd, INT cmd )
BOOL
wasVisible
=
(
style
&
WS_VISIBLE
)
!=
0
;
BOOL
showFlag
=
TRUE
;
RECT
newPos
=
{
0
,
0
,
0
,
0
};
UINT
swp
=
0
;
UINT
new_swp
,
swp
=
0
;
TRACE
(
"hwnd=%p, cmd=%d, wasVisible %d
\n
"
,
hwnd
,
cmd
,
wasVisible
);
...
...
@@ -1117,7 +1117,9 @@ static BOOL show_window( HWND hwnd, INT cmd )
if
(
!
IsWindow
(
hwnd
))
goto
done
;
}
swp
=
USER_Driver
->
pShowWindow
(
hwnd
,
cmd
,
&
newPos
,
swp
);
if
(
IsRectEmpty
(
&
newPos
))
new_swp
=
swp
;
else
new_swp
=
USER_Driver
->
pShowWindow
(
hwnd
,
cmd
,
&
newPos
,
swp
);
swp
=
new_swp
;
parent
=
GetAncestor
(
hwnd
,
GA_PARENT
);
if
(
parent
&&
!
IsWindowVisible
(
parent
)
&&
!
(
swp
&
SWP_STATECHANGED
))
...
...
dlls/wineandroid.drv/window.c
View file @
07b9f3f6
...
...
@@ -1385,7 +1385,6 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag
*/
UINT
CDECL
ANDROID_ShowWindow
(
HWND
hwnd
,
INT
cmd
,
RECT
*
rect
,
UINT
swp
)
{
if
(
IsRectEmpty
(
rect
))
return
swp
;
if
(
!
IsIconic
(
hwnd
))
return
swp
;
/* always hide icons off-screen */
if
(
rect
->
left
!=
-
32000
||
rect
->
top
!=
-
32000
)
...
...
dlls/winemac.drv/window.c
View file @
07b9f3f6
...
...
@@ -1798,7 +1798,6 @@ UINT CDECL macdrv_ShowWindow(HWND hwnd, INT cmd, RECT *rect, UINT swp)
hwnd
,
data
?
data
->
cocoa_window
:
NULL
,
cmd
,
wine_dbgstr_rect
(
rect
),
swp
);
if
(
!
data
||
!
data
->
cocoa_window
)
goto
done
;
if
(
IsRectEmpty
(
rect
))
goto
done
;
if
(
GetWindowLongW
(
hwnd
,
GWL_STYLE
)
&
WS_MINIMIZE
)
{
if
(
rect
->
left
!=
-
32000
||
rect
->
top
!=
-
32000
)
...
...
dlls/winex11.drv/window.c
View file @
07b9f3f6
...
...
@@ -2560,7 +2560,6 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp )
struct
x11drv_win_data
*
data
=
get_win_data
(
hwnd
);
if
(
!
data
||
!
data
->
whole_window
)
goto
done
;
if
(
IsRectEmpty
(
rect
))
goto
done
;
if
(
style
&
WS_MINIMIZE
)
{
if
(((
rect
->
left
!=
-
32000
||
rect
->
top
!=
-
32000
))
&&
hide_icon
(
data
))
...
...
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