October 2021 - Wine-commits

Rémi Bernon : winex11.drv: Rename (x|y)_rel_valuator to (x|y)_valuator.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: dfa11dc040f93aceec7009eeb3a57b95764c1c64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfa11dc040f93aceec7009ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 25 11:51:54 2021 +0200 winex11.drv: Rename (x|y)_rel_valuator to (x|y)_valuator. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 33 +++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 4 ++-- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index c6daa30392c..1ef7027e838 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -256,8 +256,8 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator struct x11drv_thread_data *thread_data = x11drv_thread_data(); int i; - thread_data->x_rel_valuator.number = -1; - thread_data->y_rel_valuator.number = -1; + thread_data->x_valuator.number = -1; + thread_data->y_valuator.number = -1; for (i = 0; i < n_valuators; i++) { @@ -265,10 +265,10 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator if (valuators[i]->type != XIValuatorClass) continue; if (class->label == x11drv_atom( Rel_X ) || (!class->label && class->number == 0 && class->mode == XIModeRelative)) - thread_data->x_rel_valuator = *class; + thread_data->x_valuator = *class; else if (class->label == x11drv_atom( Rel_Y ) || (!class->label && class->number == 1 && class->mode == XIModeRelative)) - thread_data->y_rel_valuator = *class; + thread_data->y_valuator = *class; } } #endif @@ -349,8 +349,8 @@ static void disable_xinput2(void) pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); pXIFreeDeviceInfo( data->xi2_devices ); - data->x_rel_valuator.number = -1; - data->y_rel_valuator.number = -1; + data->x_valuator.number = -1; + data->y_valuator.number = -1; data->xi2_devices = NULL; data->xi2_core_pointer = 0; data->xi2_current_slave = 0; @@ -625,13 +625,13 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); + XIValuatorClassInfo *x = &thread_data->x_valuator, *y = &thread_data->y_valuator; const double *values = event->valuators.values; - XIValuatorClassInfo *x_rel, *y_rel; double dx = 0, dy = 0, val; RECT virtual_rect; int i; - if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; + if (x->number < 0 || y->number < 0) return FALSE; if (!event->valuators.mask_len) return FALSE; if (thread_data->xi2_state != xi_enabled) return FALSE; @@ -654,26 +654,23 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) } if (event->deviceid != thread_data->xi2_current_slave) return FALSE; - x_rel = &thread_data->x_rel_valuator; - y_rel = &thread_data->y_rel_valuator; - virtual_rect = get_virtual_screen_rect(); - for (i = 0; i <= max( x_rel->number, y_rel->number ); i++) + for (i = 0; i <= max( x->number, y->number ); i++) { if (!XIMaskIsSet( event->valuators.mask, i )) continue; val = *values++; - if (i == x_rel->number) + if (i == x->number) { input->u.mi.dx = dx = val; - if (x_rel->min < x_rel->max) - input->u.mi.dx = val * (virtual_rect.right - virtual_rect.left) / (x_rel->max - x_rel->min); + if (x->min < x->max) + input->u.mi.dx = val * (virtual_rect.right - virtual_rect.left) / (x->max - x->min); } - if (i == y_rel->number) + if (i == y->number) { input->u.mi.dy = dy = val; - if (y_rel->min < y_rel->max) - input->u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) / (y_rel->max - y_rel->min); + if (y->min < y->max) + input->u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) / (y->max - y->min); } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 962fe373833..d384a8a68c0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -335,8 +335,8 @@ struct x11drv_thread_data enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ void *xi2_devices; /* list of XInput2 devices (valid when state is enabled) */ int xi2_device_count; - XIValuatorClassInfo x_rel_valuator; - XIValuatorClassInfo y_rel_valuator; + XIValuatorClassInfo x_valuator; + XIValuatorClassInfo y_valuator; int xi2_core_pointer; /* XInput2 core pointer id */ int xi2_current_slave; /* Current slave driving the Core pointer */ #endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */

