{\r
m_pThread = NULL;\r
m_bAltAbortPress=false;\r
+ m_bBufferAll=false;\r
}\r
\r
CProgressDlg::~CProgressDlg()\r
}\r
if(wParam == MSG_PROGRESSDLG_END || wParam == MSG_PROGRESSDLG_FAILED)\r
{\r
+ if(m_bBufferAll)\r
+ {\r
+ m_Databuf.push_back(0);\r
+ InsertCRLF();\r
+ m_Log.SetWindowText(&m_Databuf[0]);\r
+ }\r
m_BufStart=0;\r
this->m_Databuf.clear();\r
\r
DialogEnableWindow(IDCANCEL, FALSE);\r
}\r
\r
- if(lParam == 0)\r
+ if(!m_bBufferAll)\r
{\r
- for(int i=this->m_BufStart;i<this->m_Databuf.size();i++)\r
+ if(lParam == 0)\r
{\r
- ParserCmdOutput(this->m_Databuf[m_BufStart]);\r
- m_BufStart++;\r
- }\r
- }else\r
- ParserCmdOutput((TCHAR)lParam);\r
-\r
+ for(int i=this->m_BufStart;i<this->m_Databuf.size();i++)\r
+ {\r
+ ParserCmdOutput(this->m_Databuf[m_BufStart]);\r
+ m_BufStart++;\r
+ }\r
+ }else\r
+ ParserCmdOutput((TCHAR)lParam);\r
+ }\r
return 0;\r
}\r
\r
\r
m_bAbort = true;\r
}\r
+\r
+void CProgressDlg::InsertCRLF()\r
+{\r
+ for(int i=0;i<m_Databuf.size();i++)\r
+ {\r
+ if(m_Databuf[i]==_T('\n'))\r
+ {\r
+ if(i==0 || m_Databuf[i-1]!= _T('\r'))\r
+ {\r
+ m_Databuf.insert(m_Databuf.begin()+i,_T('\r'));\r
+ i++;\r
+ }\r
+ }\r
+ }\r
+}
\ No newline at end of file