wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Zebediah Figura : strmbase: Get rid of the BaseOutputPinFuncTable typedef.
by Alexandre Julliard 13 Sep '19

13 Sep '19

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

Zebediah Figura : strmbase: Get rid of the BaseOutputPin typedef.
by Alexandre Julliard 13 Sep '19

13 Sep '19

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

Ken Thomases : ntdll: On Mac, use the Mach API as preferred approach to get a thread's GS.base.
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: wine Branch: master Commit: 84760a8fb2cf9ed577c63957c5bdfc621d748a7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=84760a8fb2cf9ed577c63957… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 12 20:52:31 2019 -0500 ntdll: On Mac, use the Mach API as preferred approach to get a thread's GS.base. The previous technique was a gross hack peeking at the internals of the pthreads implementation. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 5eca0432a0..e76e5be6aa 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3204,9 +3204,18 @@ void signal_free_thread( TEB *teb ) */ static void *mac_thread_gsbase(void) { + struct thread_identifier_info tiinfo; + unsigned int info_count = THREAD_IDENTIFIER_INFO_COUNT; static int gsbase_offset = -1; void *ret; + kern_return_t kr = thread_info(mach_thread_self(), THREAD_IDENTIFIER_INFO, (thread_identifier_info_t) &tiinfo, &info_count); + if (kr == KERN_SUCCESS) + { + TRACE("pthread_self() %p thread ID %lx gsbase %lx\n", pthread_self(), tiinfo.thread_id, tiinfo.thread_handle); + return (void*)tiinfo.thread_handle; + } + if (gsbase_offset < 0) { /* Search for the array of TLS slots within the pthread data structure.

1 0

Huw Davies : configure: Fix libunwind warning logic.
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: wine Branch: master Commit: 06754af1e5d58a38e7c41bc43453b3121b9497b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06754af1e5d58a38e7c41bc4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 13 09:04:42 2019 +0100 configure: Fix libunwind warning logic. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b54b2252a7..1211b65dfb 100755 --- a/configure +++ b/configure @@ -14967,7 +14967,7 @@ test -z "$UNWIND_LIBS" || UNWIND_LIBS=`echo " $UNWIND_LIBS" | sed 's/ -L$[^/]$ fi case $host in aarch64*|*-darwin*) - if test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" != xnono; then : + if test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" = xnono; then : case "x$with_unwind" in x) as_fn_append wine_notices "|libunwind ${notice_platform}development files not found, stack unwinding won't work." ;; xno) ;; diff --git a/configure.ac b/configure.ac index 49676f073b..ad7ed007e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1719,7 +1719,7 @@ then fi case $host in aarch64*|*-darwin*) - WINE_NOTICE_WITH(unwind,[test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" != xnono], + WINE_NOTICE_WITH(unwind,[test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" = xnono], [libunwind ${notice_platform}development files not found, stack unwinding won't work.]) ;; esac

1 0

Huw Davies : configure: Fix argument type of unw_step().
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: wine Branch: master Commit: 89773807f2b61fcaef88e11578a3adb6c602d3ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=89773807f2b61fcaef88e115… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 13 09:04:41 2019 +0100 configure: Fix argument type of unw_step(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 109d2423a2..b54b2252a7 100755 --- a/configure +++ b/configure @@ -14905,7 +14905,7 @@ else int main () { -unw_context_t context; unw_step( &context ); +unw_cursor_t cursor; unw_step( &cursor ); ; return 0; } @@ -14936,7 +14936,7 @@ else int main () { -unw_context_t context; unw_step( &context ); +unw_cursor_t cursor; unw_step( &cursor ); ; return 0; } diff --git a/configure.ac b/configure.ac index dfa6b6ac9c..49676f073b 100644 --- a/configure.ac +++ b/configure.ac @@ -1697,7 +1697,7 @@ then [AC_CACHE_CHECK([for unw_step],wine_cv_have_unw_step, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY #include <libunwind.h>]], - [[unw_context_t context; unw_step( &context );]])], + [[unw_cursor_t cursor; unw_step( &cursor );]])], [wine_cv_have_unw_step="yes"],[wine_cv_have_unw_step="no"])]) if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS" then @@ -1706,7 +1706,7 @@ then AC_CACHE_CHECK([for unw_step in libunwind],wine_cv_have_libunwind_unw_step, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY #include <libunwind.h>]], - [[unw_context_t context; unw_step( &context );]])], + [[unw_cursor_t cursor; unw_step( &cursor );]])], [wine_cv_have_libunwind_unw_step="yes"], [wine_cv_have_libunwind_unw_step="no"])]) LIBS=$save_libs

1 0

Francois Gouget : testbot/LibvirtTool: No need to wait for other TestBot processes.
by Alexandre Julliard 13 Sep '19

13 Sep '19

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

Francois Gouget : testbot: Document where parameters get untainted.
by Alexandre Julliard 13 Sep '19

13 Sep '19

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 13 Sep '19

13 Sep '19

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

Philip Rebohle : vkd3d-shader: Enable DemoteToHelperInvocation capability.
by Alexandre Julliard 13 Sep '19

13 Sep '19

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 12 Sep '19

12 Sep '19

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

← Newer
1
...
38
39
40
41
42
43
44
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2019