Alexandre Julliard : winedump: Print the machine field from the PDB symbol table.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ce6779c9b1c77d5502b97023d3be4ded26b2aa5e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ce6779c9b1c77d5502b97023d3...

Author: Alexandre Julliard 
Date:   Tue Jan 11 16:17:27 2011 +0100

winedump: Print the machine field from the PDB symbol table.

---

include/wine/mscvpdb.h |    5 ++++-
 tools/winedump/pdb.c   |   40 +++++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h
index 59ce8a5..637ed0f 100644
--- a/include/wine/mscvpdb.h
+++ b/include/wine/mscvpdb.h
@@ -1914,7 +1914,10 @@ typedef struct _PDB_SYMBOLS
     DWORD       hash_size;
     DWORD       srcmodule_size;
     DWORD       pdbimport_size;
-    DWORD       resvd[5];
+    DWORD       resvd[3];
+    WORD        resvd3;
+    WORD        machine;
+    DWORD       resvd4;
 } PDB_SYMBOLS, *PPDB_SYMBOLS;

typedef struct _PDB_FPO_DATA
diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c
index 4568d29..5720c40 100644
--- a/tools/winedump/pdb.c
+++ b/tools/winedump/pdb.c
@@ -178,23 +178,24 @@ static void pdb_dump_symbols(struct pdb_reader* reader)
         printf("-Unknown symbol info version %d\n", symbols->version);
     }
     printf("Symbols:\n"
-           "\tsignature:      %08x\n"
-           "\tversion:        %u\n"
-           "\tunknown:        %08x\n"
-           "\thash1_file:     %08x\n"
-           "\thash2_file:     %08x\n"
-           "\tgsym_file:      %04x\n"
-           "\tunknown1:       %04x\n"
-           "\tmodule_size:    %08x\n"
-           "\toffset_size:    %08x\n"
-           "\thash_size:      %08x\n"
-           "\tsrc_module_size %08x\n"
-           "\tpdbimport_size  %08x\n"
-           "\tresvd[0]        %08x\n"
-           "\tresvd[1]        %08x\n"
-           "\tresvd[2]        %08x\n"
-           "\tresvd[3]        %08x\n"
-           "\tresvd[4]        %08x\n",
+           "\tsignature:       %08x\n"
+           "\tversion:         %u\n"
+           "\tunknown:         %08x\n"
+           "\thash1_file:      %08x\n"
+           "\thash2_file:      %08x\n"
+           "\tgsym_file:       %04x\n"
+           "\tunknown1:        %04x\n"
+           "\tmodule_size:     %08x\n"
+           "\toffset_size:     %08x\n"
+           "\thash_size:       %08x\n"
+           "\tsrc_module_size: %08x\n"
+           "\tpdbimport_size:  %08x\n"
+           "\tresvd[0]         %08x\n"
+           "\tresvd[1]         %08x\n"
+           "\tresvd[2]         %08x\n"
+           "\tresvd[3]         %04x\n"
+           "\tmachine:         %s\n"
+           "\tresvd[4]         %08x\n",
            symbols->signature,
            symbols->version,
            symbols->unknown,
@@ -210,8 +211,9 @@ static void pdb_dump_symbols(struct pdb_reader* reader)
            symbols->resvd[0],
            symbols->resvd[1],
            symbols->resvd[2],
-           symbols->resvd[3],
-           symbols->resvd[4]);
+           symbols->resvd3,
+           get_machine_str( symbols->machine ),
+           symbols->resvd4);

if (symbols->offset_size)
     {