February 2021 - Wine-commits

Rémi Bernon : widl: Use explicit namespace parameter for qualified names.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: 47a256c648778d0b5798fe6bd3ca7f419f1850b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47a256c648778d0b5798fe6b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 8 09:30:44 2021 +0100 widl: Use explicit namespace parameter for qualified names. Instead of buggy lookup namespace stack. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 52 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 17a3727b114..e4834a06e23 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -76,13 +76,12 @@ static warning_list_t *append_warning(warning_list_t *, int); static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); static type_t *find_type_or_error(struct namespace *parent, const char *name); +static struct namespace *find_namespace_or_error(struct namespace *namespace, const char *name); static var_t *reg_const(var_t *var); static void push_namespace(const char *name); static void pop_namespace(const char *name); -static void init_lookup_namespace(const char *name); -static void push_lookup_namespace(const char *name); static void check_arg_attrs(const var_t *arg); static void check_statements(const statement_list_t *stmts, int is_inside_library); @@ -120,7 +119,6 @@ static struct namespace global_namespace = { }; static struct namespace *current_namespace = &global_namespace; -static struct namespace *lookup_namespace = &global_namespace; static typelib_t *current_typelib; @@ -152,6 +150,7 @@ static typelib_t *current_typelib; enum storage_class stgclass; enum type_qualifier type_qualifier; enum function_specifier function_specifier; + struct namespace *namespace; } %token <str> aIDENTIFIER aPRAGMA @@ -288,7 +287,7 @@ static typelib_t *current_typelib; %type <str> namespacedef %type <type> base_type int_std %type <type> enumdef structdef uniondef typedecl -%type <type> type qualified_seq qualified_type +%type <type> type qualified_type %type <ifref> class_interface %type <ifref_list> class_interfaces %type <var> arg ne_union_field union_field s_field case enum enum_member declaration @@ -314,6 +313,7 @@ static typelib_t *current_typelib; %type <stmt_list> gbl_statements imp_statements int_statements %type <warning_list> warnings %type <num> allocate_option_list allocate_option +%type <namespace> namespace_pfx %left ',' %right '?' ':' @@ -886,15 +886,16 @@ int_std: tINT { $$ = type_new_int(TYPE_BASIC_INT, 0); } | tINT3264 { $$ = type_new_int(TYPE_BASIC_INT3264, 0); } ; -qualified_seq: - aKNOWNTYPE { $$ = find_type_or_error(lookup_namespace, $1); } - | aIDENTIFIER '.' { push_lookup_namespace($1); } qualified_seq { $$ = $4; } - ; +namespace_pfx: + aNAMESPACE '.' { $$ = find_namespace_or_error(&global_namespace, $1); } + | namespace_pfx aNAMESPACE '.' { $$ = find_namespace_or_error($1, $2); } + | namespace_pfx aIDENTIFIER '.' { $$ = find_namespace_or_error($1, $2); } + ; qualified_type: - aKNOWNTYPE { $$ = find_type_or_error(current_namespace, $1); } - | aNAMESPACE '.' { init_lookup_namespace($1); } qualified_seq { $$ = $4; } - ; + aKNOWNTYPE { $$ = find_type_or_error(current_namespace, $1); } + | namespace_pfx typename { $$ = find_type_or_error($1, $2); } + ; coclass: tCOCLASS typename { $$ = type_coclass_declare($2); } ; @@ -1911,20 +1912,6 @@ static void pop_namespace(const char *name) current_namespace = current_namespace->parent; } -static void init_lookup_namespace(const char *name) -{ - if (!(lookup_namespace = find_sub_namespace(&global_namespace, name))) - error_loc("namespace '%s' not found\n", name); -} - -static void push_lookup_namespace(const char *name) -{ - struct namespace *namespace; - if (!(namespace = find_sub_namespace(lookup_namespace, name))) - error_loc("namespace '%s' not found\n", name); - lookup_namespace = namespace; -} - struct rtype { const char *name; type_t *type; @@ -2045,10 +2032,21 @@ static type_t *find_type_or_error(struct namespace *namespace, const char *name) return type; } +static struct namespace *find_namespace_or_error(struct namespace *parent, const char *name) +{ + struct namespace *namespace = NULL; + + if (!winrt_mode) + error_loc("namespaces are only supported in winrt mode.\n"); + else if (!(namespace = find_sub_namespace(parent, name))) + error_loc("namespace '%s' not found in '%s'\n", name, parent->name); + + return namespace; +} + int is_type(const char *name) { - return find_type(name, current_namespace, 0) != NULL || - find_type(name, lookup_namespace, 0) != NULL; + return find_type(name, current_namespace, 0) != NULL; } int is_namespace(const char *name)

