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
8bbeadf5
Commit
8bbeadf5
authored
Aug 24, 2007
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: IsChild must not consider the desktop window.
parent
149cbb1b
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
11 deletions
+3
-11
message.c
dlls/user32/message.c
+1
-1
msg.c
dlls/user32/tests/msg.c
+0
-2
win.c
dlls/user32/tests/win.c
+0
-6
win.c
dlls/user32/win.c
+1
-1
dce.c
dlls/winex11.drv/dce.c
+1
-1
No files found.
dlls/user32/message.c
View file @
8bbeadf5
...
...
@@ -303,7 +303,7 @@ static inline BOOL is_mouse_message( UINT message )
/* check whether message matches the specified hwnd filter */
static
inline
BOOL
check_hwnd_filter
(
const
MSG
*
msg
,
HWND
hwnd_filter
)
{
if
(
!
hwnd_filter
)
return
TRUE
;
if
(
!
hwnd_filter
||
hwnd_filter
==
GetDesktopWindow
()
)
return
TRUE
;
return
(
msg
->
hwnd
==
hwnd_filter
||
IsChild
(
hwnd_filter
,
msg
->
hwnd
));
}
...
...
dlls/user32/tests/msg.c
View file @
8bbeadf5
...
...
@@ -7476,9 +7476,7 @@ static void test_DestroyWindow(void)
/* test owner/parent of the parent */
test
=
GetParent
(
parent
);
ok
(
!
test
,
"wrong parent %p
\n
"
,
test
);
todo_wine
{
ok
(
!
IsChild
(
GetDesktopWindow
(),
parent
),
"wrong parent/child %p/%p
\n
"
,
GetDesktopWindow
(),
parent
);
}
if
(
pGetAncestor
)
{
test
=
pGetAncestor
(
parent
,
GA_PARENT
);
ok
(
test
==
GetDesktopWindow
(),
"wrong parent %p
\n
"
,
test
);
...
...
dlls/user32/tests/win.c
View file @
8bbeadf5
...
...
@@ -2758,27 +2758,21 @@ static void test_SetParent(void)
check_parents
(
child3
,
child2
,
child2
,
child2
,
0
,
child2
,
parent
);
check_parents
(
child4
,
desktop
,
child2
,
child2
,
child2
,
child4
,
parent
);
todo_wine
{
ok
(
!
IsChild
(
desktop
,
parent
),
"wrong parent/child %p/%p
\n
"
,
desktop
,
parent
);
ok
(
!
IsChild
(
desktop
,
child1
),
"wrong parent/child %p/%p
\n
"
,
desktop
,
child1
);
ok
(
!
IsChild
(
desktop
,
child2
),
"wrong parent/child %p/%p
\n
"
,
desktop
,
child2
);
ok
(
!
IsChild
(
desktop
,
child3
),
"wrong parent/child %p/%p
\n
"
,
desktop
,
child3
);
ok
(
!
IsChild
(
desktop
,
child4
),
"wrong parent/child %p/%p
\n
"
,
desktop
,
child4
);
}
ok
(
IsChild
(
parent
,
child1
),
"wrong parent/child %p/%p
\n
"
,
parent
,
child1
);
todo_wine
{
ok
(
!
IsChild
(
desktop
,
child2
),
"wrong parent/child %p/%p
\n
"
,
desktop
,
child2
);
}
ok
(
!
IsChild
(
parent
,
child2
),
"wrong parent/child %p/%p
\n
"
,
parent
,
child2
);
ok
(
!
IsChild
(
child1
,
child2
),
"wrong parent/child %p/%p
\n
"
,
child1
,
child2
);
ok
(
!
IsChild
(
parent
,
child3
),
"wrong parent/child %p/%p
\n
"
,
parent
,
child3
);
ok
(
IsChild
(
child2
,
child3
),
"wrong parent/child %p/%p
\n
"
,
child2
,
child3
);
ok
(
!
IsChild
(
parent
,
child4
),
"wrong parent/child %p/%p
\n
"
,
parent
,
child4
);
ok
(
!
IsChild
(
child3
,
child4
),
"wrong parent/child %p/%p
\n
"
,
child3
,
child4
);
todo_wine
{
ok
(
!
IsChild
(
desktop
,
child4
),
"wrong parent/child %p/%p
\n
"
,
desktop
,
child4
);
}
if
(
!
is_win9x
)
/* Win9x doesn't survive this test */
{
...
...
dlls/user32/win.c
View file @
8bbeadf5
...
...
@@ -2609,7 +2609,7 @@ BOOL WINAPI IsChild( HWND parent, HWND child )
if
(
!
list
)
return
FALSE
;
parent
=
WIN_GetFullHandle
(
parent
);
for
(
i
=
0
;
list
[
i
];
i
++
)
if
(
list
[
i
]
==
parent
)
break
;
ret
=
(
list
[
i
]
!=
0
)
;
ret
=
list
[
i
]
&&
list
[
i
+
1
]
;
HeapFree
(
GetProcessHeap
(),
0
,
list
);
return
ret
;
}
...
...
dlls/winex11.drv/dce.c
View file @
8bbeadf5
...
...
@@ -391,7 +391,7 @@ void invalidate_dce( HWND hwnd, const RECT *rect )
/* check if DCE window is within the z-order scope */
if
(
hwndScope
==
dce
->
hwnd
||
IsChild
(
hwndScope
,
dce
->
hwnd
))
if
(
hwndScope
==
dce
->
hwnd
||
hwndScope
==
GetDesktopWindow
()
||
IsChild
(
hwndScope
,
dce
->
hwnd
))
{
if
(
hwnd
!=
dce
->
hwnd
)
{
...
...
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