Finally fix all cabman warnings and the 64-bit build

svn path=/trunk/; revision=32103
This commit is contained in:
Colin Finck 2008-02-03 11:52:42 +00:00
parent 5b397144a9
commit 720b53c4b2

View file

@ -1105,8 +1105,8 @@ ULONG CCabinet::ExtractFile(char* FileName)
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 @@ ULONG CCabinet::ExtractFile(char* FileName)
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)))