winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2021
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
1030 discussions
Start a n
N
ew thread
Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard
10 Sep '21
10 Sep '21
Module: wine Branch: master Commit: 94e0d4b5259f5699787297f049dd0afe8a8e6f91 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=94e0d4b5259f5699787297f0…
Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Sep 9 23:14:40 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/po/lt.po b/po/lt.po index 8073c7ba361..28df893327a 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To:
https://bugs.winehq.org\n
" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-09-08 22:37+0300\n" +"PO-Revision-Date: 2021-09-09 23:13+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.4.2\n" +"X-Generator: Poedit 3.0\n" "X-Project-Style: default\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 @@ -10318,7 +10318,7 @@ msgstr "Kinijos vasaros laikas" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+08:00) Pekinas, Čongčingas, Honkongas, Urumčis" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" @@ -10398,7 +10398,7 @@ msgstr "Vidurio Europos vasaros laikas" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) Sarajevas, Skopjė, Varšuva, Zagrebas" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" @@ -10430,7 +10430,7 @@ msgstr "Altajaus vasaros laikas" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00) Barnaulas, Gorno Altaiskas" #: dlls/tzres/tzres.rc:108 msgid "Central Europe Standard Time" @@ -10442,7 +10442,7 @@ msgstr "Vidurio Europos vasaros laikas" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) Belgradas, Bratislava, Budapeštas, Liubliana, Praha" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" @@ -10514,7 +10514,7 @@ msgstr "Kalnų vasaros laikas (Meksika)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) Čihuahua, La Pasas, Masatlanas" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" @@ -10526,7 +10526,7 @@ msgstr "Grinvičo vasaros laikas" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) Dublinas, Edinburgas, Lisabona, Londonas" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -10618,7 +10618,7 @@ msgstr "Vakarų Ramiojo vandenyno vasaros laikas" #: dlls/tzres/tzres.rc:437 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) Guam, Port Morsbis" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" @@ -10714,7 +10714,7 @@ msgstr "Tokijo vasaros laikas" #: dlls/tzres/tzres.rc:362 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) Osaka, Saporas, Tokijas" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" @@ -10770,7 +10770,7 @@ msgstr "" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) Iževskas, Samara" #: dlls/tzres/tzres.rc:414 msgid "Volgograd Standard Time" @@ -10782,7 +10782,7 @@ msgstr "Volgogrado vasaros laikas" #: dlls/tzres/tzres.rc:416 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) Volgogradas" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" @@ -10794,7 +10794,7 @@ msgstr "Azorų vasaros laikas" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) Azorai" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" @@ -10806,7 +10806,7 @@ msgstr "Šiaurės Azijos rytų vasaros laikas" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) Irkutskas" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-11" @@ -10826,7 +10826,7 @@ msgstr "Argentinos vasaros laikas" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) Buenos Airės" #: dlls/tzres/tzres.rc:375 msgid "Turks And Caicos Standard Time" @@ -10838,7 +10838,7 @@ msgstr "Terkso ir Kaikoso vasaros laikas" #: dlls/tzres/tzres.rc:377 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) Terksas ir Kaikosas" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" @@ -10850,7 +10850,7 @@ msgstr "Markizo vasaros laikas" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) Markizo salos" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time"
1
0
0
0
Eric Pouech : dbghelp/dwarf: Use word_size from cuhead_t.
by Alexandre Julliard
09 Sep '21
09 Sep '21
Module: wine Branch: master Commit: 0b7f8373e3593ca8e5261d4486f1d04092a15653 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0b7f8373e3593ca8e5261d44…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:34:32 2021 +0200 dbghelp/dwarf: Use word_size from cuhead_t. Removed word_size from traverse context and make use of cuhead_t's equivalent field instead 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, 2 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index f43ad2445cb..22350124de7 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -159,7 +159,6 @@ typedef struct dwarf2_traverse_context_s { const unsigned char* data; const unsigned char* end_data; - unsigned char word_size; } dwarf2_traverse_context_t; /* symt_cache indexes */ @@ -934,7 +933,6 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, lctx.data = xloc.u.block.ptr; lctx.end_data = xloc.u.block.ptr + xloc.u.block.size; - lctx.word_size = ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; err = compute_location(ctx->module, &ctx->head, &lctx, loc, NULL, frame); if (err < 0) @@ -1052,7 +1050,6 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in traverse.data = ctx->sections[section_ranges].address + range.u.uvalue; traverse.end_data = ctx->sections[section_ranges].address + ctx->sections[section_ranges].size; - traverse.word_size = ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; *plow = ULONG_MAX; *phigh = 0; @@ -2179,7 +2176,6 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, } traverse.data = sections[section_line].address + offset; traverse.end_data = traverse.data + 4; - traverse.word_size = ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; length = dwarf2_parse_u4(&traverse); traverse.end_data = sections[section_line].address + offset + length; @@ -2386,7 +2382,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, mod_ctx->data += cu_length; ctx.head.version = dwarf2_parse_u2(&cu_ctx); cu_abbrev_offset = dwarf2_parse_u4(&cu_ctx); - ctx.head.word_size = cu_ctx.word_size = dwarf2_parse_byte(&cu_ctx); + ctx.head.word_size = dwarf2_parse_byte(&cu_ctx); TRACE("Compilation Unit Header found at 0x%x:\n", (int)(comp_unit_start - sections[section_debug].address)); @@ -2413,8 +2409,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, return FALSE; } - module->format_info[DFI_DWARF]->u.dwarf2_info->word_size = cu_ctx.word_size; - mod_ctx->word_size = cu_ctx.word_size; + module->format_info[DFI_DWARF]->u.dwarf2_info->word_size = ctx.head.word_size; pool_init(&ctx.pool, 65536); ctx.sections = sections; @@ -2430,7 +2425,6 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, abbrev_ctx.data = sections[section_abbrev].address + cu_abbrev_offset; abbrev_ctx.end_data = sections[section_abbrev].address + sections[section_abbrev].size; - abbrev_ctx.word_size = cu_ctx.word_size; dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx.abbrev_table, &ctx.pool); sparse_array_init(&ctx.debug_info_table, sizeof(dwarf2_debug_info_t), 128); @@ -2495,7 +2489,6 @@ static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE { lctx->data = ptr; lctx->end_data = ptr + len; - lctx->word_size = modfmt->u.dwarf2_info->word_size; return TRUE; } ptr += len; @@ -2761,7 +2754,6 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt if (!parse_cie_details(fde_ctx, info, word_size)) return FALSE; cie_ctx->data = fde_ctx->data; cie_ctx->end_data = ptr_blk; - cie_ctx->word_size = fde_ctx->word_size; continue; } cie_ptr = (in_eh_frame) ? fde_ctx->data - id - 4 : start_data + id; @@ -2769,7 +2761,6 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt { last_cie_ptr = cie_ptr; cie_ctx->data = cie_ptr; - cie_ctx->word_size = fde_ctx->word_size; cie_ctx->end_data = cie_ptr + 4; cie_ctx->end_data = cie_ptr + 4 + dwarf2_parse_u4(cie_ctx); if (dwarf2_parse_u4(cie_ctx) != cie_id) @@ -3111,7 +3102,6 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w ctx.end_data = zp + 4; len = dwarf2_leb128_as_unsigned(&ctx); ctx.end_data = ctx.data + len; - ctx.word_size = module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; while (ctx.data < ctx.end_data) { @@ -3288,7 +3278,6 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, memset(&info, 0, sizeof(info)); fde_ctx.data = modfmt->u.dwarf2_info->eh_frame.address; fde_ctx.end_data = fde_ctx.data + modfmt->u.dwarf2_info->eh_frame.size; - fde_ctx.word_size = modfmt->u.dwarf2_info->word_size; /* let offsets relative to the eh_frame sections be correctly computed, as we'll map * in this process the IMAGE section at a different address as the one expected by * the image @@ -3299,7 +3288,6 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, { fde_ctx.data = modfmt->u.dwarf2_info->debug_frame.address; fde_ctx.end_data = fde_ctx.data + modfmt->u.dwarf2_info->debug_frame.size; - fde_ctx.word_size = modfmt->u.dwarf2_info->word_size; delta = pair.effective->reloc_delta; if (!dwarf2_get_cie(ip, pair.effective, delta, &fde_ctx, &cie_ctx, &info, FALSE)) { @@ -3374,7 +3362,6 @@ static void dwarf2_location_compute(struct process* pcs, lctx.data = (const BYTE*)(ptr + 1); lctx.end_data = lctx.data + *ptr; - lctx.word_size = modfmt->u.dwarf2_info->word_size; } do_compute: /* now get the variable */ @@ -3563,7 +3550,6 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, mod_ctx.data = section[section_debug].address; mod_ctx.end_data = mod_ctx.data + section[section_debug].size; - mod_ctx.word_size = 0; /* will be correctly set later on */ dwarf2_modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(*dwarf2_modfmt) + sizeof(*dwarf2_modfmt->u.dwarf2_info));
1
0
0
0
Eric Pouech : dbghelp/dwarf: Pass word_size as a parameter to a couple of frame related functions.
by Alexandre Julliard
09 Sep '21
09 Sep '21
Module: wine Branch: master Commit: ff7ec0d82934c17eef5b920061a0bb6dd81bae92 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ff7ec0d82934c17eef5b9200…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:34:26 2021 +0200 dbghelp/dwarf: Pass word_size as a parameter to a couple of frame related functions. 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, 15 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index d31ad8c89c2..f43ad2445cb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2604,7 +2604,7 @@ struct frame_info struct frame_state state_stack[MAX_SAVED_STATES]; }; -static ULONG_PTR dwarf2_parse_augmentation_ptr(dwarf2_traverse_context_t* ctx, unsigned char encoding) +static ULONG_PTR dwarf2_parse_augmentation_ptr(dwarf2_traverse_context_t* ctx, unsigned char encoding, unsigned char word_size) { ULONG_PTR base; @@ -2626,7 +2626,7 @@ static ULONG_PTR dwarf2_parse_augmentation_ptr(dwarf2_traverse_context_t* ctx, u switch (encoding & 0x0f) { case DW_EH_PE_native: - return base + dwarf2_parse_addr(ctx, ctx->word_size); + return base + dwarf2_parse_addr(ctx, word_size); case DW_EH_PE_leb128: return base + dwarf2_leb128_as_unsigned(ctx); case DW_EH_PE_data2: @@ -2649,7 +2649,7 @@ static ULONG_PTR dwarf2_parse_augmentation_ptr(dwarf2_traverse_context_t* ctx, u } } -static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* info) +static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* info, unsigned char word_size) { unsigned char version; const char* augmentation; @@ -2706,7 +2706,7 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* unsigned char encoding = dwarf2_parse_byte(ctx); /* throw away the indirect bit, as we don't care for the result */ encoding &= ~DW_EH_PE_indirect; - dwarf2_parse_augmentation_ptr(ctx, encoding); /* handler */ + dwarf2_parse_augmentation_ptr(ctx, encoding, word_size); /* handler */ continue; } case 'R': @@ -2735,6 +2735,7 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt ULONG_PTR start, range; unsigned cie_id; const BYTE* start_data = fde_ctx->data; + unsigned char word_size = module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; cie_id = in_eh_frame ? 0 : DW_CIE_ID; /* skip 0-padding at beginning of section (alignment) */ @@ -2757,7 +2758,7 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt { last_cie_ptr = fde_ctx->data - 8; /* we need some bits out of the CIE in order to parse all contents */ - if (!parse_cie_details(fde_ctx, info)) return FALSE; + if (!parse_cie_details(fde_ctx, info, word_size)) return FALSE; cie_ctx->data = fde_ctx->data; cie_ctx->end_data = ptr_blk; cie_ctx->word_size = fde_ctx->word_size; @@ -2778,10 +2779,10 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt (unsigned)(fde_ctx->data - start_data)); return FALSE; } - if (!parse_cie_details(cie_ctx, info)) return FALSE; + if (!parse_cie_details(cie_ctx, info, word_size)) return FALSE; } - start = delta + dwarf2_parse_augmentation_ptr(fde_ctx, info->fde_encoding); - range = dwarf2_parse_augmentation_ptr(fde_ctx, info->fde_encoding & 0x0F); + start = delta + dwarf2_parse_augmentation_ptr(fde_ctx, info->fde_encoding, word_size); + range = dwarf2_parse_augmentation_ptr(fde_ctx, info->fde_encoding & 0x0F, word_size); if (addr >= start && addr < start + range) { @@ -2850,7 +2851,8 @@ static void execute_cfa_instructions(struct module* module, dwarf2_traverse_cont break; case DW_CFA_set_loc: { - ULONG_PTR loc = dwarf2_parse_augmentation_ptr(ctx, info->fde_encoding); + ULONG_PTR loc = dwarf2_parse_augmentation_ptr(ctx, info->fde_encoding, + module->format_info[DFI_DWARF]->u.dwarf2_info->word_size); TRACE("%lx: DW_CFA_set_loc %lx\n", info->ip, loc); info->ip = loc; break; @@ -3125,7 +3127,7 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w else switch (opcode) { case DW_OP_nop: break; - case DW_OP_addr: stack[++sp] = dwarf2_parse_addr(&ctx, ctx.word_size); break; + case DW_OP_addr: stack[++sp] = dwarf2_parse_addr(&ctx, module->format_info[DFI_DWARF]->u.dwarf2_info->word_size); break; case DW_OP_const1u: stack[++sp] = dwarf2_parse_byte(&ctx); break; case DW_OP_const1s: stack[++sp] = (signed char)dwarf2_parse_byte(&ctx); break; case DW_OP_const2u: stack[++sp] = dwarf2_parse_u2(&ctx); break; @@ -3138,7 +3140,7 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w case DW_OP_consts: stack[++sp] = dwarf2_leb128_as_signed(&ctx); break; case DW_OP_deref: tmp = 0; - if (!sw_read_mem(csw, stack[sp], &tmp, ctx.word_size)) + if (!sw_read_mem(csw, stack[sp], &tmp, module->format_info[DFI_DWARF]->u.dwarf2_info->word_size)) { ERR("Couldn't read memory at %s\n", wine_dbgstr_longlong(stack[sp])); tmp = 0; @@ -3176,7 +3178,7 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w case DW_OP_bra: tmp = (short)dwarf2_parse_u2(&ctx); if (!stack[sp--]) ctx.data += tmp; break; case DW_OP_GNU_encoded_addr: tmp = dwarf2_parse_byte(&ctx); - stack[++sp] = dwarf2_parse_augmentation_ptr(&ctx, tmp); + stack[++sp] = dwarf2_parse_augmentation_ptr(&ctx, tmp, module->format_info[DFI_DWARF]->u.dwarf2_info->word_size); break; case DW_OP_regx: stack[++sp] = get_context_reg(module, csw, context, dwarf2_leb128_as_unsigned(&ctx)); @@ -3320,7 +3322,7 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, end = fde_ctx.data + len; } else end = NULL; - dwarf2_parse_augmentation_ptr(&fde_ctx, info.lsda_encoding); /* handler_data */ + dwarf2_parse_augmentation_ptr(&fde_ctx, info.lsda_encoding, modfmt->u.dwarf2_info->word_size); /* handler_data */ if (end) fde_ctx.data = end; execute_cfa_instructions(pair.effective, &fde_ctx, ip, &info);
1
0
0
0
Eric Pouech : dbghelp/dwarf: Pass a parse_cuhead_t to compute_location().
by Alexandre Julliard
09 Sep '21
09 Sep '21
Module: wine Branch: master Commit: bb5d9cf63d60dc6b477baf2081fffb8408882dd2 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=bb5d9cf63d60dc6b477baf20…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:34:20 2021 +0200 dbghelp/dwarf: Pass a parse_cuhead_t to compute_location(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 78b2c685286..d31ad8c89c2 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -662,7 +662,8 @@ static unsigned dwarf2_map_register(int regno, const struct module* module) } static enum location_error -compute_location(const struct module *module, dwarf2_traverse_context_t* ctx, struct location* loc, +compute_location(const struct module *module, const dwarf2_cuhead_t* head, + dwarf2_traverse_context_t* ctx, struct location* loc, HANDLE hproc, const struct location* frame) { DWORD_PTR tmp, stack[64]; @@ -719,7 +720,7 @@ compute_location(const struct module *module, dwarf2_traverse_context_t* ctx, st else switch (op) { case DW_OP_nop: break; - case DW_OP_addr: stack[++stk] = dwarf2_parse_addr(ctx, ctx->word_size); break; + case DW_OP_addr: stack[++stk] = dwarf2_parse_addr_head(ctx, head); break; case DW_OP_const1u: stack[++stk] = dwarf2_parse_byte(ctx); break; case DW_OP_const1s: stack[++stk] = dwarf2_parse_byte(ctx); break; case DW_OP_const2u: stack[++stk] = dwarf2_parse_u2(ctx); break; @@ -828,7 +829,7 @@ compute_location(const struct module *module, dwarf2_traverse_context_t* ctx, st DWORD_PTR addr = stack[stk--]; DWORD_PTR deref = 0; - if (!ReadProcessMemory(hproc, (void*)addr, &deref, ctx->word_size, NULL)) + if (!ReadProcessMemory(hproc, (void*)addr, &deref, head->word_size, NULL)) { WARN("Couldn't read memory at %lx\n", addr); return loc_err_cant_read; @@ -868,7 +869,7 @@ compute_location(const struct module *module, dwarf2_traverse_context_t* ctx, st case 1: stack[++stk] = *(unsigned char*)&deref; break; case 2: stack[++stk] = *(unsigned short*)&deref; break; case 4: stack[++stk] = *(DWORD*)&deref; break; - case 8: if (ctx->word_size >= derefsize) stack[++stk] = deref; break; + case 8: if (head->word_size >= derefsize) stack[++stk] = deref; break; } } else @@ -935,7 +936,7 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, lctx.end_data = xloc.u.block.ptr + xloc.u.block.size; lctx.word_size = ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; - err = compute_location(ctx->module, &lctx, loc, NULL, frame); + err = compute_location(ctx->module, &ctx->head, &lctx, loc, NULL, frame); if (err < 0) { loc->kind = loc_error; @@ -948,7 +949,7 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, *ptr = xloc.u.block.size; memcpy(ptr + 1, xloc.u.block.ptr, xloc.u.block.size); loc->offset = (ULONG_PTR)ptr; - compute_location(ctx->module, &lctx, loc, NULL, frame); + compute_location(ctx->module, &ctx->head, &lctx, loc, NULL, frame); } } return TRUE; @@ -2503,6 +2504,17 @@ static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE return FALSE; } +static const dwarf2_cuhead_t* get_cuhead_from_func(const struct symt_function* func) +{ + if (func && symt_check_tag(func->container, SymTagCompiland)) + { + struct symt_compiland* c = (struct symt_compiland*)func->container; + return (const dwarf2_cuhead_t*)c->user; + } + FIXME("Should have a compilation unit head\n"); + return NULL; +} + static enum location_error loc_compute_frame(struct process* pcs, const struct module_format* modfmt, const struct symt_function* func, @@ -2534,7 +2546,8 @@ static enum location_error loc_compute_frame(struct process* pcs, modfmt->u.dwarf2_info->debug_loc.address + pframe->offset, ip, &lctx)) return loc_err_out_of_scope; - if ((err = compute_location(modfmt->module, &lctx, frame, pcs->handle, NULL)) < 0) return err; + if ((err = compute_location(modfmt->module, get_cuhead_from_func(func), + &lctx, frame, pcs->handle, NULL)) < 0) return err; if (frame->kind >= loc_user) { WARN("Couldn't compute runtime frame location\n"); @@ -3363,7 +3376,8 @@ static void dwarf2_location_compute(struct process* pcs, } do_compute: /* now get the variable */ - err = compute_location(modfmt->module, &lctx, loc, pcs->handle, &frame); + err = compute_location(modfmt->module, get_cuhead_from_func(func), + &lctx, loc, pcs->handle, &frame); break; case loc_register: case loc_regrel:
1
0
0
0
Eric Pouech : dbghelp/dwarf: Pass dwarf2_cuhead_t for addr details to swallow_attribute.
by Alexandre Julliard
09 Sep '21
09 Sep '21
Module: wine Branch: master Commit: d12c7548061b53c2b251f16fd595f48f8cf80b60 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d12c7548061b53c2b251f16f…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:34:14 2021 +0200 dbghelp/dwarf: Pass dwarf2_cuhead_t for addr details to swallow_attribute. 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, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 07f06c4fa82..78b2c685286 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -451,6 +451,7 @@ static void dwarf2_parse_abbrev_set(dwarf2_traverse_context_t* abbrev_ctx, } static void dwarf2_swallow_attribute(dwarf2_traverse_context_t* ctx, + const dwarf2_cuhead_t* head, const dwarf2_abbrev_entry_attr_t* abbrev_attr) { unsigned step; @@ -461,7 +462,7 @@ static void dwarf2_swallow_attribute(dwarf2_traverse_context_t* ctx, { case DW_FORM_flag_present: step = 0; break; case DW_FORM_ref_addr: - case DW_FORM_addr: step = ctx->word_size; break; + case DW_FORM_addr: step = head->word_size; break; case DW_FORM_flag: case DW_FORM_data1: case DW_FORM_ref1: step = 1; break; @@ -497,8 +498,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, { case DW_FORM_ref_addr: case DW_FORM_addr: - attr->u.uvalue = dwarf2_get_addr(data, - ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size); + attr->u.uvalue = dwarf2_get_addr(data, ctx->head.word_size); TRACE("addr<0x%lx>\n", attr->u.uvalue); break; @@ -1129,7 +1129,7 @@ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx, for (i = 0, attr = abbrev->attrs; attr; i++, attr = attr->next) { di->data[i] = traverse->data; - dwarf2_swallow_attribute(traverse, attr); + dwarf2_swallow_attribute(traverse, &ctx->head, attr); } } else di->data = NULL;
1
0
0
0
Eric Pouech : dbghelp/dwarf: Add word size parameter to parse_addr() internal function.
by Alexandre Julliard
09 Sep '21
09 Sep '21
Module: wine Branch: master Commit: f4da45d9f5dacc0b4ce1c09ae3685a26f7fc1919 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=f4da45d9f5dacc0b4ce1c09a…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:34:08 2021 +0200 dbghelp/dwarf: Add word size parameter to parse_addr() internal function. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 19545e2b72b..07f06c4fa82 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -351,13 +351,18 @@ static ULONG_PTR dwarf2_get_addr(const unsigned char* ptr, unsigned word_size) return ret; } -static ULONG_PTR dwarf2_parse_addr(dwarf2_traverse_context_t* ctx) +static inline ULONG_PTR dwarf2_parse_addr(dwarf2_traverse_context_t* ctx, unsigned word_size) { - ULONG_PTR ret = dwarf2_get_addr(ctx->data, ctx->word_size); - ctx->data += ctx->word_size; + ULONG_PTR ret = dwarf2_get_addr(ctx->data, word_size); + ctx->data += word_size; return ret; } +static inline ULONG_PTR dwarf2_parse_addr_head(dwarf2_traverse_context_t* ctx, const dwarf2_cuhead_t* head) +{ + return dwarf2_parse_addr(ctx, head->word_size); +} + static const char* dwarf2_debug_traverse_ctx(const dwarf2_traverse_context_t* ctx) { return wine_dbg_sprintf("ctx(%p)", ctx->data); @@ -714,7 +719,7 @@ compute_location(const struct module *module, dwarf2_traverse_context_t* ctx, st else switch (op) { case DW_OP_nop: break; - case DW_OP_addr: stack[++stk] = dwarf2_parse_addr(ctx); break; + case DW_OP_addr: stack[++stk] = dwarf2_parse_addr(ctx, ctx->word_size); break; case DW_OP_const1u: stack[++stk] = dwarf2_parse_byte(ctx); break; case DW_OP_const1s: stack[++stk] = dwarf2_parse_byte(ctx); break; case DW_OP_const2u: stack[++stk] = dwarf2_parse_u2(ctx); break; @@ -1050,10 +1055,10 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in *plow = ULONG_MAX; *phigh = 0; - while (traverse.data + 2 * traverse.word_size < traverse.end_data) + while (traverse.data + 2 * ctx->head.word_size < traverse.end_data) { - low = dwarf2_parse_addr(&traverse); - high = dwarf2_parse_addr(&traverse); + 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 < *plow) *plow = low; @@ -2303,7 +2308,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, end_sequence = TRUE; break; case DW_LNE_set_address: - address = ctx->load_offset + dwarf2_parse_addr(&traverse); + address = ctx->load_offset + dwarf2_parse_addr_head(&traverse, &ctx->head); break; case DW_LNE_define_file: FIXME("not handled define file %s\n", debugstr_a((char *)traverse.data)); @@ -2608,7 +2613,7 @@ static ULONG_PTR dwarf2_parse_augmentation_ptr(dwarf2_traverse_context_t* ctx, u switch (encoding & 0x0f) { case DW_EH_PE_native: - return base + dwarf2_parse_addr(ctx); + return base + dwarf2_parse_addr(ctx, ctx->word_size); case DW_EH_PE_leb128: return base + dwarf2_leb128_as_unsigned(ctx); case DW_EH_PE_data2: @@ -3107,7 +3112,7 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w else switch (opcode) { case DW_OP_nop: break; - case DW_OP_addr: stack[++sp] = dwarf2_parse_addr(&ctx); break; + case DW_OP_addr: stack[++sp] = dwarf2_parse_addr(&ctx, ctx.word_size); break; case DW_OP_const1u: stack[++sp] = dwarf2_parse_byte(&ctx); break; case DW_OP_const1s: stack[++sp] = (signed char)dwarf2_parse_byte(&ctx); break; case DW_OP_const2u: stack[++sp] = dwarf2_parse_u2(&ctx); break;
1
0
0
0
Eric Pouech : dbghelp/dwarf: Share compilation unit header information.
by Alexandre Julliard
09 Sep '21
09 Sep '21
Module: wine Branch: master Commit: d648dcd3a6addca18ea25a07aa31764021ea4e9a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d648dcd3a6addca18ea25a07…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:34:02 2021 +0200 dbghelp/dwarf: Share compilation unit header information. Store cu information for dwarf content - in each compiland - and queue the unique one's inside the module. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/dwarf.c | 25 +++++++++++++++++++++++++ dlls/dbghelp/symbol.c | 1 + 3 files changed, 27 insertions(+) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index f9191ae1205..2d4efafd041 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -179,6 +179,7 @@ struct symt_compiland ULONG_PTR address; unsigned source; struct vector vchildren; /* global variables & functions */ + void* user; /* when debug info provider needs to store information */ }; struct symt_data diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 0ba15fd338c..19545e2b72b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -193,6 +193,8 @@ typedef struct dwarf2_parse_context_s /* stored in the dbghelp's module internal structure for later reuse */ struct dwarf2_module_info_s { + dwarf2_cuhead_t** cuheads; + unsigned num_cuheads; dwarf2_section_t debug_loc; dwarf2_section_t debug_frame; dwarf2_section_t eh_frame; @@ -2335,6 +2337,26 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, return TRUE; } +unsigned dwarf2_cache_cuhead(struct dwarf2_module_info_s* module, struct symt_compiland* c, const dwarf2_cuhead_t* head) +{ + dwarf2_cuhead_t* ah; + unsigned i; + for (i = 0; i < module->num_cuheads; ++i) + { + if (memcmp(module->cuheads[i], head, sizeof(*head)) == 0) + { + c->user = module->cuheads[i]; + return TRUE; + } + } + if (!(ah = pool_alloc(&c->container->module->pool, sizeof(*head)))) return FALSE; + memcpy(ah, head, sizeof(*head)); + module->cuheads = realloc(module->cuheads, ++module->num_cuheads * sizeof(head)); + module->cuheads[module->num_cuheads - 1] = ah; + c->user = ah; + return TRUE; +} + static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, struct module* module, const struct elf_thunk_area* thunks, @@ -3475,6 +3497,7 @@ static void dwarf2_module_remove(struct process* pcs, struct module_format* modf { dwarf2_fini_section(&modfmt->u.dwarf2_info->debug_loc); dwarf2_fini_section(&modfmt->u.dwarf2_info->debug_frame); + free(modfmt->u.dwarf2_info->cuheads); HeapFree(GetProcessHeap(), 0, modfmt); } @@ -3541,6 +3564,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_loc, fmap, ".debug_loc", ".zdebug_loc", NULL); dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_frame, fmap, ".debug_frame", ".zdebug_frame", NULL); dwarf2_modfmt->u.dwarf2_info->eh_frame = eh_frame; + dwarf2_modfmt->u.dwarf2_info->cuheads = NULL; + dwarf2_modfmt->u.dwarf2_info->num_cuheads = 0; while (mod_ctx.data < mod_ctx.end_data) { diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 8f192662b7d..28c906c10a3 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -210,6 +210,7 @@ struct symt_compiland* symt_new_compiland(struct module* module, sym->address = address; sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); + sym->user = NULL; } return sym; }
1
0
0
0
Eric Pouech : dbghelp/dwarf: Add dwarf2_cuhead_s structure to hold compilation unit parsing info.
by Alexandre Julliard
09 Sep '21
09 Sep '21
Module: wine Branch: master Commit: 1c8869e79abf80e416793032c604917d2de6361c URL:
https://source.winehq.org/git/wine.git/?a=commit;h=1c8869e79abf80e416793032…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:33:55 2021 +0200 dbghelp/dwarf: Add dwarf2_cuhead_s structure to hold compilation unit parsing info. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5ce60b3bf5b..0ba15fd338c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -167,6 +167,12 @@ typedef struct dwarf2_traverse_context_s #define sc_unknown 1 #define sc_num 2 +typedef struct dwarf2_cuhead_s +{ + unsigned char word_size; /* size of a word on target machine */ + unsigned char version; +} dwarf2_cuhead_t; + typedef struct dwarf2_parse_context_s { const dwarf2_section_t* sections; @@ -181,6 +187,7 @@ typedef struct dwarf2_parse_context_s ULONG_PTR ref_offset; struct symt* symt_cache[sc_num]; /* void, unknown */ char* cpp_name; + dwarf2_cuhead_t head; } dwarf2_parse_context_t; /* stored in the dbghelp's module internal structure for later reuse */ @@ -2340,7 +2347,6 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, dwarf2_traverse_context_t cu_ctx; const unsigned char* comp_unit_start = mod_ctx->data; ULONG_PTR cu_length; - unsigned short cu_version; ULONG_PTR cu_abbrev_offset; BOOL ret = FALSE; /* FIXME this is a temporary configuration while adding support for dwarf3&4 bits */ @@ -2350,16 +2356,16 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, cu_ctx.data = mod_ctx->data; cu_ctx.end_data = mod_ctx->data + cu_length; mod_ctx->data += cu_length; - cu_version = dwarf2_parse_u2(&cu_ctx); + ctx.head.version = dwarf2_parse_u2(&cu_ctx); cu_abbrev_offset = dwarf2_parse_u4(&cu_ctx); - cu_ctx.word_size = dwarf2_parse_byte(&cu_ctx); + ctx.head.word_size = cu_ctx.word_size = dwarf2_parse_byte(&cu_ctx); TRACE("Compilation Unit Header found at 0x%x:\n", (int)(comp_unit_start - sections[section_debug].address)); TRACE("- length: %lu\n", cu_length); - TRACE("- version: %u\n", cu_version); + TRACE("- version: %u\n", ctx.head.version); TRACE("- abbrev_offset: %lu\n", cu_abbrev_offset); - TRACE("- word_size: %u\n", cu_ctx.word_size); + TRACE("- word_size: %u\n", ctx.head.word_size); if (max_supported_dwarf_version == 0) { @@ -2368,14 +2374,14 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, max_supported_dwarf_version = (v >= 2 && v <= 4) ? v : 2; } - if (cu_version < 2 || cu_version > max_supported_dwarf_version) + if (ctx.head.version < 2 || ctx.head.version > max_supported_dwarf_version) { if (max_supported_dwarf_version > 2) WARN("%u DWARF version unsupported. Wine dbghelp only support DWARF 2 up to %u.\n", - cu_version, max_supported_dwarf_version); + ctx.head.version, max_supported_dwarf_version); else WARN("%u DWARF version unsupported. Wine dbghelp only support DWARF 2.\n", - cu_version); + ctx.head.version); return FALSE; }
1
0
0
0
Eric Pouech : dbghelp/dwarf: Allow tweaking from env variable which DWARF version is to be loaded.
by Alexandre Julliard
09 Sep '21
09 Sep '21
Module: wine Branch: master Commit: 31b6640e48f222ef0fe7d56c21825a3e0ee3054f URL:
https://source.winehq.org/git/wine.git/?a=commit;h=31b6640e48f222ef0fe7d56c…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 8 08:33:49 2021 +0200 dbghelp/dwarf: Allow tweaking from env variable which DWARF version is to be loaded. This is a temporary feature while implementing the required bits for Dwarf3 and Dwarf4 format. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index c6657c87f18..5ce60b3bf5b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2343,6 +2343,8 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, unsigned short cu_version; ULONG_PTR cu_abbrev_offset; BOOL ret = FALSE; + /* FIXME this is a temporary configuration while adding support for dwarf3&4 bits */ + static LONG max_supported_dwarf_version = 0; cu_length = dwarf2_parse_u4(mod_ctx); cu_ctx.data = mod_ctx->data; @@ -2359,10 +2361,21 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, TRACE("- abbrev_offset: %lu\n", cu_abbrev_offset); TRACE("- word_size: %u\n", cu_ctx.word_size); - if (cu_version != 2) + if (max_supported_dwarf_version == 0) { - WARN("%u DWARF version unsupported. Wine dbghelp only support DWARF 2.\n", - cu_version); + char* env = getenv("DBGHELP_DWARF_VERSION"); + LONG v = env ? atol(env) : 2; + max_supported_dwarf_version = (v >= 2 && v <= 4) ? v : 2; + } + + if (cu_version < 2 || cu_version > max_supported_dwarf_version) + { + if (max_supported_dwarf_version > 2) + WARN("%u DWARF version unsupported. Wine dbghelp only support DWARF 2 up to %u.\n", + cu_version, max_supported_dwarf_version); + else + WARN("%u DWARF version unsupported. Wine dbghelp only support DWARF 2.\n", + cu_version); return FALSE; }
1
0
0
0
Rémi Bernon : dinput8/tests: Move HID driver tests from ntoskrnl.exe.
by Alexandre Julliard
09 Sep '21
09 Sep '21
Module: wine Branch: master Commit: 6aef301e08b4e1d59215f7a94bebc06a8cfe071b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=6aef301e08b4e1d59215f7a9…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 9 08:50:08 2021 +0200 dinput8/tests: Move HID driver tests from ntoskrnl.exe. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/Makefile.in | 12 +- dlls/dinput8/tests/dinput.c | 4 +- dlls/{ntoskrnl.exe => dinput8}/tests/driver_hid.c | 507 +++-- dlls/dinput8/tests/driver_hid.h | 451 +++++ .../tests/driver_hid.spec | 0 dlls/dinput8/tests/hid.c | 2121 ++++++++++++++++++++ dlls/dinput8/tests/pop_hid_macros.h | 83 + dlls/dinput8/tests/psh_hid_macros.h | 85 + dlls/ntoskrnl.exe/tests/Makefile.in | 4 - dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1594 --------------- 10 files changed, 3004 insertions(+), 1857 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=6aef301e08b4e1d59215…
1
0
0
0
← Newer
1
...
74
75
76
77
78
79
80
...
103
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
Results per page:
10
25
50
100
200