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

Akihiro Sagawa : mciqtz32: Fix MCI_DGV_WHERE_WINDOW behavior.
by Alexandre Julliard 10 Aug '22

10 Aug '22

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: Reset the video size when changing video destination.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 9cdc68126530012d67f17c2ae6528ceea767f89e URL: https://gitlab.winehq.org/wine/wine/-/commit/9cdc68126530012d67f17c2ae6528c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jul 31 20:49:25 2022 +0900 mciqtz32: Reset the video size when changing video destination. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/mciqtz32/mciqtz.c | 15 ++++++++++++--- dlls/winmm/tests/mci.c | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index fb941f26a86..89f128831b6 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -998,9 +998,18 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS if (dwFlags & MCI_DGV_WINDOW_HWND && (IsWindow(lpParms->hWnd) || !lpParms->hWnd)) { HWND hwnd = lpParms->hWnd ? lpParms->hWnd : wma->window; TRACE("Setting parent window to %p.\n", hwnd); - IVideoWindow_put_MessageDrain(wma->vidwin, (OAHWND)hwnd); - IVideoWindow_put_Owner(wma->vidwin, (OAHWND)hwnd); - wma->parent = hwnd; + if (wma->parent != hwnd) + { + LONG width, height; + + IVideoWindow_put_MessageDrain(wma->vidwin, (OAHWND)hwnd); + IVideoWindow_put_Owner(wma->vidwin, (OAHWND)hwnd); + + IBasicVideo_GetVideoSize(wma->vidbasic, &width, &height); + IVideoWindow_SetWindowPosition(wma->vidwin, 0, 0, width, height); + + wma->parent = hwnd; + } } if (dwFlags & MCI_DGV_WINDOW_STATE) { TRACE("Setting nCmdShow to %d\n", lpParms->nCmdShow); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index c4a92221d0f..dc3a4973362 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1664,7 +1664,7 @@ static void test_video_window(void) /* 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", + 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 */ @@ -1699,7 +1699,7 @@ 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)); err = mciSendCommandW(id, MCI_CLOSE, 0, 0);

1 0

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

10 Aug '22

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 : mciqtz32: Show the default video window when switching from another one.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 8e27f6c2ef327d6d643e29a271245e76aa6f4792 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e27f6c2ef327d6d643e29a271245e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jul 31 20:49:25 2022 +0900 mciqtz32: Show the default video window when switching from another one. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/mciqtz32/mciqtz.c | 2 ++ dlls/winmm/tests/mci.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 952015e4c9f..ee130b078d5 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -1010,6 +1010,8 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS if (wma->parent == wma->window) ShowWindow(wma->window, SW_HIDE); + else if (hwnd == wma->window) + ShowWindow(wma->window, SW_SHOW); wma->parent = hwnd; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 18dfdf1f74b..a529b3080d2 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1695,7 +1695,7 @@ static void test_video_window(void) 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"); - todo_wine ok(IsWindowVisible(video_window), "Video window should be shown.\n"); + 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 visibility of video window.
by Alexandre Julliard 10 Aug '22

10 Aug '22

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

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

10 Aug '22

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 window style of video window.
by Alexandre Julliard 10 Aug '22

10 Aug '22

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

