August 2022 - Wine-Commits - list.winehq.org

Akihiro Sagawa : winmm/tests: Add tests for dimensions of video window.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 4bf8935d43f2432d03a9afe54e88ac7c8777f863 URL: https://gitlab.winehq.org/wine/wine/-/commit/4bf8935d43f2432d03a9afe54e88ac… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 5 22:48:42 2022 +0900 winmm/tests: Add tests for dimensions of video window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/mci.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index bf609a9d26d..d7686ec54b1 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -39,6 +39,7 @@ typedef union { MCI_SYSINFO_PARMSA sys; MCI_SEEK_PARMS seek; MCI_DGV_OPEN_PARMSW dgv_open; + MCI_DGV_WHERE_PARMS where; MCI_GENERIC_PARMS gen; } MCI_PARMS_UNION; @@ -1537,6 +1538,7 @@ static void test_video_window(void) { HWND parent_window = NULL, hwnd, video_window; DWORD style, expected; + RECT rc, src_rc, win_rc; winetest_push_context("%u", i); @@ -1585,6 +1587,49 @@ static void test_video_window(void) todo_wine_if (i != 3) ok(style == expected, "Got style %#lx for window %p, expected %#lx.\n", style, video_window, expected); + /* Get the source video size. */ + err = mciSendCommandW(id, MCI_WHERE, MCI_DGV_WHERE_SOURCE, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + SetRect(&rc, 0, 0, 32, 24); + ok(EqualRect(&parm.where.rc, &rc), "Got source rect %s, expected %s.\n", + wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&rc)); + src_rc = parm.where.rc; + + /* Test the default video destination size. */ + err = mciSendCommandW(id, MCI_WHERE, MCI_DGV_WHERE_DESTINATION, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + if (style & (WS_POPUP | WS_CHILD)) + rc = src_rc; + else + /* The video destination is stretched to fit the window, + * in particular if the video width is less than SM_CXMIN. */ + GetClientRect(video_window, &rc); + + todo_wine_if (style & (WS_POPUP | WS_CHILD)) + ok(EqualRect(&parm.where.rc, &rc), "Got destination rect %s, expected %s.\n", + wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&rc)); + + /* Test the default video window size. */ + rc = src_rc; + /* Windows is broken and always uses WS_OVERLAPPEDWINDOW regardless of + * the window's actual style. */ + AdjustWindowRect(&rc, WS_OVERLAPPEDWINDOW, FALSE); + OffsetRect(&rc, -rc.left, -rc.top); + rc.right = max(rc.right, GetSystemMetrics(SM_CXMIN)); + + GetWindowRect(video_window, &win_rc); + OffsetRect(&rc, win_rc.left, win_rc.top); + todo_wine_if (testcase[i].style & WS_CHILD) + ok(EqualRect(&rc, &win_rc), "Got window rect %s, expected %s.\n", + wine_dbgstr_rect(&win_rc), wine_dbgstr_rect(&rc)); + + err = mciSendCommandW(id, MCI_WHERE, MCI_DGV_WHERE_WINDOW, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + win_rc.right -= win_rc.left; + win_rc.bottom -= win_rc.top; + ok(EqualRect(&win_rc, &parm.where.rc), "Got rect %s, expected %s.\n", + wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&win_rc)); + err = mciSendCommandW(id, MCI_STOP, 0, (DWORD_PTR)&parm); ok(!err, "Got %s.\n", dbg_mcierr(err));

1 0

