March 2021 - Wine-devel - list.winehq.org

[PATCH 1/5] strmbase: Rename pfnDoRenderSample to renderer_render.
by Zebediah Figura 12 Mar '21

12 Mar '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/evr/evr.c | 4 ++-- dlls/qedit/nullrenderer.c | 4 ++-- dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 6 +++--- include/wine/strmbase.h | 3 +-- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index ff89d85ac8c..94239417794 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -48,7 +48,7 @@ static void evr_destroy(struct strmbase_renderer *iface) free(filter); } -static HRESULT WINAPI evr_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) +static HRESULT evr_render(struct strmbase_renderer *iface, IMediaSample *sample) { FIXME("Not implemented.\n"); return E_NOTIMPL; @@ -63,7 +63,7 @@ static HRESULT evr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_ static const struct strmbase_renderer_ops renderer_ops = { .renderer_query_accept = evr_query_accept, - .pfnDoRenderSample = evr_DoRenderSample, + .renderer_render = evr_render, .renderer_destroy = evr_destroy, }; diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index a9319b06efe..5dc74c77809 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -36,7 +36,7 @@ static struct null_renderer *impl_from_strmbase_renderer(struct strmbase_rendere return CONTAINING_RECORD(iface, struct null_renderer, renderer); } -static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) +static HRESULT null_renderer_render(struct strmbase_renderer *iface, IMediaSample *sample) { return S_OK; } @@ -57,7 +57,7 @@ static void null_renderer_destroy(struct strmbase_renderer *iface) static const struct strmbase_renderer_ops renderer_ops = { .renderer_query_accept = null_renderer_query_accept, - .pfnDoRenderSample = NullRenderer_DoRenderSample, + .renderer_render = null_renderer_render, .renderer_destroy = null_renderer_destroy, }; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ec40bc8db9c..1a59a9b5213 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -79,7 +79,7 @@ static void VideoRenderer_AutoShowWindow(struct video_renderer *This) ShowWindow(This->window.hwnd, SW_SHOW); } -static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) +static HRESULT video_renderer_render(struct strmbase_renderer *iface, IMediaSample *pSample) { struct video_renderer *filter = impl_from_strmbase_renderer(iface); RECT src = filter->window.src, dst = filter->window.dst; @@ -214,7 +214,7 @@ static RECT video_renderer_get_default_rect(struct video_window *iface) static const struct strmbase_renderer_ops renderer_ops = { .renderer_query_accept = video_renderer_query_accept, - .pfnDoRenderSample = VideoRenderer_DoRenderSample, + .renderer_render = video_renderer_render, .renderer_init_stream = video_renderer_init_stream, .renderer_stop_stream = video_renderer_stop_stream, .renderer_destroy = video_renderer_destroy, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 9e8a037eca0..f95c2bfbce2 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -206,7 +206,7 @@ static inline struct quartz_vmr *impl_from_IBaseFilter(IBaseFilter *iface) return CONTAINING_RECORD(iface, struct quartz_vmr, renderer.filter.IBaseFilter_iface); } -static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) +static HRESULT vmr_render(struct strmbase_renderer *iface, IMediaSample *sample) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); unsigned int data_size, width, depth, src_pitch; @@ -638,7 +638,7 @@ static HRESULT vmr_pin_query_interface(struct strmbase_renderer *iface, REFIID i static const struct strmbase_renderer_ops renderer_ops = { .renderer_query_accept = vmr_query_accept, - .pfnDoRenderSample = VMR9_DoRenderSample, + .renderer_render = vmr_render, .renderer_init_stream = vmr_init_stream, .renderer_start_stream = vmr_start_stream, .renderer_stop_stream = vmr_stop_stream, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 7718232e97c..e6adf41add9 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -361,7 +361,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp filter->current_sample = sample; - hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + hr = filter->pFuncsTable->renderer_render(filter, sample); SetEvent(filter->state_event); LeaveCriticalSection(&filter->filter.stream_cs); @@ -401,14 +401,14 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp } if (state == State_Running) - hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + hr = filter->pFuncsTable->renderer_render(filter, sample); perform_qos(filter, start, stop, jitter); } else { if (state == State_Running) - hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + hr = filter->pFuncsTable->renderer_render(filter, sample); } return hr; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index dbb4a21c071..347482b1eb9 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -305,13 +305,12 @@ struct strmbase_renderer BOOL eos; }; -typedef HRESULT (WINAPI *BaseRenderer_DoRenderSample)(struct strmbase_renderer *iface, IMediaSample *sample); typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (struct strmbase_renderer *iface); struct strmbase_renderer_ops { HRESULT (*renderer_query_accept)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); - BaseRenderer_DoRenderSample pfnDoRenderSample; + HRESULT (*renderer_render)(struct strmbase_renderer *iface, IMediaSample *sample); void (*renderer_init_stream)(struct strmbase_renderer *iface); void (*renderer_start_stream)(struct strmbase_renderer *iface); void (*renderer_stop_stream)(struct strmbase_renderer *iface); -- 2.20.1

2 5

[tools] testbot/LibvirtTool: Don't unset the VM name before reporting it is wrong.
by Francois Gouget 12 Mar '21

12 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 73a3b19d7..4f364541f 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -120,14 +120,15 @@ if (!defined $Usage) } else { - $VMKey = WineTestBot::VM::UntaintName($VMKey); - if (!defined $VMKey) + my $UnTainted = WineTestBot::VM::UntaintName($VMKey); + if (!defined $UnTainted) { Error "'$VMKey' is not a valid VM name\n"; $Usage = 2; } else { + $VMKey = $UnTainted; $VM = CreateVMs()->GetItem($VMKey); if (!defined $VM) { -- 2.20.1

1 0

[tools] testbot/LibvirtTool: Trace the sleep time in Revert().
by Francois Gouget 12 Mar '21

12 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 4f364541f..cee2692d0 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -676,7 +676,7 @@ sub Revert() { my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? $SleepAfterBoot : $SleepAfterRevert; - Debug(Elapsed($Start), " Sleeping\n"); + Debug(Elapsed($Start), " Sleeping ${Sleep}s\n"); LogMsg "Letting $VMKey settle down for ${Sleep}s\n"; sleep($Sleep); } -- 2.20.1

1 0

[tools] testbot/WineRun*: Trace the name of the VM the task is run on.
by Francois Gouget 12 Mar '21

12 Mar '21

The information is available by going to the job details page of that task but this helps keep track of the operations performed on a specific VM in the Engine log. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunTask.pl | 2 +- testbot/bin/WineRunWineTest.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index ff130526e..adb1959f0 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -168,7 +168,7 @@ my $VM = $Task->VM; my $Start = Time(); -LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; +LogMsg "Task $JobId/$StepNo/$TaskNo started on ", $VM->Name, "\n"; # diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 36b3e68f0..d5f2610f6 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -197,7 +197,7 @@ my $VM = $Task->VM; my $Start = Time(); -LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; +LogMsg "Task $JobId/$StepNo/$TaskNo started on ", $VM->Name, "\n"; # diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 94757bf62..3a267ace1 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -194,7 +194,7 @@ my $VM = $Task->VM; my $Start = Time(); -LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; +LogMsg "Task $JobId/$StepNo/$TaskNo started on ", $VM->Name, "\n"; # -- 2.20.1

1 0

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

11 Mar '21

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 11 Mar '21

11 Mar '21

2 1

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

11 Mar '21

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 11 Mar '21

11 Mar '21

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 11 Mar '21

11 Mar '21

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 11 Mar '21

11 Mar '21

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