diff --git a/doc/Changelog.html b/doc/Changelog.html index 0d695f97..e43b561d 100644 --- a/doc/Changelog.html +++ b/doc/Changelog.html @@ -17,10 +17,10 @@ a:visited { color: #0000EE; }

LameXP - Version History


Changes between v4.02 and v4.03:

diff --git a/res/tools/mediainfo.i386.exe b/res/tools/mediainfo.i386.exe index f9c9f961..f063d570 100644 Binary files a/res/tools/mediainfo.i386.exe and b/res/tools/mediainfo.i386.exe differ diff --git a/res/tools/mediainfo.x64.exe b/res/tools/mediainfo.x64.exe index 2ed81d7a..79667412 100644 Binary files a/res/tools/mediainfo.x64.exe and b/res/tools/mediainfo.x64.exe differ diff --git a/src/Config.h b/src/Config.h index 05f40650..f20c2c7c 100644 --- a/src/Config.h +++ b/src/Config.h @@ -29,8 +29,8 @@ #define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_TYPE Alpha -#define VER_LAMEXP_PATCH 4 -#define VER_LAMEXP_BUILD 606 +#define VER_LAMEXP_PATCH 5 +#define VER_LAMEXP_BUILD 608 /////////////////////////////////////////////////////////////////////////////// // Tools versions diff --git a/src/Global.cpp b/src/Global.cpp index f13f99da..33d1743b 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -709,6 +709,7 @@ static bool lamexp_check_elevation(void) bool lamexp_init_qt(int argc, char* argv[]) { static bool qt_initialized = false; + bool isWine = false; typedef BOOL (WINAPI *SetDllDirectoryProc)(WCHAR *lpPathName); //Don't initialized again, if done already @@ -719,8 +720,12 @@ bool lamexp_init_qt(int argc, char* argv[]) //Secure DLL loading QLibrary kernel32("kernel32.dll"); - SetDllDirectoryProc pSetDllDirectory = static_cast(kernel32.resolve("SetDllDirectoryW")); - if(pSetDllDirectory != NULL) pSetDllDirectory(L""); + if(kernel32.load()) + { + SetDllDirectoryProc pSetDllDirectory = (SetDllDirectoryProc) kernel32.resolve("SetDllDirectoryW"); + if(pSetDllDirectory != NULL) pSetDllDirectory(L""); + kernel32.unload(); + } //Extract executable name from argv[] array char *executableName = argv[0]; @@ -763,8 +768,13 @@ bool lamexp_init_qt(int argc, char* argv[]) //Check for Wine QLibrary ntdll("ntdll.dll"); - bool isWine = (ntdll.resolve("wine_get_version") != NULL) || (ntdll.resolve("wine_nt_to_unix_file_name") != NULL); - if(isWine) qWarning("It appears we are running under Wine, unexpected things might happen!\n"); + if(ntdll.load()) + { + 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 QDate date = QDate::currentDate(); @@ -808,10 +818,11 @@ bool lamexp_init_qt(int argc, char* argv[]) { typedef DWORD (__stdcall *SetConsoleIconFun)(HICON); QLibrary kernel32("kernel32.dll"); - SetConsoleIconFun SetConsoleIconPtr = (SetConsoleIconFun) kernel32.resolve("SetConsoleIcon"); - if(SetConsoleIconPtr) + if(kernel32.load()) { - 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(); } } diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp index 5b3fbdf1..9c63d426 100644 --- a/src/Thread_Initialization.cpp +++ b/src/Thread_Initialization.cpp @@ -64,8 +64,8 @@ g_lamexp_tools[] = {"b3fca757b3567dab75c042e62213c231de378ea0fdd7fe29b733417cd5d3d33558452f94", CPU_TYPE_ALL, "gpgv.gpg", UINT_MAX}, {"9c1c8024d5d75213edbc1dbad7aeaf2535000f57880b445c763ac45da365446b8cfd84c7", CPU_TYPE_ALL, "lame.exe", 3990}, {"67933924d68ce319795989648f29e7bd1abaac4ec09c26cbb0ff0d15a67a9df17e257933", CPU_TYPE_ALL, "mac.exe", 406}, - {"2a4407cc8df3c1dfefad9238b93df9d526a5e171567e5920c7cbb271275e132693356685", CPU_TYPE_GEN, "mediainfo.i386.exe", 746}, - {"f1fa9cdadd35188ce2ca25549abb3155a04faeaff52f96ce2856cd28f6c07df0b4febbf8", CPU_TYPE_X64, "mediainfo.x64.exe", 746}, + {"9a8c97be6ae18d083f7ba32cd114f03feb6f6b1f3c008655e5d2688c0783f1ecd27fdd57", CPU_TYPE_GEN, "mediainfo.i386.exe", 747}, + {"bd32724ebd1f5a7f39cc1f011df0a0ae475ec8c5958cecd216e9e248283d29ab846e123d", CPU_TYPE_X64, "mediainfo.x64.exe", 747}, {"a93ec86187025e66fb78026af35555bd3b4e30fe1a40e8d66f600cfd918f07f431f0b2f2", CPU_TYPE_ALL, "mpcdec.exe", 435}, {"5a89768010efb1ddfd88ccc378a89433ceaecb403a7b1f83f8716f6848d9a05b3d3c6d93", CPU_TYPE_ALL, "mpg123.exe", 1133}, {"0c781805dda931c529bd16069215f616a7a4c5e5c2dfb6b75fe85d52b20511830693e528", CPU_TYPE_ALL, "oggdec.exe", UINT_MAX},