February 2016 - Wine-Commits

Józef Kucia : wined3d: Add support for separate sRGB formats.
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

Module: wine Branch: master Commit: 1769ea38e6fea924b19c2a4a4421caf4a36db844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1769ea38e6fea924b19c2a4a4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 8 00:04:37 2016 +0100 wined3d: Add support for separate sRGB formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 3 +- dlls/d3d9/directx.c | 3 +- dlls/ddraw/ddraw_private.h | 3 +- dlls/wined3d/context.c | 5 ++- dlls/wined3d/device.c | 46 ++++++++++------------ dlls/wined3d/directx.c | 9 +++-- dlls/wined3d/shader.c | 16 +++----- dlls/wined3d/state.c | 12 +++--- dlls/wined3d/texture.c | 5 +-- dlls/wined3d/utils.c | 87 +++++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 19 ++++++++- include/wine/wined3d.h | 1 + 12 files changed, 135 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1769ea38e6fea924b19c2…

1 0

Changhui Liu : kernel32/tests: Add tests for MultiByteToWideChar in DBCS codepage.
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

Module: wine Branch: master Commit: e776421232996729a0e350c31d56f696bd47e429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e776421232996729a0e350c31… Author: Changhui Liu <liuchanghui(a)linuxdeepin.com> Date: Sat Feb 6 14:09:13 2016 +0800 kernel32/tests: Add tests for MultiByteToWideChar in DBCS codepage. Signed-off-by: Changhui Liu <liuchanghui(a)linuxdeepin.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 6718a3b..7293acc 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1136,6 +1136,64 @@ static void test_threadcp(void) SetThreadLocale(last); } +static void test_dbcs_to_widechar(void) +{ + int i, count, count2; + WCHAR wbuf[2]; + unsigned char buf[] = {0xbf, 0xb4, 0xc7}; + static const DWORD flags[] = { + MB_PRECOMPOSED, + MB_COMPOSITE, + + MB_PRECOMPOSED|MB_USEGLYPHCHARS, + MB_COMPOSITE |MB_USEGLYPHCHARS, + + MB_PRECOMPOSED|MB_ERR_INVALID_CHARS, + MB_COMPOSITE |MB_ERR_INVALID_CHARS, + + MB_PRECOMPOSED|MB_ERR_INVALID_CHARS|MB_USEGLYPHCHARS, + MB_COMPOSITE |MB_ERR_INVALID_CHARS|MB_USEGLYPHCHARS, + }; + + for (i = 0; i < sizeof(flags)/sizeof(DWORD); ++i) + { + wbuf[0] = 0xffff; + wbuf[1] = 0xffff; + count = MultiByteToWideChar(936, flags[i], (char*)&buf[0], 2, NULL, 0); + count2 = MultiByteToWideChar(936, flags[i], (char*)&buf[0], 2, wbuf, count); + + ok(count == 1, "%04x: returned %d (expected 1)\n", flags[i], count); + ok(count2 == 1, "%04x: returned %d (expected 1)\n", flags[i], count2); + ok(wbuf[0] == 0x770b, "%04x: returned %04x (expected 770b)\n", flags[i], wbuf[0]); + ok(wbuf[1] == 0xffff, "%04x: returned %04x (expected ffff)\n", flags[i], wbuf[1]); + } + + for (i = 0; i < sizeof(flags)/sizeof(DWORD); ++i) + { + wbuf[0] = 0xffff; + wbuf[1] = 0xffff; + count = MultiByteToWideChar(936, flags[i], (char*)&buf[0], 3, NULL, 0); + SetLastError( 0xdeadbeef ); + count2 = MultiByteToWideChar(936, flags[i], (char*)&buf[0], 3, wbuf, count); + + if (flags[i] & MB_ERR_INVALID_CHARS) + { + ok(count == 0, "%04x: returned %d (expected 0)\n", flags[i], count); + ok(count2 == 0, "%04x: returned %d (expected 0)\n", flags[i], count2); + ok(GetLastError() == ERROR_NO_UNICODE_TRANSLATION, "%04x: returned %d (expected %d)\n", + flags[i], GetLastError(), ERROR_NO_UNICODE_TRANSLATION); + } + else + { + todo_wine ok(count == 2, "%04x: returned %d (expected 2)\n", flags[i], count); + todo_wine ok(count2 == 2, "%04x: returned %d (expected 2)\n", flags[i], count2); + ok(wbuf[0] == 0x770b, "%04x: returned %04x (expected 770b)\n", flags[i], wbuf[0]); + todo_wine ok(wbuf[1] == 0x003f || broken(wbuf[1] == 0)/*windows xp*/, + "%04x: wrong wide char: %04x\n", flags[i], wbuf[1]); + } + } +} + START_TEST(codepage) { BOOL bUsedDefaultChar; @@ -1156,4 +1214,6 @@ START_TEST(codepage) test_undefined_byte_char(); test_threadcp(); + + test_dbcs_to_widechar(); }

1 0

Nikolay Sivov : dwrite: Improve error handling in ConvertFontToLOGFONT() ( Coverity).
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

Module: wine Branch: master Commit: 15485f538da86264ec1148543174eb480cd8950d URL: http://source.winehq.org/git/wine.git/?a=commit;h=15485f538da86264ec1148543… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Feb 8 12:31:46 2016 +0300 dwrite: Improve error handling in ConvertFontToLOGFONT() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 794ebee..dcc2f7a 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -711,11 +711,11 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, if (FAILED(hr) || !exists) return hr; - IDWriteLocalizedStrings_FindLocaleName(name, enusW, &index, &exists); - IDWriteLocalizedStrings_GetString(name, index, logfont->lfFaceName, sizeof(logfont->lfFaceName)/sizeof(WCHAR)); + hr = IDWriteLocalizedStrings_FindLocaleName(name, enusW, &index, &exists); + if (hr == S_OK) + hr = IDWriteLocalizedStrings_GetString(name, index, logfont->lfFaceName, sizeof(logfont->lfFaceName)/sizeof(WCHAR)); IDWriteLocalizedStrings_Release(name); - - return S_OK; + return hr; } static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *iface,

1 0

Nikolay Sivov : dwrite: Implement color glyph run decomposition.
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

Module: wine Branch: master Commit: 8a4db9fd90db755fe1d3473e185d19e91de476f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4db9fd90db755fe1d3473e1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Feb 8 12:31:35 2016 +0300 dwrite: Implement color glyph run decomposition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 13 +++ dlls/dwrite/font.c | 249 ++++++++++++++++++++++++++++++++++++++++--- dlls/dwrite/opentype.c | 84 +++++++++++++++ dlls/dwrite/tests/font.c | 5 +- 4 files changed, 334 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a4db9fd90db755fe1d34…

1 0

Andrew Eikum : configure: Be more helpful for users with mis-configured glib-2.0.
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

Module: wine Branch: master Commit: 049412a48c9ad10d571ae0d102a3659a2948406c URL: http://source.winehq.org/git/wine.git/?a=commit;h=049412a48c9ad10d571ae0d10… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 5 13:32:33 2016 -0600 configure: Be more helpful for users with mis-configured glib-2.0. glib-2.0 ships different headers for x86 and x86_64, but pkgconfig doesn't support returning different headers for a particular architecture. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 +++- configure.ac | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 27373d1d..98ad5f0 100755 --- a/configure +++ b/configure @@ -12697,6 +12697,8 @@ fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + ac_glib2_broken=yes + as_fn_append wine_notices "|glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built." fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -12707,7 +12709,7 @@ test -z "$GSTREAMER_CFLAGS" || GSTREAMER_CFLAGS=`echo " $GSTREAMER_CFLAGS" | sed test -z "$GSTREAMER_LIBS" || GSTREAMER_LIBS=`echo " $GSTREAMER_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi -if test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes; then : +if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ; then : case "x$with_gstreamer" in x) as_fn_append wine_notices "|gstreamer-1.0 base plugins ${notice_platform}development files not found, gstreamer support disabled" ;; xno) ;; diff --git a/configure.ac b/configure.ac index 59fc4fa..b5fc9d1 100644 --- a/configure.ac +++ b/configure.ac @@ -1478,9 +1478,11 @@ then [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], [AC_MSG_RESULT([yes]) AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])], - [AC_MSG_RESULT([no])])])]) + [AC_MSG_RESULT([no]) + ac_glib2_broken=yes + WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])]) fi -WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes], +WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ], [gstreamer-1.0 base plugins ${notice_platform}development files not found, gstreamer support disabled]) test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no}

1 0

Francois Gouget : shell32/tests: Move a test_argify() check so it is run even if we could not create associations.
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

Module: wine Branch: master Commit: c1636cd27929a33e7de960902db53ff967a74dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1636cd27929a33e7de960902… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 8 05:26:18 2016 +0100 shell32/tests: Move a test_argify() check so it is run even if we could not create associations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 8e9325f..3cf80b6 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1538,6 +1538,18 @@ static void test_argify(void) const char* cmd; unsigned i, count; + /* Test with a long parameter */ + for (rc = 0; rc < MAX_PATH; rc++) + fileA[rc] = 'a' + rc % 26; + fileA[MAX_PATH-1] = '\0'; + sprintf(params, "shlexec \"%s\" %s", child_file, fileA); + + /* We need NOZONECHECKS on Win2003 to block a dialog */ + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, NULL, NULL); + okShell(rc > 32, "failed: rc=%lu\n", rc); + okChildInt("argcA", 4); + okChildPath("argvA3", fileA); + if (skip_shlexec_tests) { skip("No argify tests due to lack of .shlexec association\n"); @@ -1602,18 +1614,6 @@ static void test_argify(void) has_cl2a = test_one_cmdline(&(test->cmd)); test++; } - - /* Test with a long parameter */ - for (rc = 0; rc < MAX_PATH; rc++) - fileA[rc] = 'a' + rc % 26; - fileA[MAX_PATH-1] = '\0'; - sprintf(params, "shlexec \"%s\" %s", child_file, fileA); - - /* We need NOZONECHECKS on Win2003 to block a dialog */ - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, NULL, NULL); - okShell(rc > 32, "failed: rc=%lu\n", rc); - okChildInt("argcA", 4); - okChildPath("argvA3", fileA); } static void test_filename(void)

1 0

Józef Kucia : wined3d: Move internal format queries to separate function.
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

Module: wine Branch: master Commit: 6fa62b26672e110ecdbde898a4388fe1d97d21a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fa62b26672e110ecdbde898a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 8 00:04:36 2016 +0100 wined3d: Move internal format queries to separate function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 191 +++++++++++++++++++++++++++------------------------ 1 file changed, 100 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6fa62b26672e110ecdbde…

1 0

Charles Davis : icacls: New stub program.
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

