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
6f7c0c76
Commit
6f7c0c76
authored
Jul 31, 2022
by
Akihiro Sagawa
Committed by
Alexandre Julliard
Aug 10, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mciqtz32: Hide the default video window when switching to another one.
Signed-off-by:
Akihiro Sagawa
<
sagawa.aki@gmail.com
>
parent
9cdc6812
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
mciqtz.c
dlls/mciqtz32/mciqtz.c
+3
-0
mci.c
dlls/winmm/tests/mci.c
+3
-3
No files found.
dlls/mciqtz32/mciqtz.c
View file @
6f7c0c76
...
@@ -1008,6 +1008,9 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS
...
@@ -1008,6 +1008,9 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS
IBasicVideo_GetVideoSize
(
wma
->
vidbasic
,
&
width
,
&
height
);
IBasicVideo_GetVideoSize
(
wma
->
vidbasic
,
&
width
,
&
height
);
IVideoWindow_SetWindowPosition
(
wma
->
vidwin
,
0
,
0
,
width
,
height
);
IVideoWindow_SetWindowPosition
(
wma
->
vidwin
,
0
,
0
,
width
,
height
);
if
(
wma
->
parent
==
wma
->
window
)
ShowWindow
(
wma
->
window
,
SW_HIDE
);
wma
->
parent
=
hwnd
;
wma
->
parent
=
hwnd
;
}
}
}
}
...
...
dlls/winmm/tests/mci.c
View file @
6f7c0c76
...
@@ -1658,7 +1658,7 @@ static void test_video_window(void)
...
@@ -1658,7 +1658,7 @@ static void test_video_window(void)
style
=
GetWindowLongW
(
video_window
,
GWL_STYLE
);
style
=
GetWindowLongW
(
video_window
,
GWL_STYLE
);
expected
=
testcase
[
i
].
expected_style
;
expected
=
testcase
[
i
].
expected_style
;
todo_wine
ok
(
style
==
expected
,
"Video window %p: got style %#lx, expected %#lx.
\n
"
,
ok
(
style
==
expected
,
"Video window %p: got style %#lx, expected %#lx.
\n
"
,
video_window
,
style
,
expected
);
video_window
,
style
,
expected
);
/* destination size is reset to the source video size */
/* destination size is reset to the source video size */
...
@@ -1688,14 +1688,14 @@ static void test_video_window(void)
...
@@ -1688,14 +1688,14 @@ static void test_video_window(void)
ok
(
!
err
,
"Got %s.
\n
"
,
dbg_mcierr
(
err
));
ok
(
!
err
,
"Got %s.
\n
"
,
dbg_mcierr
(
err
));
ok
(
IsWindowVisible
(
main_window
),
"Main window should be shown.
\n
"
);
ok
(
IsWindowVisible
(
main_window
),
"Main window should be shown.
\n
"
);
ok
(
IsWindow
(
video_window
),
"Video window should exist.
\n
"
);
ok
(
IsWindow
(
video_window
),
"Video window should exist.
\n
"
);
todo_wine
ok
(
!
IsWindowVisible
(
video_window
),
"Video window should be hidden.
\n
"
);
ok
(
!
IsWindowVisible
(
video_window
),
"Video window should be hidden.
\n
"
);
/* video window is reset to the default window, which is visible again */
/* video window is reset to the default window, which is visible again */
parm
.
win
.
hWnd
=
NULL
;
parm
.
win
.
hWnd
=
NULL
;
err
=
mciSendCommandW
(
id
,
MCI_WINDOW
,
MCI_DGV_WINDOW_HWND
,
(
DWORD_PTR
)
&
parm
);
err
=
mciSendCommandW
(
id
,
MCI_WINDOW
,
MCI_DGV_WINDOW_HWND
,
(
DWORD_PTR
)
&
parm
);
ok
(
!
err
,
"Got %s.
\n
"
,
dbg_mcierr
(
err
));
ok
(
!
err
,
"Got %s.
\n
"
,
dbg_mcierr
(
err
));
ok
(
IsWindowVisible
(
main_window
),
"Main window should be shown.
\n
"
);
ok
(
IsWindowVisible
(
main_window
),
"Main window should be shown.
\n
"
);
ok
(
IsWindowVisible
(
video_window
),
"Video window should be shown.
\n
"
);
todo_wine
ok
(
IsWindowVisible
(
video_window
),
"Video window should be shown.
\n
"
);
err
=
mciSendCommandW
(
id
,
MCI_WHERE
,
MCI_DGV_WHERE_DESTINATION
,
(
DWORD_PTR
)
&
parm
);
err
=
mciSendCommandW
(
id
,
MCI_WHERE
,
MCI_DGV_WHERE_DESTINATION
,
(
DWORD_PTR
)
&
parm
);
ok
(
!
err
,
"Got %s.
\n
"
,
dbg_mcierr
(
err
));
ok
(
!
err
,
"Got %s.
\n
"
,
dbg_mcierr
(
err
));
...
...
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