September 2019 - Wine-Commits

Zebediah Figura : strmbase: Get rid of the BaseOutputPinFuncTable typedef.
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

Module: wine Branch: master Commit: 765cb748a8e2a257ed75d1438d26da6c272e485e URL: https://source.winehq.org/git/wine.git/?a=commit;h=765cb748a8e2a257ed75d143… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 12 14:28:26 2019 -0500 strmbase: Get rid of the BaseOutputPinFuncTable typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 5 +++-- dlls/qcap/avimux.c | 5 +++-- dlls/qcap/smartteefilter.c | 10 ++++++---- dlls/qcap/vfwcapture.c | 5 +++-- dlls/quartz/filesource.c | 7 ++++--- dlls/quartz/parser.c | 5 +++-- dlls/strmbase/pin.c | 2 +- dlls/strmbase/transform.c | 5 +++-- dlls/winegstreamer/gstdemux.c | 5 +++-- dlls/wineqtdecoder/qtsplitter.c | 5 +++-- include/wine/strmbase.h | 9 +++++---- 11 files changed, 37 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=765cb748a8e2a257ed75…

1 0

Gerald Pfeifer : dwrite/tests: Silence a compiler warning in test_fontsetbuilder.
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

Module: wine Branch: master Commit: 66bd8e3288d73c0b87151b7ae8d5e95d01e0a4f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66bd8e3288d73c0b87151b7a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Sep 13 08:10:01 2019 +0300 dwrite/tests: Silence a compiler warning in test_fontsetbuilder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 309c0a2b08..7d434222a3 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9105,7 +9105,7 @@ todo_wine static const WCHAR fmtW[] = {'%','u',0}; IDWriteLocalizedStrings *values; WCHAR buffW[255], buff2W[255]; - UINT32 c, ivalue; + UINT32 c, ivalue = 0; BOOL exists; hr = IDWriteFontSet_GetPropertyValues(fontset, 0, id, &exists, &values);

1 0

Zebediah Figura : winegstreamer: Get rid of the GSTOutPin typedef.
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

Module: wine Branch: master Commit: 993d1dd2f8047cf8eb205fcd15cdd8e212348f68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=993d1dd2f8047cf8eb205fcd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 12 14:28:29 2019 -0500 winegstreamer: Get rid of the GSTOutPin typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 69 +++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=993d1dd2f8047cf8eb20…

1 0

Alexandre Julliard : ntdll: Avoid calling init_handler() twice in signal handler on i386.
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

Module: wine Branch: master Commit: 17c82ddc954a7f71a92b542aa8f523c010b25feb URL: https://source.winehq.org/git/wine.git/?a=commit;h=17c82ddc954a7f71a92b542a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 13 16:58:28 2019 +0200 ntdll: Avoid calling init_handler() twice in signal handler on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 8876790195..35abc288b3 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2168,10 +2168,10 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { WORD fs, gs; - init_handler( sigcontext, &fs, &gs ); + void *stack_ptr = init_handler( sigcontext, &fs, &gs ); if (!dispatch_signal(SIGINT)) { - struct stack_layout *stack = setup_exception( sigcontext ); + struct stack_layout *stack = setup_exception_record( sigcontext, stack_ptr, fs, gs ); stack->rec.ExceptionCode = CONTROL_C_EXIT; setup_raise_exception( sigcontext, stack ); }

1 0

Zebediah Figura : strmbase: Get rid of the BaseOutputPin typedef.
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

Module: wine Branch: master Commit: c585931d6147cbe367ecfe26f3da5625d77d4932 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c585931d6147cbe367ecfe26… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 12 14:28:25 2019 -0500 strmbase: Get rid of the BaseOutputPin typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 1 - dlls/qcap/avico.c | 7 ++++--- dlls/qcap/avimux.c | 6 +++--- dlls/qcap/capture.h | 2 +- dlls/qcap/smartteefilter.c | 8 +++++--- dlls/qcap/v4l.c | 6 +++--- dlls/qcap/vfwcapture.c | 5 +++-- dlls/quartz/filesource.c | 11 ++++++----- dlls/quartz/parser.c | 12 ++++++++---- dlls/quartz/parser.h | 2 +- dlls/strmbase/outputqueue.c | 12 +++--------- dlls/strmbase/pin.c | 31 +++++++++++++++++-------------- dlls/strmbase/transform.c | 3 ++- dlls/winegstreamer/gstdemux.c | 8 +++++--- dlls/wineqtdecoder/qtsplitter.c | 10 ++++++---- include/wine/strmbase.h | 37 +++++++++++++++++++------------------ 16 files changed, 86 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c585931d6147cbe367ec…

1 0

Francois Gouget : testbot: Document where parameters get untainted.
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

Module: tools Branch: master Commit: 7e94278bcdc46f9fbd61d6344efa6a80fc055caf URL: https://source.winehq.org/git/tools.git/?a=commit;h=7e94278bcdc46f9fbd61d63… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 13 03:06:38 2019 +0200 testbot: Document where parameters get untainted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 4 ++-- testbot/bin/build/WineTest.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index e348834..46b2793 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -104,7 +104,7 @@ while (@ARGV) } } -# Check parameters +# Check and untaint parameters my $VM; if (!defined $Usage) { @@ -120,7 +120,7 @@ if (!defined $Usage) } elsif ($VMKey =~ /^([a-zA-Z0-9_]+)$/) { - $VMKey = $1; + $VMKey = $1; # untaint $VM = CreateVMs()->GetItem($VMKey); if (!defined $VM) { diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 4b9a4b9..37c20d1 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -329,7 +329,7 @@ if (!defined $Usage) } elsif ($BaseTag =~ m/^([\w_.\-]+)$/) { - $BaseTag = $1; + $BaseTag = $1; # untaint } else {

