- Fix warnings
 - Revert to wZ, gcc is being stupid.

Modified: trunk/reactos/subsys/system/calc/winecalc.c
Modified: trunk/reactos/subsys/system/usetup/partlist.c

--- trunk/reactos/subsys/system/calc/winecalc.c	2005-07-27 00:55:36 UTC (rev 16768)
+++ trunk/reactos/subsys/system/calc/winecalc.c	2005-07-27 01:02:51 UTC (rev 16769)
@@ -2927,15 +2927,15 @@

     switch (calc->numBase) {
     case NBASE_HEX:
         real = calc_atof(calc->buffer, calc->numBase);

-        sprintf(calc->display, "%x", (long)real);

+        sprintf(calc->display, "%lx", (long)real);

         break;
 
     case NBASE_OCTAL:

-        sprintf(calc->display, "%o", calc->buffer);

+        sprintf(calc->display, "%lo", (long)calc->buffer);

         break;
 
     case NBASE_BINARY:

-        sprintf(calc->display, "%x", calc->buffer);

+        sprintf(calc->display, "%lx", (long)calc->buffer);

         break;
 
     case NBASE_DECIMAL:
@@ -3060,7 +3060,7 @@

 
     // commify the integer part now
 

-    while (c = *(s + --n)) {

+    while ((c = *(s + --n))) {

         r[i++] = c;
         if (x++ % 3 == 0)
             r[i++] = ',';
@@ -3258,7 +3258,7 @@

     case 'F':
         {
             char s22[CALC_BUF_SIZE];

-            char w = (char)LOWORD(wParam);

+            UCHAR w = (UCHAR)LOWORD(wParam);

 
             if (!keys[calc.numBase][w]) {
                MessageBeep(0);

--- trunk/reactos/subsys/system/usetup/partlist.c	2005-07-27 00:55:36 UTC (rev 16768)
+++ trunk/reactos/subsys/system/usetup/partlist.c	2005-07-27 01:02:51 UTC (rev 16769)
@@ -918,14 +918,14 @@

   if (DiskEntry->DriverName.Length > 0)
     {
       sprintf (LineBuffer,

-	       "%6I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) on %S",

+	       "%6I64u %s  Harddisk %lu  (Port=%hu, Bus=%hu, Id=%hu) on %wZ",

 	       DiskSize,
 	       Unit,
 	       DiskEntry->DiskNumber,
 	       DiskEntry->Port,
 	       DiskEntry->Bus,
 	       DiskEntry->Id,

-	       DiskEntry->DriverName.Buffer);

+	       &DiskEntry->DriverName);

     }
   else
     {