September 2019 - Wine-commits

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

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

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

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 : winegstreamer: Use BasePinImpl_QueryAccept() and BasePinImpl_EnumMediaTypes().
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: wine Branch: master Commit: 9c92c0bf19b8ab4708e8eb111b255511007a792c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c92c0bf19b8ab4708e8eb11… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 12 14:28:27 2019 -0500 winegstreamer: Use BasePinImpl_QueryAccept() and BasePinImpl_EnumMediaTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index c0ff9e53b4..828d67fc3a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1211,6 +1211,19 @@ static const struct strmbase_filter_ops filter_ops = .filter_destroy = gstdemux_destroy, }; +static HRESULT WINAPI sink_CheckMediaType(BasePin *iface, const AM_MEDIA_TYPE *mt) +{ + if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Stream)) + return S_OK; + return S_FALSE; +} + +static const BasePinFuncTable sink_ops = +{ + .pfnCheckMediaType = sink_CheckMediaType, + .pfnGetMediaType = BasePinImpl_GetMediaType, +}; + IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) { GSTImpl *object; @@ -1236,6 +1249,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) object->sink.filter = &object->filter; lstrcpynW(object->sink.name, wcsInputPinName, ARRAY_SIZE(object->sink.name)); object->sink.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; + object->sink.pFuncsTable = &sink_ops; *phr = S_OK; TRACE("Created GStreamer demuxer %p.\n", object); @@ -1916,16 +1930,6 @@ static HRESULT WINAPI GSTInPin_Disconnect(IPin *iface) return hr; } -static HRESULT WINAPI GSTInPin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *pmt) -{ - TRACE("iface %p, mt %p.\n", iface, pmt); - dump_AM_MEDIA_TYPE(pmt); - - if (IsEqualIID(&pmt->majortype, &MEDIATYPE_Stream)) - return S_OK; - return S_FALSE; -} - static HRESULT WINAPI GSTInPin_EndOfStream(IPin *iface) { FIXME("iface %p, stub!\n", iface); @@ -1982,15 +1986,6 @@ static HRESULT WINAPI GSTInPin_QueryInterface(IPin * iface, REFIID riid, LPVOID return E_NOINTERFACE; } -static HRESULT WINAPI GSTInPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) -{ - BasePin *This = (BasePin *)iface; - - TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); - - return EnumMediaTypes_Construct(This, BasePinImpl_GetMediaType, BasePinImpl_GetMediaTypeVersion, ppEnum); -} - static const IPinVtbl GST_InputPin_Vtbl = { GSTInPin_QueryInterface, BasePinImpl_AddRef, @@ -2003,8 +1998,8 @@ static const IPinVtbl GST_InputPin_Vtbl = { BasePinImpl_QueryPinInfo, BasePinImpl_QueryDirection, BasePinImpl_QueryId, - GSTInPin_QueryAccept, - GSTInPin_EnumMediaTypes, + BasePinImpl_QueryAccept, + BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, GSTInPin_EndOfStream, GSTInPin_BeginFlush,

1 0

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

13 Sep '19

Module: wine Branch: master Commit: 4b635019dd7862bd099408c54356a3d8fc492d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b635019dd7862bd099408c5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 12 14:28:28 2019 -0500 winegstreamer: Get rid of the GSTImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 77 ++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b635019dd7862bd0994…

1 0

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

13 Sep '19

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

Gerald Pfeifer : dwrite/tests: Silence a compiler warning in test_fontsetbuilder.
by Alexandre Julliard 13 Sep '19

13 Sep '19

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

Alexandre Julliard : ntdll: Avoid calling init_handler() twice in signal handler on i386.
by Alexandre Julliard 13 Sep '19

13 Sep '19

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

Alexandre Julliard : ntdll: Use virtual_uninterrupted_read_memory() to read code inside signal handler on i386.
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: wine Branch: master Commit: 944c4e8f760460ca6a260573d87c454052caad2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=944c4e8f760460ca6a260573… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 13 17:19:38 2019 +0200 ntdll: Use virtual_uninterrupted_read_memory() to read code inside signal handler on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 35abc288b3..8d1c591504 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1530,13 +1530,13 @@ __ASM_STDCALL_FUNC( NtGetContextThread, 8, */ static inline DWORD is_privileged_instr( CONTEXT *context ) { - const BYTE *instr; - unsigned int prefix_count = 0; + BYTE instr[16]; + unsigned int i, len, prefix_count = 0; if (!wine_ldt_is_system( context->SegCs )) return 0; - instr = (BYTE *)context->Eip; + len = virtual_uninterrupted_read_memory( (BYTE *)context->Eip, instr, sizeof(instr) ); - for (;;) switch(*instr) + for (i = 0; i < len; i++) switch (instr[i]) { /* instruction prefixes */ case 0x2e: /* %cs: */ @@ -1551,11 +1551,11 @@ static inline DWORD is_privileged_instr( CONTEXT *context ) case 0xf2: /* repne */ case 0xf3: /* repe */ if (++prefix_count >= 15) return EXCEPTION_ILLEGAL_INSTRUCTION; - instr++; continue; case 0x0f: /* extended instruction */ - switch(instr[1]) + if (i == len - 1) return 0; + switch(instr[i + 1]) { case 0x20: /* mov crX, reg */ case 0x21: /* mov drX, reg */ @@ -1584,6 +1584,7 @@ static inline DWORD is_privileged_instr( CONTEXT *context ) default: return 0; } + return 0; }

1 0