January 2011 - Wine-Commits

Hans Leidekker : msi: Downgrade a warning.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 3ada9f2c082bc1927fea3f08c59724568ac1b246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ada9f2c082bc1927fea3f08c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 19 12:05:52 2011 +0100 msi: Downgrade a warning. Unreferenced files are normal when applying a patch. --- dlls/msi/files.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 9d0e01a..1205690 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -187,7 +187,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, f = get_loaded_file(package, file); if (!f) { - WARN("unknown file in cabinet (%s)\n", debugstr_w(file)); + TRACE("unknown file in cabinet (%s)\n", debugstr_w(file)); return FALSE; }

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirectDraw7 iface.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 97451080964a50c1ed14ae6656e2bf61c222ba3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=97451080964a50c1ed14ae665… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 19 01:42:43 2011 +0100 ddraw: COM cleanup for the IDirectDraw7 iface. --- dlls/ddraw/ddraw.c | 289 +++++++++++++++++++++++--------------------- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 2 +- dlls/ddraw/main.c | 12 +- dlls/ddraw/palette.c | 2 +- dlls/ddraw/surface.c | 2 +- 6 files changed, 160 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97451080964a50c1ed14a…

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirectDraw iface.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: a59347fcd26f1d38d9ddc1af5f77d8d027b70d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59347fcd26f1d38d9ddc1af5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 19 01:33:42 2011 +0100 ddraw: COM cleanup for the IDirectDraw iface. --- dlls/ddraw/ddraw.c | 130 ++++++++++++++++++++++++++++---------------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 2 +- dlls/ddraw/main.c | 4 +- dlls/ddraw/surface.c | 2 +- 5 files changed, 87 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a59347fcd26f1d38d9ddc…

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3D3 iface.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 97f9b02a26342ee4b7f1ef04f3759a3de9fa0bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f9b02a26342ee4b7f1ef04f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 19 01:30:21 2011 +0100 ddraw: COM cleanup for the IDirect3D3 iface. --- dlls/ddraw/ddraw.c | 88 +++++++++++++++++++++++++++---------------- dlls/ddraw/ddraw_private.h | 7 +--- dlls/ddraw/device.c | 6 +- 3 files changed, 59 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97f9b02a26342ee4b7f1e…

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3D7 iface.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 497944f2bd374939b930bff6f8b699f84fe4f20c URL: http://source.winehq.org/git/wine.git/?a=commit;h=497944f2bd374939b930bff6f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 19 01:32:36 2011 +0100 ddraw: COM cleanup for the IDirect3D7 iface. --- dlls/ddraw/ddraw.c | 57 ++++++++++++++++++++++++++----------------- dlls/ddraw/ddraw_private.h | 7 +---- dlls/ddraw/device.c | 4 +- dlls/ddraw/surface.c | 3 +- 4 files changed, 39 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=497944f2bd374939b930b…

1 0

