Fix crash in part file conversion

Compacted files might get unacked Allow MediaInfo dll 21.09
irwir · Nov 24, 2021 · 033762b · 033762b
1 parent 230972e
commit 033762b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/srchybrid/FileInfoDialog.cpp b/srchybrid/FileInfoDialog.cpp
@@ -205,7 +205,7 @@ class CMediaInfoDLL
 					(FARPROC &)m_pfnMediaInfo_Count_Get = GetProcAddress(m_hLib, "MediaInfo_Count_Get");
 					if (m_pfnMediaInfo5_Open && m_pfnMediaInfo_Close && m_pfnMediaInfo_Get)
 						m_ullVersion = ullVersion;
-				} else if (ullVersion < MAKEDLLVERULL(21, 4, 0, 0)) { //here ullVersion >= 7.0
+				} else if (ullVersion < MAKEDLLVERULL(21, 10, 0, 0)) { //here ullVersion >= 7.0
 					(FARPROC &)m_pfnMediaInfo_New = GetProcAddress(m_hLib, "MediaInfo_New");
 					(FARPROC &)m_pfnMediaInfo_Delete = GetProcAddress(m_hLib, "MediaInfo_Delete");
 					(FARPROC &)m_pfnMediaInfo_Open = GetProcAddress(m_hLib, "MediaInfo_Open");

diff --git a/srchybrid/MediaInfo.cpp b/srchybrid/MediaInfo.cpp
@@ -2013,8 +2013,9 @@ bool GetWMHeaders(LPCTSTR pszFileName, SMediaInfo *mi, bool &rbIsWM, bool bFullI
 				CComQIPtr<IWMMetadataEditor2> pIWMMetadataEditor2 = pIWMMetadataEditor;
 				if (pIWMMetadataEditor2 && (hr = pIWMMetadataEditor2->OpenEx(pszFileName, GENERIC_READ, FILE_SHARE_READ)) == S_OK)
 					pIUnkReader = pIWMMetadataEditor2;
-				else if ((hr = pIWMMetadataEditor->Open(pszFileName)) == S_OK)
-					pIUnkReader = pIWMMetadataEditor;
+				//This Open() call unpacks files compressed with "compact /exe:lzx"; assumed to be obsolete
+				//else if ((hr = pIWMMetadataEditor->Open(pszFileName)) == S_OK)
+				//	pIUnkReader = pIWMMetadataEditor;
 			}
 		}
 

diff --git a/srchybrid/PartFileConvert.cpp b/srchybrid/PartFileConvert.cpp
@@ -720,8 +720,10 @@ void CPartFileConvertDlg::RemoveSel()
 		int index = joblist.GetNextSelectedItem(pos);
 		if (index >= 0) {
 			ConvertJob *job = reinterpret_cast<ConvertJob*>(joblist.GetItemData(index));
-			if (job->state != CONV_INPROGRESS)
+			if (job->state != CONV_INPROGRESS) {
 				CPartFileConvert::RemoveJob(job);
+				pos = joblist.GetFirstSelectedItemPosition();
+			}
 		}
 	}
 }

diff --git a/srchybrid/Version.h b/srchybrid/Version.h
@@ -30,7 +30,7 @@
 //
 #define VERSION_MJR	0
 #define VERSION_MIN	60
-#define VERSION_UPDATE	2
+#define VERSION_UPDATE	3
 #define VERSION_BUILD	1
 #ifdef _M_X64
 #define VERSION_X64 _T(" x64")

diff --git a/srchybrid/res/emuleWin32.manifest b/srchybrid/res/emuleWin32.manifest
@@ -4,7 +4,7 @@
                     name="eMule"
                     processorArchitecture="x86"
                     publicKeyToken="0000000000000000"
-                    version="0.60.2.1"
+                    version="0.60.3.1"
   />
   <description>eMule by https://www.emule-project.net</description>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">

diff --git a/srchybrid/res/emulex64.manifest b/srchybrid/res/emulex64.manifest
@@ -4,7 +4,7 @@
                     name="eMule"
                     processorArchitecture="ia64"
                     publicKeyToken="0000000000000000"
-                    version="0.60.2.1"
+                    version="0.60.3.1"
   />
   <description>eMule by https://www.emule-project.net</description>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">