tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-26 23:34:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add logs for nul content corruption issue

Browse Source 
These logs are written for debugging NUL file-corruption issue (#6133) and session lost issue (#10402) which are still problematic probably.
The writting log info will be triggered only when Windows notifies Notepad++ to end session.
The log file will be in "%APPDATA%\Notepad++\" or in Notepad++ installation folder if doLocalConf.xml is present.
To disable the log, just remove nppLogNulContentCorruptionIssue.xml.

Close #10871
This commit is contained in:
Don Ho 2021-12-02 03:55:24 +01:00
parent 1039c10bae
commit acb8a9db47
18 changed files with 244 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
PowerEditor/bin/nppLogNulContentCorruptionIssue.xml Normal file
View File

2
PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
View File

@ -84,6 +84,8 @@ Function copyCommonFiles
SetOverwrite off SetOverwrite off
File "..\bin\shortcuts.xml" File "..\bin\shortcuts.xml"
; For debug logs
File "..\bin\nppLogNulContentCorruptionIssue.xml"
; Set Section Files and Shortcuts ; Set Section Files and Shortcuts

1
PowerEditor/installer/nsisInclude/uninstall.nsh
View File

@ -228,6 +228,7 @@ Section Uninstall
Delete "$INSTDIR\session.xml" Delete "$INSTDIR\session.xml"
Delete "$INSTDIR\nativeLang.xml" Delete "$INSTDIR\nativeLang.xml"
Delete "$INSTDIR\userDefineLang.xml" Delete "$INSTDIR\userDefineLang.xml"
Delete "$INSTDIR\nppLogNulContentCorruptionIssue.xml"
${endIf} ${endIf}
Delete "$INSTDIR\config.model.xml" Delete "$INSTDIR\config.model.xml"

12
PowerEditor/installer/packageAll.bat
View File

@ -105,6 +105,8 @@ copy /Y ..\src\shortcuts.xml .\minimalist\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ..\bin\doLocalConf.xml .\minimalist\ copy /Y ..\bin\doLocalConf.xml .\minimalist\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ..\bin\nppLogNulContentCorruptionIssue.xml .\minimalist\
If ErrorLevel 1 goto End
copy /Y ..\bin\"notepad++.exe" .\minimalist\ copy /Y ..\bin\"notepad++.exe" .\minimalist\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ".\themes\DarkModeDefault.xml" .\minimalist\themes\ copy /Y ".\themes\DarkModeDefault.xml" .\minimalist\themes\
@ -134,6 +136,8 @@ copy /Y ..\src\shortcuts.xml .\minimalist64\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ..\bin\doLocalConf.xml .\minimalist64\ copy /Y ..\bin\doLocalConf.xml .\minimalist64\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ..\bin\nppLogNulContentCorruptionIssue.xml .\minimalist64\
If ErrorLevel 1 goto End
copy /Y ..\bin64\"notepad++.exe" .\minimalist64\ copy /Y ..\bin64\"notepad++.exe" .\minimalist64\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ".\themes\DarkModeDefault.xml" .\minimalist64\themes\ copy /Y ".\themes\DarkModeDefault.xml" .\minimalist64\themes\
@ -163,6 +167,8 @@ copy /Y ..\src\shortcuts.xml .\minimalistArm64\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ..\bin\doLocalConf.xml .\minimalistArm64\ copy /Y ..\bin\doLocalConf.xml .\minimalistArm64\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ..\bin\nppLogNulContentCorruptionIssue.xml .\minimalistArm64\
If ErrorLevel 1 goto End
copy /Y ..\binarm64\"notepad++.exe" .\minimalistArm64\ copy /Y ..\binarm64\"notepad++.exe" .\minimalistArm64\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ".\themes\DarkModeDefault.xml" .\minimalistArm64\themes\ copy /Y ".\themes\DarkModeDefault.xml" .\minimalistArm64\themes\
@ -243,6 +249,8 @@ copy /Y ..\src\shortcuts.xml .\zipped.package.release\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ..\bin\doLocalConf.xml .\zipped.package.release\ copy /Y ..\bin\doLocalConf.xml .\zipped.package.release\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ..\bin\nppLogNulContentCorruptionIssue.xml .\zipped.package.release\
If ErrorLevel 1 goto End
copy /Y ..\bin\"notepad++.exe" .\zipped.package.release\ copy /Y ..\bin\"notepad++.exe" .\zipped.package.release\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
@ -264,6 +272,8 @@ copy /Y ..\src\shortcuts.xml .\zipped.package.release64\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ..\bin\doLocalConf.xml .\zipped.package.release64\ copy /Y ..\bin\doLocalConf.xml .\zipped.package.release64\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ..\bin\nppLogNulContentCorruptionIssue.xml .\zipped.package.release64\
If ErrorLevel 1 goto End
copy /Y ..\bin64\"notepad++.exe" .\zipped.package.release64\ copy /Y ..\bin64\"notepad++.exe" .\zipped.package.release64\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
@ -285,6 +295,8 @@ copy /Y ..\src\shortcuts.xml .\zipped.package.releaseArm64\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ..\bin\doLocalConf.xml .\zipped.package.releaseArm64\ copy /Y ..\bin\doLocalConf.xml .\zipped.package.releaseArm64\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End
copy /Y ..\bin\nppLogNulContentCorruptionIssue.xml .\zipped.package.releaseArm64\
If ErrorLevel 1 goto End
copy /Y ..\binarm64\"notepad++.exe" .\zipped.package.releaseArm64\ copy /Y ..\binarm64\"notepad++.exe" .\zipped.package.releaseArm64\
If ErrorLevel 1 goto End If ErrorLevel 1 goto End

15
PowerEditor/src/MISC/Common/Common.cpp
View File

@ -20,7 +20,6 @@
#include <cassert> #include <cassert>
#include <codecvt> #include <codecvt>
#include <locale> #include <locale>
#include "StaticDialog.h" #include "StaticDialog.h"
#include "CustomFileDialog.h" #include "CustomFileDialog.h"
@ -139,13 +138,16 @@ void writeLog(const TCHAR *logFileName, const char *log2write)
SYSTEMTIME currentTime = { 0 }; SYSTEMTIME currentTime = { 0 };
::GetLocalTime(&currentTime); ::GetLocalTime(&currentTime);
generic_string dateTimeStrW = getDateTimeStrFrom(TEXT("yyyy-MM-dd HH:mm:ss"), currentTime); generic_string dateTimeStrW = getDateTimeStrFrom(TEXT("yyyy-MM-dd HH:mm:ss"), currentTime);
std::string log2writeStr(dateTimeStrW.begin(), dateTimeStrW.end()); std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
std::string log2writeStr = converter.to_bytes(dateTimeStrW);
log2writeStr += " "; log2writeStr += " ";
log2writeStr += log2write; log2writeStr += log2write;
log2writeStr += "\n"; log2writeStr += "\n";
DWORD bytes_written = 0; DWORD bytes_written = 0;
::WriteFile(hFile, log2writeStr.c_str(), static_cast<DWORD>(log2writeStr.length()), &bytes_written, NULL); ::WriteFile(hFile, log2writeStr.c_str(), static_cast<DWORD>(log2writeStr.length()), &bytes_written, NULL);
::FlushFileBuffers(hFile);
} }
} }
@ -537,7 +539,6 @@ generic_string intToString(int val)
return generic_string(vt.rbegin(), vt.rend()); return generic_string(vt.rbegin(), vt.rend());
} }
generic_string uintToString(unsigned int val) generic_string uintToString(unsigned int val)
{ {
std::vector<TCHAR> vt; std::vector<TCHAR> vt;
@ -628,7 +629,7 @@ generic_string PathRemoveFileSpec(generic_string& path)
} }
generic_string PathAppend(generic_string& strDest, const generic_string& str2append) generic_string pathAppend(generic_string& strDest, const generic_string& str2append)
{ {
if (strDest.empty() && str2append.empty()) // "" + "" if (strDest.empty() && str2append.empty()) // "" + ""
{ {
@ -1283,7 +1284,7 @@ bool deleteFileOrFolder(const generic_string& f2delete)
void getFilesInFolder(std::vector<generic_string>& files, const generic_string& extTypeFilter, const generic_string& inFolder) void getFilesInFolder(std::vector<generic_string>& files, const generic_string& extTypeFilter, const generic_string& inFolder)
{ {
generic_string filter = inFolder; generic_string filter = inFolder;
PathAppend(filter, extTypeFilter); pathAppend(filter, extTypeFilter);
WIN32_FIND_DATA foundData; WIN32_FIND_DATA foundData;
HANDLE hFindFile = ::FindFirstFile(filter.c_str(), &foundData); HANDLE hFindFile = ::FindFirstFile(filter.c_str(), &foundData);
@ -1291,13 +1292,13 @@ void getFilesInFolder(std::vector<generic_string>& files, const generic_string&
if (hFindFile != INVALID_HANDLE_VALUE && !(foundData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) if (hFindFile != INVALID_HANDLE_VALUE && !(foundData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
{ {
generic_string foundFullPath = inFolder; generic_string foundFullPath = inFolder;
PathAppend(foundFullPath, foundData.cFileName); pathAppend(foundFullPath, foundData.cFileName);
files.push_back(foundFullPath); files.push_back(foundFullPath);
while (::FindNextFile(hFindFile, &foundData)) while (::FindNextFile(hFindFile, &foundData))
{ {
generic_string foundFullPath2 = inFolder; generic_string foundFullPath2 = inFolder;
PathAppend(foundFullPath2, foundData.cFileName); pathAppend(foundFullPath2, foundData.cFileName);
files.push_back(foundFullPath2); files.push_back(foundFullPath2);
} }
} }

2
PowerEditor/src/MISC/Common/Common.h
View File

@ -165,7 +165,7 @@ protected:
#define REBARBAND_SIZE sizeof(REBARBANDINFO) #define REBARBAND_SIZE sizeof(REBARBANDINFO)
generic_string PathRemoveFileSpec(generic_string & path); generic_string PathRemoveFileSpec(generic_string & path);
generic_string PathAppend(generic_string &strDest, const generic_string & str2append); generic_string pathAppend(generic_string &strDest, const generic_string & str2append);
COLORREF getCtrlBgColor(HWND hWnd); COLORREF getCtrlBgColor(HWND hWnd);
generic_string stringToUpper(generic_string strToConvert); generic_string stringToUpper(generic_string strToConvert);
generic_string stringToLower(generic_string strToConvert); generic_string stringToLower(generic_string strToConvert);

93
PowerEditor/src/MISC/Common/FileInterface.cpp
View File

@ -14,11 +14,11 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <locale>
#include <codecvt>
#include "FileInterface.h" #include "FileInterface.h"
#include "Parameters.h" #include "Parameters.h"
Win32_IO_File::Win32_IO_File(const char *fname) Win32_IO_File::Win32_IO_File(const char *fname)
{ {
if (fname) if (fname)
@ -33,40 +33,51 @@ Win32_IO_File::Win32_IO_File(const wchar_t *fname)
{ {
if (fname) if (fname)
{ {
generic_string fn = fname; std::wstring fn = fname;
_path = std::string(fn.begin(), fn.end()); std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
_path = converter.to_bytes(fn);
_hFile = ::CreateFileW(fname, _accessParam, _shareParam, NULL, _dispParam, _attribParam, NULL); _hFile = ::CreateFileW(fname, _accessParam, _shareParam, NULL, _dispParam, _attribParam, NULL);
NppParameters& nppParam = NppParameters::getInstance();
if (nppParam.isQueryEndSessionStarted() && nppParam.doNppLogNulContentCorruptionIssue())
{
generic_string issueFn = nppLogNulContentCorruptionIssue;
issueFn += TEXT(".log");
generic_string nppIssueLog = nppParam.getUserPath();
pathAppend(nppIssueLog, issueFn);
std::string msg = _path;
msg += " is opened.";
writeLog(nppIssueLog.c_str(), msg.c_str());
}
} }
} }
void Win32_IO_File::close() void Win32_IO_File::close()
{ {
if (isOpened()) if (isOpened())
{ {
if (_written) if (_written)
{ {
BOOL isOK = ::FlushFileBuffers(_hFile); ::FlushFileBuffers(_hFile);
if (!isOK)
{
if (NppParameters::getInstance().doNppLogNetworkDriveIssue())
{
generic_string nppLogNetworkDriveIssueLog = TEXT("c:\\temp\\");
nppLogNetworkDriveIssueLog += nppLogNetworkDriveIssue;
nppLogNetworkDriveIssueLog += TEXT(".log");
std::string msg = _path;
msg += " FlushFileBuffers call failed: ";
generic_string lastErrorMsg = GetLastErrorAsString(::GetLastError());
msg += std::string(lastErrorMsg.begin(), lastErrorMsg.end());
writeLog(nppLogNetworkDriveIssueLog.c_str(), msg.c_str());
} }
}
}
::CloseHandle(_hFile); ::CloseHandle(_hFile);
_hFile = INVALID_HANDLE_VALUE; _hFile = INVALID_HANDLE_VALUE;
NppParameters& nppParam = NppParameters::getInstance();
if (nppParam.isQueryEndSessionStarted() && nppParam.doNppLogNulContentCorruptionIssue())
{
generic_string issueFn = nppLogNulContentCorruptionIssue;
issueFn += TEXT(".log");
generic_string nppIssueLog = nppParam.getUserPath();
pathAppend(nppIssueLog, issueFn);
std::string msg = _path;
msg += " is closed.";
writeLog(nppIssueLog.c_str(), msg.c_str());
}
} }
} }
@ -81,7 +92,6 @@ int_fast64_t Win32_IO_File::getSize()
return static_cast<int_fast64_t>(r.QuadPart); return static_cast<int_fast64_t>(r.QuadPart);
} }
*/
unsigned long Win32_IO_File::read(void *rbuf, unsigned long buf_size) unsigned long Win32_IO_File::read(void *rbuf, unsigned long buf_size)
{ {
@ -95,6 +105,7 @@ unsigned long Win32_IO_File::read(void *rbuf, unsigned long buf_size)
return bytes_read; return bytes_read;
} }
*/
bool Win32_IO_File::write(const void *wbuf, unsigned long buf_size) bool Win32_IO_File::write(const void *wbuf, unsigned long buf_size)
{ {
@ -103,8 +114,44 @@ bool Win32_IO_File::write(const void *wbuf, unsigned long buf_size)
DWORD bytes_written = 0; DWORD bytes_written = 0;
NppParameters& nppParam = NppParameters::getInstance();
if (::WriteFile(_hFile, wbuf, buf_size, &bytes_written, NULL) == FALSE) if (::WriteFile(_hFile, wbuf, buf_size, &bytes_written, NULL) == FALSE)
{
if (nppParam.isQueryEndSessionStarted() && nppParam.doNppLogNulContentCorruptionIssue())
{
generic_string issueFn = nppLogNulContentCorruptionIssue;
issueFn += TEXT(".log");
generic_string nppIssueLog = nppParam.getUserPath();
pathAppend(nppIssueLog, issueFn);
std::string msg = _path;
msg += " written failed: ";
std::wstring lastErrorMsg = GetLastErrorAsString(::GetLastError());
std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
msg += converter.to_bytes(lastErrorMsg);
writeLog(nppIssueLog.c_str(), msg.c_str());
}
return false; return false;
}
else
{
if (nppParam.isQueryEndSessionStarted() && nppParam.doNppLogNulContentCorruptionIssue())
{
generic_string issueFn = nppLogNulContentCorruptionIssue;
issueFn += TEXT(".log");
generic_string nppIssueLog = nppParam.getUserPath();
pathAppend(nppIssueLog, issueFn);
std::string msg = _path;
msg += " ";
msg += std::to_string(bytes_written);
msg += "/";
msg += std::to_string(buf_size);
msg += " bytes are written.";
writeLog(nppIssueLog.c_str(), msg.c_str());
}
}
if (!_written) if (!_written)
_written = true; _written = true;

3
PowerEditor/src/MISC/Common/FileInterface.h
View File

@ -43,7 +43,8 @@ public:
void close(); void close();
//int_fast64_t getSize(); //int_fast64_t getSize();
unsigned long read(void *rbuf, unsigned long buf_size); //unsigned long read(void *rbuf, unsigned long buf_size);
bool write(const void *wbuf, unsigned long buf_size); bool write(const void *wbuf, unsigned long buf_size);
bool writeStr(const std::string& str) { bool writeStr(const std::string& str) {

12
PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
View File

@ -308,10 +308,10 @@ bool PluginsManager::loadPluginsV2(const TCHAR* dir)
else else
{ {
pluginsFolder = nppPath; pluginsFolder = nppPath;
PathAppend(pluginsFolder, TEXT("plugins")); pathAppend(pluginsFolder, TEXT("plugins"));
} }
generic_string pluginsFolderFilter = pluginsFolder; generic_string pluginsFolderFilter = pluginsFolder;
PathAppend(pluginsFolderFilter, TEXT("*.*")); pathAppend(pluginsFolderFilter, TEXT("*.*"));
WIN32_FIND_DATA foundData; WIN32_FIND_DATA foundData;
HANDLE hFindFolder = ::FindFirstFile(pluginsFolderFilter.c_str(), &foundData); HANDLE hFindFolder = ::FindFirstFile(pluginsFolderFilter.c_str(), &foundData);
@ -324,10 +324,10 @@ bool PluginsManager::loadPluginsV2(const TCHAR* dir)
if (foundFileName != TEXT(".") && foundFileName != TEXT("..") && generic_stricmp(foundFileName.c_str(), TEXT("Config")) != 0) if (foundFileName != TEXT(".") && foundFileName != TEXT("..") && generic_stricmp(foundFileName.c_str(), TEXT("Config")) != 0)
{ {
generic_string pluginsFullPathFilter = pluginsFolder; generic_string pluginsFullPathFilter = pluginsFolder;
PathAppend(pluginsFullPathFilter, foundFileName); pathAppend(pluginsFullPathFilter, foundFileName);
generic_string dllName = foundFileName; generic_string dllName = foundFileName;
dllName += TEXT(".dll"); dllName += TEXT(".dll");
PathAppend(pluginsFullPathFilter, dllName); pathAppend(pluginsFullPathFilter, dllName);
// get plugin // get plugin
hFindDll = ::FindFirstFile(pluginsFullPathFilter.c_str(), &foundData); hFindDll = ::FindFirstFile(pluginsFullPathFilter.c_str(), &foundData);
@ -346,11 +346,11 @@ bool PluginsManager::loadPluginsV2(const TCHAR* dir)
if (foundFileName2 != TEXT(".") && foundFileName2 != TEXT("..") && generic_stricmp(foundFileName2.c_str(), TEXT("Config")) != 0) if (foundFileName2 != TEXT(".") && foundFileName2 != TEXT("..") && generic_stricmp(foundFileName2.c_str(), TEXT("Config")) != 0)
{ {
generic_string pluginsFullPathFilter2 = pluginsFolder; generic_string pluginsFullPathFilter2 = pluginsFolder;
PathAppend(pluginsFullPathFilter2, foundFileName2); pathAppend(pluginsFullPathFilter2, foundFileName2);
generic_string pluginsFolderPath2 = pluginsFullPathFilter2; generic_string pluginsFolderPath2 = pluginsFullPathFilter2;
generic_string dllName2 = foundFileName2; generic_string dllName2 = foundFileName2;
dllName2 += TEXT(".dll"); dllName2 += TEXT(".dll");
PathAppend(pluginsFullPathFilter2, dllName2); pathAppend(pluginsFullPathFilter2, dllName2);
// get plugin // get plugin
if (hFindDll) if (hFindDll)

8
PowerEditor/src/Notepad_plus.cpp
View File

@ -6240,7 +6240,7 @@ vector<generic_string> Notepad_plus::addNppComponents(const TCHAR *destDir, cons
{ {
// Get plugins dir // Get plugins dir
generic_string destDirName = (NppParameters::getInstance()).getNppPath(); generic_string destDirName = (NppParameters::getInstance()).getNppPath();
PathAppend(destDirName, destDir); pathAppend(destDirName, destDir);
if (!::PathFileExists(destDirName.c_str())) if (!::PathFileExists(destDirName.c_str()))
{ {
@ -6297,12 +6297,12 @@ vector<generic_string> Notepad_plus::addNppPlugins(const TCHAR *extFilterName, c
continue; continue;
generic_string name = nameExt.substr(0, pos); generic_string name = nameExt.substr(0, pos);
PathAppend(destName, name); pathAppend(destName, name);
if (!::PathFileExists(destName.c_str())) if (!::PathFileExists(destName.c_str()))
{ {
::CreateDirectory(destName.c_str(), NULL); ::CreateDirectory(destName.c_str(), NULL);
} }
PathAppend(destName, nameExt); pathAppend(destName, nameExt);
if (::CopyFile(fns.at(i).c_str(), destName.c_str(), FALSE)) if (::CopyFile(fns.at(i).c_str(), destName.c_str(), FALSE))
copiedFiles.push_back(destName.c_str()); copiedFiles.push_back(destName.c_str());
@ -7752,7 +7752,7 @@ void Notepad_plus::refreshDarkMode(bool resetStyle)
if (NppDarkMode::isEnabled()) if (NppDarkMode::isEnabled())
{ {
themePath = themeSwitcher.getThemeDirPath(); themePath = themeSwitcher.getThemeDirPath();
PathAppend(themePath, darkModeXmlFileName); pathAppend(themePath, darkModeXmlFileName);
themeName = themeSwitcher.getThemeFromXmlFileName(themePath.c_str()); themeName = themeSwitcher.getThemeFromXmlFileName(themePath.c_str());
} }

8
PowerEditor/src/Notepad_plus_Window.cpp
View File

@ -203,7 +203,7 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin
LocalizationSwitcher & localizationSwitcher = nppParams.getLocalizationSwitcher(); LocalizationSwitcher & localizationSwitcher = nppParams.getLocalizationSwitcher();
std::wstring localizationDir = nppDir; std::wstring localizationDir = nppDir;
PathAppend(localizationDir, TEXT("localization\\")); pathAppend(localizationDir, TEXT("localization\\"));
_notepad_plus_plus_core.getMatchedFileNames(localizationDir.c_str(), patterns, fileNames, false, false); _notepad_plus_plus_core.getMatchedFileNames(localizationDir.c_str(), patterns, fileNames, false, false);
for (size_t i = 0, len = fileNames.size(); i < len; ++i) for (size_t i = 0, len = fileNames.size(); i < len; ++i)
@ -219,7 +219,7 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin
if (nppParams.getAppDataNppDir() && nppParams.getAppDataNppDir()[0]) if (nppParams.getAppDataNppDir() && nppParams.getAppDataNppDir()[0])
{ {
appDataThemeDir = nppParams.getAppDataNppDir(); appDataThemeDir = nppParams.getAppDataNppDir();
PathAppend(appDataThemeDir, TEXT("themes\\")); pathAppend(appDataThemeDir, TEXT("themes\\"));
_notepad_plus_plus_core.getMatchedFileNames(appDataThemeDir.c_str(), patterns, fileNames, false, false); _notepad_plus_plus_core.getMatchedFileNames(appDataThemeDir.c_str(), patterns, fileNames, false, false);
for (size_t i = 0, len = fileNames.size() ; i < len ; ++i) for (size_t i = 0, len = fileNames.size() ; i < len ; ++i)
{ {
@ -231,7 +231,7 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin
generic_string nppThemeDir; generic_string nppThemeDir;
nppThemeDir = nppDir.c_str(); // <- should use the pointer to avoid the constructor of copy nppThemeDir = nppDir.c_str(); // <- should use the pointer to avoid the constructor of copy
PathAppend(nppThemeDir, TEXT("themes\\")); pathAppend(nppThemeDir, TEXT("themes\\"));
// Set theme directory to their installation directory // Set theme directory to their installation directory
themeSwitcher.setThemeDirPath(nppThemeDir); themeSwitcher.setThemeDirPath(nppThemeDir);
@ -254,7 +254,7 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin
} }
TCHAR* fn = PathFindFileName(fileNames[i].c_str()); TCHAR* fn = PathFindFileName(fileNames[i].c_str());
PathAppend(appDataThemePath, fn); pathAppend(appDataThemePath, fn);
themeSwitcher.addThemeStylerSavePath(fileNames[i], appDataThemePath); themeSwitcher.addThemeStylerSavePath(fileNames[i], appDataThemePath);
} }
} }

36
PowerEditor/src/NppBigSwitch.cpp
View File

@ -1915,6 +1915,22 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
case WM_QUERYENDSESSION: case WM_QUERYENDSESSION:
case WM_CLOSE: case WM_CLOSE:
{ {
NppParameters& nppParam = NppParameters::getInstance();
if (message == WM_QUERYENDSESSION)
{
nppParam.queryEndSessionStart();
}
if (nppParam.isQueryEndSessionStarted() && nppParam.doNppLogNulContentCorruptionIssue())
{
generic_string issueFn = nppLogNulContentCorruptionIssue;
issueFn += TEXT(".log");
generic_string nppIssueLog = nppParam.getUserPath();
pathAppend(nppIssueLog, issueFn);
writeLog(nppIssueLog.c_str(), "WM_QUERYENDSESSION =====================================");
}
if (_pPublicInterface->isPrelaunch()) if (_pPublicInterface->isPrelaunch())
{ {
SendMessage(hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); SendMessage(hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0);
@ -2046,6 +2062,16 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
case WM_ENDSESSION: case WM_ENDSESSION:
{ {
if (NppParameters::getInstance().doNppLogNulContentCorruptionIssue())
{
generic_string issueFn = nppLogNulContentCorruptionIssue;
issueFn += TEXT(".log");
generic_string nppIssueLog = nppParam.getUserPath();
pathAppend(nppIssueLog, issueFn);
writeLog(nppIssueLog.c_str(), "WM_ENDSESSION");
}
if (wParam == TRUE) if (wParam == TRUE)
{ {
::DestroyWindow(hwnd); ::DestroyWindow(hwnd);
@ -2059,6 +2085,16 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
case WM_DESTROY: case WM_DESTROY:
{ {
if (NppParameters::getInstance().doNppLogNulContentCorruptionIssue())
{
generic_string issueFn = nppLogNulContentCorruptionIssue;
issueFn += TEXT(".log");
generic_string nppIssueLog = nppParam.getUserPath();
pathAppend(nppIssueLog, issueFn);
writeLog(nppIssueLog.c_str(), "WM_DESTROY");
}
killAllChildren(); killAllChildren();
::PostQuitMessage(0); ::PostQuitMessage(0);
_pPublicInterface->gNppHWND = NULL; _pPublicInterface->gNppHWND = NULL;

4
PowerEditor/src/NppCommands.cpp
View File

@ -3230,10 +3230,10 @@ void Notepad_plus::command(int id)
else else
{ {
generic_string updaterDir = (NppParameters::getInstance()).getNppPath(); generic_string updaterDir = (NppParameters::getInstance()).getNppPath();
PathAppend(updaterDir, TEXT("updater")); pathAppend(updaterDir, TEXT("updater"));
generic_string updaterFullPath = updaterDir; generic_string updaterFullPath = updaterDir;
PathAppend(updaterFullPath, TEXT("gup.exe")); pathAppend(updaterFullPath, TEXT("gup.exe"));
#ifdef DEBUG // if not debug, then it's release #ifdef DEBUG // if not debug, then it's release

106
PowerEditor/src/Parameters.cpp
View File

@ -873,7 +873,7 @@ NppParameters::NppParameters()
_appdataNppDir.clear(); _appdataNppDir.clear();
generic_string notepadStylePath(_nppPath); generic_string notepadStylePath(_nppPath);
PathAppend(notepadStylePath, notepadStyleFile); pathAppend(notepadStylePath, notepadStyleFile);
_asNotepadStyle = (PathFileExists(notepadStylePath.c_str()) == TRUE); _asNotepadStyle = (PathFileExists(notepadStylePath.c_str()) == TRUE);
@ -951,7 +951,7 @@ bool NppParameters::reloadLang()
if (!PathFileExists(nativeLangPath.c_str())) if (!PathFileExists(nativeLangPath.c_str()))
{ {
nativeLangPath = _nppPath; nativeLangPath = _nppPath;
PathAppend(nativeLangPath, generic_string(TEXT("nativeLang.xml"))); pathAppend(nativeLangPath, generic_string(TEXT("nativeLang.xml")));
if (!PathFileExists(nativeLangPath.c_str())) if (!PathFileExists(nativeLangPath.c_str()))
return false; return false;
} }
@ -994,7 +994,7 @@ generic_string NppParameters::getSettingsFolder()
if (settingsFolderPath.empty()) if (settingsFolderPath.empty())
return _nppPath; return _nppPath;
PathAppend(settingsFolderPath, TEXT("Notepad++")); pathAppend(settingsFolderPath, TEXT("Notepad++"));
return settingsFolderPath; return settingsFolderPath;
} }
@ -1008,7 +1008,7 @@ bool NppParameters::load()
// Make localConf.xml path // Make localConf.xml path
generic_string localConfPath(_nppPath); generic_string localConfPath(_nppPath);
PathAppend(localConfPath, localConfFile); pathAppend(localConfPath, localConfFile);
// Test if localConf.xml exist // Test if localConf.xml exist
_isLocal = (PathFileExists(localConfPath.c_str()) == TRUE); _isLocal = (PathFileExists(localConfPath.c_str()) == TRUE);
@ -1031,7 +1031,7 @@ bool NppParameters::load()
} }
_pluginRootDir = _nppPath; _pluginRootDir = _nppPath;
PathAppend(_pluginRootDir, TEXT("plugins")); pathAppend(_pluginRootDir, TEXT("plugins"));
// //
// the 3rd priority: general default configuration // the 3rd priority: general default configuration
@ -1041,21 +1041,21 @@ bool NppParameters::load()
{ {
_userPath = nppPluginRootParent = _nppPath; _userPath = nppPluginRootParent = _nppPath;
_userPluginConfDir = _pluginRootDir; _userPluginConfDir = _pluginRootDir;
PathAppend(_userPluginConfDir, TEXT("Config")); pathAppend(_userPluginConfDir, TEXT("Config"));
} }
else else
{ {
_userPath = getSpecialFolderLocation(CSIDL_APPDATA); _userPath = getSpecialFolderLocation(CSIDL_APPDATA);
PathAppend(_userPath, TEXT("Notepad++")); pathAppend(_userPath, TEXT("Notepad++"));
if (!PathFileExists(_userPath.c_str())) if (!PathFileExists(_userPath.c_str()))
::CreateDirectory(_userPath.c_str(), NULL); ::CreateDirectory(_userPath.c_str(), NULL);
_appdataNppDir = _userPluginConfDir = _userPath; _appdataNppDir = _userPluginConfDir = _userPath;
PathAppend(_userPluginConfDir, TEXT("plugins")); pathAppend(_userPluginConfDir, TEXT("plugins"));
if (!PathFileExists(_userPluginConfDir.c_str())) if (!PathFileExists(_userPluginConfDir.c_str()))
::CreateDirectory(_userPluginConfDir.c_str(), NULL); ::CreateDirectory(_userPluginConfDir.c_str(), NULL);
PathAppend(_userPluginConfDir, TEXT("Config")); pathAppend(_userPluginConfDir, TEXT("Config"));
if (!PathFileExists(_userPluginConfDir.c_str())) if (!PathFileExists(_userPluginConfDir.c_str()))
::CreateDirectory(_userPluginConfDir.c_str(), NULL); ::CreateDirectory(_userPluginConfDir.c_str(), NULL);
@ -1064,7 +1064,7 @@ bool NppParameters::load()
} }
_pluginConfDir = _pluginRootDir; // for plugin list home _pluginConfDir = _pluginRootDir; // for plugin list home
PathAppend(_pluginConfDir, TEXT("Config")); pathAppend(_pluginConfDir, TEXT("Config"));
if (!PathFileExists(nppPluginRootParent.c_str())) if (!PathFileExists(nppPluginRootParent.c_str()))
::CreateDirectory(nppPluginRootParent.c_str(), NULL); ::CreateDirectory(nppPluginRootParent.c_str(), NULL);
@ -1134,7 +1134,7 @@ bool NppParameters::load()
// langs.xml : for per user // // langs.xml : for per user //
//--------------------------// //--------------------------//
generic_string langs_xml_path(_userPath); generic_string langs_xml_path(_userPath);
PathAppend(langs_xml_path, TEXT("langs.xml")); pathAppend(langs_xml_path, TEXT("langs.xml"));
BOOL doRecover = FALSE; BOOL doRecover = FALSE;
if (::PathFileExists(langs_xml_path.c_str())) if (::PathFileExists(langs_xml_path.c_str()))
@ -1166,7 +1166,7 @@ bool NppParameters::load()
if (doRecover) if (doRecover)
{ {
generic_string srcLangsPath(_nppPath); generic_string srcLangsPath(_nppPath);
PathAppend(srcLangsPath, TEXT("langs.model.xml")); pathAppend(srcLangsPath, TEXT("langs.model.xml"));
::CopyFile(srcLangsPath.c_str(), langs_xml_path.c_str(), FALSE); ::CopyFile(srcLangsPath.c_str(), langs_xml_path.c_str(), FALSE);
} }
@ -1200,10 +1200,10 @@ bool NppParameters::load()
// config.xml : for per user // // config.xml : for per user //
//---------------------------// //---------------------------//
generic_string configPath(_userPath); generic_string configPath(_userPath);
PathAppend(configPath, TEXT("config.xml")); pathAppend(configPath, TEXT("config.xml"));
generic_string srcConfigPath(_nppPath); generic_string srcConfigPath(_nppPath);
PathAppend(srcConfigPath, TEXT("config.model.xml")); pathAppend(srcConfigPath, TEXT("config.model.xml"));
if (!::PathFileExists(configPath.c_str())) if (!::PathFileExists(configPath.c_str()))
::CopyFile(srcConfigPath.c_str(), configPath.c_str(), FALSE); ::CopyFile(srcConfigPath.c_str(), configPath.c_str(), FALSE);
@ -1226,12 +1226,12 @@ bool NppParameters::load()
//----------------------------// //----------------------------//
_stylerPath = _userPath; _stylerPath = _userPath;
PathAppend(_stylerPath, TEXT("stylers.xml")); pathAppend(_stylerPath, TEXT("stylers.xml"));
if (!PathFileExists(_stylerPath.c_str())) if (!PathFileExists(_stylerPath.c_str()))
{ {
generic_string srcStylersPath(_nppPath); generic_string srcStylersPath(_nppPath);
PathAppend(srcStylersPath, TEXT("stylers.model.xml")); pathAppend(srcStylersPath, TEXT("stylers.model.xml"));
::CopyFile(srcStylersPath.c_str(), _stylerPath.c_str(), TRUE); ::CopyFile(srcStylersPath.c_str(), _stylerPath.c_str(), TRUE);
} }
@ -1273,8 +1273,8 @@ bool NppParameters::load()
// userDefineLang.xml : for per user // // userDefineLang.xml : for per user //
//-----------------------------------// //-----------------------------------//
_userDefineLangsFolderPath = _userDefineLangPath = _userPath; _userDefineLangsFolderPath = _userDefineLangPath = _userPath;
PathAppend(_userDefineLangPath, TEXT("userDefineLang.xml")); pathAppend(_userDefineLangPath, TEXT("userDefineLang.xml"));
PathAppend(_userDefineLangsFolderPath, TEXT("userDefineLangs")); pathAppend(_userDefineLangsFolderPath, TEXT("userDefineLangs"));
std::vector<generic_string> udlFiles; std::vector<generic_string> udlFiles;
getFilesInFolder(udlFiles, TEXT("*.xml"), _userDefineLangsFolderPath); getFilesInFolder(udlFiles, TEXT("*.xml"), _userDefineLangsFolderPath);
@ -1318,7 +1318,7 @@ bool NppParameters::load()
generic_string nativeLangPath; generic_string nativeLangPath;
nativeLangPath = _userPath; nativeLangPath = _userPath;
PathAppend(nativeLangPath, TEXT("nativeLang.xml")); pathAppend(nativeLangPath, TEXT("nativeLang.xml"));
// LocalizationSwitcher should use always user path // LocalizationSwitcher should use always user path
_localizationSwitcher._nativeLangPath = nativeLangPath; _localizationSwitcher._nativeLangPath = nativeLangPath;
@ -1327,15 +1327,15 @@ bool NppParameters::load()
{ {
// overwrite nativeLangPath variable // overwrite nativeLangPath variable
nativeLangPath = _nppPath; nativeLangPath = _nppPath;
PathAppend(nativeLangPath, TEXT("localization\\")); pathAppend(nativeLangPath, TEXT("localization\\"));
PathAppend(nativeLangPath, _startWithLocFileName); pathAppend(nativeLangPath, _startWithLocFileName);
} }
else // use %appdata% location, or (if absence then) npp installed location else // use %appdata% location, or (if absence then) npp installed location
{ {
if (!PathFileExists(nativeLangPath.c_str())) if (!PathFileExists(nativeLangPath.c_str()))
{ {
nativeLangPath = _nppPath; nativeLangPath = _nppPath;
PathAppend(nativeLangPath, TEXT("nativeLang.xml")); pathAppend(nativeLangPath, TEXT("nativeLang.xml"));
} }
} }
@ -1354,7 +1354,7 @@ bool NppParameters::load()
// toolbarIcons.xml : for per user // // toolbarIcons.xml : for per user //
//---------------------------------// //---------------------------------//
generic_string toolbarIconsPath(_userPath); generic_string toolbarIconsPath(_userPath);
PathAppend(toolbarIconsPath, TEXT("toolbarIcons.xml")); pathAppend(toolbarIconsPath, TEXT("toolbarIcons.xml"));
_pXmlToolIconsDoc = new TiXmlDocument(toolbarIconsPath); _pXmlToolIconsDoc = new TiXmlDocument(toolbarIconsPath);
loadOkay = _pXmlToolIconsDoc->LoadFile(); loadOkay = _pXmlToolIconsDoc->LoadFile();
@ -1369,12 +1369,12 @@ bool NppParameters::load()
// shortcuts.xml : for per user // // shortcuts.xml : for per user //
//------------------------------// //------------------------------//
_shortcutsPath = _userPath; _shortcutsPath = _userPath;
PathAppend(_shortcutsPath, TEXT("shortcuts.xml")); pathAppend(_shortcutsPath, TEXT("shortcuts.xml"));
if (!PathFileExists(_shortcutsPath.c_str())) if (!PathFileExists(_shortcutsPath.c_str()))
{ {
generic_string srcShortcutsPath(_nppPath); generic_string srcShortcutsPath(_nppPath);
PathAppend(srcShortcutsPath, TEXT("shortcuts.xml")); pathAppend(srcShortcutsPath, TEXT("shortcuts.xml"));
::CopyFile(srcShortcutsPath.c_str(), _shortcutsPath.c_str(), TRUE); ::CopyFile(srcShortcutsPath.c_str(), _shortcutsPath.c_str(), TRUE);
} }
@ -1402,12 +1402,12 @@ bool NppParameters::load()
// contextMenu.xml : for per user // // contextMenu.xml : for per user //
//---------------------------------// //---------------------------------//
_contextMenuPath = _userPath; _contextMenuPath = _userPath;
PathAppend(_contextMenuPath, TEXT("contextMenu.xml")); pathAppend(_contextMenuPath, TEXT("contextMenu.xml"));
if (!PathFileExists(_contextMenuPath.c_str())) if (!PathFileExists(_contextMenuPath.c_str()))
{ {
generic_string srcContextMenuPath(_nppPath); generic_string srcContextMenuPath(_nppPath);
PathAppend(srcContextMenuPath, TEXT("contextMenu.xml")); pathAppend(srcContextMenuPath, TEXT("contextMenu.xml"));
::CopyFile(srcContextMenuPath.c_str(), _contextMenuPath.c_str(), TRUE); ::CopyFile(srcContextMenuPath.c_str(), _contextMenuPath.c_str(), TRUE);
} }
@ -1425,7 +1425,7 @@ bool NppParameters::load()
// session.xml : for per user // // session.xml : for per user //
//----------------------------// //----------------------------//
PathAppend(_sessionPath, TEXT("session.xml")); pathAppend(_sessionPath, TEXT("session.xml"));
// Don't load session.xml if not required in order to speed up!! // Don't load session.xml if not required in order to speed up!!
const NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI(); const NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI();
@ -1452,7 +1452,7 @@ bool NppParameters::load()
// manually in order to set selected text's foreground color. // // manually in order to set selected text's foreground color. //
//-------------------------------------------------------------// //-------------------------------------------------------------//
generic_string enableSelectFgColorPath = _userPath; generic_string enableSelectFgColorPath = _userPath;
PathAppend(enableSelectFgColorPath, TEXT("enableSelectFgColor.xml")); pathAppend(enableSelectFgColorPath, TEXT("enableSelectFgColor.xml"));
if (PathFileExists(enableSelectFgColorPath.c_str())) if (PathFileExists(enableSelectFgColorPath.c_str()))
{ {
@ -1460,19 +1460,33 @@ bool NppParameters::load()
} }
generic_string nppLogNetworkDriveIssueFilePath(_nppPath); generic_string filePath, filePath2, issueFileName;
generic_string nppLogNetworkDriveIssueFile = nppLogNetworkDriveIssue;
nppLogNetworkDriveIssueFile += TEXT(".xml"); filePath = _nppPath;
PathAppend(nppLogNetworkDriveIssueFilePath, nppLogNetworkDriveIssueFile); issueFileName = nppLogNetworkDriveIssue;
bool doNppLogNetworkDriveIssue = (PathFileExists(nppLogNetworkDriveIssueFilePath.c_str()) == TRUE); issueFileName += TEXT(".xml");
if (!doNppLogNetworkDriveIssue) pathAppend(filePath, issueFileName);
_doNppLogNetworkDriveIssue = (PathFileExists(filePath.c_str()) == TRUE);
if (!_doNppLogNetworkDriveIssue)
{ {
generic_string nppLogNetworkDriveIssueFilePath2(_userPath); filePath2 = _userPath;
PathAppend(nppLogNetworkDriveIssueFilePath2, nppLogNetworkDriveIssueFile); pathAppend(filePath2, issueFileName);
doNppLogNetworkDriveIssue = (PathFileExists(nppLogNetworkDriveIssueFilePath2.c_str()) == TRUE); _doNppLogNetworkDriveIssue = (PathFileExists(filePath2.c_str()) == TRUE);
} }
_doNppLogNetworkDriveIssue = doNppLogNetworkDriveIssue; filePath = _nppPath;
issueFileName = nppLogNulContentCorruptionIssue;
issueFileName += TEXT(".xml");
pathAppend(filePath, issueFileName);
_doNppLogNulContentCorruptionIssue = (PathFileExists(filePath.c_str()) == TRUE);
if (!_doNppLogNulContentCorruptionIssue)
{
filePath2 = _userPath;
pathAppend(filePath2, issueFileName);
_doNppLogNulContentCorruptionIssue = (PathFileExists(filePath2.c_str()) == TRUE);
}
return isAllLaoded; return isAllLaoded;
@ -2942,7 +2956,7 @@ bool NppParameters::writeSettingsFilesOnCloudForThe1stTime(const generic_string
// config.xml // config.xml
generic_string cloudConfigPath = cloudSettingsPath; generic_string cloudConfigPath = cloudSettingsPath;
PathAppend(cloudConfigPath, TEXT("config.xml")); pathAppend(cloudConfigPath, TEXT("config.xml"));
if (!::PathFileExists(cloudConfigPath.c_str()) && _pXmlUserDoc) if (!::PathFileExists(cloudConfigPath.c_str()) && _pXmlUserDoc)
{ {
isOK = _pXmlUserDoc->SaveFile(cloudConfigPath.c_str()); isOK = _pXmlUserDoc->SaveFile(cloudConfigPath.c_str());
@ -2952,7 +2966,7 @@ bool NppParameters::writeSettingsFilesOnCloudForThe1stTime(const generic_string
// stylers.xml // stylers.xml
generic_string cloudStylersPath = cloudSettingsPath; generic_string cloudStylersPath = cloudSettingsPath;
PathAppend(cloudStylersPath, TEXT("stylers.xml")); pathAppend(cloudStylersPath, TEXT("stylers.xml"));
if (!::PathFileExists(cloudStylersPath.c_str()) && _pXmlUserStylerDoc) if (!::PathFileExists(cloudStylersPath.c_str()) && _pXmlUserStylerDoc)
{ {
isOK = _pXmlUserStylerDoc->SaveFile(cloudStylersPath.c_str()); isOK = _pXmlUserStylerDoc->SaveFile(cloudStylersPath.c_str());
@ -2962,7 +2976,7 @@ bool NppParameters::writeSettingsFilesOnCloudForThe1stTime(const generic_string
// langs.xml // langs.xml
generic_string cloudLangsPath = cloudSettingsPath; generic_string cloudLangsPath = cloudSettingsPath;
PathAppend(cloudLangsPath, TEXT("langs.xml")); pathAppend(cloudLangsPath, TEXT("langs.xml"));
if (!::PathFileExists(cloudLangsPath.c_str()) && _pXmlUserDoc) if (!::PathFileExists(cloudLangsPath.c_str()) && _pXmlUserDoc)
{ {
isOK = _pXmlDoc->SaveFile(cloudLangsPath.c_str()); isOK = _pXmlDoc->SaveFile(cloudLangsPath.c_str());
@ -2972,7 +2986,7 @@ bool NppParameters::writeSettingsFilesOnCloudForThe1stTime(const generic_string
// userDefineLang.xml // userDefineLang.xml
generic_string cloudUserLangsPath = cloudSettingsPath; generic_string cloudUserLangsPath = cloudSettingsPath;
PathAppend(cloudUserLangsPath, TEXT("userDefineLang.xml")); pathAppend(cloudUserLangsPath, TEXT("userDefineLang.xml"));
if (!::PathFileExists(cloudUserLangsPath.c_str()) && _pXmlUserLangDoc) if (!::PathFileExists(cloudUserLangsPath.c_str()) && _pXmlUserLangDoc)
{ {
isOK = _pXmlUserLangDoc->SaveFile(cloudUserLangsPath.c_str()); isOK = _pXmlUserLangDoc->SaveFile(cloudUserLangsPath.c_str());
@ -2982,7 +2996,7 @@ bool NppParameters::writeSettingsFilesOnCloudForThe1stTime(const generic_string
// shortcuts.xml // shortcuts.xml
generic_string cloudShortcutsPath = cloudSettingsPath; generic_string cloudShortcutsPath = cloudSettingsPath;
PathAppend(cloudShortcutsPath, TEXT("shortcuts.xml")); pathAppend(cloudShortcutsPath, TEXT("shortcuts.xml"));
if (!::PathFileExists(cloudShortcutsPath.c_str()) && _pXmlShortcutDoc) if (!::PathFileExists(cloudShortcutsPath.c_str()) && _pXmlShortcutDoc)
{ {
isOK = _pXmlShortcutDoc->SaveFile(cloudShortcutsPath.c_str()); isOK = _pXmlShortcutDoc->SaveFile(cloudShortcutsPath.c_str());
@ -2992,7 +3006,7 @@ bool NppParameters::writeSettingsFilesOnCloudForThe1stTime(const generic_string
// contextMenu.xml // contextMenu.xml
generic_string cloudContextMenuPath = cloudSettingsPath; generic_string cloudContextMenuPath = cloudSettingsPath;
PathAppend(cloudContextMenuPath, TEXT("contextMenu.xml")); pathAppend(cloudContextMenuPath, TEXT("contextMenu.xml"));
if (!::PathFileExists(cloudContextMenuPath.c_str()) && _pXmlContextMenuDocA) if (!::PathFileExists(cloudContextMenuPath.c_str()) && _pXmlContextMenuDocA)
{ {
isOK = _pXmlContextMenuDocA->SaveUnicodeFilePath(cloudContextMenuPath.c_str()); isOK = _pXmlContextMenuDocA->SaveUnicodeFilePath(cloudContextMenuPath.c_str());
@ -3002,7 +3016,7 @@ bool NppParameters::writeSettingsFilesOnCloudForThe1stTime(const generic_string
// nativeLang.xml // nativeLang.xml
generic_string cloudNativeLangPath = cloudSettingsPath; generic_string cloudNativeLangPath = cloudSettingsPath;
PathAppend(cloudNativeLangPath, TEXT("nativeLang.xml")); pathAppend(cloudNativeLangPath, TEXT("nativeLang.xml"));
if (!::PathFileExists(cloudNativeLangPath.c_str()) && _pXmlNativeLangDocA) if (!::PathFileExists(cloudNativeLangPath.c_str()) && _pXmlNativeLangDocA)
{ {
isOK = _pXmlNativeLangDocA->SaveUnicodeFilePath(cloudNativeLangPath.c_str()); isOK = _pXmlNativeLangDocA->SaveUnicodeFilePath(cloudNativeLangPath.c_str());

8
PowerEditor/src/Parameters.h
View File

@ -134,7 +134,9 @@ const TCHAR fontSizeStrs[][3] = {TEXT(""), TEXT("5"), TEXT("6"), TEXT("7"), TEXT
const TCHAR localConfFile[] = TEXT("doLocalConf.xml"); const TCHAR localConfFile[] = TEXT("doLocalConf.xml");
const TCHAR notepadStyleFile[] = TEXT("asNotepad.xml"); const TCHAR notepadStyleFile[] = TEXT("asNotepad.xml");
// issue xml/log file name
const TCHAR nppLogNetworkDriveIssue[] = TEXT("nppLogNetworkDriveIssue"); const TCHAR nppLogNetworkDriveIssue[] = TEXT("nppLogNetworkDriveIssue");
const TCHAR nppLogNulContentCorruptionIssue[] = TEXT("nppLogNulContentCorruptionIssue");
void cutString(const TCHAR *str2cut, std::vector<generic_string> & patternVect); void cutString(const TCHAR *str2cut, std::vector<generic_string> & patternVect);
@ -1801,6 +1803,9 @@ private:
bool _doNppLogNetworkDriveIssue = false; bool _doNppLogNetworkDriveIssue = false;
bool _doNppLogNulContentCorruptionIssue = false;
bool _isQueryEndSessionStarted = false;
public: public:
generic_string getWingupFullPath() const { return _wingupFullPath; }; generic_string getWingupFullPath() const { return _wingupFullPath; };
generic_string getWingupParams() const { return _wingupParams; }; generic_string getWingupParams() const { return _wingupParams; };
@ -1812,6 +1817,9 @@ public:
void setElevationRequired(bool val2set) { _isElevationRequired = val2set; }; void setElevationRequired(bool val2set) { _isElevationRequired = val2set; };
bool doNppLogNetworkDriveIssue() { return _doNppLogNetworkDriveIssue; }; bool doNppLogNetworkDriveIssue() { return _doNppLogNetworkDriveIssue; };
bool doNppLogNulContentCorruptionIssue() { return _doNppLogNulContentCorruptionIssue; };
void queryEndSessionStart() { _isQueryEndSessionStarted = true; };
bool isQueryEndSessionStarted() { return _isQueryEndSessionStarted; };
private: private:
void getLangKeywordsFromXmlTree(); void getLangKeywordsFromXmlTree();

33
PowerEditor/src/ScintillaComponent/Buffer.cpp
View File

@ -17,6 +17,8 @@
#include <deque> #include <deque>
#include <algorithm> #include <algorithm>
#include <time.h> #include <time.h>
#include <locale>
#include <codecvt>
#include <sys/stat.h> #include <sys/stat.h>
#include "Buffer.h" #include "Buffer.h"
#include "Scintilla.h" #include "Scintilla.h"
@ -27,6 +29,7 @@
#include "uchardet.h" #include "uchardet.h"
#include "FileInterface.h" #include "FileInterface.h"
static const int blockSize = 128 * 1024 + 4; static const int blockSize = 128 * 1024 + 4;
static const int CR = 0x0D; static const int CR = 0x0D;
static const int LF = 0x0A; static const int LF = 0x0A;
@ -149,17 +152,20 @@ void Buffer::updateTimeStamp()
{ {
if (res == 1) if (res == 1)
{ {
if (NppParameters::getInstance().doNppLogNetworkDriveIssue()) NppParameters& nppParam = NppParameters::getInstance();
if (nppParam.doNppLogNetworkDriveIssue())
{ {
generic_string nppLogNetworkDriveIssueLog = TEXT("c:\\temp\\"); generic_string issueFn = nppLogNetworkDriveIssue;
nppLogNetworkDriveIssueLog += nppLogNetworkDriveIssue; issueFn += TEXT(".log");
nppLogNetworkDriveIssueLog += TEXT(".log"); generic_string nppIssueLog = nppParam.getUserPath();
pathAppend(nppIssueLog, issueFn);
std::string msg = std::string(_fullPathName.begin(), _fullPathName.end()); std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
std::string msg = converter.to_bytes(_fullPathName);
char buf[1024]; char buf[1024];
sprintf(buf, " in updateTimeStamp(): timeStampLive (%u/%u) < _timeStamp (%u/%u)", timeStampLive.dwLowDateTime, timeStampLive.dwHighDateTime, _timeStamp.dwLowDateTime, _timeStamp.dwHighDateTime); sprintf(buf, " in updateTimeStamp(): timeStampLive (%u/%u) < _timeStamp (%u/%u)", timeStampLive.dwLowDateTime, timeStampLive.dwHighDateTime, _timeStamp.dwLowDateTime, _timeStamp.dwHighDateTime);
msg += buf; msg += buf;
writeLog(nppLogNetworkDriveIssueLog.c_str(), msg.c_str()); writeLog(nppIssueLog.c_str(), msg.c_str());
} }
} }
_timeStamp = timeStampLive; _timeStamp = timeStampLive;
@ -297,17 +303,20 @@ bool Buffer::checkFileState() // returns true if the status has been changed (it
{ {
if (res == 1) if (res == 1)
{ {
if (NppParameters::getInstance().doNppLogNetworkDriveIssue()) NppParameters& nppParam = NppParameters::getInstance();
if (nppParam.doNppLogNetworkDriveIssue())
{ {
generic_string nppLogNetworkDriveIssueLog = TEXT("c:\\temp\\"); generic_string issueFn = nppLogNetworkDriveIssue;
nppLogNetworkDriveIssueLog += nppLogNetworkDriveIssue; issueFn += TEXT(".log");
nppLogNetworkDriveIssueLog += TEXT(".log"); generic_string nppIssueLog = nppParam.getUserPath();
pathAppend(nppIssueLog, issueFn);
std::string msg = std::string(_fullPathName.begin(), _fullPathName.end()); std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
std::string msg = converter.to_bytes(_fullPathName);
char buf[1024]; char buf[1024];
sprintf(buf, " in checkFileState(): attributes.ftLastWriteTime (%u/%u) < _timeStamp (%u/%u)", attributes.ftLastWriteTime.dwLowDateTime, attributes.ftLastWriteTime.dwHighDateTime, _timeStamp.dwLowDateTime, _timeStamp.dwHighDateTime); sprintf(buf, " in checkFileState(): attributes.ftLastWriteTime (%u/%u) < _timeStamp (%u/%u)", attributes.ftLastWriteTime.dwLowDateTime, attributes.ftLastWriteTime.dwHighDateTime, _timeStamp.dwLowDateTime, _timeStamp.dwHighDateTime);
msg += buf; msg += buf;
writeLog(nppLogNetworkDriveIssueLog.c_str(), msg.c_str()); writeLog(nppIssueLog.c_str(), msg.c_str());
} }
} }
_timeStamp = attributes.ftLastWriteTime; _timeStamp = attributes.ftLastWriteTime;

6
PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
View File

@ -490,10 +490,10 @@ void FunctionListPanel::init(HINSTANCE hInst, HWND hPere, ScintillaEditView **pp
NppParameters& nppParams = NppParameters::getInstance(); NppParameters& nppParams = NppParameters::getInstance();
generic_string funcListXmlPath = nppParams.getUserPath(); generic_string funcListXmlPath = nppParams.getUserPath();
PathAppend(funcListXmlPath, TEXT("functionList")); pathAppend(funcListXmlPath, TEXT("functionList"));
generic_string funcListDefaultXmlPath = nppParams.getNppPath(); generic_string funcListDefaultXmlPath = nppParams.getNppPath();
PathAppend(funcListDefaultXmlPath, TEXT("functionList")); pathAppend(funcListDefaultXmlPath, TEXT("functionList"));
bool doLocalConf = nppParams.isLocal(); bool doLocalConf = nppParams.isLocal();
@ -515,7 +515,7 @@ void FunctionListPanel::init(HINSTANCE hInst, HWND hPere, ScintillaEditView **pp
else else
{ {
generic_string funcListDefaultXmlPath = nppParams.getNppPath(); generic_string funcListDefaultXmlPath = nppParams.getNppPath();
PathAppend(funcListDefaultXmlPath, TEXT("functionList")); pathAppend(funcListDefaultXmlPath, TEXT("functionList"));
if (PathFileExists(funcListDefaultXmlPath.c_str())) if (PathFileExists(funcListDefaultXmlPath.c_str()))
{ {
_funcParserMgr.init(funcListDefaultXmlPath, funcListDefaultXmlPath, ppEditView); _funcParserMgr.init(funcListDefaultXmlPath, funcListDefaultXmlPath, ppEditView);

8
PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp
View File

@ -428,18 +428,18 @@ PluginsAdminDlg::PluginsAdminDlg()
// Get wingup path // Get wingup path
NppParameters& nppParameters = NppParameters::getInstance(); NppParameters& nppParameters = NppParameters::getInstance();
_updaterDir = nppParameters.getNppPath(); _updaterDir = nppParameters.getNppPath();
PathAppend(_updaterDir, TEXT("updater")); pathAppend(_updaterDir, TEXT("updater"));
_updaterFullPath = _updaterDir; _updaterFullPath = _updaterDir;
PathAppend(_updaterFullPath, TEXT("gup.exe")); pathAppend(_updaterFullPath, TEXT("gup.exe"));
// get plugin-list path // get plugin-list path
_pluginListFullPath = nppParameters.getPluginConfDir(); _pluginListFullPath = nppParameters.getPluginConfDir();
#ifdef DEBUG // if not debug, then it's release #ifdef DEBUG // if not debug, then it's release
// load from nppPluginList.json instead of nppPluginList.dll // load from nppPluginList.json instead of nppPluginList.dll
PathAppend(_pluginListFullPath, TEXT("nppPluginList.json")); pathAppend(_pluginListFullPath, TEXT("nppPluginList.json"));
#else //RELEASE #else //RELEASE
PathAppend(_pluginListFullPath, TEXT("nppPluginList.dll")); pathAppend(_pluginListFullPath, TEXT("nppPluginList.dll"));
#endif #endif
} }