[KERNEL32]

[reactos.git] / reactos / dll / win32 / kernel32 / file / copy.c

diff --git a/reactos/dll/win32/kernel32/file/copy.c b/reactos/dll/win32/kernel32/file/copy.c
index 2a2e798..30c847b 100644 (file)
--- a/reactos/dll/win32/kernel32/file/copy.c
+++ b/reactos/dll/win32/kernel32/file/copy.c
@@ -13,9 +13,12 @@
 /* INCLUDES ****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
+#include <debug.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
+#if DBG
+DEBUG_CHANNEL(kernel32file);
+#endif
 
 /* FUNCTIONS ****************************************************************/
 
@@ -194,7 +197,7 @@ SetLastWriteTime(
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 CopyFileExW (
        LPCWSTR                 lpExistingFileName,
        LPCWSTR                 lpNewFileName,
@@ -310,38 +313,37 @@ CopyFileExW (
  * @implemented
  */
 BOOL
-STDCALL
-CopyFileExA (
-       LPCSTR                  lpExistingFileName,
-       LPCSTR                  lpNewFileName,
-       LPPROGRESS_ROUTINE      lpProgressRoutine,
-       LPVOID                  lpData,
-       BOOL                    *pbCancel,
-       DWORD                   dwCopyFlags
-       )
+WINAPI
+CopyFileExA(IN LPCSTR lpExistingFileName,
+            IN LPCSTR lpNewFileName,
+            IN LPPROGRESS_ROUTINE lpProgressRoutine OPTIONAL,
+            IN LPVOID lpData OPTIONAL,
+            IN LPBOOL pbCancel OPTIONAL,
+            IN DWORD dwCopyFlags)
 {
-       PWCHAR ExistingFileNameW;
-   PWCHAR NewFileNameW;
-       BOOL Result;
-
-   if (!(ExistingFileNameW = FilenameA2W(lpExistingFileName, FALSE)))
-      return FALSE;
-
-   if (!(NewFileNameW = FilenameA2W(lpNewFileName, TRUE)))
-      return FALSE;
-
-   Result = CopyFileExW (ExistingFileNameW ,
-                         NewFileNameW ,
-                             lpProgressRoutine,
-                             lpData,
-                             pbCancel,
-                             dwCopyFlags);
-
-       RtlFreeHeap (RtlGetProcessHeap (),
-                    0,
-                NewFileNameW);
-
-       return Result;
+    BOOL Result = FALSE;
+    UNICODE_STRING lpNewFileNameW;
+    PUNICODE_STRING lpExistingFileNameW;
+
+    lpExistingFileNameW = Basep8BitStringToStaticUnicodeString(lpExistingFileName);
+    if (!lpExistingFileName)
+    {
+        return FALSE;
+    }
+
+    if (Basep8BitStringToDynamicUnicodeString(&lpNewFileNameW, lpNewFileName))
+    {
+        Result = CopyFileExW(lpExistingFileNameW->Buffer,
+                             lpNewFileNameW.Buffer,
+                             lpProgressRoutine,
+                             lpData,
+                             pbCancel,
+                             dwCopyFlags);
+
+        RtlFreeUnicodeString(&lpNewFileNameW);
+    }
+
+    return Result;
 }
 
 
@@ -349,7 +351,7 @@ CopyFileExA (
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 CopyFileA (
        LPCSTR  lpExistingFileName,
        LPCSTR  lpNewFileName,
@@ -369,7 +371,7 @@ CopyFileA (
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 CopyFileW (
        LPCWSTR lpExistingFileName,
        LPCWSTR lpNewFileName,
@@ -389,7 +391,7 @@ CopyFileW (
  * @implemented
  */
 BOOL
-STDCALL
+WINAPI
 PrivCopyFileExW (
        LPCWSTR                 lpExistingFileName,
        LPCWSTR                 lpNewFileName,