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

Nikolay Sivov : evr/tests: Add a test to show that IMFVideoDisplayControl is accessible.
by Alexandre Julliard 19 Aug '22

19 Aug '22

Module: wine Branch: master Commit: 120ca2ff52d145faa925a41d494035842d47a967 URL: https://gitlab.winehq.org/wine/wine/-/commit/120ca2ff52d145faa925a41d494035… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 19 15:54:39 2022 +0300 evr/tests: Add a test to show that IMFVideoDisplayControl is accessible. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/tests/evr.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index c4604c954b3..28a472a8a7f 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -571,6 +571,26 @@ static void test_misc_flags(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +static void test_display_control(void) +{ + IBaseFilter *filter = create_evr(); + IMFVideoDisplayControl *display_control; + HRESULT hr; + ULONG ref; + + hr = MFGetService((IUnknown *)filter, &MR_VIDEO_RENDER_SERVICE, + &IID_IMFVideoDisplayControl, (void **)&display_control); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, 0); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + IMFVideoDisplayControl_Release(display_control); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + static IMFMediaType * create_video_type(const GUID *subtype) { IMFMediaType *video_type; @@ -3243,6 +3263,7 @@ START_TEST(evr) test_pin_info(); test_unconnected_eos(); test_misc_flags(); + test_display_control(); test_default_mixer(); test_default_mixer_type_negotiation();

1 0

Akihiro Sagawa : winmm/tests: Add MCI_DGV_WINDOW_STATE tests.
by Alexandre Julliard 19 Aug '22

19 Aug '22

Module: wine Branch: master Commit: 861811206c2f3a2959ee064d7bdddcc01794b16b URL: https://gitlab.winehq.org/wine/wine/-/commit/861811206c2f3a2959ee064d7bdddc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Aug 18 19:17:05 2022 +0900 winmm/tests: Add MCI_DGV_WINDOW_STATE tests. --- dlls/winmm/tests/mci.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index ba810f6f096..fc24bec26a0 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1424,6 +1424,9 @@ static void test_asyncWaveTypeMpegvideo(HWND hwnd) Sleep(200); 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)); + err = mciSendStringA("close mysound wait", NULL, 0, NULL); ok(!err,"mci close wait returned %s\n", dbg_mcierr(err)); test_notification(hwnd,"play (aborted by close)",MCI_NOTIFY_ABORTED); @@ -1689,6 +1692,12 @@ static void test_video_window(void) ok(IsWindow(video_window), "Video window should exist.\n"); ok(!IsWindowVisible(video_window), "Video window should be hidden.\n"); + /* Test MCI_DGV_WINDOW_STATE for the non-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(main_window), "Video window should be minimized.\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); @@ -1698,9 +1707,15 @@ 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)); - ok(EqualRect(&parm.where.rc, &src_rc), "Got destination rect %s, expected %s.\n", + 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)); + /* 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"); + err = mciSendCommandW(id, MCI_CLOSE, 0, 0); ok(!err, "Got %s.\n", dbg_mcierr(err));

1 0

Akihiro Sagawa : mciqtz32: Fix MCI_DGV_WINDOW_STATE behavior.
by Alexandre Julliard 19 Aug '22

19 Aug '22

Module: wine Branch: master Commit: 1c1a21214e36895600540ab3b72badb654c6cdcc URL: https://gitlab.winehq.org/wine/wine/-/commit/1c1a21214e36895600540ab3b72bad… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Aug 18 19:17:05 2022 +0900 mciqtz32: Fix MCI_DGV_WINDOW_STATE behavior. --- dlls/mciqtz32/mciqtz.c | 4 +++- dlls/winmm/tests/mci.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index abbbbc07547..2cc12c5b8ec 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -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)); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index fc24bec26a0..921e7ec800f 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -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));

1 0

Akihiro Sagawa : winmm/tests: Add MCI_DGV_WINDOW_TEXT tests.
by Alexandre Julliard 19 Aug '22

19 Aug '22

Module: wine Branch: master Commit: bb0f1981fca55ec7e47162098facfa55baddb143 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb0f1981fca55ec7e47162098facfa… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Aug 18 19:17:05 2022 +0900 winmm/tests: Add MCI_DGV_WINDOW_TEXT tests. --- dlls/winmm/tests/mci.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 921e7ec800f..b2f3c2c8d45 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1427,6 +1427,9 @@ static void test_asyncWaveTypeMpegvideo(HWND hwnd) err = mciSendStringA("window mysound state hide", NULL, 0, NULL); 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)); + err = mciSendStringA("close mysound wait", NULL, 0, NULL); ok(!err,"mci close wait returned %s\n", dbg_mcierr(err)); test_notification(hwnd,"play (aborted by close)",MCI_NOTIFY_ABORTED); @@ -1494,6 +1497,7 @@ static void test_video_window(void) { const WCHAR *filename = load_resource(L"test.mpg"); MCI_PARMS_UNION parm; + WCHAR buffer[256]; unsigned int i; MCIDEVICEID id; MCIERROR err; @@ -1698,6 +1702,13 @@ static void test_video_window(void) ok(!err, "Got %s.\n", dbg_mcierr(err)); ok(IsIconic(main_window), "Video window should be minimized.\n"); + /* Test MCI_DGV_WINDOW_TEXT for the non-default window. */ + parm.win.lpstrText = (LPWSTR)L"foobar"; + 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)); + /* 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); @@ -1716,6 +1727,13 @@ static void test_video_window(void) ok(!err, "Got %s.\n", dbg_mcierr(err)); ok(IsIconic(video_window), "Video window should be minimized.\n"); + /* Test MCI_DGV_WINDOW_TEXT for the default window. */ + parm.win.lpstrText = (LPWSTR)L"abracadabra"; + 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)); + err = mciSendCommandW(id, MCI_CLOSE, 0, 0); ok(!err, "Got %s.\n", dbg_mcierr(err));

