From fd30631edf131c4e35e87fcaa02cddffa713c3c0 Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Sun, 18 Sep 2005 11:18:28 +0000
Subject: [PATCH] Clean up patch from filip, with small change from me, for
 MoveFileWithProgressW.

svn path=/trunk/; revision=17908
---
 reactos/lib/kernel32/file/move.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/reactos/lib/kernel32/file/move.c b/reactos/lib/kernel32/file/move.c
index 827d3a3c306..ad42d5e3516 100644
--- a/reactos/lib/kernel32/file/move.c
+++ b/reactos/lib/kernel32/file/move.c
@@ -326,26 +326,15 @@ MoveFileWithProgressW (
 	                     FILE_SHARE_WRITE|FILE_SHARE_READ,
 	                     NULL,
 	                     OPEN_EXISTING,
-	                    FILE_ATTRIBUTE_NORMAL,
+	                     FILE_FLAG_BACKUP_SEMANTICS,
 	                     NULL);
 
 	if (hFile == INVALID_HANDLE_VALUE)
 	{
-           hFile = CreateFileW (lpExistingFileName,
-	                     GENERIC_ALL,
-	                     FILE_SHARE_WRITE|FILE_SHARE_READ,
-	                     NULL,
-	                     OPEN_EXISTING,
-	                     FILE_FLAG_BACKUP_SEMANTICS,
-	                     NULL);
-			     
-	   if (hFile == INVALID_HANDLE_VALUE)
-	      return FALSE;
-	      
-           folder = TRUE;
-
+	   return FALSE;
 	}
 
+	
         /* validate & translate the filename */
         if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpNewFileName,
 				           &DstPathU,
@@ -379,6 +368,12 @@ MoveFileWithProgressW (
 	                                sizeof(FILE_RENAME_INFORMATION) + DstPathU.Length,
 	                                FileRenameInformation);
 	CloseHandle(hFile);
+
+	if (GetFileAttributesW(lpExistingFileName) & FILE_ATTRIBUTE_DIRECTORY)
+	{
+           folder = TRUE;
+	}
+
 	
 	/*
 	 *  FIXME: