February 2022 - Wine-commits

Nikolay Sivov : mfreadwrite/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: c8c40e973494d45c7c86bb84caf23a0aa093b889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8c40e973494d45c7c86bb84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 14 14:48:36 2022 +0300 mfreadwrite/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/Makefile.in | 1 - dlls/mfreadwrite/tests/mfplat.c | 316 ++++++++++++++++++------------------- 2 files changed, 158 insertions(+), 159 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c8c40e973494d45c7c86…

1 0

Nikolay Sivov : mfplay: Implement UpdateVideo().
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 8b9cc79c2c82f3d821e435b48e688bea79eafec6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b9cc79c2c82f3d821e435b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 14 14:49:11 2022 +0300 mfplay: Implement UpdateVideo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 18 ++++++++++++++++-- dlls/mfplay/tests/mfplay.c | 3 --- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 7f9188e5619..31c8e094cd2 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1524,9 +1524,23 @@ static HRESULT WINAPI media_player_GetVideoWindow(IMFPMediaPlayer *iface, HWND * static HRESULT WINAPI media_player_UpdateVideo(IMFPMediaPlayer *iface) { - FIXME("%p.\n", iface); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFVideoDisplayControl *display_control; + HRESULT hr; + RECT rect; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) + { + if (GetClientRect(player->output_window, &rect)) + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &rect); + if (SUCCEEDED(hr)) + hr = IMFVideoDisplayControl_RepaintVideo(display_control); + IMFVideoDisplayControl_Release(display_control); + } + + return hr; } static HRESULT WINAPI media_player_SetBorderColor(IMFPMediaPlayer *iface, COLORREF color) diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 3c2782a9412..44526801c22 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -203,7 +203,6 @@ static void test_shutdown(void) ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); - todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", TRUE, 0, &item); @@ -316,7 +315,6 @@ static void test_video_control(void) ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); - todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); IMFPMediaPlayer_Release(player); @@ -356,7 +354,6 @@ static void test_video_control(void) ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaPlayer_UpdateVideo(player); - todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#lx.\n", hr); IMFPMediaPlayer_Release(player);

1 0

Nikolay Sivov : mfplay: Handle shutdown state in media item methods.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 28f9cd5b5d624a42ad6abda6d934c2eee08483e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28f9cd5b5d624a42ad6abda6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 14 14:49:12 2022 +0300 mfplay: Handle shutdown state in media item methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 214 ++++++++++++++++++++++++++++++++---------- dlls/mfplay/tests/Makefile.in | 4 +- dlls/mfplay/tests/mfplay.c | 147 ++++++++++++++++++++++++++++- dlls/mfplay/tests/resource.rc | 22 +++++ dlls/mfplay/tests/test.mp4 | Bin 0 -> 1554 bytes 5 files changed, 336 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28f9cd5b5d624a42ad6a…

1 0

Nikolay Sivov : mfplay: Fix IsProtected() return value.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: a408bba2268e07e87589c34c634e6d23aba248d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a408bba2268e07e87589c34c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 14 14:49:13 2022 +0300 mfplay: Fix IsProtected() return value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 5 ++++- dlls/mfplay/tests/mfplay.c | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index d8c13cc22a8..f0df707c6d8 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -627,10 +627,13 @@ static HRESULT WINAPI media_item_IsProtected(IMFPMediaItem *iface, BOOL *protect TRACE("%p, %p.\n", iface, protected); + if (!protected) + return E_POINTER; + EnterCriticalSection(&item->player->cs); if (SUCCEEDED(hr = media_item_get_pd(item, &pd))) { - *protected = MFRequireProtectedEnvironment(pd) == S_OK; + *protected = (hr = MFRequireProtectedEnvironment(pd)) == S_OK; IMFPresentationDescriptor_Release(pd); } LeaveCriticalSection(&item->player->cs); diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index c58f34e8b31..12825ba29da 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -328,8 +328,10 @@ static void test_media_item(void) hr = IMFPMediaItem_HasAudio(item, &ret, &selected); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFPMediaItem_IsProtected(item, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + hr = IMFPMediaItem_IsProtected(item, &ret); - todo_wine ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaItem_GetDuration(item, &MFP_POSITIONTYPE_100NS, &propvar); @@ -380,6 +382,9 @@ static void test_media_item(void) hr = IMFPMediaItem_HasAudio(item, &ret, &selected); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFPMediaItem_IsProtected(item, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + hr = IMFPMediaItem_IsProtected(item, &ret); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr);

1 0

Sven Baars : ntoskrnl.exe/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: ef437b41eebcb54a3576741fc52dbc29caa1590f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef437b41eebcb54a3576741f… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Feb 13 20:43:45 2022 +0100 ntoskrnl.exe/tests: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f53663f17d0..6207ce00ccb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -235,11 +235,15 @@ static void testsign_cleanup(struct testsign_context *ctx) ret = CertDeleteCertificateFromStore(ctx->root_cert); ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); + ret = CertFreeCertificateContext(ctx->root_cert); + ok(ret, "Failed to free certificate context, error %u\n", GetLastError()); ret = CertCloseStore(ctx->root_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError()); ret = CertDeleteCertificateFromStore(ctx->publisher_cert); ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); + ret = CertFreeCertificateContext(ctx->publisher_cert); + ok(ret, "Failed to free certificate context, error %u\n", GetLastError()); ret = CertCloseStore(ctx->publisher_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError()); @@ -1360,6 +1364,8 @@ static void add_file_to_catalog(HANDLE catalog, const WCHAR *file) sizeof(L"2:6.0"), (BYTE *)L"2:6.0"); ok(ret, "Failed to write attr, error %u\n", GetLastError()); } + + free(indirect_data); } static const GUID bus_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc1}}; @@ -1816,6 +1822,8 @@ static void test_pnp_driver(struct testsign_context *ctx) ok(ret, "failed to remove device, error %#x\n", GetLastError()); } + SetupDiDestroyDeviceInfoList(set); + /* Windows stops the service but does not delete it. */ manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); ok(!!manager, "failed to open service manager, error %u\n", GetLastError());