1 0

Rémi Bernon : widl: Disallow qualified types in expressions.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: f5b7a76b2843e33ba811b0384d8d24cb1bec3f03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5b7a76b2843e33ba811b038… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 8 09:30:45 2021 +0100 widl: Disallow qualified types in expressions. MIDL WinRT mode only supports a limited subset of original IDL syntax anyway, and this will save some conflicts when removing the lexer trick for namespaces. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index e4834a06e23..9fb6772ba33 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -279,7 +279,7 @@ static typelib_t *current_typelib; %type <stgclass> storage_cls_spec %type <type_qualifier> type_qualifier m_type_qual_list %type <function_specifier> function_specifier -%type <declspec> decl_spec decl_spec_no_type m_decl_spec_no_type +%type <declspec> decl_spec unqualified_decl_spec decl_spec_no_type m_decl_spec_no_type %type <type> inherit interface interfacedef %type <type> interfaceref %type <type> dispinterface dispinterfacedef @@ -287,7 +287,7 @@ static typelib_t *current_typelib; %type <str> namespacedef %type <type> base_type int_std %type <type> enumdef structdef uniondef typedecl -%type <type> type qualified_type +%type <type> type unqualified_type qualified_type %type <ifref> class_interface %type <ifref_list> class_interfaces %type <var> arg ne_union_field union_field s_field case enum enum_member declaration @@ -763,9 +763,9 @@ expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | '*' expr %prec PPTR { $$ = make_expr1(EXPR_PPTR, $2); } | expr MEMBERPTR aIDENTIFIER { $$ = make_expr2(EXPR_MEMBER, make_expr1(EXPR_PPTR, $1), make_exprs(EXPR_IDENTIFIER, $3)); } | expr '.' aIDENTIFIER { $$ = make_expr2(EXPR_MEMBER, $1, make_exprs(EXPR_IDENTIFIER, $3)); } - | '(' decl_spec m_abstract_declarator ')' expr %prec CAST + | '(' unqualified_decl_spec m_abstract_declarator ')' expr %prec CAST { $$ = make_exprt(EXPR_CAST, declare_var(NULL, $2, $3, 0), $5); free($2); free($3); } - | tSIZEOF '(' decl_spec m_abstract_declarator ')' + | tSIZEOF '(' unqualified_decl_spec m_abstract_declarator ')' { $$ = make_exprt(EXPR_SIZEOF, declare_var(NULL, $3, $4, 0), NULL); free($3); free($4); } | expr '[' expr ']' { $$ = make_expr2(EXPR_ARRAY, $1, $3); } | '(' expr ')' { $$ = $2; } @@ -1005,6 +1005,12 @@ decl_spec: type m_decl_spec_no_type { $$ = make_decl_spec($1, $2, NULL, STG_NON { $$ = make_decl_spec($2, $1, $3, STG_NONE, 0, 0); } ; +unqualified_decl_spec: unqualified_type m_decl_spec_no_type + { $$ = make_decl_spec($1, $2, NULL, STG_NONE, 0, 0); } + | decl_spec_no_type unqualified_type m_decl_spec_no_type + { $$ = make_decl_spec($2, $1, $3, STG_NONE, 0, 0); } + ; + m_decl_spec_no_type: { $$ = NULL; } | decl_spec_no_type ; @@ -1146,8 +1152,8 @@ pointer_type: structdef: tSTRUCT m_typename '{' fields '}' { $$ = type_new_struct($2, current_namespace, TRUE, $4); } ; -type: tVOID { $$ = type_new_void(); } - | qualified_type { $$ = $1; } +unqualified_type: + tVOID { $$ = type_new_void(); } | base_type { $$ = $1; } | enumdef { $$ = $1; } | tENUM aIDENTIFIER { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } @@ -1156,6 +1162,12 @@ type: tVOID { $$ = type_new_void(); } | uniondef { $$ = $1; } | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, FALSE, NULL); } | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } + | aKNOWNTYPE { $$ = find_type_or_error(current_namespace, $1); } + ; + +type: + unqualified_type + | namespace_pfx typename { $$ = find_type_or_error($1, $2); } ; typedef: m_attributes tTYPEDEF m_attributes decl_spec declarator_list