1 0

Francois Gouget : testbot/Engine: Clean up left-over VM child deadlines.
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

Module: tools Branch: master Commit: 4bec6e75d7823e6f4053f03cc28eec025a004c7b URL: https://source.winehq.org/git/tools.git/?a=commit;h=4bec6e75d7823e6f4053f03… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 13 03:06:20 2019 +0200 testbot/Engine: Clean up left-over VM child deadlines. Normally the ChildDeadline gets unset whenever ChildPid is unset. But if it does remain set the scheduler will eventually see a deadline in the past, causing it to reschedule every second, until a new child process gets created for that VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 39d2342..3ec51d2 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -350,7 +350,7 @@ sub _CheckAndClassifyVMs() } else { - if (defined $VM->ChildPid or + if (defined $VM->ChildPid or defined $VM->ChildDeadline or $VM->Status =~ /^(?:running|reverting|sleeping)$/) { # The VM is missing its child process or it died unexpectedly. Mark

1 0

Francois Gouget : testbot/LibvirtTool: No need to wait for other TestBot processes.
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

Module: tools Branch: master Commit: 15486048713f333f213249840730b8e5ba77bc05 URL: https://source.winehq.org/git/tools.git/?a=commit;h=15486048713f333f2132498… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 13 03:07:14 2019 +0200 testbot/LibvirtTool: No need to wait for other TestBot processes. The pid of any process started by the Engine is recorded in the VM's ChildPid field. Also the Engine kills any tool that would still be running before clearing the ChildPid field. So the Engine would not have started LibvirtTool if another process was using that VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 46b2793..f031c78 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -297,18 +297,7 @@ sub Monitor() if ($IsPoweredOn) { $ErrMessage = $VM->GetDomain()->PowerOff(); - if (defined $ErrMessage) - { - Error "$ErrMessage\n"; - } - else - { - # Another process might have been trying to connect to the VM's - # TestAgent server. Wait for it to time out so it does not set the - # VM offline right after we have put it back online. - LogMsg "Powered off $VMKey. Sleep until all other processes accessing it are gone.\n"; - sleep(3 * $WaitForToolsInVM); - } + Error "$ErrMessage\n" if (defined $ErrMessage); $IsPoweredOn = undef; } }

1 0

Philip Rebohle : vkd3d-shader: Enable DemoteToHelperInvocation capability.
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

Module: vkd3d Branch: master Commit: ae44e06debdd07c044179e93405bd3866e4a8924 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ae44e06debdd07c044179e9… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Thu Sep 12 15:46:27 2019 +0200 vkd3d-shader: Enable DemoteToHelperInvocation capability. Fixes validation errors complaining about invalid shader modules. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0fb499e..fe8935c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6510,6 +6510,7 @@ static void vkd3d_dxbc_compiler_emit_kill(struct vkd3d_dxbc_compiler *compiler, if (vkd3d_dxbc_compiler_is_target_extension_supported(compiler, VKD3D_SHADER_TARGET_EXTENSION_SPV_EXT_DEMOTE_TO_HELPER_INVOCATION)) { + vkd3d_spirv_enable_capability(builder, SpvCapabilityDemoteToHelperInvocationEXT); vkd3d_spirv_build_op_demote_to_helper_invocation(builder); vkd3d_spirv_build_op_branch(builder, merge_block_id); }

1 0

Rémi Bernon : user32: Add parameter validation for RegisterRawInputDevices.
by Alexandre Julliard Sept. 12, 2019

Sept. 12, 2019

Module: wine Branch: master Commit: 85d8d1390467147fca416236fd50bb6ea2e2c8e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d8d1390467147fca416236… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 10 19:02:31 2019 +0200 user32: Add parameter validation for RegisterRawInputDevices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 11 +++++++++++ dlls/user32/tests/rawinput.c | 3 --- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 49cf9f73a0..94cf7a9a5d 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -261,9 +261,20 @@ BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(RAWINPUTDEVICE *devices, U if (size != sizeof(*devices)) { WARN("Invalid structure size %u.\n", size); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + for (i = 0; i < device_count; ++i) + { + if ((devices[i].dwFlags & RIDEV_REMOVE) && + (devices[i].hwndTarget != NULL)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + } + if (!(d = HeapAlloc( GetProcessHeap(), 0, device_count * sizeof(*d) ))) return FALSE; for (i = 0; i < device_count; ++i) diff --git a/dlls/user32/tests/rawinput.c b/dlls/user32/tests/rawinput.c index 4aa2a162f4..f4c8eb6738 100644 --- a/dlls/user32/tests/rawinput.c +++ b/dlls/user32/tests/rawinput.c @@ -49,7 +49,6 @@ static void test_RegisterRawInputDevices(void) SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); SetLastError(0xdeadbeef); @@ -64,9 +63,7 @@ static void test_RegisterRawInputDevices(void) SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - todo_wine ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); raw_devices[0].hwndTarget = 0;

1 0