August 2017 - Wine-Commits - list.winehq.org

Hugh McMaster : reg: Handle unknown registry data types in the state machine.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

Module: wine Branch: master Commit: db98cc4ced9772b59b0a17124b042bbf870030f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db98cc4ced9772b59b0a17124… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 18 09:30:59 2017 +0000 reg: Handle unknown registry data types in the state machine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index efb09e6..544a085 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -75,6 +75,7 @@ enum parser_state HEX_DATA, /* parsing REG_BINARY, REG_NONE, REG_EXPAND_SZ or REG_MULTI_SZ data */ EOL_BACKSLASH, /* preparing to parse multiple lines of hex data */ HEX_MULTILINE, /* parsing multiple lines of hex data */ + UNKNOWN_DATA, /* parsing an unhandled or invalid data type */ SET_VALUE, /* adding a value to the registry */ NB_PARSER_STATES }; @@ -112,6 +113,7 @@ static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos); static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos); static WCHAR *eol_backslash_state(struct parser *parser, WCHAR *pos); static WCHAR *hex_multiline_state(struct parser *parser, WCHAR *pos); +static WCHAR *unknown_data_state(struct parser *parser, WCHAR *pos); static WCHAR *set_value_state(struct parser *parser, WCHAR *pos); static const parser_state_func parser_funcs[NB_PARSER_STATES] = @@ -129,6 +131,7 @@ static const parser_state_func parser_funcs[NB_PARSER_STATES] = hex_data_state, /* HEX_DATA */ eol_backslash_state, /* EOL_BACKSLASH */ hex_multiline_state, /* HEX_MULTILINE */ + unknown_data_state, /* UNKNOWN_DATA */ set_value_state, /* SET_VALUE */ }; @@ -675,7 +678,7 @@ static WCHAR *data_type_state(struct parser *parser, WCHAR *pos) set_state(parser, HEX_DATA); break; default: - set_state(parser, LINE_START); + set_state(parser, UNKNOWN_DATA); } return line; @@ -794,6 +797,15 @@ invalid: return line; } +/* handler for parser UNKNOWN_DATA state */ +static WCHAR *unknown_data_state(struct parser *parser, WCHAR *pos) +{ + FIXME("Unknown registry data type [0x%x]\n", parser->data_type); + + set_state(parser, LINE_START); + return pos; +} + /* handler for parser SET_VALUE state */ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) {

1 0

Hugh McMaster : reg: Add initial support for the import operation.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

1 0

Hugh McMaster : reg: Compile with msvcrt.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

Module: wine Branch: master Commit: c6c95a026b5df7ba5f1bf57a1dda384daa9e7b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6c95a026b5df7ba5f1bf57a1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 18 09:29:35 2017 +0000 reg: Compile with msvcrt. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/Makefile.in | 2 +- programs/reg/reg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index c255171..7a70a33 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -1,5 +1,5 @@ MODULE = reg.exe -APPMODE = -mconsole -municode +APPMODE = -mconsole -municode -mno-cygwin IMPORTS = advapi32 DELAYIMPORTS = user32 diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 72f2b58..cb3bd4e 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -284,8 +284,8 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW { LPWSTR rest; unsigned long val; - val = strtoulW(data, &rest, (tolowerW(data[1]) == 'x') ? 16 : 10); - if (*rest || data[0] == '-' || (val == ~0u && errno == ERANGE) || val > ~0u) { + val = wcstoul(data, &rest, (tolowerW(data[1]) == 'x') ? 16 : 10); + if (*rest || data[0] == '-' || (val == ~0u && errno == ERANGE)) { output_message(STRING_MISSING_INTEGER); break; }

1 0

Nikolay Sivov : dwrite: Added a helper to check for supported characters.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

Module: wine Branch: master Commit: b93d9d93e78312fc997995cbdbce514682710b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93d9d93e78312fc997995cbd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 15 14:40:25 2017 +0300 dwrite: Added a helper to check for supported characters. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index eadf92c..a189f74 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1192,7 +1192,7 @@ static BOOL WINAPI dwritefontface3_HasCharacter(IDWriteFontFace4 *iface, UINT32 struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); UINT16 index; - TRACE("(%p)->(0x%08x)\n", This, ch); + TRACE("(%p)->(%#x)\n", This, ch); index = 0; if (FAILED(fontface_get_glyphs(This, &ch, 1, &index))) @@ -1566,31 +1566,37 @@ static void WINAPI dwritefont_GetMetrics(IDWriteFont3 *iface, DWRITE_FONT_METRIC memcpy(metrics, &This->data->metrics, sizeof(*metrics)); } -static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont3 *iface, UINT32 value, BOOL *exists) +static HRESULT font_has_character(struct dwrite_font *font, UINT32 ch, BOOL *exists) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); IDWriteFontFace4 *fontface; UINT16 index; HRESULT hr; - TRACE("(%p)->(0x%08x %p)\n", This, value, exists); - *exists = FALSE; - hr = get_fontface_from_font(This, &fontface); + hr = get_fontface_from_font(font, &fontface); if (FAILED(hr)) return hr; index = 0; - hr = IDWriteFontFace4_GetGlyphIndices(fontface, &value, 1, &index); + hr = IDWriteFontFace4_GetGlyphIndices(fontface, &ch, 1, &index); + IDWriteFontFace4_Release(fontface); if (FAILED(hr)) return hr; - IDWriteFontFace4_Release(fontface); *exists = index != 0; return S_OK; } +static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont3 *iface, UINT32 ch, BOOL *exists) +{ + struct dwrite_font *This = impl_from_IDWriteFont3(iface); + + TRACE("(%p)->(%#x %p)\n", This, ch, exists); + + return font_has_character(This, ch, exists); +} + static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont3 *iface, IDWriteFontFace **fontface) { struct dwrite_font *This = impl_from_IDWriteFont3(iface); @@ -1694,13 +1700,11 @@ static HRESULT WINAPI dwritefont3_GetFontFaceReference(IDWriteFont3 *iface, IDWr static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) { struct dwrite_font *This = impl_from_IDWriteFont3(iface); - HRESULT hr; BOOL ret; - TRACE("(%p)->(0x%x)\n", This, ch); + TRACE("(%p)->(%#x)\n", This, ch); - hr = IDWriteFont_HasCharacter((IDWriteFont*)iface, ch, &ret); - return hr == S_OK && ret; + return font_has_character(This, ch, &ret) == S_OK && ret; } static DWRITE_LOCALITY WINAPI dwritefont3_GetLocality(IDWriteFont3 *iface)

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

Module: wine Branch: master Commit: 2c438c7ed8669d95e7dd2341fc341a8a50d70437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c438c7ed8669d95e7dd2341f… Author: Mingcong Bai <jeffbai(a)aosc.xyz> Date: Sat Aug 19 14:38:15 2017 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 396 +++++++++++++++++++----------------------------------------- 1 file changed, 123 insertions(+), 273 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c438c7ed8669d95e7dd2…

1 0

Hugh McMaster : reg: Rename reg.h to resource.h.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

Module: wine Branch: master Commit: f2fbbec27db92291fd4f6344a65a2d0c2d64a658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2fbbec27db92291fd4f6344a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 18 09:29:44 2017 +0000 reg: Rename reg.h to resource.h. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/reg.rc | 2 +- programs/reg/{reg.h => resource.h} | 0 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index cb3bd4e..595dcab 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <wine/unicode.h> #include <wine/debug.h> -#include "reg.h" +#include "resource.h" #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index ae69cb7..2e0da68 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "reg.h" +#include "resource.h" #pragma makedep po diff --git a/programs/reg/reg.h b/programs/reg/resource.h similarity index 100% rename from programs/reg/reg.h rename to programs/reg/resource.h

1 0

Hugh McMaster : regedit: Return a valid pointer in the QUOTED_VALUE_NAME state if REGPROC_unescape_string () returns FALSE.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

Module: wine Branch: master Commit: 3f0ebaeebb524f87a0c154b1e6ffa6e9242b0b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0ebaeebb524f87a0c154b1e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Aug 18 09:14:14 2017 +0000 regedit: Return a valid pointer in the QUOTED_VALUE_NAME state if REGPROC_unescape_string() returns FALSE. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 3f055b6..58ca5ac 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -748,7 +748,7 @@ static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) invalid: set_state(parser, LINE_START); - return p; + return val_name; } /* handler for parser DATA_START state */