Akihiro Sagawa : winmm/tests: Add tests for destination of video window.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: e08631097eae8a2bcfd125cea2b09225789913ad URL: https://gitlab.winehq.org/wine/wine/-/commit/e08631097eae8a2bcfd125cea2b092… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jul 31 20:49:25 2022 +0900 winmm/tests: Add tests for destination of video window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/mci.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index d7686ec54b1..a0989d542c5 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -39,7 +39,9 @@ typedef union { MCI_SYSINFO_PARMSA sys; MCI_SEEK_PARMS seek; MCI_DGV_OPEN_PARMSW dgv_open; + MCI_DGV_PUT_PARMS put; MCI_DGV_WHERE_PARMS where; + MCI_DGV_WINDOW_PARMSW win; MCI_GENERIC_PARMS gen; } MCI_PARMS_UNION; @@ -1536,12 +1538,14 @@ static void test_video_window(void) for (i = 0; i < ARRAY_SIZE(testcase); ++i) { - HWND parent_window = NULL, hwnd, video_window; + HWND parent_window = NULL, hwnd, video_window, main_window; DWORD style, expected; RECT rc, src_rc, win_rc; winetest_push_context("%u", i); + main_window = CreateWindowExA(0, "static", "main", + WS_POPUPWINDOW, 0, 0, 10, 10, 0, 0, 0, NULL); if (testcase[i].open_flags & MCI_DGV_OPEN_PARENT) parent_window = CreateWindowExA(0, "static", "parent", WS_POPUPWINDOW, 0, 0, 100, 100, 0, 0, 0, NULL); @@ -1645,6 +1649,67 @@ static void test_video_window(void) ok(IsWindowVisible(video_window), "Video window should be visible.\n"); + /* Test MCI_DGV_WINDOW_HWND. */ + parm.win.hWnd = main_window; + err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + ok(!IsWindowVisible(main_window), "Main window should be hidden.\n"); + + hwnd = GetWindow(main_window, GW_CHILD); + todo_wine ok(hwnd != video_window, + "Video window (%p) and child window (%p) should be different.\n", video_window, hwnd); + style = GetWindowLongW(hwnd, GWL_STYLE); + expected = WS_CHILD | WS_VISIBLE; + todo_wine ok(style == expected, "Child window %p: got style %#lx, expected %#lx.\n", + hwnd, style, expected); + + style = GetWindowLongW(video_window, GWL_STYLE); + expected = testcase[i].expected_style; + todo_wine ok(style == expected, "Video window %p: got style %#lx, expected %#lx.\n", + video_window, style, expected); + + /* destination size is reset to the source video size */ + 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", + wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&src_rc)); + + /* destination size isn't reset unless the destination window is changed */ + SetRect(&rc, 0, 0, src_rc.right * 2, src_rc.bottom / 2); + parm.put.rc = rc; + err = mciSendCommandW(id, MCI_PUT, MCI_DGV_PUT_DESTINATION | MCI_DGV_RECT, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + + parm.win.hWnd = main_window; + err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + ok(!IsWindowVisible(main_window), "Main window should be hidden.\n"); + + err = mciSendCommandW(id, MCI_WHERE, MCI_DGV_WHERE_DESTINATION, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + todo_wine_if ((testcase[i].style & (WS_CHILD | WS_POPUP)) != WS_CHILD) + ok(EqualRect(&parm.where.rc, &rc), "Got destination rect %s, expected %s.\n", + wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&rc)); + + /* MCI_PLAY shows current video window */ + err = mciSendCommandW(id, MCI_PLAY, 0, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + todo_wine ok(IsWindowVisible(main_window), "Main window should be shown.\n"); + ok(IsWindow(video_window), "Video window should exist.\n"); + ok(!IsWindowVisible(video_window), "Video window should be hidden.\n"); + + /* video window is reset to the default window, which is visible again */ + parm.win.hWnd = NULL; + err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + todo_wine ok(IsWindowVisible(main_window), "Main 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); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + todo_wine 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)); + next: err = mciSendCommandW(id, MCI_CLOSE, 0, 0); ok(!err, "Got %s.\n", dbg_mcierr(err)); @@ -1654,6 +1719,7 @@ next: ret = DestroyWindow(parent_window); ok(ret, "Failed to destroy parent window\n"); } + DestroyWindow(main_window); winetest_pop_context(); }

1 0

