December 2019 - Wine-Commits

Francois Gouget : user32/tests: Avoid an unneeded (&commented out) strlen() call.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: e248170e30d9103e3ff162efc5eb91a8723b18ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e248170e30d9103e3ff162ef… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:40:06 2019 +0100 user32/tests: Avoid an unneeded (&commented out) strlen() call. Note that pathBuffer is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 8d8115131e..9f6f45990f 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1710,7 +1710,7 @@ static void test_listbox_dlgdir(void) ok (res == 0, "DlgDirSelectEx() with no selection returned %d, expected 0\n", res); /* WinXP-SP2 leaves pathBuffer untouched, but Win98 fills it with garbage. */ /* - ok (strlen(pathBuffer) == 0, "DlgDirSelectEx() with no selection filled buffer with %s\n", pathBuffer); + ok (!*pathBuffer, "DlgDirSelectEx() with no selection filled buffer with %s\n", pathBuffer); */ /* Test proper drive/dir/file recognition */ itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0);

1 0

Francois Gouget : winedbg: Avoid unneeded strlen() calls.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 9fbfa988f28e4bba289a7cc292f310253a60bb4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fbfa988f28e4bba289a7cc2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:47:45 2019 +0100 winedbg: Avoid unneeded strlen() calls. Note that target_xml is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b7f59ee05b..85ebc882a6 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1615,7 +1615,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) return packet_ok; if (strncmp(gdbctx->in_packet, "Supported", 9) == 0) { - if (strlen(target_xml)) + if (*target_xml) return packet_reply(gdbctx, "PacketSize=400;qXfer:features:read+"); else { @@ -1652,7 +1652,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) } break; case 'X': - if (strlen(target_xml) && strncmp(gdbctx->in_packet, "Xfer:features:read:target.xml", 29) == 0) + if (*target_xml && strncmp(gdbctx->in_packet, "Xfer:features:read:target.xml", 29) == 0) return packet_reply(gdbctx, target_xml); break; }

1 0

Alexandre Julliard : configure: Disable gcc control flow protection.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: cff35d4de1bbc7fb51a0f0317fbb138fdcf25f0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cff35d4de1bbc7fb51a0f031… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 6 10:40:00 2019 +0100 configure: Disable gcc control flow protection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48161 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 27 ++++++++++++++++++++++++++- configure.ac | 1 + 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 5dc6347ee1..8e5bee0501 100755 --- a/configure +++ b/configure @@ -16875,7 +16875,32 @@ $as_echo "$ac_cv_c_gcc_strength_bug" >&6; } EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-strict-aliasing" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fcf-protection=none" >&5 +$as_echo_n "checking whether the compiler supports -fcf-protection=none... " >&6; } +if ${ac_cv_cflags__fcf_protection_none+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fcf-protection=none" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__fcf_protection_none=yes +else + ac_cv_cflags__fcf_protection_none=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fcf_protection_none" >&5 +$as_echo "$ac_cv_cflags__fcf_protection_none" >&6; } +if test "x$ac_cv_cflags__fcf_protection_none" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -fcf-protection=none" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-strict-aliasing" >&5 $as_echo_n "checking whether the compiler supports -fno-strict-aliasing... " >&6; } if ${ac_cv_cflags__fno_strict_aliasing+:} false; then : $as_echo_n "(cached) " >&6 diff --git a/configure.ac b/configure.ac index b0ba094134..9b6bc2bc9f 100644 --- a/configure.ac +++ b/configure.ac @@ -2026,6 +2026,7 @@ then fi dnl Check for some compiler flags + WINE_TRY_CFLAGS([-fcf-protection=none]) WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) dnl clang needs to be told to fail on unknown options

1 0