1 0

Damjan Jovanovic : winegcc: Use sysctl instead of /proc/curproc/file on FreeBSD.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: c1e83ae9fbed38136324844c80540da9ece9d342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1e83ae9fbed38136324844c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Oct 23 10:17:45 2021 +0200 winegcc: Use sysctl instead of /proc/curproc/file on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5204553f739..b1123cd7e51 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -96,6 +96,11 @@ #include <string.h> #include <errno.h> #include <ctype.h> +#include <limits.h> +#include <sys/types.h> +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif #include "utils.h" @@ -747,7 +752,12 @@ static void init_argv0_dir( const char *argv0 ) #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) dir = realpath( "/proc/self/exe", NULL ); #elif defined (__FreeBSD__) || defined(__DragonFly__) - dir = realpath( "/proc/curproc/file", NULL ); + static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; + size_t path_size = PATH_MAX; + char *path = malloc( path_size ); + if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + dir = realpath( path, NULL ); + free( path ); #else dir = realpath( argv0, NULL ); #endif

1 0

Damjan Jovanovic : wmc: Use sysctl instead of /proc/curproc/file on FreeBSD.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 2c1b8153630d34aaea27a2d59c67e9704f5aa7d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c1b8153630d34aaea27a2d5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Oct 23 10:18:16 2021 +0200 wmc: Use sysctl instead of /proc/curproc/file on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/wmc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 864c969b136..2993d3c5ef7 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -24,6 +24,11 @@ #include <stdlib.h> #include <string.h> #include <signal.h> +#include <limits.h> +#include <sys/types.h> +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif #include "wmc.h" #include "utils.h" @@ -165,7 +170,12 @@ static void init_argv0_dir( const char *argv0 ) #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) dir = realpath( "/proc/self/exe", NULL ); #elif defined (__FreeBSD__) || defined(__DragonFly__) - dir = realpath( "/proc/curproc/file", NULL ); + static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; + size_t path_size = PATH_MAX; + char *path = malloc( path_size ); + if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + dir = realpath( path, NULL ); + free( path ); #else dir = realpath( argv0, NULL ); #endif

1 0

Damjan Jovanovic : wrc: Use sysctl instead of /proc/curproc/file on FreeBSD.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: f01b028d58d4195c9f84a08528ae7f9c226746e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f01b028d58d4195c9f84a085… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Oct 23 10:18:43 2021 +0200 wrc: Use sysctl instead of /proc/curproc/file on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/wrc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 8cdb91195cf..b44ae6fd0e5 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -27,6 +27,11 @@ #include <assert.h> #include <ctype.h> #include <signal.h> +#include <limits.h> +#include <sys/types.h> +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif #include "../tools.h" #include "wrc.h" @@ -336,7 +341,12 @@ static void init_argv0_dir( const char *argv0 ) #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) dir = realpath( "/proc/self/exe", NULL ); #elif defined (__FreeBSD__) || defined(__DragonFly__) - dir = realpath( "/proc/curproc/file", NULL ); + static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; + size_t path_size = PATH_MAX; + char *path = malloc( path_size ); + if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + dir = realpath( path, NULL ); + free( path ); #else dir = realpath( argv0, NULL ); #endif

1 0