Akihiro Sagawa : mciqtz32: Fix MCI_DGV_WHERE_WINDOW behavior.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 23dabd570fbc54990743fcee6ed3ffb842593d01 URL: https://gitlab.winehq.org/wine/wine/-/commit/23dabd570fbc54990743fcee6ed3ff… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jul 31 20:49:25 2022 +0900 mciqtz32: Fix MCI_DGV_WHERE_WINDOW behavior. Use parent window dimensions instead of IVideoWindow ones. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/mciqtz32/mciqtz.c | 4 +++- dlls/winmm/tests/mci.c | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 2439bfeea62..fb941f26a86 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -966,7 +966,9 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp rc.bottom -= rc.top; TRACE("MCI_DGV_WHERE_WINDOW_MAX %s\n", wine_dbgstr_rect(&rc)); } else { - IVideoWindow_GetWindowPosition(wma->vidwin, &rc.left, &rc.top, &rc.right, &rc.bottom); + GetWindowRect(wma->parent, &rc); + rc.right -= rc.left; + rc.bottom -= rc.top; TRACE("MCI_DGV_WHERE_WINDOW %s\n", wine_dbgstr_rect(&rc)); } } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index ee75a05d9c2..c4a92221d0f 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1624,9 +1624,8 @@ static void test_video_window(void) ok(!err, "Got %s.\n", dbg_mcierr(err)); win_rc.right -= win_rc.left; win_rc.bottom -= win_rc.top; - todo_wine_if (!(style & WS_CHILD)) - ok(EqualRect(&win_rc, &parm.where.rc), "Got rect %s, expected %s.\n", - wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&win_rc)); + ok(EqualRect(&win_rc, &parm.where.rc), "Got rect %s, expected %s.\n", + wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&win_rc)); err = mciSendCommandW(id, MCI_STOP, 0, (DWORD_PTR)&parm); ok(!err, "Got %s.\n", dbg_mcierr(err));

1 0

