Index: src/ch/FeedbackNotEnoughSpaceDlg.cpp =================================================================== diff -u -r671f4b1792a20d98b186f4e0a9cc6a620dede019 -r8dc649003961dad64b92da67426814fb5dd862e0 --- src/ch/FeedbackNotEnoughSpaceDlg.cpp (.../FeedbackNotEnoughSpaceDlg.cpp) (revision 671f4b1792a20d98b186f4e0a9cc6a620dede019) +++ src/ch/FeedbackNotEnoughSpaceDlg.cpp (.../FeedbackNotEnoughSpaceDlg.cpp) (revision 8dc649003961dad64b92da67426814fb5dd862e0) @@ -34,7 +34,7 @@ // CFeedbackNotEnoughSpaceDlg dialog -CFeedbackNotEnoughSpaceDlg::CFeedbackNotEnoughSpaceDlg(ull_t ullSizeRequired, const tchar_t* pszSrcPath, const tchar_t* pszDstPath) +CFeedbackNotEnoughSpaceDlg::CFeedbackNotEnoughSpaceDlg(unsigned long long ullSizeRequired, const wchar_t* pszSrcPath, const wchar_t* pszDstPath) :ictranslate::CLanguageDialog(IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG), m_bAllItems(FALSE), m_ullRequired(ullSizeRequired), @@ -69,21 +69,20 @@ { // format needed text ictranslate::CFormat fmt(GetResManager().LoadString(IDS_NERPATH_STRING)); - fmt.SetParam(_t("%path"), m_strDisk); + fmt.SetParam(_T("%path"), m_strDisk); CWnd* pWnd=GetDlgItem(IDC_HEADER_STATIC); if (pWnd) pWnd->SetWindowText(fmt); // now the sizes - TCHAR szData[128]; pWnd=GetDlgItem(IDC_REQUIRED_STATIC); if (pWnd) - pWnd->SetWindowText(GetSizeString(m_ullRequired, szData, 128)); - ull_t ullFree; + pWnd->SetWindowText(GetSizeString(m_ullRequired)); + unsigned long long ullFree; pWnd=GetDlgItem(IDC_AVAILABLE_STATIC); if (pWnd && GetDynamicFreeSpace(m_strDisk, &ullFree, NULL)) - pWnd->SetWindowText(GetSizeString(ullFree, szData, 128)); + pWnd->SetWindowText(GetSizeString(ullFree)); } BOOL CFeedbackNotEnoughSpaceDlg::OnInitDialog() @@ -129,12 +128,11 @@ if (nIDEvent == 1601) { // update free space - ull_t ullFree; + unsigned long long ullFree; CWnd *pWnd=GetDlgItem(IDC_AVAILABLE_STATIC); if (pWnd && GetDynamicFreeSpace(m_strDisk, &ullFree, NULL)) { - TCHAR szData[128]; - pWnd->SetWindowText(GetSizeString(ullFree, szData, 128)); + pWnd->SetWindowText(GetSizeString(ullFree)); // end dialog if this is enough if (m_ullRequired <= ullFree)