1 0

Rémi Bernon : widl: Remove aNAMESPACE token from the lexer.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: 374321f83619f5f71eb67ddf3aff368651c51367 URL: https://source.winehq.org/git/wine.git/?a=commit;h=374321f83619f5f71eb67ddf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 8 09:30:46 2021 +0100 widl: Remove aNAMESPACE token from the lexer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.h | 1 - tools/widl/parser.l | 2 +- tools/widl/parser.y | 13 ++----------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index a6dc94ae6b8..a67b160d48a 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -38,7 +38,6 @@ void pop_import(void); #define parse_only import_stack_ptr int is_type(const char *name); -int is_namespace(const char *name); int do_warning(char *toggle, warning_list_t *wnum); int is_warning_enabled(int warning); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 7e20d30e7f0..8acc9c9590c 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -468,7 +468,7 @@ static int kw_token(const char *kw) return kwp->token; } parser_lval.str = xstrdup(kw); - return is_type(kw) ? aKNOWNTYPE : is_namespace(kw) ? aNAMESPACE : aIDENTIFIER; + return is_type(kw) ? aKNOWNTYPE : aIDENTIFIER; } static int attr_token(const char *kw) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9fb6772ba33..d3a79e9fcb7 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -154,7 +154,7 @@ static typelib_t *current_typelib; } %token <str> aIDENTIFIER aPRAGMA -%token <str> aKNOWNTYPE aNAMESPACE +%token <str> aKNOWNTYPE %token <num> aNUM aHEXNUM %token <dbl> aDOUBLE %token <str> aSTRING aWSTRING aSQSTRING @@ -887,8 +887,7 @@ int_std: tINT { $$ = type_new_int(TYPE_BASIC_INT, 0); } ; namespace_pfx: - aNAMESPACE '.' { $$ = find_namespace_or_error(&global_namespace, $1); } - | namespace_pfx aNAMESPACE '.' { $$ = find_namespace_or_error($1, $2); } + aIDENTIFIER '.' { $$ = find_namespace_or_error(&global_namespace, $1); } | namespace_pfx aIDENTIFIER '.' { $$ = find_namespace_or_error($1, $2); } ; @@ -919,7 +918,6 @@ apicontract_def: attributes apicontract '{' '}' semicolon_opt ; namespacedef: tNAMESPACE aIDENTIFIER { $$ = $2; } - | tNAMESPACE aNAMESPACE { $$ = $2; } ; class_interfaces: { $$ = NULL; } @@ -2061,13 +2059,6 @@ int is_type(const char *name) return find_type(name, current_namespace, 0) != NULL; } -int is_namespace(const char *name) -{ - if (!winrt_mode) return 0; - return find_sub_namespace(current_namespace, name) != NULL || - find_sub_namespace(&global_namespace, name) != NULL; -} - type_t *get_type(enum type_type type, char *name, struct namespace *namespace, int t) { type_t *tp;

1 0

