November 2006 - Wine-commits

Eric Pouech : winedump: Added support for dumping types from PDB, CV... files.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: bacca3425a98639ef26e59f6debddf62cf42440a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bacca3425a98639ef26e59f6d… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 29 21:41:05 2006 +0100 winedump: Added support for dumping types from PDB, CV... files. --- tools/winedump/Makefile.in | 1 + tools/winedump/msc.c | 1167 ++++++++++++++++++++++++++++++++++++++++++++ tools/winedump/pdb.c | 67 ++- tools/winedump/winedump.h | 2 + 4 files changed, 1218 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bacca3425a98639ef26e5…

1 0

Eric Pouech : winedump: First shot at dumping PDB files contents.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 64f7c6855467c85fc9c9173f96d238b3a9146fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f7c6855467c85fc9c9173f9… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 29 21:40:58 2006 +0100 winedump: First shot at dumping PDB files contents. --- tools/winedump/Makefile.in | 1 + tools/winedump/dump.c | 1 + tools/winedump/pdb.c | 650 ++++++++++++++++++++++++++++++++++++++++++++ tools/winedump/winedump.h | 5 +- 4 files changed, 655 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64f7c6855467c85fc9c91…

1 0

Eric Pouech : mscvpdb.h: Update some definitions (constants, structures) with latest information we have.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 0bee33e1952dd38c770523765ec8be8ef9936fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bee33e1952dd38c770523765… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 29 21:40:43 2006 +0100 mscvpdb.h: Update some definitions (constants, structures) with latest information we have. --- dlls/dbghelp/msc.c | 20 ++++---- include/wine/mscvpdb.h | 108 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 102 insertions(+), 26 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 7599917..b7209b1 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1454,16 +1454,16 @@ static int codeview_snarf(const struct m } break; - case S_COMPILE_V1: - TRACE("S-Compile-V1 %x %s\n", - sym->compile_v1.unknown, terminate_string(&sym->compile_v1.p_name)); + case S_COMPILAND_V1: + TRACE("S-Compiland-V1 %x %s\n", + sym->compiland_v1.unknown, terminate_string(&sym->compiland_v1.p_name)); break; - case S_COMPILE_V2: - TRACE("S-Compile-V2 %s\n", terminate_string(&sym->compile_v2.p_name)); + case S_COMPILAND_V2: + TRACE("S-Compiland-V2 %s\n", terminate_string(&sym->compiland_v2.p_name)); if (TRACE_ON(dbghelp_msc)) { - const char* ptr1 = sym->compile_v2.p_name.name + sym->compile_v2.p_name.namelen; + const char* ptr1 = sym->compiland_v2.p_name.name + sym->compiland_v2.p_name.namelen; const char* ptr2; while (*ptr1) { @@ -1473,11 +1473,11 @@ static int codeview_snarf(const struct m } } break; - case S_COMPILE_V3: - TRACE("S-Compile-V3 %s\n", sym->compile_v3.name); + case S_COMPILAND_V3: + TRACE("S-Compiland-V3 %s\n", sym->compiland_v3.name); if (TRACE_ON(dbghelp_msc)) { - const char* ptr1 = sym->compile_v3.name + strlen(sym->compile_v3.name); + const char* ptr1 = sym->compiland_v3.name + strlen(sym->compiland_v3.name); const char* ptr2; while (*ptr1) { @@ -1622,7 +1622,7 @@ static int codeview_snarf(const struct m length += (*name + 1 + 3) & ~3; break; - case S_PUB_DATA_V3: + case S_PUB_V3: if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) { symt_new_public(msc_dbg->module, compiland, diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index e59d79e..08366d9 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -343,7 +343,7 @@ union codeview_type { unsigned short int len; short int id; - unsigned unknown1; /* could be this_type ??? */ + unsigned this_type; unsigned int class_type; unsigned int rvtype; unsigned char call; @@ -540,6 +540,14 @@ union codeview_fieldtype struct { short int id; + short int attribute; + unsigned int type; + char name[1]; + } stmember_v3; + + struct + { + short int id; short int count; short int mlist; struct p_string p_name; @@ -556,7 +564,15 @@ union codeview_fieldtype struct { short int id; - short int index; + short int count; + unsigned int mlist; + char name[1]; + } method_v3; + + struct + { + short int id; + short int type; struct p_string p_name; } nesttype_v1; @@ -564,13 +580,21 @@ union codeview_fieldtype { short int id; short int _pad0; - unsigned int index; + unsigned int type; struct p_string p_name; } nesttype_v2; struct { short int id; + short int _pad0; + unsigned int type; + char name[1]; + } nesttype_v3; + + struct + { + short int id; short int type; } vfunctab_v1; @@ -606,18 +630,26 @@ union codeview_fieldtype { short int id; short int attribute; - short int type; - unsigned int vtab_offset; + unsigned int type; struct p_string p_name; - } onemethod_virt_v1; + } onemethod_v2; struct { short int id; short int attribute; unsigned int type; + char name[1]; + } onemethod_v3; + + struct + { + short int id; + short int attribute; + short int type; + unsigned int vtab_offset; struct p_string p_name; - } onemethod_v2; + } onemethod_virt_v1; struct { @@ -631,6 +663,15 @@ union codeview_fieldtype struct { short int id; + short int attribute; + unsigned int type; + unsigned int vtab_offset; + char name[1]; + } onemethod_virt_v3; + + struct + { + short int id; short int type; unsigned int offset; } vfuncoff_v1; @@ -647,7 +688,7 @@ union codeview_fieldtype { short int id; short int attribute; - short int index; + short int type; struct p_string p_name; } nesttypeex_v1; @@ -655,7 +696,7 @@ union codeview_fieldtype { short int id; short int attribute; - unsigned int index; + unsigned int type; struct p_string p_name; } nesttypeex_v2; @@ -817,6 +858,10 @@ union codeview_fieldtype #define LF_UNION_V3 0x1506 #define LF_ENUM_V3 0x1507 #define LF_MEMBER_V3 0x150d +#define LF_STMEMBER_V3 0x150e +#define LF_METHOD_V3 0x150f +#define LF_NESTTYPE_V3 0x1510 +#define LF_ONEMETHOD_V3 0x1511 #define LF_NUMERIC 0x8000 /* numeric leaf types */ #define LF_CHAR 0x8000 @@ -960,6 +1005,26 @@ union codeview_symbol struct { + short int len; + short int id; + unsigned int symtype; + unsigned int offset; + unsigned short segment; + struct p_string p_name; + } public_v2; + + struct + { + short int len; + short int id; + unsigned int symtype; + unsigned int offset; + unsigned short segment; + char name[1]; + } public_v3; + + struct + { short int len; /* Total length of this entry */ short int id; /* Always S_BPREL_V1 */ unsigned int offset; /* Stack offset relative to BP */ @@ -1007,6 +1072,16 @@ union codeview_symbol struct { + short int len; /* Total length of this entry */ + short int id; /* Always S_REGISTER_V3 */ + unsigned int type; /* check whether type & reg are correct */ + unsigned short reg; + char name[1]; + /* don't handle register tracking */ + } register_v3; + + struct + { short int len; short int id; unsigned int parent; @@ -1120,7 +1195,7 @@ union codeview_symbol short int id; unsigned int unknown; struct p_string p_name; - } compile_v1; + } compiland_v1; struct { @@ -1129,7 +1204,7 @@ union codeview_symbol unsigned unknown1[4]; unsigned short unknown2; struct p_string p_name; - } compile_v2; + } compiland_v2; struct { @@ -1137,7 +1212,7 @@ union codeview_symbol short int id; unsigned int unknown; char name[1]; - } compile_v3; + } compiland_v3; struct { @@ -1148,7 +1223,7 @@ union codeview_symbol } ssearch_v1; }; -#define S_COMPILE_V1 0x0001 +#define S_COMPILAND_V1 0x0001 #define S_REGISTER_V1 0x0002 #define S_CONSTANT_V1 0x0003 #define S_UDT_V1 0x0004 @@ -1202,18 +1277,19 @@ union codeview_symbol #if 0 #define S_XXXXXXXXX_32 0x1012 /* seems linked to a function, content unknown */ #endif -#define S_COMPILE_V2 0x1013 +#define S_COMPILAND_V2 0x1013 -#define S_COMPILE_V3 0x1101 +#define S_COMPILAND_V3 0x1101 #define S_THUNK_V3 0x1102 #define S_BLOCK_V3 0x1103 #define S_LABEL_V3 0x1105 +#define S_REGISTER_V3 0x1106 #define S_CONSTANT_V3 0x1107 #define S_UDT_V3 0x1108 #define S_BPREL_V3 0x110B #define S_LDATA_V3 0x110C #define S_GDATA_V3 0x110D -#define S_PUB_DATA_V3 0x110E +#define S_PUB_V3 0x110E #define S_LPROC_V3 0x110F #define S_GPROC_V3 0x1110 #define S_MSTOOL_V3 0x1116 /* not really understood */

1 0

Eric Pouech : dbghelp: Moved mscvpdb.h file to include/ wine to allow sharing of the definitions with winedump.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: cc65d21f8263bb597baa8ad6f85e0f3c2eaa33ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc65d21f8263bb597baa8ad6f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 29 21:40:30 2006 +0100 dbghelp: Moved mscvpdb.h file to include/wine to allow sharing of the definitions with winedump. --- dlls/dbghelp/coff.c | 2 +- dlls/dbghelp/msc.c | 2 +- {dlls/dbghelp => include/wine}/mscvpdb.h | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index 9bdf0bf..340e8a6 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -55,7 +55,7 @@ #include "wine/debug.h" #include "excpt.h" #include "dbghelp_private.h" -#include "mscvpdb.h" +#include "wine/mscvpdb.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_coff); diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index f336609..7599917 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -56,7 +56,7 @@ #include "wine/debug.h" #include "excpt.h" #include "dbghelp_private.h" -#include "mscvpdb.h" +#include "wine/mscvpdb.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_msc); diff --git a/dlls/dbghelp/mscvpdb.h b/include/wine/mscvpdb.h similarity index 100% rename from dlls/dbghelp/mscvpdb.h rename to include/wine/mscvpdb.h index 1bc2b7b..e59d79e 100644 --- a/dlls/dbghelp/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -29,7 +29,7 @@ * MSVC 2.0 Inclusion in link of debug info (PDB v2) * MSVC 5.0 Types are 24 bits (instead of 16 for <= 4.x) * MSVC x.0 PDB (change in internal streams layout) - * + * * .DBG Contains COFF, FPO and Codeview info * .PDB New format for debug info (information is * derived from Codeview information) @@ -39,14 +39,14 @@ * Debug information can either be found in the debug section of a PE * module (in something close to a .DBG file), or the debug section * can actually refer to an external file, which can be in turn, - * either a .DBG or .PDB file. + * either a .DBG or .PDB file. * * Regarding PDB files: * ------------------- * They are implemented as a set of internal files (as a small file * system). The file is split into blocks, an internal file is made * of a set of blocks. Internal files are accessed through - * numbers. For example, + * numbers. For example, * 1/ is the ROOT (basic information on the file) * 2/ is the Symbol information (global symbols, local variables...) * 3/ is the Type internal file (each the symbols can have type @@ -68,7 +68,7 @@ * evolutions: * - the first flavor (suffixed by V1 in this file), where the types * and subtypes are 16 bit entities; and where strings are in Pascal - * format (first char is their length and are not 0 terminated) + * format (first char is their length and are not 0 terminated) * - the second flavor (suffixed by V2) differs from first flavor with * types and subtypes as 32 bit entities. This forced some * reordering of fields in some types @@ -77,7 +77,7 @@ * length prefixed) * The different flavors can coexist in the same file (is this really * true ??) - * + * * For the evolution of types, the need of the second flavor was the * number of types to be defined (limited to 0xFFFF, including the C * basic types); the need of the third flavor is the increase of @@ -88,7 +88,7 @@ * disk because: * - some integral values are stored as numeric leaf, which size is * variable depending on its value - * + * * Symbols internal stream * ----------------------- * Here also we find three flavors (that we've suffixed with _V1, _V2 @@ -377,7 +377,7 @@ union codeview_reftype unsigned char bitoff; unsigned short type; } bitfield_v1; - + struct { unsigned short int len;

1 0

Eric Pouech : winedump: Make dump mode the default.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 5839fd7f10f8376ef6264e25b492e06aae4a62df URL: http://source.winehq.org/git/wine.git/?a=commit;h=5839fd7f10f8376ef6264e25b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 29 21:40:26 2006 +0100 winedump: Make dump mode the default. --- tools/winedump/main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index 193fb74..f0ea281 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -306,6 +306,9 @@ static void parse_options (char *argv[]) if (VERBOSE && QUIET) fatal ("Options -v and -q are mutually exclusive"); + + if (globals.mode == NONE) + do_dump(""); } static void set_module_name(unsigned setUC)

1 0

Eric Pouech : winedump: Dump the EMF files as any other file types.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: c4dc400a8822d9287a658e3946f23c4737cbee59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4dc400a8822d9287a658e394… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 29 21:40:21 2006 +0100 winedump: Dump the EMF files as any other file types. Internally, make use of the PRD function for checking available file ranges. --- tools/winedump/dump.c | 1 + tools/winedump/emf.c | 52 +++++++++++++++++++++----------------------- tools/winedump/main.c | 21 +---------------- tools/winedump/winedump.h | 10 ++++---- 4 files changed, 33 insertions(+), 51 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 0aeb474..f8b149d 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -159,6 +159,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_UNKNOWN, NULL, NULL} /* sentinel */ }; diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index df92e1d..f5375d0 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -36,7 +36,7 @@ #include "winbase.h" #include "wingdi.h" -static unsigned int read_int(unsigned char *buffer) +static unsigned int read_int(const unsigned char *buffer) { return buffer[0] + (buffer[1]<<8) @@ -46,18 +46,18 @@ static unsigned int read_int(unsigned ch #define EMRCASE(x) case x: printf("%-20s %08x\n", #x, length); break -static int dump_emfrecord(int fd) +static unsigned offset = 0; + +static int dump_emfrecord(void) { - unsigned char buffer[8]; - int r; + const unsigned char* ptr; unsigned int type, length, i; - r = read(fd, buffer, 8); - if(r!=8) - return -1; + ptr = PRD(offset, 8); + if (!ptr) return -1; - type = read_int(buffer); - length = read_int(buffer+4); + type = read_int(ptr); + length = read_int(ptr + 4); switch(type) { @@ -96,36 +96,34 @@ static int dump_emfrecord(int fd) length -= 8; + offset += 8; + for(i=0; i<length; i+=4) { if (i%16 == 0) printf(" "); - memset(buffer,0,sizeof buffer); - r = read(fd,buffer,4); - if(r!=4) - return -1; - printf("%08x ", read_int(buffer)); - if ( (i%16 == 12) || ((i+4)==length) ) + if (!(ptr = PRD(offset, 4))) return -1; + offset += 4; + printf("%08x ", read_int(ptr)); + if ( (i % 16 == 12) || (i + 4 == length)) printf("\n"); } return 0; } -static int dump_emf_records(int fd) +enum FileSig get_kind_emf(void) { - while(!dump_emfrecord(fd)) - ; - return 0; + const ENHMETAHEADER* hdr; + + hdr = PRD(0, sizeof(*hdr)); + if (hdr && hdr->iType == EMR_HEADER && hdr->dSignature == ENHMETA_SIGNATURE) + return SIG_EMF; + return SIG_UNKNOWN; } -int dump_emf(const char *emf) +void emf_dump(void) { - int fd; - - fd = open(emf,O_RDONLY); - if (fd<0) return -1; - dump_emf_records(fd); - close(fd); - return 0; + offset = 0; + while (!dump_emfrecord()); } diff --git a/tools/winedump/main.c b/tools/winedump/main.c index 22c3210..193fb74 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -80,13 +80,6 @@ static void do_dump (const char *arg) } -static void do_dumpemf(void) -{ - if (globals.mode != NONE) fatal("Only one mode can be specified\n"); - globals.mode = EMF; -} - - static void do_code (void) { globals.do_code = 1; @@ -223,20 +216,19 @@ static const struct my_option option_tab {"-S", SPEC, 1, do_symfile, "-S symfile Search only prototype names found in 'symfile'"}, {"-q", SPEC, 0, do_quiet, "-q Don't show progress (quiet)."}, {"-v", SPEC, 0, do_verbose, "-v Show lots of detail while working (verbose)."}, - {"dump", DUMP, 0, do_dump, "dump <file> Dumps the contents of the file (dll, exe, lib...)"}, + {"dump", DUMP, 0, do_dump, "dump <file> Dumps the contents of a file (dll, exe, lib...)"}, {"-C", DUMP, 0, do_symdmngl, "-C Turns on symbol demangling"}, {"-f", DUMP, 0, do_dumphead, "-f Dumps file header information"}, {"-G", DUMP, 0, do_rawdebug, "-G Dumps raw debug information"}, {"-j", DUMP, 1, do_dumpsect, "-j sect_name Dumps only the content of section sect_name (import, export, debug, resource, tls)"}, {"-x", DUMP, 0, do_dumpall, "-x Dumps everything"}, - {"emf", EMF, 0, do_dumpemf, "emf Dumps an Enhanced Meta File"}, {NULL, NONE, 0, NULL, NULL} }; void do_usage (void) { const struct my_option *opt; - printf ("Usage: winedump [-h | sym <sym> | spec <dll> | dump <file> | emf <emf>]\n"); + printf ("Usage: winedump [-h | sym <sym> | spec <dll> | dump <file>]\n"); printf ("Mode options (can be put as the mode (sym/spec/dump...) is declared):\n"); printf ("\tWhen used in --help mode\n"); for (opt = option_table; opt->name; opt++) @@ -254,10 +246,6 @@ void do_usage (void) for (opt = option_table; opt->name; opt++) if (opt->mode == DUMP) printf ("\t %s\n", opt->usage); - printf ("\tWhen used in emf mode\n"); - for (opt = option_table; opt->name; opt++) - if (opt->mode == EMF) - printf ("\t %s\n", opt->usage); puts (""); exit (1); @@ -489,11 +477,6 @@ int main (int argc, char *argv[]) set_module_name(0); dump_file(globals.input_name); break; - case EMF: - if (globals.input_name == NULL) - fatal("No file name has been given\n"); - dump_emf(globals.input_name); - break; } return 0; diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 37d9056..4c97fd0 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -72,7 +72,7 @@ #define SYM_THISCALL 0x4 #define SYM_DATA 0x8 /* Data, not a function */ -typedef enum {NONE, DMGL, SPEC, DUMP, EMF} Mode; +typedef enum {NONE, DMGL, SPEC, DUMP} Mode; /* Structure holding a parsed symbol */ typedef struct __parsed_symbol @@ -156,9 +156,6 @@ extern _globals globals; /* Default calling convention */ #define CALLING_CONVENTION (globals.do_cdecl ? SYM_CDECL : SYM_STDCALL) -/* EMF functions */ -int dump_emf (const char *emf); - /* Image functions */ void dump_file(const char* name); @@ -221,7 +218,7 @@ char *str_toupper (char *str); const char *get_machine_str(int mach); /* file dumping functions */ -enum FileSig {SIG_UNKNOWN, SIG_DOS, SIG_PE, SIG_DBG, SIG_NE, SIG_LE, SIG_MDMP, SIG_COFFLIB, SIG_LNK}; +enum FileSig {SIG_UNKNOWN, SIG_DOS, SIG_PE, SIG_DBG, SIG_NE, SIG_LE, SIG_MDMP, SIG_COFFLIB, SIG_LNK, SIG_EMF}; const void* PRD(unsigned long prd, unsigned long len); unsigned long Offset(const void* ptr); @@ -246,6 +243,9 @@ enum FileSig get_kind_dbg(void); void dbg_dump( void ); enum FileSig get_kind_lnk(void); void lnk_dump( void ); +enum FileSig get_kind_emf(void); +void emf_dump( void ); + void dump_stabs(const void* pv_stabs, unsigned szstabs, const char* stabstr, unsigned szstr); void dump_codeview(unsigned long ptr, unsigned long len);

1 0

Eric Pouech : winedump: Use same scheme for dumping lnk files as the executables ( through the PRD macro and a full mapped image).
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: cac7be486dc2b6d734dca691992aaf5b5249d6a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac7be486dc2b6d734dca6919… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 29 21:40:16 2006 +0100 winedump: Use same scheme for dumping lnk files as the executables (through the PRD macro and a full mapped image). --- tools/winedump/dump.c | 1 + tools/winedump/lnk.c | 199 +++++++++++++--------------------------- tools/winedump/main.c | 19 +---- tools/winedump/winedump.h | 9 +- tools/winedump/winedump.man.in | 9 +- 5 files changed, 77 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cac7be486dc2b6d734dca…

1 0

Eric Pouech : winedump: Use a uniform scheme for dumping file contents.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 9ef9d62d4ced222dd8fb05d77224291fb2a68b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef9d62d4ced222dd8fb05d77… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 29 21:40:12 2006 +0100 winedump: Use a uniform scheme for dumping file contents. --- tools/winedump/dump.c | 133 ++++++++------------------------------------- tools/winedump/lib.c | 33 ++++++----- tools/winedump/minidump.c | 11 ++++ tools/winedump/pe.c | 39 +++++++++++++- tools/winedump/winedump.h | 10 +++- 5 files changed, 97 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ef9d62d4ced222dd8fb0…

1 0

Eric Pouech : winedump: Header file pe.h is useless, get rid of it.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 80b09ccf4cf868d5690760020eadc16e673aaf9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b09ccf4cf868d5690760020… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 29 21:40:08 2006 +0100 winedump: Header file pe.h is useless, get rid of it. --- tools/winedump/debug.c | 1 - tools/winedump/dump.c | 1 - tools/winedump/pe.c | 1 - tools/winedump/pe.h | 24 ------------------------ tools/winedump/winedump.h | 5 ++++- 5 files changed, 4 insertions(+), 28 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 3ada5eb..4ce09c8 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -44,7 +44,6 @@ #include "windef.h" #include "winbase.h" #include "winedump.h" -#include "pe.h" #include "cvinclude.h" /* diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index aa4d58d..21ff22a 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -44,7 +44,6 @@ #include "windef.h" #include "winbase.h" #include "winedump.h" -#include "pe.h" static void* dump_base; static unsigned long dump_total_len; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 210b100..080fb42 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -44,7 +44,6 @@ #include "windef.h" #include "winbase.h" #include "winedump.h" -#include "pe.h" static const IMAGE_NT_HEADERS32* PE_nt_headers; diff --git a/tools/winedump/pe.h b/tools/winedump/pe.h deleted file mode 100644 index c564174..0000000 --- a/tools/winedump/pe.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * PE dumping utility - * - * Copyright 2001 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 - */ - -extern void dump_codeview(unsigned long ptr, unsigned long len); -extern void dump_coff(unsigned long coffbase, unsigned long len, const void* sect_map); -extern void dump_frame_pointer_omission(unsigned long base, unsigned long len); - diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index aa257f3..d4aea07 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -244,7 +244,10 @@ void lib_dump( const char *li void dbg_dump( void ); void pe_dump( void ); -void dump_stabs(const void* pv_stabs, unsigned szstabs, const char* stabstr, unsigned szstr); +void dump_stabs(const void* pv_stabs, unsigned szstabs, const char* stabstr, unsigned szstr); +void dump_codeview(unsigned long ptr, unsigned long len); +void dump_coff(unsigned long coffbase, unsigned long len, const void* sect_map); +void dump_frame_pointer_omission(unsigned long base, unsigned long len); FILE *open_file (const char *name, const char *ext, const char *mode);

1 0

Eric Pouech : winedump: Changed PE, NE, LE dumping so that they are consistent in terms of dump function signatures .
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: afe309b7d96504f011cf203ceb3d7b06d6909adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe309b7d96504f011cf203ce… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 29 21:40:00 2006 +0100 winedump: Changed PE, NE, LE dumping so that they are consistent in terms of dump function signatures. Avoid passing around the base of the module, but use instead the PRD function. --- tools/winedump/dump.c | 12 +++++----- tools/winedump/le.c | 38 +++++++++++++++++++----------------- tools/winedump/ne.c | 46 ++++++++++++++++++++++++-------------------- tools/winedump/pe.c | 28 +++++++++++++++----------- tools/winedump/pe.h | 3 +- tools/winedump/winedump.h | 8 ++++-- 6 files changed, 73 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afe309b7d96504f011cf2…

1 0