Eric Pouech : dbghelp, winedump: Added definition for S_FRAMEPROC_V2 symbol (CodeView).
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 67a55feeaf3dea6a6ea66e5ee161d762e88b64c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a55feeaf3dea6a6ea66e5ee… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 18 21:49:47 2011 +0100 dbghelp, winedump: Added definition for S_FRAMEPROC_V2 symbol (CodeView). --- dlls/dbghelp/msc.c | 2 +- include/wine/mscvpdb.h | 15 +++++++-------- tools/winedump/msc.c | 19 +++++++++---------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 91927b3..0c90b00 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1935,7 +1935,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root /* the symbols we can safely ignore for now */ case 0x112c: - case S_FUNCINFO_V2: + case S_FRAMEINFO_V2: case S_SECUCOOKIE_V3: case S_SECTINFO_V3: case S_SUBSECTINFO_V3: diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 99734c7..e72bee5 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1568,15 +1568,14 @@ union codeview_symbol { short int len; short int id; - unsigned int unknown1; /* maybe size (of what ?) */ + unsigned int sz_frame; /* size of frame */ unsigned int unknown2; unsigned int unknown3; - unsigned int unknown4; /* maybe size (of what ?) */ - unsigned int unknown5; /* maybe address <offset and segment> (of what ?) */ - unsigned short unknown6; - unsigned short flags; - unsigned int unknown7; - } func_info_v2; + unsigned int sz_saved_regs; /* size of saved registers from callee */ + unsigned int eh_offset; /* offset for exception handler */ + unsigned short eh_sect; /* section for exception handler */ + unsigned int flags; + } frame_info_v2; }; #define S_COMPILAND_V1 0x0001 @@ -1630,7 +1629,7 @@ union codeview_symbol #define S_REGREL_V2 0x100d #define S_LTHREAD_V2 0x100e #define S_GTHREAD_V2 0x100f -#define S_FUNCINFO_V2 0x1012 +#define S_FRAMEINFO_V2 0x1012 #define S_COMPILAND_V2 0x1013 #define S_COMPILAND_V3 0x1101 diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index c917309..5b276fb 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1101,16 +1101,15 @@ int codeview_dump_symbols(const void* root, unsigned long size) break; /* Additional function information */ - case S_FUNCINFO_V2: - printf("\tFunction info V2 unk1:%x unk2:%x unk3:%x unk4:%x unk5:%x unk6:%x flags:%04x unk7:%x\n", - sym->func_info_v2.unknown1, - sym->func_info_v2.unknown2, - sym->func_info_v2.unknown3, - sym->func_info_v2.unknown4, - sym->func_info_v2.unknown5, - sym->func_info_v2.unknown6, - sym->func_info_v2.flags, - sym->func_info_v2.unknown7); + case S_FRAMEINFO_V2: + printf("\tS-Frame-Info V2: frame-size:%x unk2:%x unk3:%x saved-regs-sz:%x eh(%04x:%08x) flags:%08x\n", + sym->frame_info_v2.sz_frame, + sym->frame_info_v2.unknown2, + sym->frame_info_v2.unknown3, + sym->frame_info_v2.sz_saved_regs, + sym->frame_info_v2.eh_sect, + sym->frame_info_v2.eh_offset, + sym->frame_info_v2.flags); break; case S_SECUCOOKIE_V3:

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirectDraw2 iface.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 4202f09100552f52c3a1c2587d122d2ac73b80b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4202f09100552f52c3a1c2587… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 19 01:36:36 2011 +0100 ddraw: COM cleanup for the IDirectDraw2 iface. --- dlls/ddraw/ddraw.c | 114 ++++++++++++++++++++++++++++--------------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 2 +- dlls/ddraw/main.c | 4 +- dlls/ddraw/surface.c | 2 +- 5 files changed, 79 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4202f09100552f52c3a1c…

1 0

