From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/mciqtz32/mciqtz.c | 2 +- dlls/winmm/tests/mci.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index bcb0645e248..86ab15a45ee 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -1040,7 +1040,7 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS } if (dwFlags & MCI_DGV_WINDOW_TEXT) { TRACE("Setting caption to %s\n", debugstr_w(lpParms->lpstrText)); - IVideoWindow_put_Caption(wma->vidwin, lpParms->lpstrText); + SetWindowTextW(wma->parent, lpParms->lpstrText); } return 0; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 9d0b5bba938..07c39e92ca3 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1502,7 +1502,7 @@ static void test_video_window(HWND hwnd) ok(!err,"mciCommand window text returned %s\n", dbg_mcierr(err)); GetWindowTextW(video_window, text, ARRAY_SIZE(text)); - todo_wine ok(!wcscmp(text, parm.win.lpstrText),"expected %s, got %s\n", debugstr_w(parm.win.lpstrText), debugstr_w(text)); + ok(!wcscmp(text, parm.win.lpstrText),"expected %s, got %s\n", debugstr_w(parm.win.lpstrText), debugstr_w(text)); ok(!IsWindowVisible(video_window), "video window (%p) should be hidden\n", video_window); @@ -1542,13 +1542,13 @@ static void test_video_window(HWND hwnd) ok(!err,"mciCommand window text returned %s\n", dbg_mcierr(err)); GetWindowTextW(hwnd, text, ARRAY_SIZE(text)); - todo_wine ok(!wcscmp(text, parm.win.lpstrText),"expected %s, got %s\n", debugstr_w(parm.win.lpstrText), debugstr_w(text)); + ok(!wcscmp(text, parm.win.lpstrText),"expected %s, got %s\n", debugstr_w(parm.win.lpstrText), debugstr_w(text)); parm.win.lpstrText = NULL; err = mciSendCommandW(wDeviceID, MCI_WINDOW, MCI_DGV_WINDOW_TEXT, (DWORD_PTR)&parm); ok(!err,"mciCommand window text returned %s\n", dbg_mcierr(err)); GetWindowTextW(hwnd, text, ARRAY_SIZE(text)); - todo_wine ok(!wcscmp(text, L""), "expected L\"\", got %s\n", debugstr_w(text)); + ok(!wcscmp(text, L""), "expected L\"\", got %s\n", debugstr_w(text)); /* MCI_PLAY shows parent window */ err = mciSendCommandW(wDeviceID, MCI_PLAY, 0, (DWORD_PTR)&parm); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/370