Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Updated MediaInfo binaries to v0.7.47 (2011-07-27), compiled with MSVC 10.0.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-07-27 22:17:43 +02:00
parent 74e6bb7672
commit 7127271652
6 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/Changelog.html
View File

@ -17,10 +17,10 @@ a:visited { color: #0000EE; }
<h3>LameXP - Version History</h3><br> <h3>LameXP - Version History</h3><br>
<a name="4.02"></a>Changes between v4.02 and v4.03:<br><ul> <a name="4.02"></a>Changes between v4.02 and v4.03:<br><ul>
<li>Updated MediaInfo to v0.7.46 (2011-07-04), compiled with MSVC 10.0
<li>Fixed Cue Sheet import for tracks with certain characters in the title
<li>Added "built-in" WMA decoder (see <a href="http://forum.doom9.org/showthread.php?t=140273">this</a> thread for details) and removed all remnants of "old" decoder <li>Added "built-in" WMA decoder (see <a href="http://forum.doom9.org/showthread.php?t=140273">this</a> thread for details) and removed all remnants of "old" decoder
<li>Updated MediaInfo to v0.7.47 (2011-07-27), compiled with MSVC 10.0
<li>Updated language files (big thank-you to all contributors !!!) <li>Updated language files (big thank-you to all contributors !!!)
<li>Fixed Cue Sheet import for tracks with certain characters in the title
<li>Workaround for malicious "anti-virus" programs that prevent innocent applications from functioning <li>Workaround for malicious "anti-virus" programs that prevent innocent applications from functioning
<li>Enabled "Aero Glass" theme in installer and web-update program (Vista and Windows 7 only) <li>Enabled "Aero Glass" theme in installer and web-update program (Vista and Windows 7 only)
</ul><br> </ul><br>

BIN
res/tools/mediainfo.i386.exe
View File

Binary file not shown.

BIN
res/tools/mediainfo.x64.exe
View File

Binary file not shown.

4
src/Config.h
View File

@ -29,8 +29,8 @@
#define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_MINOR_LO 3
#define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 4 #define VER_LAMEXP_PATCH 5
#define VER_LAMEXP_BUILD 606 #define VER_LAMEXP_BUILD 608
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tools versions // Tools versions

25
src/Global.cpp
View File

@ -709,6 +709,7 @@ static bool lamexp_check_elevation(void)
bool lamexp_init_qt(int argc, char* argv[]) bool lamexp_init_qt(int argc, char* argv[])
{ {
static bool qt_initialized = false; static bool qt_initialized = false;
bool isWine = false;
typedef BOOL (WINAPI *SetDllDirectoryProc)(WCHAR *lpPathName); typedef BOOL (WINAPI *SetDllDirectoryProc)(WCHAR *lpPathName);
//Don't initialized again, if done already //Don't initialized again, if done already
@ -719,8 +720,12 @@ bool lamexp_init_qt(int argc, char* argv[])
//Secure DLL loading //Secure DLL loading
QLibrary kernel32("kernel32.dll"); QLibrary kernel32("kernel32.dll");
SetDllDirectoryProc pSetDllDirectory = static_cast<SetDllDirectoryProc>(kernel32.resolve("SetDllDirectoryW")); if(kernel32.load())
if(pSetDllDirectory != NULL) pSetDllDirectory(L""); {
SetDllDirectoryProc pSetDllDirectory = (SetDllDirectoryProc) kernel32.resolve("SetDllDirectoryW");
if(pSetDllDirectory != NULL) pSetDllDirectory(L"");
kernel32.unload();
}
//Extract executable name from argv[] array //Extract executable name from argv[] array
char *executableName = argv[0]; char *executableName = argv[0];
@ -763,8 +768,13 @@ bool lamexp_init_qt(int argc, char* argv[])
//Check for Wine //Check for Wine
QLibrary ntdll("ntdll.dll"); QLibrary ntdll("ntdll.dll");
bool isWine = (ntdll.resolve("wine_get_version") != NULL) || (ntdll.resolve("wine_nt_to_unix_file_name") != NULL); if(ntdll.load())
if(isWine) qWarning("It appears we are running under Wine, unexpected things might happen!\n"); {
if(ntdll.resolve("wine_nt_to_unix_file_name") != NULL) isWine = true;
if(ntdll.resolve("wine_get_version") != NULL) isWine = true;
if(isWine) qWarning("It appears we are running under Wine, unexpected things might happen!\n");
ntdll.unload();
}
//Create Qt application instance and setup version info //Create Qt application instance and setup version info
QDate date = QDate::currentDate(); QDate date = QDate::currentDate();
@ -808,10 +818,11 @@ bool lamexp_init_qt(int argc, char* argv[])
{ {
typedef DWORD (__stdcall *SetConsoleIconFun)(HICON); typedef DWORD (__stdcall *SetConsoleIconFun)(HICON);
QLibrary kernel32("kernel32.dll"); QLibrary kernel32("kernel32.dll");
SetConsoleIconFun SetConsoleIconPtr = (SetConsoleIconFun) kernel32.resolve("SetConsoleIcon"); if(kernel32.load())
if(SetConsoleIconPtr)
{ {
SetConsoleIconPtr(QIcon(":/icons/sound.png").pixmap(16, 16).toWinHICON()); SetConsoleIconFun SetConsoleIconPtr = (SetConsoleIconFun) kernel32.resolve("SetConsoleIcon");
if(SetConsoleIconPtr != NULL) SetConsoleIconPtr(QIcon(":/icons/sound.png").pixmap(16, 16).toWinHICON());
kernel32.unload();
} }
} }

4
src/Thread_Initialization.cpp
View File

@ -64,8 +64,8 @@ g_lamexp_tools[] =
{"b3fca757b3567dab75c042e62213c231de378ea0fdd7fe29b733417cd5d3d33558452f94", CPU_TYPE_ALL, "gpgv.gpg", UINT_MAX}, {"b3fca757b3567dab75c042e62213c231de378ea0fdd7fe29b733417cd5d3d33558452f94", CPU_TYPE_ALL, "gpgv.gpg", UINT_MAX},
{"9c1c8024d5d75213edbc1dbad7aeaf2535000f57880b445c763ac45da365446b8cfd84c7", CPU_TYPE_ALL, "lame.exe", 3990}, {"9c1c8024d5d75213edbc1dbad7aeaf2535000f57880b445c763ac45da365446b8cfd84c7", CPU_TYPE_ALL, "lame.exe", 3990},
{"67933924d68ce319795989648f29e7bd1abaac4ec09c26cbb0ff0d15a67a9df17e257933", CPU_TYPE_ALL, "mac.exe", 406}, {"67933924d68ce319795989648f29e7bd1abaac4ec09c26cbb0ff0d15a67a9df17e257933", CPU_TYPE_ALL, "mac.exe", 406},
{"2a4407cc8df3c1dfefad9238b93df9d526a5e171567e5920c7cbb271275e132693356685", CPU_TYPE_GEN, "mediainfo.i386.exe", 746}, {"9a8c97be6ae18d083f7ba32cd114f03feb6f6b1f3c008655e5d2688c0783f1ecd27fdd57", CPU_TYPE_GEN, "mediainfo.i386.exe", 747},
{"f1fa9cdadd35188ce2ca25549abb3155a04faeaff52f96ce2856cd28f6c07df0b4febbf8", CPU_TYPE_X64, "mediainfo.x64.exe", 746}, {"bd32724ebd1f5a7f39cc1f011df0a0ae475ec8c5958cecd216e9e248283d29ab846e123d", CPU_TYPE_X64, "mediainfo.x64.exe", 747},
{"a93ec86187025e66fb78026af35555bd3b4e30fe1a40e8d66f600cfd918f07f431f0b2f2", CPU_TYPE_ALL, "mpcdec.exe", 435}, {"a93ec86187025e66fb78026af35555bd3b4e30fe1a40e8d66f600cfd918f07f431f0b2f2", CPU_TYPE_ALL, "mpcdec.exe", 435},
{"5a89768010efb1ddfd88ccc378a89433ceaecb403a7b1f83f8716f6848d9a05b3d3c6d93", CPU_TYPE_ALL, "mpg123.exe", 1133}, {"5a89768010efb1ddfd88ccc378a89433ceaecb403a7b1f83f8716f6848d9a05b3d3c6d93", CPU_TYPE_ALL, "mpg123.exe", 1133},
{"0c781805dda931c529bd16069215f616a7a4c5e5c2dfb6b75fe85d52b20511830693e528", CPU_TYPE_ALL, "oggdec.exe", UINT_MAX}, {"0c781805dda931c529bd16069215f616a7a4c5e5c2dfb6b75fe85d52b20511830693e528", CPU_TYPE_ALL, "oggdec.exe", UINT_MAX},