Mathew Hodson : kernel32/tests: Trace the mapped string when FoldStringW fails.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 356513ef2d8b79509fa45e11a4ea452af1dae22c URL: https://source.winehq.org/git/wine.git/?a=commit;h=356513ef2d8b79509fa45e11… Author: Mathew Hodson <mathew.hodson(a)gmail.com> Date: Sat Dec 7 21:59:34 2019 -0500 kernel32/tests: Trace the mapped string when FoldStringW fails. Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e43eee2788..9328666181 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3585,7 +3585,7 @@ static void test_FoldStringW(void) ok(ret == ARRAY_SIZE(foldczone_dst), "Got %d, error %d\n", ret, GetLastError()); ok(!memcmp(dst, foldczone_dst, sizeof(foldczone_dst)) || broken(!memcmp(dst, foldczone_broken_dst, sizeof(foldczone_broken_dst))), - "MAP_FOLDCZONE: Expanded incorrectly\n"); + "Got unexpected string %s.\n", wine_dbgstr_w(dst)); /* MAP_EXPAND_LIGATURES */ SetLastError(0); @@ -3594,7 +3594,7 @@ static void test_FoldStringW(void) if (!(ret == 0 && GetLastError() == ERROR_INVALID_FLAGS)) { ok(ret == ARRAY_SIZE(ligatures_dst), "Got %d, error %d\n", ret, GetLastError()); ok(!memcmp(dst, ligatures_dst, sizeof(ligatures_dst)), - "MAP_EXPAND_LIGATURES: Expanded incorrectly\n"); + "Got unexpected string %s.\n", wine_dbgstr_w(dst)); } /* FIXME: MAP_PRECOMPOSED : MAP_COMPOSITE */

1 0

Nikolay Sivov : Update to Unicode 12.1.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 624ed18b1f7d1daf09f493cc34e4679cb8ae84f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=624ed18b1f7d1daf09f493cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 9 11:38:24 2019 +0300 Update to Unicode 12.1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/linebreak.c | 4 +- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 4 +- dlls/dwrite/scripts.h | 2 +- dlls/gdi32/vertical.c | 112 ++--- dlls/kernel32/wctype.c | 52 ++- dlls/kernelbase/compose.c | 2 +- dlls/kernelbase/decompose.c | 2 +- dlls/kernelbase/digitmap.c | 2 +- dlls/usp10/bracket.c | 2 +- dlls/usp10/indicsyllable.c | 4 +- dlls/usp10/linebreak.c | 4 +- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 2 +- dlls/wineps.drv/vertical.c | 112 ++--- libs/port/casemap.c | 2 +- libs/port/combclass.c | 2 +- libs/port/compose.c | 2 +- libs/port/decompose.c | 985 ++++++++++++++++++++++---------------------- libs/port/digitmap.c | 2 +- libs/port/wctype.c | 2 +- tools/make_unicode | 2 +- 23 files changed, 657 insertions(+), 650 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=624ed18b1f7d1daf09f4…

1 0

Nikolay Sivov : dwrite: Implement returning axis values from face reference.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 0d533dea5b6b772926b7b060243ca23a29bbdce2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d533dea5b6b772926b7b060… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 9 11:09:37 2019 +0300 dwrite: Implement returning axis values from face reference. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 11 +++++++++-- dlls/dwrite/tests/font.c | 10 ++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 84e3af8b70..9280b5d32a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -6280,9 +6280,16 @@ static UINT32 WINAPI fontfacereference1_GetFontAxisValueCount(IDWriteFontFaceRef static HRESULT WINAPI fontfacereference1_GetFontAxisValues(IDWriteFontFaceReference1 *iface, DWRITE_FONT_AXIS_VALUE *axis_values, UINT32 value_count) { - FIXME("%p, %p, %u.\n", iface, axis_values, value_count); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); - return E_NOTIMPL; + TRACE("%p, %p, %u.\n", iface, axis_values, value_count); + + if (value_count < reference->axis_values_count) + return E_NOT_SUFFICIENT_BUFFER; + + memcpy(axis_values, reference->axis_values, value_count * sizeof(*axis_values)); + + return S_OK; } static const IDWriteFontFaceReference1Vtbl fontfacereferencevtbl = diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 219a0510ea..3dff4a6191 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9408,6 +9408,16 @@ static void test_font_resource(void) ok(!ret, "Unexpected result.\n"); IDWriteFontFaceReference1_Release(reference2); + memset(axis_values, 0, sizeof(axis_values)); + hr = IDWriteFontFaceReference1_GetFontAxisValues(reference, axis_values, 1); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + ok(!axis_values[0].axisTag, "Unexpected axis tag.\n"); + + memset(axis_values, 0, sizeof(axis_values)); + hr = IDWriteFontFaceReference1_GetFontAxisValues(reference, axis_values, 2); + ok(hr == S_OK, "Failed to get axis values, hr %#x.\n", hr); + ok(axis_values[0].axisTag == DWRITE_FONT_AXIS_TAG_WEIGHT, "Unexpected axis tag.\n"); + IDWriteFontFaceReference1_Release(reference); IDWriteFontFile_Release(fontfile);

