August 2023 - Wine-commits - list.winehq.org

Piotr Caban : winedump: Support REG_BINARY values in regf files.
by Alexandre Julliard 04 Aug '23

04 Aug '23

Module: wine Branch: master Commit: 037677932b8349a7682c55ac7b3c56f3a04b8925 URL: https://gitlab.winehq.org/wine/wine/-/commit/037677932b8349a7682c55ac7b3c56… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 15:30:17 2023 +0200 winedump: Support REG_BINARY values in regf files. --- tools/winedump/reg.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index 46841a9d342..65426f540c0 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -192,8 +192,8 @@ static BOOL dump_subkeys(unsigned int hive_off, unsigned int off) static BOOL dump_value(unsigned int hive_off, unsigned int off) { + unsigned int i, len, data_size; const void *data = NULL; - unsigned int data_size; const value_key *val; const char *name; @@ -246,6 +246,25 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) printf("%s", !data ? "\"\"" : get_unicode_str((const WCHAR *)data, data_size / sizeof(WCHAR))); break; + case REG_BINARY: + printf("hex:"); + len = val->name_size + 7; /* strlen("\"\"=hex:") */ + for (i = 0; i < data_size; i++) + { + if (i) + { + printf(","); + len += 1; + } + if (len > 76) + { + printf("\\\n "); + len = 2; + } + printf("%02x", ((BYTE *)data)[i]); + len += 2; + } + break; case REG_DWORD: assert(data_size == sizeof(DWORD)); printf("dword:%08x", *(unsigned int *)data);

1 0

Piotr Caban : winedump: Support REG_MULTI_SZ values in regf files.
by Alexandre Julliard 04 Aug '23

04 Aug '23

Module: wine Branch: master Commit: b4fb0aef0d21e10b3e776f43be69e1c52a798f90 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4fb0aef0d21e10b3e776f43be69e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 15:53:54 2023 +0200 winedump: Support REG_MULTI_SZ values in regf files. --- tools/winedump/reg.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index 65426f540c0..2afde27e2d7 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -194,8 +194,8 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) { unsigned int i, len, data_size; const void *data = NULL; + const char *name, *str; const value_key *val; - const char *name; val = PRD(hive_off + off, sizeof(*val)); if (!val || memcmp(&val->signature, "vk", 2)) @@ -269,6 +269,22 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) assert(data_size == sizeof(DWORD)); printf("dword:%08x", *(unsigned int *)data); break; + case REG_MULTI_SZ: + printf("str(7):\""); + + while(data_size > sizeof(WCHAR)) + { + for (len = 0; len < data_size / sizeof(WCHAR); len++) + if (!((WCHAR *)data)[len]) + break; + str = get_unicode_str(data, len); + + printf("%.*s\\0", (unsigned int)strlen(str + 1) - 1, str + 1); + data = ((WCHAR *)data) + len + 1; + data_size -= (len + 1) * sizeof(WCHAR); + } + printf("\""); + break; default: printf("unhandled data type %d", val->data_type); }

1 0

Piotr Caban : winedump: Skip data blocks when dumping regf files.
by Alexandre Julliard 04 Aug '23

04 Aug '23

Module: wine Branch: master Commit: bed6f9dfb3aeb9e2833a91df1374d7d582095452 URL: https://gitlab.winehq.org/wine/wine/-/commit/bed6f9dfb3aeb9e2833a91df1374d7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 17:36:16 2023 +0200 winedump: Skip data blocks when dumping regf files. --- tools/winedump/reg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index 2afde27e2d7..cce45fdb27a 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -206,6 +206,11 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) printf("unsupported value flags: %x\n", val->flags); return FALSE; } + if (!(val->data_size & 0x80000000) && val->data_size > 4 * BLOCK_SIZE) + { + printf("Warning: data blocks not supported\n"); + return TRUE; + } if (val->name_size) {

1 0

Piotr Caban : winedump: Enlarge buffer in dump_want_n helper.
by Alexandre Julliard 04 Aug '23

