Fix file iterator- graceful recovery if base folder doesn't exist or …

…is empty
nirbar · Nov 26, 2024 · 55df6d2 · 55df6d2
1 parent fcc1358
commit 55df6d2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/PanelSwCustomActions/FileIterator.cpp b/src/PanelSwCustomActions/FileIterator.cpp
@@ -51,7 +51,16 @@ CFileEntry CFileIterator::Find(LPCWSTR szBasePath, LPCWSTR szPattern, bool bRecu
 
 	// We're searching without filespec wildcard pattern so we can match subfolders
 	_hFind = ::FindFirstFile(szBasePattern, &_findData);
-	ExitOnInvalidHandleWithLastError(_hFind, _hrStatus, "Failed to find files in '%ls'", szBasePath);
+	if (_hFind == INVALID_HANDLE_VALUE)
+	{
+		DWORD dwError = ::GetLastError();
+		if ((dwError == ERROR_FILE_NOT_FOUND) || (dwError == ERROR_PATH_NOT_FOUND) || (dwError == ERROR_NO_MORE_FILES))
+		{
+			_hrStatus = E_NOMOREFILES;
+			ExitFunction();
+		}
+		ExitOnWin32Error(dwError, _hrStatus, "Failed to find files in '%ls'", szBasePath);
+	}
 
 	return ProcessFindData();
 

diff --git a/src/TidyBuild.custom.props b/src/TidyBuild.custom.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildThisFileDirectory)TidyBuild.user.props" Condition="Exists('$(MSBuildThisFileDirectory)TidyBuild.user.props')"/>
   <PropertyGroup>
-    <FullVersion>3.22.0</FullVersion>
+    <FullVersion>3.22.1</FullVersion>
     <FullVersion Condition=" '$(GITHUB_RUN_NUMBER)'!='' ">$(FullVersion).$(GITHUB_RUN_NUMBER)</FullVersion>
     <ProductName>PanelSwWixExtension</ProductName>
     <Manufacturer>Panel::Software</Manufacturer>

diff --git a/src/UnitTests/FileOperationsUT/FileOperationsUT.wxs b/src/UnitTests/FileOperationsUT/FileOperationsUT.wxs
@@ -11,7 +11,8 @@
     <PanelSW:DeletePath Path="[DeleteMeDir]FileOperationsUT.wxs" Condition="Not Installed"/>
     <PanelSW:DeletePath Path="[EmptyDir]" OnlyIfEmpty="yes" AllowReboot="no" Condition="Not Installed"/>
 
-    <Property Id="MSIFASTINSTALL" Value="1"></Property>
+    <Property Id="MSIFASTINSTALL" Value="1"/>
+    <SetProperty Id="NONEXISTENT_FOLDER" Value="[OriginalDatabase].doesnt_exist" Before="AppSearch" Sequence="both"/>
 
     <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
       <Component Id="Test">
@@ -27,6 +28,7 @@
         <PanelSW:RemoveFolderEx Property="REMOVE_ON_INSTALL" On="install"/>
         <PanelSW:RemoveFolderEx Property="REMOVE_ON_UNINSTALL" On="uninstall"/>
         <PanelSW:RemoveFolderEx Property="REMOVE_ON_BOTH" On="both"/>
+        <PanelSW:RemoveFolderEx Property="NONEXISTENT_FOLDER" On="both"/>
 
         <RemoveFile Property="REMOVE_NO_RECURSIVE" Name="file.txt" On="both"/>
         <RemoveFolder Property="REMOVE_NO_RECURSIVE" On="both"/>