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

Fix a problem that will cause our CLI tools from working, introduced in Git-40b03002848cad7a745dc445e846c77cb451d89b.

Browse Source
This commit is contained in:
LoRd_MuldeR 2010-12-08 18:29:31 +01:00
parent 9f1f8e8f4b
commit 65482fb2e8
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -25,7 +25,7 @@
#define VER_LAMEXP_MAJOR 4
#define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 0
#define VER_LAMEXP_BUILD 132
#define VER_LAMEXP_BUILD 134
#define VER_LAMEXP_SUFFIX TechPreview
/*

2
src/Dialog_MainWindow.cpp
View File

@ -530,6 +530,8 @@ void MainWindow::windowShown(void)
QString messageText;
messageText += "<nobr>The Nero AAC encoder could not be found. AAC encoding support will be disabled.<br>";
messageText += "Please put 'neroAacEnc.exe', 'neroAacDec.exe' and 'neroAacTag.exe' into the LameXP directory!<br><br>";
messageText += "Your LameXP directory is as follows:<br>";
messageText += "<i><nobr>" + QDir::toNativeSeparators(QCoreApplication::applicationDirPath()) + "</nobr></i><br><br>";
messageText += "You can download the Nero AAC encoder for free from the official Nero website at:<br>";
messageText += "<b>" + LINK(AboutDialog::neroAacUrl) + "</b><br></nobr>";
QMessageBox::information(this, "AAC Support Disabled", messageText);

21
src/Global.cpp
View File

@ -608,7 +608,9 @@ QString lamexp_rand_str(void)
*/
const QString &lamexp_temp_folder(void)
{
const GUID LocalAppDataID={0xF1B32785,0x6FBA,0x4FCF,{0x9D,0x55,0x7B,0x8E,0x7F,0x15,0x70,0x91}};
const GUID LocalAppDataLowID={0xA520A1A4,0x1780,0x4FF6,{0xBD,0x18,0x16,0x73,0x43,0xC5,0xAF,0x16}};
typedef HANDLE (WINAPI *SHGetKnownFolderPathFun)(__in const GUID &rfid, __in DWORD dwFlags, __in HANDLE hToken, __out PWSTR *ppszPath);
if(g_lamexp_temp_folder.isEmpty())
@ -620,22 +622,23 @@ const QString &lamexp_temp_folder(void)
if(SHGetKnownFolderPathPtr)
{
WCHAR *localAppDataLowPath = NULL;
if(SHGetKnownFolderPathPtr(LocalAppDataLowID, 0x00008000, NULL, &localAppDataLowPath) == S_OK)
WCHAR *localAppDataPath = NULL;
if(SHGetKnownFolderPathPtr(LocalAppDataID, 0x00008000, NULL, &localAppDataPath) == S_OK)
{
QDir localAppDataLow = QDir(QDir::fromNativeSeparators(QString::fromUtf16(reinterpret_cast<const unsigned short*>(localAppDataLowPath))));
if(localAppDataLow.exists())
MessageBoxW(NULL, localAppDataPath, L"LocalAppData", MB_TOPMOST);
QDir localAppData = QDir(QDir::fromNativeSeparators(QString::fromUtf16(reinterpret_cast<const unsigned short*>(localAppDataPath))));
if(localAppData.exists())
{
if(!localAppDataLow.entryList(QDir::AllDirs).contains("Temp"))
if(!localAppData.entryList(QDir::AllDirs).contains("Temp"))
{
localAppDataLow.mkdir("Temp");
localAppData.mkdir("Temp");
}
if(localAppDataLow.cd("Temp"))
if(localAppData.cd("Temp"))
{
temp.setPath(localAppDataLow.canonicalPath());
temp.setPath(localAppData.canonicalPath());
}
}
CoTaskMemFree(localAppDataLowPath);
CoTaskMemFree(localAppDataPath);
}
}