Index: src/ch/FileInfo.h
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r025757ce5252abbb6dfd81f8f254e419f9520a09
--- src/ch/FileInfo.h	(.../FileInfo.h)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/FileInfo.h	(.../FileInfo.h)	(revision 025757ce5252abbb6dfd81f8f254e419f9520a09)
@@ -316,12 +316,32 @@
 	int AddFile(CString strFilePath, int iSrcIndex);
 	
 	// store/restore
-	void Store(CArchive& ar) { int iSize=GetSize(); ar<<iSize; for (int i=0;i<iSize;i++) { CFileInfo fi=GetAt(i); fi.Store(ar); } };
-	void Load(CArchive& ar) { int iSize; ar>>iSize; SetSize(iSize, 5000); CFileInfo fi; fi.SetClipboard(m_pClipboard);
-			for (int i=0;i<iSize;i++) { fi.Load(ar); SetAt(i, fi); } }
+	void Store(CArchive& ar)
+	{
+		INT_PTR iSize = GetSize();
+		ar << iSize;
+		for (INT_PTR i=0;i<iSize;i++)
+		{
+			CFileInfo fi=GetAt(i);
+			fi.Store(ar);
+		}
+	}
+
+	void Load(CArchive& ar)
+	{
+		INT_PTR iSize;
+		ar>>iSize;
+		SetSize(iSize, 5000);
+		CFileInfo fi;
+		fi.SetClipboard(m_pClipboard);
+		for (INT_PTR i=0;i<iSize;i++)
+		{
+			fi.Load(ar);
+			SetAt(i, fi);
+		}
+	}
 	
 protected:
-	
 	CClipboardArray* m_pClipboard;
 };
 
Index: src/ch/OptionsDlg.cpp
===================================================================
diff -u -rebabad67cdda34ed4e36ab794e10d0ade8124bf3 -r025757ce5252abbb6dfd81f8f254e419f9520a09
--- src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision ebabad67cdda34ed4e36ab794e10d0ade8124bf3)
+++ src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision 025757ce5252abbb6dfd81f8f254e419f9520a09)
@@ -71,10 +71,10 @@
 	m_ctlProperties.AddString(text, ID_PROPERTY_COMBO_LIST, IDS_BOOLTEXT_STRING, (value));
 
 #define PROP_UINT(text, value)\
-	m_ctlProperties.AddString(text, ID_PROPERTY_TEXT, _itot(PtrToInt((value)), m_szBuffer, 10), 0);
+	m_ctlProperties.AddString(text, ID_PROPERTY_TEXT, _itot((int)(value), m_szBuffer, 10), 0);
 
 #define PROP_COMBO(text, prop_text, value)\
-	m_ctlProperties.AddString(text, ID_PROPERTY_COMBO_LIST, prop_text, PtrToInt((value)));
+	m_ctlProperties.AddString(text, ID_PROPERTY_COMBO_LIST, prop_text, (int)((value)));
 
 #define PROP_DIR(text, prop_text, value)\
 	m_ctlProperties.AddString(text, ID_PROPERTY_DIR, (value)+CString(GetResManager()->LoadString(prop_text)), 0);
@@ -83,7 +83,7 @@
 	m_ctlProperties.AddString(text, ID_PROPERTY_PATH, (value)+CString(GetResManager()->LoadString(prop_text)), 0);
 
 #define PROP_CUSTOM_UINT(text, value, callback, param)\
-	m_ctlProperties.AddString(text, ID_PROPERTY_CUSTOM, CString(_itot(PtrToInt(value), m_szBuffer, 10)), callback, this, param, 0);
+	m_ctlProperties.AddString(text, ID_PROPERTY_CUSTOM, CString(_itot((int)(value), m_szBuffer, 10)), callback, this, param, 0);
 
 #define SKIP_SEPARATOR(pos)\
 	pos++;
Index: src/chext/MenuExt.cpp
===================================================================
diff -u -rb5f6c00d1615afa6d26e4d74e564afe0af893174 -r025757ce5252abbb6dfd81f8f254e419f9520a09
--- src/chext/MenuExt.cpp	(.../MenuExt.cpp)	(revision b5f6c00d1615afa6d26e4d74e564afe0af893174)
+++ src/chext/MenuExt.cpp	(.../MenuExt.cpp)	(revision 025757ce5252abbb6dfd81f8f254e419f9520a09)
@@ -33,7 +33,7 @@
 void CutAmpersands(LPTSTR lpszString)
 {
 	int iOffset=0;
-	int iLength=_tcslen(lpszString);
+	size_t iLength=_tcslen(lpszString);
 	for (int j=0;j<iLength;j++)
 	{
 		if (lpszString[j] == _T('&'))
@@ -94,7 +94,7 @@
 
 			// calc text size
 			SIZE size;
-			GetTextExtentPoint32(hDC, pShortcuts[iShortcutIndex].szName, _tcslen(pShortcuts[iShortcutIndex].szName), &size);
+			GetTextExtentPoint32(hDC, pShortcuts[iShortcutIndex].szName, (int)_tcslen(pShortcuts[iShortcutIndex].szName), &size);
 
 			// restore old settings
 			SelectObject(hDC, hOldFont);