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

Fixed regression in 027f4d519d: If no existing file type was associated with a supported file extension, then the LameXP type wasn't associated with that extension correctly.

Browse Source
This commit is contained in:
LoRd_MuldeR 2015-07-26 14:19:40 +02:00
parent 73cc7b937d
commit 6c59b4caf6
3 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 2 #define VER_LAMEXP_MINOR_LO 2
#define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 2 #define VER_LAMEXP_PATCH 2
#define VER_LAMEXP_BUILD 1770 #define VER_LAMEXP_BUILD 1772
#define VER_LAMEXP_CONFG 1700 #define VER_LAMEXP_CONFG 1700
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

56
src/ShellIntegration.cpp
View File

@ -99,19 +99,20 @@ void ShellIntegration::install(bool async)
const QString lamexpShellAction(g_lamexpShellAction); const QString lamexpShellAction(g_lamexpShellAction);
//Register the LameXP file type //Register the LameXP file type
const bool ok1 = MUtils::Registry::reg_value_write(MUtils::Registry::root_user, QString("Software\\Classes\\%1") .arg(lamexpFileType), QString(), lamexpFileInfo); bool ok[4] = {false, false, false, false};
const bool ok2 = MUtils::Registry::reg_value_write(MUtils::Registry::root_user, QString("Software\\Classes\\%1\\shell") .arg(lamexpFileType), QString(), lamexpShellAction); ok[0] = MUtils::Registry::reg_value_write(MUtils::Registry::root_user, QString("Software\\Classes\\%1") .arg(lamexpFileType), QString(), lamexpFileInfo);
const bool ok3 = MUtils::Registry::reg_value_write(MUtils::Registry::root_user, QString("Software\\Classes\\%1\\shell\\%2") .arg(lamexpFileType, lamexpShellAction), QString(), lamexpShellText); ok[1] = MUtils::Registry::reg_value_write(MUtils::Registry::root_user, QString("Software\\Classes\\%1\\shell") .arg(lamexpFileType), QString(), lamexpShellAction);
const bool ok4 = MUtils::Registry::reg_value_write(MUtils::Registry::root_user, QString("Software\\Classes\\%1\\shell\\%2\\command").arg(lamexpFileType, lamexpShellAction), QString(), lamexpShellCommand); ok[2] = MUtils::Registry::reg_value_write(MUtils::Registry::root_user, QString("Software\\Classes\\%1\\shell\\%2") .arg(lamexpFileType, lamexpShellAction), QString(), lamexpShellText);
if(!(ok1 && ok2 && ok3 && ok4)) ok[3] = MUtils::Registry::reg_value_write(MUtils::Registry::root_user, QString("Software\\Classes\\%1\\shell\\%2\\command").arg(lamexpFileType, lamexpShellAction), QString(), lamexpShellCommand);
if(!(ok[0] && ok[1] && ok[2] && ok[3]))
{ {
qWarning("Failed to create LameXP file type!"); qWarning("Failed to register the LameXP file type!");
return; return;
} }
//Detect supported file types //Detect supported file types
QStringList types; QStringList types;
detectTypes(lamexpFileType, lamexpShellAction, types); initializeTypes(lamexpFileType, lamexpShellAction, types);
//Add LameXP shell action to all supported file types //Add LameXP shell action to all supported file types
for(QStringList::ConstIterator iter = types.constBegin(); iter != types.constEnd(); iter++) for(QStringList::ConstIterator iter = types.constBegin(); iter != types.constEnd(); iter++)
@ -186,37 +187,24 @@ void ShellIntegration::remove(bool async)
// Private Functions // Private Functions
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void ShellIntegration::detectTypes(const QString &lamexpFileType, const QString &lamexpShellAction, QStringList &nativeTypes) void ShellIntegration::initializeTypes(const QString &lamexpFileType, const QString &lamexpShellAction, QStringList &nativeTypes)
{ {
nativeTypes.clear(); nativeTypes.clear();
const QStringList supportedTypes = DecoderRegistry::getSupportedTypes();
const QString progId = "Progid"; const QString progId = "Progid";
QRegExp regExp1("\\((.+)\\)");
QRegExp regExp2("(\\.\\w+)");
//Find all supported file extensions
QStringList extensions;
for(QStringList::ConstIterator iter = supportedTypes.constBegin(); iter != supportedTypes.constEnd(); iter++)
{
if(regExp1.lastIndexIn(*iter) > 0)
{
int lastIndex = 0;
while((lastIndex = regExp2.indexIn(regExp1.cap(1), lastIndex) + 1) >= 1)
{
if(!extensions.contains(regExp2.cap(1), Qt::CaseInsensitive))
{
extensions.append(regExp2.cap(1));
}
}
}
}
//Map supported extensions to native types //Map supported extensions to native types
for(QStringList::ConstIterator iter = extensions.constBegin(); iter != extensions.constEnd(); iter++) const QStringList &supportedExts = DecoderRegistry::getSupportedExts();
for(QStringList::ConstIterator iter = supportedExts.constBegin(); iter != supportedExts.constEnd(); iter++)
{ {
const QString currentExt = (*iter).mid(1).trimmed(); /*remove leading asterisk*/
if(currentExt.isEmpty() || (!currentExt.startsWith('.')))
{
qWarning("Invalid file extension '%s' encountered -> skipping!", currentExt);
continue;
}
QString currentType; QString currentType;
if(MUtils::Registry::reg_value_read(MUtils::Registry::root_classes, (*iter), QString(), currentType)) if(MUtils::Registry::reg_value_read(MUtils::Registry::root_classes, currentExt, QString(), currentType))
{ {
currentType = QDir::toNativeSeparators(currentType); currentType = QDir::toNativeSeparators(currentType);
if((currentType.compare(lamexpFileType, Qt::CaseInsensitive) != 0) && (!nativeTypes.contains(currentType, Qt::CaseInsensitive))) if((currentType.compare(lamexpFileType, Qt::CaseInsensitive) != 0) && (!nativeTypes.contains(currentType, Qt::CaseInsensitive)))
@ -226,10 +214,10 @@ void ShellIntegration::detectTypes(const QString &lamexpFileType, const QString
} }
else else
{ {
MUtils::Registry::reg_value_write(MUtils::Registry::root_user, (*iter), QString(), lamexpFileType); MUtils::Registry::reg_value_write(MUtils::Registry::root_user, QString("Software\\Classes\\%1").arg(currentExt), QString(), lamexpFileType);
} }
if(MUtils::Registry::reg_value_read(MUtils::Registry::root_user, QString("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\%1\\UserChoice").arg(*iter), progId, currentType)) if(MUtils::Registry::reg_value_read(MUtils::Registry::root_user, QString("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\%1\\UserChoice").arg(currentExt), progId, currentType))
{ {
currentType = QDir::toNativeSeparators(currentType); currentType = QDir::toNativeSeparators(currentType);
if((currentType.compare(lamexpFileType, Qt::CaseInsensitive) != 0) && (!nativeTypes.contains(currentType, Qt::CaseInsensitive))) if((currentType.compare(lamexpFileType, Qt::CaseInsensitive) != 0) && (!nativeTypes.contains(currentType, Qt::CaseInsensitive)))
@ -239,7 +227,7 @@ void ShellIntegration::detectTypes(const QString &lamexpFileType, const QString
} }
QStringList progids; QStringList progids;
if(MUtils::Registry::reg_enum_values(MUtils::Registry::root_user, QString("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\%1\\OpenWithProgids").arg(*iter), progids)) if(MUtils::Registry::reg_enum_values(MUtils::Registry::root_user, QString("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\%1\\OpenWithProgids").arg(currentExt), progids))
{ {
for(QStringList::ConstIterator iter2 = progids.constBegin(); iter2 != progids.constEnd(); iter2++) for(QStringList::ConstIterator iter2 = progids.constBegin(); iter2 != progids.constEnd(); iter2++)
{ {

2
src/ShellIntegration.h
View File

@ -39,7 +39,7 @@ public:
private: private:
ShellIntegration(void); ShellIntegration(void);
static void detectTypes(const QString &lamexpFileType, const QString &lamexpShellAction, QStringList &nativeTypes); static void initializeTypes(const QString &lamexpFileType, const QString &lamexpShellAction, QStringList &nativeTypes);
static QMutex m_mutex; static QMutex m_mutex;
static volatile int m_state; static volatile int m_state;
}; };