1 0

Michael Stefaniuc : dmime/tests: Add segment GetParam/SetParam tests.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 59600f9588c25d1a1777f1113e688d28d2f8bca1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59600f9588c25d1a1777f111… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 8 18:53:53 2019 +0100 dmime/tests: Add segment GetParam/SetParam tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 2e0626cde4..5bb3a8b5b3 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -630,6 +630,47 @@ static void test_gettrack(void) IDirectMusicSegment8_Release(seg); } +static void test_segment_param(void) +{ + IDirectMusicSegment8 *seg; + char buf[64]; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment8, (void **)&seg); + ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + + add_track(seg, LyricsTrack, 0x1); /* no params */ + add_track(seg, SegmentTriggerTrack, 0x1); /* all params "supported" */ + + hr = IDirectMusicSegment8_GetParam(seg, NULL, 0x1, 0, 0, NULL, buf); + ok(hr == E_POINTER, "GetParam failed: %08x, expected E_POINTER\n", hr); + hr = IDirectMusicSegment8_SetParam(seg, NULL, 0x1, 0, 0, buf); + todo_wine ok(hr == E_POINTER, "SetParam failed: %08x, expected E_POINTER\n", hr); + + hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, 0, 0, NULL, buf); + ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", hr); + hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, 1, 0, NULL, buf); + ok(hr == DMUS_E_TRACK_NOT_FOUND, + "GetParam failed: %08x, expected DMUS_E_TRACK_NOT_FOUND\n", hr); + hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, DMUS_SEG_ANYTRACK, 0, + NULL, buf); + ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", hr); + + hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, 0, 0, buf); + ok(hr == S_OK, "SetParam failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, 1, 0, buf); + todo_wine ok(hr == DMUS_E_TRACK_NOT_FOUND, + "SetParam failed: %08x, expected DMUS_E_TRACK_NOT_FOUND\n", hr); + hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, DMUS_SEG_ALLTRACKS, + 0, buf); + ok(hr == S_OK, "SetParam failed: %08x, expected S_OK\n", hr); + + IDirectMusicSegment8_Release(seg); +} + static void expect_getparam(IDirectMusicTrack *track, REFGUID type, const char *name, HRESULT expect) { @@ -1117,6 +1158,7 @@ START_TEST(dmime) test_graph(); test_segment(); test_gettrack(); + test_segment_param(); test_track(); test_parsedescriptor();

1 0

Michael Stefaniuc : dmime: Fix index handling in segment GetParam().
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 17bab664ce29728533ee5eda87941df33e74a9d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17bab664ce29728533ee5eda… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 8 18:53:52 2019 +0100 dmime: Fix index handling in segment GetParam(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 55 ++++++++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 34 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 5284ac5fec..b6357b6f5f 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -368,49 +368,36 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_RemoveNotificationType(IDirectMus return S_OK; } -static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *iface, - REFGUID type, DWORD group, DWORD index, MUSIC_TIME time, MUSIC_TIME *next, - void *param) +static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *iface, REFGUID type, + DWORD group, DWORD index, MUSIC_TIME time, MUSIC_TIME *next, void *param) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - struct list *item; IDirectMusicTrack *track; - DMUS_PRIVATE_SEGMENT_TRACK *segment; - HRESULT hr; - - FIXME("(%p, %s, 0x%x, %d, %d, %p, %p) Semi-stub\n", This, debugstr_dmguid(type), group, - index, time, next, param); - - if (index == DMUS_SEG_ANYTRACK || group == 0xffffffff) { - if (group == 0xffffffff && index != DMUS_SEG_ANYTRACK) - WARN("Any group doesnt have DMUS_SEG_ANYTRACK index.\n"); + unsigned int i, count; + HRESULT hr = DMUS_E_TRACK_NOT_FOUND; - LIST_FOR_EACH (item, &This->Tracks) { - segment = LIST_ENTRY(item, DMUS_PRIVATE_SEGMENT_TRACK, entry); + TRACE("(%p, %s, %#x, %u, %d, %p, %p)\n", This, debugstr_dmguid(type), group, index, time, + next, param); - TRACE(" - %p -> 0x%x,%p\n", segment, segment->dwGroupBits, segment->pTrack); - - if (group != 0xffffffff && !(segment->dwGroupBits & group)) - continue; - if (FAILED(IDirectMusicTrack_IsParamSupported(segment->pTrack, type))) - continue; - hr = IDirectMusicTrack_GetParam(segment->pTrack, type, time, next, param); - if (SUCCEEDED(hr)) - return hr; - } + if (!type) + return E_POINTER; - WARN("(%p): not found\n", This); - return DMUS_E_TRACK_NOT_FOUND; - } + /* Index is relative to the search pattern: group bits and supported param type */ + for (i = 0, count = 0; i < DMUS_SEG_ANYTRACK && count <= index; i++) { + if (FAILED(IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, group, i, &track))) + break; + if (FAILED(IDirectMusicTrack_IsParamSupported(track, type))) + continue; + if (index == count || index == DMUS_SEG_ANYTRACK) + hr = IDirectMusicTrack_GetParam(track, type, time, next, param); + IDirectMusicTrack_Release(track); - hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, group, index, &track); - if (FAILED(hr)) { - ERR("(%p): not found\n", This); - return DMUS_E_TRACK_NOT_FOUND; + if (SUCCEEDED(hr)) + return hr; + count++; } - hr = IDirectMusicTrack_GetParam(track, type, time, next, param); - IDirectMusicTrack_Release(track); + TRACE("(%p): not found\n", This); return hr; }

