wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Andrey Gusev : make_specfiles: Add api-ms-win-core-winrt-error-l1-1-* to combase group.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 9b3d5b8e5e3764920b78626f48315be0b119d7b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b3d5b8e5e3764920b78626f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Apr 21 13:27:13 2021 +0300 make_specfiles: Add api-ms-win-core-winrt-error-l1-1-* to combase group. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_specfiles | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/make_specfiles b/tools/make_specfiles index 7486bd57647..4a151545aa0 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -470,6 +470,8 @@ my @dll_groups = ], [ "combase", + "api-ms-win-core-winrt-error-l1-1-0", + "api-ms-win-core-winrt-error-l1-1-1", "api-ms-win-core-winrt-errorprivate-l1-1-1", "api-ms-win-core-winrt-l1-1-0", "api-ms-win-core-winrt-registration-l1-1-0",

1 0

Andrey Gusev : dmime: Fix misplaced parentheses.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 7d14318c1862a96ab1a3357c64f3e47e7b6c0f2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d14318c1862a96ab1a3357c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Apr 21 13:27:50 2021 +0300 dmime: Fix misplaced parentheses. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/lyricstrack.c | 2 +- dlls/dmime/tempotrack.c | 2 +- dlls/dmime/timesigtrack.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index b45041ca818..b2ce3e0a4c1 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -320,7 +320,7 @@ static HRESULT WINAPI lyrics_IPersistStream_Load(IPersistStream *iface, IStream if (!stream) return E_POINTER; - if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + if ((hr = stream_get_chunk(stream, &chunk)) != S_OK) return hr; if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_LYRICSTRACK_LIST) diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 9d25ccc298c..57931bf1e56 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -339,7 +339,7 @@ static HRESULT WINAPI tempo_IPersistStream_Load(IPersistStream *iface, IStream * if (!stream) return E_POINTER; - if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + if ((hr = stream_get_chunk(stream, &chunk)) != S_OK) return hr; if (chunk.id != DMUS_FOURCC_TEMPO_TRACK) return DMUS_E_UNSUPPORTED_STREAM; diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 30432378cfa..c34049beb18 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -262,7 +262,7 @@ static HRESULT WINAPI time_IPersistStream_Load(IPersistStream *iface, IStream *s if (!stream) return E_POINTER; - if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + if ((hr = stream_get_chunk(stream, &chunk)) != S_OK) return hr; if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_TIMESIGTRACK_LIST)

1 0

Nikolay Sivov : rtworkq: Use CRT allocation functions.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 349b61cc985dd211d15acb3dfacfe3bf6a613723 URL: https://source.winehq.org/git/wine.git/?a=commit;h=349b61cc985dd211d15acb3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 21 12:31:17 2021 +0300 rtworkq: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 6817b06f284..58769a0be04 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -24,7 +24,6 @@ #include "initguid.h" #include "rtworkq.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -220,7 +219,7 @@ static HRESULT unlock_user_queue(DWORD queue) { if (shared_mt_queue == queue) shared_mt_queue = 0; shutdown_queue((struct queue *)entry->obj); - heap_free(entry->obj); + free(entry->obj); entry->obj = next_free_user_queue; next_free_user_queue = entry; } @@ -555,7 +554,7 @@ static ULONG WINAPI work_item_Release(IUnknown *iface) if (item->reply_result) IRtwqAsyncResult_Release(item->reply_result); IRtwqAsyncResult_Release(item->result); - heap_free(item); + free(item); } return refcount; @@ -574,7 +573,7 @@ static struct work_item * alloc_work_item(struct queue *queue, LONG priority, IR DWORD flags = 0, queue_id = 0; struct work_item *item; - item = heap_alloc_zero(sizeof(*item)); + item = calloc(1, sizeof(*item)); item->IUnknown_iface.lpVtbl = &work_item_vtbl; item->result = result; @@ -898,8 +897,7 @@ static HRESULT alloc_user_queue(const struct queue_desc *desc, DWORD *queue_id) if (platform_lock <= 0) return RTWQ_E_SHUTDOWN; - queue = heap_alloc_zero(sizeof(*queue)); - if (!queue) + if (!(queue = calloc(1, sizeof(*queue)))) return E_OUTOFMEMORY; init_work_queue(desc, queue); @@ -914,7 +912,7 @@ static HRESULT alloc_user_queue(const struct queue_desc *desc, DWORD *queue_id) else { LeaveCriticalSection(&queues_section); - heap_free(queue); + free(queue); WARN("Out of user queue handles.\n"); return E_OUTOFMEMORY; } @@ -988,7 +986,7 @@ static ULONG WINAPI async_result_Release(IRtwqAsyncResult *iface) IUnknown_Release(result->state); if (result->result.hEvent) CloseHandle(result->result.hEvent); - heap_free(result); + free(result); RtwqUnlockPlatform(); } @@ -1074,8 +1072,7 @@ static HRESULT create_async_result(IUnknown *object, IRtwqAsyncCallback *callbac if (!out) return E_INVALIDARG; - result = heap_alloc_zero(sizeof(*result)); - if (!result) + if (!(result = calloc(1, sizeof(*result)))) return E_OUTOFMEMORY; RtwqLockPlatform(); @@ -1267,7 +1264,7 @@ static ULONG WINAPI periodic_callback_Release(IRtwqAsyncCallback *iface) TRACE("%p, %u.\n", iface, refcount); if (!refcount) - heap_free(callback); + free(callback); return refcount; } @@ -1306,8 +1303,7 @@ static HRESULT create_periodic_callback_obj(RTWQPERIODICCALLBACK callback, IRtwq { struct periodic_callback *object; - object = heap_alloc(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IRtwqAsyncCallback_iface.lpVtbl = &periodic_callback_vtbl;

1 0

Nikolay Sivov : mfplay: Implement GetNativeVideoSize().
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 2d2290843913fa8ed4f15670da5818fc3479bf05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d2290843913fa8ed4f15670… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 21 12:29:49 2021 +0300 mfplay: Implement GetNativeVideoSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index aa9392a1e97..540a182a5ba 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1243,9 +1243,20 @@ static HRESULT WINAPI media_player_SetMute(IMFPMediaPlayer *iface, BOOL mute) static HRESULT WINAPI media_player_GetNativeVideoSize(IMFPMediaPlayer *iface, SIZE *video, SIZE *arvideo) { - FIXME("%p, %p, %p.\n", iface, video, arvideo); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFVideoDisplayControl *display_control; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, video, arvideo); + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, + &IID_IMFVideoDisplayControl, (void **)&display_control))) + { + hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, video, arvideo); + IMFVideoDisplayControl_Release(display_control); + } + + return hr; } static HRESULT WINAPI media_player_GetIdealVideoSize(IMFPMediaPlayer *iface,

1 0

Nikolay Sivov : mfplay: Implement border color control methods.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: b1203230a3e4fb2b207aedbefbbe97ae67e01d76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1203230a3e4fb2b207aedbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 21 12:29:48 2021 +0300 mfplay: Implement border color control methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 708df7614e8..aa9392a1e97 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1363,16 +1363,38 @@ static HRESULT WINAPI media_player_UpdateVideo(IMFPMediaPlayer *iface) static HRESULT WINAPI media_player_SetBorderColor(IMFPMediaPlayer *iface, COLORREF color) { - FIXME("%p, %#x.\n", iface, color); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFVideoDisplayControl *display_control; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %#x.\n", iface, color); + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, + &IID_IMFVideoDisplayControl, (void **)&display_control))) + { + hr = IMFVideoDisplayControl_SetBorderColor(display_control, color); + IMFVideoDisplayControl_Release(display_control); + } + + return hr; } static HRESULT WINAPI media_player_GetBorderColor(IMFPMediaPlayer *iface, COLORREF *color) { - FIXME("%p, %p.\n", iface, color); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFVideoDisplayControl *display_control; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, color); + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, + &IID_IMFVideoDisplayControl, (void **)&display_control))) + { + hr = IMFVideoDisplayControl_GetBorderColor(display_control, color); + IMFVideoDisplayControl_Release(display_control); + } + + return hr; } static HRESULT WINAPI media_player_InsertEffect(IMFPMediaPlayer *iface, IUnknown *effect,

1 0

Nikolay Sivov : mfplay: Implement aspect ratio control methods.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 69e6f194b6ebb29d59d178b5cd23c29810779039 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69e6f194b6ebb29d59d178b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 21 12:29:47 2021 +0300 mfplay: Implement aspect ratio control methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index cfbb3764905..708df7614e8 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1308,17 +1308,39 @@ static HRESULT WINAPI media_player_GetVideoSourceRect(IMFPMediaPlayer *iface, static HRESULT WINAPI media_player_SetAspectRatioMode(IMFPMediaPlayer *iface, DWORD mode) { - FIXME("%p, %u.\n", iface, mode); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFVideoDisplayControl *display_control; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u.\n", iface, mode); + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, + &IID_IMFVideoDisplayControl, (void **)&display_control))) + { + hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, mode); + IMFVideoDisplayControl_Release(display_control); + } + + return hr; } static HRESULT WINAPI media_player_GetAspectRatioMode(IMFPMediaPlayer *iface, DWORD *mode) { - FIXME("%p, %p.\n", iface, mode); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFVideoDisplayControl *display_control; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, mode); + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, + &IID_IMFVideoDisplayControl, (void **)&display_control))) + { + hr = IMFVideoDisplayControl_GetAspectRatioMode(display_control, mode); + IMFVideoDisplayControl_Release(display_control); + } + + return hr; } static HRESULT WINAPI media_player_GetVideoWindow(IMFPMediaPlayer *iface, HWND *window)

1 0

Nikolay Sivov : mfplay: Implement source rectangle methods.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 6580ce6801b296bbb672836cf2b1fdc65222ba44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6580ce6801b296bbb672836c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 21 12:29:46 2021 +0300 mfplay: Implement source rectangle methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 80c88721c78..cfbb3764905 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1270,17 +1270,40 @@ static HRESULT WINAPI media_player_GetIdealVideoSize(IMFPMediaPlayer *iface, static HRESULT WINAPI media_player_SetVideoSourceRect(IMFPMediaPlayer *iface, MFVideoNormalizedRect const *rect) { - FIXME("%p, %p.\n", iface, rect); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFVideoDisplayControl *display_control; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, rect); + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, + &IID_IMFVideoDisplayControl, (void **)&display_control))) + { + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, rect, NULL); + IMFVideoDisplayControl_Release(display_control); + } + + return hr; } static HRESULT WINAPI media_player_GetVideoSourceRect(IMFPMediaPlayer *iface, MFVideoNormalizedRect *rect) { - FIXME("%p, %p.\n", iface, rect); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFVideoDisplayControl *display_control; + HRESULT hr; + RECT dest; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, rect); + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, + &IID_IMFVideoDisplayControl, (void **)&display_control))) + { + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, rect, &dest); + IMFVideoDisplayControl_Release(display_control); + } + + return hr; } static HRESULT WINAPI media_player_SetAspectRatioMode(IMFPMediaPlayer *iface, DWORD mode)

