Common subdirectories: ./Source/7zip and ../../src/Source/7zip
diff -u ./Source/DialogTemplate.cpp ../../src/Source/DialogTemplate.cpp
--- ./Source/DialogTemplate.cpp	2007-11-30 09:54:13.000000000 +0000
+++ ../../src/Source/DialogTemplate.cpp	2008-03-19 14:36:22.000000000 +0000
@@ -74,7 +74,7 @@
     if (IS_INTRESOURCE(x)) { \
       *(WORD*)seeker = 0xFFFF; \
       seeker += sizeof(WORD); \
-      *(WORD*)seeker = ConvertEndianness(WORD(DWORD(x))); \
+      *(WORD*)seeker = ConvertEndianness(WORD(ULONG_PTR(x))); \
       seeker += sizeof(WORD); \
     } \
     else { \
@@ -622,7 +622,7 @@
     }
   }
 
-  assert((DWORD) seeker - (DWORD) pbDlg == dwSize);
+  assert((char *)seeker - (char *)pbDlg == dwSize);
 
   // DONE!
   return pbDlg;
diff -u ./Source/Platform.h ../../src/Source/Platform.h
--- ./Source/Platform.h	2007-12-22 09:41:57.000000000 +0000
+++ ../../src/Source/Platform.h	2008-03-19 14:46:43.000000000 +0000
@@ -185,7 +185,7 @@
 #    define MAKEINTRESOURCE MAKEINTRESOURCEA
 #  endif
 #  ifndef IMAGE_FIRST_SECTION
-#    define IMAGE_FIRST_SECTION(h) ( PIMAGE_SECTION_HEADER( (DWORD) h + \
+#    define IMAGE_FIRST_SECTION(h) ( PIMAGE_SECTION_HEADER( (char *) h + \
                                      FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader) + \
                                      FIX_ENDIAN_INT16(PIMAGE_NT_HEADERS(h)->FileHeader.SizeOfOptionalHeader) ) )
 #  endif
@@ -217,7 +217,7 @@
 #endif
 
 #ifndef ULONG_PTR
-#  define ULONG_PTR DWORD
+#  define ULONG_PTR DWORDLONG
 #endif
 
 #ifndef IDC_HAND
diff -u ./Source/ResourceEditor.cpp ../../src/Source/ResourceEditor.cpp
--- ./Source/ResourceEditor.cpp	2007-12-22 09:41:57.000000000 +0000
+++ ../../src/Source/ResourceEditor.cpp	2008-03-19 15:50:25.000000000 +0000
@@ -665,7 +665,7 @@
     rdDir.NumberOfIdEntries = ConvertEndianness(rdDir.NumberOfIdEntries);
 
     CopyMemory(seeker, &rdDir, sizeof(IMAGE_RESOURCE_DIRECTORY));
-    crd->m_dwWrittenAt = DWORD(seeker);
+    crd->m_dwWrittenAt = (void *)(seeker);
     seeker += sizeof(IMAGE_RESOURCE_DIRECTORY);
 
     for (int i = 0; i < crd->CountEntries(); i++) {
@@ -686,7 +686,7 @@
       rDirE.UName.NameString.NameIsString = (crd->GetEntry(i)->HasName()) ? 1 : 0;
 
       CopyMemory(seeker, &rDirE, sizeof(MY_IMAGE_RESOURCE_DIRECTORY_ENTRY));
-      crd->GetEntry(i)->m_dwWrittenAt = DWORD(seeker);
+      crd->GetEntry(i)->m_dwWrittenAt = (void *)(seeker);
       seeker += sizeof(MY_IMAGE_RESOURCE_DIRECTORY_ENTRY);
     }
     qDirs.pop();
@@ -702,7 +702,7 @@
     rDataE.Size = ConvertEndianness(cRDataE->GetSize());
 
     CopyMemory(seeker, &rDataE, sizeof(IMAGE_RESOURCE_DATA_ENTRY));
-    cRDataE->m_dwWrittenAt = DWORD(seeker);
+    cRDataE->m_dwWrittenAt = (void *)(seeker);
     seeker += sizeof(IMAGE_RESOURCE_DATA_ENTRY);
 
     qDataEntries.pop();
@@ -714,7 +714,8 @@
   while (!qStrings.empty()) {
     CResourceDirectoryEntry* cRDirE = qStrings.front();
 
-    PMY_IMAGE_RESOURCE_DIRECTORY_ENTRY(cRDirE->m_dwWrittenAt)->UName.NameString.NameOffset = ConvertEndianness(DWORD(seeker) - DWORD(pbRsrcSec));
+    PMY_IMAGE_RESOURCE_DIRECTORY_ENTRY(cRDirE->m_dwWrittenAt)->UName.NameString.NameOffset = 
+	     ConvertEndianness((DWORD)((char *)(seeker) - (char *)(pbRsrcSec)));
 
     WCHAR* szName = cRDirE->GetName();
     WORD iLen = winchar_strlen(szName) + 1;
@@ -745,21 +746,21 @@
   /*
    * Set all of the directory entries offsets.
    */
-  SetOffsets(m_cResDir, DWORD(pbRsrcSec));
+  SetOffsets(m_cResDir, pbRsrcSec);
 }
 
 // Sets the offsets in directory entries