1 0

Zebediah Figura : strmbase: Get rid of the "vtbl" argument to strmbase_source_init().
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 675e0611426625226b3f3fe76bb396cb68727cb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=675e0611426625226b3f3fe7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 7 22:20:38 2019 -0600 strmbase: Get rid of the "vtbl" argument to strmbase_source_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 24 +------------------- dlls/qcap/avimux.c | 24 +------------------- dlls/qcap/smartteefilter.c | 48 ++------------------------------------- dlls/qcap/vfwcapture.c | 25 +------------------- dlls/qedit/samplegrabber.c | 24 +------------------- dlls/quartz/filesource.c | 26 +-------------------- dlls/quartz/tests/videorenderer.c | 24 +------------------- dlls/quartz/tests/vmr7.c | 24 +------------------- dlls/quartz/tests/vmr9.c | 24 +------------------- dlls/strmbase/pin.c | 38 ++++++++++++++++++++++++------- dlls/strmbase/transform.c | 26 +-------------------- dlls/winegstreamer/gstdemux.c | 25 +------------------- dlls/wineqtdecoder/qtsplitter.c | 25 +------------------- include/wine/strmbase.h | 10 +------- 14 files changed, 44 insertions(+), 323 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=675e0611426625226b3f…

1 0

Alexandre Julliard : configure: Disable gcc stack protection.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 684c272aa794757627ee0eee264a19fcd1052190 URL: https://source.winehq.org/git/wine.git/?a=commit;h=684c272aa794757627ee0eee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 6 11:08:17 2019 +0100 configure: Disable gcc stack protection. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+) diff --git a/configure b/configure index 8e5bee0501..1b463aebc0 100755 --- a/configure +++ b/configure @@ -16899,6 +16899,31 @@ fi $as_echo "$ac_cv_cflags__fcf_protection_none" >&6; } if test "x$ac_cv_cflags__fcf_protection_none" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -fcf-protection=none" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-stack-protector" >&5 +$as_echo_n "checking whether the compiler supports -fno-stack-protector... " >&6; } +if ${ac_cv_cflags__fno_stack_protector+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fno-stack-protector" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__fno_stack_protector=yes +else + ac_cv_cflags__fno_stack_protector=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_stack_protector" >&5 +$as_echo "$ac_cv_cflags__fno_stack_protector" >&6; } +if test "x$ac_cv_cflags__fno_stack_protector" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -fno-stack-protector" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-strict-aliasing" >&5 $as_echo_n "checking whether the compiler supports -fno-strict-aliasing... " >&6; } diff --git a/configure.ac b/configure.ac index 9b6bc2bc9f..ed0c1de9db 100644 --- a/configure.ac +++ b/configure.ac @@ -2027,6 +2027,7 @@ then dnl Check for some compiler flags WINE_TRY_CFLAGS([-fcf-protection=none]) + WINE_TRY_CFLAGS([-fno-stack-protector]) WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) dnl clang needs to be told to fail on unknown options

1 0