- Wine-Devel - list.winehq.org

[PATCH 1/5] winegstreamer: Activate source pad in push mode if it isn't activated in pull mode.
by Derek Lesho March 11, 2021

March 11, 2021

Since our source pad is not part of any element, gstreamer won't end up activating it directly through the state transition. Instead, if the downstream element doesn't activate the source pad into pull mode during the transition to the READY state, we activate our pad in push mode. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index b8dd75d5fff..67f65264a8d 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -58,7 +58,7 @@ struct wg_parser pthread_mutex_t mutex; pthread_cond_t init_cond; - bool no_more_pads, has_duration, error; + bool no_more_pads, has_duration, error, pull_mode; pthread_cond_t read_cond, read_done_cond; struct @@ -1331,9 +1331,12 @@ static gboolean src_activate_mode_cb(GstPad *pad, GstObject *parent, GstPadMode GST_DEBUG("%s source pad for parser %p in %s mode.", activate ? "Activating" : "Deactivating", parser, gst_pad_mode_get_name(mode)); + parser->pull_mode = false; + switch (mode) { case GST_PAD_MODE_PULL: + parser->pull_mode = activate; return TRUE; case GST_PAD_MODE_PUSH: return activate_push(pad, activate); @@ -1573,6 +1576,8 @@ static void CDECL wg_parser_disconnect(struct wg_parser *parser) pthread_mutex_unlock(&parser->mutex); gst_element_set_state(parser->container, GST_STATE_NULL); + if (!parser->pull_mode) + gst_pad_set_active(parser->my_src, 0); gst_pad_unlink(parser->my_src, parser->their_sink); gst_object_unref(parser->my_src); gst_object_unref(parser->their_sink); @@ -1628,6 +1633,8 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) } gst_element_set_state(parser->container, GST_STATE_PAUSED); + if (!parser->pull_mode) + gst_pad_set_active(parser->my_src, 1); ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { @@ -1679,6 +1686,8 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) } gst_element_set_state(parser->container, GST_STATE_PAUSED); + if (!parser->pull_mode) + gst_pad_set_active(parser->my_src, 1); ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { @@ -1733,6 +1742,8 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) gst_pad_set_active(stream->my_sink, 1); gst_element_set_state(parser->container, GST_STATE_PAUSED); + if (!parser->pull_mode) + gst_pad_set_active(parser->my_src, 1); ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { @@ -1787,6 +1798,8 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) gst_pad_set_active(stream->my_sink, 1); gst_element_set_state(parser->container, GST_STATE_PAUSED); + if (!parser->pull_mode) + gst_pad_set_active(parser->my_src, 1); ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { -- 2.30.1

2 17

[PATCH] shell32: Use CP_UTF8 in __SHCloneStrAtoW.
by Jiangyi Chen March 11, 2021

March 11, 2021

2 1

[PATCH 1/6] ntdll/tests: Fix tick count read from user shared data.
by Rémi Bernon March 11, 2021

March 11, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is some tests to validate that RtlQueryPerformanceCounter should be able to bypass NtQueryPerformanceCounter syscall and be optimised with rdtsc(p). The XSTATE save and restore is making its syscall much slower than it was before, and some applications are now burning CPU calling Qpc in a tight loop. It also looks like that there's a new shared page in town since w10v1809 and it's pretty much undocumented. On previous versions the bypass is not always enabled, and it's for instance not enabled on the testbot VMs but I was able to test it in a local VM with w10v1511, and it only seems to be using the USD values. dlls/ntdll/tests/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index d756a8c839c..931bf765aa7 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -206,9 +206,9 @@ static void test_user_shared_data_time(void) { t1 = GetTickCount(); if (user_shared_data->NtMajorVersion <= 5 && user_shared_data->NtMinorVersion <= 1) - t2 = (*(volatile ULONG*)&user_shared_data->TickCountLowDeprecated * (ULONG64)user_shared_data->TickCountMultiplier) >> 24; + t2 = (DWORD)((*(volatile ULONG*)&user_shared_data->TickCountLowDeprecated * (ULONG64)user_shared_data->TickCountMultiplier) >> 24); else - t2 = (read_ksystem_time(&user_shared_data->u.TickCount) * user_shared_data->TickCountMultiplier) >> 24; + t2 = (DWORD)((read_ksystem_time(&user_shared_data->u.TickCount) * user_shared_data->TickCountMultiplier) >> 24); t3 = GetTickCount(); } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ -- 2.30.0

3 19

[PATCH v3 1/3] jscript: Store the object prototype in the script context.
by Gabriel Ivăncescu March 11, 2021

March 11, 2021

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/global.c | 7 +++---- dlls/jscript/jscript.c | 5 +++++ dlls/jscript/jscript.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 735e188..33869cd 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -1055,7 +1055,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) HRESULT init_global(script_ctx_t *ctx) { unsigned const_flags = ctx->version >= SCRIPTLANGUAGEVERSION_ES5 ? 0 : PROPF_WRITABLE; - jsdisp_t *math, *object_prototype, *constr; + jsdisp_t *math, *constr; HRESULT hres; if(ctx->global) @@ -1065,12 +1065,11 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = create_object_prototype(ctx, &object_prototype); + hres = create_object_prototype(ctx, &ctx->object_prototype); if(FAILED(hres)) return hres; - hres = init_constructors(ctx, object_prototype); - jsdisp_release(object_prototype); + hres = init_constructors(ctx, ctx->object_prototype); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index c5c2388..67a25d1 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -483,6 +483,11 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) This->ctx->site = NULL; } + if(This->ctx->object_prototype) { + jsdisp_release(This->ctx->object_prototype); + This->ctx->object_prototype = NULL; + } + if(This->ctx->global) { jsdisp_release(This->ctx->global); This->ctx->global = NULL; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index b590e1a..d7d9dd7 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -451,6 +451,7 @@ struct _script_ctx_t { jsdisp_t *uri_error_constr; jsdisp_t *number_constr; jsdisp_t *object_constr; + jsdisp_t *object_prototype; jsdisp_t *regexp_constr; jsdisp_t *string_constr; jsdisp_t *vbarray_constr; -- 2.30.0

2 5

[PATCH 8/8] mshtml: Initialize HTMLLocation object with compat mode.
by Jacek Caban March 11, 2021

March 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmllocation.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 7/8] mshtml: Initialize DOMEventObj object with compat mode.
by Jacek Caban March 11, 2021

March 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlevent.c | 12 ++++++------ dlls/mshtml/htmlevent.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)

1 0

[PATCH 6/8] mshtml: Initialize HTMLImageElementFactory object with compat mode.
by Jacek Caban March 11, 2021

March 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlimg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 5/8] mshtml: Initialize DOMEvent object with compat mode.
by Jacek Caban March 11, 2021

March 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 12 ++++++------ dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 4 ++-- dlls/mshtml/xmlhttprequest.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)

1 0

[PATCH 4/8] mshtml: Initialize HTMLAttributeCollection object with compat mode.
by Jacek Caban March 11, 2021

March 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 3/8] mshtml: Initialize HTMLRectCollection object with compat mode.
by Jacek Caban March 11, 2021

March 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0