Rémi Bernon : widl: Fold inherit cases by using typename rule in qualified_type.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: 509daf4d23c475a10ae120e0f7644cfa2056b375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=509daf4d23c475a10ae120e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 8 09:30:47 2021 +0100 widl: Fold inherit cases by using typename rule in qualified_type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d3a79e9fcb7..bbf71a2e3ef 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -892,7 +892,7 @@ namespace_pfx: ; qualified_type: - aKNOWNTYPE { $$ = find_type_or_error(current_namespace, $1); } + typename { $$ = find_type_or_error(current_namespace, $1); } | namespace_pfx typename { $$ = find_type_or_error($1, $2); } ; @@ -960,11 +960,6 @@ interfacedef: attributes interface inherit '{' int_statements '}' semicolon_opt { $$ = type_interface_define($2, $1, $3, $5); check_async_uuid($$); } -/* MIDL is able to import the definition of a base class from inside the - * definition of a derived class, I'll try to support it with this rule */ - | attributes interface ':' aIDENTIFIER - '{' import int_statements '}' - semicolon_opt { $$ = type_interface_define($2, $1, find_type_or_error(current_namespace, $4), $7); } | dispinterfacedef semicolon_opt { $$ = $1; } ;

1 0

Rémi Bernon : widl: Support referencing qualified interface names.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: 2bfcfcc0a92607115d4bc5b8a7712b8ab64708eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bfcfcc0a92607115d4bc5b8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 8 09:30:48 2021 +0100 widl: Support referencing qualified interface names. And split the dispinterface case, which is not supported in WinRT mode. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.media.speechsynthesis.idl | 2 +- tools/widl/parser.y | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index 71c51b74c0c..502261f79c6 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -64,7 +64,7 @@ namespace Windows { ] runtimeclass VoiceInformation { - [default] interface IVoiceInformation; + [default] interface Windows.Media.SpeechSynthesis.IVoiceInformation; } } } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index bbf71a2e3ef..b43a1cdd5f2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -282,6 +282,7 @@ static typelib_t *current_typelib; %type <declspec> decl_spec unqualified_decl_spec decl_spec_no_type m_decl_spec_no_type %type <type> inherit interface interfacedef %type <type> interfaceref +%type <type> dispinterfaceref %type <type> dispinterface dispinterfacedef %type <type> module moduledef %type <str> namespacedef @@ -926,6 +927,7 @@ class_interfaces: { $$ = NULL; } class_interface: m_attributes interfaceref ';' { $$ = make_ifref($2); $$->attrs = $1; } + | m_attributes dispinterfaceref ';' { $$ = make_ifref($2); $$->attrs = $1; } ; dispinterface: tDISPINTERFACE typename { $$ = type_dispinterface_declare($2); } @@ -965,7 +967,11 @@ interfacedef: attributes interface inherit interfaceref: tINTERFACE typename { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } - | tDISPINTERFACE typename { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } + | tINTERFACE namespace_pfx typename { $$ = get_type(TYPE_INTERFACE, $3, $2, 0); } + ; + +dispinterfaceref: + tDISPINTERFACE typename { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } ; module: tMODULE typename { $$ = type_module_declare($2); }

1 0

Hans Leidekker : wldap32: Convert berval structures.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: 0631cecd524fe99999cd71cc8bb30b1f0be1c95a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0631cecd524fe99999cd71cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 8 12:33:54 2021 +0100 wldap32: Convert berval structures. The layout is different on 64-bit. As a side effect this patch fixes bug 50622 because we no longer include the Windows header. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50622 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/ber.c | 158 ++++++++++++++++++++++++++++++----------- dlls/wldap32/page.c | 54 +++++++++----- dlls/wldap32/winldap_private.h | 18 ++--- dlls/wldap32/wldap32.h | 115 ++++++++++++++++++++++++++---- 4 files changed, 265 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0631cecd524fe99999cd…

1 0

