April 2021 - Wine-Commits - list.winehq.org

Nikolay Sivov : mfplay: Implement aspect ratio control methods.
by Alexandre Julliard April 21, 2021

April 21, 2021

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

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

April 21, 2021

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

Nikolay Sivov : mfplay: Forward GetNativeVideoSize() to the session.
by Alexandre Julliard April 21, 2021

April 21, 2021

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 source rectangle methods.
by Alexandre Julliard April 21, 2021

April 21, 2021

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: Implement GetNativeVideoSize().
by Alexandre Julliard April 21, 2021

April 21, 2021

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 : rtworkq: Use CRT allocation functions.
by Alexandre Julliard April 21, 2021

April 21, 2021

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

Jacek Caban : jscript: Don't expose named functions in expressions as a local variable in ES5 mode.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: e76450946660dc520d0274a10efed8c540f99e8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e76450946660dc520d0274a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 21 17:23:17 2021 +0200 jscript: Don't expose named functions in expressions as a local variable in ES5 mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 21 +++++++++++++++++---- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 1 + dlls/mshtml/tests/documentmode.js | 25 +++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 717ae00d053..9bb9ff13d14 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1887,8 +1887,12 @@ static HRESULT visit_function_expression(compiler_ctx_t *ctx, function_expressio expr->func_id = ctx->func->func_cnt++; ctx->func_tail = ctx->func_tail ? (ctx->func_tail->next = expr) : (ctx->func_head = expr); - return !expr->identifier || expr->event_target || alloc_variable(ctx, expr->identifier) - ? S_OK : E_OUTOFMEMORY; + if(!expr->identifier || expr->event_target) + return S_OK; + if(!expr->is_statement && ctx->parser->script->version >= SCRIPTLANGUAGEVERSION_ES5) + return S_OK; + + return alloc_variable(ctx, expr->identifier) ? S_OK : E_OUTOFMEMORY; } static HRESULT visit_expression(compiler_ctx_t *ctx, expression_t *expr) @@ -2069,7 +2073,15 @@ static HRESULT visit_statement(compiler_ctx_t *ctx, statement_t *stat) case STAT_CONTINUE: case STAT_EMPTY: break; - case STAT_EXPR: + case STAT_EXPR: { + expression_statement_t *expr_stat = (expression_statement_t*)stat; + if(expr_stat->expr) { + if(expr_stat->expr->type == EXPR_FUNC) + ((function_expression_t*)expr_stat->expr)->is_statement = TRUE; + hres = visit_expression(ctx, expr_stat->expr); + } + break; + } case STAT_RETURN: case STAT_THROW: { expression_statement_t *expr_stat = (expression_statement_t*)stat; @@ -2410,7 +2422,8 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, return hres; TRACE("[%d] func %s\n", i, debugstr_w(func->funcs[i].name)); - if(func->funcs[i].name && !func->funcs[i].event_target) { + if((ctx->parser->script->version < SCRIPTLANGUAGEVERSION_ES5 || iter->is_statement) && + func->funcs[i].name && !func->funcs[i].event_target) { local_ref_t *local_ref = lookup_local(func, func->funcs[i].name); func->funcs[i].local_ref = local_ref->ref; TRACE("found ref %s %d for %s\n", debugstr_w(local_ref->name), local_ref->ref, debugstr_w(func->funcs[i].name)); diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index 3fa699c86d3..b88a52af242 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -302,6 +302,7 @@ typedef struct _function_expression_t { const WCHAR *src_str; DWORD src_len; unsigned func_id; + BOOL is_statement; struct _function_expression_t *next; /* for compiler */ } function_expression_t; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index bfc83912ba1..f11119143b8 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1386,6 +1386,7 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide ret->event_target = event_target; ret->src_str = src_str; ret->src_len = src_len; + ret->is_statement = FALSE; ret->next = NULL; return &ret->expr; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index dfaaff44096..bd1255bc960 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -538,6 +538,7 @@ sync_test("delete_prop", function() { }); var func_scope_val = 1; +var func_scope_val2 = 2; sync_test("func_scope", function() { var func_scope_val = 2; @@ -571,4 +572,28 @@ sync_test("func_scope", function() { window = 1; ok(window === window.self, "window = " + window); + + ! function func_scope_val2() {}; + ok(window.func_scope_val2 === 2, "window.func_scope_val2 = " + window.func_scope_val2); + + var o = {}; + (function(x) { + ok(x === o, "x = " + x); + ! function x() {}; + ok(x === o, "x != o"); + })(o); + + (function(x) { + ok(x === o, "x = " + x); + 1, function x() {}; + ok(x === o, "x != o"); + })(o); + + (function() { + ! function x() {}; + try { + x(); + ok(false, "expected exception"); + }catch(e) {} + })(o); });

1 0

Connor McAdams : mfplat: Add support for AudioFormat_Float in MFCreateWaveFormatExFromMFMediaType.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 538b702c871aa262d117a10fb5bc02b543112981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=538b702c871aa262d117a10f… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Apr 21 10:20:04 2021 -0400 mfplat: Add support for AudioFormat_Float in MFCreateWaveFormatExFromMFMediaType. Add support for the MFAudioFormat_Float subtype in MFCreateWaveFormatExFromMFMediaType. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index c8028b2a46f..4904dbb566f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2884,7 +2884,7 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE if (!IsEqualGUID(&major, &MFMediaType_Audio)) return E_INVALIDARG; - if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM)) + if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM) && !IsEqualGUID(&subtype, &MFAudioFormat_Float)) { FIXME("Unsupported audio format %s.\n", debugstr_guid(&subtype)); return E_NOTIMPL; @@ -2908,7 +2908,12 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE memset(format, 0, *size); - format->wFormatTag = format_ext ? WAVE_FORMAT_EXTENSIBLE : WAVE_FORMAT_PCM; + if (format_ext) + format->wFormatTag = WAVE_FORMAT_EXTENSIBLE; + else if (IsEqualGUID(&subtype, &MFAudioFormat_Float)) + format->wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + else + format->wFormatTag = WAVE_FORMAT_PCM; if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, &value))) format->nChannels = value;

1 0

Nikolay Sivov : mfplay: Handle user sinks.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 78c35d34e88219a8f1c93e53d71587189e9d0f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78c35d34e88219a8f1c93e53… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 21 12:29:42 2021 +0300 mfplay: Handle user sinks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 75 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 51f3f67f5b1..87ddf613288 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1015,13 +1015,38 @@ static HRESULT media_item_get_stream_type(IMFStreamDescriptor *sd, GUID *major) return hr; } +static HRESULT media_item_create_source_node(struct media_item *item, IMFStreamDescriptor *sd, + IMFTopologyNode **node) +{ + HRESULT hr; + + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, node))) + { + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_SOURCE, (IUnknown *)item->source); + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)item->pd); + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + } + + return hr; +} + +static HRESULT media_item_create_sink_node(IUnknown *sink, IMFTopologyNode **node) +{ + HRESULT hr; + + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, node))) + IMFTopologyNode_SetObject(*node, sink); + + return hr; +} + static HRESULT media_item_create_topology(struct media_player *player, struct media_item *item, IMFTopology **out) { IMFTopologyNode *src_node, *sink_node; - IMFActivate *sar_activate; IMFStreamDescriptor *sd; IMFTopology *topology; unsigned int idx; + IUnknown *sink; BOOL selected; HRESULT hr; GUID major; @@ -1029,48 +1054,54 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me if (FAILED(hr = MFCreateTopology(&topology))) return hr; - /* FIXME: handle user sinks */ - /* Use first stream if none selected. */ if (player->output_window) { FIXME("Video streams are not handled.\n"); } - /* Set up audio branches for all selected streams. */ + /* Set up branches for all selected streams. */ idx = 0; while (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, idx++, &selected, &sd))) { - if (selected && SUCCEEDED(media_item_get_stream_type(sd, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) + if (!selected) { - if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node))) - { - IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, (IUnknown *)item->source); - IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)item->pd); - IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + IMFStreamDescriptor_Release(sd); + continue; + } - IMFTopology_AddNode(topology, src_node); - } + sink = NULL; - if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node))) - { - if (SUCCEEDED(MFCreateAudioRendererActivate(&sar_activate))) - { - IMFTopologyNode_SetObject(sink_node, (IUnknown *)sar_activate); - IMFActivate_Release(sar_activate); - } + if (SUCCEEDED(IMFStreamDescriptor_GetUnknown(sd, &_MF_CUSTOM_SINK, &IID_IUnknown, (void **)&sink))) + { + /* User sink is attached as-is. */ + } + else if (SUCCEEDED(media_item_get_stream_type(sd, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) + { + if (FAILED(hr = MFCreateAudioRendererActivate((IMFActivate **)&sink))) + WARN("Failed to create SAR activation object, hr %#x.\n", hr); + } - IMFTopology_AddNode(topology, sink_node); - } + if (sink) + { + hr = media_item_create_source_node(item, sd, &src_node); + if (SUCCEEDED(hr)) + hr = media_item_create_sink_node(sink, &sink_node); - if (src_node && sink_node) + if (SUCCEEDED(hr)) + { + IMFTopology_AddNode(topology, src_node); + IMFTopology_AddNode(topology, sink_node); IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0); + } if (src_node) IMFTopologyNode_Release(src_node); if (sink_node) IMFTopologyNode_Release(sink_node); + + IUnknown_Release(sink); } IMFStreamDescriptor_Release(sd);

1 0

Hugh McMaster : reg: Print the full key path without a trailing backslash.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: e685718c3b701b67e1920a8e4f2ddce31d3ca800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e685718c3b701b67e1920a8e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 21 23:24:48 2021 +1000 reg: Print the full key path without a trailing backslash. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 14 +++++++++++--- programs/reg/tests/query.c | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 69107d54b92..8ffbc5054d9 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -205,10 +205,10 @@ WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD WCHAR *get_long_key(HKEY root, WCHAR *path) { - DWORD i, array_size = ARRAY_SIZE(root_rels), len; + int i, len, path_len; WCHAR *long_key; - for (i = 0; i < array_size; i++) + for (i = 0; i < ARRAY_SIZE(root_rels); i++) { if (root == root_rels[i].key) break; @@ -223,7 +223,15 @@ WCHAR *get_long_key(HKEY root, WCHAR *path) return long_key; } - len += lstrlenW(path) + 1; /* add one for the backslash */ + path_len = lstrlenW(path); + + if (path[path_len - 1] == '\\') + { + path[path_len - 1] = 0; + path_len--; + } + + len += path_len + 1; /* add one for the concatenating backslash */ long_key = malloc((len + 1) * sizeof(WCHAR)); swprintf(long_key, len + 1, L"%s\\%s", root_rels[i].long_name, path); return long_key; diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 5c97554648e..34196c77aa4 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -251,7 +251,7 @@ static void test_query(void) read_reg_output("reg query HKCU\\" KEY_BASE "\\ /s", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test6, FALSE, TODO_REG_COMPARE); + compare_query(buf, test6, FALSE, 0); read_reg_output("reg query HKCU\\" KEY_BASE " /v Wine /s", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */,

1 0