Update

Author: 0x5bfa

src/Files.App.Storage/Storables/WindowsStorage/WindowsFolderWatcher.cs

@@ -1,27 +1,25 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using OwlCore.Storage;
-using System.Collections.Concurrent;
 using System.Collections.Specialized;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Threading;
 using Windows.Win32;
 using Windows.Win32.Foundation;
-using Windows.Win32.Graphics.Gdi;
 using Windows.Win32.System.Com;
 using Windows.Win32.UI.Shell;
 using Windows.Win32.UI.Shell.Common;
 using Windows.Win32.UI.WindowsAndMessaging;
 
 namespace Files.App.Storage
 {
+	/// <summary>
+	/// Represents an implementation of <see cref="IFolderWatcher"/> that uses Windows Shell notifications to watch for changes in a folder.
+	/// </summary>
 	public unsafe partial class WindowsFolderWatcher : IFolderWatcher
 	{
 		// Fields
 
-		private const uint WM_SHFLDRWATCHER = PInvoke.WM_APP | 0x0001U;
+		private const uint WM_FOLDERWATCHER = PInvoke.WM_APP | 0x0001U;
 		private readonly WNDPROC _wndProc;
 
 		private uint _registrationID = 0U;
@@ -37,12 +35,14 @@ public unsafe partial class WindowsFolderWatcher : IFolderWatcher
 
 		// Constructor
 
+		/// <summary>
+		/// Initializes a new instance of the <see cref="WindowsFolderWatcher"/> class.
+		/// </summary>
+		/// <param name="folder">Specifies the folder to be monitored for changes.</param>
 		public WindowsFolderWatcher(WindowsFolder folder)
 		{
 			Folder = folder;
 
-			HINSTANCE hInst = PInvoke.GetModuleHandle(default(PWSTR));
-
 			_wndProc = new(WndProc);
 			var pfnWndProc = (delegate* unmanaged[Stdcall]<HWND, uint, WPARAM, LPARAM, LRESULT>)Marshal.GetFunctionPointerForDelegate(_wndProc);
 
@@ -51,11 +51,11 @@ public WindowsFolderWatcher(WindowsFolder folder)
 				WNDCLASSEXW wndClass = default;
 				wndClass.cbSize = (uint)sizeof(WNDCLASSEXW);
 				wndClass.lpfnWndProc = pfnWndProc;
-				wndClass.hInstance = hInst;
+				wndClass.hInstance = PInvoke.GetModuleHandle(default(PWSTR)); ;
 				wndClass.lpszClassName = pszClassName;
 
 				PInvoke.RegisterClassEx(&wndClass);
-				PInvoke.CreateWindowEx(0, pszClassName, null, 0, 0, 0, 0, 0, HWND.HWND_MESSAGE, default, hInst, null);
+				PInvoke.CreateWindowEx(0, pszClassName, null, 0, 0, 0, 0, 0, HWND.HWND_MESSAGE, default, wndClass.hInstance, null);
 			}
 		}
 
@@ -79,15 +79,15 @@ private unsafe LRESULT WndProc(HWND hWnd, uint uMessage, WPARAM wParam, LPARAM l
 							hWnd,
 							SHCNRF_SOURCE.SHCNRF_ShellLevel | SHCNRF_SOURCE.SHCNRF_NewDelivery,
 							(int)SHCNE_ID.SHCNE_ALLEVENTS,
-							PInvoke.WM_APP | 1,
+							WM_FOLDERWATCHER,
 							1,
 							&changeNotifyEntry);
 
 						if (_registrationID is 0U)
 							break;
 					}
 					break;
-				case PInvoke.WM_APP | 1:
+				case WM_FOLDERWATCHER:
 					{
 						ITEMIDLIST** ppidl;
 						int lEvent = 0;