[cfinck] 32395: /Wp64 and __w64 are deprecated beginning with Visual C++ 2008. Remove the /Wp64 switch from the cabman project file (no idea why it was enabled anyway ; -) and the _W64 macros from the code.

Author: cfinck
Date: Sun Feb 17 01:21:59 2008
New Revision: 32395

URL: http://svn.reactos.org/svn/reactos?rev=32395&view=rev
Log:
/Wp64 and __w64 are deprecated beginning with Visual C++ 2008.
Remove the /Wp64 switch from the cabman project file (no idea why it was enabled anyway ;-) and the _W64 macros from the code.

Modified:
    trunk/reactos/tools/cabman/cabinet.cxx
    trunk/reactos/tools/cabman/cabinet.h
    trunk/reactos/tools/cabman/cabman.vcproj
    trunk/reactos/tools/cabman/mszip.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 17 01:21:59 2008
@@ -1210,8 +1210,8 @@

BytesToRead = CFData.CompSize;

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

if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) !=
                         CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead))

Modified: trunk/reactos/tools/cabman/cabinet.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev=...
==============================================================================
--- trunk/reactos/tools/cabman/cabinet.h (original)
+++ trunk/reactos/tools/cabman/cabinet.h Sun Feb 17 01:21:59 2008
@@ -19,10 +19,6 @@
 #ifndef MAX_PATH
 #define MAX_PATH 260
 #endif
-#endif
-
-#ifndef _W64
-#define _W64
 #endif

#include <stdlib.h>

Modified: trunk/reactos/tools/cabman/cabman.vcproj
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.vcproj?...
==============================================================================
--- trunk/reactos/tools/cabman/cabman.vcproj (original)
+++ trunk/reactos/tools/cabman/cabman.vcproj Sun Feb 17 01:21:59 2008
@@ -48,7 +48,7 @@
    			RuntimeLibrary="3"
    			UsePrecompiledHeader="0"
    			WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
    			DebugInformationFormat="4"
    		/>
    		<Tool

Modified: trunk/reactos/tools/cabman/mszip.cxx
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.cxx?rev=...
==============================================================================
--- trunk/reactos/tools/cabman/mszip.cxx (original)
+++ trunk/reactos/tools/cabman/mszip.cxx Sun Feb 17 01:21:59 2008
@@ -74,7 +74,7 @@

ZStream.next_in   = (unsigned char*)InputBuffer;
     ZStream.avail_in  = InputLength;
-    ZStream.next_out  = (unsigned char*)((_W64 unsigned long)OutputBuffer + 2);
+    ZStream.next_out  = (unsigned char*)((unsigned long)OutputBuffer + 2);
     ZStream.avail_out = CAB_BLOCKSIZE + 12;

/* WindowBits is passed < 0 to tell that there is no zlib header */
@@ -137,7 +137,7 @@
         return CS_BADSTREAM;
     }

-    ZStream.next_in   = (unsigned char*)((_W64 unsigned long)InputBuffer + 2);
+    ZStream.next_in   = (unsigned char*)((unsigned long)InputBuffer + 2);
     ZStream.avail_in  = InputLength - 2;
     ZStream.next_out  = (unsigned char*)OutputBuffer;
     ZStream.avail_out = CAB_BLOCKSIZE + 12;