Commit 0b3b28c2 authored by Mohamad Al-Jaf's avatar Mohamad Al-Jaf Committed by Alexandre Julliard

widl: Add support for default_overload attribute.

Needed for IDeviceInformationStatics.
parent b26ec54e
...@@ -153,6 +153,7 @@ struct allowed_attr allowed_attr[] = ...@@ -153,6 +153,7 @@ struct allowed_attr allowed_attr[] =
/* ATTR_CUSTOM */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, "custom" }, /* ATTR_CUSTOM */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, "custom" },
/* ATTR_DECODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "decode" }, /* ATTR_DECODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "decode" },
/* ATTR_DEFAULT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, "default" }, /* ATTR_DEFAULT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, "default" },
/* ATTR_DEFAULT_OVERLOAD */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "default_overload" },
/* ATTR_DEFAULTBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultbind" }, /* 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_DEFAULTCOLLELEM */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultcollelem" },
/* ATTR_DEFAULTVALUE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultvalue" }, /* ATTR_DEFAULTVALUE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultvalue" },
......
...@@ -254,6 +254,7 @@ static void winrt_enable( int ns_prefix ) ...@@ -254,6 +254,7 @@ static void winrt_enable( int ns_prefix )
control { return tCONTROL; } control { return tCONTROL; }
custom { return tCUSTOM; } custom { return tCUSTOM; }
decode { return tDECODE; } decode { return tDECODE; }
default_overload { return tDEFAULT_OVERLOAD; }
defaultbind { return tDEFAULTBIND; } defaultbind { return tDEFAULTBIND; }
defaultcollelem { return tDEFAULTCOLLELEM; } defaultcollelem { return tDEFAULTCOLLELEM; }
defaultvalue { return tDEFAULTVALUE; } defaultvalue { return tDEFAULTVALUE; }
......
...@@ -196,6 +196,7 @@ void pop_import( PARSER_LTYPE *yylloc ); ...@@ -196,6 +196,7 @@ void pop_import( PARSER_LTYPE *yylloc );
%token tDECLARE %token tDECLARE
%token tDECODE tDEFAULT tDEFAULTBIND %token tDECODE tDEFAULT tDEFAULTBIND
%token tDELEGATE %token tDELEGATE
%token tDEFAULT_OVERLOAD
%token tDEFAULTCOLLELEM %token tDEFAULTCOLLELEM
%token tDEFAULTVALUE %token tDEFAULTVALUE
%token tDEFAULTVTABLE %token tDEFAULTVTABLE
...@@ -662,6 +663,7 @@ attribute ...@@ -662,6 +663,7 @@ attribute
} }
| tDECODE { $$ = attr_int( @$, ATTR_DECODE, 0 ); } | tDECODE { $$ = attr_int( @$, ATTR_DECODE, 0 ); }
| tDEFAULT { $$ = attr_int( @$, ATTR_DEFAULT, 0 ); } | tDEFAULT { $$ = attr_int( @$, ATTR_DEFAULT, 0 ); }
| tDEFAULT_OVERLOAD { $$ = attr_int( @$, ATTR_DEFAULT_OVERLOAD, 0 ); }
| tDEFAULTBIND { $$ = attr_int( @$, ATTR_DEFAULTBIND, 0 ); } | tDEFAULTBIND { $$ = attr_int( @$, ATTR_DEFAULTBIND, 0 ); }
| tDEFAULTCOLLELEM { $$ = attr_int( @$, ATTR_DEFAULTCOLLELEM, 0 ); } | tDEFAULTCOLLELEM { $$ = attr_int( @$, ATTR_DEFAULTCOLLELEM, 0 ); }
| tDEFAULTVALUE '(' expr_const ')' { $$ = attr_ptr( @$, ATTR_DEFAULTVALUE, $3 ); } | tDEFAULTVALUE '(' expr_const ')' { $$ = attr_ptr( @$, ATTR_DEFAULTVALUE, $3 ); }
......
...@@ -92,6 +92,7 @@ enum attr_type ...@@ -92,6 +92,7 @@ enum attr_type
ATTR_CUSTOM, ATTR_CUSTOM,
ATTR_DECODE, ATTR_DECODE,
ATTR_DEFAULT, ATTR_DEFAULT,
ATTR_DEFAULT_OVERLOAD,
ATTR_DEFAULTBIND, ATTR_DEFAULTBIND,
ATTR_DEFAULTCOLLELEM, ATTR_DEFAULTCOLLELEM,
ATTR_DEFAULTVALUE, ATTR_DEFAULTVALUE,
......
...@@ -1418,6 +1418,7 @@ static int add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) ...@@ -1418,6 +1418,7 @@ static int add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index)
break; break;
case ATTR_OUT: case ATTR_OUT:
break; break;
case ATTR_DEFAULT_OVERLOAD:
case ATTR_OVERLOAD: case ATTR_OVERLOAD:
break; break;
case ATTR_PROPGET: case ATTR_PROPGET:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment