[ros-diffs] [greatlrd] 17908: Clean up patch from filip, with small change from me, for MoveFileWithProgressW.

Clean up patch from filip, with small change from me, for
MoveFileWithProgressW.
Modified: trunk/reactos/lib/kernel32/file/move.c
  _____  

Modified: trunk/reactos/lib/kernel32/file/move.c
--- trunk/reactos/lib/kernel32/file/move.c	2005-09-18 09:29:37 UTC
(rev 17907)
+++ trunk/reactos/lib/kernel32/file/move.c	2005-09-18 11:18:28 UTC
(rev 17908)
@@ -326,26 +326,15 @@

 	                     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 @@
 	                                sizeof(FILE_RENAME_INFORMATION)
+ DstPathU.Length,
 	                                FileRenameInformation);
 	CloseHandle(hFile);
+
+	if (GetFileAttributesW(lpExistingFileName) &
FILE_ATTRIBUTE_DIRECTORY)
+	{
+           folder = TRUE;
+	}
+
 	
 	/*
 	 *  FIXME: