From 9f5d2684e0bd505f3c37ff6eb53098c5945dc09e Mon Sep 17 00:00:00 2001
From: Colin Finck <colin@reactos.org>
Date: Sat, 16 Feb 2008 22:21:59 +0000
Subject: [PATCH] /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
---
 reactos/tools/cabman/cabinet.cxx   | 4 ++--
 reactos/tools/cabman/cabinet.h     | 4 ----
 reactos/tools/cabman/cabman.vcproj | 2 +-
 reactos/tools/cabman/mszip.cxx     | 4 ++--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/reactos/tools/cabman/cabinet.cxx b/reactos/tools/cabman/cabinet.cxx
index d059497765b..633ae7181ca 100755
--- 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 e082746bba6..329f0829286 100755
--- 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 762cbf88012..92218e3da6b 100644
--- a/reactos/tools/cabman/cabman.vcproj
+++ b/reactos/tools/cabman/cabman.vcproj
@@ -48,7 +48,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool
diff --git a/reactos/tools/cabman/mszip.cxx b/reactos/tools/cabman/mszip.cxx
index e0337960c1a..45e87f1c06a 100755
--- 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;