/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.

svn path=/trunk/; revision=32395

diff --git a/reactos/tools/cabman/cabinet.cxx b/reactos/tools/cabman/cabinet.cxx
index d059497..633ae71 100755 (executable)
--- a/reactos/tools/cabman/cabinet.cxx
+++ b/reactos/tools/cabman/cabinet.cxx
@@ -1210,8 +1210,8 @@ ULONG CCabinet::ExtractFile(char* FileName)
 
                     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))

diff --git a/reactos/tools/cabman/cabinet.h b/reactos/tools/cabman/cabinet.h
index e082746..329f082 100755 (executable)
--- a/reactos/tools/cabman/cabinet.h
+++ b/reactos/tools/cabman/cabinet.h
@@ -21,10 +21,6 @@
 #endif
 #endif
 
-#ifndef _W64
-#define _W64
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/reactos/tools/cabman/cabman.vcproj b/reactos/tools/cabman/cabman.vcproj
index 762cbf8..92218e3 100644 (file)
--- a/reactos/tools/cabman/cabman.vcproj
+++ b/reactos/tools/cabman/cabman.vcproj
@@ -48,7 +48,7 @@
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               Detect64BitPortabilityProblems="false"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r

diff --git a/reactos/tools/cabman/mszip.cxx b/reactos/tools/cabman/mszip.cxx
index e033796..45e87f1 100755 (executable)
--- a/reactos/tools/cabman/mszip.cxx
+++ b/reactos/tools/cabman/mszip.cxx
@@ -74,7 +74,7 @@ ULONG CMSZipCodec::Compress(void* OutputBuffer,
 
     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 @@ ULONG CMSZipCodec::Uncompress(void* OutputBuffer,
         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;