Eric Pouech : dbghelp: Use AT_range attribute (for function, block... addresses) when AT_low_pc and AT_high_pc are not present.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 60fbda43cb92f4574f96383eeefc734e1dbf0fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fbda43cb92f4574f96383ee… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 18 21:49:05 2011 +0100 dbghelp: Use AT_range attribute (for function, block... addresses) when AT_low_pc and AT_high_pc are not present. --- dlls/dbghelp/dwarf.c | 108 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 84 insertions(+), 24 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 2130c71..d60a5fd 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -163,7 +163,7 @@ typedef struct dwarf2_section_s DWORD_PTR rva; } dwarf2_section_t; -enum dwarf2_sections {section_debug, section_string, section_abbrev, section_line, section_max}; +enum dwarf2_sections {section_debug, section_string, section_abbrev, section_line, section_ranges, section_max}; typedef struct dwarf2_traverse_context_s { @@ -945,6 +945,61 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, } /****************************************************************** + * dwarf2_read_range + * + * read a range for a given debug_info (either using AT_range attribute, in which + * case we don't return all the details, or using AT_low_pc & AT_high_pc attributes) + * in all cases, range is relative to beginning of compilation unit + */ +static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_info_t* di, + unsigned long* plow, unsigned long* phigh) +{ + struct attribute range; + + if (dwarf2_find_attribute(ctx, di, DW_AT_ranges, &range)) + { + dwarf2_traverse_context_t traverse; + unsigned long low, high; + + 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; + while (traverse.data + 2 * traverse.word_size < traverse.end_data) + { + low = dwarf2_parse_addr(&traverse); + high = dwarf2_parse_addr(&traverse); + if (low == 0 && high == 0) break; + if (low == ULONG_MAX) FIXME("unsupported yet (base address selection)\n"); + 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 == *phigh) {FIXME("entry found, but low=high\n"); return FALSE;} + + return TRUE; + } + else + { + struct attribute low_pc; + struct attribute high_pc; + + 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; + } +} + +/****************************************************************** * dwarf2_read_one_debug_info * * Loads into memory one debug info entry, and recursively its children (if any) @@ -1563,17 +1618,19 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, const dwarf2_debug_info_t* di) { struct symt_block* block; - struct attribute low_pc; - struct attribute high_pc; + unsigned long low_pc, high_pc; TRACE("%s, for %s\n", dwarf2_debug_ctx(subpgm->ctx), dwarf2_debug_di(di)); - if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_low_pc, &low_pc)) low_pc.u.uvalue = 0; - if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_high_pc, &high_pc)) high_pc.u.uvalue = 0; + if (!dwarf2_read_range(subpgm->ctx, di, &low_pc, &high_pc)) + { + FIXME("cannot read range\n"); + return; + } block = symt_open_func_block(subpgm->ctx->module, subpgm->func, parent_block, - subpgm->ctx->load_offset + low_pc.u.uvalue - subpgm->func->address, - high_pc.u.uvalue - low_pc.u.uvalue); + subpgm->ctx->load_offset + low_pc - subpgm->func->address, + high_pc - low_pc); if (di->abbrev->have_child) /** any interest to not have child ? */ { @@ -1614,19 +1671,19 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, const dwarf2_debug_info_t* di) { struct symt_block* block; - struct attribute low_pc; - struct attribute high_pc; + unsigned long low_pc, high_pc; TRACE("%s, for %s\n", dwarf2_debug_ctx(subpgm->ctx), dwarf2_debug_di(di)); - if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_low_pc, &low_pc)) - low_pc.u.uvalue = 0; - if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_high_pc, &high_pc)) - high_pc.u.uvalue = 0; + if (!dwarf2_read_range(subpgm->ctx, di, &low_pc, &high_pc)) + { + FIXME("no range\n"); + return; + } block = symt_open_func_block(subpgm->ctx->module, subpgm->func, parent_block, - subpgm->ctx->load_offset + low_pc.u.uvalue - subpgm->func->address, - high_pc.u.uvalue - low_pc.u.uvalue); + subpgm->ctx->load_offset + low_pc - subpgm->func->address, + high_pc - low_pc); if (di->abbrev->have_child) /** any interest to not have child ? */ { @@ -1683,8 +1740,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, struct symt_compiland* compiland) { struct attribute name; - struct attribute low_pc; - struct attribute high_pc; + unsigned long low_pc, high_pc; struct attribute is_decl; struct attribute inline_flags; struct symt* ret_type; @@ -1710,14 +1766,17 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, return NULL; } - if (!dwarf2_find_attribute(ctx, di, DW_AT_low_pc, &low_pc)) low_pc.u.uvalue = 0; - if (!dwarf2_find_attribute(ctx, di, DW_AT_high_pc, &high_pc)) high_pc.u.uvalue = 0; + if (!dwarf2_read_range(ctx, di, &low_pc, &high_pc)) + { + FIXME("cannot get range\n"); + 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.u.uvalue, - ctx->thunks) >= 0) + 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; @@ -1733,8 +1792,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, if (!is_decl.u.uvalue) { subpgm.func = symt_new_function(ctx->module, compiland, name.u.string, - ctx->load_offset + low_pc.u.uvalue, - high_pc.u.uvalue - low_pc.u.uvalue, + ctx->load_offset + low_pc, high_pc - low_pc, &sig_type->symt); di->symt = &subpgm.func->symt; } @@ -3119,7 +3177,7 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, dwarf2_section_t section[section_max]; dwarf2_traverse_context_t mod_ctx; struct image_section_map debug_sect, debug_str_sect, debug_abbrev_sect, - debug_line_sect; + debug_line_sect, debug_ranges_sect; BOOL ret = TRUE; struct module_format* dwarf2_modfmt; @@ -3130,6 +3188,7 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", &debug_abbrev_sect); dwarf2_init_section(&section[section_string], fmap, ".debug_str", &debug_str_sect); dwarf2_init_section(&section[section_line], fmap, ".debug_line", &debug_line_sect); + dwarf2_init_section(&section[section_ranges], fmap, ".debug_ranges", &debug_ranges_sect); if (section[section_debug].address == IMAGE_NO_MAP || section[section_abbrev].address == IMAGE_NO_MAP || @@ -3192,6 +3251,7 @@ leave: image_unmap_section(&debug_abbrev_sect); image_unmap_section(&debug_str_sect); image_unmap_section(&debug_line_sect); + image_unmap_section(&debug_ranges_sect); return ret; }

1 0

Nikolay Sivov : oleaut32/tests: Fix a dead path in test (Valgrind).
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 9d15067c251565e27f25d16a7142bacb1a8a8d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d15067c251565e27f25d16a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 18 19:52:19 2011 +0300 oleaut32/tests: Fix a dead path in test (Valgrind). --- dlls/oleaut32/tests/safearray.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 7c16ef7..e653141 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -127,9 +127,11 @@ static HRESULT CALLBACK IRecordInfoImpl_GetSize(IRecordInfo *iface, ULONG* size) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->sizeCalled++; - *size = 17; if (fail_GetSize) + { + *size = RECORD_SIZE_FAIL; return E_UNEXPECTED; + } *size = RECORD_SIZE; return S_OK; } @@ -846,7 +848,10 @@ static void test_VectorCreateLockDestroy(void) int element; if (!pSafeArrayCreateVector) + { + win_skip("SafeArrayCreateVector not supported\n"); return; + } sa = pSafeArrayCreateVector(VT_UI1, 0, 0); ok(sa != NULL, "SACV with 0 elements failed.\n"); @@ -1256,7 +1261,10 @@ static void test_SafeArrayCopyData(void) int dimension,size=1; if (!pSafeArrayCopyData) + { + win_skip("SafeArrayCopyData not supported\n"); return; + } for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++) { @@ -1342,7 +1350,10 @@ static void test_SafeArrayCreateEx(void) int dimension; if (!pSafeArrayCreateEx) + { + win_skip("SafeArrayCreateEx not supported\n"); return; + } for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++) { @@ -1467,6 +1478,8 @@ static void test_SafeArrayCreateEx(void) ok(iRec->clearCalled == sab[0].cElements, "Destroy->Clear called %d times\n", iRec->clearCalled); ok(iRec->ref == START_REF_COUNT, "Wrong iRec refcount %d\n", iRec->ref); } + else + SafeArrayDestroy(sa); } static void test_SafeArrayClear(void) @@ -1672,7 +1685,6 @@ static void test_SafeArrayChangeTypeEx(void) hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_EMPTY); ok(hres == DISP_E_TYPEMISMATCH, "CTE VT_ARRAY|VT_UI1 returned %x\n", hres); VariantClear(&v); - } static void test_SafeArrayDestroyData (void) @@ -1724,6 +1736,7 @@ START_TEST(safearray) GETPTR(SafeArrayGetVartype); GETPTR(SafeArrayCreateEx); GETPTR(SafeArrayCreateVector); + GETPTR(SafeArrayGetRecordInfo); check_for_VT_INT_PTR(); test_safearray();

1 0

Nikolay Sivov : shell32/tests: Fix a PIDL leak in tests (Valgrind).
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: cc1dc2e69304f7cef00099cd97d9a53e74cbd4ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1dc2e69304f7cef00099cd9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 18 22:37:14 2011 +0300 shell32/tests: Fix a PIDL leak in tests (Valgrind). --- dlls/shell32/tests/shelllink.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index f213221..f754efd 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -911,6 +911,7 @@ static void test_GetIconLocation(void) pidl = path_to_pidl(mypath); r = IShellLinkA_SetIDList(sl, pidl); ok(r == S_OK, "SetPath failed (0x%08x)\n", r); + pILFree(pidl); i = 0xdeadbeef; strcpy(buffer, "garbage");

1 0