1 0

Hans Leidekker : wbemprox: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 0444be5ccd6853da7add09f7937cf989a8a42648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0444be5ccd6853da7add09f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 14 12:14:58 2022 +0100 wbemprox: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/Makefile.in | 1 - dlls/wbemprox/builtin.c | 9 +++++---- dlls/wbemprox/class.c | 44 ++++++++++++++++++++--------------------- dlls/wbemprox/process.c | 10 +++++----- dlls/wbemprox/qualifier.c | 16 +++++++-------- dlls/wbemprox/query.c | 4 ++-- dlls/wbemprox/reg.c | 4 ++-- dlls/wbemprox/service.c | 2 +- dlls/wbemprox/services.c | 48 ++++++++++++++++++++++----------------------- dlls/wbemprox/table.c | 4 ++-- dlls/wbemprox/wbemlocator.c | 4 ++-- 11 files changed, 73 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0444be5ccd6853da7add…

1 0

Hans Leidekker : wbemprox/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: ce22a025643bb8e102779f054f7d143117a5e250 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce22a025643bb8e102779f05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 14 12:14:59 2022 +0100 wbemprox/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/Makefile.in | 1 - dlls/wbemprox/tests/query.c | 538 ++++++++++++++++++++-------------------- dlls/wbemprox/tests/services.c | 78 +++--- 3 files changed, 307 insertions(+), 310 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce22a025643bb8e10277…

1 0

Hans Leidekker : wbemdisp: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 82ca6773579f4ef4135573196006643a217e5e89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82ca6773579f4ef413557319… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 14 12:15:00 2022 +0100 wbemdisp: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/Makefile.in | 1 - dlls/wbemdisp/locator.c | 104 ++++++++++++------------- dlls/wbemdisp/tests/Makefile.in | 1 - dlls/wbemdisp/tests/wbemdisp.c | 163 ++++++++++++++++++++-------------------- 4 files changed, 134 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=82ca6773579f4ef41355…

1 0

Hans Leidekker : wmiutils: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: c6d1921e930bb015166095819e4ed690791c1aef URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6d1921e930bb01516609581… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 14 12:15:01 2022 +0100 wmiutils: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/Makefile.in | 1 - dlls/wmiutils/path.c | 46 +++--- dlls/wmiutils/statuscode.c | 4 +- dlls/wmiutils/tests/Makefile.in | 1 - dlls/wmiutils/tests/path.c | 323 ++++++++++++++++++++-------------------- 5 files changed, 185 insertions(+), 190 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c6d1921e930bb0151660…

1 0