04 Aug '23

Module: wine Branch: master Commit: 1a58a7032a20af01e830123e29c336cab045d94d URL: https://gitlab.winehq.org/wine/wine/-/commit/1a58a7032a20af01e830123e29c336… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 15:58:24 2023 +0200 winedump: Enlarge buffer in dump_want_n helper. --- tools/winedump/dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 1a97e3bb171..42916ac4fa3 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -65,7 +65,7 @@ void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix static char* dump_want_n(unsigned sz) { - static char buffer[4 * 1024]; + static char buffer[64 * 1024]; static unsigned idx; char* ret;

1 0

Piotr Caban : winedump: Don't dump volatile keys from regf file.
by Alexandre Julliard 04 Aug '23

04 Aug '23

Module: wine Branch: master Commit: 2908537f3fe4fe583b16a5c21c5c222fdb0dd0ee URL: https://gitlab.winehq.org/wine/wine/-/commit/2908537f3fe4fe583b16a5c21c5c22… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 17:58:41 2023 +0200 winedump: Don't dump volatile keys from regf file. --- tools/winedump/reg.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index cce45fdb27a..baa298784e3 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -356,8 +356,6 @@ static BOOL dump_key(unsigned int hive_off, unsigned int off) if (key->sub_keys) ret = dump_subkeys(hive_off, key->sub_keys_list_off); - if (ret && key->volatile_sub_keys) - ret = dump_subkeys(hive_off, key->volatile_sub_keys_list_off); path_len -= key->name_size + 1; path[path_len] = 0;

1 0

Piotr Caban : winedump: Support dumping UTF16 value names in regf files.
by Alexandre Julliard 04 Aug '23

04 Aug '23