1 0

Dmitry Timoshkov : windowscodecs/tests: Add a test for loading PNG grayscale images.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

Module: wine Branch: master Commit: 1dbc9fcb9cf7d4caf87a4eaaeed8c1728fda922c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dbc9fcb9cf7d4caf87a4eaae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 17 13:35:29 2017 -0500 windowscodecs/tests: Add a test for loading PNG grayscale images. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/pngformat.c | 58 +++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 1aeb9bc..d266910 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Dmitry Timoshkov + * Copyright 2012, 2016 Dmitry Timoshkov * Copyright 2012 Hans Leidekker for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -580,6 +580,61 @@ static void test_png_palette(void) IWICBitmapDecoder_Release(decoder); } +/* RGB 24 bpp 1x1 pixel PNG image */ +static const char png_1x1_data[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53,0xde, + 0x00,0x00,0x00,0x0c,'I','D','A','T',0x08,0xd7,0x63,0xf8,0xff,0xff,0x3f,0x00,0x05,0xfe,0x02,0xfe,0xdc,0xcc,0x59,0xe7, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + +static void test_color_formats(void) +{ + static const struct + { + char bit_depth, color_type; + const GUID *format; + } td[] = + { + /* 2 - PNG_COLOR_TYPE_RGB */ + { 8, 2, &GUID_WICPixelFormat24bppBGR }, + /* 0 - PNG_COLOR_TYPE_GRAY */ + { 1, 0, &GUID_WICPixelFormatBlackWhite }, + { 2, 0, &GUID_WICPixelFormat2bppGray }, + { 4, 0, &GUID_WICPixelFormat4bppGray }, + { 8, 0, &GUID_WICPixelFormat8bppGray }, + { 16, 0, &GUID_WICPixelFormat16bppGray }, + }; + char buf[sizeof(png_1x1_data)]; + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + GUID format; + int i; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + memcpy(buf, png_1x1_data, sizeof(png_1x1_data)); + buf[24] = td[i].bit_depth; + buf[25] = td[i].color_type; + + decoder = create_decoder(buf, sizeof(buf)); + ok(decoder != NULL, "Failed to load PNG image data\n"); + if (!decoder) continue; + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, td[i].format), + "expected %s, got %s\n", wine_dbgstr_guid(td[i].format), wine_dbgstr_guid(&format)); + + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); + } +} + START_TEST(pngformat) { HRESULT hr; @@ -592,6 +647,7 @@ START_TEST(pngformat) test_color_contexts(); test_png_palette(); + test_color_formats(); IWICImagingFactory_Release(factory); CoUninitialize();

1 0

Nikolay Sivov : dwrite: Simplify GetFontSignature().
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

Module: wine Branch: master Commit: eb212c1939b77ba12fbb68b05dfbe448c0343780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb212c1939b77ba12fbb68b05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 15 14:40:26 2017 +0300 dwrite: Simplify GetFontSignature(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 4 +++- dlls/dwrite/font.c | 19 +++++++++++++++++++ dlls/dwrite/gdiinterop.c | 33 ++------------------------------- dlls/dwrite/opentype.c | 44 ++++++++++++++++---------------------------- 4 files changed, 40 insertions(+), 60 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index c65166d..a0632b7 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -202,6 +202,8 @@ extern void factory_detach_gdiinterop(IDWriteFactory5*,IDWriteGdiInterop1*) DECL extern struct fontfacecached *factory_cache_fontface(IDWriteFactory5*,struct list*,IDWriteFontFace4*) DECLSPEC_HIDDEN; extern void get_logfont_from_font(IDWriteFont*,LOGFONTW*) DECLSPEC_HIDDEN; extern void get_logfont_from_fontface(IDWriteFontFace*,LOGFONTW*) DECLSPEC_HIDDEN; +extern HRESULT get_fontsig_from_font(IDWriteFont*,FONTSIGNATURE*) DECLSPEC_HIDDEN; +extern HRESULT get_fontsig_from_fontface(IDWriteFontFace*,FONTSIGNATURE*) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteFactory5*,IDWriteGdiInterop1**) DECLSPEC_HIDDEN; extern void fontface_detach_from_cache(IDWriteFontFace4*) DECLSPEC_HIDDEN; extern void factory_lock(IDWriteFactory5*) DECLSPEC_HIDDEN; @@ -213,6 +215,7 @@ struct dwrite_font_props { DWRITE_FONT_STRETCH stretch; DWRITE_FONT_WEIGHT weight; DWRITE_PANOSE panose; + FONTSIGNATURE fontsig; LOGFONTW lf; }; @@ -235,7 +238,6 @@ extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HID extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_paletteentrycount(const void*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_cpal_entries(const void*,UINT32,UINT32,UINT32,DWRITE_COLOR_F*) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_font_signature(struct file_stream_desc*,FONTSIGNATURE*) DECLSPEC_HIDDEN; extern BOOL opentype_has_vertical_variants(IDWriteFontFace4*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a189f74..4dfb47f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -76,6 +76,7 @@ struct dwrite_font_data { DWRITE_FONT_STRETCH stretch; DWRITE_FONT_WEIGHT weight; DWRITE_PANOSE panose; + FONTSIGNATURE fontsig; struct dwrite_font_propvec propvec; DWRITE_FONT_METRICS1 metrics; @@ -242,6 +243,7 @@ struct dwrite_fontface { DWRITE_FONT_STRETCH stretch; DWRITE_FONT_WEIGHT weight; DWRITE_PANOSE panose; + FONTSIGNATURE fontsig; UINT32 glyph_image_formats; LOGFONTW lf; @@ -1769,6 +1771,20 @@ void get_logfont_from_fontface(IDWriteFontFace *iface, LOGFONTW *lf) *lf = fontface->lf; } +HRESULT get_fontsig_from_font(IDWriteFont *iface, FONTSIGNATURE *fontsig) +{ + struct dwrite_font *font = unsafe_impl_from_IDWriteFont(iface); + *fontsig = font->data->fontsig; + return S_OK; +} + +HRESULT get_fontsig_from_fontface(IDWriteFontFace *iface, FONTSIGNATURE *fontsig) +{ + struct dwrite_fontface *fontface = unsafe_impl_from_IDWriteFontFace(iface); + *fontsig = fontface->fontsig; + return S_OK; +} + static HRESULT create_font(struct dwrite_fontfamily *family, UINT32 index, IDWriteFont3 **font) { struct dwrite_font *This; @@ -3344,6 +3360,7 @@ static HRESULT init_font_data(const struct fontface_desc *desc, IDWriteLocalized data->stretch = props.stretch; data->weight = props.weight; data->panose = props.panose; + data->fontsig = props.fontsig; data->lf = props.lf; fontstrings_get_en_string(*family_name, familyW, sizeof(familyW)/sizeof(WCHAR)); @@ -4383,6 +4400,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->style = desc->font_data->style; fontface->stretch = desc->font_data->stretch; fontface->panose = desc->font_data->panose; + fontface->fontsig = desc->font_data->fontsig; fontface->lf = desc->font_data->lf; } else { @@ -4399,6 +4417,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->style = data->style; fontface->stretch = data->stretch; fontface->panose = data->panose; + fontface->fontsig = data->fontsig; fontface->lf = data->lf; IDWriteLocalizedStrings_Release(names); diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 22b4ca4..5425b5c 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -838,51 +838,22 @@ static HRESULT WINAPI gdiinterop1_GetFontSignature_(IDWriteGdiInterop1 *iface, I FONTSIGNATURE *fontsig) { struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - struct file_stream_desc stream_desc; - IDWriteFontFileStream *stream; - IDWriteFontFile *file; - UINT32 count; - HRESULT hr; TRACE("(%p)->(%p %p)\n", This, fontface, fontsig); - memset(fontsig, 0, sizeof(*fontsig)); - - count = 1; - hr = IDWriteFontFace_GetFiles(fontface, &count, &file); - hr = get_filestream_from_file(file, &stream); - IDWriteFontFile_Release(file); - if (FAILED(hr)) - return hr; - - stream_desc.stream = stream; - stream_desc.face_type = IDWriteFontFace_GetType(fontface); - stream_desc.face_index = IDWriteFontFace_GetIndex(fontface); - hr = opentype_get_font_signature(&stream_desc, fontsig); - IDWriteFontFileStream_Release(stream); - return hr; + return get_fontsig_from_fontface(fontface, fontsig); } static HRESULT WINAPI gdiinterop1_GetFontSignature(IDWriteGdiInterop1 *iface, IDWriteFont *font, FONTSIGNATURE *fontsig) { struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - IDWriteFontFace *fontface; - HRESULT hr; TRACE("(%p)->(%p %p)\n", This, font, fontsig); if (!font) return E_INVALIDARG; - memset(fontsig, 0, sizeof(*fontsig)); - - hr = IDWriteFont_CreateFontFace(font, &fontface); - if (FAILED(hr)) - return hr; - - hr = IDWriteGdiInterop1_GetFontSignature_(iface, fontface, fontsig); - IDWriteFontFace_Release(fontface); - return hr; + return get_fontsig_from_font(font, fontsig); } static HRESULT WINAPI gdiinterop1_GetMatchingFontsByLOGFONT(IDWriteGdiInterop1 *iface, LOGFONTW const *logfont, diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a66500a..36c34b6 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1317,6 +1317,7 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d props->weight = DWRITE_FONT_WEIGHT_NORMAL; props->style = DWRITE_FONT_STYLE_NORMAL; memset(&props->panose, 0, sizeof(props->panose)); + memset(&props->fontsig, 0, sizeof(props->fontsig)); memset(&props->lf, 0, sizeof(props->lf)); /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ @@ -1343,6 +1344,21 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d props->style = DWRITE_FONT_STYLE_ITALIC; memcpy(&props->panose, &tt_os2->panose, sizeof(props->panose)); + + /* FONTSIGNATURE */ + props->fontsig.fsUsb[0] = GET_BE_DWORD(tt_os2->ulUnicodeRange1); + props->fontsig.fsUsb[1] = GET_BE_DWORD(tt_os2->ulUnicodeRange2); + props->fontsig.fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); + props->fontsig.fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4); + + if (GET_BE_WORD(tt_os2->version) == 0) { + props->fontsig.fsCsb[0] = 0; + props->fontsig.fsCsb[1] = 0; + } + else { + props->fontsig.fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); + props->fontsig.fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + } } else if (tt_head) { USHORT macStyle = GET_BE_WORD(tt_head->macStyle); @@ -1971,34 +1987,6 @@ void opentype_colr_next_glyph(const void *colr, struct dwrite_colorglyph *glyph) glyph->palette_index = GET_BE_WORD(layer->paletteIndex); } -HRESULT opentype_get_font_signature(struct file_stream_desc *stream_desc, FONTSIGNATURE *fontsig) -{ - const TT_OS2_V2 *tt_os2; - void *os2_context; - HRESULT hr; - - hr = opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); - if (tt_os2) { - fontsig->fsUsb[0] = GET_BE_DWORD(tt_os2->ulUnicodeRange1); - fontsig->fsUsb[1] = GET_BE_DWORD(tt_os2->ulUnicodeRange2); - fontsig->fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); - fontsig->fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4); - - if (GET_BE_WORD(tt_os2->version) == 0) { - fontsig->fsCsb[0] = 0; - fontsig->fsCsb[1] = 0; - } - else { - fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); - fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); - } - - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context); - } - - return hr; -} - BOOL opentype_has_vertical_variants(IDWriteFontFace4 *fontface) { const OT_FeatureList *featurelist;

1 0

Nikolay Sivov : dwrite: Protect cached fontface list when accessed from multiple threads.
by Alexandre Julliard Aug. 20, 2017

Aug. 20, 2017

Module: wine Branch: master Commit: fb5079d887036ea35c8aa8dabdbd126c4df52dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5079d887036ea35c8aa8dab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 15 14:40:24 2017 +0300 dwrite: Protect cached fontface list when accessed from multiple threads. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 15 ++++++++--- dlls/dwrite/font.c | 30 +++++++++++++-------- dlls/dwrite/main.c | 63 +++++++++++++++++++++++++++++++------------- 3 files changed, 74 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb5079d887036ea35c8aa…

1 0