Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add thee new capacity to load plugins from %ALLUSERSPROFILE%

Browse Source 
By putting an empty "pluginsForAllUsers.xml" file, all the plugins will be loaded from %ALLUSERSPROFILE%\Notepad++\plugins\.
This commit is contained in:
Don HO 2018-11-21 02:20:36 +01:00
parent f03ce289d3
commit 116f400753
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
PowerEditor/src/Parameters.cpp
View File

@ -995,6 +995,11 @@ bool NppParameters::load()
// Test if localConf.xml exist
_isLocal = (PathFileExists(localConfPath.c_str()) == TRUE);
generic_string pluginsForAllUserPath(_nppPath);
PathAppend(pluginsForAllUserPath, pluginsForAllUsersFile);
if (!PathFileExists(pluginsForAllUserPath.c_str()))
pluginsForAllUserPath = TEXT("");
// Under vista and windows 7, the usage of doLocalConf.xml is not allowed
// if Notepad++ is installed in "program files" directory, because of UAC
if (_isLocal)
@ -1012,9 +1017,10 @@ bool NppParameters::load()
}
}
generic_string nppPluginRootParent;
if (_isLocal)
{
_userPath = _nppPath;
_userPath = nppPluginRootParent = _nppPath;
_pluginRootDir = _nppPath;
PathAppend(_pluginRootDir, TEXT("plugins"));
@ -1026,24 +1032,32 @@ bool NppParameters::load()
PathAppend(_userPath, TEXT("Notepad++"));
_appdataNppDir = _userPath;
// Plugin System V1
if (!PathFileExists(_userPath.c_str()))
::CreateDirectory(_userPath.c_str(), NULL);
// Plugin System V2
_localAppdataNppDir = getSpecialFolderLocation(CSIDL_LOCAL_APPDATA);
PathAppend(_localAppdataNppDir, TEXT("Notepad++"));
if (!PathFileExists(_localAppdataNppDir.c_str()))
::CreateDirectory(_localAppdataNppDir.c_str(), NULL);
nppPluginRootParent = _localAppdataNppDir;
_pluginRootDir = _localAppdataNppDir;
PathAppend(_pluginRootDir, TEXT("plugins"));
if (!PathFileExists(_pluginRootDir.c_str()))
::CreateDirectory(_pluginRootDir.c_str(), NULL);
}
// pluginsForAllUser.xml > doLocalConf.xml
// overriding _pluginRootDir
if (!pluginsForAllUserPath.empty())
{
_pluginRootDir = getSpecialFolderLocation(CSIDL_COMMON_APPDATA);
PathAppend(_pluginRootDir, TEXT("Notepad++"));
nppPluginRootParent = _pluginRootDir;
PathAppend(_pluginRootDir, TEXT("plugins"));
}
if (!PathFileExists(nppPluginRootParent.c_str()))
::CreateDirectory(nppPluginRootParent.c_str(), NULL);
if (!PathFileExists(_pluginRootDir.c_str()))
::CreateDirectory(_pluginRootDir.c_str(), NULL);
_sessionPath = _userPath; // Session stock the absolute file path, it should never be on cloud

1
PowerEditor/src/Parameters.h
View File

@ -121,6 +121,7 @@ const TCHAR fontSizeStrs[][3] = {TEXT(""), TEXT("5"), TEXT("6"), TEXT("7"), TEXT
const TCHAR localConfFile[] = TEXT("doLocalConf.xml");
const TCHAR notepadStyleFile[] = TEXT("asNotepad.xml");
const TCHAR pluginsForAllUsersFile[] = TEXT("pluginsForAllUsers.xml");
void cutString(const TCHAR *str2cut, std::vector<generic_string> & patternVect);