March 2011 - Wine-Commits - list.winehq.org

Eric Pouech : dbghelp: Fix bug in managing COFF files array.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 1d4381664c238157268f1ac80593c9fd163df71c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4381664c238157268f1ac80… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:52 2011 +0100 dbghelp: Fix bug in managing COFF files array. --- dlls/dbghelp/coff.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index b0a085c..17ba7be 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -138,12 +138,18 @@ static void coff_add_symbol(struct CoffFile* coff_file, struct symt* sym) { if (coff_file->neps + 1 >= coff_file->neps_alloc) { - coff_file->neps_alloc *= 2; - coff_file->entries = (coff_file->entries) ? - HeapReAlloc(GetProcessHeap(), 0, coff_file->entries, - coff_file->neps_alloc * sizeof(struct symt*)) : - HeapAlloc(GetProcessHeap(), 0, - coff_file->neps_alloc * sizeof(struct symt*)); + if (coff_file->entries) + { + coff_file->neps_alloc *= 2; + coff_file->entries = HeapReAlloc(GetProcessHeap(), 0, coff_file->entries, + coff_file->neps_alloc * sizeof(struct symt*)); + } + else + { + coff_file->neps_alloc = 32; + coff_file->entries = HeapAlloc(GetProcessHeap(), 0, + coff_file->neps_alloc * sizeof(struct symt*)); + } } coff_file->entries[coff_file->neps++] = sym; }

1 0

Austin English : mshtml: Avoid shadowing a parameter.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: a71f3683afe719895dcf71b73d81ef5c5c36e037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71f3683afe719895dcf71b73… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:07:39 2011 -0800 mshtml: Avoid shadowing a parameter. --- dlls/mshtml/dispex.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4706309..327b5db 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -106,16 +106,16 @@ static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) } if(!typeinfos[tid]) { - ITypeInfo *typeinfo; + ITypeInfo *ti; - hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &typeinfo); + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); if(FAILED(hres)) { ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); return hres; } - if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), typeinfo, NULL)) - ITypeInfo_Release(typeinfo); + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); } *typeinfo = typeinfos[tid];

1 0

