September 2019 - Wine-Commits

Alexandre Julliard : ntdll: Use virtual_uninterrupted_read_memory() to read code inside signal handler on i386.
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

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

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

Sept. 13, 2019

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: Use BasePinImpl_QueryAccept() and BasePinImpl_EnumMediaTypes().
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

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

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

Sept. 13, 2019

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 Sept. 13, 2019

Sept. 13, 2019

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 Sept. 13, 2019

Sept. 13, 2019

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

Dmitry Timoshkov : ole32: Turn FIXME into a TRACE for clipboard backend of QueryGetData.
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

Module: wine Branch: master Commit: 6f7d91c64a86d23c54870c304acb2b2583aa063c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f7d91c64a86d23c54870c30… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 10 16:05:42 2019 +0800 ole32: Turn FIXME into a TRACE for clipboard backend of QueryGetData. This one seems to be implemented. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 3464e2ca6a..0c02d02a65 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1602,7 +1602,7 @@ end: */ static HRESULT WINAPI snapshot_QueryGetData(IDataObject *iface, FORMATETC *fmt) { - FIXME("(%p, %p {%s})\n", iface, fmt, dump_fmtetc(fmt)); + TRACE("(%p, %p {%s})\n", iface, fmt, dump_fmtetc(fmt)); if (!fmt) return E_INVALIDARG;

1 0

Akihiro Sagawa : dwrite: Avoid a magic constant.
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

Module: wine Branch: master Commit: 9597ed5375367b466eddee5772204186417456d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9597ed5375367b466eddee57… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 11 23:04:43 2019 +0900 dwrite: Avoid a magic constant. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8dad94d25d..604c67f565 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2507,7 +2507,7 @@ static UINT32 collection_find_family(struct dwrite_fontcollection *collection, c for (j = 0; j < count; j++) { WCHAR buffer[255]; - hr = IDWriteLocalizedStrings_GetString(family_name, j, buffer, 255); + hr = IDWriteLocalizedStrings_GetString(family_name, j, buffer, ARRAY_SIZE(buffer)); if (SUCCEEDED(hr) && !strcmpiW(buffer, name)) return i; }

1 0

Francois Gouget : dwrite: A couple of spelling fixes in comments.
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

Module: wine Branch: master Commit: f38c260ce76c834d92a141b11e0f513c02720c0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f38c260ce76c834d92a141b1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 8 06:19:38 2019 +0200 dwrite: A couple of spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bidi.c | 2 +- dlls/dwrite/font.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index f614f4ad8f..03c655ef68 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -67,7 +67,7 @@ extern const unsigned short bidi_direction_table[] DECLSPEC_HIDDEN; Note: The list of bidirectional character types here is not grouped the - same way as the table 3-7, since the numberic values for the types + same way as the table 3-7, since the numeric values for the types are chosen to keep the state and action tables compact. ------------------------------------------------------------------------*/ enum directions diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 3f11b1d3ad..8dad94d25d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5402,7 +5402,7 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit *ret = NULL; - /* Check rendering, antialising, measuring, and grid fitting modes. */ + /* Check rendering, antialiasing, measuring, and grid fitting modes. */ if ((UINT32)desc->rendering_mode >= DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED || desc->rendering_mode == DWRITE_RENDERING_MODE1_OUTLINE || desc->rendering_mode == DWRITE_RENDERING_MODE1_DEFAULT)

1 0

Tag wine-4.16 : Alexandre Julliard : Release 4.16
by Alexandre Julliard Sept. 13, 2019

Sept. 13, 2019

Module: wine Branch: refs/tags/wine-4.16 Tag: 6ab81dee1654637dac674a2d680a936934421bdf URL: https://source.winehq.org/git/wine.git/?a=tag;h=6ab81dee1654637dac674a2d680… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 13 22:32:49 2019 +0200 Release 4.16

1 0