Installer updates.

diff --git a/etc/Deployment/_deploy.bat b/etc/Deployment/_deploy.bat
index 6ab6da2..cab0aaa 100644 (file)
--- a/etc/Deployment/_deploy.bat
+++ b/etc/Deployment/_deploy.bat
@@ -81,6 +81,7 @@ REM ------------------------------------------
 REM :: DELETE OLD OUTPUT FILE ::
 REM ------------------------------------------
 del "%OUT_FILE%.exe"
+del "%OUT_FILE%.sfx.exe"
 del "%OUT_FILE%.zip"
 REM ------------------------------------------
 if exist "%OUT_FILE%.exe" (
@@ -130,7 +131,8 @@ REM ------------------------------------------
 REM :: CREATE PACKAGES ::
 REM ------------------------------------------
 "%PATH_SEVENZ%\7z.exe" a -tzip -r "%OUT_FILE%.zip" "%TMP_PATH%\*"
-"%PATH_MKNSIS%\makensis.exe" "/DLAMEXP_SOURCE_PATH=%TMP_PATH%" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.exe" "/DLAMEXP_UPX_PATH=%PATH_UPXBIN%" "/DLAMEXP_DATE=%ISO_DATE%" "/DLAMEXP_VERSION=%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%" "/DLAMEXP_BUILD=%VER_LAMEXP_BUILD%" "/DLAMEXP_INSTTYPE=%VER_LAMEXP_TYPE%" "/DLAMEXP_PATCH=%VER_LAMEXP_PATCH%" "%~dp0\..\NSIS\setup.nsi"
+"%PATH_MKNSIS%\makensis.exe" "/DLAMEXP_UPX_PATH=%PATH_UPXBIN%" "/DLAMEXP_DATE=%ISO_DATE%" "/DLAMEXP_VERSION=%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%" "/DLAMEXP_BUILD=%VER_LAMEXP_BUILD%" "/DLAMEXP_INSTTYPE=%VER_LAMEXP_TYPE%" "/DLAMEXP_PATCH=%VER_LAMEXP_PATCH%" "/DLAMEXP_SOURCE_PATH=%TMP_PATH%" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.exe" "%~dp0\..\NSIS\setup.nsi"
+"%PATH_MKNSIS%\makensis.exe" "/DLAMEXP_UPX_PATH=%PATH_UPXBIN%" "/DLAMEXP_DATE=%ISO_DATE%" "/DLAMEXP_VERSION=%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%" "/DLAMEXP_BUILD=%VER_LAMEXP_BUILD%" "/DLAMEXP_INSTTYPE=%VER_LAMEXP_TYPE%" "/DLAMEXP_PATCH=%VER_LAMEXP_PATCH%" "/DLAMEXP_SOURCE_FILE=%OUT_FILE%.exe" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.sfx.exe" "%~dp0\..\NSIS\wrapper.nsi"
 rd /S /Q "%TMP_PATH%"
 REM ------------------------------------------
 if not exist "%OUT_FILE%.zip" (
@@ -144,10 +146,11 @@ if not exist "%OUT_FILE%.exe" (
 REM ------------------------------------------
 attrib +R "%OUT_FILE%.zip"
 attrib +R "%OUT_FILE%.exe"
+attrib +R "%OUT_FILE%.sfx.exe"
 REM ------------------------------------------
 REM :: CREATE SIGNATURE ::
 REM ------------------------------------------
-"%PATH_GNUPG1%\gpg.exe" --detach-sign "%OUT_FILE%.exe"
+"%PATH_GNUPG1%\gpg.exe" --detach-sign "%OUT_FILE%.sfx.exe"
 attrib +R "%OUT_FILE%.exe.sig"
 REM ------------------------------------------
 echo.

diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi
index fb17e66..483bed8 100644 (file)
--- a/etc/NSIS/setup.nsi
+++ b/etc/NSIS/setup.nsi
@@ -75,7 +75,7 @@
 
 !include `MUI2.nsh`
 !include `WinVer.nsh`
-!include `UAC.nsh`
+!include `StdUtils.nsh`
 !include `parameters.nsh`
 
 
@@ -83,7 +83,7 @@
 ;Installer Attributes
 ;--------------------------------
 
-RequestExecutionLevel user
+RequestExecutionLevel admin
 ShowInstDetails show
 ShowUninstDetails show
 Name "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]"
@@ -107,12 +107,14 @@ SetCompressorDictSize 64
 ;Reserved Files
 ;--------------------------------
 
-ReserveFile "${NSISDIR}\Plugins\UAC.dll"
 ReserveFile "${NSISDIR}\Plugins\System.dll"
+ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"
+ReserveFile "${NSISDIR}\Plugins\Aero.dll"
+ReserveFile "${NSISDIR}\Plugins\StdUtils.dll"
 ReserveFile "${NSISDIR}\Plugins\nsDialogs.dll"
 ReserveFile "${NSISDIR}\Plugins\StartMenu.dll"
 ReserveFile "${NSISDIR}\Plugins\LockedList.dll"
-ReserveFile "${NSISDIR}\Plugins\Aero.dll"
+ReserveFile "checkproc.exe"
 
 
 ;--------------------------------
@@ -170,8 +172,8 @@ VIAddVersionKey "Website" "${MyWebSite}"
 !define MUI_HEADERIMAGE_BITMAP "header.bmp"
 !define MUI_HEADERIMAGE_UNBITMAP "header-un.bmp"
 !define MUI_LANGDLL_ALLLANGUAGES
-!define MUI_CUSTOMFUNCTION_GUIINIT MyUacInit
-!define MUI_CUSTOMFUNCTION_UNGUIINIT un.MyUacInit
+!define MUI_CUSTOMFUNCTION_GUIINIT MyGuiInit
+!define MUI_CUSTOMFUNCTION_UNGUIINIT un.MyGuiInit
 !define MUI_LANGDLL_ALWAYSSHOW
 
 
@@ -257,19 +259,15 @@ UninstPage Custom un.LockedListShow
 ;--------------------------------
 
 Function .onInit
-       ${If} ${UAC_IsInnerInstance}
-       ${OrIf} ${UAC_IsAdmin}
-               !insertmacro MUI_LANGDLL_DISPLAY
-       ${EndIf}
-
-       ${IfNot} ${UAC_IsInnerInstance}
-               System::Call 'kernel32::CreateMutexA(i 0, i 0, t "{2B3D1EBF-B3B6-4E93-92B9-6853029A7162}") i .r1 ?e'
-               Pop $0
-               StrCmp $0 0 +3
+       System::Call 'kernel32::CreateMutexA(i 0, i 0, t "{2B3D1EBF-B3B6-4E93-92B9-6853029A7162}") i .r1 ?e'
+       Pop $0
+       ${If} $0 <> 0
                MessageBox MB_ICONSTOP|MB_TOPMOST "Sorry, the installer is already running!"
                Quit
        ${EndIf}
 
+       !insertmacro MUI_LANGDLL_DISPLAY
+
        ; --------
        
        ${IfNot} ${IsNT}
@@ -287,54 +285,41 @@ Function .onInit
                Quit
        ${EndIf}
        
-       ${If} ${UAC_IsInnerInstance}
-       ${OrIf} ${UAC_IsAdmin}
-               ${If} ${IsWin2000}
-               ${AndIf} ${AtMostServicePack} 3
-                       MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "Setup has detected that your system is missing important updates:$\nThe Service Pack 4 for Windows 2000 is highly recommended!"
-                       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} 2
-                       MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "Setup has detected that your system is missing important updates:$\nThe Service Pack 3 for Windows XP is highly recommended!"
-                       MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 3 for Windows XP now?" IDNO +2
-                       ExecShell "open" "http://technet.microsoft.com/en-us/windows/bb794714"
-               ${EndIf}
-               ${If} ${IsWinVista}
-               ${AndIf} ${AtMostServicePack} 1
-                       MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "Setup has detected that your system is missing important updates:$\nThe Service Pack 2 for Windows Vista is highly recommended!"
-                       MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 2 for Windows Vista now?" IDNO +2
-                       ExecShell "open" "http://technet.microsoft.com/en-us/windows/dd262148"
-               ${EndIf}
-               ${If} ${IsWin7}
-               ${AndIf} ${AtMostServicePack} 0
-                       MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "Setup has detected that your system is missing important updates:$\nThe Service Pack 1 for Windows 7 is highly recommended!"
-                       MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 1 for Windows 7 now?" IDNO +2
-                       ExecShell "open" "http://technet.microsoft.com/en-us/windows/gg635126"
-               ${EndIf}
-       ${EndIf}
+       ; --------
 
+       UserInfo::GetAccountType
+       Pop $0
+       ${If} $0 != "Admin"
+               MessageBox MB_ICONSTOP|MB_TOPMOST "Your system requires administrative permissions in order to install this software."
+               Quit
+       ${EndIf}
+       
        ; --------
 
        InitPluginsDir
        File "/oname=$PLUGINSDIR\checkproc.exe" "checkproc.exe"
        nsExec::Exec /TIMEOUT=5000 '"$PLUGINSDIR\checkproc.exe" Softonic Brothersoft'
+       Pop $0
 FunctionEnd
 
 Function un.onInit
-       ${If} ${UAC_IsInnerInstance}
-       ${OrIf} ${UAC_IsAdmin}
-               !insertmacro MUI_LANGDLL_DISPLAY
+       System::Call 'kernel32::CreateMutexA(i 0, i 0, t "{2B3D1EBF-B3B6-4E93-92B9-6853029A7162}") i .r1 ?e'
+       Pop $0
+       ${If} $0 <> 0
+               MessageBox MB_ICONSTOP|MB_TOPMOST "Sorry, the un-installer is already running!"
+               Quit
        ${EndIf}
 
-       ${IfNot} ${UAC_IsInnerInstance}
-               System::Call 'kernel32::CreateMutexA(i 0, i 0, t "{2B3D1EBF-B3B6-4E93-92B9-6853029A7162}") i .r1 ?e'
-               Pop $0
-               StrCmp $0 0 +3
-               MessageBox MB_ICONSTOP|MB_TOPMOST "Sorry, the un-installer is already running!"
+       !insertmacro MUI_LANGDLL_DISPLAY
+
+       ; --------
+
+       UserInfo::GetAccountType
+       Pop $0
+       ${If} $0 != "Admin"
+               MessageBox MB_ICONSTOP|MB_TOPMOST "Your system requires administrative permissions in order to install this software."
                Quit
-       ${EndIf}  
+       ${EndIf}
 FunctionEnd
 
 
@@ -342,53 +327,13 @@ FunctionEnd
 ;UAC initialization
 ;--------------------------------
 
-Function MyUacInit
-       UAC_TryAgain:
-       !insertmacro UAC_RunElevated
-       ${Switch} $0
-       ${Case} 0
-               ${IfThen} $1 = 1 ${|} Quit ${|}
-               ${IfThen} $3 <> 0 ${|} ${Break} ${|}
-               ${If} $1 = 3
-                       MessageBox MB_ICONEXCLAMATION|MB_TOPMOST|MB_SETFOREGROUND|MB_OKCANCEL "This installer requires admin access, please try again!" /SD IDCANCEL IDOK UAC_TryAgain
-               ${EndIf}
-       ${Case} 1223
-               MessageBox MB_ICONEXCLAMATION|MB_TOPMOST|MB_SETFOREGROUND|MB_OKCANCEL "This installer requires admin privileges, please try again!" /SD IDCANCEL IDOK UAC_TryAgain
-               Quit
-       ${Case} 1062
-               MessageBox MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND "Logon service not running, aborting!"
-               Quit
-       ${Default}
-               MessageBox MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND "Unable to elevate installer! (Error code: $0)"
-               Quit
-       ${EndSwitch}
-       
+Function MyGuiInit
        StrCpy $0 $HWNDPARENT
        System::Call "user32::SetWindowPos(i r0, i -1, i 0, i 0, i 0, i 0, i 3)"
        Aero::Apply
 FunctionEnd
 
-Function un.MyUacInit
-       UAC_TryAgain:
-       !insertmacro UAC_RunElevated
-       ${Switch} $0
-       ${Case} 0
-               ${IfThen} $1 = 1 ${|} Quit ${|}
-               ${IfThen} $3 <> 0 ${|} ${Break} ${|}
-               ${If} $1 = 3
-                       MessageBox MB_ICONEXCLAMATION|MB_TOPMOST|MB_SETFOREGROUND|MB_OKCANCEL "This un-installer requires admin access, please try again!" /SD IDCANCEL IDOK UAC_TryAgain
-               ${EndIf}
-       ${Case} 1223
-               MessageBox MB_ICONEXCLAMATION|MB_TOPMOST|MB_SETFOREGROUND|MB_OKCANCEL "This un-installer requires admin privileges, please try again!" /SD IDCANCEL IDOK UAC_TryAgain
-               Quit
-       ${Case} 1062
-               MessageBox MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND "Logon service not running, aborting!"
-               Quit
-       ${Default}
-               MessageBox MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND "Unable to elevate installer! (Error code: $0)"
-               Quit
-       ${EndSwitch}
-       
+Function un.MyGuiInit
        StrCpy $0 $HWNDPARENT
        System::Call "user32::SetWindowPos(i r0, i -1, i 0, i 0, i 0, i 0, i 3)"
        Aero::Apply
@@ -474,6 +419,11 @@ FunctionEnd
        StrCpy ${OutVar} "LameXP.exe"
 !macroend
 
+!macro DisableNextButton TmpVar
+       GetDlgItem ${TmpVar} $HWNDPARENT 1
+       EnableWindow ${TmpVar} 0
+!macroend
+
 
 ;--------------------------------
 ;Install Files
@@ -675,12 +625,15 @@ FunctionEnd
 ;--------------------------------
 
 Function RunAppFunction
+       !insertmacro DisableNextButton $R0
        !insertmacro GetExecutableName $R0
-       !insertmacro UAC_AsUser_ExecShell "explore" "$INSTDIR" "" "" SW_SHOWNORMAL
-       !insertmacro UAC_AsUser_ExecShell "open" "$INSTDIR\$R0" "--first-run" "$INSTDIR" SW_SHOWNORMAL
+       ${StdUtils.ExecShellAsUser} $R1 "$INSTDIR" "explore" ""
+       ${StdUtils.ExecShellAsUser} $R1 "$INSTDIR\$R0" "open" "--first-run"
+       ${StdUtils.Unload}
 FunctionEnd
 
 Function ShowReadmeFunction
-       !insertmacro UAC_AsUser_ExecShell "open" "$INSTDIR\FAQ.html" "" "" SW_SHOWNORMAL
+       !insertmacro DisableNextButton $R0
+       ${StdUtils.ExecShellAsUser} $R1 "$INSTDIR\FAQ.html" "open" ""
+       ${StdUtils.Unload}
 FunctionEnd
-

diff --git a/etc/NSIS/wrapper.nsi b/etc/NSIS/wrapper.nsi
new file mode 100644 (file)
index 0000000..39f6407
--- /dev/null
+++ b/etc/NSIS/wrapper.nsi
@@ -0,0 +1,154 @@
+; ///////////////////////////////////////////////////////////////////////////////
+; // LameXP - Audio Encoder Front-End
+; // Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+; //
+; // This program is free software; you can redistribute it and/or modify
+; // it under the terms of the GNU General Public License as published by
+; // the Free Software Foundation; either version 2 of the License, or
+; // (at your option) any later version.
+; //
+; // This program is distributed in the hope that it will be useful,
+; // but WITHOUT ANY WARRANTY; without even the implied warranty of
+; // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; // GNU General Public License for more details.
+; //
+; // You should have received a copy of the GNU General Public License along
+; // with this program; if not, write to the Free Software Foundation, Inc.,
+; // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+; //
+; // http://www.gnu.org/licenses/gpl-2.0.txt
+; ///////////////////////////////////////////////////////////////////////////////
+
+;--------------------------------
+;Basic Defines
+;--------------------------------
+
+!ifndef LAMEXP_VERSION
+  !error "LAMEXP_VERSION is not defined !!!"
+!endif
+!ifndef LAMEXP_BUILD
+  !error "LAMEXP_BUILD is not defined !!!"
+!endif
+!ifndef LAMEXP_INSTTYPE
+  !error "LAMEXP_INSTTYPE is not defined !!!"
+!endif
+!ifndef LAMEXP_PATCH
+  !error "LAMEXP_PATCH is not defined !!!"
+!endif
+!ifndef LAMEXP_DATE
+  !error "LAMEXP_DATE is not defined !!!"
+!endif
+!ifndef LAMEXP_OUTPUT_FILE
+  !error "LAMEXP_OUTPUT_FILE is not defined !!!"
+!endif
+!ifndef LAMEXP_SOURCE_FILE
+  !error "LAMEXP_SOURCE_FILE is not defined !!!"
+!endif
+!ifndef LAMEXP_UPX_PATH
+  !error "LAMEXP_UPX_PATH is not defined !!!"
+!endif
+
+;UUID
+!define MyRegPath "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{FBD7A67D-D700-4043-B54F-DD106D00F308}"
+
+;Web-Site
+!define MyWebSite "http://mulder.at.gg/"
+
+
+;--------------------------------
+;Includes
+;--------------------------------
+
+!include `parameters.nsh`
+
+
+;--------------------------------
+;Installer Attributes
+;--------------------------------
+
+RequestExecutionLevel user
+XPStyle on
+Name "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]"
+OutFile "${LAMEXP_OUTPUT_FILE}"
+BrandingText "${LAMEXP_DATE} / Build ${LAMEXP_BUILD}"
+InstallDir "$PROGRAMFILES\MuldeR\LameXP v${LAMEXP_VERSION}"
+Icon "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico"
+ChangeUI all "${NSISDIR}\Contrib\UIs\sdbarker_tiny.exe"
+ShowInstDetails show
+AutoCloseWindow true
+
+
+;--------------------------------
+;Page Captions
+;--------------------------------
+
+SubCaption 0 " "
+SubCaption 1 " "
+SubCaption 2 " "
+SubCaption 3 " "
+SubCaption 4 " "
+
+
+;--------------------------------
+;Compressor
+;--------------------------------
+
+!packhdr "$%TEMP%\exehead.tmp" '"${LAMEXP_UPX_PATH}\upx.exe" --brute "$%TEMP%\exehead.tmp"'
+
+
+;--------------------------------
+;Version Info
+;--------------------------------
+
+!searchreplace PRODUCT_VERSION_DATE "${LAMEXP_DATE}" "-" "."
+VIProductVersion "${PRODUCT_VERSION_DATE}.${LAMEXP_BUILD}"
+
+VIAddVersionKey "Author" "LoRd_MuldeR <mulder2@gmx.de>"
+VIAddVersionKey "Comments" "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+VIAddVersionKey "CompanyName" "Free Software Foundation"
+VIAddVersionKey "FileDescription" "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]"
+VIAddVersionKey "FileVersion" "${PRODUCT_VERSION_DATE}.${LAMEXP_BUILD} (${LAMEXP_VERSION})"
+VIAddVersionKey "LegalCopyright" "Copyright 2004-2011 LoRd_MuldeR"
+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" "${MyWebSite}"
+
+
+;--------------------------------
+;Installer initialization
+;--------------------------------
+
+Section "-LaunchTheInstaller"
+       SetDetailsPrint textonly
+       DetailPrint "Launching installer, please stay tuned..."
+       SetDetailsPrint listonly
+       
+       InitPluginsDir
+       SetOutPath "$PLUGINSDIR"
+       File "/oname=$PLUGINSDIR\Install.exe" "${LAMEXP_SOURCE_FILE}"
+       !insertmacro GetCommandlineParameter "Update" "?" $R9
+       
+       RunTryAgain:
+       
+       ClearErrors
+       StrCmp "$R9" "?" +3 0
+       ExecShell "open" "$PLUGINSDIR\Install.exe" '/Update=$R9' SW_SHOWNORMAL
+       Goto +2
+       ExecShell "open" "$PLUGINSDIR\Install.exe" '/Update' SW_SHOWNORMAL
+       IfErrors 0 RunSuccess
+       
+       ClearErrors
+       StrCmp "$R9" "?" +3 0
+       ExecShell "" "$PLUGINSDIR\Install.exe" '/Update=$R9' SW_SHOWNORMAL
+       Goto +2
+       ExecShell "" "$PLUGINSDIR\Install.exe" '/Update' SW_SHOWNORMAL
+       IfErrors 0 RunSuccess
+
+       MessageBox MB_RETRYCANCEL|MB_ICONSTOP|MB_TOPMOST "Failed to launch installer. Please try again!" IDRETRY RunTryAgain
+       Abort "Failed to launch installer :-("
+       
+       RunSuccess:
+       Delete /REBOOTOK "$PLUGINSDIR\Install.exe"
+SectionEnd

diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 6e7f23b..81ef45e 100644 (file)
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -1477,7 +1477,7 @@
     </message>
     <message>
         <location filename="../../src/Dialog_MainWindow.cpp" line="493"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2976"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2975"/>
         <source>Access Denied</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1632,8 +1632,8 @@
         <location filename="../../src/Dialog_MainWindow.cpp" line="1031"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1097"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1098"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1634"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2919"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1633"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2918"/>
         <source>Discard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1837,8 +1837,8 @@
         <location filename="../../src/Dialog_MainWindow.cpp" line="1452"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1478"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1530"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1632"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1669"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1631"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1668"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1847,8 +1847,8 @@
         <location filename="../../src/Dialog_MainWindow.cpp" line="1452"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1478"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1530"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1632"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1669"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1631"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1668"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1945,201 +1945,201 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1632"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1634"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1647"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1631"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1633"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1646"/>
         <source>Beta Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1632"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1631"/>
         <source>Do you really want LameXP to check for Beta (pre-release) updates?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1634"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1633"/>
         <source>LameXP will check for Beta (pre-release) updates from now on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1634"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1633"/>
         <source>Check Now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1647"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1646"/>
         <source>LameXP will &lt;i&gt;not&lt;/i&gt; check for Beta (pre-release) updates from now on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1669"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1672"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1683"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1668"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1671"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1682"/>
         <source>Shell Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1669"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1668"/>
         <source>Do you really want to disable the LameXP shell integration?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1672"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1671"/>
         <source>The LameXP shell integration has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1683"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1682"/>
         <source>The LameXP shell integration has been re-enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1780"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1789"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1779"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1788"/>
         <source>Add file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1821"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="1825"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1820"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="1824"/>
         <source>Add Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2198"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2241"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2197"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2240"/>
         <source>New Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2241"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2240"/>
         <source>Enter the name of the new folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2273"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2272"/>
         <source>Failed to create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2273"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2272"/>
         <source>The new folder could not be created:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2273"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2272"/>
         <source>Drive is read-only or insufficient access rights!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2553"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2556"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2559"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2565"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2552"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2555"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2558"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2564"/>
         <source>Quality Level %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2562"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2582"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2602"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2561"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2581"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2601"/>
         <source>Compression %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2568"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2588"/>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2608"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2567"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2587"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2607"/>
         <source>Uncompressed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2632"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2631"/>
         <source>Best Quality (Very Slow)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2635"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2634"/>
         <source>High Quality (Recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2638"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2637"/>
         <source>Average Quality (Default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2641"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2640"/>
         <source>Low Quality (Fast)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2644"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2643"/>
         <source>Poor Quality (Very Fast)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2908"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2907"/>
         <source>File name without extension</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2909"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2908"/>
         <source>Track number with leading zero</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2910"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2909"/>
         <source>Track title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2911"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2910"/>
         <source>Artist name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2912"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2911"/>
         <source>Album name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2913"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2912"/>
         <source>Year with (at least) four digits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2914"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2913"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2916"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2915"/>
         <source>Characters forbidden in file names:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2919"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2918"/>
         <source>Rename Macros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2932"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2931"/>
         <source>%1 Instance(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="2976"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="2975"/>
         <source>Cannot write to the selected directory. Please choose another directory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3043"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3042"/>
         <source>Already Running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Dialog_MainWindow.cpp" line="3043"/>
+        <location filename="../../src/Dialog_MainWindow.cpp" line="3042"/>
         <source>LameXP is already running, please use the running instance!</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/res/tools/wupdate.exe b/res/tools/wupdate.exe
index 3add977..ed9af62 100644 (file)
Binary files a/res/tools/wupdate.exe and b/res/tools/wupdate.exe differ

diff --git a/src/Config.h b/src/Config.h
index c1d040e..6163448 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -30,7 +30,7 @@
 #define VER_LAMEXP_MINOR_LO                                    3
 #define VER_LAMEXP_TYPE                                                Beta
 #define VER_LAMEXP_PATCH                                       3
-#define VER_LAMEXP_BUILD                                       708
+#define VER_LAMEXP_BUILD                                       710
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tools versions

diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp
index c79f36b..f7be983 100644 (file)
--- a/src/Thread_Initialization.cpp
+++ b/src/Thread_Initialization.cpp
@@ -90,7 +90,7 @@ g_lamexp_tools[] =
        {"875871c942846f6ad163f9e4949bba2f4331bec678ca5aefe58c961b6825bd0d419a078b", CPU_TYPE_ALL_ALL, "valdec.exe", 31},
        {"e657331e281840878a37eb4fb357cb79f33d528ddbd5f9b2e2f7d2194bed4720e1af8eaf", CPU_TYPE_ALL_ALL, "wget.exe", 1114},
        {"8923cf65e181f8a99f28e9d1ea0d89ace02142241a7f76dae3d540ffd0790495af815644", CPU_TYPE_ALL_ALL, "wma2wav.exe", 20111001},
-       {"e3b14951b7121f12fa656c70488db6df5d07862effa243a3f3f93398ae9265bc684b74c2", CPU_TYPE_ALL_ALL, "wupdate.exe", 20110929},
+       {"44a80977bfa84938a3584423cd5eb0716c0fded456b493bed0b1cf78f7579106365d4c89", CPU_TYPE_ALL_ALL, "wupdate.exe", 20111002},
        {"6b053b37d47a9c8659ebf2de43ad19dcba17b9cd868b26974b9cc8c27b6167e8bf07a5a2", CPU_TYPE_ALL_ALL, "wvunpack.exe", 4601},
        {NULL, NULL, NULL, NULL}
 };