[PATCH v2 1/2] implement CopyFile2

[Kartavya Vashishtha]

From: Kartavya Vashishtha

implement CopyFileExW in terms of CopyFile2
---
 dlls/kernelbase/file.c          | 47 +++++++++++++++++++++++----------
 dlls/kernelbase/kernelbase.spec |  2 +-
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
index e1ba92a6448..48e2af85005 100644
--- a/dlls/kernelbase/file.c
+++ b/dlls/kernelbase/file.c
@@ -487,13 +487,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH AreFileApisANSI(void)
     return !oem_file_apis;
 }

-
 /***********************************************************************
- *	CopyFileExW   (kernelbase.@)
+ *	CopyFile2   (kernelbase.@)
+ * 
+ * FIXME: Silently ignores:
+ * the callback function
+ * cancel_ptr
  */
-BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUTINE progress,
-                         void *param, BOOL *cancel_ptr, DWORD flags )
-{
+HRESULT WINAPI CopyFile2 ( const PCWSTR source , const PCWSTR dest, COPYFILE2_EXTENDED_PARAMETERS* params) {
     static const int buffer_size = 65536;
     HANDLE h1, h2;
     FILE_BASIC_INFORMATION info;
@@ -502,15 +503,15 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT
     BOOL ret = FALSE;
     char *buffer;

+    DWORD flags = params? params->dwCopyFlags : 0;
+
     if (!source || !dest)
     {
-        SetLastError( ERROR_INVALID_PARAMETER );
-        return FALSE;
+        return HRESULT_FROM_WIN32( ERROR_INVALID_PARAMETER );
     }
     if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size )))
     {
-        SetLastError( ERROR_NOT_ENOUGH_MEMORY );
-        return FALSE;
+        return HRESULT_FROM_WIN32( ERROR_NOT_ENOUGH_MEMORY );
     }

TRACE("%s -> %s, %lx\n", debugstr_w(source), debugstr_w(dest), flags);
@@ -527,7 +528,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT
     {
         WARN("Unable to open source %s\n", debugstr_w(source));
         HeapFree( GetProcessHeap(), 0, buffer );
-        return FALSE;
+        return HRESULT_FROM_WIN32( ERROR_INVALID_PARAMETER );
     }

if (!set_ntstatus( NtQueryInformationFile( h1, &io, &info, sizeof(info), FileBasicInformation )))
@@ -535,7 +536,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT
         WARN("GetFileInformationByHandle returned error for %s\n", debugstr_w(source));
         HeapFree( GetProcessHeap(), 0, buffer );
         CloseHandle( h1 );
-        return FALSE;
+        return HRESULT_FROM_WIN32( GetLastError() );
     }

if (!(flags & COPY_FILE_FAIL_IF_EXISTS))
@@ -551,8 +552,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT
         {
             HeapFree( GetProcessHeap(), 0, buffer );
             CloseHandle( h1 );
-            SetLastError( ERROR_SHARING_VIOLATION );
-            return FALSE;
+            return HRESULT_FROM_WIN32( ERROR_SHARING_VIOLATION );
         }
     }

@@ -563,7 +563,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT
         WARN("Unable to open dest %s\n", debugstr_w(dest));
         HeapFree( GetProcessHeap(), 0, buffer );
         CloseHandle( h1 );
-        return FALSE;
+        return HRESULT_FROM_WIN32( GetLastError() );
     }

while (ReadFile( h1, buffer, buffer_size, &count, NULL ) && count)
@@ -590,6 +590,25 @@ done:
 }

+/***********************************************************************
+ *	CopyFileExW   (kernelbase.@)
+ */
+BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUTINE progress,
+                         void *param, BOOL *cancel_ptr, DWORD flags )
+{
+    BOOL ret;
+    COPYFILE2_EXTENDED_PARAMETERS params;
+
+    params.dwSize = sizeof(params);
+    params.dwCopyFlags = flags;
+
+    ret = CopyFile2( source, dest, &params );
+    if (ret) SetLastError( 0 );
+
+    return ret;
+}
+
+
 /**************************************************************************
  *	CopyFileW   (kernelbase.@)
  */
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index ffb153a46ee..bde4bc66bde 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -168,7 +168,7 @@
 @ stdcall ConvertThreadToFiberEx(ptr long)
 @ stdcall ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr)
 @ stdcall CopyContext(ptr long ptr)
-# @ stub CopyFile2
+@ stdcall CopyFile2(wstr wstr ptr)
 @ stdcall CopyFileExW(wstr wstr ptr ptr ptr long)
 @ stdcall CopyFileW(wstr wstr long)
 @ stdcall -arch=x86_64 CopyMemoryNonTemporal(ptr ptr long) ntdll.RtlCopyMemoryNonTemporal