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
6536868d
Commit
6536868d
authored
Jun 25, 2008
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Make sure that IsWindowVisible returns FALSE for HWND_MESSAGE windows.
parent
612c0104
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
win.c
dlls/user32/tests/win.c
+9
-0
win.c
dlls/user32/win.c
+4
-4
window.c
server/window.c
+1
-1
No files found.
dlls/user32/tests/win.c
View file @
6536868d
...
@@ -4755,6 +4755,15 @@ static void test_hwnd_message(void)
...
@@ -4755,6 +4755,15 @@ static void test_hwnd_message(void)
ok
(
found
==
hwnd
,
"didn't find message window %p/%p
\n
"
,
found
,
hwnd
);
ok
(
found
==
hwnd
,
"didn't find message window %p/%p
\n
"
,
found
,
hwnd
);
}
}
/* test IsChild behavior */
if
(
parent
)
ok
(
!
IsChild
(
parent
,
hwnd
),
"HWND_MESSAGE is child of top window
\n
"
);
/* test IsWindowVisible behavior */
ok
(
!
IsWindowVisible
(
hwnd
),
"HWND_MESSAGE window is visible
\n
"
);
if
(
parent
)
ok
(
!
IsWindowVisible
(
parent
),
"HWND_MESSAGE parent is visible
\n
"
);
DestroyWindow
(
hwnd
);
DestroyWindow
(
hwnd
);
}
}
...
...
dlls/user32/win.c
View file @
6536868d
...
@@ -2758,11 +2758,11 @@ BOOL WINAPI IsWindowVisible( HWND hwnd )
...
@@ -2758,11 +2758,11 @@ BOOL WINAPI IsWindowVisible( HWND hwnd )
if
(
!
(
GetWindowLongW
(
hwnd
,
GWL_STYLE
)
&
WS_VISIBLE
))
return
FALSE
;
if
(
!
(
GetWindowLongW
(
hwnd
,
GWL_STYLE
)
&
WS_VISIBLE
))
return
FALSE
;
if
(
!
(
list
=
list_window_parents
(
hwnd
)))
return
TRUE
;
if
(
!
(
list
=
list_window_parents
(
hwnd
)))
return
TRUE
;
if
(
list
[
0
]
&&
list
[
1
])
/* desktop window is considered always visible so we don't check it */
if
(
list
[
0
]
)
{
{
for
(
i
=
0
;
list
[
i
+
1
];
i
++
)
for
(
i
=
0
;
list
[
i
+
1
];
i
++
)
if
(
!
(
GetWindowLongW
(
list
[
i
],
GWL_STYLE
)
&
WS_VISIBLE
))
break
;
if
(
!
(
GetWindowLongW
(
list
[
i
],
GWL_STYLE
)
&
WS_VISIBLE
))
break
;
retval
=
!
list
[
i
+
1
]
;
retval
=
!
list
[
i
+
1
]
&&
(
list
[
i
]
==
GetDesktopWindow
());
/* top message window isn't visible */
}
}
HeapFree
(
GetProcessHeap
(),
0
,
list
);
HeapFree
(
GetProcessHeap
(),
0
,
list
);
return
retval
;
return
retval
;
...
@@ -2787,12 +2787,12 @@ BOOL WIN_IsWindowDrawable( HWND hwnd, BOOL icon )
...
@@ -2787,12 +2787,12 @@ BOOL WIN_IsWindowDrawable( HWND hwnd, BOOL icon )
if
((
style
&
WS_MINIMIZE
)
&&
icon
&&
GetClassLongPtrW
(
hwnd
,
GCLP_HICON
))
return
FALSE
;
if
((
style
&
WS_MINIMIZE
)
&&
icon
&&
GetClassLongPtrW
(
hwnd
,
GCLP_HICON
))
return
FALSE
;
if
(
!
(
list
=
list_window_parents
(
hwnd
)))
return
TRUE
;
if
(
!
(
list
=
list_window_parents
(
hwnd
)))
return
TRUE
;
if
(
list
[
0
]
&&
list
[
1
])
/* desktop window is considered always visible so we don't check it */
if
(
list
[
0
]
)
{
{
for
(
i
=
0
;
list
[
i
+
1
];
i
++
)
for
(
i
=
0
;
list
[
i
+
1
];
i
++
)
if
((
GetWindowLongW
(
list
[
i
],
GWL_STYLE
)
&
(
WS_VISIBLE
|
WS_MINIMIZE
))
!=
WS_VISIBLE
)
if
((
GetWindowLongW
(
list
[
i
],
GWL_STYLE
)
&
(
WS_VISIBLE
|
WS_MINIMIZE
))
!=
WS_VISIBLE
)
break
;
break
;
retval
=
!
list
[
i
+
1
]
;
retval
=
!
list
[
i
+
1
]
&&
(
list
[
i
]
==
GetDesktopWindow
());
/* top message window isn't visible */
}
}
HeapFree
(
GetProcessHeap
(),
0
,
list
);
HeapFree
(
GetProcessHeap
(),
0
,
list
);
return
retval
;
return
retval
;
...
...
server/window.c
View file @
6536868d
...
@@ -604,7 +604,7 @@ static inline void inc_window_paint_count( struct window *win, int incr )
...
@@ -604,7 +604,7 @@ static inline void inc_window_paint_count( struct window *win, int incr )
/* check if window and all its ancestors are visible */
/* check if window and all its ancestors are visible */
static
int
is_visible
(
const
struct
window
*
win
)
static
int
is_visible
(
const
struct
window
*
win
)
{
{
while
(
win
&&
win
->
parent
)
while
(
win
)
{
{
if
(
!
(
win
->
style
&
WS_VISIBLE
))
return
0
;
if
(
!
(
win
->
style
&
WS_VISIBLE
))
return
0
;
win
=
win
->
parent
;
win
=
win
->
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