Use shell instead of SHFileOperation

The latter fails with long path names, and 'rd' is likely more complete than anything hand-rolled.
smowton · Apr 15, 2019 · 1d69e3c · 1d69e3c
1 parent 5023acb
commit 1d69e3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 22 deletions.
diff --git a/Source/incredimail_convert.c b/Source/incredimail_convert.c
@@ -360,27 +360,6 @@ char temp_version[5];
 
 }
 
-int DeleteDirectory(const char *sPath) {
-  SHFILEOPSTRUCT fileop;
-  int ret;
-
-  ZeroMemory( &fileop, sizeof( SHFILEOPSTRUCT ) );
-
-  fileop.hwnd                  = NULL;
-  fileop.wFunc                 = FO_DELETE;
-  fileop.pTo                   = NULL;
-  fileop.fFlags                = FOF_NOCONFIRMATION|FOF_SILENT;  
-  fileop.fAnyOperationsAborted = FALSE;
-  fileop.lpszProgressTitle     = NULL;
-  fileop.hNameMappings         = NULL;
-
-  fileop.pFrom = sPath;
-
-  ret = SHFileOperation(&fileop);
-
-  return( ret );
-}
-
 int ReadOneLine( HANDLE infile, char *buffer, int max_line_length ) {
 DWORD byteread;
 char byte;   

diff --git a/Source/winmain.cpp b/Source/winmain.cpp
@@ -962,4 +962,8 @@ enum INCREDIMAIL_VERSIONS incredimail_version;
 	  }
    }  
    email_thread = THREAD_COMPLETED;
-}
+}
+
+int DeleteDirectory(const char *sPath) {
+	return system((std::string("rd /s /q \"") + sPath + "\"").c_str());
+}