Zebediah Figura : winhttp: Pass a length to parse_header().
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 6a84877cc204c86b3b0d034accbb2806418f73e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a84877cc204c86b3b0d034accbb28… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 9 18:20:23 2022 -0500 winhttp: Pass a length to parse_header(). --- dlls/winhttp/request.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2331c30b58c..e846676041e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -286,7 +286,7 @@ static BOOL valid_token_char( WCHAR c ) } } -static struct header *parse_header( const WCHAR *string ) +static struct header *parse_header( const WCHAR *string, size_t string_len ) { const WCHAR *p, *q; struct header *header; @@ -324,7 +324,7 @@ static struct header *parse_header( const WCHAR *string ) q++; /* skip past colon */ while (*q == ' ') q++; - len = lstrlenW( q ); + len = (string + string_len) - q; if (!(header->value = malloc( (len + 1) * sizeof(WCHAR) ))) { @@ -467,15 +467,17 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD p = buffer; do { + const WCHAR *end; + if (!*p) break; for (q = p; *q && *q != '\r' && *q != '\n'; ++q) ; - *q++ = 0; + end = q; while (*q == '\r' || *q == '\n') ++q; - if ((header = parse_header( p ))) + if ((header = parse_header( p, end - p ))) { ret = process_header( request, header->field, header->value, flags, TRUE ); free_header( header ); @@ -2559,6 +2561,7 @@ static DWORD read_reply( struct request *request ) for (;;) { struct header *header; + int lenW; buflen = MAX_REPLY_LEN; if (read_line( request, buffer, &buflen )) return ERROR_SUCCESS; @@ -2576,9 +2579,9 @@ static DWORD read_reply( struct request *request ) memcpy( raw_headers + offset, L"\r\n", sizeof(L"\r\n") ); break; } - MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers + offset, buflen ); + lenW = MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers + offset, buflen ); - if (!(header = parse_header( raw_headers + offset ))) break; + if (!(header = parse_header( raw_headers + offset, lenW - 1 ))) break; if ((ret = process_header( request, header->field, header->value, WINHTTP_ADDREQ_FLAG_ADD, FALSE ))) { free_header( header );

1 0

Zebediah Figura : winhttp: Don't make a copy of the string in add_request_headers().
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 7cd30faabee03ffc982b6e1ff2c0be9aa75c2418 URL: https://gitlab.winehq.org/wine/wine/-/commit/7cd30faabee03ffc982b6e1ff2c0be… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 9 18:23:56 2022 -0500 winhttp: Don't make a copy of the string in add_request_headers(). --- dlls/winhttp/request.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e846676041e..9f769f3dc35 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -455,23 +455,20 @@ DWORD process_header( struct request *request, const WCHAR *field, const WCHAR * DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD len, DWORD flags ) { DWORD ret = ERROR_WINHTTP_INVALID_HEADER; - WCHAR *buffer, *p, *q; struct header *header; + const WCHAR *p, *q; if (len == ~0u) len = lstrlenW( headers ); if (!len) return ERROR_SUCCESS; - if (!(buffer = malloc( (len + 1) * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; - memcpy( buffer, headers, len * sizeof(WCHAR) ); - buffer[len] = 0; - p = buffer; + p = headers; do { const WCHAR *end; - if (!*p) break; + if (p >= headers + len) break; - for (q = p; *q && *q != '\r' && *q != '\n'; ++q) + for (q = p; q < headers + len && *q != '\r' && *q != '\n'; ++q) ; end = q; while (*q == '\r' || *q == '\n') @@ -485,7 +482,6 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD p = q; } while (!ret); - free( buffer ); return ret; }

1 0

Nikolay Sivov : dwrite/fallback: Fill in some more fallback ranges for various scripts.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 1795fd7af9a4d600e38dd20436595d8d14a26350 URL: https://gitlab.winehq.org/wine/wine/-/commit/1795fd7af9a4d600e38dd20436595d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 10 13:26:54 2022 +0300 dwrite/fallback: Fill in some more fallback ranges for various scripts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index ccce2c63976..c528ccf7001 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -228,6 +228,12 @@ system_fallback_config[] = "08A0-08FF, FB50-FDCF, " "FDF0-FDFF, FE70-FEFE", L"Noto Sans Arabic" }, + { "0700-074F", L"Noto Sans Syriac" }, + { "0780-07BF", L"Noto Sans Thaana" }, + { "07C0-07FF", L"Noto Sans NKo" }, + { "0800-083F", L"Noto Sans Samaritan" }, + { "0840-085F", L"Noto Sans Mandaic" }, + { "0900-097F", L"Noto Sans Devanagari" }, { "0980-09FF", L"Noto Sans Bengali" }, { "0A00-0A7F", L"Noto Sans Gurmukhi" }, @@ -242,12 +248,53 @@ system_fallback_config[] = { "0E00-0E7F", L"Noto Sans Thai" }, { "0E80-0EFF", L"Noto Sans Lao" }, + { "0F00-0FFF", L"Noto Serif Tibetan" }, + + { "1000-109F, A9E0-A9FF, AA60-AA7F", L"Noto Sans Myanmar" }, + + /* Hangul Jamo - 1100-11FF + Hangul Compatibility Jamo - 3130-318F + Enc. CJK (Paren Hangul) - 3200-321F + Enc. CJK (Circled Hangul) - 3260-327F + Hangul Jamo Extended-A - A960-A97F + Hangul Syllables - AC00-D7AF + Hangul Jamo Extended-B - D7B0-D7FF */ + + { "1100-11FF, 3130-318F, " + "3200-321F, 3260-327F, " + "A960-A97F, AC00-D7FF, " + "D7B0-D7FF", L"Noto Sans CJK KR" }, + { "1680-169F", L"Noto Sans Ogham" }, { "16A0-16FF", L"Noto Sans Runic" }, + { "1700-171F", L"Noto Sans Tagalog" }, + { "1720-173F", L"Noto Sans Hanunoo" }, + { "1740-175F", L"Noto Sans Buhid" }, + { "1760-177F", L"Noto Sans Tagbanwa" }, { "1800-18AF, 11660-1167F", L"Noto Sans Mongolian" }, + { "1900-194F", L"Noto Sans Limbu" }, + { "1950-197F", L"Noto Sans Tai Le" }, + { "1980-19DF", L"Noto Sans New Tai Lue" }, + { "1A00-1A1F", L"Noto Sans Buginese" }, + { "1A20-1AAF", L"Noto Sans Tai Tham" }, + { "1B00-1B7F", L"Noto Sans Balinese" }, + { "1B80-1BBF, 1CC0-1CCF", L"Noto Sans Sundanes" }, + { "1BC0-1BFF", L"Noto Sans Batak" }, + { "1C00-1C4F", L"Noto Sans Lepcha" }, + { "1C50-1C7F", L"Noto Sans Ol Chiki" }, + + { "2C80-2CFF", L"Noto Sans Coptic" }, + { "2D30-2D7F", L"Noto Sans Tifinagh" }, + + /* CJK Radicals Supplement - 2E80-2EFF */ + + { "2E80-2EFF", L"Noto Sans CJK SC", L"zh-Hans" }, + { "2E80-2EFF", L"Noto Sans CJK TC", L"zh-Hant" }, + { "2E80-2EFF", L"Noto Sans CJK KR", L"ko" }, + /* CJK Symbols and Punctuation - 3000-303F Hiragana - 3040-309F Katakana - 30A0-30FF @@ -266,6 +313,18 @@ system_fallback_config[] = { "3400-4DBF, 4E00-9FFF", L"Noto Sans CJK KR", L"ko" }, { "3400-4DBF, 4E00-9FFF", L"Noto Sans CJK JP" }, + { "A000-A4CF", L"Noto Sans Yi" }, + { "A4D0-A4FF", L"Noto Sans Lisu" }, + { "A500-A63F", L"Noto Sans Vai" }, + { "A6A0-A6FF", L"Noto Sans Bamum" }, + { "A800-A82F", L"Noto Sans Syloti Nagri" }, + { "A840-A87F", L"Noto Sans PhagsPa" }, + { "A880-A8DF", L"Noto Sans Saurashtra" }, + { "A900-A92F", L"Noto Sans Kayah Li" }, + { "A930-A95F", L"Noto Sans Rejang" }, + { "A980-A9DF", L"Noto Sans Javanese" }, + { "AA00-AA5F", L"Noto Sans Cham" }, + /* CJK Compatibility Ideographs - F900-FAFF */ { "F900-FAFF", L"Noto Sans CJK SC", L"zh-Hans" },

1 0