January 2007 - Wine-Commits

Eric Pouech : winedump: Added helper to convert a guid to a string.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: 07d681b0d95ea758e6112c1e8939b69b41ec3fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07d681b0d95ea758e6112c1e8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 5 21:42:32 2007 +0100 winedump: Added helper to convert a guid to a string. --- tools/winedump/dump.c | 9 +++++++++ tools/winedump/lnk.c | 16 +++------------- tools/winedump/pdb.c | 8 ++++---- tools/winedump/winedump.h | 1 + 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 21074d1..bdd9e93 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -131,6 +131,15 @@ void dump_unicode_str( const WCHAR *str, printf( "\"" ); } +char* guid_to_string(const GUID* guid, char* str, size_t sz) +{ + snprintf(str, sz, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return str; +} + const void* PRD(unsigned long prd, unsigned long len) { return (prd + len > dump_total_len) ? NULL : (const char*)dump_base + prd; diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index 13f3542..91f109c 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -106,14 +106,6 @@ typedef struct lnk_string_tag static unsigned offset; -static void guid_to_string(const GUID* guid, char *str) -{ - sprintf(str, "{%08x-%04x-%04x-%02X%02X-%02X%02X%02X%02X%02X%02X}", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); -} - static const void* fetch_block(void) { const unsigned* u; @@ -292,7 +284,7 @@ static int dump_advertise_info(const cha GUID guid; if (base85_to_guid(avt->bufA, &guid)) - guid_to_string( &guid, prod_str ); + guid_to_string( &guid, prod_str, sizeof(prod_str) ); else strcpy( prod_str, "?" ); @@ -311,7 +303,7 @@ static int dump_advertise_info(const cha } if (feat && feat[0] == '>' && base85_to_guid( &feat[1], &guid )) - guid_to_string( &guid, feat_str ); + guid_to_string( &guid, feat_str, sizeof(feat_str) ); else feat_str[0] = 0; @@ -345,12 +337,10 @@ void lnk_dump(void) offset = 0; hdr = fetch_block(); - guid_to_string(&hdr->MagicGuid, guid); - printf("Header\n"); printf("------\n\n"); printf("Size: %04x\n", hdr->dwSize); - printf("GUID: %s\n", guid); + printf("GUID: %s\n", guid_to_string(&hdr->MagicGuid, guid, sizeof(guid))); printf("FileAttr: %08x\n", hdr->dwFileAttr); printf("FileLength: %08x\n", hdr->dwFileLength); diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 9243b18..3074745 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -625,18 +625,18 @@ static void pdb_ds_dump(void) if (root) { const char* ptr; + char guid_str[40]; + printf("Root:\n" "\tVersion: %u\n" "\tTimeDateStamp: %08x\n" "\tAge: %08x\n" - "\tguid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n" + "\tguid %s\n" "\tcbNames: %08x\n", root->Version, root->TimeDateStamp, root->Age, - root->guid.Data1, root->guid.Data2, root->guid.Data3, - root->guid.Data4[0], root->guid.Data4[1], root->guid.Data4[2], root->guid.Data4[3], - root->guid.Data4[4], root->guid.Data4[5], root->guid.Data4[6], root->guid.Data4[7], + guid_to_string(&root->guid, guid_str, sizeof(guid_str)), root->cbNames); for (ptr = &root->names[0]; ptr < &root->names[0] + root->cbNames; ptr += strlen(ptr) + 1) printf("\tString: %s\n", ptr); diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 540bbd0..8aee2f9 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -239,6 +239,7 @@ void dump_unicode_str( const void dump_file_header(const IMAGE_FILE_HEADER *); void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *, UINT); void dump_section(const IMAGE_SECTION_HEADER *); +char* guid_to_string(const GUID* guid, char *str, size_t sz); enum FileSig get_kind_exec(void); void dos_dump( void );

1 0

Eric Pouech : winedump: Handling of S_SALIGN symbols.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: b675ac3919b1252e032fb54b858c4e0ec1ccf701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b675ac3919b1252e032fb54b8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 5 21:43:00 2007 +0100 winedump: Handling of S_SALIGN symbols. --- tools/winedump/msc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index d423d09..a516afb 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1158,6 +1158,10 @@ int codeview_dump_symbols(const void* ro } break; + case S_ALIGN_V1: + /* simply skip it */ + break; + default: printf(">>> Unsupported symbol-id %x sz=%d\n", sym->generic.id, sym->generic.len + 2); dump_data((const void*)sym, sym->generic.len + 2, " ");

1 0

Eric Pouech : winedump: Removed cvinclude.h.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: bbef1cbd2d018cfb2caa91df541dbde85dbcfbbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbef1cbd2d018cfb2caa91df5… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 5 21:42:45 2007 +0100 winedump: Removed cvinclude.h. --- dlls/dbghelp/msc.c | 47 ++++++------ include/wine/mscvpdb.h | 121 +++++++++++++++++++++++----- tools/winedump/cvinclude.h | 187 -------------------------------------------- tools/winedump/debug.c | 61 +++++++------- 4 files changed, 154 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbef1cbd2d018cfb2caa9…

1 0

Eric Pouech : winedump: Re-use existing codeview facilities to dump OMF files.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: 8a68e46953ba13d7e7bac875776b0fef8a8572db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a68e46953ba13d7e7bac8757… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 5 21:42:53 2007 +0100 winedump: Re-use existing codeview facilities to dump OMF files. --- include/wine/mscvpdb.h | 12 ------------ tools/winedump/debug.c | 36 +----------------------------------- 2 files changed, 1 insertions(+), 47 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 064b5fa..abbd539 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1650,18 +1650,6 @@ typedef struct OMFSymHash unsigned long cbHAddr; } OMFSymHash; -/* FIXME: to be removed (and using codeview_symbol type above) - * Symbol table entry */ -typedef struct DATASYM32 -{ - unsigned short reclen; - unsigned short rectyp; - unsigned long typind; - unsigned long off; - unsigned short seg; -} DATASYM32; -typedef DATASYM32 PUBSYM32; - /* sstSegMap section */ typedef struct OMFSegMapDesc diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 37e0b65..3202c25 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -135,18 +135,12 @@ static int dump_cv_sst_global_pub(const long fileoffset; const OMFSymHash* header; const BYTE* symbols; - const BYTE* curpos; - const PUBSYM32* sym; - unsigned symlen; - int recordlen; - char nametmp[256]; fileoffset = Offset(cv_base) + omfde->lfo; printf (" GlobalPub section starts at file offset 0x%lx\n", fileoffset); printf (" Symbol table starts at 0x%lx\n", fileoffset + sizeof (OMFSymHash)); printf ("\n ----- Begin Symbol Table -----\n"); - printf (" (type) (symbol name) (offset) (len) (seg) (ind)\n"); header = PRD(fileoffset, sizeof(OMFSymHash)); if (!header) {printf("Can't get OMF-SymHash, aborting\n");return FALSE;} @@ -154,35 +148,7 @@ static int dump_cv_sst_global_pub(const symbols = PRD(fileoffset + sizeof(OMFSymHash), header->cbSymbol); if (!symbols) {printf("Can't OMF-SymHash details, aborting\n"); return FALSE;} - /* We don't know how many symbols are in this block of memory...only what - * the total size of the block is. Because the symbol's name is tacked - * on to the end of the PUBSYM32 struct, each symbol may take up a different - * # of bytes. This makes it harder to parse through the symbol table, - * since we won't know the exact location of the following symbol until we've - * already parsed the current one. - */ - for (curpos = symbols; curpos < symbols + header->cbSymbol; curpos += recordlen) - { - /* Point to the next PUBSYM32 in the table. - */ - sym = (const PUBSYM32*)curpos; - - if (sym->reclen < sizeof(PUBSYM32)) break; - - symlen = sym->reclen - sizeof(PUBSYM32) + 1; - if (symlen > sizeof(nametmp)) {printf("\nsqueeze%d\n", symlen);symlen = sizeof(nametmp) - 1;} - - memcpy(nametmp, curpos + sizeof (PUBSYM32) + 1, symlen); - nametmp[symlen] = '\0'; - - printf (" 0x%04x %-30.30s [0x%8lx] [0x%4x] %d %ld\n", - sym->rectyp, nametmp, sym->off, sym->reclen, sym->seg, sym->typind); - - /* The entire record is null-padded to the nearest 4-byte - * boundary, so we must do a little extra math to keep things straight. - */ - recordlen = (sym->reclen + 3) & ~3; - } + codeview_dump_symbols(symbols, header->cbSymbol); return TRUE; }

1 0

Eric Pouech : winedump: While dumping NE files, use -j option if present ( as we do for PE files).
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: 1fcb0c1118f973a773103864be22ee816eb76843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcb0c1118f973a773103864b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 5 21:42:26 2007 +0100 winedump: While dumping NE files, use -j option if present (as we do for PE files). --- tools/winedump/main.c | 1 + tools/winedump/ne.c | 20 +++++++++++++++----- tools/winedump/winedump.man.in | 18 ++++++++++-------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index a760ee6..93cd074 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -398,6 +398,7 @@ int main (int argc, char *argv[]) globals.mode = NONE; globals.forward_dll = NULL; globals.input_name = NULL; + globals.dumpsect = NULL; parse_options (argv); diff --git a/tools/winedump/ne.c b/tools/winedump/ne.c index a9f7dc2..9328ccf 100644 --- a/tools/winedump/ne.c +++ b/tools/winedump/ne.c @@ -384,9 +384,19 @@ void ne_dump( void ) if (!dos) return; ne = PRD(dos->e_lfanew, sizeof(*ne)); - dump_ne_header( ne ); - dump_ne_names( ne ); - dump_ne_resources( ne ); - dump_ne_exports( ne ); - for (i = 1; i <= ne->ne_cseg; i++) dump_ne_segment( ne, i ); + if (globals.do_dumpheader || !globals.dumpsect) + dump_ne_header( ne ); + if (globals.do_dumpheader) + dump_ne_names( ne ); + if (globals.dumpsect) + { + BOOL all = strcmp(globals.dumpsect, "ALL") == 0; + + if (all || !strcmp(globals.dumpsect, "resource")) + dump_ne_resources( ne ); + if (all || !strcmp(globals.dumpsect, "export")) + dump_ne_exports( ne ); + } + if (globals.do_dumpheader) + for (i = 1; i <= ne->ne_cseg; i++) dump_ne_segment( ne, i ); } diff --git a/tools/winedump/winedump.man.in b/tools/winedump/winedump.man.in index 5a05c43..fcc596d 100644 --- a/tools/winedump/winedump.man.in +++ b/tools/winedump/winedump.man.in @@ -70,17 +70,19 @@ Turns on symbol demangling. Dumps file header information. This option dumps only the standard PE header structures, along with the COFF sections available in the file. -.IP "\fB-j \fIsect_name\fR" -Dumps only the content of section sect_name (import, -export, debug, resource, tls, clr). -To dump only a given directory, specify them using this -option. Currently the import, export, debug, resource, +.IP "\fB-j \fIdir_name\fR" +Dumps only the content of directory \fIdir_name\fR, for files +which header points to directories. +For PE files, currently the import, export, debug, resource, tls and clr directories are implemented. +For NE files, currently the export and resource directories are +implemented. .IP \fB-x\fR Dumps everything. -This command prints all available information about the -file. You may wish to pipe the output through more/less or -into a file, since a lot of output will be produced. +This command prints all available information (including all +available directories - see \fB-j\fR option) about the file. You may +wish to pipe the output through more/less or into a file, since +a lot of output will be produced. .IP \fB-G\fR Dumps contents of debug section if any (for now, only stabs information is supported).

1 0

Eric Pouech : winedump: Print some basic info for pure DOS file ( which fixes segfault while reading DOS files).
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: d75e0cd1f002e4c794a71acc93c5f7ddcd2ce907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d75e0cd1f002e4c794a71acc9… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 5 21:42:19 2007 +0100 winedump: Print some basic info for pure DOS file (which fixes segfault while reading DOS files). --- tools/winedump/Makefile.in | 1 + tools/winedump/dos.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ tools/winedump/dump.c | 4 +- tools/winedump/winedump.h | 1 + 4 files changed, 74 insertions(+), 2 deletions(-) diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index 32a2a1d..63af00b 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -10,6 +10,7 @@ MODULE = none C_SRCS = \ debug.c \ + dos.c \ dump.c \ emf.c \ le.c \ diff --git a/tools/winedump/dos.c b/tools/winedump/dos.c new file mode 100644 index 0000000..8424f79 --- /dev/null +++ b/tools/winedump/dos.c @@ -0,0 +1,70 @@ +/* + * DOS dumping utility + * + * Copyright 2006 Eric Pouech + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdlib.h> +#include <stdarg.h> +#include <stdio.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#include <time.h> +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#ifdef HAVE_SYS_MMAN_H +#include <sys/mman.h> +#endif +#include <fcntl.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "windef.h" +#include "winbase.h" +#include "winedump.h" + +void dos_dump(void) +{ + const IMAGE_DOS_HEADER* dh; + + if ((dh = PRD(0, sizeof(IMAGE_DOS_HEADER)))) + { + printf("DOS image:\n"); + printf(" Signature: %.2s\n", (const char*)&dh->e_magic); + printf(" Bytes on last page: %u\n", dh->e_cblp); + printf(" Number of pages: %u\n", dh->e_cp); + printf(" Relocations: %u\n", dh->e_crlc); + printf(" Size of header: %u\n", dh->e_cparhdr); + printf(" Min extra paragraphs: %u\n", dh->e_minalloc); + printf(" Max extra paragraphs: %u\n", dh->e_maxalloc); + printf(" Initial stack: %x:%x\n", dh->e_ss, dh->e_sp); + printf(" Checksum: %x\n", dh->e_csum); + printf(" Initial address: %x:%x\n", dh->e_cs, dh->e_ip); + printf(" Relocation (file): %u\n", dh->e_lfarlc); + printf(" Overlay number: %u\n", dh->e_ovno); + printf(" OEM id(info): %x(%x)\n", dh->e_oemid, dh->e_oeminfo); + printf(" Offset to ext header: %x\n", dh->e_lfanew); + } +} diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 6cd9c9e..21074d1 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -151,7 +151,7 @@ static const struct dumper } dumpers[] = { - {SIG_DOS, get_kind_exec, NULL}, + {SIG_DOS, get_kind_exec, dos_dump}, {SIG_PE, get_kind_exec, pe_dump}, {SIG_DBG, get_kind_dbg, dbg_dump}, {SIG_PDB, get_kind_pdb, pdb_dump}, @@ -160,7 +160,7 @@ dumpers[] = {SIG_COFFLIB, get_kind_lib, lib_dump}, {SIG_MDMP, get_kind_mdmp, mdmp_dump}, {SIG_LNK, get_kind_lnk, lnk_dump}, - {SIG_EMF, get_kind_emf, emf_dump}, + {SIG_EMF, get_kind_emf, emf_dump}, {SIG_UNKNOWN, NULL, NULL} /* sentinel */ }; diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 1da28d7..540bbd0 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -241,6 +241,7 @@ void dump_optional_header(con void dump_section(const IMAGE_SECTION_HEADER *); enum FileSig get_kind_exec(void); +void dos_dump( void ); void pe_dump( void ); void ne_dump( void ); void le_dump( void );

1 0

Eric Pouech : winedump: Added ability to dump FPO debug information.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: b63098cf241d46f80c64c9977479ca4e1e8bd240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b63098cf241d46f80c64c9977… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 5 21:42:12 2007 +0100 winedump: Added ability to dump FPO debug information. --- tools/winedump/debug.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 4ce09c8..10ec2d5 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -578,8 +578,33 @@ void dump_codeview(unsigned long base, u void dump_frame_pointer_omission(unsigned long base, unsigned long len) { - /* FPO is used to describe nonstandard stack frames */ - printf("FIXME: FPO (frame pointer omission) debug symbol dumping not implemented yet.\n"); + const FPO_DATA* fpo; + const FPO_DATA* last; + const char* x; + /* FPO is used to describe nonstandard stack frames */ + printf("Range #loc #pmt Prlg #reg Info\n" + "-----------------+----+----+----+----+------------\n"); + + fpo = (const FPO_DATA*)PRD(base, len); + if (!fpo) {printf("Couldn't get FPO blob\n"); return;} + last = (const FPO_DATA*)((const char*)fpo + len); + + while (fpo < last && fpo->ulOffStart) + { + switch (fpo->cbFrame) + { + case FRAME_FPO: x = "FRAME_FPO"; break; + case FRAME_NONFPO: x = "FRAME_NONFPO"; break; + case FRAME_TRAP: x = "FRAME_TRAP"; break; + case FRAME_TSS: x = "case FRAME_TSS"; break; + default: x = NULL; break; + } + printf("%08x-%08x %4u %4u %4u %4u %s%s%s\n", + fpo->ulOffStart, fpo->ulOffStart + fpo->cbProcSize, + fpo->cdwLocals, fpo->cdwParams, fpo->cbProlog, fpo->cbRegs, + x, fpo->fHasSEH ? " SEH" : "", fpo->fUseBP ? " UseBP" : ""); + fpo++; + } } struct stab_nlist

1 0

Eric Pouech : dbghelp: Corrected the map/unmap operations for ELF sections.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: 1b158dd38d04443a974763a23d7734b1670fbdbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b158dd38d04443a974763a23… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Jan 6 09:07:45 2007 +0100 dbghelp: Corrected the map/unmap operations for ELF sections. Now correctly free the mapped areas when no longer used. --- dlls/dbghelp/elf_module.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index eff1b62..61d7edb 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -147,8 +147,8 @@ static const char* elf_map_section(struc return ELF_NO_MAP; /* align required information on page size (we assume pagesize is a power of 2) */ ofst = fmap->sect[sidx].shdr.sh_offset & ~(pgsz - 1); - size = (fmap->sect[sidx].shdr.sh_offset + - fmap->sect[sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1); + size = ((fmap->sect[sidx].shdr.sh_offset + + fmap->sect[sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1)) - ofst; fmap->sect[sidx].mapped = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fmap->fd, ofst); if (fmap->sect[sidx].mapped == ELF_NO_MAP) return ELF_NO_MAP; return fmap->sect[sidx].mapped + (fmap->sect[sidx].shdr.sh_offset & (pgsz - 1)); @@ -163,7 +163,14 @@ static void elf_unmap_section(struct elf { if (sidx >= 0 && sidx < fmap->elfhdr.e_shnum && fmap->sect[sidx].mapped != ELF_NO_MAP) { - munmap((char*)fmap->sect[sidx].mapped, fmap->sect[sidx].shdr.sh_size); + unsigned pgsz = getpagesize(); + unsigned ofst, size; + + ofst = fmap->sect[sidx].shdr.sh_offset & ~(pgsz - 1); + size = ((fmap->sect[sidx].shdr.sh_offset + + fmap->sect[sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1)) - ofst; + if (munmap((char*)fmap->sect[sidx].mapped, size) < 0) + WARN("Couldn't unmap the section\n"); fmap->sect[sidx].mapped = ELF_NO_MAP; } } @@ -957,11 +964,11 @@ static BOOL elf_load_debug_info_from_map else WARN("Couldn't load debug information from %s\n", dbg_link); ret = ret || lret; + elf_unmap_file(&fmap_link); } else WARN("Couldn't load linked debug file for %s\n", module->module.ModuleName); - elf_unmap_file(&fmap_link); } } if (strstr(module->module.ModuleName, "<elf>") ||

1 0

Kai Blin : msacm32: Fix comment and remove unneeded if check (Coverity).
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: c3bf8b88ad18b0c1d08d6530744672d2683049eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3bf8b88ad18b0c1d08d65307… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Jan 6 03:42:31 2007 +0100 msacm32: Fix comment and remove unneeded if check (Coverity). Thanks to Alex Villacís Lasso for comments. --- dlls/msacm32/driver.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index d4ad644..88bce8c 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -426,11 +426,11 @@ LRESULT WINAPI acmDriverMessage(HACMDRIV } if (pAlias != NULL) { - unsigned int iStructSize = 16; - /* This verification is required because DRVCONFIGINFO is 12 bytes - long, yet native msacm reports a 16-byte structure to codecs. + /* DRVCONFIGINFO is only 12 bytes long, but native msacm + * reports a 16-byte structure to codecs, so allocate 16 bytes, + * just to be on the safe side. */ - if (iStructSize < sizeof(DRVCONFIGINFO)) iStructSize = sizeof(DRVCONFIGINFO); + const unsigned int iStructSize = 16; pConfigInfo = HeapAlloc(MSACM_hHeap, 0, iStructSize); if (!pConfigInfo) { ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n");

1 0

Francois Gouget : ole32: Print GetLastError() in decimal with '%u'.
by Alexandre Julliard Jan. 6, 2007

Jan. 6, 2007

Module: wine Branch: master Commit: 386bb905e78c90ac1edb2180b7da59e21a5c77ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=386bb905e78c90ac1edb2180b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 5 21:49:31 2007 +0100 ole32: Print GetLastError() in decimal with '%u'. --- dlls/ole32/rpc.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 455fed7..4f35ea1 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -794,7 +794,7 @@ static HRESULT WINAPI ClientRpcChannelBu if (!PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params)) { - ERR("PostMessage failed with error %d\n", GetLastError()); + ERR("PostMessage failed with error %u\n", GetLastError()); hr = HRESULT_FROM_WIN32(GetLastError()); } } @@ -818,7 +818,7 @@ static HRESULT WINAPI ClientRpcChannelBu */ if (!QueueUserWorkItem(rpc_sendreceive_thread, params, WT_EXECUTEDEFAULT)) { - ERR("QueueUserWorkItem failed with error %x\n", GetLastError()); + ERR("QueueUserWorkItem failed with error %u\n", GetLastError()); hr = E_UNEXPECTED; } else @@ -1381,7 +1381,7 @@ static void __RPC_STUB dispatch_rpc(RPC_ WaitForSingleObject(params->handle, INFINITE); else { - ERR("PostMessage failed with error %d\n", GetLastError()); + ERR("PostMessage failed with error %u\n", GetLastError()); IRpcChannelBuffer_Release(params->chan); IRpcStubBuffer_Release(params->stub); } @@ -1589,7 +1589,7 @@ static DWORD start_local_service(LPCWSTR r = GetLastError(); CloseServiceHandle(handle); - TRACE("StartService returned error %d (%s)\n", r, (r == ERROR_SUCCESS) ? "ok":"failed"); + TRACE("StartService returned error %u (%s)\n", r, (r == ERROR_SUCCESS) ? "ok":"failed"); return r; } @@ -1696,7 +1696,7 @@ HRESULT RPC_GetLocalClassObject(REFCLSID return hres; Sleep(1000); } else { - WARN("Connecting to %s, no response yet, retrying: le is %x\n", debugstr_w(pipefn), GetLastError()); + WARN("Connecting to %s, no response yet, retrying: le is %u\n", debugstr_w(pipefn), GetLastError()); Sleep(1000); } continue; @@ -1766,13 +1766,13 @@ static DWORD WINAPI local_server_thread( if (hPipe == INVALID_HANDLE_VALUE) { - FIXME("pipe creation failed for %s, le is %d\n", debugstr_w(pipefn), GetLastError()); + FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); return 1; } while (1) { if (!ConnectNamedPipe(hPipe,NULL) && GetLastError() != ERROR_PIPE_CONNECTED) { - ERR("Failure during ConnectNamedPipe %d, ABORT!\n",GetLastError()); + ERR("Failure during ConnectNamedPipe %u, ABORT!\n",GetLastError()); break; }

1 0