1 0

Akihiro Sagawa : mciqtz32: Fix MCI_DGV_WINDOW_TEXT behavior.
by Alexandre Julliard 19 Aug '22

19 Aug '22

Module: wine Branch: master Commit: ef48187a40e86b4855d82b5bfd70dd6ae25912f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef48187a40e86b4855d82b5bfd70dd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Aug 18 19:17:05 2022 +0900 mciqtz32: Fix MCI_DGV_WINDOW_TEXT behavior. --- dlls/mciqtz32/mciqtz.c | 4 +++- dlls/winmm/tests/mci.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 2cc12c5b8ec..092b445fb02 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -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; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index b2f3c2c8d45..764b3b13d0e 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -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));

1 0

Akihiro Sagawa : winmm/tests: Add more MCI_DGV_WINDOW_HWND tests.
by Alexandre Julliard 19 Aug '22

19 Aug '22

Module: wine Branch: master Commit: ebd1b7ab815b5de88f109422cfae0aeb224fe191 URL: https://gitlab.winehq.org/wine/wine/-/commit/ebd1b7ab815b5de88f109422cfae0a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Aug 18 19:17:05 2022 +0900 winmm/tests: Add more MCI_DGV_WINDOW_HWND tests. --- dlls/winmm/tests/mci.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 764b3b13d0e..d2ab6731300 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1430,6 +1430,14 @@ static void test_asyncWaveTypeMpegvideo(HWND hwnd) err = mciSendStringA("window mysound text abracadabra", NULL, 0, NULL); ok(err == MCIERR_NO_WINDOW, "mci window text returned %s\n", dbg_mcierr(err)); + sprintf(buf, "window mysound handle %lu", PtrToUlong(GetDesktopWindow())); + err = mciSendStringA(buf, NULL, 0, NULL); + todo_wine ok(err == MCIERR_INTERNAL, "mci window handle (desktop) returned %s\n", dbg_mcierr(err)); + + sprintf(buf, "window mysound handle %lu", (unsigned long)0xdeadbeef); + err = mciSendStringA(buf, NULL, 0, NULL); + todo_wine ok(err == MCIERR_NO_WINDOW, "mci window handle (deadbeef) 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)); test_notification(hwnd,"play (aborted by close)",MCI_NOTIFY_ABORTED); @@ -1649,6 +1657,10 @@ static void test_video_window(void) ok(IsWindowVisible(video_window), "Video window should be visible.\n"); /* Test MCI_DGV_WINDOW_HWND. */ + parm.win.hWnd = (HWND)0xdeadbeef; + err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm); + todo_wine ok(err == MCIERR_NO_WINDOW, "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));

1 0

Akihiro Sagawa : mciqtz32: Fix MCI_DGV_WINDOW_HWND error handling.
by Alexandre Julliard 19 Aug '22

19 Aug '22