1 0

Nikolay Sivov : mfplay: Forward GetNativeVideoSize() to the session.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: fd0d79c624afa66e4b4a71434797ffbc106a7649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd0d79c624afa66e4b4a7143… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 21 12:29:45 2021 +0300 mfplay: Forward GetNativeVideoSize() to the session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/Makefile.in | 2 +- dlls/mfplay/player.c | 15 +++++++++++++-- dlls/mfplay/tests/mfplay.c | 4 ++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in index 8cd572bf638..303226f57f6 100644 --- a/dlls/mfplay/Makefile.in +++ b/dlls/mfplay/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplay.dll IMPORTLIB = mfplay -IMPORTS = mfplat mf ole32 user32 uuid mfuuid +IMPORTS = mfplat mf ole32 user32 uuid mfuuid strmiids EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 831e9fa9781..80c88721c78 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1251,9 +1251,20 @@ static HRESULT WINAPI media_player_GetNativeVideoSize(IMFPMediaPlayer *iface, static HRESULT WINAPI media_player_GetIdealVideoSize(IMFPMediaPlayer *iface, SIZE *min_size, SIZE *max_size) { - FIXME("%p, %p, %p.\n", iface, min_size, max_size); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFVideoDisplayControl *display_control; + HRESULT hr; - return E_NOTIMPL; + 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))) + { + hr = IMFVideoDisplayControl_GetIdealVideoSize(display_control, min_size, max_size); + IMFVideoDisplayControl_Release(display_control); + } + + return hr; } static HRESULT WINAPI media_player_SetVideoSourceRect(IMFPMediaPlayer *iface, diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 64a48cceaca..f11973ef939 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -122,6 +122,7 @@ static void test_create_player(void) static void test_shutdown(void) { + SIZE min_size, max_size; IMFPMediaPlayer *player; float slowest, fastest; HRESULT hr; @@ -156,6 +157,9 @@ static void test_shutdown(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(state == MFP_MEDIAPLAYER_STATE_SHUTDOWN, "Unexpected state %d.\n", state); + hr = IMFPMediaPlayer_GetIdealVideoSize(player, &min_size, &max_size); + 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);

1 0

Nikolay Sivov : mfplay: Implement HasVideo()/HasAudio().
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 7ce6ff3cb492efbac7e9c4243a07f1f64fef0e42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ce6ff3cb492efbac7e9c424… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 21 12:29:44 2021 +0300 mfplay: Implement HasVideo()/HasAudio(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 66 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 18 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 6a6f3b6cddc..831e9fa9781 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -435,18 +435,62 @@ static HRESULT WINAPI media_item_SetStartStopPosition(IMFPMediaItem *iface, cons return E_NOTIMPL; } +static HRESULT media_item_get_stream_type(IMFStreamDescriptor *sd, GUID *major) +{ + IMFMediaTypeHandler *handler; + HRESULT hr; + + if (SUCCEEDED(hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler))) + { + hr = IMFMediaTypeHandler_GetMajorType(handler, major); + IMFMediaTypeHandler_Release(handler); + } + + return hr; +} + +static HRESULT media_item_has_stream(struct media_item *item, const GUID *major, BOOL *has_stream, BOOL *is_selected) +{ + IMFStreamDescriptor *sd; + unsigned int idx = 0; + BOOL selected; + GUID guid; + + *has_stream = *is_selected = FALSE; + + while (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, idx++, &selected, &sd))) + { + if (SUCCEEDED(media_item_get_stream_type(sd, &guid)) && IsEqualGUID(&guid, major)) + { + *has_stream = TRUE; + *is_selected = selected; + } + + IMFStreamDescriptor_Release(sd); + + if (*has_stream && *is_selected) + break; + } + + return S_OK; +} + static HRESULT WINAPI media_item_HasVideo(IMFPMediaItem *iface, BOOL *has_video, BOOL *selected) { - FIXME("%p, %p, %p.\n", iface, has_video, selected); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, has_video, selected); + + return media_item_has_stream(item, &MFMediaType_Video, has_video, selected); } static HRESULT WINAPI media_item_HasAudio(IMFPMediaItem *iface, BOOL *has_audio, BOOL *selected) { - FIXME("%p, %p, %p.\n", iface, has_audio, selected); + struct media_item *item = impl_from_IMFPMediaItem(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, has_audio, selected); + + return media_item_has_stream(item, &MFMediaType_Audio, has_audio, selected); } static HRESULT WINAPI media_item_IsProtected(IMFPMediaItem *iface, BOOL *protected) @@ -1001,20 +1045,6 @@ static HRESULT WINAPI media_player_CreateMediaItemFromObject(IMFPMediaPlayer *if return hr; } -static HRESULT media_item_get_stream_type(IMFStreamDescriptor *sd, GUID *major) -{ - IMFMediaTypeHandler *handler; - HRESULT hr; - - if (SUCCEEDED(hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler))) - { - hr = IMFMediaTypeHandler_GetMajorType(handler, major); - IMFMediaTypeHandler_Release(handler); - } - - return hr; -} - static HRESULT media_item_create_source_node(struct media_item *item, IMFStreamDescriptor *sd, IMFTopologyNode **node) {

1 0

Nikolay Sivov : mfplay: Create video output branches.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: baa97389103096cac90908e5d56fe7d5f6b58cd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baa97389103096cac90908e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 21 12:29:43 2021 +0300 mfplay: Create video output branches. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 87ddf613288..6a6f3b6cddc 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1043,29 +1043,23 @@ static HRESULT media_item_create_sink_node(IUnknown *sink, IMFTopologyNode **nod static HRESULT media_item_create_topology(struct media_player *player, struct media_item *item, IMFTopology **out) { IMFTopologyNode *src_node, *sink_node; + BOOL selected, video_added = FALSE; IMFStreamDescriptor *sd; IMFTopology *topology; unsigned int idx; IUnknown *sink; - BOOL selected; HRESULT hr; GUID major; if (FAILED(hr = MFCreateTopology(&topology))) return hr; - /* Use first stream if none selected. */ - if (player->output_window) - { - FIXME("Video streams are not handled.\n"); - } - /* Set up branches for all selected streams. */ idx = 0; while (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, idx++, &selected, &sd))) { - if (!selected) + if (!selected || FAILED(media_item_get_stream_type(sd, &major))) { IMFStreamDescriptor_Release(sd); continue; @@ -1077,11 +1071,17 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me { /* User sink is attached as-is. */ } - else if (SUCCEEDED(media_item_get_stream_type(sd, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) + else if (IsEqualGUID(&major, &MFMediaType_Audio)) { if (FAILED(hr = MFCreateAudioRendererActivate((IMFActivate **)&sink))) WARN("Failed to create SAR activation object, hr %#x.\n", hr); } + else if (IsEqualGUID(&major, &MFMediaType_Video) && player->output_window && !video_added) + { + if (FAILED(hr = MFCreateVideoRendererActivate(player->output_window, (IMFActivate **)&sink))) + WARN("Failed to create EVR activation object, hr %#x.\n", hr); + video_added = SUCCEEDED(hr); + } if (sink) {

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021