Index: src/ch/CustomCopyDlg.cpp
===================================================================
diff -u -r17059054c69cd5726f4c7d35357f3b9556471783 -r68739164e349c34dcd0bcb36c6eb381f23cb8b77
--- src/ch/CustomCopyDlg.cpp	(.../CustomCopyDlg.cpp)	(revision 17059054c69cd5726f4c7d35357f3b9556471783)
+++ src/ch/CustomCopyDlg.cpp	(.../CustomCopyDlg.cpp)	(revision 68739164e349c34dcd0bcb36c6eb381f23cb8b77)
@@ -393,7 +393,7 @@
 	{
 		const CFileFilter* pFilter = m_ccData.m_afFilters.GetAt(i);
 		if(pFilter)
-			AddFilter(*pFilter, i);
+			AddFilter(*pFilter, (int)i);
 	}
 }
 
@@ -418,7 +418,7 @@
 		// first element is the path
 		CString strPath=pszBuffer;
 
-		int iOffset=_tcslen(pszBuffer)+1;
+		int iOffset = (int)_tcslen(pszBuffer) + 1;
 		
 		// get filenames
 		if (pszBuffer[iOffset] == _T('\0'))
@@ -430,7 +430,7 @@
 			while (pszBuffer[iOffset] != _T('\0'))
 			{
 				AddPath(strPath+CString(pszBuffer+iOffset));
-				iOffset+=_tcslen(pszBuffer+iOffset)+1;
+				iOffset += (int)_tcslen(pszBuffer+iOffset) + 1;
 			}
 		}
 	}
Index: src/ch/FolderDialog.cpp
===================================================================
diff -u -raa6bff57279b9f9cfc276e9adab2763e2900878d -r68739164e349c34dcd0bcb36c6eb381f23cb8b77
--- src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision aa6bff57279b9f9cfc276e9adab2763e2900878d)
+++ src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 68739164e349c34dcd0bcb36c6eb381f23cb8b77)
@@ -866,7 +866,7 @@
 
 	// add to an array and to shortcuts list
 	m_bdData.cvShortcuts.push_back((const PTSTR)(LPCTSTR)(CString)(sc), true);
-	int iIndex=m_bdData.cvShortcuts.size()-1;
+	int iIndex = (int)m_bdData.cvShortcuts.size() - 1;
 	m_ctlShortcuts.InsertItem(iIndex, sc.m_strName, sfi.iIcon);
 	m_ctlShortcuts.SetItem(iIndex, 1, LVIF_TEXT, sc.m_strPath, 0, 0, 0, 0);
 