Eric Pouech : dbghelp: When parsing a subprogram in dwarf debug format, properly handle scoping for functions with both declaration & definition.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: e21062f9fa676b229c002a44a85c68d013f78e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21062f9fa676b229c002a44a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:26 2011 +0100 dbghelp: When parsing a subprogram in dwarf debug format, properly handle scoping for functions with both declaration & definition. --- dlls/dbghelp/dwarf.c | 52 ++++++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 343c54b..ac20442 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2,7 +2,7 @@ * File dwarf.c - read dwarf2 information from the ELF modules * * Copyright (C) 2005, Raphael Junqueira - * Copyright (C) 2006-2010, Eric Pouech + * Copyright (C) 2006-2011, Eric Pouech * Copyright (C) 2010, Alexandre Julliard * * This library is free software; you can redistribute it and/or @@ -957,12 +957,27 @@ static const char* dwarf2_get_cpp_name(dwarf2_parse_context_t* ctx, dwarf2_debug { char* last; struct attribute diname; + struct attribute spec; if (di->abbrev->tag == DW_TAG_compile_unit) return name; if (!ctx->cpp_name) ctx->cpp_name = pool_alloc(&ctx->pool, MAX_SYM_NAME); last = ctx->cpp_name + MAX_SYM_NAME - strlen(name); strcpy(last, name); + + /* if the di is a definition, but has also a (previous) declaration, then scope must + * be gotten from declaration not definition + */ + if (dwarf2_find_attribute(ctx, di, DW_AT_specification, &spec) && spec.gotten_from == attr_direct) + { + di = sparse_array_find(&ctx->debug_info_table, spec.u.uvalue); + if (!di) + { + FIXME("Should have found the debug info entry\n"); + return NULL; + } + } + for (di = di->parent; di; di = di->parent) { switch (di->abbrev->tag) @@ -1033,10 +1048,7 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in if (!dwarf2_find_attribute(ctx, di, DW_AT_low_pc, &low_pc) || !dwarf2_find_attribute(ctx, di, DW_AT_high_pc, &high_pc)) - { - FIXME("missing low or high value\n"); return FALSE; - } *plow = low_pc.u.uvalue; *phigh = high_pc.u.uvalue; return TRUE; @@ -1834,43 +1846,35 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, return NULL; } + if (dwarf2_find_attribute(ctx, di, DW_AT_declaration, &is_decl) && + is_decl.u.uvalue && is_decl.gotten_from == attr_direct) + { + /* it's a real declaration, skip it */ + return NULL; + } if (!dwarf2_read_range(ctx, di, &low_pc, &high_pc)) { - FIXME("cannot get range\n"); + WARN("cannot get range for %s\n", name.u.string); return NULL; } - /* As functions (defined as inline assembly) get debug info with dwarf * (not the case for stabs), we just drop Wine's thunks here... * Actual thunks will be created in elf_module from the symbol table */ if (elf_is_in_thunk_area(ctx->load_offset + low_pc, ctx->thunks) >= 0) return NULL; - if (!dwarf2_find_attribute(ctx, di, DW_AT_declaration, &is_decl)) - is_decl.u.uvalue = 0; - if (!(ret_type = dwarf2_lookup_type(ctx, di))) { ret_type = ctx->symt_cache[sc_void]; assert(ret_type); } - /* FIXME: assuming C source code */ sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C); - if (!is_decl.u.uvalue || is_decl.gotten_from != attr_direct) - { - subpgm.func = symt_new_function(ctx->module, ctx->compiland, - dwarf2_get_cpp_name(ctx, di, name.u.string), - ctx->load_offset + low_pc, high_pc - low_pc, - &sig_type->symt); - di->symt = &subpgm.func->symt; - } - else - { - WARN("no location for '%s::%s'\n", ctx->name_space, name.u.string); - subpgm.func = NULL; - } - + subpgm.func = symt_new_function(ctx->module, ctx->compiland, + dwarf2_get_cpp_name(ctx, di, name.u.string), + ctx->load_offset + low_pc, high_pc - low_pc, + &sig_type->symt); + di->symt = &subpgm.func->symt; subpgm.ctx = ctx; if (!dwarf2_compute_location_attr(ctx, di, DW_AT_frame_base, &subpgm.frame, NULL))

1 0

Eric Pouech : dbghelp: When building the by address lookup table, speed up resorting by always taking into account that existing symbols are already sorted .
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 9d3be00df22d87bc3aa328afc0a393fc721528b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d3be00df22d87bc3aa328afc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:47 2011 +0100 dbghelp: When building the by address lookup table, speed up resorting by always taking into account that existing symbols are already sorted. --- dlls/dbghelp/symbol.c | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 64bc4eb..e92d998 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -879,16 +879,38 @@ static inline unsigned where_to_insert(struct module* module, unsigned high, con */ static BOOL resort_symbols(struct module* module) { + int delta; + if (!(module->module.NumSyms = module->num_symbols)) return FALSE; - /* FIXME: what's the optimal value here ??? */ - if (module->num_sorttab && module->num_symbols <= module->num_sorttab + 30) + /* we know that set from 0 up to num_sorttab is already sorted + * so sort the remaining (new) symbols, and merge the two sets + * (unless the first set is empty) + */ + delta = module->num_symbols - module->num_sorttab; + qsort(&module->addr_sorttab[module->num_sorttab], delta, sizeof(struct symt_ht*), symt_cmp_addr); + if (module->num_sorttab) { - int i, delta, ins_idx = module->num_sorttab, prev_ins_idx; - struct symt_ht* tmp[30]; + int i, ins_idx = module->num_sorttab, prev_ins_idx; + static struct symt_ht** tmp; + static unsigned num_tmp; - delta = module->num_symbols - module->num_sorttab; + if (num_tmp < delta) + { + static struct symt_ht** new; + if (tmp) + new = HeapReAlloc(GetProcessHeap(), 0, tmp, delta * sizeof(struct symt_ht*)); + else + new = HeapAlloc(GetProcessHeap(), 0, delta * sizeof(struct symt_ht*)); + if (!new) + { + module->num_sorttab = 0; + return resort_symbols(module); + } + tmp = new; + num_tmp = delta; + } memcpy(tmp, &module->addr_sorttab[module->num_sorttab], delta * sizeof(struct symt_ht*)); qsort(tmp, delta, sizeof(struct symt_ht*), symt_cmp_addr); @@ -902,10 +924,6 @@ static BOOL resort_symbols(struct module* module) module->addr_sorttab[ins_idx + i] = tmp[i]; } } - else - { - qsort(module->addr_sorttab, module->num_symbols, sizeof(struct symt_ht*), symt_cmp_addr); - } module->num_sorttab = module->num_symbols; return module->sortlist_valid = TRUE; }

1 0

Austin English : gdiplus: Avoid shadowing a parameter.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 3ac2c9eea03550dfee70254e25536ebd9863e023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac2c9eea03550dfee70254e2… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:07:14 2011 -0800 gdiplus: Avoid shadowing a parameter. --- dlls/gdiplus/graphicspath.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 992bd7c..971ab31 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -384,8 +384,7 @@ GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath *path, GDIPCONST GpPointF *po /* close figure */ if(stat == Ok){ - INT count = path->pathdata.Count; - path->pathdata.Types[count - 1] |= PathPointTypeCloseSubpath; + path->pathdata.Types[path->pathdata.Count - 1] |= PathPointTypeCloseSubpath; path->newfigure = TRUE; }

1 0

Eric Pouech : dbghelp: Quirk for supporting anonymous UDT (class, struct, enum...).
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: d52e42e985784693f3b68c00a2869bf1dbe24fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d52e42e985784693f3b68c00a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:32 2011 +0100 dbghelp: Quirk for supporting anonymous UDT (class, struct, enum...). --- dlls/dbghelp/dwarf.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index ac20442..8714c90 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1406,7 +1406,9 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; + /* quirk... FIXME provide real support for anonymous UDTs */ + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) + name.u.string = "zz_anon_zz"; if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = 0; di->symt = &symt_new_udt(ctx->module, dwarf2_get_cpp_name(ctx, di, name.u.string),

1 0

Eric Pouech : dbghelp: Add helper to get global address out of symt, instead of going though symt_get_info.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: dca2d350adbee357cad6f61dcc0607491435652c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca2d350adbee357cad6f61dc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:38 2011 +0100 dbghelp: Add helper to get global address out of symt, instead of going though symt_get_info. --- dlls/dbghelp/coff.c | 7 +-- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 4 +- dlls/dbghelp/macho_module.c | 2 +- dlls/dbghelp/symbol.c | 37 ++++++++---------- dlls/dbghelp/type.c | 80 +++++++++++++++++++++------------------- 6 files changed, 65 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dca2d350adbee357cad6f…

1 0

Eric Pouech : dbghelp: Add support for parsing methods (in C++ classes) for dwarf debug format.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: a575351b3019ad86628c8325af62920b75c5d2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a575351b3019ad86628c8325a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:20 2011 +0100 dbghelp: Add support for parsing methods (in C++ classes) for dwarf debug format. --- dlls/dbghelp/dwarf.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4e72a5c..343c54b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1377,6 +1377,9 @@ static void dwarf2_parse_udt_member(dwarf2_parse_context_t* ctx, if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); } +static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, + dwarf2_debug_info_t* di); + static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di, enum UdtKind udt) @@ -1411,13 +1414,15 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, case DW_TAG_enumeration_type: dwarf2_parse_enumeration_type(ctx, child); break; + case DW_TAG_subprogram: + dwarf2_parse_subprogram(ctx, child); + break; case DW_TAG_structure_type: case DW_TAG_class_type: case DW_TAG_union_type: case DW_TAG_typedef: /* FIXME: we need to handle nested udt definitions */ case DW_TAG_inheritance: - case DW_TAG_subprogram: case DW_TAG_template_type_param: case DW_TAG_template_value_param: case DW_TAG_variable: @@ -1860,7 +1865,11 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, &sig_type->symt); di->symt = &subpgm.func->symt; } - else subpgm.func = NULL; + else + { + WARN("no location for '%s::%s'\n", ctx->name_space, name.u.string); + subpgm.func = NULL; + } subpgm.ctx = ctx; if (!dwarf2_compute_location_attr(ctx, di, DW_AT_frame_base,

1 0

Eric Pouech : dbghelp: In dwarf debug format, correctly manage the DW_AT_specification attribute.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 0d4a9757c245397f6f8a37e8fe7dc8ab1fb3f96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4a9757c245397f6f8a37e8f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:02 2011 +0100 dbghelp: In dwarf debug format, correctly manage the DW_AT_specification attribute. --- dlls/dbghelp/dwarf.c | 453 ++++++++++++++++++++++++++------------------------ 1 files changed, 232 insertions(+), 221 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d4a9757c245397f6f8a3…

1 0

Alexandre Julliard : ntdll: Fix RtlGetSacl/ DaclSecurityDescriptor for relative descriptors on 64-bit.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: ab7efe727363b52e31ff7a29763a1bcaa623efe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7efe727363b52e31ff7a297… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 13:44:11 2011 +0100 ntdll: Fix RtlGetSacl/DaclSecurityDescriptor for relative descriptors on 64-bit. --- dlls/ntdll/sec.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 6784848..c8e8a4d 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -604,12 +604,15 @@ NTSTATUS WINAPI RtlGetDaclSecurityDescriptor( if ( (*lpbDaclPresent = (SE_DACL_PRESENT & lpsd->Control) ? 1 : 0) ) { - if ((SE_SELF_RELATIVE & lpsd->Control) && lpsd->Dacl) - *pDacl = (PACL)SELF_RELATIVE_FIELD( lpsd, Dacl ); - else - *pDacl = lpsd->Dacl; + if (lpsd->Control & SE_SELF_RELATIVE) + { + SECURITY_DESCRIPTOR_RELATIVE *sdr = pSecurityDescriptor; + if (sdr->Dacl) *pDacl = (PACL)SELF_RELATIVE_FIELD( sdr, Dacl ); + else *pDacl = NULL; + } + else *pDacl = lpsd->Dacl; - *lpbDaclDefaulted = (( SE_DACL_DEFAULTED & lpsd->Control ) ? 1 : 0); + *lpbDaclDefaulted = (lpsd->Control & SE_DACL_DEFAULTED) != 0; } else { @@ -673,12 +676,15 @@ NTSTATUS WINAPI RtlGetSaclSecurityDescriptor( if ( (*lpbSaclPresent = (SE_SACL_PRESENT & lpsd->Control) ? 1 : 0) ) { - if ((SE_SELF_RELATIVE & lpsd->Control) && lpsd->Sacl) - *pSacl = (PACL)SELF_RELATIVE_FIELD( lpsd, Sacl ); - else - *pSacl = lpsd->Sacl; + if (lpsd->Control & SE_SELF_RELATIVE) + { + SECURITY_DESCRIPTOR_RELATIVE *sdr = pSecurityDescriptor; + if (sdr->Sacl) *pSacl = (PACL)SELF_RELATIVE_FIELD( sdr, Sacl ); + else *pSacl = NULL; + } + else *pSacl = lpsd->Sacl; - *lpbSaclDefaulted = (( SE_SACL_DEFAULTED & lpsd->Control ) ? 1 : 0); + *lpbSaclDefaulted = (lpsd->Control & SE_SACL_DEFAULTED) != 0; } return STATUS_SUCCESS; }

1 0