January 2020 - Wine-Commits

Jacek Caban : jscript: Always set parser error code on error.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 84179c16f7f8dbec84ac68d215f735f33e62bb1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=84179c16f7f8dbec84ac68d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 23 13:52:22 2020 +0100 jscript: Always set parser error code on error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/lex.c | 8 ++++---- dlls/jscript/parser.y | 24 +++++++++--------------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index de8549eeaf..9a583e3339 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -548,7 +548,7 @@ static int next_token(parser_ctx_t *ctx, unsigned *loc, void *lval) do { if(!skip_spaces(ctx)) { *loc = ctx->ptr - ctx->begin; - return tEOF; + return 0; } }while(skip_comment(ctx) || skip_html_comment(ctx)); *loc = ctx->ptr - ctx->begin; @@ -1118,7 +1118,6 @@ literal_t *parse_regexp(parser_ctx_t *ctx) BOOL in_class = FALSE; DWORD re_len, flags; literal_t *ret; - HRESULT hres; TRACE("\n"); @@ -1147,6 +1146,7 @@ literal_t *parse_regexp(parser_ctx_t *ctx) if(ctx->ptr == ctx->end || *ctx->ptr != '/') { WARN("pre-parsing failed\n"); + ctx->hres = JS_E_SYNTAX; return NULL; } @@ -1156,8 +1156,8 @@ literal_t *parse_regexp(parser_ctx_t *ctx) while(ctx->ptr < ctx->end && iswalnum(*ctx->ptr)) ctx->ptr++; - hres = parse_regexp_flags(flags_ptr, ctx->ptr-flags_ptr, &flags); - if(FAILED(hres)) + ctx->hres = parse_regexp_flags(flags_ptr, ctx->ptr-flags_ptr, &flags); + if(FAILED(ctx->hres)) return NULL; ret = parser_alloc(ctx, sizeof(literal_t)); diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index aa5e27d7c7..72f5786f18 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -30,7 +30,6 @@ static int parser_error(unsigned*,parser_ctx_t*,const char*); static void set_error(parser_ctx_t*,UINT); static BOOL explicit_error(parser_ctx_t*,void*,WCHAR); static BOOL allow_auto_semicolon(parser_ctx_t*); -static void program_parsed(parser_ctx_t*,source_elements_t*); typedef struct _statement_list_t { statement_t *head; @@ -178,7 +177,6 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %token <ival> tAssignOper tEqOper tShiftOper tRelOper %token <literal> tNumericLiteral tBooleanLiteral %token <str> tStringLiteral -%token tEOF %type <source_elements> SourceElements %type <source_elements> FunctionBody @@ -254,12 +252,11 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state /* ECMA-262 3rd Edition 14 */ Program - : SourceElements HtmlComment tEOF - { program_parsed(ctx, $1); } + : SourceElements HtmlComment { ctx->source = $1; } HtmlComment - : tHTMLCOMMENT {} - | /* empty */ {} + : tHTMLCOMMENT + | /* empty */ /* ECMA-262 3rd Edition 14 */ SourceElements @@ -783,6 +780,7 @@ ObjectLiteral { if(ctx->script->version < 2) { WARN("Trailing comma in object literal is illegal in legacy mode.\n"); + ctx->hres = JS_E_SYNTAX; YYABORT; } $$ = new_prop_and_value_expression(ctx, $2); @@ -826,6 +824,7 @@ IdentifierName if(ctx->script->version < SCRIPTLANGUAGEVERSION_ES5) { WARN("%s keyword used as an identifier in legacy mode.\n", debugstr_w($1)); + ctx->hres = JS_E_SYNTAX; YYABORT; } $$ = $1; @@ -882,7 +881,7 @@ BooleanLiteral semicolon_opt : ';' - | error { if(!allow_auto_semicolon(ctx)) {YYABORT;} } + | error { if(!allow_auto_semicolon(ctx)) {YYABORT;} else { ctx->hres = S_OK; } } left_bracket : '(' @@ -1459,6 +1458,9 @@ static expression_t *new_call_expression(parser_ctx_t *ctx, expression_t *expres static int parser_error(unsigned *loc, parser_ctx_t *ctx, const char *str) { + if(ctx->hres == S_OK) + ctx->hres = JS_E_SYNTAX; + WARN("%s: %s\n", debugstr_w(ctx->begin + *loc), str); return 0; } @@ -1548,13 +1550,6 @@ static statement_list_t *statement_list_add(statement_list_t *list, statement_t return list; } -static void program_parsed(parser_ctx_t *ctx, source_elements_t *source) -{ - ctx->source = source; - if(!ctx->lexer_error) - ctx->hres = S_OK; -} - void parser_release(parser_ctx_t *ctx) { script_release(ctx->script); @@ -1575,7 +1570,6 @@ HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, const if(!parser_ctx) return E_OUTOFMEMORY; - parser_ctx->hres = JS_E_SYNTAX; parser_ctx->is_html = delimiter && !wcsicmp(delimiter, html_tagW); parser_ctx->begin = parser_ctx->ptr = code;

1 0

Jacek Caban : jscript: Use parser location to calculate function body string.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 0fb086d5736508b1dca3c6433fa67a6df482b8a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fb086d5736508b1dca3c643… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 23 13:52:15 2020 +0100 jscript: Use parser location to calculate function body string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 10 +++++++++- dlls/jscript/lex.c | 16 ++++++++-------- dlls/jscript/parser.h | 2 +- dlls/jscript/parser.y | 30 +++++++++++++----------------- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index a530e87d8e..d8eb3de714 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2245,6 +2245,11 @@ void release_bytecode(bytecode_t *code) static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source) { + size_t len = source ? lstrlenW(source) : 0; + + if(len > INT32_MAX) + return E_OUTOFMEMORY; + compiler->code = heap_alloc_zero(sizeof(bytecode_t)); if(!compiler->code) return E_OUTOFMEMORY; @@ -2252,11 +2257,14 @@ static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source) compiler->code->ref = 1; heap_pool_init(&compiler->code->heap); - compiler->code->source = heap_strdupW(source); + compiler->code->source = heap_alloc((len + 1) * sizeof(WCHAR)); if(!compiler->code->source) { release_bytecode(compiler->code); return E_OUTOFMEMORY; } + if(len) + memcpy(compiler->code->source, source, len * sizeof(WCHAR)); + compiler->code->source[len] = 0; compiler->code->instrs = heap_alloc(64 * sizeof(instr_t)); if(!compiler->code->instrs) { diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 1b34a14a79..de8549eeaf 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -543,12 +543,15 @@ static BOOL parse_numeric_literal(parser_ctx_t *ctx, double *ret) return TRUE; } -static int next_token(parser_ctx_t *ctx, void *lval) +static int next_token(parser_ctx_t *ctx, unsigned *loc, void *lval) { do { - if(!skip_spaces(ctx)) + if(!skip_spaces(ctx)) { + *loc = ctx->ptr - ctx->begin; return tEOF; + } }while(skip_comment(ctx) || skip_html_comment(ctx)); + *loc = ctx->ptr - ctx->begin; if(ctx->implicit_nl_semicolon) { if(ctx->nl) @@ -576,6 +579,7 @@ static int next_token(parser_ctx_t *ctx, void *lval) switch(*ctx->ptr) { case '{': + case '}': case '(': case ')': case '[': @@ -586,10 +590,6 @@ static int next_token(parser_ctx_t *ctx, void *lval) case '?': return *ctx->ptr++; - case '}': - *(const WCHAR**)lval = ctx->ptr++; - return '}'; - case '.': if(ctx->ptr+1 < ctx->end && is_digit(ctx->ptr[1])) { double n; @@ -1099,14 +1099,14 @@ static int cc_token(parser_ctx_t *ctx, void *lval) return tBooleanLiteral; } -int parser_lex(void *lval, parser_ctx_t *ctx) +int parser_lex(void *lval, unsigned *loc, parser_ctx_t *ctx) { int ret; ctx->nl = ctx->ptr == ctx->begin; do { - ret = next_token(ctx, lval); + ret = next_token(ctx, loc, lval); } while(ret == '@' && !(ret = cc_token(ctx, lval))); return ret; diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index bceb5569b4..d180c0551a 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -51,7 +51,7 @@ typedef struct _parser_ctx_t { HRESULT script_parse(script_ctx_t*,struct _compiler_ctx_t*,const WCHAR*,const WCHAR*,BOOL,parser_ctx_t**) DECLSPEC_HIDDEN; void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; -int parser_lex(void*,parser_ctx_t*) DECLSPEC_HIDDEN; +int parser_lex(void*,unsigned*,parser_ctx_t*) DECLSPEC_HIDDEN; static inline void *parser_alloc(parser_ctx_t *ctx, DWORD size) { diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index ca83b6fd15..aa5e27d7c7 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -static int parser_error(parser_ctx_t*,const char*); +static int parser_error(unsigned*,parser_ctx_t*,const char*); static void set_error(parser_ctx_t*,UINT); static BOOL explicit_error(parser_ctx_t*,void*,WCHAR); static BOOL allow_auto_semicolon(parser_ctx_t*); @@ -137,6 +137,9 @@ static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t static source_elements_t *new_source_elements(parser_ctx_t*); static source_elements_t *source_elements_add_statement(source_elements_t*,statement_t*); +#define YYLTYPE unsigned +#define YYLLOC_DEFAULT(Cur, Rhs, N) Cur = YYRHSLOC((Rhs), (N) ? 1 : 0) + %} %lex-param { parser_ctx_t *ctx } @@ -146,7 +149,6 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %union { int ival; - const WCHAR *srcptr; jsstr_t *str; literal_t *literal; struct _argument_list_t *argument_list; @@ -171,8 +173,6 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %token <identifier> kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH %token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ kDCOL -%token <srcptr> '}' - /* tokens */ %token <identifier> tIdentifier %token <ival> tAssignOper tEqOper tShiftOper tRelOper @@ -244,7 +244,6 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <property_definition> PropertyDefinition %type <literal> PropertyName %type <literal> BooleanLiteral -%type <srcptr> KFunction left_bracket %type <ival> AssignOper %type <identifier> IdentifierName ReservedAsIdentifier @@ -270,15 +269,12 @@ SourceElements /* ECMA-262 3rd Edition 13 */ FunctionExpression - : KFunction left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' - { $$ = new_function_expression(ctx, NULL, $3, $6, NULL, $1, $7-$1+1); } - | KFunction tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' - { $$ = new_function_expression(ctx, $2, $4, $7, NULL, $1, $8-$1+1); } - | KFunction tIdentifier kDCOL tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' - { $$ = new_function_expression(ctx, $4, $6, $9, $2, $1, $10-$1+1); } - -KFunction - : kFUNCTION { $$ = ctx->ptr - 8; } + : kFUNCTION left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + { $$ = new_function_expression(ctx, NULL, $3, $6, NULL, ctx->begin + @1, @7 - @1 + 1); } + | kFUNCTION tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + { $$ = new_function_expression(ctx, $2, $4, $7, NULL, ctx->begin + @1, @8 - @1 + 1); } + | kFUNCTION tIdentifier kDCOL tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + { $$ = new_function_expression(ctx, $4, $6, $9, $2, ctx->begin + @1, @10 - @1 + 1); } /* ECMA-262 3rd Edition 13 */ FunctionBody @@ -809,7 +805,7 @@ PropertyDefinition GetterSetterMethod : left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' - { $$ = new_function_expression(ctx, NULL, $2, $5, NULL, $1, $6-$1); } + { $$ = new_function_expression(ctx, NULL, $2, $5, NULL, ctx->begin + @1, @6 - @1 + 1); } /* Ecma-262 3rd Edition 11.1.5 */ PropertyName @@ -889,7 +885,7 @@ semicolon_opt | error { if(!allow_auto_semicolon(ctx)) {YYABORT;} } left_bracket - : '(' { $$ = ctx->ptr; } + : '(' | error { set_error(ctx, JS_E_MISSING_LBRACKET); YYABORT; } right_bracket @@ -1461,7 +1457,7 @@ static expression_t *new_call_expression(parser_ctx_t *ctx, expression_t *expres return &ret->expr; } -static int parser_error(parser_ctx_t *ctx, const char *str) +static int parser_error(unsigned *loc, parser_ctx_t *ctx, const char *str) { return 0; }

1 0

Nikolay Sivov : dwrite: Evaluate IsColorFont() flag at font level.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 15e62caa7a0855aa3d80df8a4ceaeb9a74a837a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15e62caa7a0855aa3d80df8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 23 12:24:14 2020 +0300 dwrite: Evaluate IsColorFont() flag at font level. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 5 +++-- dlls/dwrite/font.c | 22 ++++------------------ dlls/dwrite/opentype.c | 19 ++++++++++++++++++- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 0705d43b1f..cf3f13b1c6 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -187,8 +187,9 @@ enum font_flags { FONT_IS_SYMBOL = 1 << 0, FONT_IS_MONOSPACED = 1 << 1, - FONTFACE_HAS_KERNING_PAIRS = 1 << 2, - FONTFACE_HAS_VERTICAL_VARIANTS = 1 << 3 + FONT_IS_COLORED = 1 << 2, /* CPAL/COLR support */ + FONTFACE_HAS_KERNING_PAIRS = 1 << 3, + FONTFACE_HAS_VERTICAL_VARIANTS = 1 << 4 }; struct dwrite_fontface diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c1c9ce20fa..4e08b2f632 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -418,11 +418,6 @@ static const struct dwrite_fonttable *get_fontface_cpal(struct dwrite_fontface * return &fontface->cpal; } -static const void* get_fontface_colr(struct dwrite_fontface *fontface) -{ - return get_fontface_table(&fontface->IDWriteFontFace5_iface, MS_COLR_TAG, &fontface->colr); -} - static void addref_font_data(struct dwrite_font_data *data) { InterlockedIncrement(&data->ref); @@ -1121,7 +1116,7 @@ static BOOL WINAPI dwritefontface2_IsColorFont(IDWriteFontFace5 *iface) TRACE("%p.\n", iface); - return get_fontface_cpal(fontface) && get_fontface_colr(fontface); + return !!(fontface->flags & FONT_IS_COLORED); } static UINT32 WINAPI dwritefontface2_GetColorPaletteCount(IDWriteFontFace5 *iface) @@ -1774,19 +1769,10 @@ static BOOL WINAPI dwritefont1_IsMonospacedFont(IDWriteFont3 *iface) static BOOL WINAPI dwritefont2_IsColorFont(IDWriteFont3 *iface) { struct dwrite_font *font = impl_from_IDWriteFont3(iface); - IDWriteFontFace5 *fontface; - HRESULT hr; - BOOL ret; TRACE("%p.\n", iface); - hr = get_fontface_from_font(font, &fontface); - if (FAILED(hr)) - return FALSE; - - ret = IDWriteFontFace5_IsColorFont(fontface); - IDWriteFontFace5_Release(fontface); - return ret; + return !!(font->data->flags & FONT_IS_COLORED); } static HRESULT WINAPI dwritefont3_CreateFontFace(IDWriteFont3 *iface, IDWriteFontFace3 **fontface) @@ -4698,7 +4684,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->panose = desc->font_data->panose; fontface->fontsig = desc->font_data->fontsig; fontface->lf = desc->font_data->lf; - fontface->flags |= desc->font_data->flags & (FONT_IS_SYMBOL | FONT_IS_MONOSPACED); + fontface->flags |= desc->font_data->flags & (FONT_IS_SYMBOL | FONT_IS_MONOSPACED | FONT_IS_COLORED); } else { @@ -4718,7 +4704,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->panose = data->panose; fontface->fontsig = data->fontsig; fontface->lf = data->lf; - fontface->flags |= data->flags & (FONT_IS_SYMBOL | FONT_IS_MONOSPACED); + fontface->flags |= data->flags & (FONT_IS_SYMBOL | FONT_IS_MONOSPACED | FONT_IS_COLORED); IDWriteLocalizedStrings_Release(names); release_font_data(data); diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 5f41a5764b..86716f615d 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -39,6 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f') #define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ') #define MS_CFF2_TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F','2') +#define MS_CPAL_TAG DWRITE_MAKE_OPENTYPE_TAG('C','P','A','L') #define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') #define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ') #define MS_SBIX_TAG DWRITE_MAKE_OPENTYPE_TAG('s','b','i','x') @@ -1715,7 +1716,7 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct dwrite_font_props *props) { - struct dwrite_fonttable os2, head; + struct dwrite_fonttable os2, head, colr, cpal; BOOL is_symbol, is_monospaced; const TT_OS2_V2 *tt_os2; const TT_HEAD *tt_head; @@ -1793,6 +1794,7 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d props->lf.lfWeight = props->weight; + /* FONT_IS_SYMBOL */ if (!(is_symbol = props->panose.familyKind == DWRITE_PANOSE_FAMILY_SYMBOL)) { struct dwrite_fonttable cmap; @@ -1824,6 +1826,7 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d if (is_symbol) props->flags |= FONT_IS_SYMBOL; + /* FONT_IS_MONOSPACED */ if (!(is_monospaced = props->panose.text.proportion == DWRITE_PANOSE_PROPORTION_MONOSPACED)) { struct dwrite_fonttable post; @@ -1840,6 +1843,20 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d if (is_monospaced) props->flags |= FONT_IS_MONOSPACED; + /* FONT_IS_COLORED */ + opentype_get_font_table(stream_desc, MS_COLR_TAG, &colr); + if (colr.data) + { + opentype_get_font_table(stream_desc, MS_CPAL_TAG, &cpal); + if (cpal.data) + { + props->flags |= FONT_IS_COLORED; + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, cpal.context); + } + + IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, colr.context); + } + TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style); if (os2.data)

1 0

Jacek Caban : jscript: Store source location in statement_t.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 152bd21d95a38c0bcc59a8d3e306f1e7691dca04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=152bd21d95a38c0bcc59a8d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 23 13:52:32 2020 +0100 jscript: Store source location in statement_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 142 +++++++++++++++++++++++++------------------------- 2 files changed, 73 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=152bd21d95a38c0bcc59…

1 0

Nikolay Sivov : dwrite: Update for newer font string names.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 2296bd73f26608215509fa91e4af499d6f7a613c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2296bd73f26608215509fa91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 23 12:24:15 2020 +0300 dwrite: Update for newer font string names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 86716f615d..db277ae905 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1089,8 +1089,8 @@ enum OPENTYPE_STRING_ID OPENTYPE_STRING_LICENSE_DESCRIPTION, OPENTYPE_STRING_LICENSE_INFO_URL, OPENTYPE_STRING_RESERVED_ID15, - OPENTYPE_STRING_PREFERRED_FAMILY_NAME, - OPENTYPE_STRING_PREFERRED_SUBFAMILY_NAME, + OPENTYPE_STRING_TYPOGRAPHIC_FAMILY_NAME, + OPENTYPE_STRING_TYPOGRAPHIC_SUBFAMILY_NAME, OPENTYPE_STRING_COMPATIBLE_FULLNAME, OPENTYPE_STRING_SAMPLE_TEXT, OPENTYPE_STRING_POSTSCRIPT_CID_NAME, @@ -1113,8 +1113,8 @@ static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_POSTSCRIP OPENTYPE_STRING_LICENSE_INFO_URL, OPENTYPE_STRING_FAMILY_NAME, OPENTYPE_STRING_SUBFAMILY_NAME, - OPENTYPE_STRING_PREFERRED_FAMILY_NAME, - OPENTYPE_STRING_PREFERRED_SUBFAMILY_NAME, + OPENTYPE_STRING_TYPOGRAPHIC_FAMILY_NAME, + OPENTYPE_STRING_TYPOGRAPHIC_SUBFAMILY_NAME, OPENTYPE_STRING_SAMPLE_TEXT, OPENTYPE_STRING_FULL_FONTNAME, OPENTYPE_STRING_POSTSCRIPT_FONTNAME, @@ -2138,7 +2138,7 @@ HRESULT opentype_get_font_familyname(struct file_stream_desc *stream_desc, IDWri hr = E_FAIL; if (FAILED(hr)) - hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_PREFERRED_FAMILY_NAME, names); + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_TYPOGRAPHIC_FAMILY_NAME, names); if (FAILED(hr)) hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_FAMILY_NAME, names); @@ -2175,7 +2175,7 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * hr = E_FAIL; if (FAILED(hr)) - hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_PREFERRED_SUBFAMILY_NAME, names); + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_TYPOGRAPHIC_SUBFAMILY_NAME, names); if (FAILED(hr)) hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_SUBFAMILY_NAME, names);

1 0

Alexandre Julliard : unicode: Remove case mappings that don't round-trip.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 4b5c67ee0b3773b93cb0456a13f2822b7793617d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b5c67ee0b3773b93cb0456a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 23 16:54:05 2020 +0100 unicode: Remove case mappings that don't round-trip. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 20 ++++----- dlls/ntdll/tests/rtlstr.c | 2 - libs/port/casemap.c | 103 +++++++++++++++++-------------------------- loader/l_intl.nls | Bin 6726 -> 6566 bytes tools/make_unicode | 15 +++++++ 5 files changed, 64 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b5c67ee0b3773b93cb0…

1 0

Jeff Smith : gdiplus/tests: Add another GdipGetPathGradientCenterPoint test.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 3a092fb616480bd10948405d50b923ae39bf10e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a092fb616480bd10948405d… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jan 22 11:03:26 2020 -0600 gdiplus/tests: Add another GdipGetPathGradientCenterPoint test. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/brush.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index bb645ffef9..c67ab74708 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1299,6 +1299,7 @@ static void test_pathgradientcenterpoint(void) { static const GpPointF path_points[] = {{0,0}, {3,0}, {0,4}}; GpStatus status; + GpPath* path; GpPathGradient *grad; GpPointF point; @@ -1346,6 +1347,26 @@ static void test_pathgradientcenterpoint(void) status = GdipDeleteBrush((GpBrush*)grad); expect(Ok, status); + + status = GdipCreatePath(FillModeWinding, &path); + expect(Ok, status); + + status = GdipAddPathEllipse(path, 0, 0, 100, 50); + expect(Ok, status); + + status = GdipCreatePathGradientFromPath(path, &grad); + expect(Ok, status); + + status = GdipGetPathGradientCenterPoint(grad, &point); + expect(Ok, status); + todo_wine expectf(700.0/13.0, point.X); + expectf(25.0, point.Y); + + status = GdipDeletePath(path); + expect(Ok, status); + + status = GdipDeleteBrush((GpBrush*)grad); + expect(Ok, status); } static void test_pathgradientpresetblend(void)

1 0

Jacek Caban : makedep: Link importlib object files into module only when it's explicitly imported.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 3ad95e03b810906dce87231fd12aa9a1d8f4aad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ad95e03b810906dce87231f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 21 19:51:30 2020 +0100 makedep: Link importlib object files into module only when it's explicitly imported. To prevent msvcrt linking its own importlib into DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/Makefile.in | 2 +- dlls/dinput8/Makefile.in | 2 +- tools/makedep.c | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index 3b046d61d4..ae65fd4d93 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput.dll IMPORTLIB = dinput -IMPORTS = dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 0ede9f0fb1..5f0dce97ca 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput8.dll IMPORTLIB = dinput8 -IMPORTS = dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) PARENTSRC = ../dinput diff --git a/tools/makedep.c b/tools/makedep.c index 6d1500534d..4cc0e784c7 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2193,6 +2193,9 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra const char *name = get_base_name( imports.str[i] ); const char *lib = NULL; + /* skip module's own importlib, its object files will be linked directly */ + if (make->importlib && !strcmp( make->importlib, imports.str[i] )) continue; + for (j = 0; j < top_makefile->subdirs.count; j++) { const struct makefile *submake = top_makefile->submakes[j]; @@ -3070,7 +3073,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour { if ((source->file->flags & FLAG_C_UNIX) && *dll_ext) strarray_add( &make->unixobj_files, strmake( "%s.o", obj )); - else if (!is_dll_src) + else if (!is_dll_src && (!(source->file->flags & FLAG_C_IMPLIB) || (make->importlib && strarray_exists( &make->imports, make->importlib )))) strarray_add( &make->object_files, strmake( "%s.o", obj )); else strarray_add( &make->clean_files, strmake( "%s.o", obj ));

1 0

Jeff Smith : gdiplus: Calculate centroid of path as default center of path gradient.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: 1802ca5e344ba7d6ffb9805bdc46c23e115fb3f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1802ca5e344ba7d6ffb9805b… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jan 22 11:03:27 2020 -0600 gdiplus: Calculate centroid of path as default center of path gradient. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 16 ++++++++++------ dlls/gdiplus/tests/brush.c | 6 +++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index e321dcaa60..ff0b009559 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -574,7 +574,8 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect* rect static GpStatus create_path_gradient(GpPath *path, ARGB centercolor, GpPathGradient **grad) { - GpRectF bounds; + INT i; + REAL sum_x = 0, sum_y = 0; if(!path || !grad) return InvalidParameter; @@ -582,8 +583,6 @@ static GpStatus create_path_gradient(GpPath *path, ARGB centercolor, GpPathGradi if (path->pathdata.Count < 2) return OutOfMemory; - GdipGetPathWorldBounds(path, &bounds, NULL, NULL); - *grad = heap_alloc_zero(sizeof(GpPathGradient)); if (!*grad) { @@ -613,9 +612,14 @@ static GpStatus create_path_gradient(GpPath *path, ARGB centercolor, GpPathGradi (*grad)->centercolor = centercolor; (*grad)->wrap = WrapModeClamp; (*grad)->gamma = FALSE; - /* FIXME: this should be set to the "centroid" of the path by default */ - (*grad)->center.X = bounds.X + bounds.Width / 2; - (*grad)->center.Y = bounds.Y + bounds.Height / 2; + for (i=0; i<path->pathdata.Count; i++) + { + sum_x += path->pathdata.Points[i].X; + sum_y += path->pathdata.Points[i].Y; + } + (*grad)->center.X = sum_x / path->pathdata.Count; + (*grad)->center.Y = sum_y / path->pathdata.Count; + (*grad)->focus.X = 0.0; (*grad)->focus.Y = 0.0; (*grad)->surroundcolors[0] = 0xffffffff; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index c67ab74708..b8067c735c 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1342,8 +1342,8 @@ static void test_pathgradientcenterpoint(void) status = GdipGetPathGradientCenterPoint(grad, &point); expect(Ok, status); - todo_wine expectf(1.0, point.X); - todo_wine expectf(4.0/3.0, point.Y); + expectf(1.0, point.X); + expectf(4.0/3.0, point.Y); status = GdipDeleteBrush((GpBrush*)grad); expect(Ok, status); @@ -1359,7 +1359,7 @@ static void test_pathgradientcenterpoint(void) status = GdipGetPathGradientCenterPoint(grad, &point); expect(Ok, status); - todo_wine expectf(700.0/13.0, point.X); + expectf(700.0/13.0, point.X); expectf(25.0, point.Y); status = GdipDeletePath(path);

1 0

Alexandre Julliard : unicode: Use existing helpers to build the l_intl.nls file.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: bd9d83b73aafb67a943f6e330baf033287cbc3af URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd9d83b73aafb67a943f6e33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 23 16:45:02 2020 +0100 unicode: Use existing helpers to build the l_intl.nls file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 74 ++++++++++++------------------------------------------ 1 file changed, 16 insertions(+), 58 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 1aaeff38a4..f8d81f64e6 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1983,66 +1983,21 @@ sub dump_two_level_mapping($$@) sub dump_binary_case_table(@) { my (@table) = @_; + my $max_char = 0x10000; + my $level1 = $max_char / 16; + my $level2 = $level1 / 16; - my %difftables_hash = (); - my @difftables; - my %offtables2_hash = (); - my @offtables2 = (); - - my @offtable = (); - for (my $i = 0; $i < 256; $i++) + my @difftable; + for (my $i = 0; $i < @table; $i++) { - my @offtable2 = (); - for(my $j = 0; $j < 16; $j++) # offset table for xx00-xxFF characters - { - my @difftable; - for (my $k = 0; $k < 16; $k++) # case map table for xxx0-xxxF characters - { - my $char = ($i<<8) + ($j<<4) + $k; - $difftable[$k] = (defined $table[$char]) ? (($table[$char]-$char) & 0xffff) : 0; - } - - my $diff_key = pack "S*", @difftable; - my $offset3 = $difftables_hash{$diff_key}; - if (!defined $offset3) - { - $offset3 = scalar @difftables; - $difftables_hash{$diff_key} = $offset3; - push @difftables, @difftable; - } - $offtable2[$j] = $offset3; - } - - my $offtable2_key = pack "S*", @offtable2; - my $offset2 = $offtables2_hash{$offtable2_key}; - if (!defined $offset2) - { - $offset2 = scalar @offtables2; - $offtables2_hash{$offtable2_key} = $offset2; - push @offtables2, \@offtable2; - } - $offtable[$i] = $offset2; - } - - my @output; - my $offset = 0x100; # offset of first subtable in words - foreach (@offtable) - { - push @output, 0x10 * $_ + $offset; # offset of subtable in words - } - - $offset = 0x100 + 0x10 * scalar @offtables2; # offset of first difftable in words - foreach(@offtables2) - { - my $table = $_; - foreach(@$table) - { - push @output, $_ + $offset; # offset of difftable in words - } + next unless defined $table[$i]; + $difftable[$i] = ($table[$i] - $i) & 0xffff; } - my $len = 1 + scalar @output + scalar @difftables; - return pack "S<*", $len, @output, @difftables; + my @row_array = compress_array( $level1, 0, @difftable[0..$max_char-1] ); + my @array = compress_array( $level2, 0, @row_array[0..$level1-1] ); + for (my $i = $level2; $i < @array; $i++) { $array[$i] += @array - $level1; } + return @array, @row_array[$level1..$#row_array]; } @@ -2050,14 +2005,17 @@ sub dump_binary_case_table(@) # dump case mappings for l_intl.nls sub dump_intl_nls($) { + my @upper = dump_binary_case_table( @toupper_table ); + my @lower = dump_binary_case_table( @tolower_table ); + my $filename = shift; open OUTPUT,">$filename.new" or die "Cannot create $filename"; printf "Building $filename\n"; binmode OUTPUT; print OUTPUT pack "S<", 1; # version - print OUTPUT dump_binary_case_table( @toupper_table ); - print OUTPUT dump_binary_case_table( @tolower_table ); + print OUTPUT pack "S<*", 1 + scalar @upper, @upper; + print OUTPUT pack "S<*", 1 + scalar @lower, @lower; close OUTPUT; save_file($filename); }

1 0