Akihiro Sagawa : mciqtz32: Hide the default video window when switching to another one.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 6f7c0c76bf209c3d00419edf443fb5253b4e0510 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f7c0c76bf209c3d00419edf443fb5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jul 31 20:49:25 2022 +0900 mciqtz32: Hide the default video window when switching to another one. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/mciqtz32/mciqtz.c | 3 +++ dlls/winmm/tests/mci.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 89f128831b6..952015e4c9f 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -1008,6 +1008,9 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS IBasicVideo_GetVideoSize(wma->vidbasic, &width, &height); IVideoWindow_SetWindowPosition(wma->vidwin, 0, 0, width, height); + if (wma->parent == wma->window) + ShowWindow(wma->window, SW_HIDE); + wma->parent = hwnd; } } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index dc3a4973362..18dfdf1f74b 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1658,7 +1658,7 @@ static void test_video_window(void) style = GetWindowLongW(video_window, GWL_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); /* destination size is reset to the source video size */ @@ -1688,14 +1688,14 @@ static void test_video_window(void) ok(!err, "Got %s.\n", dbg_mcierr(err)); ok(IsWindowVisible(main_window), "Main window should be shown.\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 */ parm.win.hWnd = NULL; err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm); ok(!err, "Got %s.\n", dbg_mcierr(err)); 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); ok(!err, "Got %s.\n", dbg_mcierr(err));

1 0

Akihiro Sagawa : winmm/tests: Add tests for window style of video window.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 34671bdcff1c99acfc8f887519054363bd483078 URL: https://gitlab.winehq.org/wine/wine/-/commit/34671bdcff1c99acfc8f8875190543… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Aug 6 17:45:36 2022 +0900 winmm/tests: Add tests for window style of video window. The test shows that even if MCI_DGV_OPEN_PARENT is specified, the video window is shown. In other words, it doesn't imply the window is a child window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/mci.c | 151 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 120 insertions(+), 31 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index c8ba5440287..bf609a9d26d 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1488,41 +1488,130 @@ static void test_video_window(void) { const WCHAR *filename = load_resource(L"test.mpg"); MCI_PARMS_UNION parm; - HWND video_window; + unsigned int i; MCIDEVICEID id; MCIERROR err; BOOL ret; - parm.dgv_open.lpstrDeviceType = (WCHAR *)L"MPEGVideo"; - parm.dgv_open.lpstrElementName = (WCHAR *)filename; - err = mciSendCommandW(0, MCI_OPEN, MCI_OPEN_ELEMENT | MCI_OPEN_TYPE, (DWORD_PTR)&parm); - ok(!err, "Got %s.\n", dbg_mcierr(err)); - id = parm.dgv_open.wDeviceID; - - err = mciSendCommandW(id, MCI_PLAY, 0, (DWORD_PTR)&parm); - ok(!err, "Got %s.\n", dbg_mcierr(err)); - - video_window = NULL; - EnumWindows(my_visible_window_proc, (LPARAM)&video_window); - ok(video_window != NULL, "Video window should be shown.\n"); - - err = mciSendCommandW(id, MCI_STOP, 0, (DWORD_PTR)&parm); - ok(!err, "Got %s.\n", dbg_mcierr(err)); - - ok(IsWindowVisible(video_window), "Video window should be visible.\n"); - - err = mciSendCommandW(id, MCI_PLAY, 0, (DWORD_PTR)&parm); - ok(!err, "Got %s.\n", dbg_mcierr(err)); - - ok(IsWindowVisible(video_window), "Video window should be visible.\n"); - - err = mciSendCommandW(id, MCI_SEEK, MCI_SEEK_TO_START, (DWORD_PTR)&parm); - ok(!err, "Got %s.\n", dbg_mcierr(err)); - - ok(IsWindowVisible(video_window), "Video window should be visible.\n"); - - err = mciSendCommandW(id, MCI_CLOSE, 0, 0); - ok(!err, "Got %s.\n", dbg_mcierr(err)); + static const struct + { + DWORD open_flags; + DWORD style; + DWORD expected_style; + } + testcase[] = + { + { + 0, + 0, + (WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS) & ~WS_MAXIMIZEBOX, + }, + { + MCI_DGV_OPEN_PARENT, + 0, + (WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS) & ~WS_MAXIMIZEBOX, + }, + { + MCI_DGV_OPEN_WS, + 0, + WS_BORDER | WS_CLIPSIBLINGS | WS_BORDER | WS_DLGFRAME, + }, + { + MCI_DGV_OPEN_WS, + WS_POPUPWINDOW, + WS_POPUPWINDOW | WS_CLIPSIBLINGS, + }, + { + MCI_DGV_OPEN_PARENT | MCI_DGV_OPEN_WS, + WS_OVERLAPPEDWINDOW, + WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS, + }, + { + MCI_DGV_OPEN_PARENT | MCI_DGV_OPEN_WS, + WS_CHILDWINDOW, + WS_CHILD, + }, + }; + + for (i = 0; i < ARRAY_SIZE(testcase); ++i) + { + HWND parent_window = NULL, hwnd, video_window; + DWORD style, expected; + + winetest_push_context("%u", i); + + if (testcase[i].open_flags & MCI_DGV_OPEN_PARENT) + parent_window = CreateWindowExA(0, "static", "parent", + WS_POPUPWINDOW, 0, 0, 100, 100, 0, 0, 0, NULL); + + parm.dgv_open.lpstrDeviceType = (WCHAR *)L"MPEGVideo"; + parm.dgv_open.lpstrElementName = (WCHAR *)filename; + parm.dgv_open.hWndParent = parent_window; + parm.dgv_open.dwStyle = testcase[i].style; + err = mciSendCommandW(0, MCI_OPEN, + MCI_OPEN_ELEMENT | MCI_OPEN_TYPE | testcase[i].open_flags, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + id = parm.dgv_open.wDeviceID; + + err = mciSendCommandW(id, MCI_PLAY, 0, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + + if (!(testcase[i].style & WS_CHILD)) + { + video_window = NULL; + EnumWindows(my_visible_window_proc, (LPARAM)&video_window); + todo_wine_if (testcase[i].open_flags & MCI_DGV_OPEN_PARENT) + ok(video_window != NULL, "Video window should be shown.\n"); + + /* FIXME: Remove once Wine is fixed */ + if (!video_window) goto next; + + hwnd = GetWindow(video_window, GW_OWNER); + todo_wine_if (testcase[i].open_flags & MCI_DGV_OPEN_PARENT) + ok(hwnd == parent_window, "Got owner %p, expected %p.\n", hwnd, parent_window); + } + else + { + ok(!IsWindowVisible(parent_window), "Parent window should be hidden.\n"); + ShowWindow(parent_window, SW_SHOWNA); + + hwnd = GetWindow(parent_window, GW_CHILD); + ok(hwnd != NULL, "Child video window should be shown.\n"); + video_window = hwnd; + } + + expected = testcase[i].expected_style | WS_VISIBLE; + style = GetWindowLongW(video_window, GWL_STYLE); + todo_wine_if (i != 3) + ok(style == expected, "Got style %#lx for window %p, expected %#lx.\n", style, video_window, expected); + + err = mciSendCommandW(id, MCI_STOP, 0, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + + ok(IsWindowVisible(video_window), "Video window should be visible.\n"); + + err = mciSendCommandW(id, MCI_PLAY, 0, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + + ok(IsWindowVisible(video_window), "Video window should be visible.\n"); + + err = mciSendCommandW(id, MCI_SEEK, MCI_SEEK_TO_START, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + + ok(IsWindowVisible(video_window), "Video window should be visible.\n"); + +next: + err = mciSendCommandW(id, MCI_CLOSE, 0, 0); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + + if (parent_window) + { + ret = DestroyWindow(parent_window); + ok(ret, "Failed to destroy parent window\n"); + } + + winetest_pop_context(); + } ret = DeleteFileW(filename); ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError());

1 0

Akihiro Sagawa : mciqtz32: Don't hide video window when stopping.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 92f661da19d28e5a98756d03ace31167dbf4c216 URL: https://gitlab.winehq.org/wine/wine/-/commit/92f661da19d28e5a98756d03ace311… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jul 31 20:49:25 2022 +0900 mciqtz32: Don't hide video window when stopping. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/mciqtz32/mciqtz.c | 3 --- dlls/winmm/tests/mci.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 5bde3f5dd14..05929d25680 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -528,9 +528,6 @@ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa wma->thread = NULL; } - if (!wma->parent) - IVideoWindow_put_Visible(wma->vidwin, OAFALSE); - return 0; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index cc73e083b1f..c8ba5440287 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1509,7 +1509,7 @@ static void test_video_window(void) err = mciSendCommandW(id, MCI_STOP, 0, (DWORD_PTR)&parm); ok(!err, "Got %s.\n", dbg_mcierr(err)); - todo_wine ok(IsWindowVisible(video_window), "Video window should be visible.\n"); + ok(IsWindowVisible(video_window), "Video window should be visible.\n"); err = mciSendCommandW(id, MCI_PLAY, 0, (DWORD_PTR)&parm); ok(!err, "Got %s.\n", dbg_mcierr(err)); @@ -1519,7 +1519,7 @@ static void test_video_window(void) err = mciSendCommandW(id, MCI_SEEK, MCI_SEEK_TO_START, (DWORD_PTR)&parm); ok(!err, "Got %s.\n", dbg_mcierr(err)); - todo_wine ok(IsWindowVisible(video_window), "Video window should be visible.\n"); + ok(IsWindowVisible(video_window), "Video window should be visible.\n"); err = mciSendCommandW(id, MCI_CLOSE, 0, 0); ok(!err, "Got %s.\n", dbg_mcierr(err));

