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
ef48187a
Commit
ef48187a
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_TEXT behavior.
parent
bb0f1981
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
mciqtz.c
dlls/mciqtz32/mciqtz.c
+3
-1
mci.c
dlls/winmm/tests/mci.c
+3
-3
No files found.
dlls/mciqtz32/mciqtz.c
View file @
ef48187a
...
...
@@ -1028,8 +1028,10 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS
ShowWindow
(
wma
->
parent
,
lpParms
->
nCmdShow
);
}
if
(
dwFlags
&
MCI_DGV_WINDOW_TEXT
)
{
if
(
!
wma
->
parent
)
return
MCIERR_NO_WINDOW
;
TRACE
(
"Setting caption to %s
\n
"
,
debugstr_w
(
lpParms
->
lpstrText
));
IVideoWindow_put_Caption
(
wma
->
vidwin
,
lpParms
->
lpstrText
);
SetWindowTextW
(
wma
->
parent
,
lpParms
->
lpstrText
);
}
return
0
;
}
...
...
dlls/winmm/tests/mci.c
View file @
ef48187a
...
...
@@ -1428,7 +1428,7 @@ static void test_asyncWaveTypeMpegvideo(HWND hwnd)
ok
(
err
==
MCIERR_NO_WINDOW
,
"mci window state returned %s
\n
"
,
dbg_mcierr
(
err
));
err
=
mciSendStringA
(
"window mysound text abracadabra"
,
NULL
,
0
,
NULL
);
todo_wine
ok
(
err
==
MCIERR_NO_WINDOW
,
"mci window text returned %s
\n
"
,
dbg_mcierr
(
err
));
ok
(
err
==
MCIERR_NO_WINDOW
,
"mci window text 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
));
...
...
@@ -1707,7 +1707,7 @@ static void test_video_window(void)
err
=
mciSendCommandW
(
id
,
MCI_WINDOW
,
MCI_DGV_WINDOW_TEXT
,
(
DWORD_PTR
)
&
parm
);
ok
(
!
err
,
"Got %s.
\n
"
,
dbg_mcierr
(
err
));
GetWindowTextW
(
main_window
,
buffer
,
ARRAY_SIZE
(
buffer
));
todo_wine
ok
(
!
wcscmp
(
buffer
,
parm
.
win
.
lpstrText
),
"Got %s, expected %s
\n
"
,
wine_dbgstr_w
(
buffer
),
wine_dbgstr_w
(
parm
.
win
.
lpstrText
));
ok
(
!
wcscmp
(
buffer
,
parm
.
win
.
lpstrText
),
"Got %s, expected %s
\n
"
,
wine_dbgstr_w
(
buffer
),
wine_dbgstr_w
(
parm
.
win
.
lpstrText
));
/* video window is reset to the default window, which is visible again */
parm
.
win
.
hWnd
=
NULL
;
...
...
@@ -1732,7 +1732,7 @@ static void test_video_window(void)
err
=
mciSendCommandW
(
id
,
MCI_WINDOW
,
MCI_DGV_WINDOW_TEXT
,
(
DWORD_PTR
)
&
parm
);
ok
(
!
err
,
"Got %s.
\n
"
,
dbg_mcierr
(
err
));
GetWindowTextW
(
video_window
,
buffer
,
ARRAY_SIZE
(
buffer
));
todo_wine
ok
(
!
wcscmp
(
buffer
,
parm
.
win
.
lpstrText
),
"Got %s, expected %s
\n
"
,
wine_dbgstr_w
(
buffer
),
wine_dbgstr_w
(
parm
.
win
.
lpstrText
));
ok
(
!
wcscmp
(
buffer
,
parm
.
win
.
lpstrText
),
"Got %s, expected %s
\n
"
,
wine_dbgstr_w
(
buffer
),
wine_dbgstr_w
(
parm
.
win
.
lpstrText
));
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