Changeset 261

Timestamp:

Jan 27, 2014, 6:59:30 AM (10 years ago)

Author:

roman

Message:

Fixed problem being unable to attach a log file while it's still in use/being written; message box showing files failed to get attached

Location:

trunk/DirectShowSpy

Files:

• DirectShowSpy.rc (modified) (2 diffs)
• FilterGraphHelper.h (modified) (3 diffs)

trunk/DirectShowSpy/DirectShowSpy.rc

@@ -59 +59 @@
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION  1, 0, 0, 1301
+ FILEVERSION  1, 0, 0, 1319
  PRODUCTVERSION 1,0,0,1
  FILEFLAGSMASK 0x3fL
@@ -78 +78 @@
             VALUE "CompanyName", "Roman Ryltsov"
             VALUE "FileDescription", "Alax.Info DirectShow Spy Module"
-            VALUE "FileVersion",  "1, 0, 0, 1301\0"
+            VALUE "FileVersion",  "1, 0, 0, 1319\0"
             VALUE "InternalName", "DirectShowSpy.dll"
             VALUE "LegalCopyright", "Copyright © Alax.Info, Roman Ryltsov, 2008-2014"

trunk/DirectShowSpy/FilterGraphHelper.h

@@ -1038 +1038 @@
                                 __C(pMessage->put_Subject(CComBSTR(sSubject)));
                                 #pragma region Attachment
-                                CRoArrayT<CPath> DeleteArray;
+                                CRoArrayT<CPath> DeletePathArray;
+                                CRoArrayT<CString> FailurePathArray;
                                 {
                                         CEmailLogDialog& EmailLogDialog = m_pOwner->m_EmailLogDialog;
@@ -1047 +1048 @@
                                                 const BOOL bDelete = EmailLogDialog.GetDelete();
                                                 for(SIZE_T nIndex = 0; nIndex < Array.GetCount(); nIndex++)
+                                                {
+                                                        CEmailLogDialog::CSelectedFileData& FileData = Array[nIndex];
                                                         _ATLTRY
                                                         {
-                                                                CEmailLogDialog::CSelectedFileData& FileData = Array[nIndex];
                                                                 CLocalObjectPtr<CBzip2Item> pItem;
                                                                 pItem->LoadFromFile(FileData.m_sPath, nTruncateSize);
@@ -1074 +1076 @@
                                                                 }
                                                                 if(bDelete)
-                                                                        DeleteArray.Add(FileData.m_sPath);
+                                                                        DeletePathArray.Add(FileData.m_sPath);
                                                         }
                                                         _ATLCATCHALL()
                                                         {
-                                                                _Z_EXCEPTION()
+                                                                _Z_EXCEPTION();
+                                                                FailurePathArray.Add((LPCTSTR) FileData.m_sPath);
                                                         }
+                                                }
                                         }
                                 }
                                 #pragma endregion 
                                 __C(pMessage->Send());
-                                for(SIZE_T nIndex = 0; nIndex < DeleteArray.GetCount(); nIndex++)
-                                        DeleteFile(DeleteArray[nIndex]);
+                                for(SIZE_T nIndex = 0; nIndex < DeletePathArray.GetCount(); nIndex++)
+                                        DeleteFile(DeletePathArray[nIndex]);
                                 _RegKeyHelper::SetStringValue(HKEY_CURRENT_USER, REGISTRY_ROOT, _T("Email Message Template"), CString(sMessageString));
+                                if(!FailurePathArray.IsEmpty())
+                                {
+                                        const CString sMessage = AtlFormatString(_T("It was unable to attach the following files:") _T("\r\n\r\n") _T("%s"), _StringHelper::Join(FailurePathArray, _T("\r\n")));
+                                        AtlMessageBoxEx(m_hWnd, (LPCTSTR) sMessage, IDS_WARNING, MB_ICONWARNING | MB_OK);
+                                }
                                 AtlOptionalMessageBoxEx(m_hWnd, _T("CFilterGraphHelper::CPropertyFrameDialog::CEmailDialog::CredentialsSaved"), _T("The email was sent.") _T("\r\n\r\n") _T("The credentials were written into registry for further reuse. Use Erase Cached Credentials link to delete them from registry."), IDS_INFORMATION, MB_ICONINFORMATION | MB_OK);
                                 MessageBeep(MB_OK);