@@ -1246,7 +1246,7 @@
 // hit testing in a gripper cause
 LRESULT CFolderDialog::OnNcHitTest(CPoint point) 
 {
-	UINT uiRes=CLanguageDialog::OnNcHitTest(point);
+	LRESULT uiRes = CLanguageDialog::OnNcHitTest(point);
 	if (uiRes == HTCLIENT)
 	{
 		CRect rc;
@@ -1276,7 +1276,7 @@
 
 ////////////////////////////////////////////////////////////////////////////
 // opens choose folder dialog
-int BrowseForFolder(CFolderDialog::BROWSEDATA* pData, LPTSTR pszPath)
+INT_PTR BrowseForFolder(CFolderDialog::BROWSEDATA* pData, LPTSTR pszPath)
 {
 	_ASSERTE(pData && pszPath);
 	if(!pData || !pszPath)
@@ -1286,7 +1286,7 @@
 	CFolderDialog dlg;
 	dlg.m_bdData=*pData;
 
-	int iResult=dlg.DoModal();
+	INT_PTR iResult = dlg.DoModal();
 	if (iResult == IDOK)
 	{
 		dlg.GetPath(pszPath);		// returned path
Index: src/ch/FolderDialog.h
===================================================================
diff -u -r449a5b399ab21ca0d06050b47b264f2f704af966 -r68739164e349c34dcd0bcb36c6eb381f23cb8b77
--- src/ch/FolderDialog.h	(.../FolderDialog.h)	(revision 449a5b399ab21ca0d06050b47b264f2f704af966)
+++ src/ch/FolderDialog.h	(.../FolderDialog.h)	(revision 68739164e349c34dcd0bcb36c6eb381f23cb8b77)
@@ -88,7 +88,7 @@
 	void GetPath(LPTSTR pszPath);
 
 	// function displays dialog with some parameters
-	friend int BrowseForFolder(BROWSEDATA* pData, LPTSTR pszPath);
+	friend INT_PTR BrowseForFolder(BROWSEDATA* pData, LPTSTR pszPath);
 
 // Implementation
 protected:
Index: src/ch/PropertyListCtrl.cpp
===================================================================
diff -u -r449a5b399ab21ca0d06050b47b264f2f704af966 -r68739164e349c34dcd0bcb36c6eb381f23cb8b77
--- src/ch/PropertyListCtrl.cpp	(.../PropertyListCtrl.cpp)	(revision 449a5b399ab21ca0d06050b47b264f2f704af966)
+++ src/ch/PropertyListCtrl.cpp	(.../PropertyListCtrl.cpp)	(revision 68739164e349c34dcd0bcb36c6eb381f23cb8b77)
@@ -461,7 +461,7 @@
 				if(m_pCurItem->csProperties.GetSize() > 5)
 					TempRect.bottom += GetItemHeight(0) * 5;
 				else
-					TempRect.bottom += GetItemHeight(0) * m_pCurItem->csProperties.GetSize();
+					TempRect.bottom += GetItemHeight(0) * (int)m_pCurItem->csProperties.GetSize();
 				
 				// pobierz wsp�rz�dne tej kontrolki w stosunku do okna parenta
 //				CRect rcThisParent;
Index: src/ch/RecentDlg.cpp
===================================================================
diff -u -r17059054c69cd5726f4c7d35357f3b9556471783 -r68739164e349c34dcd0bcb36c6eb381f23cb8b77
--- src/ch/RecentDlg.cpp	(.../RecentDlg.cpp)	(revision 17059054c69cd5726f4c7d35357f3b9556471783)
+++ src/ch/RecentDlg.cpp	(.../RecentDlg.cpp)	(revision 68739164e349c34dcd0bcb36c6eb381f23cb8b77)
@@ -144,7 +144,7 @@
 	SHFILEINFO sfi;
 	sfi.iIcon=-1;
 	SHGetFileInfo(m_strPath, FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(sfi), SHGFI_SYSICONINDEX | SHGFI_LARGEICON);
-	m_ctlRecent.InsertItem(m_cvRecent.size()-1, m_strPath, sfi.iIcon);
+	m_ctlRecent.InsertItem((UINT)m_cvRecent.size() - 1, m_strPath, sfi.iIcon);
 }
 
 void CRecentDlg::OnChangeButton() 
Index: src/ch/ShortcutsDlg.cpp
===================================================================
diff -u -r17059054c69cd5726f4c7d35357f3b9556471783 -r68739164e349c34dcd0bcb36c6eb381f23cb8b77
--- src/ch/ShortcutsDlg.cpp	(.../ShortcutsDlg.cpp)	(revision 17059054c69cd5726f4c7d35357f3b9556471783)
+++ src/ch/ShortcutsDlg.cpp	(.../ShortcutsDlg.cpp)	(revision 68739164e349c34dcd0bcb36c6eb381f23cb8b77)
@@ -248,8 +248,8 @@
 	SHFILEINFO sfi;
 	sfi.iIcon=-1;
 	SHGetFileInfo(sc.m_strPath, FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(sfi), SHGFI_SYSICONINDEX | SHGFI_LARGEICON);
-	m_ctlShortcuts.InsertItem(m_cvShortcuts.size()-1, sc.m_strName, sfi.iIcon);
-	m_ctlShortcuts.SetItem(m_cvShortcuts.size()-1, 1, LVIF_TEXT, sc.m_strPath, 0, 0, 0, 0);
+	m_ctlShortcuts.InsertItem((UINT)m_cvShortcuts.size() - 1, sc.m_strName, sfi.iIcon);
+	m_ctlShortcuts.SetItem((int)m_cvShortcuts.size() - 1, 1, LVIF_TEXT, sc.m_strPath, 0, 0, 0, 0);
 }
 
 void CShortcutsDlg::OnChangeButton() 
Index: src/chext/ActionSelector.cpp
===================================================================
diff -u -r0373359eff650e8cf04a5992711ef9f20347536f -r68739164e349c34dcd0bcb36c6eb381f23cb8b77
--- src/chext/ActionSelector.cpp	(.../ActionSelector.cpp)	(revision 0373359eff650e8cf04a5992711ef9f20347536f)
+++ src/chext/ActionSelector.cpp	(.../ActionSelector.cpp)	(revision 68739164e349c34dcd0bcb36c6eb381f23cb8b77)
@@ -154,16 +154,16 @@
 				TCHAR* pFnd = _tcsstr(szPath+2, _T("\\"));
 				if(pFnd)
 				{
-					int iCount;
+					size_t stCount;
 					// find another
 					TCHAR *pSecond = _tcsstr(pFnd + 1, _T("\\"));
 					if(pSecond)
-						iCount = pSecond - szPath;
+						stCount = pSecond - szPath;
 					else
-						iCount = _tcslen(szPath);
+						stCount = _tcslen(szPath);
 
 					// found - compare
-					if(_tcsnicmp(szPath, pszDestinationPath, iCount) == 0)
+					if(_tcsnicmp(szPath, pszDestinationPath, stCount) == 0)
 						m_eDefaultOperation = eAction_Move;
 				}
 			}
Index: src/chext/MenuExt.cpp
===================================================================
diff -u -r0373359eff650e8cf04a5992711ef9f20347536f -r68739164e349c34dcd0bcb36c6eb381f23cb8b77
--- src/chext/MenuExt.cpp	(.../MenuExt.cpp)	(revision 0373359eff650e8cf04a5992711ef9f20347536f)
+++ src/chext/MenuExt.cpp	(.../MenuExt.cpp)	(revision 68739164e349c34dcd0bcb36c6eb381f23cb8b77)
@@ -222,8 +222,8 @@
 				int iShortcutIndex=((LOWORD(lpici->lpVerb)-5) % g_pscsShared->iShortcutsCount);	// shortcut index
 
 				// buffer for data
-				UINT uiSize=_tcslen(stShortcuts[iShortcutIndex].szPath)+1+m_bBuffer.m_iDataSize;
-				TCHAR *pszBuffer=new TCHAR[uiSize];
+				size_t stSize=_tcslen(stShortcuts[iShortcutIndex].szPath)+1+m_bBuffer.m_iDataSize;
+				TCHAR *pszBuffer=new TCHAR[stSize];
 				_tcscpy(pszBuffer, stShortcuts[iShortcutIndex].szPath);	// �cie�ka docelowa
 
 				// buffer with files
@@ -233,7 +233,7 @@
 				COPYDATASTRUCT cds;
 				cds.dwData=pCommand[iCommandIndex].uiCommandID;
 				cds.lpData=pszBuffer;
-				cds.cbData=uiSize * sizeof(TCHAR);
+				cds.cbData=(DWORD)(stSize * sizeof(TCHAR));
 
 				// send message
 				::SendMessage(hWnd, WM_COPYDATA, reinterpret_cast<WPARAM>(lpici->hwnd), reinterpret_cast<LPARAM>(&cds));
@@ -346,7 +346,7 @@
 			mii.wID=idCmdFirst+2;
 			mii.hSubMenu=m_mMenus.hShortcuts[0];
 			mii.dwTypeData=pCommand[2].szCommand;
-			mii.cch=_tcslen(pCommand[2].szCommand);
+			mii.cch=(UINT)_tcslen(pCommand[2].szCommand);
 
 			::InsertMenuItem(hmenu, indexMenu++, TRUE, &mii);
 			//			::InsertMenu(hmenu, indexMenu++, MF_BYPOSITION | MF_POPUP | MF_STRING | ((g_pscsShared->iShortcutsCount > 0) ? MF_ENABLED : MF_GRAYED),
@@ -364,7 +364,7 @@
 			mii.wID=idCmdFirst+3;
 			mii.hSubMenu=m_mMenus.hShortcuts[1];
 			mii.dwTypeData=pCommand[3].szCommand;
-			mii.cch=_tcslen(pCommand[3].szCommand);
+			mii.cch=(UINT)_tcslen(pCommand[3].szCommand);
 
 			::InsertMenuItem(hmenu, indexMenu++, TRUE, &mii);
 			//			::InsertMenu(hmenu, indexMenu++, MF_BYPOSITION | MF_POPUP | MF_STRING | ((g_pscsShared->iShortcutsCount > 0) ? MF_ENABLED : MF_GRAYED),
@@ -382,7 +382,7 @@
 			mii.wID=idCmdFirst+4;
 			mii.hSubMenu=m_mMenus.hShortcuts[2];
 			mii.dwTypeData=pCommand[4].szCommand;
-			mii.cch=_tcslen(pCommand[4].szCommand);
+			mii.cch=(UINT)_tcslen(pCommand[4].szCommand);
 
 			::InsertMenuItem(hmenu, indexMenu++, TRUE, &mii);
 			//			::InsertMenu(hmenu, indexMenu++, MF_BYPOSITION | MF_POPUP | MF_STRING | ((g_pscsShared->iShortcutsCount > 0) ? MF_ENABLED : MF_GRAYED),
Index: src/chext/clipboard.cpp
===================================================================
diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r68739164e349c34dcd0bcb36c6eb381f23cb8b77
--- src/chext/clipboard.cpp	(.../clipboard.cpp)	(revision d5c3edd0d167db9b5d47d04248820fda49499a5e)
+++ src/chext/clipboard.cpp	(.../clipboard.cpp)	(revision 68739164e349c34dcd0bcb36c6eb381f23cb8b77)
@@ -22,12 +22,14 @@
 void GetDataFromClipboard(HDROP hdrop, LPCTSTR pszDstPath, LPTSTR *pszBuffer, UINT* pSize)
 {
 	// get clipboard data
-	UINT uiBufferSize=(pszDstPath == NULL) ? 0 : _tcslen(pszDstPath)+1;
-	UINT uiFilesCount=DragQueryFile(hdrop, 0xffffffff, NULL, 0);
+	UINT uiBufferSize = (pszDstPath == NULL) ? 0 : (UINT)_tcslen(pszDstPath) + 1;
+	UINT uiFilesCount = DragQueryFile(hdrop, 0xffffffff, NULL, 0);
 	
 	// count size
-	for (UINT i=0;i<uiFilesCount;i++)
+	for(UINT i=0;i<uiFilesCount;i++)
+	{
 		uiBufferSize+=DragQueryFile(hdrop, i, NULL, 0)+1;
+	}
 	
 	// new buffer
 	*pszBuffer=new TCHAR[uiBufferSize];
@@ -39,7 +41,7 @@
 		_tcscpy(*pszBuffer, pszDstPath);
 	
 	// size of pszDstPath
-	UINT uiOffset=(pszDstPath == NULL) ? 0 : _tcslen(pszDstPath)+1;
+	UINT uiOffset=(pszDstPath == NULL) ? 0 : (UINT)_tcslen(pszDstPath)+1;
 	
 	// get files and put it in a table
 	UINT uiSize;
Index: src/common/FileSupport.cpp
===================================================================
diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r68739164e349c34dcd0bcb36c6eb381f23cb8b77
--- src/common/FileSupport.cpp	(.../FileSupport.cpp)	(revision d5c3edd0d167db9b5d47d04248820fda49499a5e)
+++ src/common/FileSupport.cpp	(.../FileSupport.cpp)	(revision 68739164e349c34dcd0bcb36c6eb381f23cb8b77)
@@ -91,9 +91,9 @@
 	if(!GetDiskFreeSpaceEx(lpszPath, &ui64Available, &ui64Total, NULL))
 	{
 		if(pFree)
-			*pFree=-1;
+			*pFree = 0;
 		if(pTotal)
-			*pTotal=-1;
+			*pTotal = 0;
 		return false;
 	}
 	else