diff --git a/LameXP_VS2010.vcxproj b/LameXP_VS2010.vcxproj index fab7a6aa..ab96eeba 100644 --- a/LameXP_VS2010.vcxproj +++ b/LameXP_VS2010.vcxproj @@ -139,11 +139,11 @@ copy "$(QTDIR)\plugins\imageformats\q????d4.dll" "$(TargetDir)imageformats\" "/MANIFESTDEPENDENCY:type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27 processorArchitecture=%27*%27" %(AdditionalOptions) - qtmain.lib;QtCore4.lib;QtGui4.lib;Winmm.lib;Shlwapi.lib;Wininet.lib;EncodePointer.lib;%(AdditionalDependencies) + qtmain.lib;QtCore4.lib;QtGui4.lib;Winmm.lib;Shlwapi.lib;Wininet.lib;%(AdditionalDependencies) LinkVerboseLib - $(QTDIR)\lib;$(QTDIR)\plugins\imageformats;$(SolutionDir)\etc\Prerequisites\EncodePointer\lib;%(AdditionalLibraryDirectories) + $(QTDIR)\lib;$(QTDIR)\plugins\imageformats;%(AdditionalLibraryDirectories) false diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi index f7e0f503..02a99656 100644 --- a/etc/NSIS/setup.nsi +++ b/etc/NSIS/setup.nsi @@ -139,7 +139,7 @@ VIAddVersionKey "LegalTrademarks" "GNU" VIAddVersionKey "OriginalFilename" "LameXP.${LAMEXP_DATE}.exe" VIAddVersionKey "ProductName" "LameXP - Audio Encoder Frontend" VIAddVersionKey "ProductVersion" "${LAMEXP_VERSION}, Build #${LAMEXP_BUILD} (${LAMEXP_DATE})" -VIAddVersionKey "Website" "http://mulder.at.gg/" +VIAddVersionKey "Website" "${MyWebSite}" ;-------------------------------- @@ -266,7 +266,7 @@ Function .onInit StrCmp $0 0 +3 MessageBox MB_ICONSTOP|MB_TOPMOST "Sorry, the installer is already running!" Quit - ${EndIf} + ${EndIf} ${IfNot} ${IsNT} MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, this application does NOT support Windows 9x or Windows ME!" @@ -283,11 +283,18 @@ Function .onInit Quit ${EndIf} + ${If} ${IsWin2000} + ${AndIf} ${AtMostServicePack} 3 + MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "This application recommends Windows 2000 with Service Pack 4!" + MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 4 for Windows 2000 now?" IDNO +2 + ExecShell "open" "http://www.microsoft.com/download/en/details.aspx?id=4127" + ${EndIf} + ${If} ${IsWinXP} - ${AndIf} ${AtMostServicePack} 1 - MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "For this application Windows XP with Service Pack 2 or newer is recommended!" + ${AndIf} ${AtMostServicePack} 2 + MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "This application recommends Windows XP with Service Pack 3!" MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 3 for Windows XP now?" IDNO +2 - ExecShell "open" "http://www.microsoft.com/downloads/en/details.aspx?FamilyID=5b33b5a8-5e76-401f-be08-1e1555d4f3d4" + ExecShell "open" "http://www.microsoft.com/download/en/details.aspx?id=24" ${EndIf} InitPluginsDir diff --git a/etc/Prerequisites/EncodePointer/lib/EncodePointer.lib b/etc/Prerequisites/EncodePointer/lib/EncodePointer.lib index bc9de0ac..44aa51d1 100644 Binary files a/etc/Prerequisites/EncodePointer/lib/EncodePointer.lib and b/etc/Prerequisites/EncodePointer/lib/EncodePointer.lib differ diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts index 7155552e..a2dd2502 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -2069,7 +2069,7 @@ Executable '%1' requires Windows 2000 or later. - + Programm '%1' benötigt Windows 2000 oder neuer. diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index bdd36e73..667e075b 100644 Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ diff --git a/res/tools/mediainfo.i386.exe b/res/tools/mediainfo.i386.exe index f063d570..14df74a7 100644 Binary files a/res/tools/mediainfo.i386.exe and b/res/tools/mediainfo.i386.exe differ diff --git a/res/tools/wma2wav.exe b/res/tools/wma2wav.exe index 127dd88b..10965a81 100644 Binary files a/res/tools/wma2wav.exe and b/res/tools/wma2wav.exe differ diff --git a/src/Config.h b/src/Config.h index 4cedb321..a1ded986 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 11 -#define VER_LAMEXP_BUILD 638 +#define VER_LAMEXP_BUILD 640 /////////////////////////////////////////////////////////////////////////////// // Tools versions diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp index 715f9a07..7bae7279 100644 --- a/src/Thread_Initialization.cpp +++ b/src/Thread_Initialization.cpp @@ -64,7 +64,7 @@ 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}, - {"9a8c97be6ae18d083f7ba32cd114f03feb6f6b1f3c008655e5d2688c0783f1ecd27fdd57", CPU_TYPE_GEN, "mediainfo.i386.exe", 747}, + {"bf90f38f8e05249be0937eccb6a8a312625bc66863a185fadb4d7eda8b6282ee1b05dc8b", 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}, @@ -78,7 +78,7 @@ g_lamexp_tools[] = {"9b50cf64747d4afbad5d8d9b5a0a2d41c5a58256f47ebdbd8cc920e7e576085dfe1b14ff", CPU_TYPE_ALL, "tta.exe", 21}, {"875871c942846f6ad163f9e4949bba2f4331bec678ca5aefe58c961b6825bd0d419a078b", CPU_TYPE_ALL, "valdec.exe", 31}, {"e657331e281840878a37eb4fb357cb79f33d528ddbd5f9b2e2f7d2194bed4720e1af8eaf", CPU_TYPE_ALL, "wget.exe", 1114}, - {"bd001723181e1c0188b3d790127b06f860996465c4540942fd446369b8fa36d9cd4ac619", CPU_TYPE_ALL, "wma2wav.exe", 20110731}, + {"038422e3203674dc36a71e26911220af5349d86697ad5b046f21ea841e6906ed27e9f35c", CPU_TYPE_ALL, "wma2wav.exe", 20110815}, {"a258711f7a8a0c75528f3ed4d2c17513ff8598b7e0a9d7db13ca941a3140094ffc2ffb62", CPU_TYPE_ALL, "wupdate.exe", UINT_MAX}, {"6b053b37d47a9c8659ebf2de43ad19dcba17b9cd868b26974b9cc8c27b6167e8bf07a5a2", CPU_TYPE_ALL, "wvunpack.exe", 4601}, {NULL, NULL, NULL, NULL} diff --git a/src/Tool_Abstract.cpp b/src/Tool_Abstract.cpp index ad02a5bd..f2711bea 100644 --- a/src/Tool_Abstract.cpp +++ b/src/Tool_Abstract.cpp @@ -133,6 +133,12 @@ bool AbstractTool::startProcess(QProcess &process, const QString &program, const return true; } + emit messageLogged("Process creation has failed :-("); + QString errorMsg= process.errorString().trimmed(); + if(!errorMsg.isEmpty()) emit messageLogged(errorMsg); + + process.kill(); + process.waitForFinished(-1); return false; }