Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 06:55:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

/Wp64 and __w64 are deprecated beginning with Visual C++ 2008.

Browse source 
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
This commit is contained in:
Colin Finck 2008-02-16 22:21:59 +00:00
parent c87abac6d8
commit 9f5d2684e0
4 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/tools/cabman/cabinet.cxx
View file

@ -1210,8 +1210,8 @@ ULONG CCabinet::ExtractFile(char* FileName)
BytesToRead = CFData.CompSize; BytesToRead = CFData.CompSize;
DPRINT(MAX_TRACE, ("Read: (0x%lX,0x%lX).\n", DPRINT(MAX_TRACE, ("Read: (0x%X,0x%X).\n",
(_W64 unsigned long)CurrentBuffer, (_W64 unsigned long)Buffer)); (UINT)CurrentBuffer, (UINT)Buffer));
if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) != if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) !=
CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead)) CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead))

4
reactos/tools/cabman/cabinet.h
View file

@ -21,10 +21,6 @@
#endif #endif
#endif #endif
#ifndef _W64
#define _W64
#endif
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

2
reactos/tools/cabman/cabman.vcproj
View file

@ -48,7 +48,7 @@
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="false"
DebugInformationFormat="4" DebugInformationFormat="4"
/> />
<Tool <Tool

4
reactos/tools/cabman/mszip.cxx
View file

@ -74,7 +74,7 @@ ULONG CMSZipCodec::Compress(void* OutputBuffer,
ZStream.next_in = (unsigned char*)InputBuffer; ZStream.next_in = (unsigned char*)InputBuffer;
ZStream.avail_in = InputLength; 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; ZStream.avail_out = CAB_BLOCKSIZE + 12;
/* WindowBits is passed < 0 to tell that there is no zlib header */ /* WindowBits is passed < 0 to tell that there is no zlib header */
@ -137,7 +137,7 @@ ULONG CMSZipCodec::Uncompress(void* OutputBuffer,
return CS_BADSTREAM; 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.avail_in = InputLength - 2;
ZStream.next_out = (unsigned char*)OutputBuffer; ZStream.next_out = (unsigned char*)OutputBuffer;
ZStream.avail_out = CAB_BLOCKSIZE + 12; ZStream.avail_out = CAB_BLOCKSIZE + 12;