Jacek Caban : win32u: Move monitor_from_rect implementation from user32.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: db8fcc1c9dd32af92d68ae36653608a333adf7bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=db8fcc1c9dd32af92d68ae36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:07:14 2022 +0100 win32u: Move monitor_from_rect implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 79 +------------------------------------------------ dlls/win32u/sysparams.c | 68 ++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 70 insertions(+), 78 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 9d553d7dfff..1b26098a413 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -989,89 +989,12 @@ BOOL WINAPI PhysicalToLogicalPointForPerMonitorDPI( HWND hwnd, POINT *pt ) return ret; } -struct monitor_enum_info -{ - RECT rect; - UINT max_area; - UINT min_distance; - HMONITOR primary; - HMONITOR nearest; - HMONITOR ret; -}; - -/* helper callback for MonitorFromRect */ -static BOOL CALLBACK monitor_enum( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) -{ - struct monitor_enum_info *info = (struct monitor_enum_info *)lp; - RECT intersect; - - if (IntersectRect( &intersect, rect, &info->rect )) - { - /* check for larger intersecting area */ - UINT area = (intersect.right - intersect.left) * (intersect.bottom - intersect.top); - if (area > info->max_area) - { - info->max_area = area; - info->ret = monitor; - } - } - else if (!info->max_area) /* if not intersecting, check for min distance */ - { - UINT distance; - UINT x, y; - - if (info->rect.right <= rect->left) x = rect->left - info->rect.right; - else if (rect->right <= info->rect.left) x = info->rect.left - rect->right; - else x = 0; - if (info->rect.bottom <= rect->top) y = rect->top - info->rect.bottom; - else if (rect->bottom <= info->rect.top) y = info->rect.top - rect->bottom; - else y = 0; - distance = x * x + y * y; - if (distance < info->min_distance) - { - info->min_distance = distance; - info->nearest = monitor; - } - } - if (!info->primary) - { - MONITORINFO mon_info; - mon_info.cbSize = sizeof(mon_info); - GetMonitorInfoW( monitor, &mon_info ); - if (mon_info.dwFlags & MONITORINFOF_PRIMARY) info->primary = monitor; - } - return TRUE; -} - /*********************************************************************** * MonitorFromRect (USER32.@) */ HMONITOR WINAPI MonitorFromRect( const RECT *rect, DWORD flags ) { - struct monitor_enum_info info; - - info.rect = *rect; - info.max_area = 0; - info.min_distance = ~0u; - info.primary = 0; - info.nearest = 0; - info.ret = 0; - - if (IsRectEmpty(&info.rect)) - { - info.rect.right = info.rect.left + 1; - info.rect.bottom = info.rect.top + 1; - } - - if (!NtUserEnumDisplayMonitors( 0, NULL, monitor_enum, (LPARAM)&info )) return 0; - if (!info.ret) - { - if (flags & MONITOR_DEFAULTTOPRIMARY) info.ret = info.primary; - else if (flags & MONITOR_DEFAULTTONEAREST) info.ret = info.nearest; - } - - TRACE( "%s flags %x returning %p\n", wine_dbgstr_rect(rect), flags, info.ret ); - return info.ret; + return UlongToHandle( NtUserCallTwoParam( (LONG_PTR)rect, flags, NtUserMonitorFromRect )); } /*********************************************************************** diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 6c8c297bc63..7123b0d95c8 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1936,6 +1936,72 @@ static BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) return FALSE; } +static HMONITOR monitor_from_rect( const RECT *rect, DWORD flags, UINT dpi ) +{ + HMONITOR primary = 0, nearest = 0, ret = 0; + UINT max_area = 0, min_distance = ~0u; + struct monitor *monitor; + RECT r; + + r = map_dpi_rect( *rect, dpi, system_dpi ); + if (is_rect_empty( &r )) + { + r.right = r.left + 1; + r.bottom = r.top + 1; + } + + if (!lock_display_devices()) return 0; + + LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) + { + RECT intersect; + RECT monitor_rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), + system_dpi ); + + if (intersect_rect( &intersect, &monitor_rect, &r )) + { + /* check for larger intersecting area */ + UINT area = (intersect.right - intersect.left) * (intersect.bottom - intersect.top); + if (area > max_area) + { + max_area = area; + ret = monitor->handle; + } + } + else if (!max_area) /* if not intersecting, check for min distance */ + { + UINT distance; + UINT x, y; + + if (r.right <= monitor_rect.left) x = monitor_rect.left - r.right; + else if (monitor_rect.right <= r.left) x = r.left - monitor_rect.right; + else x = 0; + if (r.bottom <= monitor_rect.top) y = monitor_rect.top - r.bottom; + else if (monitor_rect.bottom <= r.top) y = r.top - monitor_rect.bottom; + else y = 0; + distance = x * x + y * y; + if (distance < min_distance) + { + min_distance = distance; + nearest = monitor->handle; + } + } + + if (monitor->flags & MONITORINFOF_PRIMARY) primary = monitor->handle; + } + + unlock_display_devices(); + + if (!ret) + { + if (flags & MONITOR_DEFAULTTOPRIMARY) ret = primary; + else if (flags & MONITOR_DEFAULTTONEAREST) ret = nearest; + } + + TRACE( "%s flags %x returning %p\n", wine_dbgstr_rect(rect), flags, ret ); + return ret; +} + /*********************************************************************** * NtUserGetSystemDpiForProcess (win32u.@) */ @@ -4427,6 +4493,8 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return get_system_metrics_for_dpi( arg1, arg2 ); case NtUserMirrorRgn: return mirror_window_region( UlongToHandle(arg1), UlongToHandle(arg2) ); + case NtUserMonitorFromRect: + return HandleToUlong( monitor_from_rect( (const RECT *)arg1, arg2, get_thread_dpi() )); default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 4b665e6a364..89106f38628 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -67,6 +67,7 @@ enum NtUserGetMonitorInfo, NtUserGetSystemMetricsForDpi, NtUserMirrorRgn, + NtUserMonitorFromRect, }; /* color index used to retrieve system 55aa brush */

1 0