1 0

Akihiro Sagawa : winmm/tests: Add tests for visibility of video window.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 524a92fb330c9bc6c587a76e65d7807e5dcad9fa URL: https://gitlab.winehq.org/wine/wine/-/commit/524a92fb330c9bc6c587a76e65d780… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jul 31 20:49:25 2022 +0900 winmm/tests: Add tests for visibility of video window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/Makefile.in | 3 ++ dlls/winmm/tests/mci.c | 92 +++++++++++++++++++++++++++++++++++++++++++ dlls/winmm/tests/rsrc.rc | 25 ++++++++++++ dlls/winmm/tests/test.mpg | Bin 0 -> 12288 bytes 4 files changed, 120 insertions(+) diff --git a/dlls/winmm/tests/Makefile.in b/dlls/winmm/tests/Makefile.in index 1b191cb5747..2b475dd89c3 100644 --- a/dlls/winmm/tests/Makefile.in +++ b/dlls/winmm/tests/Makefile.in @@ -12,3 +12,6 @@ C_SRCS = \ mmio.c \ timer.c \ wave.c + +RC_SRCS = \ + rsrc.rc diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 2e31cf51708..cc73e083b1f 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -23,6 +23,7 @@ #include "windows.h" #include "mmsystem.h" #include "mmreg.h" +#include "digitalv.h" #include "wine/test.h" /* The tests use the MCI's own save capability to create the tempfile.wav to play. @@ -37,6 +38,7 @@ typedef union { MCI_GETDEVCAPS_PARMS caps; MCI_SYSINFO_PARMSA sys; MCI_SEEK_PARMS seek; + MCI_DGV_OPEN_PARMSW dgv_open; MCI_GENERIC_PARMS gen; } MCI_PARMS_UNION; @@ -139,6 +141,31 @@ static BOOL spurious_message(LPMSG msg) return FALSE; } +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(ARRAY_SIZE(pathW), pathW); + wcscat(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %lu.\n", + wine_dbgstr_w(pathW), GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok(!!res, "Failed to load resource, error %lu.\n", GetLastError()); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource( GetModuleHandleA(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write resource.\n"); + CloseHandle(file); + + return pathW; +} + /* A single ok() in each code path allows us to prefix this with todo_wine */ #define test_notification(hwnd, command, type) test_notification_dbg(hwnd, command, type, __LINE__) static void test_notification_dbg(HWND hwnd, const char* command, WPARAM type, int line) @@ -1439,6 +1466,68 @@ static void test_threads(void) ok(mr == 0, "close gave: 0x%lx\n", mr); } +static BOOL CALLBACK my_visible_window_proc(HWND hwnd, LPARAM param) +{ + HWND *ret = (HWND *)param; + DWORD pid; + + GetWindowThreadProcessId(hwnd, &pid); + if (pid != GetCurrentProcessId()) + return TRUE; + + if (GetWindowLongW(hwnd, GWL_STYLE) & WS_VISIBLE) + { + *ret = hwnd; + return FALSE; + } + + return TRUE; +} + +static void test_video_window(void) +{ + const WCHAR *filename = load_resource(L"test.mpg"); + MCI_PARMS_UNION parm; + HWND video_window; + MCIDEVICEID id; + MCIERROR err; + BOOL ret; + + parm.dgv_open.lpstrDeviceType = (WCHAR *)L"MPEGVideo"; + parm.dgv_open.lpstrElementName = (WCHAR *)filename; + err = mciSendCommandW(0, MCI_OPEN, MCI_OPEN_ELEMENT | MCI_OPEN_TYPE, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + id = parm.dgv_open.wDeviceID; + + err = mciSendCommandW(id, MCI_PLAY, 0, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + + video_window = NULL; + EnumWindows(my_visible_window_proc, (LPARAM)&video_window); + ok(video_window != NULL, "Video window should be shown.\n"); + + err = mciSendCommandW(id, MCI_STOP, 0, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + + todo_wine ok(IsWindowVisible(video_window), "Video window should be visible.\n"); + + err = mciSendCommandW(id, MCI_PLAY, 0, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + + ok(IsWindowVisible(video_window), "Video window should be visible.\n"); + + err = mciSendCommandW(id, MCI_SEEK, MCI_SEEK_TO_START, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + + todo_wine ok(IsWindowVisible(video_window), "Video window should be visible.\n"); + + err = mciSendCommandW(id, MCI_CLOSE, 0, 0); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + + ret = DeleteFileW(filename); + ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); +} + START_TEST(mci) { char curdir[MAX_PATH], tmpdir[MAX_PATH]; @@ -1463,6 +1552,9 @@ START_TEST(mci) test_asyncWaveTypeMpegvideo(hwnd); }else skip("No output devices available, skipping all output tests\n"); + + test_video_window(); + /* Win9X hangs when exiting with something still open. */ err = mciSendStringA("close all", NULL, 0, hwnd); ok(!err,"final close all returned %s\n", dbg_mcierr(err)); diff --git a/dlls/winmm/tests/rsrc.rc b/dlls/winmm/tests/rsrc.rc new file mode 100644 index 00000000000..b5fde1c39ba --- /dev/null +++ b/dlls/winmm/tests/rsrc.rc @@ -0,0 +1,25 @@ +/* + * Resource file for mci tests. + * + * Copyright 2022 Akihiro Sagawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 0.16 -r 25 -f mpeg -vcodec mpeg1video -vf scale=32x24 -acodec mp2 test.mpg */ +/* @makedep: test.mpg */ +test.mpg RCDATA "test.mpg" diff --git a/dlls/winmm/tests/test.mpg b/dlls/winmm/tests/test.mpg new file mode 100644 index 00000000000..97bb1abae1d Binary files /dev/null and b/dlls/winmm/tests/test.mpg differ

