September 2021 - Wine-Commits

Alistair Leslie-Hughes : sapi: Support create parameter in ISpObjectTokenCategory::SetId.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: e482605548b124a7863f6b09395b3a850ae741cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e482605548b124a7863f6b09… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 15 18:55:40 2021 +1000 sapi: Support create parameter in ISpObjectTokenCategory::SetId. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/token.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index ec1cce5f462..ba91a425e9e 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -416,9 +416,10 @@ static HRESULT WINAPI token_category_SetId( ISpObjectTokenCategory *iface, hr = parse_cat_id( id, &root, &subkey ); if (hr != S_OK) return SPERR_INVALID_REGISTRY_KEY; - if (create) FIXME( "Ignoring create\n" ); - - res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); + if (create) + res = RegCreateKeyExW( root, subkey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL ); + else + res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); if (res) return SPERR_INVALID_REGISTRY_KEY; hr = CoCreateInstance( &CLSID_SpDataKey, NULL, CLSCTX_ALL,

1 0

Eric Pouech : dbghelp/dwarf: Support more dwarf's TAG related to types in udt parsing.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 79cd318b778def23b044af6d1f54a14e6496880e URL: https://source.winehq.org/git/wine.git/?a=commit;h=79cd318b778def23b044af6d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 21 08:00:30 2021 +0200 dbghelp/dwarf: Support more dwarf's TAG related to types in udt parsing. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index d1075caf4b8..c409f39d80b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1704,6 +1704,12 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_debug_info_t* di, case DW_TAG_const_type: dwarf2_parse_const_type(child); break; + case DW_TAG_volatile_type: + dwarf2_parse_volatile_type(di); + break; + case DW_TAG_pointer_type: + dwarf2_parse_pointer_type(child); + break; case DW_TAG_subrange_type: dwarf2_parse_subrange_type(child); break; @@ -1713,11 +1719,13 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_debug_info_t* di, case DW_TAG_typedef: /* FIXME: we need to handle nested udt definitions */ case DW_TAG_inheritance: + case DW_TAG_interface_type: case DW_TAG_template_type_param: case DW_TAG_template_value_param: case DW_TAG_variable: case DW_TAG_imported_declaration: case DW_TAG_ptr_to_member_type: + case DW_TAG_GNU_template_template_param: case DW_TAG_GNU_template_parameter_pack: case DW_TAG_GNU_formal_parameter_pack: /* FIXME: some C++ related stuff */

1 0

Eric Pouech : dbghelp/dwarf: Handle C++ rvalue reference type as a reference.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 15eb6a2560e61f02cd2b471dcb00ff28b343be3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=15eb6a2560e61f02cd2b471d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 21 08:00:36 2021 +0200 dbghelp/dwarf: Handle C++ rvalue reference type as a reference. As we don't handle C++ references yet, it'll be a pointer in the end. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index c409f39d80b..192dbf59814 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2343,6 +2343,7 @@ static void dwarf2_load_one_entry(dwarf2_debug_info_t* di) dwarf2_parse_unspecified_type(di); break; case DW_TAG_reference_type: + case DW_TAG_rvalue_reference_type: dwarf2_parse_reference_type(di); break; case DW_TAG_enumeration_type:

1 0

Eric Pouech : dbghelp/dwarf: Properly detect base address selection in AT_ranges.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 69d07126feb7192c37651d92ec0d4b5ac58f12fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=69d07126feb7192c37651d92… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 21 07:59:54 2021 +0200 dbghelp/dwarf: Properly detect base address selection in AT_ranges. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 3009dead905..5f433e1d872 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1209,26 +1209,28 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in { dwarf2_traverse_context_t traverse; ULONG_PTR low, high; + const ULONG_PTR UMAX = ~(ULONG_PTR)0u; traverse.data = ctx->module_ctx->sections[section_ranges].address + range.u.uvalue; traverse.end_data = ctx->module_ctx->sections[section_ranges].address + ctx->module_ctx->sections[section_ranges].size; - *plow = ULONG_MAX; + *plow = UMAX; *phigh = 0; while (traverse.data + 2 * ctx->head.word_size < traverse.end_data) { low = dwarf2_parse_addr_head(&traverse, &ctx->head); high = dwarf2_parse_addr_head(&traverse, &ctx->head); if (low == 0 && high == 0) break; - if (low == ULONG_MAX) FIXME("unsupported yet (base address selection)\n"); + if (low == (ctx->head.word_size == 8 ? (~(DWORD64)0u) : (DWORD64)(~0u))) + FIXME("unsupported yet (base address selection)\n"); /* range values are relative to start of compilation unit */ low += ctx->compiland->address - ctx->module_ctx->load_offset; high += ctx->compiland->address - ctx->module_ctx->load_offset; if (low < *plow) *plow = low; if (high > *phigh) *phigh = high; } - if (*plow == ULONG_MAX || *phigh == 0) {FIXME("no entry found\n"); return FALSE;} + if (*plow == UMAX || *phigh == 0) {FIXME("no entry found\n"); return FALSE;} if (*plow == *phigh) {FIXME("entry found, but low=high\n"); return FALSE;} return TRUE;

1 0

Alistair Leslie-Hughes : include: Add ISpAudio interface.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: d2ff007ae0ed0de8c8b9d6dd115c8cfff52757ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2ff007ae0ed0de8c8b9d6dd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 15 18:55:38 2021 +1000 include: Add ISpAudio interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sapi.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/sapi.idl b/include/sapi.idl index c90d5ec145b..59c2540ba21 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -492,6 +492,13 @@ typedef [hidden] enum SPFILEMODE SPFM_NUM_MODES } SPFILEMODE; +typedef [restricted, hidden] struct SPAUDIOBUFFERINFO +{ + ULONG ulMsMinNotification; + ULONG ulMsBufferSize; + ULONG ulMsEventBias; +} SPAUDIOBUFFERINFO; + cpp_quote("#if defined(__GNUC__)") cpp_quote("#define SPCAT_AUDIOOUT (const WCHAR []){ 'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\\\','S','O','F','T','W','A','R','E','\\\\','M','i','c','r','o','s','o','f','t','\\\\','S','p','e','e','c','h','\\\\','A','u','d','i','o','O','u','t','p','u','t',0 }") @@ -994,6 +1001,28 @@ interface ISpStreamFormat : IStream HRESULT GetFormat(GUID *format, WAVEFORMATEX **wave); } +[ + object, + uuid(c05c768f-fae8-4ec2-8e07-338321c12452), + pointer_default(unique), + local, + restricted +] +interface ISpAudio : ISpStreamFormat +{ + HRESULT SetState([in] SPAUDIOSTATE state, [in] ULONGLONG reserved); + HRESULT SetFormat([in] REFGUID guid, [in] const WAVEFORMATEX *wave); + HRESULT GetStatus([out] SPAUDIOSTATUS *status); + HRESULT SetBufferInfo([in] const SPAUDIOBUFFERINFO *buffer); + HRESULT GetBufferInfo([out] SPAUDIOBUFFERINFO *buffer); + HRESULT GetDefaultFormat([out] GUID *guid, [out] WAVEFORMATEX **wave); + HANDLE EventHandle(); + HRESULT GetVolumeLevel([out] ULONG *level); + HRESULT SetVolumeLevel([in] ULONG level); + HRESULT GetBufferNotifySize([out] ULONG *size); + HRESULT SetBufferNotifySize([in] ULONG size); +}; + [ object, uuid(5b4fb971-b115-4de1-ad97-e482e3bf6ee4),

1 0

Alistair Leslie-Hughes : sapi: Support create parameter in ISpObjectToken::SetId.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 5d11517f6d6bd1d2fd864ce3eb821602162c70d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d11517f6d6bd1d2fd864ce3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 15 18:55:39 2021 +1000 sapi: Support create parameter in ISpObjectToken::SetId. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/token.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 04fa3a25d6a..ec1cce5f462 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -942,7 +942,10 @@ static HRESULT WINAPI token_SetId( ISpObjectToken *iface, hr = parse_cat_id( token_id, &root, &subkey ); if (hr != S_OK) return SPERR_NOT_FOUND; - res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); + if (create) + res = RegCreateKeyExW( root, subkey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL); + else + res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); if (res) return SPERR_NOT_FOUND; This->token_key = key;