-void CResourceEditor::SetOffsets(CResourceDirectory* resDir, DWORD newResDirAt) {
+void CResourceEditor::SetOffsets(CResourceDirectory* resDir, void *newResDirAt) {
   for (int i = 0; i < resDir->CountEntries(); i++) {
     PMY_IMAGE_RESOURCE_DIRECTORY_ENTRY rde = PMY_IMAGE_RESOURCE_DIRECTORY_ENTRY(resDir->GetEntry(i)->m_dwWrittenAt);
     if (resDir->GetEntry(i)->IsDataDirectory()) {
       rde->UOffset.DirectoryOffset.DataIsDirectory = 1;
-      rde->UOffset.DirectoryOffset.OffsetToDirectory = resDir->GetEntry(i)->GetSubDirectory()->m_dwWrittenAt - newResDirAt;
+      rde->UOffset.DirectoryOffset.OffsetToDirectory = (char *)(resDir->GetEntry(i)->GetSubDirectory()->m_dwWrittenAt) - (char *)newResDirAt;
       rde->UOffset.OffsetToData = ConvertEndianness(rde->UOffset.OffsetToData);
       SetOffsets(resDir->GetEntry(i)->GetSubDirectory(), newResDirAt);
     }
     else {
-      rde->UOffset.OffsetToData = ConvertEndianness(resDir->GetEntry(i)->GetDataEntry()->m_dwWrittenAt - newResDirAt);
+      rde->UOffset.OffsetToData = ConvertEndianness((char *)(resDir->GetEntry(i)->GetDataEntry()->m_dwWrittenAt) - (char *)newResDirAt);
     }
   }
 }
@@ -868,7 +869,7 @@
 // Returns -1 if can not be found
 int CResourceDirectory::Find(WCHAR* szName) {
   if (IS_INTRESOURCE(szName))
-    return Find((WORD) (DWORD) szName);
+    return Find((WORD) (ULONG_PTR) szName);
   else
     if (szName[0] == '#')
       return Find(WORD(winchar_stoi(szName + 1)));
@@ -946,7 +947,7 @@
   if (IS_INTRESOURCE(szName)) {
     m_bHasName = false;
     m_szName = 0;
-    m_wId = (WORD) (DWORD) szName;
+    m_wId = (WORD) (ULONG_PTR) szName;
   }
   else {
     m_bHasName = true;
@@ -960,7 +961,7 @@
   if (IS_INTRESOURCE(szName)) {
     m_bHasName = false;
     m_szName = 0;
-    m_wId = (WORD) (DWORD) szName;
+    m_wId = (WORD) (ULONG_PTR) szName;
   }
   else {
     m_bHasName = true;
diff -u ./Source/ResourceEditor.h ../../src/Source/ResourceEditor.h
--- ./Source/ResourceEditor.h	2007-12-22 09:41:57.000000000 +0000
+++ ../../src/Source/ResourceEditor.h	2008-03-19 15:45:48.000000000 +0000
@@ -155,7 +155,7 @@
   CResourceDirectory* ScanDirectory(PRESOURCE_DIRECTORY rdRoot, PRESOURCE_DIRECTORY rdToScan);
 
   void WriteRsrcSec(BYTE* pbRsrcSec);
-  void SetOffsets(CResourceDirectory* resDir, DWORD newResDirAt);
+  void SetOffsets(CResourceDirectory* resDir, void *newResDirAt);
 
   DWORD AdjustVA(DWORD dwVirtualAddress, DWORD dwAdjustment);
   DWORD AlignVA(DWORD dwVirtualAddress);
@@ -179,7 +179,7 @@
 
   void Destroy();
 
-  DWORD m_dwWrittenAt;
+  void *m_dwWrittenAt;
 
 private:
   IMAGE_RESOURCE_DIRECTORY m_rdDir;
@@ -203,7 +203,7 @@
 
   CResourceDataEntry* GetDataEntry();
 
-  DWORD m_dwWrittenAt;
+  void *m_dwWrittenAt;
 
 private:
   bool m_bHasName;
@@ -231,7 +231,7 @@
   DWORD GetCodePage();
   DWORD GetOffset();
 
-  DWORD m_dwWrittenAt;
+  void *m_dwWrittenAt;
 
 private:
   BYTE* m_pbData;
Common subdirectories: ./Source/Tests and ../../src/Source/Tests
Common subdirectories: ./Source/boost and ../../src/Source/boost
Common subdirectories: ./Source/bzip2 and ../../src/Source/bzip2
Only in ../../src/Source: defines.h
Common subdirectories: ./Source/exehead and ../../src/Source/exehead
diff -u ./Source/mmap.cpp ../../src/Source/mmap.cpp
--- ./Source/mmap.cpp	2007-12-22 09:41:57.000000000 +0000
+++ ../../src/Source/mmap.cpp	2008-03-19 14:41:19.000000000 +0000
@@ -324,7 +324,7 @@
   if (!pView)
     return;
 
-  unsigned int alignment = ((unsigned int)pView) % m_iAllocationGranularity;
+  ULONG_PTR alignment = ((ULONG_PTR)pView) % m_iAllocationGranularity;
   pView = (char *)pView - alignment;
   size += alignment;
 #ifdef _WIN32
Only in ../../src/Source: version.h
Common subdirectories: ./Source/zlib and ../../src/Source/zlib