1 0

Gabriel Ivăncescu : mshtml: Semi-implement non-string primitive data for postMessage.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 619312fd76a0f51654629fa7398c44d604d7072e URL: https://gitlab.winehq.org/wine/wine/-/commit/619312fd76a0f51654629fa7398c44… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 10 18:07:38 2022 +0300 mshtml: Semi-implement non-string primitive data for postMessage. IE10 and up actually pass cloned data without converting them to strings, using the Structured Clone Algorithm. Implement support for the basic variant types for now. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 46 ++++++++++++--- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlwindow.c | 106 ++++++++++++++++++++++++++--------- dlls/mshtml/mshtml_private_iface.idl | 2 + dlls/mshtml/tests/documentmode.js | 8 ++- 5 files changed, 126 insertions(+), 38 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Implement targetOrigin for postMessage.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 5b07fb4d568e2cba4c224ad5f62ba5332dd66c7b URL: https://gitlab.winehq.org/wine/wine/-/commit/5b07fb4d568e2cba4c224ad5f62ba5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 10 18:07:38 2022 +0300 mshtml: Implement targetOrigin for postMessage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 70 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 53 +++++++++++++++++++++++++++-- dlls/mshtml/tests/events.js | 2 +- 3 files changed, 120 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 75f211e4cac..3ab42af0fa4 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -25,6 +25,7 @@ #include "winuser.h" #include "ole2.h" #include "mshtmdid.h" +#include "wininet.h" #include "shlguid.h" #include "shobjidl.h" #include "exdispid.h" @@ -2218,7 +2219,7 @@ static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VAR HTMLWindow *This = impl_from_IHTMLWindow6(iface); VARIANT var, transfer; - FIXME("(%p)->(%s %s) semi-stub\n", This, debugstr_w(msg), debugstr_variant(&targetOrigin)); + TRACE("(%p)->(%s %s)\n", This, debugstr_w(msg), debugstr_variant(&targetOrigin)); if(V_VT(&targetOrigin) != VT_BSTR) return E_INVALIDARG; @@ -3155,6 +3156,69 @@ static HRESULT WINAPI window_private_matchMedia(IWineHTMLWindowPrivate *iface, B return create_media_query_list(This, media_query, media_query_list); } +static HRESULT check_target_origin(HTMLInnerWindow *window, const WCHAR *target_origin) +{ + IUri *uri, *target; + DWORD port, port2; + BSTR bstr, bstr2; + HRESULT hres; + + if(!target_origin) + return E_INVALIDARG; + + if(!wcscmp(target_origin, L"*")) + return S_OK; + + hres = create_uri(target_origin, Uri_CREATE_NOFRAG | Uri_CREATE_NO_DECODE_EXTRA_INFO, &target); + if(FAILED(hres)) + return hres; + + if(!(uri = window->base.outer_window->uri)) { + FIXME("window with no URI\n"); + hres = S_FALSE; + goto done; + } + + hres = IUri_GetSchemeName(uri, &bstr); + if(FAILED(hres)) + goto done; + hres = IUri_GetSchemeName(target, &bstr2); + if(SUCCEEDED(hres)) { + hres = !wcsicmp(bstr, bstr2) ? S_OK : S_FALSE; + SysFreeString(bstr2); + } + SysFreeString(bstr); + if(hres != S_OK) + goto done; + + hres = IUri_GetHost(uri, &bstr); + if(FAILED(hres)) + goto done; + hres = IUri_GetHost(target, &bstr2); + if(SUCCEEDED(hres)) { + hres = !wcsicmp(bstr, bstr2) ? S_OK : S_FALSE; + SysFreeString(bstr2); + } + SysFreeString(bstr); + if(hres != S_OK) + goto done; + + /* Legacy modes ignore port */ + if(dispex_compat_mode(&window->event_target.dispex) < COMPAT_MODE_IE9) + goto done; + + hres = IUri_GetPort(uri, &port); + if(FAILED(hres)) + goto done; + hres = IUri_GetPort(target, &port2); + if(SUCCEEDED(hres)) + hres = (port == port2) ? S_OK : S_FALSE; + +done: + IUri_Release(target); + return hres; +} + static HRESULT WINAPI window_private_postMessage(IWineHTMLWindowPrivate *iface, VARIANT msg, BSTR targetOrigin, VARIANT transfer) { HTMLWindow *This = impl_from_IWineHTMLWindowPrivateVtbl(iface); @@ -3168,6 +3232,10 @@ static HRESULT WINAPI window_private_postMessage(IWineHTMLWindowPrivate *iface, if(V_VT(&transfer) != VT_EMPTY) FIXME("transfer not implemented, ignoring\n"); + hres = check_target_origin(window, targetOrigin); + if(hres != S_OK) + return SUCCEEDED(hres) ? S_OK : hres; + switch(V_VT(&msg)) { case VT_EMPTY: case VT_NULL: diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 0ec4785450e..5b746598dba 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -2082,10 +2082,57 @@ async_test("postMessage", function() { onmessage_called = true; if(v < 9) ok(e === undefined, "e = " + e); - else + else { ok(e.data === (v < 10 ? "10" : 10), "e.data = " + e.data); - next_test(); + next_test(); + } + } + + var invalid = [ + v < 10 ? { toString: function() { return "http://winetest.example.org"; } } : null, + (function() { return "http://winetest.example.org"; }), + "winetest.example.org", + "example.org", + undefined + ]; + for(var i = 0; i < invalid.length; i++) { + try { + window.postMessage("invalid " + i, invalid[i]); + ok(false, "expected exception with targetOrigin " + invalid[i]); + }catch(ex) { + var n = ex.number >>> 0; + todo_wine_if(v >= 10). + ok(n === (v < 10 ? 0x80070057 : 0), "postMessage with targetOrigin " + invalid[i] + " threw " + n); + if(v >= 10) + todo_wine. + ok(ex.name === "SyntaxError", "postMessage with targetOrigin " + invalid[i] + " threw " + ex.name); + } } - window.postMessage(10, "*"); + try { + window.postMessage("invalid empty", ""); + ok(false, "expected exception with empty targetOrigin"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === 0x80070057, "postMessage with empty targetOrigin threw " + n); + } + + window.postMessage("wrong port", "http://winetest.example.org:1234"); + ok(onmessage_called == (v < 9 ? true : false), "onmessage not called with wrong port"); + onmessage_called = false; + + var not_sent = [ + "http://winetest.example.com", + "ftp://winetest.example.org", + "http://wine.example.org", + "http://example.org" + ]; + for(var i = 0; i < not_sent.length; i++) { + window.postMessage("not_sent " + i, not_sent[i]); + ok(onmessage_called == false, "onmessage called with targetOrigin " + not_sent[i]); + onmessage_called = false; + } + + window.postMessage(10, (v < 10 ? "*" : { toString: function() { return "*"; } })); ok(onmessage_called == (v < 9 ? true : false), "onmessage not called"); + if(v < 9) next_test(); }); diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index e67bf07d210..997e583ad20 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -818,6 +818,6 @@ async_test("message event", function() { next_test(); }); - window.postMessage("test", "http://winetest.example.org"); + window.postMessage("test", "httP://wineTest.example.org"); ok(listener_called == false, "listener already called"); });

1 0

Jacek Caban : winex11: Use RtlSetLastWin32Error.
by Alexandre Julliard Aug. 10, 2022

Aug. 10, 2022

Module: wine Branch: master Commit: 131de4bb8dd068c0c0c2cca92a953236f93df699 URL: https://gitlab.winehq.org/wine/wine/-/commit/131de4bb8dd068c0c0c2cca92a9532… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 9 21:49:57 2022 +0200 winex11: Use RtlSetLastWin32Error. --- dlls/winex11.drv/desktop.c | 2 +- dlls/winex11.drv/display.c | 4 ++-- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/keyboard.c | 4 ++-- dlls/winex11.drv/opengl.c | 50 ++++++++++++++++++++++----------------------- dlls/winex11.drv/xrandr.c | 2 +- dlls/winex11.drv/xrender.c | 2 +- dlls/winex11.drv/xvidmode.c | 2 +- 8 files changed, 34 insertions(+), 34 deletions(-)

1 0