Index: src/ch/StatusDlg.cpp =================================================================== diff -u -N -r22573f5fa8bfbf68a19deb7631962e026f028045 -ref313208b7c4a113907f2f72ee0b73406081501d --- src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision 22573f5fa8bfbf68a19deb7631962e026f028045) +++ src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision ef313208b7c4a113907f2f72ee0b73406081501d) @@ -59,7 +59,6 @@ { CLanguageDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CStatusDlg) - DDX_Control(pDX, IDC_ERRORS_EDIT, m_ctlErrors); DDX_Control(pDX, IDC_TASK_PROGRESS, m_ctlCurrentProgress); DDX_Control(pDX, IDC_STATUS_LIST, m_ctlStatusList); DDX_Control(pDX, IDC_ALL_PROGRESS, m_ctlProgressAll); @@ -194,11 +193,6 @@ GetDlgItem(IDC_BUFFERSIZE_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYBUFFERSIZETEXT_STRING)); GetDlgItem(IDC_PRIORITY_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYPRIORITYTEXT_STRING)); - const TCHAR *pszText=GetResManager().LoadString(IDS_EMPTYERRORTEXT_STRING); - m_ctlErrors.GetWindowText(m_strTemp); - if (m_strTemp != pszText) - m_ctlErrors.SetWindowText(pszText); - GetDlgItem(IDC_PROGRESS_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYPROCESSEDTEXT_STRING)); GetDlgItem(IDC_TRANSFER_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYTRANSFERTEXT_STRING)); GetDlgItem(IDC_TIME_STATIC)->SetWindowText(GetResManager().LoadString(IDS_EMPTYTIMETEXT_STRING)); @@ -281,22 +275,6 @@ GetDlgItem(IDC_OPERATION_STATIC)->SetWindowText(td.m_szStatusText); // operation GetDlgItem(IDC_SOURCE_STATIC)->SetWindowText(td.m_strFullFilePath); // src object - // error message - if ( (td.m_uiStatus & ST_WORKING_MASK) == ST_ERROR ) - { - m_ctlErrors.GetWindowText(m_strTemp); - if (m_strTemp != td.m_strErrorDesc) - m_ctlErrors.SetWindowText(td.m_strErrorDesc); - } - else - { - const TCHAR *pszText=GetResManager().LoadString(IDS_EMPTYERRORTEXT_STRING); - - m_ctlErrors.GetWindowText(m_strTemp2); - if (m_strTemp2 != pszText) - m_ctlErrors.SetWindowText(pszText); - } - // count of processed data/overall count of data _sntprintf(m_szData, _MAX_PATH, _T("%d/%d ("), td.m_stIndex, td.m_stSize); m_strTemp=CString(m_szData); @@ -1006,7 +984,6 @@ AddResizableControl(IDC_005_STATIC, 0.5, 0.0, 0.0, 0); AddResizableControl(IDC_006_STATIC, 0.5, 0.0, 0.0, 0); AddResizableControl(IDC_007_STATIC, 0.5, 0.0, 0.0, 0); - AddResizableControl(IDC_008_STATIC, 0.5, 0.0, 0.0, 0); AddResizableControl(IDC_009_STATIC, 0.5, 0.0, 0.0, 0); AddResizableControl(IDC_010_STATIC, 0.5, 0.0, 0.0, 0); AddResizableControl(IDC_011_STATIC, 0.5, 0.0, 0.0, 0); @@ -1022,7 +999,6 @@ AddResizableControl(IDC_TASK_PROGRESS, 0.5, 0.0, 0.5, 0); // right part of right column - AddResizableControl(IDC_ERRORS_EDIT, 0.5, 0.0, 0.5, 0); AddResizableControl(IDC_ASSOCIATEDFILES__STATIC, 0.5, 0.0, 0.5, 0); AddResizableControl(IDC_OPERATION_STATIC, 0.5, 0.0, 0.5, 0); AddResizableControl(IDC_SOURCE_STATIC, 0.5, 0.0, 0.5, 0); Index: src/ch/StatusDlg.h =================================================================== diff -u -N -rf703b71b8c856e2538283555e9fdbc84918677c3 -ref313208b7c4a113907f2f72ee0b73406081501d --- src/ch/StatusDlg.h (.../StatusDlg.h) (revision f703b71b8c856e2538283555e9fdbc84918677c3) +++ src/ch/StatusDlg.h (.../StatusDlg.h) (revision ef313208b7c4a113907f2f72ee0b73406081501d) @@ -62,7 +62,7 @@ LVITEM lvi; TASK_DISPLAY_DATA td; - CString m_strTemp, m_strTemp2; + CString m_strTemp; CImageList m_images; @@ -71,7 +71,6 @@ // Dialog Data //{{AFX_DATA(CStatusDlg) enum { IDD = IDD_STATUS_DIALOG }; - CEdit m_ctlErrors; CProgressCtrl m_ctlCurrentProgress; CFFListCtrl m_ctlStatusList; CProgressCtrl m_ctlProgressAll; Index: src/ch/ch.rc =================================================================== diff -u -N -r25aab92a9d195154393782ca83cbf5bc41ab9277 -ref313208b7c4a113907f2f72ee0b73406081501d --- src/ch/ch.rc (.../ch.rc) (revision 25aab92a9d195154393782ca83cbf5bc41ab9277) +++ src/ch/ch.rc (.../ch.rc) (revision ef313208b7c4a113907f2f72ee0b73406081501d) @@ -233,7 +233,6 @@ LTEXT "Source object:",IDC_005_STATIC,249,47,62,8 LTEXT "Buffer size:",IDC_006_STATIC,249,75,62,8 LTEXT "Thread priority:",IDC_007_STATIC,249,90,62,8 - LTEXT "Comments:",IDC_008_STATIC,249,106,62,8 LTEXT "Operation:",IDC_009_STATIC,249,34,62,8 LTEXT "Transfer:",IDC_010_STATIC,249,167,62,8 LTEXT "Processed:",IDC_011_STATIC,249,137,62,8 @@ -247,7 +246,6 @@ CONTROL "",IDC_019_STATIC,"Static",SS_ETCHEDHORZ,249,10,38,1 LTEXT "Time:",IDC_020_STATIC,249,152,62,8 PUSHBUTTON "&Resume",IDC_RESUME_BUTTON,52,196,44,14,0,0,HIDC_RESUME_BUTTON - EDITTEXT IDC_ERRORS_EDIT,313,104,159,26,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE,HIDC_ERRORS_EDIT LTEXT "Associated file:",IDC_021_STATIC,249,19,62,8 CONTROL "",IDC_ASSOCIATEDFILES__STATIC,"STATICEX",0x4,313,17,159,12,WS_EX_STATICEDGE,HIDC_ASSOCIATEDFILES__STATIC CONTROL "",IDC_OPERATION_STATIC,"STATICEX",0x4,313,32,159,12,WS_EX_STATICEDGE,HIDC_OPERATION_STATIC @@ -839,7 +837,6 @@ IDS_EMPTYDESTINATIONTEXT_STRING "empty" IDS_EMPTYBUFFERSIZETEXT_STRING "unknown" IDS_EMPTYPRIORITYTEXT_STRING "unknown" - IDS_EMPTYERRORTEXT_STRING "empty" IDS_EMPTYPROCESSEDTEXT_STRING "empty" IDS_EMPTYTRANSFERTEXT_STRING "unknown" IDS_EMPTYTIMETEXT_STRING "00:00 / 00:00 (00:00)" Index: src/ch/resource.h =================================================================== diff -u -N -r25aab92a9d195154393782ca83cbf5bc41ab9277 -ref313208b7c4a113907f2f72ee0b73406081501d --- src/ch/resource.h (.../resource.h) (revision 25aab92a9d195154393782ca83cbf5bc41ab9277) +++ src/ch/resource.h (.../resource.h) (revision ef313208b7c4a113907f2f72ee0b73406081501d) @@ -156,7 +156,6 @@ #define IDC_LANMULTIPLIER_COMBO 1144 #define IDC_ONLYDEFAULT_CHECK 1145 #define IDC_TIME_PROGRESS 1146 -#define IDC_ERRORS_EDIT 1147 #define IDC_FILTER_COMBO 1149 #define IDC_FILTER_CHECK 1150 #define IDC_SIZE_CHECK 1151 @@ -534,7 +533,6 @@ #define IDS_EMPTYDESTINATIONTEXT_STRING 21506 #define IDS_EMPTYBUFFERSIZETEXT_STRING 21507 #define IDS_EMPTYPRIORITYTEXT_STRING 21508 -#define IDS_EMPTYERRORTEXT_STRING 21509 #define IDS_EMPTYPROCESSEDTEXT_STRING 21510 #define IDS_EMPTYTRANSFERTEXT_STRING 21511 #define IDS_EMPTYTIMETEXT_STRING 21512 Index: src/ch/task.cpp =================================================================== diff -u -N -r644f7481fc638fc673e2f390e9f0172492279be5 -ref313208b7c4a113907f2f72ee0b73406081501d --- src/ch/task.cpp (.../task.cpp) (revision 644f7481fc638fc673e2f390e9f0172492279be5) +++ src/ch/task.cpp (.../task.cpp) (revision ef313208b7c4a113907f2f72ee0b73406081501d) @@ -346,7 +346,6 @@ m_bForce(false), m_bContinue(false), m_bSaved(false), - m_lOsError(0), m_stSessionUniqueID(stSessionUniqueID), m_localStats() { @@ -654,10 +653,7 @@ m_stCurrentIndex = stData; ar >> uiData; m_nStatus = uiData; - ar >> m_lOsError; - ar >> m_strErrorDesc; - ar >> m_bsSizes; ar >> m_nPriority; @@ -726,10 +722,7 @@ ar << stCurrentIndex; UINT uiStatus = (m_nStatus & ST_WRITE_MASK); ar << uiStatus; - ar << m_lOsError; - ar << m_strErrorDesc; - ar << m_bsSizes; ar << m_nPriority; @@ -895,8 +888,6 @@ pData->m_nPriority=m_nPriority; pData->m_pdpDestPath=&m_dpDestPath; pData->m_pafFilters=&m_afFilters; - pData->m_dwOsErrorCode=m_lOsError; - pData->m_strErrorDesc=m_strErrorDesc; pData->m_uiStatus=m_nStatus; pData->m_stIndex=m_stCurrentIndex+m_ucCurrentCopy*m_files.GetSize(); pData->m_ullProcessedSize = m_localStats.GetProcessedSize(); @@ -1015,13 +1006,6 @@ DeleteFile(strDel3); } -void CTask::SetOsErrorCode(DWORD dwError, LPCTSTR lpszErrDesc) -{ - boost::unique_lock lock(m_lock); - m_lOsError=dwError; - m_strErrorDesc=lpszErrDesc; -} - void CTask::UpdateTime() { boost::unique_lock lock(m_lock); @@ -2748,7 +2732,6 @@ { case E_ERROR: pTask->SetStatus(ST_ERROR, ST_WORKING_MASK); - pTask->SetOsErrorCode(e->m_dwError, e->m_strErrorDesc); break; case E_CANCEL: pTask->SetStatus(ST_CANCELLED, ST_STEP_MASK); Index: src/ch/task.h =================================================================== diff -u -N -r644f7481fc638fc673e2f390e9f0172492279be5 -ref313208b7c4a113907f2f72ee0b73406081501d --- src/ch/task.h (.../task.h) (revision 644f7481fc638fc673e2f390e9f0172492279be5) +++ src/ch/task.h (.../task.h) (revision ef313208b7c4a113907f2f72ee0b73406081501d) @@ -87,8 +87,6 @@ CFiltersArray* m_pafFilters; UINT m_uiStatus; - DWORD m_dwOsErrorCode; - CString m_strErrorDesc; const BUFFERSIZES* m_pbsSizes; int m_nPriority; @@ -431,7 +429,6 @@ void DeleteProgress(LPCTSTR lpszDirectory); - void SetOsErrorCode(DWORD dwError, LPCTSTR lpszErrDesc); void CalculateProcessedSize(); void KillThread(); @@ -484,10 +481,6 @@ volatile UINT m_nStatus; - // info about last error - DWORD m_lOsError; - CString m_strErrorDesc; - // buffers BUFFERSIZES m_bsSizes;