Nikolay Sivov : mfplay: Better handle video control method calls when there is no media item set.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: dbe241990f9499ecaf00733e5e9e1e117faaf177 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbe241990f9499ecaf00733e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 25 13:04:16 2021 +0300 mfplay: Better handle video control method calls when there is no media item set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 33 +++++++++-------- dlls/mfplay/tests/Makefile.in | 2 +- dlls/mfplay/tests/mfplay.c | 86 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 101 insertions(+), 20 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 28226f92962..03f204768ab 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1323,6 +1323,15 @@ static HRESULT WINAPI media_player_SetMute(IMFPMediaPlayer *iface, BOOL mute) return E_NOTIMPL; } +static HRESULT media_player_get_display_control(const struct media_player *player, + IMFVideoDisplayControl **display_control) +{ + HRESULT hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, + &IID_IMFVideoDisplayControl, (void **)display_control); + if (SUCCEEDED(hr)) return hr; + return hr == MF_E_SHUTDOWN ? hr : MF_E_INVALIDREQUEST; +} + static HRESULT WINAPI media_player_GetNativeVideoSize(IMFPMediaPlayer *iface, SIZE *video, SIZE *arvideo) { @@ -1332,8 +1341,7 @@ static HRESULT WINAPI media_player_GetNativeVideoSize(IMFPMediaPlayer *iface, TRACE("%p, %p, %p.\n", iface, video, arvideo); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, video, arvideo); IMFVideoDisplayControl_Release(display_control); @@ -1351,8 +1359,7 @@ static HRESULT WINAPI media_player_GetIdealVideoSize(IMFPMediaPlayer *iface, TRACE("%p, %p, %p.\n", iface, min_size, max_size); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetIdealVideoSize(display_control, min_size, max_size); IMFVideoDisplayControl_Release(display_control); @@ -1370,8 +1377,7 @@ static HRESULT WINAPI media_player_SetVideoSourceRect(IMFPMediaPlayer *iface, TRACE("%p, %p.\n", iface, rect); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_SetVideoPosition(display_control, rect, NULL); IMFVideoDisplayControl_Release(display_control); @@ -1390,8 +1396,7 @@ static HRESULT WINAPI media_player_GetVideoSourceRect(IMFPMediaPlayer *iface, TRACE("%p, %p.\n", iface, rect); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetVideoPosition(display_control, rect, &dest); IMFVideoDisplayControl_Release(display_control); @@ -1408,8 +1413,7 @@ static HRESULT WINAPI media_player_SetAspectRatioMode(IMFPMediaPlayer *iface, DW TRACE("%p, %u.\n", iface, mode); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, mode); IMFVideoDisplayControl_Release(display_control); @@ -1427,8 +1431,7 @@ static HRESULT WINAPI media_player_GetAspectRatioMode(IMFPMediaPlayer *iface, TRACE("%p, %p.\n", iface, mode); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetAspectRatioMode(display_control, mode); IMFVideoDisplayControl_Release(display_control); @@ -1463,8 +1466,7 @@ static HRESULT WINAPI media_player_SetBorderColor(IMFPMediaPlayer *iface, COLORR TRACE("%p, %#x.\n", iface, color); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_SetBorderColor(display_control, color); IMFVideoDisplayControl_Release(display_control); @@ -1481,8 +1483,7 @@ static HRESULT WINAPI media_player_GetBorderColor(IMFPMediaPlayer *iface, COLORR TRACE("%p, %p.\n", iface, color); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetBorderColor(display_control, color); IMFVideoDisplayControl_Release(display_control); diff --git a/dlls/mfplay/tests/Makefile.in b/dlls/mfplay/tests/Makefile.in index 43c7ec26240..4eabb5ae0ab 100644 --- a/dlls/mfplay/tests/Makefile.in +++ b/dlls/mfplay/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplay.dll -IMPORTS = mfplay uuid mfuuid +IMPORTS = mfplay user32 uuid mfuuid C_SRCS = \ mfplay.c diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 438d636daa2..074cee6d217 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -142,13 +142,16 @@ static void test_create_player(void) static void test_shutdown(void) { - SIZE min_size, max_size; + SIZE size, min_size, max_size; + MFP_MEDIAPLAYER_STATE state; + MFVideoNormalizedRect rect; IMFPMediaPlayer *player; float slowest, fastest; - HRESULT hr; - MFP_MEDIAPLAYER_STATE state; IMFPMediaItem *item; + COLORREF color; HWND window; + DWORD mode; + HRESULT hr; hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -180,6 +183,28 @@ static void test_shutdown(void) hr = IMFPMediaPlayer_GetIdealVideoSize(player, &min_size, &max_size); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetVideoSourceRect(player, &rect); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetBorderColor(player, &color); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetAspectRatioMode(player, &mode); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetNativeVideoSize(player, &size, &size); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetBorderColor(player, 0); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetAspectRatioMode(player, MFVideoARMode_None); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_UpdateVideo(player); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", TRUE, 0, &item); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); @@ -212,9 +237,64 @@ static void test_media_item(void) IMFPMediaPlayer_Release(player); } +static void test_video_control(void) +{ + MFVideoNormalizedRect rect; + IMFPMediaPlayer *player; + COLORREF color; + HWND window; + DWORD mode; + HRESULT hr; + SIZE size; + + window = CreateWindowA("static", "mfplay_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create output window.\n"); + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, window, &player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* No active media item */ + + rect.left = rect.top = 0.0f; + rect.right = rect.bottom = 1.0f; + hr = IMFPMediaPlayer_SetVideoSourceRect(player, &rect); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetBorderColor(player, 0); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetAspectRatioMode(player, MFVideoARMode_None); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetVideoSourceRect(player, &rect); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetBorderColor(player, &color); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetAspectRatioMode(player, &mode); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetIdealVideoSize(player, &size, &size); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetNativeVideoSize(player, &size, &size); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_UpdateVideo(player); +todo_wine + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + IMFPMediaPlayer_Release(player); + + DestroyWindow(window); +} + START_TEST(mfplay) { test_create_player(); test_shutdown(); test_media_item(); + test_video_control(); }

1 0

Nikolay Sivov : mfplay: Fix pointer argument usage in GetMetadata().
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 98a91c2c254f17e90cbb9ac89beb8785bcf87f6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=98a91c2c254f17e90cbb9ac8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 25 13:04:17 2021 +0300 mfplay: Fix pointer argument usage in GetMetadata(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 03f204768ab..fb748a485d8 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -705,7 +705,7 @@ static HRESULT WINAPI media_item_GetMetadata(IMFPMediaItem *iface, IPropertyStor TRACE("%p, %p.\n", iface, metadata); return MFGetService((IUnknown *)item->source, &MF_PROPERTY_HANDLER_SERVICE, - &IID_IPropertyStore, (void **)&metadata); + &IID_IPropertyStore, (void **)metadata); } static const IMFPMediaItemVtbl media_item_vtbl =

1 0

Nikolay Sivov : mfplay: Update destination rectangle on SetVideoSourceRect().
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 848f2a4be004f3695ee00c1db54a9df77f97ee52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=848f2a4be004f3695ee00c1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 25 13:04:18 2021 +0300 mfplay: Update destination rectangle on SetVideoSourceRect(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 7 +++++-- dlls/mfplay/tests/mfplay.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index fb748a485d8..2ccee418b72 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1373,13 +1373,16 @@ static HRESULT WINAPI media_player_SetVideoSourceRect(IMFPMediaPlayer *iface, { struct media_player *player = impl_from_IMFPMediaPlayer(iface); IMFVideoDisplayControl *display_control; + RECT dst_rect; HRESULT hr; TRACE("%p, %p.\n", iface, rect); - if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) + if (!GetClientRect(player->output_window, &dst_rect)) + hr = HRESULT_FROM_WIN32(GetLastError()); + else if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { - hr = IMFVideoDisplayControl_SetVideoPosition(display_control, rect, NULL); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, rect, &dst_rect); IMFVideoDisplayControl_Release(display_control); } diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 074cee6d217..70fde9160c8 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -261,6 +261,49 @@ static void test_video_control(void) hr = IMFPMediaPlayer_SetVideoSourceRect(player, &rect); ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_SetVideoSourceRect(player, NULL); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetBorderColor(player, 0); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetAspectRatioMode(player, MFVideoARMode_None); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetVideoSourceRect(player, &rect); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetBorderColor(player, &color); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetAspectRatioMode(player, &mode); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetIdealVideoSize(player, &size, &size); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetNativeVideoSize(player, &size, &size); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_UpdateVideo(player); +todo_wine + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + IMFPMediaPlayer_Release(player); + + /* No active media item, no output window.*/ + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + rect.left = rect.top = 0.0f; + rect.right = rect.bottom = 1.0f; + hr = IMFPMediaPlayer_SetVideoSourceRect(player, &rect); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE), "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetVideoSourceRect(player, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE), "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_SetBorderColor(player, 0); ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mfplay: Fix output argument handling in CreateMediaItemFromURL().
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 4f923996603e8881b5afbcd791b1939a43eba4a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f923996603e8881b5afbcd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 25 13:04:19 2021 +0300 mfplay: Fix output argument handling in CreateMediaItemFromURL(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 15 +++++++++++++-- dlls/mfplay/tests/mfplay.c | 11 +++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 2ccee418b72..adb88fff053 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -968,8 +968,6 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, IUnknown *object; HRESULT hr; - *ret = NULL; - if (FAILED(hr = create_media_item(&player->IMFPMediaPlayer_iface, user_data, &item))) return hr; @@ -981,6 +979,11 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, if (sync) { + if (!ret) + return E_POINTER; + + *ret = NULL; + if (SUCCEEDED(hr = IMFSourceResolver_CreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE, player->propstore, &obj_type, &object))) { @@ -1000,6 +1003,14 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, } else { + if (!player->callback) + { + WARN("Asynchronous item creation is not supported without user callback.\n"); + return MF_E_INVALIDREQUEST; + } + + if (ret) *ret = NULL; + hr = IMFSourceResolver_BeginCreateObjectFromURL(player->resolver, url, MF_RESOLUTION_MEDIASOURCE, player->propstore, NULL, &player->resolver_callback, (IUnknown *)&item->IMFPMediaItem_iface); diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 70fde9160c8..f18e041a4d0 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -226,6 +226,7 @@ todo_wine static void test_media_item(void) { IMFPMediaPlayer *player; + IMFPMediaItem *item; HRESULT hr; hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); @@ -234,6 +235,16 @@ static void test_media_item(void) hr = IMFPMediaPlayer_SetMediaItem(player, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + /* Async mode, no callback was specified. */ + hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", FALSE, 0, &item); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", FALSE, 0, NULL); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", TRUE, 0, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + IMFPMediaPlayer_Release(player); }

1 0

Nikolay Sivov : mfplay: Partially implement GetDuration().
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 9d6fc061c97a247ffce7134d429d10fc13a9d9c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d6fc061c97a247ffce7134d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 25 13:04:20 2021 +0300 mfplay: Partially implement GetDuration(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 22 +++++++++++++++++++--- dlls/mfplay/tests/mfplay.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index adb88fff053..0e33dcbd649 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -909,11 +909,27 @@ static HRESULT WINAPI media_player_GetPosition(IMFPMediaPlayer *iface, REFGUID p return E_NOTIMPL; } -static HRESULT WINAPI media_player_GetDuration(IMFPMediaPlayer *iface, REFGUID postype, PROPVARIANT *position) +static HRESULT WINAPI media_player_GetDuration(IMFPMediaPlayer *iface, REFGUID postype, PROPVARIANT *duration) { - FIXME("%p, %s, %p.\n", iface, debugstr_guid(postype), position); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(postype), duration); + + if (!postype || !duration) + return E_POINTER; + + EnterCriticalSection(&player->cs); + if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) + hr = MF_E_SHUTDOWN; + else if (!player->item) + hr = MF_E_INVALIDREQUEST; + else + /* FIXME: use start/stop markers for resulting duration */ + hr = IMFPMediaItem_GetDuration(player->item, postype, duration); + LeaveCriticalSection(&player->cs); + + return hr; } static HRESULT WINAPI media_player_SetRate(IMFPMediaPlayer *iface, float rate) diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index f18e041a4d0..cfa689c189e 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -148,6 +148,7 @@ static void test_shutdown(void) IMFPMediaPlayer *player; float slowest, fastest; IMFPMediaItem *item; + PROPVARIANT propvar; COLORREF color; HWND window; DWORD mode; @@ -217,6 +218,15 @@ todo_wine hr = IMFPMediaPlayer_GetVideoWindow(player, &window); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetDuration(player, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, &propvar); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_Shutdown(player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -345,10 +355,33 @@ todo_wine DestroyWindow(window); } +static void test_duration(void) +{ + IMFPMediaPlayer *player; + PROPVARIANT propvar; + HRESULT hr; + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* No media item. */ + hr = IMFPMediaPlayer_GetDuration(player, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, &propvar); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + IMFPMediaPlayer_Release(player); +} + START_TEST(mfplay) { test_create_player(); test_shutdown(); test_media_item(); test_video_control(); + test_duration(); }

1 0

Nikolay Sivov : mfplay: Implement GetPosition().
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: dd1a603a1f0447c980f41606aba5f6aa7717643e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd1a603a1f0447c980f41606… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 25 13:04:21 2021 +0300 mfplay: Implement GetPosition(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 40 +++++++++++++++++++++++++++++++++++++--- dlls/mfplay/tests/mfplay.c | 24 ++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 0e33dcbd649..a34973f8e36 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -904,9 +904,40 @@ static HRESULT WINAPI media_player_SetPosition(IMFPMediaPlayer *iface, REFGUID p static HRESULT WINAPI media_player_GetPosition(IMFPMediaPlayer *iface, REFGUID postype, PROPVARIANT *position) { - FIXME("%p, %s, %p.\n", iface, debugstr_guid(postype), position); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFPresentationClock *presentation_clock; + IMFClock *clock; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(postype), position); + + if (!position) + return E_POINTER; + + if (!IsEqualGUID(postype, &MFP_POSITIONTYPE_100NS)) + return E_INVALIDARG; + + EnterCriticalSection(&player->cs); + if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) + hr = MF_E_SHUTDOWN; + else if (!player->item) + hr = MF_E_INVALIDREQUEST; + else + { + if (SUCCEEDED(hr = IMFMediaSession_GetClock(player->session, &clock))) + { + if (SUCCEEDED(hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&presentation_clock))) + { + position->vt = VT_UI8; + hr = IMFPresentationClock_GetTime(presentation_clock, (MFTIME *)&position->uhVal.QuadPart); + IMFPresentationClock_Release(presentation_clock); + } + IMFClock_Release(clock); + } + } + LeaveCriticalSection(&player->cs); + + return hr; } static HRESULT WINAPI media_player_GetDuration(IMFPMediaPlayer *iface, REFGUID postype, PROPVARIANT *duration) @@ -916,9 +947,12 @@ static HRESULT WINAPI media_player_GetDuration(IMFPMediaPlayer *iface, REFGUID p TRACE("%p, %s, %p.\n", iface, debugstr_guid(postype), duration); - if (!postype || !duration) + if (!duration) return E_POINTER; + if (!IsEqualGUID(postype, &MFP_POSITIONTYPE_100NS)) + return E_INVALIDARG; + EnterCriticalSection(&player->cs); if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) hr = MF_E_SHUTDOWN; diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index cfa689c189e..1daaa3af1d5 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -227,6 +227,15 @@ todo_wine hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, &propvar); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetPosition(player, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, &propvar); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_Shutdown(player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -371,9 +380,24 @@ static void test_duration(void) hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetDuration(player, &IID_IUnknown, &propvar); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, &propvar); ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetPosition(player, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &IID_IUnknown, &propvar); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, &propvar); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + IMFPMediaPlayer_Release(player); }

1 0