Alexandre Julliard : shell32: Don' t use the short path name to delete files in SHFileOperation.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Nov 14 05:14:34 CST 2006


Module: wine
Branch: master
Commit: dc0c3677cd4532c6c75694074f047f7d45d24e88
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dc0c3677cd4532c6c75694074f047f7d45d24e88

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Nov 14 12:00:23 2006 +0100

shell32: Don't use the short path name to delete files in SHFileOperation.

---

 dlls/shell32/shlfileop.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index 6405b5b..1437c07 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -207,12 +207,9 @@ BOOL SHELL_DeleteDirectoryW(HWND hwnd, L
 	{
 	  do
 	  {
-	    LPWSTR lp = wfd.cAlternateFileName;
-	    if (!lp[0])
-	      lp = wfd.cFileName;
-	    if (IsDotDir(lp))
+	    if (IsDotDir(wfd.cFileName))
 	      continue;
-	    PathCombineW(szTemp, pszDir, lp);
+	    PathCombineW(szTemp, pszDir, wfd.cFileName);
 	    if (FILE_ATTRIBUTE_DIRECTORY & wfd.dwFileAttributes)
 	      ret = SHELL_DeleteDirectoryW(hwnd, szTemp, FALSE);
 	    else




More information about the wine-cvs mailing list