Index: src/ch/StatusDlg.cpp
===================================================================
diff -u -N -rf6c4389122d92e5f84a509e9be0facebac429151 -re912e0a6b456c2eed24bec7303a908d3ff0aa59a
--- src/ch/StatusDlg.cpp	(.../StatusDlg.cpp)	(revision f6c4389122d92e5f84a509e9be0facebac429151)
+++ src/ch/StatusDlg.cpp	(.../StatusDlg.cpp)	(revision e912e0a6b456c2eed24bec7303a908d3ff0aa59a)
@@ -293,35 +293,35 @@
 		// count of processed data/overall count of data
 		_sntprintf(m_szData, _MAX_PATH, _T("%d/%d ("), td.m_iIndex, td.m_iSize);
 		m_strTemp=CString(m_szData);
-		m_strTemp+=GetSizeString(td.m_iProcessedSize, m_szData, _MAX_PATH)+CString(_T("/"));
-		m_strTemp+=GetSizeString(td.m_iSizeAll, m_szData, _MAX_PATH)+CString(_T(")"));
+		m_strTemp+=GetSizeString(td.m_ullProcessedSize, m_szData, _MAX_PATH)+CString(_T("/"));
+		m_strTemp+=GetSizeString(td.m_ullSizeAll, m_szData, _MAX_PATH)+CString(_T(")"));
 		_sntprintf(m_szData, _MAX_PATH, _T(" (%s%d/%d)"), GetResManager()->LoadString(IDS_CURRENTPASS_STRING), td.m_ucCurrentCopy, td.m_ucCopies);
 		m_strTemp+=m_szData;
 		GetDlgItem(IDC_PROGRESS_STATIC)->SetWindowText(m_strTemp);
 		
 		// transfer
 		if (m_i64LastProcessed == 0)	// if first time - show average
-			m_strTemp=GetSizeString( td.m_lTimeElapsed ? td.m_iProcessedSize/td.m_lTimeElapsed : 0, m_szData, _MAX_PATH);	// last avg
+			m_strTemp=GetSizeString( td.m_lTimeElapsed ? td.m_ullProcessedSize/td.m_lTimeElapsed : 0, m_szData, _MAX_PATH);	// last avg
 		else
 			if ( (dwCurrentTime-m_dwLastUpdate) != 0)
-				m_strTemp=GetSizeString( (static_cast<double>(td.m_iProcessedSize) - static_cast<double>(m_i64LastProcessed))/(static_cast<double>(dwCurrentTime-m_dwLastUpdate)/1000.0), m_szData, _MAX_PATH);
+				m_strTemp=GetSizeString( (static_cast<double>(td.m_ullProcessedSize) - static_cast<double>(m_i64LastProcessed))/(static_cast<double>(dwCurrentTime-m_dwLastUpdate)/1000.0), m_szData, _MAX_PATH);
 			else
-				m_strTemp=GetSizeString( 0I64, m_szData, _MAX_PATH);
+				m_strTemp=GetSizeString( 0ULL, m_szData, _MAX_PATH);
 
 		// avg transfer
 		GetDlgItem(IDC_TRANSFER_STATIC)->SetWindowText(m_strTemp+_T("/s (")+CString(GetResManager()->LoadString(IDS_AVERAGEWORD_STRING))
-			+CString(GetSizeString(td.m_lTimeElapsed ? td.m_iProcessedSize/td.m_lTimeElapsed : 0, m_szData, _MAX_PATH))+_T("/s )")
+			+CString(GetSizeString(td.m_lTimeElapsed ? td.m_ullProcessedSize/td.m_lTimeElapsed : 0, m_szData, _MAX_PATH))+_T("/s )")
 			);
 		
 		// elapsed time/estimated time
 		FormatTime(td.m_lTimeElapsed, m_szTimeBuffer1, 40);
-		FormatTime( (td.m_iProcessedSize == 0) ? 0 : static_cast<long>((static_cast<__int64>(td.m_iSizeAll)*static_cast<__int64>(td.m_lTimeElapsed))/td.m_iProcessedSize), m_szTimeBuffer2, 40);
+		FormatTime( (td.m_ullProcessedSize == 0) ? 0 : static_cast<long>((static_cast<__int64>(td.m_ullSizeAll)*static_cast<__int64>(td.m_lTimeElapsed))/td.m_ullProcessedSize), m_szTimeBuffer2, 40);
 
 		_sntprintf(m_szData, _MAX_PATH, _T("%s / %s"), m_szTimeBuffer1, m_szTimeBuffer2);
 		GetDlgItem(IDC_TIME_STATIC)->SetWindowText(m_szData);
 		
 		// remember current processed data (used for calculating transfer)
-		m_i64LastProcessed=td.m_iProcessedSize;
+		m_i64LastProcessed=td.m_ullProcessedSize;
 
 		// set progress
 		m_ctlCurrentProgress.SetPos(td.m_nPercent);
@@ -769,7 +769,7 @@
 		if (dwCurrentTime-m_dwLastUpdate != 0)
 			m_strTemp=GetSizeString( (static_cast<double>(m_pTasks->GetPosition()) - static_cast<double>(m_i64LastAllTasksProcessed))/static_cast<double>(static_cast<double>(dwCurrentTime-m_dwLastUpdate)/1000.0), m_szData, _MAX_PATH);
 		else
-			m_strTemp=GetSizeString( 0I64, m_szData, _MAX_PATH);
+			m_strTemp=GetSizeString( 0ULL, m_szData, _MAX_PATH);
 		
 		GetDlgItem(IDC_OVERALL_TRANSFER_STATIC)->SetWindowText(m_strTemp+_T("/s"));
 		m_i64LastAllTasksProcessed=m_pTasks->GetPosition();
@@ -922,7 +922,7 @@
 		szData[0] = _T('\0');
 	}
 
-	_tcscat(szData, GetSizeString((__int64)uiValue, m_szData, _MAX_PATH));
+	_tcscat(szData, GetSizeString((ull_t)uiValue, m_szData, _MAX_PATH));
 
 	GetDlgItem(IDC_BUFFERSIZE_STATIC)->SetWindowText(szData);
 }