CVS: winex/dlls/dbghelp msc.c,1.3,1.4

Subject: winex/dlls/dbghelp msc.c,1.3,1.4Update of /var/lib/cvsd/cvsroot/winex/dlls/dbghelp
In directory agravaine:/tmp/cvs-serv18819/dlls/dbghelp

Modified Files:
	msc.c 
Log Message:

- fixed a few compiler warnings in the PDB file dumper
- fixed some alignment issues in some of the dbghelp structs.  Windows apps expected some members to be at different offsets than gcc was generating
- added the WINE_ALIGN() macro to align single members of structs


Index: msc.c
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/dlls/dbghelp/msc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- msc.c	30 Aug 2007 14:17:01 -0000	1.3
+++ msc.c	30 Aug 2007 14:17:16 -0000	1.4
@@ -2092,17 +2092,17 @@
 
             /* prevent this from reading NULL memory */
             if (x == NULL){
-                WARN("********************** file %d is empty or missing {size = %u}\n", i, pdb_get_file_size(pdb_lookup, i));
+                WARN("********************** file %d is empty or missing {size = %ld}\n", i, pdb_get_file_size(pdb_lookup, i));
 
                 continue;
             }
 
 
-            snprintf(filename, MAX_PATH, "pdbfile_%02d_%ubytes.bin", i, pdb_get_file_size(pdb_lookup, i));
+            snprintf(filename, MAX_PATH, "pdbfile_%02d_%ldbytes.bin", i, pdb_get_file_size(pdb_lookup, i));
             fp = fopen(filename, "wb");
 
             if (fp){
-                FIXME("********************** [file %d]: dumping to '%s' {size = %u}\n", i, filename, pdb_get_file_size(pdb_lookup, i));
+                FIXME("********************** [file %d]: dumping to '%s' {size = %ld}\n", i, filename, pdb_get_file_size(pdb_lookup, i));
                 fwrite(x, 1, pdb_get_file_size(pdb_lookup, i), fp);
                 
                 fclose(fp);
@@ -2558,7 +2558,7 @@
 
         for (i = 0; i < nDbg; i++){
             TRACE("debugDirectory[%d]:\n"
-                  "     Characteristics =   0x%08lx\n"
+                  "     Characteristics =   0x%08x\n"
                   "     TimeDateStamp =     %ld\n"
                   "     MajorVersion =      %d\n"
                   "     MinorVersion =      %d\n"