December 2019 - Wine-commits

Nikolay Sivov : dwrite: Compare axis values when testing for face reference equality.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: f7f9339969d82480df790dfbb9fb7e059edb2881 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7f9339969d82480df790dfb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 9 11:09:36 2019 +0300 dwrite: Compare axis values when testing for face reference equality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 28 +++++++++++++++------- dlls/dwrite/tests/font.c | 60 ++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 75 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2670a22839..84e3af8b70 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -236,6 +236,8 @@ struct dwrite_fontfacereference IDWriteFactory7 *factory; }; +static const IDWriteFontFaceReference1Vtbl fontfacereferencevtbl; + struct dwrite_fontresource { IDWriteFontResource IDWriteFontResource_iface; @@ -1896,6 +1898,16 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface) return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace5_iface); } +static struct dwrite_fontfacereference *unsafe_impl_from_IDWriteFontFaceReference(IDWriteFontFaceReference *iface) +{ + if (!iface) + return NULL; + if (iface->lpVtbl != (IDWriteFontFaceReferenceVtbl *)&fontfacereferencevtbl) + return NULL; + return CONTAINING_RECORD((IDWriteFontFaceReference1 *)iface, struct dwrite_fontfacereference, + IDWriteFontFaceReference1_iface); +} + void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf) { struct dwrite_font *font = unsafe_impl_from_IDWriteFont(iface); @@ -6132,18 +6144,18 @@ static HRESULT WINAPI fontfacereference_CreateFontFaceWithSimulations(IDWriteFon static BOOL WINAPI fontfacereference_Equals(IDWriteFontFaceReference1 *iface, IDWriteFontFaceReference *ref) { struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); - IDWriteFontFile *file; + struct dwrite_fontfacereference *other = unsafe_impl_from_IDWriteFontFaceReference(ref); BOOL ret; TRACE("%p, %p.\n", iface, ref); - if (FAILED(IDWriteFontFaceReference_GetFontFile(ref, &file))) - return FALSE; - - ret = is_same_fontfile(reference->file, file) && - reference->index == IDWriteFontFaceReference_GetFontFaceIndex(ref) && - reference->simulations == IDWriteFontFaceReference_GetSimulations(ref); - IDWriteFontFile_Release(file); + ret = is_same_fontfile(reference->file, other->file) && reference->index == other->index && + reference->simulations == other->simulations; + if (reference->axis_values_count) + { + ret &= reference->axis_values_count == other->axis_values_count && + !memcmp(reference->axis_values, other->axis_values, reference->axis_values_count * sizeof(*reference->axis_values)); + } return ret; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index a0d36e2f0b..219a0510ea 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9279,13 +9279,14 @@ static void test_font_resource(void) IDWriteFontFaceReference1 *reference, *reference2; IDWriteFontResource *resource, *resource2; IDWriteFontFile *fontfile, *fontfile2; - DWRITE_FONT_AXIS_VALUE axis_value; + DWRITE_FONT_AXIS_VALUE axis_values[2]; IDWriteFontFace5 *fontface5; IDWriteFontFace *fontface; IDWriteFactory6 *factory; UINT32 count, index; HRESULT hr; ULONG ref; + BOOL ret; if (!(factory = create_factory_iid(&IID_IDWriteFactory6))) { @@ -9316,9 +9317,9 @@ static void test_font_resource(void) ok(!index, "Unexpected index %u.\n", index); /* Specify axis value, font has no variations. */ - axis_value.axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; - axis_value.value = 400.0f; - hr = IDWriteFontResource_CreateFontFaceReference(resource, DWRITE_FONT_SIMULATIONS_NONE, &axis_value, 1, &reference); + axis_values[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis_values[0].value = 400.0f; + hr = IDWriteFontResource_CreateFontFaceReference(resource, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 1, &reference); ok(hr == S_OK, "Failed to create reference object, hr %#x.\n", hr); count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference); @@ -9326,7 +9327,7 @@ static void test_font_resource(void) IDWriteFontFaceReference1_Release(reference); - hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, &axis_value, 1, + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 1, &reference); count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference); ok(count == 1, "Unexpected axis value count.\n"); @@ -9360,6 +9361,55 @@ static void test_font_resource(void) IDWriteFontFace5_Release(fontface5); + /* Reference equality regarding set axis values. */ + axis_values[0].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis_values[0].value = 400.0f; + axis_values[1].axisTag = DWRITE_FONT_AXIS_TAG_ITALIC; + axis_values[1].value = 1.0f; + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 2, + &reference); + count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference); + ok(count == 2, "Unexpected axis value count.\n"); + + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, NULL, 0, + &reference2); + count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference2); + ok(!count, "Unexpected axis value count.\n"); + + ret = IDWriteFontFaceReference1_Equals(reference, (IDWriteFontFaceReference *)reference2); + ok(!ret, "Unexpected result.\n"); + IDWriteFontFaceReference1_Release(reference2); + + /* Different values order. */ + axis_values[0].axisTag = DWRITE_FONT_AXIS_TAG_ITALIC; + axis_values[0].value = 1.0f; + axis_values[1].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis_values[1].value = 400.0f; + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 2, + &reference2); + count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference2); + ok(count == 2, "Unexpected axis value count.\n"); + + ret = IDWriteFontFaceReference1_Equals(reference, (IDWriteFontFaceReference *)reference2); + ok(!ret, "Unexpected result.\n"); + IDWriteFontFaceReference1_Release(reference2); + + /* Different axis values. */ + axis_values[0].axisTag = DWRITE_FONT_AXIS_TAG_ITALIC; + axis_values[0].value = 1.0f; + axis_values[1].axisTag = DWRITE_FONT_AXIS_TAG_WEIGHT; + axis_values[1].value = 401.0f; + hr = IDWriteFactory6_CreateFontFaceReference(factory, fontfile, 0, DWRITE_FONT_SIMULATIONS_NONE, axis_values, 2, + &reference2); + count = IDWriteFontFaceReference1_GetFontAxisValueCount(reference2); + ok(count == 2, "Unexpected axis value count.\n"); + + ret = IDWriteFontFaceReference1_Equals(reference, (IDWriteFontFaceReference *)reference2); + ok(!ret, "Unexpected result.\n"); + IDWriteFontFaceReference1_Release(reference2); + + IDWriteFontFaceReference1_Release(reference); + IDWriteFontFile_Release(fontfile); IDWriteFontFace_Release(fontface);

