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

Eric Pouech : dbghelp: When parsing dwarf debug info, silence ptr_to_member and imported_declaration entries.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 0816d8f4bfee9d30c45ec0a290f5e1b835b0a5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0816d8f4bfee9d30c45ec0a29… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:30:36 2011 +0100 dbghelp: When parsing dwarf debug info, silence ptr_to_member and imported_declaration entries. --- dlls/dbghelp/dwarf.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 585ea6c..776031e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1358,6 +1358,8 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, 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: /* FIXME: some C++ related stuff */ break; default: @@ -1715,6 +1717,9 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, * Skip it for now */ break; + case DW_TAG_imported_module: + /* C++ stuff to be silenced (for now) */ + break; case DW_TAG_label: dwarf2_parse_subprogram_label(subpgm, child); break; @@ -1974,6 +1979,7 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, case DW_TAG_namespace: case DW_TAG_imported_module: case DW_TAG_imported_declaration: + case DW_TAG_ptr_to_member_type: break; default: FIXME("Unhandled Tag type 0x%lx at %s, for %lu\n",

1 0

Eric Pouech : dbghelp: More precisely manage the inline attribute.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 6d49f958de0de5665c3d9028d53652fa579027ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d49f958de0de5665c3d9028d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:30:42 2011 +0100 dbghelp: More precisely manage the inline attribute. --- dlls/dbghelp/dwarf.c | 3 ++- dlls/dbghelp/dwarf.h | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 776031e..7299314 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1764,7 +1764,8 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, /* if it's an abstract representation of an inline function, there should be * a concrete object that we'll handle */ - if (dwarf2_find_attribute(ctx, di, DW_AT_inline, &inline_flags)) + if (dwarf2_find_attribute(ctx, di, DW_AT_inline, &inline_flags) && + inline_flags.u.uvalue != DW_INL_not_inlined) { TRACE("Function %s declared as inlined (%ld)... skipping\n", name.u.string ? name.u.string : "(null)", inline_flags.u.uvalue); diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 9864ecc..f0557be 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -475,3 +475,8 @@ enum dwarf_call_frame_info #define DW_EH_PE_aligned 0x50 #define DW_EH_PE_indirect 0x80 #define DW_EH_PE_omit 0xff + +#define DW_INL_not_inlined 0x00 +#define DW_INL_inlined 0x01 +#define DW_INL_declared_not_inlined 0x02 +#define DW_INL_declared_inlined 0x03

1 0

Max TenEyck Woodbury : c2man: Fix .spec file flag recognition.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 3d6ae97aa3e607793bca6ab3cef433c9ec00d40a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6ae97aa3e607793bca6ab3c… Author: Max TenEyck Woodbury <max(a)mtew.isa-geek.net> Date: Tue Mar 8 18:29:02 2011 -0500 c2man: Fix .spec file flag recognition. --- tools/c2man.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index db9f25f..868e4fc 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -152,7 +152,7 @@ sub process_spec_file($) { $flags |= $FLAG_REGISTER; } - s/ \-[a-z0-9]+//g; # Strip flags + s/ \-[a-z0-9=_]+//g; # Strip flags if( /^(([0-9]+)|@) / ) {

1 0

Juan Lang : wininet/tests: Add a couple more tests for GetUrlCacheEntryInfoEx.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: c485996e5ea71f27f2e794461ecfdfe07a9070ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c485996e5ea71f27f2e794461… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 8 11:34:23 2011 -0800 wininet/tests: Add a couple more tests for GetUrlCacheEntryInfoEx. --- dlls/wininet/tests/urlcache.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 630b5cc..526a70d 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -96,7 +96,7 @@ static void test_find_url_cache_entriesA(void) static void test_GetUrlCacheEntryInfoExA(void) { BOOL ret; - DWORD cbCacheEntryInfo; + DWORD cbCacheEntryInfo, cbRedirectUrl; LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; SetLastError(0xdeadbeef); @@ -142,6 +142,16 @@ static void test_GetUrlCacheEntryInfoExA(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetUrlCacheEntryInfoEx should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + + /* Querying the redirect URL fails with ERROR_INVALID_PARAMETER */ + SetLastError(0xdeadbeef); + ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, NULL, NULL, &cbRedirectUrl, NULL, 0); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, &cbCacheEntryInfo, NULL, &cbRedirectUrl, NULL, 0); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } static void test_RetrieveUrlCacheEntryA(void)

1 0

Eric Pouech : dbghelp: Add hierarchical information in die object.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 770e3b5ddf9e0bdf8b3250fb8a75a1a3e4ac143b URL: http://source.winehq.org/git/wine.git/?a=commit;h=770e3b5ddf9e0bdf8b3250fb8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:30:47 2011 +0100 dbghelp: Add hierarchical information in die object. --- dlls/dbghelp/dwarf.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 7299314..c61ec9c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -154,6 +154,7 @@ typedef struct dwarf2_debug_info_s struct symt* symt; const unsigned char** data; struct vector children; + struct dwarf2_debug_info_s* parent; } dwarf2_debug_info_t; typedef struct dwarf2_section_s @@ -1006,6 +1007,7 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in */ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx, dwarf2_traverse_context_t* traverse, + dwarf2_debug_info_t* parent_di, dwarf2_debug_info_t** pdi) { const dwarf2_abbrev_entry_t*abbrev; @@ -1036,6 +1038,7 @@ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx, if (!di) return FALSE; di->abbrev = abbrev; di->symt = NULL; + di->parent = parent_di; if (abbrev->num_attr) { @@ -1052,7 +1055,7 @@ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx, vector_init(&di->children, sizeof(dwarf2_debug_info_t*), 16); while (traverse->data < traverse->end_data) { - if (!dwarf2_read_one_debug_info(ctx, traverse, &child)) return FALSE; + if (!dwarf2_read_one_debug_info(ctx, traverse, di, &child)) return FALSE; if (!child) break; where = vector_add(&di->children, &ctx->pool); if (!where) return FALSE; @@ -2238,7 +2241,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx.abbrev_table, &ctx.pool); sparse_array_init(&ctx.debug_info_table, sizeof(dwarf2_debug_info_t), 128); - dwarf2_read_one_debug_info(&ctx, &cu_ctx, &di); + dwarf2_read_one_debug_info(&ctx, &cu_ctx, NULL, &di); if (di->abbrev->tag == DW_TAG_compile_unit) {

1 0

Eric Pouech : dbghelp: Add support for namespace support out of dwarf debug format.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 0035d5df3fc1424c126386f0717a233047e5421c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0035d5df3fc1424c126386f07… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:30:56 2011 +0100 dbghelp: Add support for namespace support out of dwarf debug format. --- dlls/dbghelp/dwarf.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index c61ec9c..f8eaad4 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -192,6 +192,7 @@ typedef struct dwarf2_parse_context_s unsigned long load_offset; unsigned long ref_offset; struct symt* symt_cache[sc_num]; /* void, int1, int2, int4 */ + char* cpp_name; } dwarf2_parse_context_t; /* stored in the dbghelp's module internal structure for later reuse */ @@ -945,6 +946,41 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, return NULL; } +static const char* dwarf2_get_cpp_name(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di, const char* name) +{ + char* last; + struct attribute diname; + + 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); + for (di = di->parent; di; di = di->parent) + { + switch (di->abbrev->tag) + { + case DW_TAG_namespace: + case DW_TAG_structure_type: + case DW_TAG_class_type: + case DW_TAG_interface_type: + case DW_TAG_union_type: + if (dwarf2_find_attribute(ctx, di, DW_AT_name, &diname)) + { + size_t len = strlen(diname.u.string); + last -= 2 + len; + if (last < ctx->cpp_name) return NULL; + memcpy(last, diname.u.string, len); + last[len] = last[len + 1] = ':'; + } + break; + default: + break; + } + } + return last; +} + /****************************************************************** * dwarf2_read_range * @@ -1331,7 +1367,8 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = 0; - di->symt = &symt_new_udt(ctx->module, name.u.string, size.u.uvalue, udt)->symt; + di->symt = &symt_new_udt(ctx->module, dwarf2_get_cpp_name(ctx, di, name.u.string), + size.u.uvalue, udt)->symt; if (di->abbrev->have_child) /** any interest to not have child ? */ { @@ -1493,7 +1530,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, ext.u.uvalue = 0; loc.offset += subpgm->ctx->load_offset; symt_new_global_variable(subpgm->ctx->module, subpgm->compiland, - name.u.string, !ext.u.uvalue, + dwarf2_get_cpp_name(subpgm->ctx, di, name.u.string), !ext.u.uvalue, loc, 0, param_type); break; default: @@ -1800,7 +1837,8 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C); if (!is_decl.u.uvalue) { - subpgm.func = symt_new_function(ctx->module, compiland, name.u.string, + subpgm.func = symt_new_function(ctx->module, 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; @@ -1921,6 +1959,28 @@ static struct symt* dwarf2_parse_subroutine_type(dwarf2_parse_context_t* ctx, return di->symt = &sig_type->symt; } +static void dwarf2_parse_namespace(dwarf2_parse_context_t* ctx, + dwarf2_debug_info_t* di, + struct symt_compiland* compiland) +{ + if (di->symt) return; + + TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); + + di->symt = ctx->symt_cache[sc_void]; + if (di->abbrev->have_child) /** any interest to not have child ? */ + { + dwarf2_debug_info_t* child; + unsigned int i; + + for (i = 0; i < vector_length(&di->children); i++) + { + child = *(dwarf2_debug_info_t**)vector_at(&di->children, i); + dwarf2_load_one_entry(ctx, child, compiland); + } + } +} + static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di, struct symt_compiland* compiland) @@ -1979,8 +2039,10 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, dwarf2_parse_variable(&subpgm, NULL, di); } break; - /* silence a couple of C++ defines */ case DW_TAG_namespace: + dwarf2_parse_namespace(ctx, di, compiland); + break; + /* silence a couple of C++ defines */ case DW_TAG_imported_module: case DW_TAG_imported_declaration: case DW_TAG_ptr_to_member_type: @@ -2234,6 +2296,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, ctx.ref_offset = comp_unit_start - sections[section_debug].address; memset(ctx.symt_cache, 0, sizeof(ctx.symt_cache)); ctx.symt_cache[sc_void] = &symt_new_basic(module, btVoid, "void", 0)->symt; + ctx.cpp_name = NULL; abbrev_ctx.data = sections[section_abbrev].address + cu_abbrev_offset; abbrev_ctx.end_data = sections[section_abbrev].address + sections[section_abbrev].size;

1 0

Eric Pouech : dbghelp: Store the compiland into the parse context.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 395d734d3301a7ef91189f4786508a92b259e320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395d734d3301a7ef91189f478… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:14 2011 +0100 dbghelp: Store the compiland into the parse context. --- dlls/dbghelp/dwarf.c | 39 ++++++++++++++++----------------------- 1 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index cc30ffd..4e72a5c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -187,6 +187,7 @@ typedef struct dwarf2_parse_context_s unsigned section; struct pool pool; struct module* module; + struct symt_compiland* compiland; const struct elf_thunk_area*thunks; struct sparse_array abbrev_table; struct sparse_array debug_info_table; @@ -634,8 +635,7 @@ static BOOL dwarf2_find_attribute(const dwarf2_parse_context_t* ctx, return FALSE; } -static void dwarf2_load_one_entry(dwarf2_parse_context_t*, dwarf2_debug_info_t*, - struct symt_compiland*); +static void dwarf2_load_one_entry(dwarf2_parse_context_t*, dwarf2_debug_info_t*); #define Wine_DW_no_register 0x7FFFFFFF @@ -946,7 +946,7 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, if (!type->symt) { /* load the debug info entity */ - dwarf2_load_one_entry(ctx, type, NULL); + dwarf2_load_one_entry(ctx, type); } return type->symt; } @@ -1501,7 +1501,6 @@ static struct symt* dwarf2_parse_enumeration_type(dwarf2_parse_context_t* ctx, typedef struct dwarf2_subprogram_s { dwarf2_parse_context_t* ctx; - struct symt_compiland* compiland; struct symt_function* func; BOOL non_computed_variable; struct location frame; @@ -1549,7 +1548,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_external, &ext)) ext.u.uvalue = 0; loc.offset += subpgm->ctx->load_offset; - symt_new_global_variable(subpgm->ctx->module, subpgm->compiland, + symt_new_global_variable(subpgm->ctx->module, subpgm->ctx->compiland, dwarf2_get_cpp_name(subpgm->ctx, di, name.u.string), !ext.u.uvalue, loc, 0, param_type); break; @@ -1625,7 +1624,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, name.u.string, value.form); v.n1.n2.vt = VT_EMPTY; } - di->symt = &symt_new_constant(subpgm->ctx->module, subpgm->compiland, + di->symt = &symt_new_constant(subpgm->ctx->module, subpgm->ctx->compiland, name.u.string, param_type, &v)->symt; } else @@ -1797,8 +1796,7 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, } static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, - dwarf2_debug_info_t* di, - struct symt_compiland* compiland) + dwarf2_debug_info_t* di) { struct attribute name; unsigned long low_pc, high_pc; @@ -1856,7 +1854,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, 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, compiland, + 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); @@ -1865,7 +1863,6 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, else subpgm.func = NULL; subpgm.ctx = ctx; - subpgm.compiland = compiland; if (!dwarf2_compute_location_attr(ctx, di, DW_AT_frame_base, &subpgm.frame, NULL)) { @@ -1972,8 +1969,7 @@ static struct symt* dwarf2_parse_subroutine_type(dwarf2_parse_context_t* ctx, } static void dwarf2_parse_namespace(dwarf2_parse_context_t* ctx, - dwarf2_debug_info_t* di, - struct symt_compiland* compiland) + dwarf2_debug_info_t* di) { struct vector* children; dwarf2_debug_info_t* child; @@ -1989,13 +1985,12 @@ static void dwarf2_parse_namespace(dwarf2_parse_context_t* ctx, if (children) for (i = 0; i < vector_length(children); i++) { child = *(dwarf2_debug_info_t**)vector_at(children, i); - dwarf2_load_one_entry(ctx, child, compiland); + dwarf2_load_one_entry(ctx, child); } } static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, - dwarf2_debug_info_t* di, - struct symt_compiland* compiland) + dwarf2_debug_info_t* di) { switch (di->abbrev->tag) { @@ -2033,7 +2028,7 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, dwarf2_parse_enumeration_type(ctx, di); break; case DW_TAG_subprogram: - dwarf2_parse_subprogram(ctx, di, compiland); + dwarf2_parse_subprogram(ctx, di); break; case DW_TAG_subroutine_type: dwarf2_parse_subroutine_type(ctx, di); @@ -2043,7 +2038,6 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, dwarf2_subprogram_t subpgm; subpgm.ctx = ctx; - subpgm.compiland = compiland; subpgm.func = NULL; subpgm.frame.kind = loc_absolute; subpgm.frame.offset = 0; @@ -2052,7 +2046,7 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, } break; case DW_TAG_namespace: - dwarf2_parse_namespace(ctx, di, compiland); + dwarf2_parse_namespace(ctx, di); break; /* silence a couple of C++ defines */ case DW_TAG_imported_module: @@ -2336,15 +2330,14 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, if (!dwarf2_find_attribute(&ctx, di, DW_AT_low_pc, &low_pc)) low_pc.u.uvalue = 0; - di->symt = &symt_new_compiland(module, - ctx.load_offset + low_pc.u.uvalue, - source_new(module, comp_dir.u.string, name.u.string))->symt; - + ctx.compiland = symt_new_compiland(module, ctx.load_offset + low_pc.u.uvalue, + source_new(module, comp_dir.u.string, name.u.string)); + di->symt = &ctx.compiland->symt; children = dwarf2_get_di_children(&ctx, di); if (children) for (i = 0; i < vector_length(children); i++) { child = *(dwarf2_debug_info_t**)vector_at(children, i); - dwarf2_load_one_entry(&ctx, child, (struct symt_compiland*)di->symt); + dwarf2_load_one_entry(&ctx, child); } if (dwarf2_find_attribute(&ctx, di, DW_AT_stmt_list, &stmt_list)) {

