Correct character display when character set missing. Enhance Status …

…Bar.Enhance inline image handling..

README.txt

@@ -5,8 +5,11 @@ Changes
 v 1.0.3.2
 
  - To improve mboxview, please post reviews on what works, what doesn't, create bug tickets and enhancment requests;
- - Improved handling of missing character set in the raw email that could result in improper text display;
- - Improved handling of Mail Retrieval Status Text in the Status Bar to reliably display Mail Retrival In Progress Status text;
+ - Enhanced handling of missing character set in the raw email that could result in improper text display;
+ - Added Mail Retrival In Progress Status text in the Status Bar;
+ - Added Mail Archive Open in Progress Status text in the Status Bar;
+ - Added Sort Column in Progress Status text in the Status Bar;
+ - Enhanced handling of inline images;
  - Updated User Manual to describe new and updated features;
 
 v 1.0.3.1

ReadMe.markdown

@@ -31,8 +31,11 @@ Changes
 v 1.0.3.2
 
  - To improve mboxview, please post reviews on what works, what doesn't, create bug tickets and enhancment requests;
- - Improved handling of missing character set in the raw email that could result in improper text display;
- - Improved handling of Mail Retrieval Status Text in the Status Bar to reliably display Mail Retrival In Progress Status text;
+ - Enhanced handling of missing character set in the raw email that could result in improper text display;
+ - Added Mail Retrival In Progress Status text in the Status Bar;
+ - Added Mail Archive Open in Progress Status text in the Status Bar;
+ - Added Sort Column in Progress Status text in the Status Bar;
+ - Enhanced handling of inline images;
  - Updated User Manual to describe new and updated features;
 
 v 1.0.3.1

src/CPictureCtrlDemoDlg.cpp

@@ -325,6 +325,14 @@ BOOL CCPictureCtrlDemoDlg::isSupportedPictureFile(LPCSTR file)
 		return FALSE;
 }
 
+int __cdecl FooPred(void const * first, void const * second)
+{
+	CString *f = *((CString**)first);
+	CString *s = *((CString**)second);
+	int ret = strcmp(f->operator LPCSTR(), s->operator LPCSTR());
+	return ret;
+}
+
 BOOL CCPictureCtrlDemoDlg::LoadImageFileNames(CString & dir)
 {
 	WIN32_FIND_DATA FileData;
@@ -356,6 +364,8 @@ BOOL CCPictureCtrlDemoDlg::LoadImageFileNames(CString & dir)
 			bFinished = TRUE;
 	}
 	FindClose(hSearch);
+
+	qsort(m_ImageFileNameArray.GetData(), m_ImageFileNameArray.GetCount(), sizeof(void*), FooPred);
 	return TRUE;
 }
 

src/MainFrm.cpp

@@ -2585,9 +2585,6 @@ BOOL MySelectFolder::OnFileNameOK()
 		return TRUE;
 }
 
-
-
-
 void CMainFrame::OnClose()
 {
 	// TODO: Add your message handler code here and/or call default

src/MboxMail.cpp

@@ -56,7 +56,7 @@ int MboxMail::nWhichMailList = -1;
 
 BOOL PathFileExist(LPCSTR path);
 BOOL RemoveDir(CString & dir, bool recursive = false);
-int fixInlineSrcImgPath(char *inData, int indDataLen, SimpleString *outbuf, CListCtrl *attachments, int mailPosition, bool useMailPosition);
+//int fixInlineSrcImgPath(char *inData, int indDataLen, SimpleString *outbuf, CListCtrl *attachments, int mailPosition, bool useMailPosition);
 UINT getCodePageFromHtmlBody(SimpleString *buffer, std::string &charset);
 
 ///////
@@ -3711,7 +3711,8 @@ int MboxMail::printSingleMailToHtmlFile(/*out*/CFile &fp, int mailPosition, /*in
 		SimpleString *workbuf = MboxMail::m_workbuf;
 		workbuf->ClearAndResize(outbuflarge->Count() * 2);
 		bool useMailPosition = true;
-		fixInlineSrcImgPath(outbuflarge->Data(), outbuflarge->Count(), workbuf, 0, mailPosition, useMailPosition);
+		//fixInlineSrcImgPath(outbuflarge->Data(), outbuflarge->Count(), workbuf, 0, mailPosition, useMailPosition);
+		NListView::UpdateInlineSrcImgPath(outbuflarge->Data(), outbuflarge->Count(), workbuf, 0, mailPosition, useMailPosition);
 		outbuflarge->Copy(*workbuf);
 
 		bdy = "<div style=\'background-color:transparent;margin-left:5px;text-align:left\'>";
@@ -4693,6 +4694,8 @@ int MboxMail::DecodeBody(CFile &fpm, MailBodyContent *body, int mailPosition, Si
 	if ((body->m_contentOffset + body->m_contentLength) > m->m_length) {
 		// something is not consistent
 		bodyLength = m->m_length - body->m_contentOffset;
+		if (bodyLength < 0)
+			bodyLength = 0;
 	}
 
 	fileOffset = m->m_startOff + body->m_contentOffset;
@@ -4791,6 +4794,8 @@ int MboxMail::GetMailBody_mboxview(CFile &fpm, int mailPosition, SimpleString *o
 		if ((body->m_contentOffset + body->m_contentLength) > m->m_length) {
 			// something is not consistent
 			bodyLength = m->m_length - body->m_contentOffset;
+			if (bodyLength < 0)
+				bodyLength = 0;
 		}
 
 		fileOffset = m->m_startOff + body->m_contentOffset;