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

[PATCH 1/4] quartz: Move the current sample tracking back to strmbase.
by Zebediah Figura March 10, 2021

March 10, 2021

Only the video renderer uses this, but we'd like to deduplicate the wait-on-preroll behaviour. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/videorenderer.c | 9 ++------- dlls/strmbase/renderer.c | 4 ++++ include/wine/strmbase.h | 2 ++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a925340a676..ed5774bf484 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -50,7 +50,6 @@ struct video_renderer DWORD saved_style; HANDLE run_event; - IMediaSample *current_sample; }; static inline struct video_renderer *impl_from_video_window(struct video_window *iface) @@ -109,14 +108,10 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa { const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; - filter->current_sample = pSample; - SetEvent(filter->renderer.state_event); LeaveCriticalSection(&filter->renderer.filter.stream_cs); WaitForMultipleObjects(2, events, FALSE, INFINITE); EnterCriticalSection(&filter->renderer.filter.stream_cs); - - filter->current_sample = NULL; } return S_OK; @@ -276,7 +271,7 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG return VFW_E_NOT_PAUSED; } - if (!filter->current_sample) + if (!filter->renderer.current_sample) { LeaveCriticalSection(&filter->renderer.filter.stream_cs); return E_UNEXPECTED; @@ -289,7 +284,7 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG } memcpy(image, bih, sizeof(BITMAPINFOHEADER)); - IMediaSample_GetPointer(filter->current_sample, &sample_data); + IMediaSample_GetPointer(filter->renderer.current_sample, &sample_data); memcpy((char *)image + sizeof(BITMAPINFOHEADER), sample_data, image_size); LeaveCriticalSection(&filter->renderer.filter.stream_cs); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 47017f5ced5..b384ea991d9 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -353,7 +353,11 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp } if (state == State_Paused) + { + filter->current_sample = sample; hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + filter->current_sample = NULL; + } if (need_wait) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 4b5ecc86721..e902790ecb1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -291,6 +291,8 @@ struct strmbase_renderer HANDLE flush_event; REFERENCE_TIME stream_start; + IMediaSample *current_sample; + IQualityControl *qc_sink; REFERENCE_TIME last_left, avg_duration, avg_pt; double avg_rate; -- 2.20.1

1 3

[PATCH] winemac.drv: Fix crash when building against Metal-capable SDK but running on older OS X.
by Brendan Shanks March 10, 2021

March 10, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50790 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/cocoa_display.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 7cc6f981fee..05f1c75d53b 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -348,10 +348,15 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp int ret = -1; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + /* Test if Metal is available */ + if (&CGDirectDisplayCopyCurrentMetalDevice == NULL) + goto done; + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; if (device && [device respondsToSelector:@selector(registryID)]) ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); +done: [pool release]; return ret; } -- 2.26.2

1 0

[PATCH] tools: Relax the dot in module names rules.
by Rémi Bernon March 10, 2021

March 10, 2021

This should allow modules with dot in their names, while still making the .dll extension optional. The MODULE variable still determines the actual output file extension. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 201129 This should be a better fix, that will also allow to add tests to these modules without any changes on the testbot (although it should arguably use the same logic as makedep to compute the test executable names). tools/make_makefiles | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 2d3c14cb2ec..3abba2da840 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -446,18 +446,17 @@ sub update_makefiles(@) if (defined $make{"APPMODE"}) { $dllflags .= " " . $make{"APPMODE"}; } die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs)\//; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; - die "Invalid MODULE in $file" if $name =~ /\./ && $make{"MODULE"} ne $name; if ($file =~ /^programs\//) { die "EXTRADLLFLAGS should be defined in $file" unless $dllflags; die "EXTRADLLFLAGS should contain -mconsole or -mwindows in $file" unless $dllflags =~ /-m(console|windows)/; - die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.exe"; + die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.exe"; } else { die "APPMODE should not be defined in $file" if defined $make{"APPMODE"} ; die "EXTRADLLFLAGS should not contain -mconsole or -mwindows in $file" if $dllflags =~ /-m(console|windows)/; - die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.dll"; + die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.dll"; } if (defined $make{"IMPORTLIB"}) { -- 2.30.0

1 1

[PATCH v2 1/2] jscript: Check for null instance prototype.
by Gabriel Ivăncescu March 10, 2021