1 0

Nikolay Sivov : msvcrt: Add _get_output_format() and return default value.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 0512829a27b6401610545ed15ab6cbc83097070c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0512829a27b6401610545ed15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 22:41:07 2011 +0300 msvcrt: Add _get_output_format() and return default value. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/misc.c | 9 +++++++++ dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/headers.c | 1 + dlls/msvcrt/tests/printf.c | 17 +++++++++++++++++ include/msvcrt/stdio.h | 4 ++++ 9 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d732d69..1570fd4 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -684,7 +684,7 @@ @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle -@ stub _get_output_format +@ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr @ stub _get_printf_count_output @ stub _get_purecall_handler diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1631fdb..65f9510 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -528,7 +528,7 @@ @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ cdecl _get_osplatform(ptr) msvcrt._get_osplatform @ stub _get_osver -@ stub _get_output_format +@ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr @ stub _get_printf_count_output @ stub _get_purecall_handler diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8148caf..badfe65 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -518,7 +518,7 @@ @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle -@ stub _get_output_format +@ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr @ stub _get_printf_count_output @ stub _get_purecall_handler diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index d37fc72..b32fdb9 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -253,3 +253,12 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, MSVCRT_mergesort(base, secondarr, size, compar, 0, nmemb-1, context); MSVCRT_free(secondarr); } + +/********************************************************************* + * _get_output_format (MSVCRT.@) + * + */ +unsigned int CDECL _get_output_format(void) +{ + return 0; +} diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 1c7120f..311437a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -769,6 +769,9 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int); #define MSVCRT__WRITE_ABORT_MSG 1 #define MSVCRT__CALL_REPORTFAULT 2 +/* _get_output_format return code */ +#define MSVCRT__TWO_DIGIT_EXPONENT 0x1 + void __cdecl MSVCRT_free(void*); void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f75c0d9..5d07736 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -473,7 +473,7 @@ @ cdecl _get_osfhandle(long) @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform # stub _get_osver -# stub _get_output_format +@ cdecl _get_output_format() # stub _get_pgmptr @ cdecl _get_sbh_threshold() # stub _get_wenviron diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index 25e2277..7c102b4 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -457,6 +457,7 @@ static void test_defines(void) CHECK_DEF(_UNDERFLOW); CHECK_DEF(_WRITE_ABORT_MSG); CHECK_DEF(_CALL_REPORTFAULT); + CHECK_DEF(_TWO_DIGIT_EXPONENT); } #endif /* __WINE_USE_MSVCRT */ diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index ddf4801..22ad1f6 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -43,6 +43,7 @@ static int (__cdecl *p__ecvt_s)(char *buffer, size_t length, double number, int ndigits, int *decpt, int *sign); static int (__cdecl *p__fcvt_s)(char *buffer, size_t length, double number, int ndigits, int *decpt, int *sign); +static unsigned int (__cdecl *p__get_output_format)(void); static void init( void ) { @@ -53,6 +54,7 @@ static void init( void ) p__vsnwprintf_s = (void *)GetProcAddress(hmod, "_vsnwprintf_s"); p__ecvt_s = (void *)GetProcAddress(hmod, "_ecvt_s"); p__fcvt_s = (void *)GetProcAddress(hmod, "_fcvt_s"); + p__get_output_format = (void *)GetProcAddress(hmod, "_get_output_format"); } static void test_sprintf( void ) @@ -1013,6 +1015,20 @@ static void test_vsnwprintf_s(void) ok( !wcscmp(out1, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); } +static void test__get_output_format(void) +{ + unsigned int ret; + + if (!p__get_output_format) + { + win_skip("_get_output_format not available\n"); + return; + } + + ret = p__get_output_format(); + ok(ret == 0, "got %d\n", ret); +} + START_TEST(printf) { init(); @@ -1026,4 +1042,5 @@ START_TEST(printf) test_vscprintf(); test_vscwprintf(); test_vsnwprintf_s(); + test__get_output_format(); } diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index fa5290f..c167110 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -94,6 +94,9 @@ FILE* __cdecl __iob_func(void); #define stdout (_iob+STDOUT_FILENO) #define stderr (_iob+STDERR_FILENO) +/* return value for _get_output_format */ +#define _TWO_DIGIT_EXPONENT 0x1 + #ifndef _STDIO_DEFINED #define _STDIO_DEFINED int __cdecl _fcloseall(void); @@ -173,6 +176,7 @@ int __cdecl vprintf(const char*,__ms_va_list); int __cdecl vprintf_s(const char*,__ms_va_list); int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); +unsigned int __cdecl _get_output_format(void); #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED

1 0

Nikolay Sivov : msxml3: Put together similar tests using tabled test data.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 6194d3014508b0d01ff321f1c50ec4430a511607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6194d3014508b0d01ff321f1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 22:09:03 2011 +0300 msxml3: Put together similar tests using tabled test data. --- dlls/msxml3/tests/domdoc.c | 486 ++++++++++++++++++++------------------------ 1 files changed, 225 insertions(+), 261 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6194d3014508b0d01ff32…

1 0

Vincent Povirk : gdiplus: Fix a handle leak in GdipDrawString.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: d0e6aa0204a5cd6c7d2f4696019f6f87897cf478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e6aa0204a5cd6c7d2f46960… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 8 16:59:19 2011 -0600 gdiplus: Fix a handle leak in GdipDrawString. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 43513c8..e9412c8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4411,7 +4411,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0); gdifont = CreateFontIndirectW(&lfw); - DeleteObject(SelectObject(graphics->hdc, CreateFontIndirectW(&lfw))); + DeleteObject(SelectObject(graphics->hdc, gdifont)); if (!format || format->align == StringAlignmentNear) {

1 0