1 0

Eric Pouech : dbghelp/dwarf: Added support for DW_TAG_subrange_type in various places.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 88840187f5a197288c8f62c71045ddf78de34522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88840187f5a197288c8f62c7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 21 08:00:24 2021 +0200 dbghelp/dwarf: Added support for DW_TAG_subrange_type in various places. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 2d4f13b8281..d1075caf4b8 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1429,6 +1429,28 @@ static struct symt* dwarf2_parse_pointer_type(dwarf2_debug_info_t* di) return di->symt; } +static struct symt* dwarf2_parse_subrange_type(dwarf2_debug_info_t* di) +{ + struct symt* ref_type; + struct attribute name; + struct attribute dummy; + + if (di->symt) return di->symt; + + TRACE("%s\n", dwarf2_debug_di(di)); + + if (dwarf2_find_attribute(di, DW_AT_name, &name)) FIXME("Found name for subrange %s\n", name.u.string); + if (dwarf2_find_attribute(di, DW_AT_byte_size, &dummy)) FIXME("Found byte_size %lu\n", dummy.u.uvalue); + if (dwarf2_find_attribute(di, DW_AT_bit_size, &dummy)) FIXME("Found bit_size %lu\n", dummy.u.uvalue); + /* for now, we don't support the byte_size nor bit_size about the subrange, and pretend the two + * types are the same (FIXME) + */ + ref_type = dwarf2_lookup_type(di); + di->symt = ref_type; + if (dwarf2_get_di_children(di)) FIXME("Unsupported children\n"); + return di->symt; +} + static struct symt* dwarf2_parse_array_type(dwarf2_debug_info_t* di) { struct symt* ref_type; @@ -1682,6 +1704,9 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_debug_info_t* di, case DW_TAG_const_type: dwarf2_parse_const_type(child); break; + case DW_TAG_subrange_type: + dwarf2_parse_subrange_type(child); + break; case DW_TAG_structure_type: case DW_TAG_class_type: case DW_TAG_union_type: @@ -2336,6 +2361,9 @@ static void dwarf2_load_one_entry(dwarf2_debug_info_t* di) case DW_TAG_namespace: dwarf2_parse_namespace(di); break; + case DW_TAG_subrange_type: + dwarf2_parse_subrange_type(di); + break; /* silence a couple of C++ defines */ case DW_TAG_imported_module: case DW_TAG_imported_declaration:

1 0

Eric Pouech : dbghelp/dwarf: Added support for parsing dwarf's 3 restrict type TAG.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 09d2a6cffb6b7f3ca373bddacf97bdbe1284d993 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09d2a6cffb6b7f3ca373bdda… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 21 08:00:12 2021 +0200 dbghelp/dwarf: Added support for parsing dwarf's 3 restrict type TAG. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index fd50f590982..41abb91f33b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1507,6 +1507,21 @@ static struct symt* dwarf2_parse_volatile_type(dwarf2_debug_info_t* di) return ref_type; } +static struct symt* dwarf2_parse_restrict_type(dwarf2_debug_info_t* di) +{ + struct symt* ref_type; + + if (di->symt) return di->symt; + + TRACE("%s\n", dwarf2_debug_di(di)); + + ref_type = dwarf2_lookup_type(di); + if (dwarf2_get_di_children(di)) FIXME("Unsupported children\n"); + di->symt = ref_type; + + return ref_type; +} + static struct symt* dwarf2_parse_unspecified_type(dwarf2_debug_info_t* di) { struct attribute name; @@ -2265,6 +2280,9 @@ static void dwarf2_load_one_entry(dwarf2_debug_info_t* di) case DW_TAG_volatile_type: dwarf2_parse_volatile_type(di); break; + case DW_TAG_restrict_type: + dwarf2_parse_restrict_type(di); + break; case DW_TAG_unspecified_type: dwarf2_parse_unspecified_type(di); break;

1 0

Eric Pouech : dbghelp/dwarf: Handle some Dwarf4 tweaks in high / low pc attributes.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: 87485ea107f1a44a3b94a8a87eedae207eeed066 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87485ea107f1a44a3b94a8a8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 21 08:00:06 2021 +0200 dbghelp/dwarf: Handle some Dwarf4 tweaks in high / low pc attributes. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 16ebd5dbf65..fd50f590982 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1244,6 +1244,24 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in return FALSE; *plow = low_pc.u.uvalue; *phigh = high_pc.u.uvalue; + if (ctx->head.version >= 4) + switch (high_pc.form) + { + case DW_FORM_addr: + break; + case DW_FORM_data1: + case DW_FORM_data2: + case DW_FORM_data4: + case DW_FORM_data8: + case DW_FORM_sdata: + case DW_FORM_udata: + /* From dwarf4 on, when FORM's class is constant, high_pc is an offset from low_pc */ + *phigh += *plow; + break; + default: + FIXME("Unsupported class for high_pc\n"); + break; + } return TRUE; } }

1 0

Eric Pouech : dbghelp/dwarf: In DW_AT_ranges, the values are relative to the start of the CU.
by Alexandre Julliard Sept. 21, 2021

Sept. 21, 2021

Module: wine Branch: master Commit: ab8fdb191c7fc3868decfa7d442898612bf9b4b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab8fdb191c7fc3868decfa7d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 21 07:59:48 2021 +0200 dbghelp/dwarf: In DW_AT_ranges, the values are relative to the start of the CU. And not the module, as most of the other addresses. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index f67efc43993..3009dead905 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1222,6 +1222,9 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in high = dwarf2_parse_addr_head(&traverse, &ctx->head); if (low == 0 && high == 0) break; if (low == ULONG_MAX) FIXME("unsupported yet (base address selection)\n"); + /* range values are relative to start of compilation unit */ + low += ctx->compiland->address - ctx->module_ctx->load_offset; + high += ctx->compiland->address - ctx->module_ctx->load_offset; if (low < *plow) *plow = low; if (high > *phigh) *phigh = high; }

1 0