[dchapyshev] 38194: - Fix all wine tests for MoveFileA/W

Author: dchapyshev
Date: Sat Dec 20 04:08:11 2008
New Revision: 38194

URL: http://svn.reactos.org/svn/reactos?rev=38194&view=rev
Log:
- Fix all wine tests for MoveFileA/W

Modified:
    trunk/reactos/dll/win32/kernel32/file/move.c

Modified: trunk/reactos/dll/win32/kernel32/file/move.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mov...
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] Sat Dec 20 04:08:11 2008
@@ -235,8 +235,9 @@
    DWORD			dwFlags
    )
 {
-	HANDLE hFile = NULL;
+	HANDLE hFile = NULL, hNewFile = NULL;
    IO_STATUS_BLOCK IoStatusBlock;
+    OBJECT_ATTRIBUTES ObjectAttributes;
    PFILE_RENAME_INFORMATION FileRename;
    NTSTATUS errCode;
    BOOL Result;
@@ -247,6 +248,48 @@

if (dwFlags & MOVEFILE_DELAY_UNTIL_REBOOT)
    	return add_boot_rename_entry( lpExistingFileName, lpNewFileName, dwFlags );
+
+    if (dwFlags & MOVEFILE_WRITE_THROUGH)
+        FIXME("MOVEFILE_WRITE_THROUGH unimplemented\n");
+
+    if (!lpNewFileName)
+        return DeleteFileW(lpExistingFileName);
+
+    /* validate & translate the filename */
+    if (!RtlDosPathNameToNtPathName_U (lpNewFileName,
+				           &DstPathU,
+				           NULL,
+				           NULL))
+    {
+        WARN("Invalid destination path\n");
+        SetLastError(ERROR_PATH_NOT_FOUND);
+        return FALSE;
+    }
+
+    InitializeObjectAttributes(&ObjectAttributes,
+                               &DstPathU,
+                               OBJ_CASE_INSENSITIVE,
+                               NULL,
+                               NULL);
+
+    errCode = NtOpenFile(&hNewFile, GENERIC_READ | GENERIC_WRITE, &ObjectAttributes, &IoStatusBlock, 0,
+                         FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT );
+
+	if (NT_SUCCESS(errCode)) /* Destination exists */
+	{
+        NtClose(hNewFile);
+
+        if (!(dwFlags & MOVEFILE_REPLACE_EXISTING))
+        {
+			SetLastError(ERROR_ALREADY_EXISTS);
+			return FALSE;
+		}
+		else if (GetFileAttributesW(lpNewFileName) & FILE_ATTRIBUTE_DIRECTORY)
+		{
+			SetLastError(ERROR_ACCESS_DENIED);
+			return FALSE;
+		}
+	}

hFile = CreateFileW (lpExistingFileName,
                         GENERIC_ALL,
@@ -258,21 +301,8 @@

if (hFile == INVALID_HANDLE_VALUE)
    {
-	   return FALSE;
+	    return FALSE;
    }
-
-	
-        /* validate & translate the filename */
-        if (!RtlDosPathNameToNtPathName_U (lpNewFileName,
-				           &DstPathU,
-				           NULL,
-				           NULL))
-        {
-           WARN("Invalid destination path\n");
-	   CloseHandle(hFile);
-           SetLastError(ERROR_PATH_NOT_FOUND);
-           return FALSE;
-        }

FileRename = RtlAllocateHeap(
    	RtlGetProcessHeap(),