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

Make better variable names & coding style

This commit is contained in:
Don HO 2020-02-26 01:37:00 +01:00
parent 66893f980f
commit 40b49d0b66
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
PowerEditor/src/NppIO.cpp
View File

@ -58,13 +58,13 @@ DWORD WINAPI Notepad_plus::monitorFileOnChange(void * params)
const DWORD dwNotificationFlags = FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_SIZE;
// Create the monitor and add directory to watch.
CReadDirectoryChanges changes;
changes.AddDirectory(folderToMonitor, true, dwNotificationFlags);
CReadDirectoryChanges dirChanges;
dirChanges.AddDirectory(folderToMonitor, true, dwNotificationFlags);
CReadFileChanges fChanges;
fChanges.AddFile(fullFileName, FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_SIZE);
CReadFileChanges fileChanges;
fileChanges.AddFile(fullFileName, FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_SIZE);
HANDLE changeHandles[] = { buf->getMonitoringEvent(), changes.GetWaitHandle() };
HANDLE changeHandles[] = { buf->getMonitoringEvent(), dirChanges.GetWaitHandle() };
bool toBeContinued = true;
@ -74,17 +74,19 @@ DWORD WINAPI Notepad_plus::monitorFileOnChange(void * params)
switch (waitStatus)
{
case WAIT_OBJECT_0 + 0:
// Mutex was signaled. User removes this folder or file browser is closed
// Mutex was signaled. User removes this folder or file browser is closed
{
toBeContinued = false;
}
break;
case WAIT_OBJECT_0 + 1:
// We've received a notification in the queue.
// We've received a notification in the queue.
{
DWORD dwAction;
generic_string fn;
// Process all available changes, ignore User actions
while (changes.Pop(dwAction, fn))
while (dirChanges.Pop(dwAction, fn))
{
// Fix monitoring files which are under root problem
size_t pos = fn.find(TEXT("\\\\"));
@ -106,11 +108,14 @@ DWORD WINAPI Notepad_plus::monitorFileOnChange(void * params)
}
}
break;
case WAIT_TIMEOUT:
if (fChanges.DetectChanges()) {
{
if (fileChanges.DetectChanges())
::PostMessage(h, NPPM_INTERNAL_RELOADSCROLLTOEND, reinterpret_cast<WPARAM>(buf), 0);
}
break;
}
break;
case WAIT_IO_COMPLETION:
// Nothing to do.
break;
@ -119,8 +124,8 @@ DWORD WINAPI Notepad_plus::monitorFileOnChange(void * params)
// Just for sample purposes. The destructor will
// call Terminate() automatically.
changes.Terminate();
fChanges.Terminate();
dirChanges.Terminate();
fileChanges.Terminate();
delete monitorInfo;
return EXIT_SUCCESS;
}