wine-devel November 2019

wine-devel@winehq.org

85 participants
778 discussions

GCC stack protector causes ntdll exception test to crash
by Brendan Shanks 09 Nov '19

09 Nov '19

While trying to run ntdll’s exception tests in 32-bit mode, I found that one test was causing Wine itself to segfault. It’s protection fault test #18, from dlls/ntdll/tests/exception.c:250: /* test accessing a zero selector */ { { 0x0f, 0xa8, 0x31, 0xc0, 0x8e, 0xe8, 0x65, 0xa1, 0, 0, 0, 0, 0x0f, 0xa9, 0xc3 }, /* push %gs; xor %eax,%eax; mov %ax,%gs; mov %gs:(0),%ax; pop %gs; ret */ 6, 6, FALSE, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, That test runs and triggers a segfault as expected, but another segfault is triggered in the prologue of segv_handler when it’s trying to copy the stack canary from TLS: segv_handler: 0x7bcbb728: push %ebp 0x7bcbb729: mov %esp,%ebp 0x7bcbb72b: sub $0x48,%esp 0x7bcbb72e: mov 0xc(%ebp),%eax 0x7bcbb731: mov %eax,-0x3c(%ebp) 0x7bcbb734: mov 0x10(%ebp),%eax 0x7bcbb737: mov %eax,-0x40(%ebp) => 0x7bcbb73a: mov %gs:0x14,%eax 0x7bcbb740: mov %eax,-0xc(%ebp) 0x7bcbb743: xor %eax,%eax Obviously %gs does not point to the TLS area and that causes the crash. More detail on how the stack protector works: https://www.elttam.com.au/blog/playing-with-canaries/ I’m using Gentoo, which builds gcc (8.2.0 in my case) with ‘—enable-default-ssp’, enabling '-fstack-protector-strong’ by default for all compiles. I believe Arch also builds gcc and clang with this flag (https://www.reddit.com/r/archlinux/comments/6n5tkp/arch_now_enables_pie_and…). After rebuilding Wine with CFLAGS="-fno-stack-protector", the test passes. I’m not sure what the best fix is: - always build Wine with “-fno-stack-protector” added to CFLAGS if the compiler supports it? - use pragmas to disable stack protection just for signal handlers that might get called with a trashed %gs? - if it’s possible, add an assembly wrapper for segv_handler to set the correct %gs? - or, is this test (and setting %gs) even representative of something 32-bit Windows apps do? Thanks, Brendan

1 0

[PATCH v2] dmband: Handle the DirectX 7 version of DMUS_IO_INSTRUMENT structure.
by Michael Stefaniuc 08 Nov '19

08 Nov '19

1 0

[PATCH] msvcrt/tests: Add iswdigit tests.
by Jacek Caban 08 Nov '19

08 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)

2 1

[PATCH v2] dmime: Trace dwGroupBits parameter consistently
by Michael Stefaniuc 08 Nov '19

08 Nov '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Use "%#x" instead of "0x%x" dlls/dmime/segment.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index a0e6191864..d47c2f2c23 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -170,7 +170,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *if IPersistStream* pCLSIDStream = NULL; HRESULT hr = S_OK; - TRACE("(%p, %s, %d, 0x%x, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); + TRACE("(%p, %s, %#x, %#x, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); if (NULL == ppTrack) { return E_POINTER; @@ -243,12 +243,12 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; LPDMUS_PRIVATE_SEGMENT_TRACK pNewSegTrack = NULL; - TRACE("(%p, %p, %d)\n", This, pTrack, dwGroupBits); + TRACE("(%p, %p, %#x)\n", This, pTrack, dwGroupBits); LIST_FOR_EACH (pEntry, &This->Tracks) { i++; pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - #%u: %p -> %d,%p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - #%u: %p -> %#x, %p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); if (NULL != pIt && pIt->pTrack == pTrack) { ERR("(%p, %p): track is already in list\n", This, pTrack); return E_FAIL; @@ -424,7 +424,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *if REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, void *pParam) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %d, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); + FIXME("(%p, %s, %#x, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); return S_OK; } @@ -503,7 +503,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetTrackConfig(IDirectMusicSegmen DWORD dwFlagsOff) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %d, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); + FIXME("(%p, %s, %#x, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); return S_OK; } -- 2.20.1

2 1

[PATCH] vbscript: Treat only ASCII digits as digits.
by Jacek Caban 08 Nov '19

08 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/lex.c | 14 +++++++------- dlls/vbscript/vbregexp.c | 4 ++-- dlls/vbscript/vbscript.h | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-)

1 0

[PATCH] jscript: Treat only ASCII digits as digits.
by Jacek Caban 08 Nov '19

08 Nov '19

1 0

[PATCH] vbscript: Remove redundant NULL checks before SysFreeString()
by Michael Stefaniuc 08 Nov '19

08 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/global.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 8d4150ad70..a4442960d9 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2948,19 +2948,19 @@ static HRESULT Err_Raise(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VA error = (code & ~0xffff) ? map_hres(code) : MAKE_VBSERROR(code); if(source) { - if(ctx->ei.bstrSource) SysFreeString(ctx->ei.bstrSource); + SysFreeString(ctx->ei.bstrSource); ctx->ei.bstrSource = source; } if(!ctx->ei.bstrSource) ctx->ei.bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR); if(description) { - if(ctx->ei.bstrDescription) SysFreeString(ctx->ei.bstrDescription); + SysFreeString(ctx->ei.bstrDescription); ctx->ei.bstrDescription = description; } if(!ctx->ei.bstrDescription) ctx->ei.bstrDescription = get_vbscript_error_string(error); if(helpfile) { - if(ctx->ei.bstrHelpFile) SysFreeString(ctx->ei.bstrHelpFile); + SysFreeString(ctx->ei.bstrHelpFile); ctx->ei.bstrHelpFile = helpfile; } if(args_cnt >= 5) -- 2.20.1

2 1

[PATCH v3] dsound/tests: Add media object query tests
by Andrew Eikum 08 Nov '19

08 Nov '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v3: Add test prefix to ok() output. dlls/dsound/tests/dsound8.c | 48 +++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index b66275973f7..8190a617368 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1424,6 +1424,38 @@ static void test_effects(void) while (IDirectSound8_Release(dso)); } +static void test_dsfx_interfaces(const char *test_prefix, IUnknown *dmo, REFGUID refguid) +{ + HRESULT rc; + IMediaObject *mediaobject; + IMediaObjectInPlace *inplace; + IUnknown *parent; + + rc = IUnknown_QueryInterface(dmo, &IID_IMediaObject, (void**)&mediaobject); + ok(rc == DS_OK, "%s: Failed: %08x\n", test_prefix, rc); + if (rc == DS_OK) + { + rc = IMediaObject_QueryInterface(mediaobject, refguid, (void**)&parent); + ok(rc == S_OK, "%s: got: %08x\n", test_prefix, rc); + ok(dmo == parent, "%s: Objects not equal\n", test_prefix); + IUnknown_Release(parent); + + IMediaObject_Release(mediaobject); + } + + rc = IUnknown_QueryInterface(dmo, &IID_IMediaObjectInPlace, (void**)&inplace); + ok(rc == DS_OK, "%s: Failed: %08x\n", test_prefix, rc); + if (rc == DS_OK) + { + rc = IMediaObjectInPlace_QueryInterface(inplace, refguid, (void**)&parent); + ok(rc == S_OK, "%s: got: %08x\n", test_prefix, rc); + ok(dmo == parent, "%s: Objects not equal\n", test_prefix); + IUnknown_Release(parent); + + IMediaObjectInPlace_Release(inplace); + } +} + static void test_echo_parameters(IDirectSoundBuffer8 *secondary8) { HRESULT rc; @@ -1446,6 +1478,8 @@ static void test_echo_parameters(IDirectSoundBuffer8 *secondary8) ok(params.lPanDelay == 0, "got %d\n", params.lPanDelay); } + test_dsfx_interfaces("FXEcho", (IUnknown *)echo, &IID_IDirectSoundFXEcho); + IDirectSoundFXEcho_Release(echo); } } @@ -1469,6 +1503,8 @@ static void test_gargle_parameters(IDirectSoundBuffer8 *secondary8) ok(params.dwWaveShape == DSFXGARGLE_WAVE_TRIANGLE, "got %d\n", params.dwWaveShape); } + test_dsfx_interfaces("FXGargle", (IUnknown *)gargle, &IID_IDirectSoundFXGargle); + IDirectSoundFXGargle_Release(gargle); } } @@ -1497,6 +1533,8 @@ static void test_chorus_parameters(IDirectSoundBuffer8 *secondary8) ok(params.lPhase == 3, "got %d\n", params.lPhase); } + test_dsfx_interfaces("FXChorus", (IUnknown *)chorus, &IID_IDirectSoundFXChorus); + IDirectSoundFXChorus_Release(chorus); } } @@ -1525,6 +1563,8 @@ static void test_flanger_parameters(IDirectSoundBuffer8 *secondary8) ok(params.lPhase == 2, "got %d\n", params.lPhase); } + test_dsfx_interfaces("FXFlanger", (IUnknown *)flanger, &IID_IDirectSoundFXFlanger); + IDirectSoundFXFlanger_Release(flanger); } } @@ -1551,6 +1591,8 @@ static void test_distortion_parameters(IDirectSoundBuffer8 *secondary8) ok(params.fPreLowpassCutoff == 3675.0f, "got %f\n", params.fPreLowpassCutoff); } + test_dsfx_interfaces("FXDistortion", (IUnknown *)distortion, &IID_IDirectSoundFXDistortion); + IDirectSoundFXDistortion_Release(distortion); } } @@ -1577,6 +1619,8 @@ static void test_compressor_parameters(IDirectSoundBuffer8 *secondary8) ok(params.fPredelay == 4.0f, "got %f\n", params.fPredelay); } + test_dsfx_interfaces("FXCompressor", (IUnknown *)compressor, &IID_IDirectSoundFXCompressor); + IDirectSoundFXCompressor_Release(compressor); } } @@ -1601,6 +1645,8 @@ static void test_parameq_parameters(IDirectSoundBuffer8 *secondary8) ok(params.fGain == 0.0f, "got %f\n", params.fGain); } + test_dsfx_interfaces("FXParamEq", (IUnknown *)parameq, &IID_IDirectSoundFXParamEq); + IDirectSoundFXParamEq_Release(parameq); } } @@ -1632,6 +1678,8 @@ static void test_reverb_parameters(IDirectSoundBuffer8 *secondary8) ok(params.flHFReference == 5000.0f, "got %f\n", params.flHFReference); } + test_dsfx_interfaces("FXI3DL2Reverb", (IUnknown *)reverb, &IID_IDirectSoundFXI3DL2Reverb); + IDirectSoundFXI3DL2Reverb_Release(reverb); } } -- 2.24.0

1 0

[PATCH] configure: Get rid of no longer needed __builtin_clz check.
by Jacek Caban 08 Nov '19

08 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- configure.ac | 9 --------- 1 file changed, 9 deletions(-)

1 0

[PATCH 3/3] widl: Use strmake in get_name.
by Jacek Caban 08 Nov '19

08 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/header.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
78
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-devel November 2019