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
1c1a2121
Commit
1c1a2121
authored
Aug 18, 2022
by
Akihiro Sagawa
Committed by
Alexandre Julliard
Aug 19, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mciqtz32: Fix MCI_DGV_WINDOW_STATE behavior.
parent
86181120
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
mciqtz.c
dlls/mciqtz32/mciqtz.c
+3
-1
mci.c
dlls/winmm/tests/mci.c
+4
-4
No files found.
dlls/mciqtz32/mciqtz.c
View file @
1c1a2121
...
...
@@ -1022,8 +1022,10 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS
}
}
if
(
dwFlags
&
MCI_DGV_WINDOW_STATE
)
{
if
(
!
wma
->
parent
)
return
MCIERR_NO_WINDOW
;
TRACE
(
"Setting nCmdShow to %d
\n
"
,
lpParms
->
nCmdShow
);
IVideoWindow_put_WindowState
(
wma
->
vidwin
,
lpParms
->
nCmdShow
);
ShowWindow
(
wma
->
parent
,
lpParms
->
nCmdShow
);
}
if
(
dwFlags
&
MCI_DGV_WINDOW_TEXT
)
{
TRACE
(
"Setting caption to %s
\n
"
,
debugstr_w
(
lpParms
->
lpstrText
));
...
...
dlls/winmm/tests/mci.c
View file @
1c1a2121
...
...
@@ -1425,7 +1425,7 @@ static void test_asyncWaveTypeMpegvideo(HWND hwnd)
test_notification
(
hwnd
,
"play"
,
0
);
err
=
mciSendStringA
(
"window mysound state hide"
,
NULL
,
0
,
NULL
);
todo_wine
ok
(
err
==
MCIERR_NO_WINDOW
,
"mci window state returned %s
\n
"
,
dbg_mcierr
(
err
));
ok
(
err
==
MCIERR_NO_WINDOW
,
"mci window state returned %s
\n
"
,
dbg_mcierr
(
err
));
err
=
mciSendStringA
(
"close mysound wait"
,
NULL
,
0
,
NULL
);
ok
(
!
err
,
"mci close wait returned %s
\n
"
,
dbg_mcierr
(
err
));
...
...
@@ -1696,7 +1696,7 @@ static void test_video_window(void)
parm
.
win
.
nCmdShow
=
SW_MINIMIZE
;
err
=
mciSendCommandW
(
id
,
MCI_WINDOW
,
MCI_DGV_WINDOW_STATE
,
(
DWORD_PTR
)
&
parm
);
ok
(
!
err
,
"Got %s.
\n
"
,
dbg_mcierr
(
err
));
todo_wine
ok
(
IsIconic
(
main_window
),
"Video window should be minimized.
\n
"
);
ok
(
IsIconic
(
main_window
),
"Video window should be minimized.
\n
"
);
/* video window is reset to the default window, which is visible again */
parm
.
win
.
hWnd
=
NULL
;
...
...
@@ -1707,14 +1707,14 @@ static void test_video_window(void)
err
=
mciSendCommandW
(
id
,
MCI_WHERE
,
MCI_DGV_WHERE_DESTINATION
,
(
DWORD_PTR
)
&
parm
);
ok
(
!
err
,
"Got %s.
\n
"
,
dbg_mcierr
(
err
));
todo_wine
ok
(
EqualRect
(
&
parm
.
where
.
rc
,
&
src_rc
),
"Got destination rect %s, expected %s.
\n
"
,
ok
(
EqualRect
(
&
parm
.
where
.
rc
,
&
src_rc
),
"Got destination rect %s, expected %s.
\n
"
,
wine_dbgstr_rect
(
&
parm
.
where
.
rc
),
wine_dbgstr_rect
(
&
src_rc
));
/* Test MCI_DGV_WINDOW_STATE for the default window. */
parm
.
win
.
nCmdShow
=
SW_MINIMIZE
;
err
=
mciSendCommandW
(
id
,
MCI_WINDOW
,
MCI_DGV_WINDOW_STATE
,
(
DWORD_PTR
)
&
parm
);
ok
(
!
err
,
"Got %s.
\n
"
,
dbg_mcierr
(
err
));
todo_wine
ok
(
IsIconic
(
video_window
),
"Video window should be minimized.
\n
"
);
ok
(
IsIconic
(
video_window
),
"Video window should be minimized.
\n
"
);
err
=
mciSendCommandW
(
id
,
MCI_CLOSE
,
0
,
0
);
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