CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ fix: avoid file cache lost on power failure

Browse Source
This commit is contained in:
RaiKoHoff 2020-10-08 17:05:53 +02:00
parent 862c95a9d2
commit 3031a12224
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grepWinNP3/sktoolslib_mod/TextFile.cpp
View File

@ -58,9 +58,11 @@ bool CTextFile::Save(LPCWSTR path)
DWORD byteswritten;
if (!WriteFile(hFile, pFileBuf.get(), filelen, &byteswritten, NULL))
{
FlushFileBuffers(hFile);
CloseHandle(hFile);
return false;
}
FlushFileBuffers(hFile);
CloseHandle(hFile);
return true;
}

13
src/Edit.c
View File

@ -1332,12 +1332,15 @@ bool EditSaveFile(
bool bWriteSuccess = false;
status->bCancelDataLoss = false;
///~ (!) FILE_FLAG_NO_BUFFERING needs sector-size aligned buffer layout
DWORD const dwWriteAttributes = FILE_ATTRIBUTE_NORMAL | /*FILE_FLAG_NO_BUFFERING |*/ FILE_FLAG_WRITE_THROUGH;
HANDLE hFile = CreateFile(pszFile,
GENERIC_WRITE,
FILE_SHARE_READ|FILE_SHARE_WRITE,
NULL,
OPEN_ALWAYS,
FILE_ATTRIBUTE_NORMAL,
dwWriteAttributes,
NULL);
Globals.dwLastError = GetLastError();
@ -1345,16 +1348,16 @@ bool EditSaveFile(
// failure could be due to missing attributes (2k/XP)
if (hFile == INVALID_HANDLE_VALUE)
{
DWORD dwAttributes = GetFileAttributes(pszFile);
if (dwAttributes != INVALID_FILE_ATTRIBUTES)
DWORD dwSpecialAttributes = GetFileAttributes(pszFile);
if (dwSpecialAttributes != INVALID_FILE_ATTRIBUTES)
{
dwAttributes = dwAttributes & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM);
dwSpecialAttributes &= (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM);
hFile = CreateFile(pszFile,
GENERIC_WRITE,
FILE_SHARE_READ|FILE_SHARE_WRITE,
NULL,
OPEN_ALWAYS,
FILE_ATTRIBUTE_NORMAL | dwAttributes,
dwWriteAttributes | dwSpecialAttributes,
NULL);
Globals.dwLastError = GetLastError();

4
src/Helpers.c
View File

@ -766,7 +766,9 @@ bool WriteFileXL(HANDLE hFile, const char* const lpBuffer, const size_t nNumberO
bytesLeft -= (size_t)dwWritten;
}
while (bWriteOk && ((dwWritten != 0) && (bytesLeft > 0)));
FlushFileBuffers(hFile);
*lpNumberOfBytesWritten = bytesWritten;
return (bytesWritten == nNumberOfBytesToWrite);
}

2
src/Notepad3.c
View File

@ -10094,7 +10094,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
HANDLE hFile = CreateFile(szFilePath,
GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL,CREATE_NEW,FILE_ATTRIBUTE_NORMAL,NULL);
NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
Globals.dwLastError = GetLastError();
fSuccess = (hFile != INVALID_HANDLE_VALUE);
if (fSuccess) {