wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

Francois Gouget : user32/tests: Avoid an unneeded (&commented out) strlen() call.
by Alexandre Julliard 09 Dec '19

09 Dec '19

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

Alexandre Julliard : configure: Get rid of the gcc strength-reduce bug check.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 421639ec63c06e67dd07af67cfd3d4103577b53e URL: https://source.winehq.org/git/wine.git/?a=commit;h=421639ec63c06e67dd07af67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 6 11:10:18 2019 +0100 configure: Get rid of the gcc strength-reduce bug check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 42 ------------------------------------------ configure.ac | 16 ---------------- 2 files changed, 58 deletions(-) diff --git a/configure b/configure index 1b463aebc0..6310283580 100755 --- a/configure +++ b/configure @@ -16833,48 +16833,6 @@ if test "x${GCC}" = "xyes" then EXTRACFLAGS="-Wall -pipe" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc strength-reduce bug" >&5 -$as_echo_n "checking for gcc strength-reduce bug... " >&6; } -if ${ac_cv_c_gcc_strength_bug+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_c_gcc_strength_bug="no" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int L[4] = {0,1,2,3}; -int -main () -{ -static int Array[3]; - unsigned int B = 3; - int i; - for(i=0; i<B; i++) Array[i] = i - 3; - for(i=0; i<4 - 1; i++) L[i] = L[i + 1]; - L[i] = 4; - return (Array[1] != -2 || L[2] != 3) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_c_gcc_strength_bug="no" -else - ac_cv_c_gcc_strength_bug="yes" -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_gcc_strength_bug" >&5 -$as_echo "$ac_cv_c_gcc_strength_bug" >&6; } - if test "$ac_cv_c_gcc_strength_bug" = "yes" - then - EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce" - fi - { $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 : diff --git a/configure.ac b/configure.ac index ed0c1de9db..97d2dbf3e5 100644 --- a/configure.ac +++ b/configure.ac @@ -2009,22 +2009,6 @@ if test "x${GCC}" = "xyes" then EXTRACFLAGS="-Wall -pipe" - dnl Check for strength-reduce bug - AC_CACHE_CHECK( [for gcc strength-reduce bug], ac_cv_c_gcc_strength_bug, - AC_RUN_IFELSE([AC_LANG_PROGRAM([[int L[[4]] = {0,1,2,3};]], -[[static int Array[[3]]; - unsigned int B = 3; - int i; - for(i=0; i<B; i++) Array[[i]] = i - 3; - for(i=0; i<4 - 1; i++) L[[i]] = L[[i + 1]]; - L[[i]] = 4; - return (Array[[1]] != -2 || L[[2]] != 3)]])], - [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="no"]) ) - if test "$ac_cv_c_gcc_strength_bug" = "yes" - then - EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce" - fi - dnl Check for some compiler flags WINE_TRY_CFLAGS([-fcf-protection=none]) WINE_TRY_CFLAGS([-fno-stack-protector])

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

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

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

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

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

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 : 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 : oleaut32/typelib: No need to query self for supported interface.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: ae67aa8bbfacc5da94d23b187b63b86bee407466 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae67aa8bbfacc5da94d23b18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 9 11:08:46 2019 +0300 oleaut32/typelib: No need to query self for supported interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index eb713a4e2f..6e8a18c9d7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -11180,7 +11180,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeIdldesc(ICreateTypeInfo2 *iface, static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - ITypeInfo *tinfo; + ITypeInfo2 *tinfo = &This->ITypeInfo2_iface; TLBFuncDesc *func_desc; UINT user_vft = 0, i, depth = 0; HRESULT hres = S_OK; @@ -11189,25 +11189,20 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) This->needs_layout = FALSE; - hres = ICreateTypeInfo2_QueryInterface(iface, &IID_ITypeInfo, (LPVOID*)&tinfo); - if (FAILED(hres)) - return hres; - if (This->typeattr.typekind == TKIND_INTERFACE) { ITypeInfo *inh; TYPEATTR *attr; HREFTYPE inh_href; - hres = ITypeInfo_GetRefTypeOfImplType(tinfo, 0, &inh_href); + hres = ITypeInfo2_GetRefTypeOfImplType(tinfo, 0, &inh_href); if (SUCCEEDED(hres)) { - hres = ITypeInfo_GetRefTypeInfo(tinfo, inh_href, &inh); + hres = ITypeInfo2_GetRefTypeInfo(tinfo, inh_href, &inh); if (SUCCEEDED(hres)) { hres = ITypeInfo_GetTypeAttr(inh, &attr); if (FAILED(hres)) { ITypeInfo_Release(inh); - ITypeInfo_Release(tinfo); return hres; } This->typeattr.cbSizeVft = attr->cbSizeVft; @@ -11231,17 +11226,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) } else if (hres == TYPE_E_ELEMENTNOTFOUND) { This->typeattr.cbSizeVft = 0; hres = S_OK; - } else { - ITypeInfo_Release(tinfo); + } else return hres; - } } else if (hres == TYPE_E_ELEMENTNOTFOUND) { This->typeattr.cbSizeVft = 0; hres = S_OK; - } else { - ITypeInfo_Release(tinfo); + } else return hres; - } } else if (This->typeattr.typekind == TKIND_DISPATCH) This->typeattr.cbSizeVft = 7 * This->pTypeLib->ptr_size; else @@ -11316,7 +11307,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) } } - ITypeInfo_Release(tinfo); return hres; }

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
64
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-commits December 2019