[PATCH 0/1] MR3479: widl: Add support for default_overload attribute.
Needed for IDeviceInformationStatics, which is needed by Lenovo Ready For Assistant. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3479
From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Needed for IDeviceInformationStatics. --- tools/widl/attribute.c | 1 + tools/widl/parser.l | 1 + tools/widl/parser.y | 2 ++ tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 1 + 5 files changed, 6 insertions(+) diff --git a/tools/widl/attribute.c b/tools/widl/attribute.c index 5ea13a01175..2d3fd5488ff 100644 --- a/tools/widl/attribute.c +++ b/tools/widl/attribute.c @@ -155,6 +155,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_DEFAULT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, "default" }, /* ATTR_DEFAULTBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultbind" }, /* ATTR_DEFAULTCOLLELEM */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultcollelem" }, + /* ATTR_DEFAULT_OVERLOAD */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "default_overload" }, /* ATTR_DEFAULTVALUE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultvalue" }, /* ATTR_DEFAULTVTABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "defaultvtable" }, /* ATTR_DEPRECATED */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "deprecated" }, diff --git a/tools/widl/parser.l b/tools/widl/parser.l index afbdf7151f0..e8804a5ff89 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -256,6 +256,7 @@ static void winrt_enable( int ns_prefix ) decode { return tDECODE; } defaultbind { return tDEFAULTBIND; } defaultcollelem { return tDEFAULTCOLLELEM; } + default_overload { return tDEFAULTOVERLOAD; } defaultvalue { return tDEFAULTVALUE; } defaultvtable { return tDEFAULTVTABLE; } deprecated { return token_winrt( tDEPRECATED, yytext, yylval ); } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 26385a578b0..67ea4f3f5cb 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -197,6 +197,7 @@ void pop_import( PARSER_LTYPE *yylloc ); %token tDECODE tDEFAULT tDEFAULTBIND %token tDELEGATE %token tDEFAULTCOLLELEM +%token tDEFAULTOVERLOAD %token tDEFAULTVALUE %token tDEFAULTVTABLE %token tDEPRECATED @@ -664,6 +665,7 @@ attribute | tDEFAULT { $$ = attr_int( @$, ATTR_DEFAULT, 0 ); } | tDEFAULTBIND { $$ = attr_int( @$, ATTR_DEFAULTBIND, 0 ); } | tDEFAULTCOLLELEM { $$ = attr_int( @$, ATTR_DEFAULTCOLLELEM, 0 ); } + | tDEFAULTOVERLOAD { $$ = attr_int( @$, ATTR_DEFAULT_OVERLOAD, 0 ); } | tDEFAULTVALUE '(' expr_const ')' { $$ = attr_ptr( @$, ATTR_DEFAULTVALUE, $3 ); } | tDEFAULTVTABLE { $$ = attr_int( @$, ATTR_DEFAULTVTABLE, 0 ); } | tDEPRECATED '(' deprecated_attr ')' { $$ = attr_ptr( @$, ATTR_DEPRECATED, $3 ); } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index b92c8c15e68..ed7c35c7d18 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -94,6 +94,7 @@ enum attr_type ATTR_DEFAULT, ATTR_DEFAULTBIND, ATTR_DEFAULTCOLLELEM, + ATTR_DEFAULT_OVERLOAD, ATTR_DEFAULTVALUE, ATTR_DEFAULTVTABLE, ATTR_DEPRECATED, diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index a757af8adc9..063e293cdc4 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1418,6 +1418,7 @@ static int add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) break; case ATTR_OUT: break; + case ATTR_DEFAULT_OVERLOAD: case ATTR_OVERLOAD: break; case ATTR_PROPGET: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3479
Rémi Bernon (@rbernon) commented about tools/widl/attribute.c:
/* ATTR_DEFAULT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, "default" }, /* ATTR_DEFAULTBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultbind" }, /* ATTR_DEFAULTCOLLELEM */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultcollelem" }, + /* ATTR_DEFAULT_OVERLOAD */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "default_overload" }, /* ATTR_DEFAULTVALUE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultvalue" }, /* ATTR_DEFAULTVTABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "defaultvtable" },
I'm not completely sure the order still matters, but I suggest to keep it nonetheless and move default_overload before defaultbind. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3479#note_41002
Rémi Bernon (@rbernon) commented about tools/widl/parser.l:
decode { return tDECODE; } defaultbind { return tDEFAULTBIND; } defaultcollelem { return tDEFAULTCOLLELEM; } + default_overload { return tDEFAULTOVERLOAD; }
Same. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3479#note_41003
Rémi Bernon (@rbernon) commented about tools/widl/parser.y:
| tDEFAULT { $$ = attr_int( @$, ATTR_DEFAULT, 0 ); } | tDEFAULTBIND { $$ = attr_int( @$, ATTR_DEFAULTBIND, 0 ); } | tDEFAULTCOLLELEM { $$ = attr_int( @$, ATTR_DEFAULTCOLLELEM, 0 ); } + | tDEFAULTOVERLOAD { $$ = attr_int( @$, ATTR_DEFAULT_OVERLOAD, 0 ); }
Same. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3479#note_41004
Rémi Bernon (@rbernon) commented about tools/widl/parser.y:
%token tDECODE tDEFAULT tDEFAULTBIND %token tDELEGATE %token tDEFAULTCOLLELEM +%token tDEFAULTOVERLOAD I'd name this tDEFAULT_OVERLOAD to be consistent.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3479#note_41005
Rémi Bernon (@rbernon) commented about tools/widl/widltypes.h:
ATTR_DEFAULT, ATTR_DEFAULTBIND, ATTR_DEFAULTCOLLELEM, + ATTR_DEFAULT_OVERLOAD,
(Same with the ordering here) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3479#note_41006
participants (3)
-
Mohamad Al-Jaf -
Mohamad Al-Jaf (＠maljaf)
-
Rémi Bernon