1 0

Nikolay Sivov : dwrite: Implement returning axis values from face reference.
by Alexandre Julliard 09 Dec '19

09 Dec '19

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

Nikolay Sivov : Update to Unicode 12.1.
by Alexandre Julliard 09 Dec '19

09 Dec '19

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

Mathew Hodson : kernel32/tests: Trace the mapped string when FoldStringW fails.
by Alexandre Julliard 09 Dec '19

09 Dec '19

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

Mathew Hodson : kernel32/tests: Add broken result for Windows XP and 2003.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: df94a9a45063239516bdca15b7e6427cb434fe23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df94a9a45063239516bdca15… Author: Mathew Hodson <mathew.hodson(a)gmail.com> Date: Sat Dec 7 21:59:35 2019 -0500 kernel32/tests: Add broken result for Windows XP and 2003. Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9328666181..c8cc904791 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3439,7 +3439,7 @@ static void test_FoldStringW(void) }; static const WCHAR foldczone_broken_dst[] = { - 'W','i','n','e',0x0348,0x0551,0x1323,0x280d,'W','i','n','e',0x3cb,0x1f0,0xa0,0xaa,0 + 'W','i','n','e',0x0348,0x0551,0x1323,0x280d,'W','i','n','e',0x03c5,0x0308,'j',0x030c,0x00a0,0x00aa,0 }; static const WCHAR ligatures_src[] = { @@ -3582,9 +3582,11 @@ static void test_FoldStringW(void) /* MAP_FOLDCZONE */ SetLastError(0); ret = pFoldStringW(MAP_FOLDCZONE, foldczone_src, -1, dst, 256); - ok(ret == ARRAY_SIZE(foldczone_dst), "Got %d, error %d\n", ret, GetLastError()); + ok(ret == ARRAY_SIZE(foldczone_dst) + || broken(ret == ARRAY_SIZE(foldczone_broken_dst)), /* winxp, win2003 */ + "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))), + || broken(!memcmp(dst, foldczone_broken_dst, sizeof(foldczone_broken_dst))), /* winxp, win2003 */ "Got unexpected string %s.\n", wine_dbgstr_w(dst)); /* MAP_EXPAND_LIGATURES */

1 0

Alexandre Julliard : configure: Disable gcc control flow protection.
by Alexandre Julliard 09 Dec '19

09 Dec '19

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

Alexandre Julliard : configure: Disable gcc stack protection.
by Alexandre Julliard 09 Dec '19

09 Dec '19

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

Derek Lesho : bcrypt: Add fallback when gnutls_decode_rs_value isn't present.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: ff91d9473a224be0a3272f2205db467c05fdaf65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff91d9473a224be0a3272f22… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Dec 6 20:11:03 2019 -0600 bcrypt: Add fallback when gnutls_decode_rs_value isn't present. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 1c31b5625f..868f898bbb 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -86,13 +86,15 @@ static int (*pgnutls_privkey_export_rsa_raw)(gnutls_privkey_t, gnutls_datum_t *, gnutls_datum_t *); static int (*pgnutls_privkey_generate)(gnutls_privkey_t, gnutls_pk_algorithm_t, unsigned int, unsigned int); +/* Not present in gnutls version < 3.6.0 */ +static int (*pgnutls_decode_rs_value)(const gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_cipher_decrypt2); MAKE_FUNCPTR(gnutls_cipher_deinit); MAKE_FUNCPTR(gnutls_cipher_encrypt2); MAKE_FUNCPTR(gnutls_cipher_init); -MAKE_FUNCPTR(gnutls_decode_rs_value); MAKE_FUNCPTR(gnutls_global_deinit); MAKE_FUNCPTR(gnutls_global_init); MAKE_FUNCPTR(gnutls_global_set_log_function); @@ -164,6 +166,11 @@ static int compat_gnutls_privkey_generate(gnutls_privkey_t key, gnutls_pk_algori return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_decode_rs_value(const gnutls_datum_t * sig_value, gnutls_datum_t * r, gnutls_datum_t * s) +{ + return GNUTLS_E_INTERNAL_ERROR; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -190,7 +197,6 @@ BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_cipher_deinit) LOAD_FUNCPTR(gnutls_cipher_encrypt2) LOAD_FUNCPTR(gnutls_cipher_init) - LOAD_FUNCPTR(gnutls_decode_rs_value) LOAD_FUNCPTR(gnutls_global_deinit) LOAD_FUNCPTR(gnutls_global_init) LOAD_FUNCPTR(gnutls_global_set_log_function) @@ -259,6 +265,11 @@ BOOL gnutls_initialize(void) WARN("gnutls_privkey_generate not found\n"); pgnutls_privkey_generate = compat_gnutls_privkey_generate; } + if (!(pgnutls_decode_rs_value = wine_dlsym( libgnutls_handle, "gnutls_decode_rs_value", NULL, 0 ))) + { + WARN("gnutls_decode_rs_value not found\n"); + pgnutls_decode_rs_value = compat_gnutls_decode_rs_value; + } if (TRACE_ON( bcrypt )) {

1 0

Alexandre Julliard : winecrt0: Create the Ansi argv from the Unicode one.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 5a9c88d62e018049cc29369b0c463b0664ef6ef1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a9c88d62e018049cc29369b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 7 14:45:24 2019 +0100 winecrt0: Create the Ansi argv from the Unicode one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/dll_entry.c | 2 +- dlls/winecrt0/drv_entry.c | 2 +- dlls/winecrt0/exe_entry.c | 28 ++++++++++++++++++++++++++-- dlls/winecrt0/exe_wentry.c | 2 +- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/winecrt0/dll_entry.c b/dlls/winecrt0/dll_entry.c index a002d87875..92bd069529 100644 --- a/dlls/winecrt0/dll_entry.c +++ b/dlls/winecrt0/dll_entry.c @@ -38,7 +38,7 @@ BOOL WINAPI DECLSPEC_HIDDEN __wine_spec_dll_entry( HINSTANCE inst, DWORD reason, if (reason == DLL_PROCESS_ATTACH && __wine_spec_init_state != CONSTRUCTORS_DONE) { call_fini = TRUE; - _init( __wine_main_argc, __wine_main_argv, NULL ); + _init( 0, NULL, NULL ); } ret = DllMain( inst, reason, reserved ); diff --git a/dlls/winecrt0/drv_entry.c b/dlls/winecrt0/drv_entry.c index ee9f3b13a7..c7d39922e1 100644 --- a/dlls/winecrt0/drv_entry.c +++ b/dlls/winecrt0/drv_entry.c @@ -35,7 +35,7 @@ NTSTATUS DECLSPEC_HIDDEN WINAPI __wine_spec_drv_entry( struct _DRIVER_OBJECT *ob { BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE); - if (needs_init) _init( __wine_main_argc, __wine_main_argv, NULL ); + if (needs_init) _init( 0, NULL, NULL ); return DriverEntry( obj, path ); /* there is no detach routine so we can't call destructors */ } diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index 13a1d893c9..9ae45f9f04 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -25,19 +25,43 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "winternl.h" #include "wine/library.h" #include "crt0_private.h" extern int __cdecl main( int argc, char *argv[] ); +static char **build_argv( WCHAR **wargv ) +{ + int argc; + char *p, **argv; + DWORD total = 0; + + for (argc = 0; wargv[argc]; argc++) + total += WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, NULL, 0, NULL, NULL ); + + argv = HeapAlloc( GetProcessHeap(), 0, total + (argc + 1) * sizeof(*argv) ); + p = (char *)(argv + argc + 1); + for (argc = 0; wargv[argc]; argc++) + { + DWORD reslen = WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, p, total, NULL, NULL ); + argv[argc] = p; + p += reslen; + total -= reslen; + } + argv[argc] = NULL; + return argv; +} + DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_entry( PEB *peb ) { BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE); + char **argv = build_argv( __wine_main_wargv ); DWORD ret; - if (needs_init) _init( __wine_main_argc, __wine_main_argv, NULL ); - ret = main( __wine_main_argc, __wine_main_argv ); + if (needs_init) _init( __wine_main_argc, argv, NULL ); + ret = main( __wine_main_argc, argv ); if (needs_init) _fini(); ExitProcess( ret ); } diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index 9db135eed0..b889e5a102 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -36,7 +36,7 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_wentry( PEB *peb ) BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE); DWORD ret; - if (needs_init) _init( __wine_main_argc, __wine_main_argv, NULL ); + if (needs_init) _init( 0, NULL, NULL ); ret = wmain( __wine_main_argc, __wine_main_wargv ); if (needs_init) _fini(); ExitProcess( ret );

1 0

Alexandre Julliard : msvcrt: Create the Ansi argv from the Unicode one.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 94a3d4adad43dad1086f8293d6ea293cc601c13b URL: https://source.winehq.org/git/wine.git/?a=commit;h=94a3d4adad43dad1086f8293… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 7 14:45:43 2019 +0100 msvcrt: Create the Ansi argv from the Unicode one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 187 ++++++++++++++++++++--------------------------------- 1 file changed, 71 insertions(+), 116 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index c3a1255a60..af7a13528f 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -30,7 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); int MSVCRT___argc = 0; -static int argc_expand; static int wargc_expand; unsigned int MSVCRT__commode = 0; int MSVCRT__fmode = 0; @@ -50,7 +49,6 @@ unsigned int MSVCRT___setlc_active = 0; unsigned int MSVCRT___unguarded_readlc_active = 0; double MSVCRT__HUGE = 0; char **MSVCRT___argv = NULL; -static char **argv_expand; MSVCRT_wchar_t **MSVCRT___wargv = NULL; static MSVCRT_wchar_t **wargv_expand; char *MSVCRT__acmdln = NULL; @@ -139,6 +137,28 @@ MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **wblk) return wblk; } +static char **build_argv( WCHAR **wargv ) +{ + int argc; + char *p, **argv; + DWORD total = 0; + + for (argc = 0; wargv[argc]; argc++) + total += WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, NULL, 0, NULL, NULL ); + + argv = HeapAlloc( GetProcessHeap(), 0, total + (argc + 1) * sizeof(*argv) ); + p = (char *)(argv + argc + 1); + for (argc = 0; wargv[argc]; argc++) + { + DWORD reslen = WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, p, total, NULL, NULL ); + argv[argc] = p; + p += reslen; + total -= reslen; + } + argv[argc] = NULL; + return argv; +} + typedef void (CDECL *_INITTERMFUN)(void); typedef int (CDECL *_INITTERM_E_FN)(void); @@ -327,10 +347,10 @@ void msvcrt_init_args(void) OSVERSIONINFOW osvi; MSVCRT__acmdln = MSVCRT__strdup( GetCommandLineA() ); - MSVCRT__wcmdln = msvcrt_wstrdupa(MSVCRT__acmdln); + MSVCRT__wcmdln = MSVCRT__wcsdup( GetCommandLineW() ); MSVCRT___argc = __wine_main_argc; - MSVCRT___argv = __wine_main_argv; MSVCRT___wargv = __wine_main_wargv; + MSVCRT___argv = build_argv( MSVCRT___wargv ); TRACE("got %s, wide = %s argc=%d\n", debugstr_a(MSVCRT__acmdln), debugstr_w(MSVCRT__wcmdln),MSVCRT___argc); @@ -382,125 +402,16 @@ void msvcrt_init_args(void) void msvcrt_free_args(void) { /* FIXME: more things to free */ + HeapFree(GetProcessHeap(), 0, MSVCRT___argv); HeapFree(GetProcessHeap(), 0, MSVCRT___initenv); HeapFree(GetProcessHeap(), 0, MSVCRT___winitenv); HeapFree(GetProcessHeap(), 0, MSVCRT__environ); HeapFree(GetProcessHeap(), 0, MSVCRT__wenviron); HeapFree(GetProcessHeap(), 0, MSVCRT__pgmptr); HeapFree(GetProcessHeap(), 0, MSVCRT__wpgmptr); - HeapFree(GetProcessHeap(), 0, argv_expand); HeapFree(GetProcessHeap(), 0, wargv_expand); } -static int build_expanded_argv(int *argc, char **argv) -{ - int i, size=0, args_no=0, path_len; - BOOL is_expandable; - HANDLE h; - - args_no = 0; - for(i=0; i<__wine_main_argc; i++) { - WIN32_FIND_DATAA data; - int len = 0; - - is_expandable = FALSE; - for(path_len = strlen(__wine_main_argv[i])-1; path_len>=0; path_len--) { - if(__wine_main_argv[i][path_len]=='*' || __wine_main_argv[i][path_len]=='?') - is_expandable = TRUE; - else if(__wine_main_argv[i][path_len]=='\\' || __wine_main_argv[i][path_len]=='/') - break; - } - path_len++; - - if(is_expandable) - h = FindFirstFileA(__wine_main_argv[i], &data); - else - h = INVALID_HANDLE_VALUE; - - if(h != INVALID_HANDLE_VALUE) { - do { - if(data.cFileName[0]=='.' && (data.cFileName[1]=='\0' || - (data.cFileName[1]=='.' && data.cFileName[2]=='\0'))) - continue; - - len = strlen(data.cFileName)+1; - if(argv) { - argv[args_no] = (char*)(argv+*argc+1)+size; - memcpy(argv[args_no], __wine_main_argv[i], path_len*sizeof(char)); - memcpy(argv[args_no]+path_len, data.cFileName, len*sizeof(char)); - } - args_no++; - size += len+path_len; - }while(FindNextFileA(h, &data)); - FindClose(h); - } - - if(!len) { - len = strlen(__wine_main_argv[i])+1; - if(argv) { - argv[args_no] = (char*)(argv+*argc+1)+size; - memcpy(argv[args_no], __wine_main_argv[i], len*sizeof(char)); - } - args_no++; - size += len; - } - } - - if(argv) - argv[args_no] = NULL; - size += (args_no+1)*sizeof(char*); - *argc = args_no; - return size; -} - -/********************************************************************* - * __getmainargs (MSVCRT.@) - */ -int CDECL __getmainargs(int *argc, char** *argv, char** *envp, - int expand_wildcards, int *new_mode) -{ - TRACE("(%p,%p,%p,%d,%p).\n", argc, argv, envp, expand_wildcards, new_mode); - - if (expand_wildcards) { - HeapFree(GetProcessHeap(), 0, argv_expand); - argv_expand = NULL; - - argv_expand = HeapAlloc(GetProcessHeap(), 0, - build_expanded_argv(&argc_expand, NULL)); - if (argv_expand) { - build_expanded_argv(&argc_expand, argv_expand); - - MSVCRT___argc = argc_expand; - MSVCRT___argv = argv_expand; - }else { - expand_wildcards = 0; - } - } - if (!expand_wildcards) { - MSVCRT___argc = __wine_main_argc; - MSVCRT___argv = __wine_main_argv; - } - - *argc = MSVCRT___argc; - *argv = MSVCRT___argv; - *envp = MSVCRT___initenv; - - if (new_mode) - MSVCRT__set_new_mode( *new_mode ); - return 0; -} - -#ifdef _CRTDLL -/********************************************************************* - * __GetMainArgs (CRTDLL.@) - */ -void CDECL __GetMainArgs( int *argc, char ***argv, char ***envp, int expand_wildcards ) -{ - int new_mode = 0; - __getmainargs( argc, argv, envp, expand_wildcards, &new_mode ); -} -#endif - static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) { int i, size=0, args_no=0, path_len; @@ -573,8 +484,6 @@ int CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *w if (expand_wildcards) { HeapFree(GetProcessHeap(), 0, wargv_expand); - wargv_expand = NULL; - wargv_expand = HeapAlloc(GetProcessHeap(), 0, build_expanded_wargv(&wargc_expand, NULL)); if (wargv_expand) { @@ -602,6 +511,52 @@ int CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *w return 0; } +/********************************************************************* + * __getmainargs (MSVCRT.@) + */ +int CDECL __getmainargs(int *argc, char** *argv, char** *envp, + int expand_wildcards, int *new_mode) +{ + TRACE("(%p,%p,%p,%d,%p).\n", argc, argv, envp, expand_wildcards, new_mode); + + if (expand_wildcards) { + HeapFree(GetProcessHeap(), 0, wargv_expand); + wargv_expand = HeapAlloc(GetProcessHeap(), 0, + build_expanded_wargv(&wargc_expand, NULL)); + if (wargv_expand) { + build_expanded_wargv(&wargc_expand, wargv_expand); + + MSVCRT___argc = wargc_expand; + MSVCRT___argv = build_argv( wargv_expand ); + }else { + expand_wildcards = 0; + } + } + if (!expand_wildcards) { + MSVCRT___argc = __wine_main_argc; + MSVCRT___argv = build_argv( __wine_main_wargv ); + } + + *argc = MSVCRT___argc; + *argv = MSVCRT___argv; + *envp = MSVCRT___initenv; + + if (new_mode) + MSVCRT__set_new_mode( *new_mode ); + return 0; +} + +#ifdef _CRTDLL +/********************************************************************* + * __GetMainArgs (CRTDLL.@) + */ +void CDECL __GetMainArgs( int *argc, char ***argv, char ***envp, int expand_wildcards ) +{ + int new_mode = 0; + __getmainargs( argc, argv, envp, expand_wildcards, &new_mode ); +} +#endif + /********************************************************************* * _initterm (MSVCRT.@) */

1 0