[PATCH v2 2/2] - replace BOOL with HRESULT

[Kartavya Vashishtha]

From: Kartavya Vashishtha

- try using ERROR_PATH_NOT_FOUND when source or dest is NULL (due to tests/file.c:1185)

- change source file open error to ERROR_FILE_NOT_FOUND, per MSDN documentation for CopyFile2
---
 dlls/kernelbase/file.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
index 48e2af85005..cc21f11117a 100644
--- a/dlls/kernelbase/file.c
+++ b/dlls/kernelbase/file.c
@@ -503,11 +503,11 @@ HRESULT WINAPI CopyFile2 ( const PCWSTR source , const PCWSTR dest, COPYFILE2_EX
     BOOL ret = FALSE;
     char *buffer;

-    DWORD flags = params? params->dwCopyFlags : 0;
+    DWORD flags = params ? params->dwCopyFlags : 0;

if (!source || !dest)
     {
-        return HRESULT_FROM_WIN32( ERROR_INVALID_PARAMETER );
+        return HRESULT_FROM_WIN32( ERROR_PATH_NOT_FOUND );
     }
     if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size )))
     {
@@ -528,7 +528,7 @@ HRESULT WINAPI CopyFile2 ( const PCWSTR source , const PCWSTR dest, COPYFILE2_EX
     {
         WARN("Unable to open source %s\n", debugstr_w(source));
         HeapFree( GetProcessHeap(), 0, buffer );
-        return HRESULT_FROM_WIN32( ERROR_INVALID_PARAMETER );
+        return HRESULT_FROM_WIN32( ERROR_FILE_NOT_FOUND );
     }

if (!set_ntstatus( NtQueryInformationFile( h1, &io, &info, sizeof(info), FileBasicInformation )))
@@ -577,7 +577,7 @@ HRESULT WINAPI CopyFile2 ( const PCWSTR source , const PCWSTR dest, COPYFILE2_EX
             count -= res;
         }
     }
-    ret =  TRUE;
+    ret = S_OK;
 done:
     /* Maintain the timestamp of source file to destination file */
     info.FileAttributes = 0;
@@ -585,7 +585,6 @@ done:
     HeapFree( GetProcessHeap(), 0, buffer );
     CloseHandle( h1 );
     CloseHandle( h2 );
-    if (ret) SetLastError( 0 );
     return ret;
 }

@@ -596,16 +595,17 @@ done:
 BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUTINE progress,
                          void *param, BOOL *cancel_ptr, DWORD flags )
 {
-    BOOL ret;
+    HRESULT ret;
     COPYFILE2_EXTENDED_PARAMETERS params;

params.dwSize = sizeof(params);
     params.dwCopyFlags = flags;

ret = CopyFile2( source, dest, &params );
-    if (ret) SetLastError( 0 );
-
-    return ret;
+    if (ret != S_OK) {
+        SetLastError( ret );
+    }
+    return SUCCEEDED(ret);
 }