Module: wine Branch: master Commit: 48737f0e68709f55577fb3486f7da18688927563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48737f0e68709f55577fb3486… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 8 02:31:15 2016 -0700 icacls: New stub program. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/icacls/Makefile.in | 5 +++++ programs/icacls/icacls_main.c | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+) diff --git a/configure b/configure index 85d85a8..4eb195a 100755 --- a/configure +++ b/configure @@ -1446,6 +1446,7 @@ enable_extrac32 enable_findstr enable_hh enable_hostname +enable_icacls enable_icinfo enable_iexplore enable_ipconfig @@ -18109,6 +18110,7 @@ wine_fn_config_program extrac32 enable_extrac32 install wine_fn_config_program findstr enable_findstr install wine_fn_config_program hh enable_hh install wine_fn_config_program hostname enable_hostname install,po +wine_fn_config_program icacls enable_icacls install wine_fn_config_program icinfo enable_icinfo install wine_fn_config_program iexplore enable_iexplore install wine_fn_config_program ipconfig enable_ipconfig install,po diff --git a/configure.ac b/configure.ac index c4bd6a0..76fb87d 100644 --- a/configure.ac +++ b/configure.ac @@ -3452,6 +3452,7 @@ WINE_CONFIG_PROGRAM(extrac32,,[install]) WINE_CONFIG_PROGRAM(findstr,,[install]) WINE_CONFIG_PROGRAM(hh,,[install]) WINE_CONFIG_PROGRAM(hostname,,[install,po]) +WINE_CONFIG_PROGRAM(icacls,,[install]) WINE_CONFIG_PROGRAM(icinfo,,[install]) WINE_CONFIG_PROGRAM(iexplore,,[install]) WINE_CONFIG_PROGRAM(ipconfig,,[install,po]) diff --git a/programs/icacls/Makefile.in b/programs/icacls/Makefile.in new file mode 100644 index 0000000..af919a5 --- /dev/null +++ b/programs/icacls/Makefile.in @@ -0,0 +1,5 @@ +MODULE = icacls.exe +APPMODE = -mconsole + +C_SRCS = \ + icacls_main.c diff --git a/programs/icacls/icacls_main.c b/programs/icacls/icacls_main.c new file mode 100644 index 0000000..8f93a97 --- /dev/null +++ b/programs/icacls/icacls_main.c @@ -0,0 +1,39 @@ +/* + * Integrity/ACL viewer/editor stub + * Copyright (C) 2009 Andrey Turkin + * Copyright (C) 2016 Charles Davis + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdlib.h> +#include <stdio.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(icacls); + +int main(int argc, char** argv) +{ + int i; + + WINE_FIXME("This is dummy icacls, not performing ACL manipulations\n"); + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_a(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Nikolay Sivov : dwrite: Implement IsColorFont().
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

Module: wine Branch: master Commit: 2e927af3284dca0258c59772ab7eabbb8175d8fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e927af3284dca0258c59772a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Feb 8 12:31:26 2016 +0300 dwrite: Implement IsColorFont(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 29 ++++++++++++++++++++--------- dlls/dwrite/tests/font.c | 13 +++---------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 18e4e0e..a7d28f9 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_VDMX_TAG DWRITE_MAKE_OPENTYPE_TAG('V','D','M','X') #define MS_GASP_TAG DWRITE_MAKE_OPENTYPE_TAG('g','a','s','p') #define MS_CPAL_TAG DWRITE_MAKE_OPENTYPE_TAG('C','P','A','L') +#define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') static const IID IID_issystemcollection = {0x14d88047,0x331f,0x4cd3,{0xbc,0xa8,0x3e,0x67,0x99,0xaf,0x34,0x75}}; @@ -209,6 +210,7 @@ struct dwrite_fontface { struct dwrite_fonttable vdmx; struct dwrite_fonttable gasp; struct dwrite_fonttable cpal; + struct dwrite_fonttable colr; DWRITE_GLYPH_METRICS *glyphs[GLYPH_MAX/GLYPH_BLOCK_SIZE]; }; @@ -292,7 +294,7 @@ static HRESULT set_cached_glyph_metrics(struct dwrite_fontface *fontface, UINT16 return S_OK; } -static void* get_fontface_table(struct dwrite_fontface *fontface, UINT32 tag, struct dwrite_fonttable *table) +static void* get_fontface_table(IDWriteFontFace2 *fontface, UINT32 tag, struct dwrite_fonttable *table) { HRESULT hr; @@ -300,8 +302,8 @@ static void* get_fontface_table(struct dwrite_fontface *fontface, UINT32 tag, st return table->data; table->exists = FALSE; - hr = IDWriteFontFace2_TryGetFontTable(&fontface->IDWriteFontFace2_iface, tag, (const void**)&table->data, - &table->size, &table->context, &table->exists); + hr = IDWriteFontFace2_TryGetFontTable(fontface, tag, (const void**)&table->data, &table->size, &table->context, + &table->exists); if (FAILED(hr) || !table->exists) { WARN("Font does not have a %s table\n", debugstr_tag(tag)); return NULL; @@ -330,24 +332,29 @@ static FLOAT get_font_prop_vec_dotproduct(const struct dwrite_font_propvec *left static inline void* get_fontface_cmap(struct dwrite_fontface *fontface) { - return get_fontface_table(fontface, MS_CMAP_TAG, &fontface->cmap); + return get_fontface_table(&fontface->IDWriteFontFace2_iface, MS_CMAP_TAG, &fontface->cmap); } static inline void* get_fontface_vdmx(struct dwrite_fontface *fontface) { - return get_fontface_table(fontface, MS_VDMX_TAG, &fontface->vdmx); + return get_fontface_table(&fontface->IDWriteFontFace2_iface, MS_VDMX_TAG, &fontface->vdmx); } static inline void* get_fontface_gasp(struct dwrite_fontface *fontface, UINT32 *size) { - void *ptr = get_fontface_table(fontface, MS_GASP_TAG, &fontface->gasp); + void *ptr = get_fontface_table(&fontface->IDWriteFontFace2_iface, MS_GASP_TAG, &fontface->gasp); *size = fontface->gasp.size; return ptr; } static inline void* get_fontface_cpal(struct dwrite_fontface *fontface) { - return get_fontface_table(fontface, MS_CPAL_TAG, &fontface->cpal); + return get_fontface_table(&fontface->IDWriteFontFace2_iface, MS_CPAL_TAG, &fontface->cpal); +} + +static inline void* get_fontface_colr(struct dwrite_fontface *fontface) +{ + return get_fontface_table(&fontface->IDWriteFontFace2_iface, MS_COLR_TAG, &fontface->colr); } static void release_font_data(struct dwrite_font_data *data) @@ -429,6 +436,8 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace2 *iface) IDWriteFontFace2_ReleaseFontTable(iface, This->gasp.context); if (This->cpal.context) IDWriteFontFace2_ReleaseFontTable(iface, This->cpal.context); + if (This->colr.context) + IDWriteFontFace2_ReleaseFontTable(iface, This->colr.context); for (i = 0; i < This->file_count; i++) { if (This->streams[i]) IDWriteFontFileStream_Release(This->streams[i]); @@ -926,8 +935,8 @@ static BOOL WINAPI dwritefontface1_HasVerticalGlyphVariants(IDWriteFontFace2 *if static BOOL WINAPI dwritefontface2_IsColorFont(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p): stub\n", This); - return FALSE; + TRACE("(%p)\n", This); + return get_fontface_cpal(This) && get_fontface_colr(This); } static UINT32 WINAPI dwritefontface2_GetColorPaletteCount(IDWriteFontFace2 *iface) @@ -3602,10 +3611,12 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW memset(&fontface->vdmx, 0, sizeof(fontface->vdmx)); memset(&fontface->gasp, 0, sizeof(fontface->gasp)); memset(&fontface->cpal, 0, sizeof(fontface->cpal)); + memset(&fontface->colr, 0, sizeof(fontface->colr)); fontface->cmap.exists = TRUE; fontface->vdmx.exists = TRUE; fontface->gasp.exists = TRUE; fontface->cpal.exists = TRUE; + fontface->colr.exists = TRUE; fontface->index = index; fontface->simulations = simulations; memset(fontface->glyphs, 0, sizeof(fontface->glyphs)); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 76d76f7..a396723 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5201,12 +5201,9 @@ static void test_TranslateColorGlyphRun(void) layers = NULL; hr = IDWriteFactory2_TranslateColorGlyphRun(factory2, 0.0, 0.0, &run, NULL, DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(layers != NULL, "got %p\n", layers); -} -if (layers) { while (1) { hasrun = FALSE; hr = IDWriteColorGlyphRunEnumerator_MoveNext(layers, &hasrun); @@ -5223,7 +5220,7 @@ todo_wine ok(hr == E_NOT_VALID_STATE, "got 0x%08x\n", hr); IDWriteColorGlyphRunEnumerator_Release(layers); -} + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -5239,9 +5236,7 @@ todo_wine hr = IDWriteFactory2_TranslateColorGlyphRun(factory2, 0.0f, 0.0f, &run, NULL, DWRITE_MEASURING_MODE_NATURAL, NULL, IDWriteFontFace2_GetColorPaletteCount(fontface2) - 1, &layers); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (layers) IDWriteColorGlyphRunEnumerator_Release(layers); /* color font, glyph without color info */ @@ -5252,9 +5247,10 @@ if (layers) layers = (void*)0xdeadbeef; hr = IDWriteFactory2_TranslateColorGlyphRun(factory2, 0.0, 0.0, &run, NULL, DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); +todo_wine { ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); ok(layers == NULL, "got %p\n", layers); - +} /* one glyph with, one without */ codepoints[0] = 'A'; codepoints[1] = 0x26c4; @@ -5267,11 +5263,8 @@ if (layers) layers = NULL; hr = IDWriteFactory2_TranslateColorGlyphRun(factory2, 0.0, 0.0, &run, NULL, DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(layers != NULL, "got %p\n", layers); -} -if (layers) IDWriteColorGlyphRunEnumerator_Release(layers); IDWriteFontFace2_Release(fontface2);