March 10, 2021

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Add tests. dlls/jscript/dispex.c | 2 +- dlls/jscript/tests/lang.js | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5829ceb..9d0357e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1853,7 +1853,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built return hres; } - if(is_object_instance(val)) + if(is_object_instance(val) && get_object(val)) prot = iface_to_jsdisp(get_object(val)); jsval_release(val); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 753b4ee..211ae2f 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1864,6 +1864,21 @@ ok(tmp === "VT_DISPATCH", "getVT(Object(nullDisp) = " + tmp); tmp = Object(nullDisp).toString(); ok(tmp === "[object Object]", "Object(nullDisp).toString() = " + tmp); +function testNullPrototype() { + this.x = 13; +} +tmp = new testNullPrototype(); +ok(tmp.x === 13, "tmp.x !== 13"); +ok(!("y" in tmp), "tmp has 'y' property"); +testNullPrototype.prototype.y = 10; +ok("y" in tmp, "tmp does not have 'y' property"); +tmp = new testNullPrototype(); +ok(tmp.y === 10, "tmp.y !== 10"); +testNullPrototype.prototype = nullDisp; +tmp = new testNullPrototype(); +ok(tmp.x === 13, "tmp.x !== 13"); +ok(!("y" in tmp), "tmp has 'y' property"); + function do_test() {} function nosemicolon() {} nosemicolon(); function () {} nosemicolon(); -- 2.30.0

2 3

[PATCH 3/5] riched20: Handle WM_SETTEXT's unicode conversion in the host.
by Huw Davies March 10, 2021

March 10, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 2 +- dlls/riched20/txthost.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9ac5d49a3db..cacad463963 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3953,7 +3953,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_StreamInRTFString(editor, 0, (char *)lParam); } else - ME_SetText(editor, (void*)lParam, unicode); + ME_SetText( editor, (void*)lParam, TRUE ); } else TRACE("WM_SETTEXT - NULL\n"); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 14cb19e8f45..23c9962bb3a 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -863,6 +863,18 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, SetWindowLongW( hwnd, GWL_STYLE, style ); return res; } + case WM_SETTEXT: + { + char *textA = (char *)lparam; + WCHAR *text = (WCHAR *)lparam; + int len; + + if (!unicode && textA && strncmp( textA, "{\\rtf", 5 ) && strncmp( textA, "{\\urtf", 6 )) + text = ME_ToUnicode( CP_ACP, textA, &len ); + hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, (LPARAM)text, &res ); + if (text != (WCHAR *)lparam) ME_EndToUnicode( CP_ACP, text ); + break; + } default: res = ME_HandleMessage( editor, msg, wparam, lparam, unicode, &hr ); } -- 2.23.0

2 1

[PATCH] ntdll: Initialize USR1 handler XSTATE buffer (valgrind).
by Rémi Bernon March 10, 2021

March 10, 2021

Conditional jump or move depends on uninitialised value(s) at 0x46AC989: NtGetContextThread (signal_x86_64.c:2002) Conditional jump or move depends on uninitialised value(s) at 0x46ABA1E: xstate_to_server (unix_private.h:342) by 0x46ABA1E: context_to_server (signal_x86_64.c:1698) Conditional jump or move depends on uninitialised value(s) at 0x46AC18F: NtSetContextThread (signal_x86_64.c:1859) There's still some uninitialized bytes being passed to writev, but that seems to come from the pushfd instruction, and could probably be flagged as false positive. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 2a030372fb7..d0f3ece266c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2642,6 +2642,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *ucontext ) DECLSPEC_ALIGN(64) XSTATE xs; context.c.ContextFlags = CONTEXT_FULL; context_init_xstate( &context.c, &xs ); + memset( &xs, 0, offsetof(XSTATE, YmmContext) ); NtGetContextThread( GetCurrentThread(), &context.c ); wait_suspend( &context.c ); -- 2.30.0

2 1

[PATCH 6/6] mshtml: Add animationstart and animationend event support.
by Jacek Caban March 10, 2021

March 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 6 ++++++ dlls/mshtml/htmlevent.h | 2 ++ dlls/mshtml/tests/dom.js | 14 ++++++++++++++ 3 files changed, 22 insertions(+)

2 1

[PATCH 5/6] mshtml/tests: Use more winetest.js helpers in more places.
by Jacek Caban March 10, 2021

March 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.js | 113 +++++++++------------------- dlls/mshtml/tests/events.js | 142 ++++++++++++------------------------ 2 files changed, 80 insertions(+), 175 deletions(-)

2 1

[PATCH 3/6] mshtml: Expose IHTMLElement7 to scripts.
by Jacek Caban March 10, 2021

March 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 3 +++ dlls/mshtml/tests/documentmode.js | 2 ++ 2 files changed, 5 insertions(+)

2 1

infosoft:infosoft spam
by Francois Gouget March 10, 2021

March 10, 2021

WineTest has not been running the infosoft:insoft test but that should change soon. Unfortunately on the latest Windows 10 it spams the report with failures. ~500 KB worth of it! https://testbot.winehq.org/JobDetails.pl?Key=86812 If we could avoid that it would be nice. https://test.winehq.org/data/tests/infosoft:infosoft.html -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ A black hole is just God dividing by zero.

1 0