github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add log while flush file buffers action fails 

Currently while flush file buffers action fails at not critical end session, a error message dialog display the problem.
It raises the problem of some external process interfering with the Notepad++ file saving (via NppSaveAsAdmin plugin).

This commit logs this error at critical end session, so if NUL characters content issue happens to the users again, we can try to know what was happening, plus users' plugin list.

Ref: https://github.com/notepad-plus-plus/notepad-plus-plus/issues/14990#issuecomment-2054242025

Close #15003
pull/15005/head
Don Ho 2024-04-15 04:23:09 +02:00
parent 25c6795d0c
commit 0e8781938d
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,6 +100,7 @@ void Win32_IO_File::close()
if (!::FlushFileBuffers(_hFile)) if (!::FlushFileBuffers(_hFile))
{ {
flushError = ::GetLastError(); flushError = ::GetLastError();
std::wstring errNumberMsg = std::to_wstring(flushError) + L" - " + GetLastErrorAsString(flushError);
if (!nppParam.isEndSessionCritical()) if (!nppParam.isEndSessionCritical())
{ {
@ -133,9 +134,21 @@ void Win32_IO_File::close()
errMsg += L"\n\nThat file, temporarily stored in the system cache, cannot be finally committed to the storage device selected! \ errMsg += L"\n\nThat file, temporarily stored in the system cache, cannot be finally committed to the storage device selected! \
This is probably a storage driver or hardware issue, beyond the control of the Notepad++. \ This is probably a storage driver or hardware issue, beyond the control of the Notepad++. \
Please try using another storage and also check if your saved data is not corrupted.\n\nError Code reported: "; Please try using another storage and also check if your saved data is not corrupted.\n\nError Code reported: ";
errMsg += std::to_wstring(flushError) + L" - " + GetLastErrorAsString(flushError); errMsg += errNumberMsg;
::MessageBoxW(NULL, errMsg.c_str(), L"WARNING - filebuffer flushing fail!", MB_OK | MB_ICONWARNING | MB_SYSTEMMODAL); ::MessageBoxW(NULL, errMsg.c_str(), L"WARNING - filebuffer flushing fail!", MB_OK | MB_ICONWARNING | MB_SYSTEMMODAL);
} }
else
{
// writing breif log here
std::wstring nppFlushFileBuffersFailsLog = L"nppFlushFileBuffersFails.log";
std::wstring nppIssueLog = nppParam.getUserPath();
pathAppend(nppIssueLog, nppFlushFileBuffersFailsLog);
std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
std::string errNumberMsgA = converter.to_bytes(errNumberMsg);
writeLog(nppIssueLog.c_str(), errNumberMsgA.c_str());
}
} }
} }
::CloseHandle(_hFile); ::CloseHandle(_hFile);
@ -152,6 +165,8 @@ Please try using another storage and also check if your saved data is not corrup
std::string msg; std::string msg;
if (flushError != NOERROR) if (flushError != NOERROR)
{ {
msg = "FlushFileBuffers failed with the error code: " + std::to_string(flushError) + " - ";
LPSTR messageBuffer = nullptr; LPSTR messageBuffer = nullptr;
FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
nullptr, flushError, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&messageBuffer, 0, nullptr); nullptr, flushError, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&messageBuffer, 0, nullptr);

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

@ -139,7 +139,7 @@ void Buffer::setLangType(LangType lang, const TCHAR* userLangName)
void Buffer::updateTimeStamp() void Buffer::updateTimeStamp()
{ {
FILETIME timeStampLive = {}; FILETIME timeStampLive {};
WIN32_FILE_ATTRIBUTE_DATA attributes{}; WIN32_FILE_ATTRIBUTE_DATA attributes{};
if (GetFileAttributesEx(_fullPathName.c_str(), GetFileExInfoStandard, &attributes) != 0) if (GetFileAttributesEx(_fullPathName.c_str(), GetFileExInfoStandard, &attributes) != 0)
{ {