diff --git a/LameXP_VS2010.vcxproj b/LameXP_VS2010.vcxproj
index beca3774..6f7de01f 100644
--- a/LameXP_VS2010.vcxproj
+++ b/LameXP_VS2010.vcxproj
@@ -213,7 +213,7 @@ del "$(TargetDir)imageformats\q???d4.dll"
"/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;QtCore.lib;QtGui.lib;QtSvg.lib;qgif.lib;qsvg.lib;qico.lib;Winmm.lib;imm32.lib;ws2_32.lib;Shlwapi.lib;Wininet.lib;EncodePointer.lib;%(AdditionalDependencies)
+ qtmain.lib;QtCore.lib;QtGui.lib;QtSvg.lib;qsvg.lib;qico.lib;Winmm.lib;imm32.lib;ws2_32.lib;Shlwapi.lib;Wininet.lib;EncodePointer.lib;%(AdditionalDependencies)
LinkVerboseLib
$(SolutionDir)\etc\Prerequisites\qt4_static\lib;$(SolutionDir)\etc\Prerequisites\qt4_static\plugins\imageformats;$(SolutionDir)\etc\Prerequisites\EncodePointer\lib;%(AdditionalLibraryDirectories)
%(IgnoreSpecificDefaultLibraries)
diff --git a/doc/Changelog.html b/doc/Changelog.html
index da875849..1cec2e27 100644
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -23,7 +23,7 @@ a:visited { color: #0000EE; }
Added optional support for the FHG AAC Encoder included with Winamp 5.62 (see FAQ doc for details)
Added a menu for bookmarking "favorite" output folders to the "output folder" tab
Added Polish translation, thanks to Sir Daniel K <sir.daniel.k@gmail.com>
-Updated Qt runtime libraries to v4.8.0 Beta-1 (2011-07-19), compiled with MSVC 10.0
+Updated Qt runtime libraries to v4.8.0 RC-1 (2011-10-13), compiled with MSVC 10.0
Updated mpg123 decoder to v1.13.4 (2011-09-07), compiled with GCC 4.6.1
Updated MediaInfo to v0.7.50 (2011-09-23), compiled with MSVC 10.0
Updated language files (big thank-you to all contributors !!!)
diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 90e41822..ef21e77a 100644
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -2709,17 +2709,17 @@
QApplication
-
+
Executable '%1' doesn't support Windows compatibility mode.
-
+
Executable '%1' requires Qt v%2, but found Qt v%3.
-
+
Executable '%1' requires Windows 2000 or later.
diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts
index f806bac9..26a48ac9 100644
--- a/etc/Translation/LameXP_PL.ts
+++ b/etc/Translation/LameXP_PL.ts
@@ -2709,17 +2709,17 @@
QApplication
-
+
Executable '%1' doesn't support Windows compatibility mode.
Plik wykonywalny '%1' nie działa w trybie kompatybilności z Windows.
-
+
Executable '%1' requires Qt v%2, but found Qt v%3.
Plik wykonywalny '%1' wymaga Qt v%2, znaleziono jednak Qt v%3.
-
+
Executable '%1' requires Windows 2000 or later.
Plik wykonywalny '%1' wymaga do uruchomienia Windows 2000 lub nowszego.
diff --git a/res/tools/elevator.exe b/res/tools/elevator.exe
index d3d4239c..8226605d 100644
Binary files a/res/tools/elevator.exe and b/res/tools/elevator.exe differ
diff --git a/res/tools/wupdate.exe b/res/tools/wupdate.exe
index fe5402bd..164aa9a5 100644
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 a9a9091a..92eb0bfe 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 Beta
-#define VER_LAMEXP_PATCH 3
-#define VER_LAMEXP_BUILD 731
+#define VER_LAMEXP_PATCH 4
+#define VER_LAMEXP_BUILD 734
///////////////////////////////////////////////////////////////////////////////
// Tools versions
diff --git a/src/Global.cpp b/src/Global.cpp
index 7f43e3d9..3ddcf8da 100644
--- a/src/Global.cpp
+++ b/src/Global.cpp
@@ -66,7 +66,6 @@
//Initialize static Qt plugins
#ifdef QT_NODLL
-Q_IMPORT_PLUGIN(qgif)
Q_IMPORT_PLUGIN(qico)
Q_IMPORT_PLUGIN(qsvg)
#endif
@@ -318,6 +317,28 @@ const QDate &lamexp_version_date(void)
return g_lamexp_version_date;
}
+/*
+ * Get the native operating system version
+ */
+static DWORD lamexp_get_os_version(void)
+{
+ OSVERSIONINFO osVerInfo;
+ memset(&osVerInfo, 0, sizeof(OSVERSIONINFO));
+ osVerInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ DWORD version = 0;
+
+ if(GetVersionEx(&osVerInfo) == TRUE)
+ {
+ if(osVerInfo.dwPlatformId != VER_PLATFORM_WIN32_NT)
+ {
+ throw "Ouuups: Not running under Windows NT. This is not supposed to happen!";
+ }
+ version = (DWORD)((osVerInfo.dwMajorVersion << 16) | (osVerInfo.dwMinorVersion & 0xffff));
+ }
+
+ return version;
+}
+
/*
* Global exception handler
*/
@@ -516,14 +537,12 @@ lamexp_cpu_t lamexp_detect_cpu_features(int argc, char **argv)
lamexp_cpu_t features;
SYSTEM_INFO systemInfo;
- OSVERSIONINFO osVersionInfo;
int CPUInfo[4] = {-1};
char CPUIdentificationString[0x40];
char CPUBrandString[0x40];
memset(&features, 0, sizeof(lamexp_cpu_t));
memset(&systemInfo, 0, sizeof(SYSTEM_INFO));
- memset(&osVersionInfo, 0, sizeof(OSVERSIONINFO));
memset(CPUIdentificationString, 0, sizeof(CPUIdentificationString));
memset(CPUBrandString, 0, sizeof(CPUBrandString));
@@ -604,10 +623,10 @@ lamexp_cpu_t lamexp_detect_cpu_features(int argc, char **argv)
#endif
//Hack to disable x64 on the Windows 8 Developer Preview
- osVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- if(features.x64 && GetVersionEx(&osVersionInfo))
+ if(features.x64)
{
- if((osVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) && (osVersionInfo.dwMajorVersion == 6) && (osVersionInfo.dwMinorVersion == 2))
+ DWORD osVerNo = lamexp_get_os_version();
+ if((HIWORD(osVerNo) == 6) && (LOWORD(osVerNo) == 2))
{
qWarning("Windows 8 (x64) detected. Going to disable all x64 support for now!\n");
features.x64 = false;
@@ -767,7 +786,7 @@ bool lamexp_init_qt(int argc, char* argv[])
}
//Check Qt version
- qDebug("Using Qt Framework v%s, compiled with Qt v%s [%s]", qVersion(), QT_VERSION_STR, QT_PACKAGEDATE_STR);
+ qDebug("Using Qt Framework v%s (%s), compiled with Qt v%s [%s]", qVersion(), (qSharedBuild() ? "DLL" : "Static"), QT_VERSION_STR, QT_PACKAGEDATE_STR);
if(_stricmp(qVersion(), QT_VERSION_STR))
{
qFatal("%s", QApplication::tr("Executable '%1' requires Qt v%2, but found Qt v%3.").arg(QString::fromLatin1(executableName), QString::fromLatin1(QT_VERSION_STR), QString::fromLatin1(qVersion())).toLatin1().constData());
@@ -802,7 +821,10 @@ bool lamexp_init_qt(int argc, char* argv[])
lamexp_check_compatibility_mode(NULL, executableName);
break;
default:
- qWarning("Running on an unknown/untested WinNT-based OS.\n");
+ {
+ DWORD osVersionNo = lamexp_get_os_version();
+ qWarning("Running on an unknown/untested WinNT-based OS (v%u.%u).\n", HIWORD(osVersionNo), LOWORD(osVersionNo));
+ }
break;
}
diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp
index b34b2e1b..11d3ebdf 100644
--- a/src/Thread_Initialization.cpp
+++ b/src/Thread_Initialization.cpp
@@ -67,7 +67,7 @@ g_lamexp_tools[] =
{"29da0d3e810bc3e8d2cddb3db452325eefca0d0c1fff1379fa17806ad447752be1b88e2f", CPU_TYPE_X64_GEN, "aften.x64.exe", 8},
{"1cca303fabd889a18fc01c32a7fd861194cfcac60ba63740ea2d7c55d049dbf8f59259fa", CPU_TYPE_ALL_ALL, "alac.exe", 20},
{"6d22d4bbd7ce2162e38f70ac9187bc84eb28233b36ee6c0492d0a6195318782d7f05c444", CPU_TYPE_ALL_ALL, "avs2wav.exe", 13},
- {"d0f2e4dc648d66971113cc47a30283bf4f027dfd7afd31ec447c81e0ef716e9482cf4240", CPU_TYPE_ALL_ALL, "elevator.exe", UINT_MAX},
+ {"e53a787d4a0319453f4fe48c3145f190fcce7ac4802e521db908771437f6250746116e6c", CPU_TYPE_ALL_ALL, "elevator.exe", UINT_MAX},
{"9ae98a3fc779f69ee876a3b477fbc35a709ba5066823b2eb62eeb015057c38807e4be51f", CPU_TYPE_ALL_ALL, "faad.exe", 27},
{"446054f9a7f705f1aadc9053ca7b8a86a775499ef159978954ebdea92de056c34f8841f7", CPU_TYPE_ALL_ALL, "flac.exe", 121},
{"dd68d074c5e13a607580f3a24595c0f3882e37211d2ca628f46e6df20fabcc832dad488a", CPU_TYPE_ALL_ALL, "gpgv.exe", 1411},
@@ -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},
- {"7fe357a133398e3c5163bb9990ac9528751b0a781c73c326b65c1741c7dcb2750910cb62", CPU_TYPE_ALL_ALL, "wupdate.exe", 20111009},
+ {"aa7668d58559f0295cf088cbb6c184470d9b1b3da6028440c58b6edbca0940bf62501f5f", CPU_TYPE_ALL_ALL, "wupdate.exe", 20111014},
{"6b053b37d47a9c8659ebf2de43ad19dcba17b9cd868b26974b9cc8c27b6167e8bf07a5a2", CPU_TYPE_ALL_ALL, "wvunpack.exe", 4601},
{NULL, NULL, NULL, NULL}
};