Module: wine Branch: master Commit: 49c40d502cc142dffa1260347c6a53c209b9f8a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/49c40d502cc142dffa1260347c6a53… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 18:40:51 2023 +0200 winedump: Support dumping UTF16 value names in regf files. --- tools/winedump/reg.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index baa298784e3..9d227f29253 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -201,27 +201,34 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) if (!val || memcmp(&val->signature, "vk", 2)) return FALSE; - if (!(val->flags & VAL_COMP_NAME) && val->name_size) - { - printf("unsupported value flags: %x\n", val->flags); - return FALSE; - } if (!(val->data_size & 0x80000000) && val->data_size > 4 * BLOCK_SIZE) { printf("Warning: data blocks not supported\n"); return TRUE; } - if (val->name_size) + if (val->name_size && !(val->flags & VAL_COMP_NAME)) + { + name = PRD(hive_off + off + sizeof(*val), val->name_size); + if (!name) + return FALSE; + name = get_unicode_str((WCHAR *)name, val->name_size / sizeof(WCHAR)); + len = strlen(name) + 1; + + printf("%s=", name); + } + else if (val->name_size) { name = PRD(hive_off + off + sizeof(*val), val->name_size); if (!name) return FALSE; + len = val->name_size + 3; printf("\"%.*s\"=", val->name_size, name); } else { + len = 2; printf("@="); } @@ -253,7 +260,7 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) break; case REG_BINARY: printf("hex:"); - len = val->name_size + 7; /* strlen("\"\"=hex:") */ + len += 4; /* strlen("hex:") */ for (i = 0; i < data_size; i++) { if (i)

1 0

Piotr Caban : winedump: Support REG_QWORD values in regf files.
by Alexandre Julliard 04 Aug '23

04 Aug '23

Module: wine Branch: master Commit: e2414b55b6ffab465229f9234f89d7f61ba2ac51 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2414b55b6ffab465229f9234f89d7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 1 18:45:18 2023 +0200 winedump: Support REG_QWORD values in regf files. --- tools/winedump/reg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/winedump/reg.c b/tools/winedump/reg.c index 9d227f29253..f100eb47171 100644 --- a/tools/winedump/reg.c +++ b/tools/winedump/reg.c @@ -258,9 +258,10 @@ static BOOL dump_value(unsigned int hive_off, unsigned int off) printf("%s", !data ? "\"\"" : get_unicode_str((const WCHAR *)data, data_size / sizeof(WCHAR))); break; + case REG_QWORD: case REG_BINARY: - printf("hex:"); - len += 4; /* strlen("hex:") */ + printf("hex%s:", val->data_type == REG_QWORD ? "(b)" : ""); + len += 4 + (val->data_type == REG_QWORD ? 3 : 0); for (i = 0; i < data_size; i++) { if (i)

1 0

Biswapriyo Nath : include: Add missing default value in IXAudio2.
by Alexandre Julliard 04 Aug '23

04 Aug '23

Module: wine Branch: master Commit: 26e72a7580be52251a7d54334b0882be01f39f6a URL: https://gitlab.winehq.org/wine/wine/-/commit/26e72a7580be52251a7d54334b0882… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Aug 2 01:51:32 2023 +0530 include: Add missing default value in IXAudio2. This was removed in 14c44d0b0a2fc0ead5bc75615864ff850a44c4d5 commit. --- include/xaudio2.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/xaudio2.idl b/include/xaudio2.idl index d0e781fe1c6..277fc450469 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -555,7 +555,7 @@ interface IXAudio2 : IUnknown #endif [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain #if XAUDIO2_VER >= 8 - , AUDIO_STREAM_CATEGORY category + , [in, defaultvalue(AudioCategory_GameEffects)] AUDIO_STREAM_CATEGORY category #endif );

1 0

Ilia Docin : sane.ds: Add array of resolutions support.
by Alexandre Julliard 04 Aug '23

04 Aug '23

Module: wine Branch: master Commit: b43ba81e17ef7b191af30948842596fca54559a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/b43ba81e17ef7b191af30948842596… Author: Ilia Docin <ilya.docin(a)contentai.ru> Date: Fri Aug 4 12:06:06 2023 +0300 sane.ds: Add array of resolutions support. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55378 --- dlls/sane.ds/capability.c | 58 +++++++++++++++++++++++++++++++++++------------ dlls/sane.ds/options.c | 13 ++--------- dlls/sane.ds/sane_i.h | 2 +- 3 files changed, 46 insertions(+), 27 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 15ca4ea740a..312876cd8e6 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -143,27 +143,35 @@ static TW_UINT16 msg_get_range(pTW_CAPABILITY pCapability, TW_UINT16 type, return TWCC_SUCCESS; } -static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) +static TW_UINT16 msg_get_array(pTW_CAPABILITY pCapability, TW_UINT16 type, const int *values, int value_count) { TW_ARRAY *a; - static const UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, CAP_XFERCOUNT, CAP_UICONTROLLABLE, - CAP_AUTOFEED, CAP_FEEDERENABLED, - ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_UNITS, ICAP_BITDEPTH, ICAP_COMPRESSION, ICAP_PIXELFLAVOR, - ICAP_XRESOLUTION, ICAP_YRESOLUTION, ICAP_PHYSICALHEIGHT, ICAP_PHYSICALWIDTH, ICAP_SUPPORTEDSIZES }; + TW_UINT32 *p32; + TW_UINT16 *p16; - pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[sizeof(supported_caps)] )); + pCapability->hContainer = 0; pCapability->ConType = TWON_ARRAY; + if (type == TWTY_INT16 || type == TWTY_UINT16) + pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[value_count * sizeof(TW_UINT16)])); + else if (type == TWTY_INT32 || type == TWTY_UINT32) + pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[value_count * sizeof(TW_UINT32)])); + if (pCapability->hContainer) { - UINT16 *u; TW_UINT32 i; a = GlobalLock (pCapability->hContainer); - a->ItemType = TWTY_UINT16; - a->NumItems = ARRAY_SIZE(supported_caps); - u = (UINT16 *) a->ItemList; + a->ItemType = type; + a->NumItems = value_count; + p16 = (TW_UINT16 *) a->ItemList; + p32 = (TW_UINT32 *) a->ItemList; for (i = 0; i < a->NumItems; i++) - u[i] = supported_caps[i]; + { + if (type == TWTY_INT16 || type == TWTY_UINT16) + p16[i] = values[i]; + else if (type == TWTY_INT32 || type == TWTY_UINT32) + p32[i] = values[i]; + } GlobalUnlock (pCapability->hContainer); return TWCC_SUCCESS; } @@ -171,6 +179,16 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) return TWCC_LOWMEMORY; } +static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) +{ + static const int supported_caps[] = { CAP_SUPPORTEDCAPS, CAP_XFERCOUNT, CAP_UICONTROLLABLE, + CAP_AUTOFEED, CAP_FEEDERENABLED, + ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_UNITS, ICAP_BITDEPTH, ICAP_COMPRESSION, ICAP_PIXELFLAVOR, + ICAP_XRESOLUTION, ICAP_YRESOLUTION, ICAP_PHYSICALHEIGHT, ICAP_PHYSICALWIDTH, ICAP_SUPPORTEDSIZES }; + + return msg_get_array(pCapability, TWTY_UINT16, supported_caps, sizeof(supported_caps) / sizeof(supported_caps[0])); +} + /* ICAP_XFERMECH */ static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action) @@ -518,7 +536,7 @@ static TW_UINT16 SANE_ICAPResolution (pTW_CAPABILITY pCapability, TW_UINT16 acti int current_resolution; TW_FIX32 *default_res; const char *best_option_name; - int minval, maxval, quantval; + struct option_descriptor opt; TRACE("ICAP_%cRESOLUTION\n", cap == ICAP_XRESOLUTION ? 'X' : 'Y'); @@ -565,10 +583,20 @@ static TW_UINT16 SANE_ICAPResolution (pTW_CAPABILITY pCapability, TW_UINT16 acti break; case MSG_GET: - twCC = sane_option_probe_resolution(best_option_name, &minval, &maxval, &quantval); + twCC = sane_option_probe_resolution(best_option_name, &opt); if (twCC == TWCC_SUCCESS) - twCC = msg_get_range(pCapability, TWTY_FIX32, - minval, maxval, quantval == 0 ? 1 : quantval, default_res->Whole, current_resolution); + { + if (opt.constraint_type == CONSTRAINT_RANGE) + twCC = msg_get_range(pCapability, TWTY_FIX32, + opt.constraint.range.min, opt.constraint.range.max, + opt.constraint.range.quant == 0 ? 1 : opt.constraint.range.quant, + default_res->Whole, current_resolution); + else if (opt.constraint_type == CONSTRAINT_WORD_LIST) + twCC = msg_get_array(pCapability, TWTY_UINT32, &(opt.constraint.word_list[1]), + opt.constraint.word_list[0]); + else + twCC = TWCC_CAPUNSUPPORTED; + } break; case MSG_SET: diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c index 52e73a99925..30ca441fd28 100644 --- a/dlls/sane.ds/options.c +++ b/dlls/sane.ds/options.c @@ -107,18 +107,9 @@ TW_UINT16 sane_option_set_str(const char *option_name, char *val, BOOL *needs_re return rc; } -TW_UINT16 sane_option_probe_resolution(const char *option_name, int *minval, int *maxval, int *quant) +TW_UINT16 sane_option_probe_resolution(const char *option_name, struct option_descriptor *opt) { - struct option_descriptor opt; - TW_UINT16 rc = sane_find_option(option_name, TYPE_INT, &opt); - - if (rc != TWCC_SUCCESS) return rc; - if (opt.constraint_type != CONSTRAINT_RANGE) return TWCC_CAPUNSUPPORTED; - - *minval = opt.constraint.range.min; - *maxval = opt.constraint.range.max; - *quant = opt.constraint.range.quant; - return rc; + return sane_find_option(option_name, TYPE_INT, opt); } TW_UINT16 sane_option_probe_mode(TW_UINT16 *current, TW_UINT32 *choices, int *count) diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index db71b87995e..571917944e1 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -200,7 +200,7 @@ TW_UINT16 sane_option_get_int( const char *option_name, int *val ) DECLSPEC_HIDD TW_UINT16 sane_option_set_int( const char *option_name, int val, BOOL *reload ) DECLSPEC_HIDDEN; TW_UINT16 sane_option_get_str( const char *option_name, char *val, int len ) DECLSPEC_HIDDEN; TW_UINT16 sane_option_set_str( const char *option_name, char *val, BOOL *reload ) DECLSPEC_HIDDEN; -TW_UINT16 sane_option_probe_resolution( const char *option_name, int *minval, int *maxval, int *quant) DECLSPEC_HIDDEN; +TW_UINT16 sane_option_probe_resolution( const char *option_name, struct option_descriptor *opt ) DECLSPEC_HIDDEN; TW_UINT16 sane_option_probe_mode(TW_UINT16 *current, TW_UINT32 *choices, int *count) DECLSPEC_HIDDEN; TW_UINT16 sane_option_get_bool( const char *option_name, BOOL *val ) DECLSPEC_HIDDEN; TW_UINT16 sane_option_set_bool( const char *option_name, BOOL val ) DECLSPEC_HIDDEN;

1 0

Mohamad Al-Jaf : widl: Add support for default_overload attribute.
by Alexandre Julliard 04 Aug '23

04 Aug '23

Module: wine Branch: master Commit: 0b3b28c245a7523ba10285334945816a2ff4314d URL: https://gitlab.winehq.org/wine/wine/-/commit/0b3b28c245a7523ba1028533494581… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Jul 2 02:23:26 2023 -0400 widl: Add support for default_overload attribute. 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..bcd804e272f 100644 --- a/tools/widl/attribute.c +++ b/tools/widl/attribute.c @@ -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_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_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_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" }, diff --git a/tools/widl/parser.l b/tools/widl/parser.l index afbdf7151f0..951998de381 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -254,6 +254,7 @@ static void winrt_enable( int ns_prefix ) control { return tCONTROL; } custom { return tCUSTOM; } decode { return tDECODE; } + default_overload { return tDEFAULT_OVERLOAD; } defaultbind { return tDEFAULTBIND; } defaultcollelem { return tDEFAULTCOLLELEM; } defaultvalue { return tDEFAULTVALUE; } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 26385a578b0..f66dc62492f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -196,6 +196,7 @@ void pop_import( PARSER_LTYPE *yylloc ); %token tDECLARE %token tDECODE tDEFAULT tDEFAULTBIND %token tDELEGATE +%token tDEFAULT_OVERLOAD %token tDEFAULTCOLLELEM %token tDEFAULTVALUE %token tDEFAULTVTABLE @@ -662,6 +663,7 @@ attribute } | tDECODE { $$ = attr_int( @$, ATTR_DECODE, 0 ); } | tDEFAULT { $$ = attr_int( @$, ATTR_DEFAULT, 0 ); } + | tDEFAULT_OVERLOAD { $$ = attr_int( @$, ATTR_DEFAULT_OVERLOAD, 0 ); } | tDEFAULTBIND { $$ = attr_int( @$, ATTR_DEFAULTBIND, 0 ); } | tDEFAULTCOLLELEM { $$ = attr_int( @$, ATTR_DEFAULTCOLLELEM, 0 ); } | tDEFAULTVALUE '(' expr_const ')' { $$ = attr_ptr( @$, ATTR_DEFAULTVALUE, $3 ); } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index b92c8c15e68..1a26bb77cad 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -92,6 +92,7 @@ enum attr_type ATTR_CUSTOM, ATTR_DECODE, ATTR_DEFAULT, + ATTR_DEFAULT_OVERLOAD, ATTR_DEFAULTBIND, ATTR_DEFAULTCOLLELEM, ATTR_DEFAULTVALUE, 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:

1 0