CVS: winex/tools/winebuild relay.c, 1.12, 1.13 spec16.c, 1.7, 1.8

Subject: winex/tools/winebuild relay.c,1.12,1.13 spec16.c,1.7,1.8Update of /var/lib/cvsd/cvsroot/winex/tools/winebuild
In directory agravaine:/tmp/cvs-serv8933/tools/winebuild

Modified Files:
	relay.c spec16.c 
Log Message:

- fixed several printf warnings
- prevented some non-strings from being printed as strings in psapi



Index: relay.c
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/tools/winebuild/relay.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- relay.c	27 Jun 2007 11:55:47 -0000	1.12
+++ relay.c	12 Sep 2007 12:23:43 -0000	1.13
@@ -206,7 +206,7 @@
     if ( thunk )
     {
         /* Set up registers as expected and call thunk */
-        fprintf( outfile, "\tleal %d(%%edx), %%ebx\n", sizeof(STACK16FRAME)-22 );
+        fprintf( outfile, "\tleal %lu(%%edx), %%ebx\n", sizeof(STACK16FRAME)-22 );
         fprintf( outfile, "\tleal -4(%%esp), %%ebp\n" );
 
         fprintf( outfile, "\tcall *%d(%%edx)\n", STACK16OFFSET(entry_point) );
@@ -240,7 +240,7 @@
     /* Build register CONTEXT */
     if ( reg_func )
     {
-        fprintf( outfile, "\tsubl $%d, %%esp\n", sizeof(CONTEXT86) );
+        fprintf( outfile, "\tsubl $%lu, %%esp\n", sizeof(CONTEXT86) );
 
         fprintf( outfile, "\tmovl %%ecx, %d(%%esp)\n", CONTEXTOFFSET(EFlags) );
 
@@ -300,7 +300,7 @@
 
         fprintf( outfile, "\tpushl %%edx\n" );
         if ( reg_func )
-            fprintf( outfile, "\tleal -%d(%%ebp), %%eax\n\tpushl %%eax\n",
+            fprintf( outfile, "\tleal -%lu(%%ebp), %%eax\n\tpushl %%eax\n",
                               sizeof(CONTEXT) + STRUCTOFFSET(STACK32FRAME, ebp) );
         else
             fprintf( outfile, "\tpushl $0\n" );
@@ -318,7 +318,7 @@
     }
 
     /* Call relay routine (which will call the API entry point) */
-    fprintf( outfile, "\tleal %d(%%edx), %%eax\n", sizeof(STACK16FRAME) );
+    fprintf( outfile, "\tleal %lu(%%edx), %%eax\n", sizeof(STACK16FRAME) );
     fprintf( outfile, "\tpushl %%eax\n" );
     fprintf( outfile, "\tpushl %d(%%edx)\n", STACK16OFFSET(entry_point) );
     fprintf( outfile, "\tcall *%d(%%edx)\n", STACK16OFFSET(relay) );
@@ -339,7 +339,7 @@
 
         fprintf( outfile, "\tpushl %%eax\n" );
         if ( reg_func )
-            fprintf( outfile, "\tleal -%d(%%ebp), %%eax\n\tpushl %%eax\n",
+            fprintf( outfile, "\tleal -%lu(%%ebp), %%eax\n\tpushl %%eax\n",
                               sizeof(CONTEXT) + STRUCTOFFSET(STACK32FRAME, ebp) );
         else
             fprintf( outfile, "\tpushl $0\n" );
@@ -870,7 +870,7 @@
     fprintf( outfile, "\tpushf\n" );
     fprintf( outfile, "\tcld\n" );
     fprintf( outfile, "\tleal -%d(%%esi), %%edi\n", size );
-    fprintf( outfile, "\tmovl $%d, %%ecx\n", sizeof(STACK16FRAME) );
+    fprintf( outfile, "\tmovl $%lu, %%ecx\n", sizeof(STACK16FRAME) );
     fprintf( outfile, "\trep\n\tmovsb\n" );
     fprintf( outfile, "\tpopf\n" );
 
@@ -891,7 +891,7 @@
         fprintf( outfile, "\tandl $0x0000ffff, %%eax\n" );
         fprintf( outfile, "\tmovl %%eax, -4(%%edi)\n" );    /* 32-bit ss */
 
-        fprintf( outfile, "\taddl $%d, %%ebx\n", sizeof(STACK16FRAME)-size+4 + 4 );
+        fprintf( outfile, "\taddl $%lu, %%ebx\n", sizeof(STACK16FRAME)-size+4 + 4 );
         fprintf( outfile, "\tmovl %%ebx, 0(%%edi)\n" );    /* 16-bit ss:sp */
 
         fprintf( outfile, "\tmovl " PREFIX "CALL32_%s_RetAddr, %%eax\n", name );
@@ -899,7 +899,7 @@
     }
     else
     {
-        fprintf( outfile, "\taddl $%d, %%ebx\n", sizeof(STACK16FRAME)-size+4 );
+        fprintf( outfile, "\taddl $%lu, %%ebx\n", sizeof(STACK16FRAME)-size+4 );
         fprintf( outfile, "\tmovl %%ebx, 0(%%edi)\n" );
 
         fprintf( outfile, "\tmovw %%ds, %%ax\n" );
@@ -944,7 +944,7 @@
     fprintf( outfile, "\tstd\n" );
     fprintf( outfile, "\tdec %%esi\n" );
     fprintf( outfile, "\tleal %d(%%esi), %%edi\n", size );
-    fprintf( outfile, "\tmovl $%d, %%ecx\n", sizeof(STACK16FRAME) );
+    fprintf( outfile, "\tmovl $%lu, %%ecx\n", sizeof(STACK16FRAME) );
     fprintf( outfile, "\trep\n\tmovsb\n" );
     fprintf( outfile, "\tpopf\n" );
 

Index: spec16.c
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/tools/winebuild/spec16.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- spec16.c	28 Mar 2007 14:34:37 -0000	1.7
+++ spec16.c	12 Sep 2007 12:23:43 -0000	1.8
@@ -826,7 +826,7 @@
 #ifdef __i386__
             fprintf( outfile, "{ 0x5566, 0x68, %s, 0xe866, %d  /* %s */ },\n",
 #else
-            fprintf( outfile, "{ %s, 0xe866, %d, /* %s */ },\n",
+            fprintf( outfile, "{ %s, 0xe866, %lu, /* %s */ },\n",
 #endif
                      odp->link_name,
                      (type-typelist)*sizeof(CALLFROM16) -