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
d57dc9da
Commit
d57dc9da
authored
Jan 04, 2007
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Jan 04, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Fix some failures in the MDI message test.
parent
688d9af6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
97 additions
and
57 deletions
+97
-57
mdi.c
dlls/user32/mdi.c
+80
-49
msg.c
dlls/user32/tests/msg.c
+15
-6
win.c
dlls/user32/win.c
+1
-1
window.c
dlls/winex11.drv/window.c
+1
-1
No files found.
dlls/user32/mdi.c
View file @
d57dc9da
This diff is collapsed.
Click to expand it.
dlls/user32/tests/msg.c
View file @
d57dc9da
...
...
@@ -55,6 +55,8 @@ static HWINEVENTHOOK hEvent_hook;
static
HWND
(
WINAPI
*
pGetAncestor
)(
HWND
,
UINT
);
static
void
dump_winpos_flags
(
UINT
flags
);
/*
FIXME: add tests for these
Window Edge Styles (Win31/Win95/98 look), in order of precedence:
...
...
@@ -2479,6 +2481,7 @@ static LRESULT WINAPI mdi_client_hook_proc(HWND hwnd, UINT message, WPARAM wPara
trace
(
"%p after %p, x %d, y %d, cx %d, cy %d flags %08x
\n
"
,
winpos
->
hwnd
,
winpos
->
hwndInsertAfter
,
winpos
->
x
,
winpos
->
y
,
winpos
->
cx
,
winpos
->
cy
,
winpos
->
flags
);
dump_winpos_flags
(
winpos
->
flags
);
/* Log only documented flags, win2k uses 0x1000 and 0x2000
* in the high word for internal purposes
...
...
@@ -2526,6 +2529,7 @@ static LRESULT WINAPI mdi_child_wnd_proc(HWND hwnd, UINT message, WPARAM wParam,
trace
(
"%p after %p, x %d, y %d, cx %d, cy %d flags %08x
\n
"
,
winpos
->
hwnd
,
winpos
->
hwndInsertAfter
,
winpos
->
x
,
winpos
->
y
,
winpos
->
cx
,
winpos
->
cy
,
winpos
->
flags
);
dump_winpos_flags
(
winpos
->
flags
);
/* Log only documented flags, win2k uses 0x1000 and 0x2000
* in the high word for internal purposes
...
...
@@ -2591,6 +2595,7 @@ static LRESULT WINAPI mdi_frame_wnd_proc(HWND hwnd, UINT message, WPARAM wParam,
trace
(
"%p after %p, x %d, y %d, cx %d, cy %d flags %08x
\n
"
,
winpos
->
hwnd
,
winpos
->
hwndInsertAfter
,
winpos
->
x
,
winpos
->
y
,
winpos
->
cx
,
winpos
->
cy
,
winpos
->
flags
);
dump_winpos_flags
(
winpos
->
flags
);
/* Log only documented flags, win2k uses 0x1000 and 0x2000
* in the high word for internal purposes
...
...
@@ -2793,7 +2798,7 @@ static void test_mdi_messages(void)
flush_sequence
();
ShowWindow
(
mdi_child2
,
SW_MAXIMIZE
);
ok_sequence
(
WmMaximizeMDIchildInvisibleSeq
,
"ShowWindow(SW_MAXIMIZE):invisible MDI child"
,
TRU
E
);
ok_sequence
(
WmMaximizeMDIchildInvisibleSeq
,
"ShowWindow(SW_MAXIMIZE):invisible MDI child"
,
FALS
E
);
ok
(
GetWindowLongA
(
mdi_child2
,
GWL_STYLE
)
&
WS_VISIBLE
,
"MDI child should be visible
\n
"
);
ok
(
IsWindowVisible
(
mdi_child2
),
"MDI child should be visible
\n
"
);
...
...
@@ -2815,7 +2820,7 @@ static void test_mdi_messages(void)
ok_sequence
(
WmHideChildSeq
,
"ShowWindow(SW_HIDE):MDI child"
,
FALSE
);
ShowWindow
(
mdi_child2
,
SW_RESTORE
);
ok_sequence
(
WmRestoreMDIchildInisibleSeq
,
"ShowWindow(SW_RESTORE):invisible MDI child"
,
TRU
E
);
ok_sequence
(
WmRestoreMDIchildInisibleSeq
,
"ShowWindow(SW_RESTORE):invisible MDI child"
,
FALS
E
);
flush_sequence
();
ok
(
GetWindowLongA
(
mdi_child2
,
GWL_STYLE
)
&
WS_VISIBLE
,
"MDI child should be visible
\n
"
);
...
...
@@ -2839,13 +2844,13 @@ static void test_mdi_messages(void)
ok
(
GetFocus
()
==
0
,
"wrong focus window %p
\n
"
,
GetFocus
());
ShowWindow
(
mdi_child2
,
SW_MAXIMIZE
);
ok_sequence
(
WmMaximizeMDIchildVisibleSeq
,
"ShowWindow(SW_MAXIMIZE):MDI child"
,
TRU
E
);
ok_sequence
(
WmMaximizeMDIchildVisibleSeq
,
"ShowWindow(SW_MAXIMIZE):MDI child"
,
FALS
E
);
ok
(
GetActiveWindow
()
==
mdi_frame
,
"wrong active window %p
\n
"
,
GetActiveWindow
());
ok
(
GetFocus
()
==
0
,
"wrong focus window %p
\n
"
,
GetFocus
());
ShowWindow
(
mdi_child2
,
SW_RESTORE
);
ok_sequence
(
WmRestoreMDIchildVisibleSeq
,
"ShowWindow(SW_RESTORE):MDI child"
,
TRU
E
);
ok_sequence
(
WmRestoreMDIchildVisibleSeq
,
"ShowWindow(SW_RESTORE):MDI child"
,
FALS
E
);
ok
(
GetActiveWindow
()
==
mdi_frame
,
"wrong active window %p
\n
"
,
GetActiveWindow
());
ok
(
GetFocus
()
==
0
,
"wrong focus window %p
\n
"
,
GetFocus
());
...
...
@@ -3056,7 +3061,7 @@ static void test_mdi_messages(void)
mdi_client
=
CreateWindow
(
"MDI_client_class"
,
NULL
,
WS_CHILD
|
WS_CLIPCHILDREN
|
WS_VSCROLL
|
WS_HSCROLL
|
WS_VISIBLE
,
0
,
0
,
66
2
,
432
,
0
,
0
,
66
0
,
430
,
mdi_frame
,
0
,
GetModuleHandleA
(
0
),
&
client_cs
);
ok_sequence
(
WmCreateMDIclientSeq
,
"Create MDI client window"
,
FALSE
);
...
...
@@ -3065,7 +3070,7 @@ static void test_mdi_messages(void)
mdi_child
=
CreateWindowExA
(
WS_EX_MDICHILD
,
"MDI_child_class"
,
"MDI child"
,
WS_CHILD
|
WS_CLIPCHILDREN
|
WS_VSCROLL
|
WS_HSCROLL
,
0
,
0
,
65
4
,
443
,
0
,
0
,
65
0
,
440
,
mdi_client
,
0
,
GetModuleHandleA
(
0
),
NULL
);
ok_sequence
(
WmCreateMDIchildInvisibleParentSeq
,
"Create MDI child window with invisible parent"
,
FALSE
);
...
...
@@ -3140,6 +3145,7 @@ static INT_PTR CALLBACK TestModalDlgProcA(HWND hwnd, UINT message, WPARAM wParam
trace
(
"%p after %p, x %d, y %d, cx %d, cy %d flags %08x
\n
"
,
winpos
->
hwnd
,
winpos
->
hwndInsertAfter
,
winpos
->
x
,
winpos
->
y
,
winpos
->
cx
,
winpos
->
cy
,
winpos
->
flags
);
dump_winpos_flags
(
winpos
->
flags
);
/* Log only documented flags, win2k uses 0x1000 and 0x2000
* in the high word for internal purposes
...
...
@@ -5617,6 +5623,7 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message,
trace
(
"%p after %p, x %d, y %d, cx %d, cy %d flags %08x
\n
"
,
winpos
->
hwnd
,
winpos
->
hwndInsertAfter
,
winpos
->
x
,
winpos
->
y
,
winpos
->
cx
,
winpos
->
cy
,
winpos
->
flags
);
dump_winpos_flags
(
winpos
->
flags
);
/* Log only documented flags, win2k uses 0x1000 and 0x2000
* in the high word for internal purposes
...
...
@@ -5761,6 +5768,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam
trace
(
"%p after %p, x %d, y %d, cx %d, cy %d flags %08x
\n
"
,
winpos
->
hwnd
,
winpos
->
hwndInsertAfter
,
winpos
->
x
,
winpos
->
y
,
winpos
->
cx
,
winpos
->
cy
,
winpos
->
flags
);
dump_winpos_flags
(
winpos
->
flags
);
/* Log only documented flags, win2k uses 0x1000 and 0x2000
* in the high word for internal purposes
...
...
@@ -5825,6 +5833,7 @@ static LRESULT WINAPI TestDlgProcA(HWND hwnd, UINT message, WPARAM wParam, LPARA
trace
(
"%p after %p, x %d, y %d, cx %d, cy %d flags %08x
\n
"
,
winpos
->
hwnd
,
winpos
->
hwndInsertAfter
,
winpos
->
x
,
winpos
->
y
,
winpos
->
cx
,
winpos
->
cy
,
winpos
->
flags
);
dump_winpos_flags
(
winpos
->
flags
);
/* Log only documented flags, win2k uses 0x1000 and 0x2000
* in the high word for internal purposes
...
...
dlls/user32/win.c
View file @
d57dc9da
...
...
@@ -934,7 +934,7 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, ATOM classAtom, UINT flags )
{
TRACE
(
"Restoring current maximized child %p
\n
"
,
top_child
);
SendMessageW
(
top_child
,
WM_SETREDRAW
,
FALSE
,
0
);
ShowWindow
(
top_child
,
SW_RESTORE
);
ShowWindow
(
top_child
,
SW_SHOWNORMAL
);
SendMessageW
(
top_child
,
WM_SETREDRAW
,
TRUE
,
0
);
}
}
...
...
dlls/winex11.drv/window.c
View file @
d57dc9da
...
...
@@ -1109,7 +1109,7 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode )
if
(
!
(
wndPtr
=
WIN_GetPtr
(
hwnd
)))
return
FALSE
;
/* yes, even if the CBT hook was called with HWND_TOP */
insert_after
=
(
(
wndPtr
->
dwStyle
&
(
WS_CHILD
|
WS_MAXIMIZE
))
==
WS_CHILD
)
?
HWND_BOTTOM
:
HWND_TOP
;
insert_after
=
(
wndPtr
->
dwStyle
&
WS_CHILD
)
?
HWND_BOTTOM
:
HWND_TOP
;
X11DRV_SetWindowPos
(
hwnd
,
insert_after
,
&
wndPtr
->
rectWindow
,
&
rect
,
0
,
NULL
);
...
...
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