Nikolay Sivov : dwrite: Adjust comment regarding digits substitution during shaping.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: ec648ea7d0451305c1977747353579798f69775e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec648ea7d0451305c1977747… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 8 17:33:13 2021 +0300 dwrite: Adjust comment regarding digits substitution during shaping. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 2f254607653..7dc4a1f7b55 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5929,7 +5929,7 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c context->glyph_infos[i].mask |= rtlm_mask; } - /* TODO: should this check for glyph availability? */ + /* Glyph availability is not tested for a replacement digit. */ if (*context->u.subst.digits && codepoint >= '0' && codepoint <= '9') codepoint = context->u.subst.digits[codepoint - '0'];

1 0

Chao Long : gdiplus/metafile: Implement GdipRecordMetafileFileName.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: 3c2da5b9c98aebbde84702e7dd84e2221cf4235f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c2da5b9c98aebbde84702e7… Author: Chao Long <longchao(a)uniontech.com> Date: Sun Feb 7 10:03:04 2021 +0800 gdiplus/metafile: Implement GdipRecordMetafileFileName. Signed-off-by: Chao Long <longchao(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 205 ++++++++++++++++++++++++------------------------ 1 file changed, 103 insertions(+), 102 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d506d0dc8bf..5ff6b113c3d 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -759,109 +759,10 @@ static GpStatus METAFILE_WriteEndOfFile(GpMetafile *metafile) GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF *frameRect, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) { - HDC record_dc; - REAL dpix, dpiy; - REAL framerect_factor_x, framerect_factor_y; - RECT rc, *lprc; - GpStatus stat; TRACE("(%p %d %s %d %p %p)\n", hdc, type, debugstr_rectf(frameRect), frameUnit, desc, metafile); - if (!hdc || type < EmfTypeEmfOnly || type > EmfTypeEmfPlusDual || !metafile) - return InvalidParameter; - - dpix = (REAL)GetDeviceCaps(hdc, HORZRES) / GetDeviceCaps(hdc, HORZSIZE) * 25.4; - dpiy = (REAL)GetDeviceCaps(hdc, VERTRES) / GetDeviceCaps(hdc, VERTSIZE) * 25.4; - - if (frameRect) - { - switch (frameUnit) - { - case MetafileFrameUnitPixel: - framerect_factor_x = 2540.0 / dpix; - framerect_factor_y = 2540.0 / dpiy; - break; - case MetafileFrameUnitPoint: - framerect_factor_x = framerect_factor_y = 2540.0 / 72.0; - break; - case MetafileFrameUnitInch: - framerect_factor_x = framerect_factor_y = 2540.0; - break; - case MetafileFrameUnitDocument: - framerect_factor_x = framerect_factor_y = 2540.0 / 300.0; - break; - case MetafileFrameUnitMillimeter: - framerect_factor_x = framerect_factor_y = 100.0; - break; - case MetafileFrameUnitGdi: - framerect_factor_x = framerect_factor_y = 1.0; - break; - default: - return InvalidParameter; - } - - rc.left = framerect_factor_x * frameRect->X; - rc.top = framerect_factor_y * frameRect->Y; - rc.right = rc.left + framerect_factor_x * frameRect->Width; - rc.bottom = rc.top + framerect_factor_y * frameRect->Height; - - lprc = &rc; - } - else - lprc = NULL; - - record_dc = CreateEnhMetaFileW(hdc, NULL, lprc, desc); - - if (!record_dc) - return GenericError; - - *metafile = heap_alloc_zero(sizeof(GpMetafile)); - if(!*metafile) - { - DeleteEnhMetaFile(CloseEnhMetaFile(record_dc)); - return OutOfMemory; - } - - (*metafile)->image.type = ImageTypeMetafile; - (*metafile)->image.flags = ImageFlagsNone; - (*metafile)->image.palette = NULL; - (*metafile)->image.xres = dpix; - (*metafile)->image.yres = dpiy; - (*metafile)->bounds.X = (*metafile)->bounds.Y = 0.0; - (*metafile)->bounds.Width = (*metafile)->bounds.Height = 1.0; - (*metafile)->unit = UnitPixel; - (*metafile)->metafile_type = type; - (*metafile)->record_dc = record_dc; - (*metafile)->comment_data = NULL; - (*metafile)->comment_data_size = 0; - (*metafile)->comment_data_length = 0; - (*metafile)->limit_dpi = 96; - (*metafile)->hemf = NULL; - (*metafile)->printer_display = (GetDeviceCaps(record_dc, TECHNOLOGY) == DT_RASPRINTER); - (*metafile)->logical_dpix = (REAL)GetDeviceCaps(record_dc, LOGPIXELSX); - (*metafile)->logical_dpiy = (REAL)GetDeviceCaps(record_dc, LOGPIXELSY); - list_init(&(*metafile)->containers); - - if (!frameRect) - { - (*metafile)->auto_frame = TRUE; - (*metafile)->auto_frame_min.X = 0; - (*metafile)->auto_frame_min.Y = 0; - (*metafile)->auto_frame_max.X = -1; - (*metafile)->auto_frame_max.Y = -1; - } - - stat = METAFILE_WriteHeader(*metafile, hdc); - - if (stat != Ok) - { - DeleteEnhMetaFile(CloseEnhMetaFile(record_dc)); - heap_free(*metafile); - *metafile = NULL; - return OutOfMemory; - } - - return stat; + return GdipRecordMetafileFileName(NULL, hdc, type, frameRect, frameUnit, desc, metafile); } /***************************************************************************** @@ -4266,10 +4167,110 @@ GpStatus WINGDIPAPI GdipRecordMetafileFileName(GDIPCONST WCHAR* fileName, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) { - FIXME("%s %p %d %s %d %s %p stub!\n", debugstr_w(fileName), hdc, type, debugstr_rectf(pFrameRect), + HDC record_dc; + REAL dpix, dpiy; + REAL framerect_factor_x, framerect_factor_y; + RECT rc, *lprc; + GpStatus stat; + + TRACE("%s %p %d %s %d %s %p\n", debugstr_w(fileName), hdc, type, debugstr_rectf(pFrameRect), frameUnit, debugstr_w(desc), metafile); - return NotImplemented; + if (!hdc || type < EmfTypeEmfOnly || type > EmfTypeEmfPlusDual || !metafile) + return InvalidParameter; + + dpix = (REAL)GetDeviceCaps(hdc, HORZRES) / GetDeviceCaps(hdc, HORZSIZE) * 25.4; + dpiy = (REAL)GetDeviceCaps(hdc, VERTRES) / GetDeviceCaps(hdc, VERTSIZE) * 25.4; + + if (pFrameRect) + { + switch (frameUnit) + { + case MetafileFrameUnitPixel: + framerect_factor_x = 2540.0 / dpix; + framerect_factor_y = 2540.0 / dpiy; + break; + case MetafileFrameUnitPoint: + framerect_factor_x = framerect_factor_y = 2540.0 / 72.0; + break; + case MetafileFrameUnitInch: + framerect_factor_x = framerect_factor_y = 2540.0; + break; + case MetafileFrameUnitDocument: + framerect_factor_x = framerect_factor_y = 2540.0 / 300.0; + break; + case MetafileFrameUnitMillimeter: + framerect_factor_x = framerect_factor_y = 100.0; + break; + case MetafileFrameUnitGdi: + framerect_factor_x = framerect_factor_y = 1.0; + break; + default: + return InvalidParameter; + } + + rc.left = framerect_factor_x * pFrameRect->X; + rc.top = framerect_factor_y * pFrameRect->Y; + rc.right = rc.left + framerect_factor_x * pFrameRect->Width; + rc.bottom = rc.top + framerect_factor_y * pFrameRect->Height; + + lprc = &rc; + } + else + lprc = NULL; + + record_dc = CreateEnhMetaFileW(hdc, fileName, lprc, desc); + + if (!record_dc) + return GenericError; + + *metafile = heap_alloc_zero(sizeof(GpMetafile)); + if(!*metafile) + { + DeleteEnhMetaFile(CloseEnhMetaFile(record_dc)); + return OutOfMemory; + } + + (*metafile)->image.type = ImageTypeMetafile; + (*metafile)->image.flags = ImageFlagsNone; + (*metafile)->image.palette = NULL; + (*metafile)->image.xres = dpix; + (*metafile)->image.yres = dpiy; + (*metafile)->bounds.X = (*metafile)->bounds.Y = 0.0; + (*metafile)->bounds.Width = (*metafile)->bounds.Height = 1.0; + (*metafile)->unit = UnitPixel; + (*metafile)->metafile_type = type; + (*metafile)->record_dc = record_dc; + (*metafile)->comment_data = NULL; + (*metafile)->comment_data_size = 0; + (*metafile)->comment_data_length = 0; + (*metafile)->limit_dpi = 96; + (*metafile)->hemf = NULL; + (*metafile)->printer_display = (GetDeviceCaps(record_dc, TECHNOLOGY) == DT_RASPRINTER); + (*metafile)->logical_dpix = (REAL)GetDeviceCaps(record_dc, LOGPIXELSX); + (*metafile)->logical_dpiy = (REAL)GetDeviceCaps(record_dc, LOGPIXELSY); + list_init(&(*metafile)->containers); + + if (!pFrameRect) + { + (*metafile)->auto_frame = TRUE; + (*metafile)->auto_frame_min.X = 0; + (*metafile)->auto_frame_min.Y = 0; + (*metafile)->auto_frame_max.X = -1; + (*metafile)->auto_frame_max.Y = -1; + } + + stat = METAFILE_WriteHeader(*metafile, hdc); + + if (stat != Ok) + { + DeleteEnhMetaFile(CloseEnhMetaFile(record_dc)); + heap_free(*metafile); + *metafile = NULL; + return OutOfMemory; + } + + return stat; } GpStatus WINGDIPAPI GdipRecordMetafileFileNameI(GDIPCONST WCHAR* fileName, HDC hdc, EmfType type,

1 0

Rémi Bernon : wmphoto: Implement WMP decoder using jxrlib.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: 958b43327243d98b2d7fa9b641d6e7140a6a12fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=958b43327243d98b2d7fa9b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 09:10:59 2021 +0100 wmphoto: Implement WMP decoder using jxrlib. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 122 +++++++++++ configure.ac | 16 ++ dlls/d3dx10_43/tests/d3dx10.c | 7 +- dlls/windowscodecs/tests/wmpformat.c | 4 +- dlls/wmphoto/unix_lib.c | 380 ++++++++++++++++++++++++++++++++++- include/config.h.in | 6 + 6 files changed, 525 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=958b43327243d98b2d7f…

1 0

Rémi Bernon : windowscodecs: Return E_INVALIDARG from GetFrame with NULL pointer.
by Alexandre Julliard 08 Feb '21

08 Feb '21

Module: wine Branch: master Commit: 8f1122f8d2be5f6a383f2e73d88b9e41a735689f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1122f8d2be5f6a383f2e73… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 09:11:01 2021 +0100 windowscodecs: Return E_INVALIDARG from GetFrame with NULL pointer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/decoder.c | 2 +- dlls/windowscodecs/tests/wmpformat.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index b0fcd34c742..89e352b8946 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -724,7 +724,7 @@ static HRESULT WINAPI CommonDecoder_GetFrame(IWICBitmapDecoder *iface, TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); if (!ppIBitmapFrame) - return E_POINTER; + return E_INVALIDARG; EnterCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/wmpformat.c b/dlls/windowscodecs/tests/wmpformat.c index c4f947d8acf..c1a320b6ec0 100644 --- a/dlls/windowscodecs/tests/wmpformat.c +++ b/dlls/windowscodecs/tests/wmpformat.c @@ -123,7 +123,7 @@ static void test_decode(void) ok(count == 1, "unexpected count %u\n", count); hr = IWICBitmapDecoder_GetFrame(decoder, 0, NULL); - todo_wine ok(hr == E_INVALIDARG, "GetFrame(NULL) returned hr=%x\n", hr); + ok(hr == E_INVALIDARG, "GetFrame(NULL) returned hr=%x\n", hr); for (j = 2; j > 0; --j) {

1 0