Use ReadDirectoryChangesW as fallback.

SpartanJ · Aug 10, 2024 · 2f90a44 · 2f90a44
1 parent 621939d
commit 2f90a44
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/efsw/WatcherWin32.cpp b/src/efsw/WatcherWin32.cpp
@@ -169,7 +169,7 @@ void CALLBACK WatchCallback( DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOve
 	}
 
 	// Fork watch depending on the Windows API supported
-	if ( pReadDirectoryChangesExW ) {
+	if ( pWatch->Extended ) {
 		WatchCallbackEx( pWatch );
 	} else {
 		WatchCallbackOld( pWatch );
@@ -181,29 +181,40 @@ void CALLBACK WatchCallback( DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOve
 }
 
 /// Refreshes the directory monitoring.
-bool RefreshWatch( WatcherStructWin32* pWatch ) {
+RefreshResult RefreshWatch( WatcherStructWin32* pWatch ) {
 	initReadDirectoryChangesEx();
 
 	bool bRet = false;
+	RefreshResult ret = RefreshResult::Failed;
+	pWatch->Watch->Extended = false;
 
 	if ( pReadDirectoryChangesExW ) {
 		bRet = pReadDirectoryChangesExW( pWatch->Watch->DirHandle, pWatch->Watch->Buffer.data(),
 									  (DWORD)pWatch->Watch->Buffer.size(), pWatch->Watch->Recursive,
 									  pWatch->Watch->NotifyFilter, NULL, &pWatch->Overlapped,
 										 NULL, EFSW_ReadDirectoryNotifyExtendedInformation ) != 0;
-	} else {
+		if ( bRet ) {
+			ret = RefreshResult::SucessEx;
+			pWatch->Watch->Extended = true;
+		}
+	}
+
+	if ( !bRet ) {
 		bRet = ReadDirectoryChangesW( pWatch->Watch->DirHandle, pWatch->Watch->Buffer.data(),
 									  (DWORD)pWatch->Watch->Buffer.size(), pWatch->Watch->Recursive,
 									  pWatch->Watch->NotifyFilter, NULL, &pWatch->Overlapped,
 									  NULL ) != 0;
+
+		if ( bRet )
+			ret = RefreshResult::Success;
 	}
 
 	if ( !bRet ) {
 		std::string error = std::to_string( GetLastError() );
 		Errors::Log::createLastError( Errors::WatcherFailed, error );
 	}
 
-	return bRet;
+	return ret;
 }
 
 /// Stops monitoring a directory.

diff --git a/src/efsw/WatcherWin32.hpp b/src/efsw/WatcherWin32.hpp
@@ -22,6 +22,8 @@ namespace efsw {
 
 class WatcherWin32;
 
+enum RefreshResult { Success, SucessEx, Failed };
+
 /// Internal watch data
 struct WatcherStructWin32 {
 	OVERLAPPED Overlapped;
@@ -33,7 +35,7 @@ struct sLastModifiedEvent {
 	std::string fileName;
 };
 
-bool RefreshWatch( WatcherStructWin32* pWatch );
+RefreshResult RefreshWatch( WatcherStructWin32* pWatch );
 
 void CALLBACK WatchCallback( DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped );
 
@@ -51,6 +53,7 @@ class WatcherWin32 : public Watcher {
 		lParam( 0 ),
 		NotifyFilter( 0 ),
 		StopNow( false ),
+		Extended( false ),
 		Watch( NULL ),
 		DirName( NULL ) {
 			Buffer.resize(dwBufferSize);
@@ -62,6 +65,7 @@ class WatcherWin32 : public Watcher {
 	LPARAM lParam;
 	DWORD NotifyFilter;
 	bool StopNow;
+	bool Extended;
 	FileWatcherImpl* Watch;
 	char* DirName;
 	sLastModifiedEvent LastModifiedEvent;