[cfinck] 32103: Finally fix all cabman warnings and the 64-bit build

Author: cfinck
Date: Sun Feb  3 14:52:42 2008
New Revision: 32103

URL: http://svn.reactos.org/svn/reactos?rev=32103&view=rev
Log:
Finally fix all cabman warnings and the 64-bit build

Modified:
    trunk/reactos/tools/cabman/cabinet.cxx

Modified: trunk/reactos/tools/cabman/cabinet.cxx
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?re...
==============================================================================
--- trunk/reactos/tools/cabman/cabinet.cxx (original)
+++ trunk/reactos/tools/cabman/cabinet.cxx Sun Feb  3 14:52:42 2008
@@ -1105,8 +1105,8 @@

BytesToRead = CFData.CompSize;

-                    DPRINT(MAX_TRACE, ("Read: (0x%X,0x%X).\n",
-                        (UINT_PTR)CurrentBuffer, (UINT_PTR)Buffer));
+                    DPRINT(MAX_TRACE, ("Read: (0x%lX,0x%lX).\n",
+                        (_W64 unsigned long)CurrentBuffer, (_W64 unsigned long)Buffer));

if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) !=
                         CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead))
@@ -1228,7 +1228,7 @@
                 BytesToWrite = BytesLeftInBlock;

DPRINT(MAX_TRACE, ("Seeking to absolute offset 0x%X.\n",
-                    (UINT)CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + CurrentDataNode->Data.CompSize));
+                    (UINT)(CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + CurrentDataNode->Data.CompSize)));

if (((Status = ReadBlock(&CFData, sizeof(CFDATA), &BytesRead)) !=
                     CAB_STATUS_SUCCESS) || (BytesRead != sizeof(CFDATA)))