1 0

Nikolay Sivov : dwrite: Accept platform 0 name records if there's nothing, else.
by Alexandre Julliard Feb. 8, 2016

Feb. 8, 2016

Module: wine Branch: master Commit: ec3c7d9d3a98dc131c3999778ef2aa9049697ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3c7d9d3a98dc131c3999778… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Feb 8 12:31:07 2016 +0300 dwrite: Accept platform 0 name records if there's nothing, else. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 111 +++++++++++++++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 46 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 99d24ea..0d3482d 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1281,20 +1281,69 @@ static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT la strcpyW(locale, enusW); } break; + case OPENTYPE_PLATFORM_UNICODE: + strcpyW(locale, enusW); + break; default: FIXME("unknown platform %d\n", platform); } } +static BOOL opentype_decode_namerecord(const TT_NAME_V0 *header, BYTE *storage_area, USHORT recid, IDWriteLocalizedStrings *strings) +{ + const TT_NameRecord *record = &header->nameRecord[recid]; + USHORT lang_id, length, offset, encoding, platform; + BOOL ret = FALSE; + + platform = GET_BE_WORD(record->platformID); + lang_id = GET_BE_WORD(record->languageID); + length = GET_BE_WORD(record->length); + offset = GET_BE_WORD(record->offset); + encoding = GET_BE_WORD(record->encodingID); + + if (lang_id < 0x8000) { + WCHAR locale[LOCALE_NAME_MAX_LENGTH]; + WCHAR *name_string; + UINT codepage; + + codepage = get_name_record_codepage(platform, encoding); + get_name_record_locale(platform, lang_id, locale, sizeof(locale)/sizeof(WCHAR)); + + if (codepage) { + DWORD len = MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, NULL, 0); + name_string = heap_alloc(sizeof(WCHAR) * (len+1)); + MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, name_string, len); + name_string[len] = 0; + } + else { + int i; + + length /= sizeof(WCHAR); + name_string = heap_strdupnW((LPWSTR)(storage_area + offset), length); + for (i = 0; i < length; i++) + name_string[i] = GET_BE_WORD(name_string[i]); + } + + TRACE("string %s for locale %s found\n", debugstr_w(name_string), debugstr_w(locale)); + add_localizedstring(strings, locale, name_string); + heap_free(name_string); + ret = TRUE; + } + else + FIXME("handle NAME format 1\n"); + + return ret; +} + static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_STRING_ID id, IDWriteLocalizedStrings **strings) { const TT_NAME_V0 *header; BYTE *storage_area = 0; USHORT count = 0; + int i, candidate; WORD format; BOOL exists; HRESULT hr; - int i; if (!table_data) return E_FAIL; @@ -1313,20 +1362,18 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP FIXME("unsupported NAME format %d\n", format); } - storage_area = (LPBYTE)table_data + GET_BE_WORD(header->stringOffset); count = GET_BE_WORD(header->count); exists = FALSE; + candidate = -1; for (i = 0; i < count; i++) { const TT_NameRecord *record = &header->nameRecord[i]; - USHORT lang_id, length, offset, encoding, platform; + USHORT platform; if (GET_BE_WORD(record->nameID) != id) continue; - exists = TRUE; - /* Right now only accept unicode and windows encoded fonts */ platform = GET_BE_WORD(record->platformID); if (platform != OPENTYPE_PLATFORM_UNICODE && @@ -1337,53 +1384,25 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP continue; } - /* Skip such entries for now, as it's not clear which locale is implied when - unicode platform is used. Also fonts tend to duplicate those strings as - WIN platform entries. */ - if (platform == OPENTYPE_PLATFORM_UNICODE) + /* Skip such entries for now, fonts tend to duplicate those strings as + WIN platform entries. If font does not have WIN or MAC entry for this id, we will + use this Unicode platform entry while assuming en-US locale. */ + if (platform == OPENTYPE_PLATFORM_UNICODE) { + candidate = i; continue; - - lang_id = GET_BE_WORD(record->languageID); - length = GET_BE_WORD(record->length); - offset = GET_BE_WORD(record->offset); - encoding = GET_BE_WORD(record->encodingID); - - if (lang_id < 0x8000) { - WCHAR locale[LOCALE_NAME_MAX_LENGTH]; - WCHAR *name_string; - UINT codepage; - - codepage = get_name_record_codepage(platform, encoding); - get_name_record_locale(platform, lang_id, locale, sizeof(locale)/sizeof(WCHAR)); - - if (codepage) { - DWORD len = MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, NULL, 0); - name_string = heap_alloc(sizeof(WCHAR) * (len+1)); - MultiByteToWideChar(codepage, 0, (LPSTR)(storage_area + offset), length, name_string, len); - name_string[len] = 0; - } - else { - int i; - - length /= sizeof(WCHAR); - name_string = heap_strdupnW((LPWSTR)(storage_area + offset), length); - for (i = 0; i < length; i++) - name_string[i] = GET_BE_WORD(name_string[i]); - } - - TRACE("string %s for locale %s found\n", debugstr_w(name_string), debugstr_w(locale)); - add_localizedstring(*strings, locale, name_string); - heap_free(name_string); } - else { - FIXME("handle NAME format 1\n"); + + if (!(exists = opentype_decode_namerecord(header, storage_area, i, *strings))) continue; - } } if (!exists) { - IDWriteLocalizedStrings_Release(*strings); - *strings = NULL; + if (candidate != -1) + exists = opentype_decode_namerecord(header, storage_area, candidate, *strings); + else { + IDWriteLocalizedStrings_Release(*strings); + *strings = NULL; + } } return exists ? S_OK : E_FAIL;

1 0