sys: FspFsvolQueryDirectoryCopyCache: check DirInfoCacheHint against DirInfoSize

Changelog.md

@@ -1,15 +1,6 @@
 # Changelog
 
 
-## v2.1B2 (2024 Beta2)
-
-- [FIX] Fixes a rare BSOD on recent versions of Windows. See commit a482183 for details.
-
-- [FIX] Fixes a rare problem when using `NtCreateFile` to perform "relative" opens on a network drive (see GitHub issue #561).
-
-- [FIX] Fixes a racing issue with two processes competing to start the FSD discovered during testing.
-
-
 ## v2.1B1 (2024 Beta1)
 
 - [FIX] Fixes a rare BSOD on recent versions of Windows. See commit a482183 for details.

Contributors.asciidoc

@@ -67,7 +67,6 @@ CONTRIBUTOR LIST
 |John Oberschelp                                                |john at oberschelp.net
 |John Tyner                                                     |jtyner at gmail.com
 |Konstantinos Karakostas                                        |noiredev at protonmail.com
-|Naoki Ikeguchi                                                 |me at s6n.jp
 |Paweł Wegner (Google LLC, https://google.com)                  |lemourin at google.com
 |Pedro Frejo (Arpa System, https://arpasystem.com)              |pedro.frejo at arpasystem.com
 |Ronny Chan                                                     |ronny at ronnychan.ca

build/VStudio/build.version.props

@@ -20,7 +20,7 @@
 
         <MyCanonicalVersion>2.1</MyCanonicalVersion>
 
-        <MyProductVersion>2024 Beta2</MyProductVersion>
+        <MyProductVersion>2024 Beta1</MyProductVersion>
         <MyProductStage>Beta</MyProductStage>
 
         <MyCrossCert>DigiCertGlobalG3CodeSigningECCSHA3842021CA1.cer</MyCrossCert>

inc/fuse/winfsp_fuse.h

@@ -27,7 +27,6 @@
 #include <stdint.h>
 #if !defined(WINFSP_DLL_INTERNAL)
 #include <stdlib.h>
-#include <string.h>
 #endif
 
 #ifdef __cplusplus

src/sys/dirctl.c

@@ -348,7 +348,9 @@ static NTSTATUS FspFsvolQueryDirectoryCopyCache(
 
     FSP_FILE_NODE *FileNode = FileDesc->FileNode;
 
-    if (ResetCache || FileDesc->DirInfo != FileNode->NonPaged->DirInfo)
+    if (ResetCache ||
+        FileDesc->DirInfo != FileNode->NonPaged->DirInfo ||
+        FileDesc->DirInfoCacheHint >= DirInfoSize)
         FileDesc->DirInfoCacheHint = 0; /* reset the DirInfo hint if anything looks fishy! */
 
     FileDesc->DirInfo = FileNode->NonPaged->DirInfo;

tools/make-release.ps1

@@ -304,8 +304,6 @@ function Submit-AssetsToHwapi {
             "WINDOWS_v100_ARM64_CO_FULL"
             "WINDOWS_v100_X64_NI_FULL"
             "WINDOWS_v100_ARM64_NI_FULL"
-            "WINDOWS_v100_X64_GE_FULL"
-            "WINDOWS_v100_ARM64_GE_FULL"
         )
         foreach ($Signature in $DocRequestedSignatures) {
             if ($RequestedSignatures -contains $Signature) {