Module: wine Branch: master Commit: 3ba2c69457d01030e611b03469448761b8673fe0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ba2c69457d01030e611b034694487… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Aug 18 19:17:05 2022 +0900 mciqtz32: Fix MCI_DGV_WINDOW_HWND error handling. --- dlls/mciqtz32/mciqtz.c | 9 +++++++-- dlls/winmm/tests/mci.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 092b445fb02..6fb9c2f43b4 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -1000,8 +1000,13 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS if (dwFlags & MCI_TEST) return 0; - if (dwFlags & MCI_DGV_WINDOW_HWND && (IsWindow(lpParms->hWnd) || !lpParms->hWnd)) { - HWND hwnd = lpParms->hWnd ? lpParms->hWnd : wma->window; + if (dwFlags & MCI_DGV_WINDOW_HWND) { + HWND hwnd; + if (lpParms->hWnd && !IsWindow(lpParms->hWnd)) + return MCIERR_NO_WINDOW; + if (!wma->parent) + return MCIERR_INTERNAL; + hwnd = lpParms->hWnd ? lpParms->hWnd : wma->window; TRACE("Setting parent window to %p.\n", hwnd); if (wma->parent != hwnd) { diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index d2ab6731300..f6654912515 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1432,11 +1432,11 @@ static void test_asyncWaveTypeMpegvideo(HWND hwnd) sprintf(buf, "window mysound handle %lu", PtrToUlong(GetDesktopWindow())); err = mciSendStringA(buf, NULL, 0, NULL); - todo_wine ok(err == MCIERR_INTERNAL, "mci window handle (desktop) returned %s\n", dbg_mcierr(err)); + ok(err == MCIERR_INTERNAL, "mci window handle (desktop) returned %s\n", dbg_mcierr(err)); sprintf(buf, "window mysound handle %lu", (unsigned long)0xdeadbeef); err = mciSendStringA(buf, NULL, 0, NULL); - todo_wine ok(err == MCIERR_NO_WINDOW, "mci window handle (deadbeef) returned %s\n", dbg_mcierr(err)); + ok(err == MCIERR_NO_WINDOW, "mci window handle (deadbeef) 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)); @@ -1659,7 +1659,7 @@ static void test_video_window(void) /* Test MCI_DGV_WINDOW_HWND. */ parm.win.hWnd = (HWND)0xdeadbeef; err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm); - todo_wine ok(err == MCIERR_NO_WINDOW, "Got %s.\n", dbg_mcierr(err)); + ok(err == MCIERR_NO_WINDOW, "Got %s.\n", dbg_mcierr(err)); parm.win.hWnd = main_window; err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm);

1 0

Konstantin Romanov : kerberos: Fix condition for create_context_handle in kerberos_SpInitLsaModeContext and kerberos_SpAcceptLsaModeContext.
by Alexandre Julliard 19 Aug '22

19 Aug '22

Module: wine Branch: master Commit: 0b18d0c825848abeec62b650d3b95056297c5d87 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b18d0c825848abeec62b650d3b950… Author: Konstantin Romanov <incubusrk(a)gmail.com> Date: Thu Aug 18 17:01:13 2022 +0300 kerberos: Fix condition for create_context_handle in kerberos_SpInitLsaModeContext and kerberos_SpAcceptLsaModeContext. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53472 --- dlls/kerberos/krb5_ap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index b600ff06052..84d742079e6 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -424,9 +424,10 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, params.output_token_length = &output->pBuffers[idx].cbBuffer; status = KRB5_CALL( initialize_context, &params ); + if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) + *new_context = create_context_handle( context_handle, new_context_handle ); if (!status) { - *new_context = create_context_handle( context_handle, new_context_handle ); *mapped_context = TRUE; expiry_to_timestamp( exptime, expiry ); } @@ -473,9 +474,10 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential /* FIXME: check if larger output buffer exists */ status = KRB5_CALL( accept_context, &params ); + if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) + *new_context = create_context_handle( context_handle, new_context_handle ); if (!status) { - *new_context = create_context_handle( context_handle, new_context_handle ); *mapped_context = TRUE; expiry_to_timestamp( exptime, expiry ); }

1 0

Jiajin Cui : win32u: Ensure that either the primary or secondary name is in English.
by Alexandre Julliard 19 Aug '22

19 Aug '22

Module: wine Branch: master Commit: 88ead398ebcdebef8ce9f9f5a420d62be4477869 URL: https://gitlab.winehq.org/wine/wine/-/commit/88ead398ebcdebef8ce9f9f5a420d6… Author: Jiajin Cui <cuijiajin(a)uniontech.com> Date: Thu Aug 11 11:01:29 2022 +0800 win32u: Ensure that either the primary or secondary name is in English. --- dlls/win32u/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index f00df7ed86d..f6cdddd7819 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -1100,7 +1100,7 @@ static BOOL search_family_names_callback( LANGID langid, struct opentype_name *n else if (data->primary_langid == langid) { data->primary_seen = TRUE; - if (!data->second_name.bytes) data->second_name = data->family_name; + if (data->family_name.bytes) data->second_name = data->family_name; data->family_name = *name; } else if (!data->second_name.bytes) data->second_name = *name;

1 0

Jiajin Cui : win32u: Don't allow a replaced font to be a replacement.
by Alexandre Julliard 19 Aug '22

19 Aug '22

Module: wine Branch: master Commit: 53f6d82e69377a3f4f112275bbc61978946ad2a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/53f6d82e69377a3f4f112275bbc619… Author: Jiajin Cui <cuijiajin(a)uniontech.com> Date: Fri Aug 19 08:49:52 2022 +0800 win32u: Don't allow a replaced font to be a replacement. This is to prevent replacement loops. --- dlls/win32u/font.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index e26c7bfa316..e281db9b0c8 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -903,6 +903,12 @@ static BOOL add_family_replacement( const WCHAR *new_name, const WCHAR *replace return FALSE; } + if (family->replacement) + { + TRACE( "%s is replaced by another font, skipping.\n", debugstr_w(replace) ); + return FALSE; + } + if (!(new_family = create_family( new_name, NULL ))) return FALSE; new_family->replacement = family; family->refcount++;

1 0