Changeset 6090 for trunk/src/kernel32/Fileio.cpp

Timestamp:

Jun 24, 2001, 4:13:05 PM (24 years ago)

Author:

sandervl

Message:

Rewrote CopyFile, MoveFile & RemoveDirectory

File:

• trunk/src/kernel32/Fileio.cpp (modified) (8 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.49 2001-04-26 13:22:42 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.50 2001-06-24 14:13:03 sandervl Exp $ */
 
 /*
@@ -281 +281 @@
               BOOL, arg3)
 {
-  return O32_CopyFile(arg1, arg2, arg3);
+  return OSLibDosCopyFile(arg1, arg2, arg3);
 }
 //******************************************************************************
@@ -296 +296 @@
   astring1 = UnicodeToAsciiString((LPWSTR)arg1);
   astring2 = UnicodeToAsciiString((LPWSTR)arg2);
-  rc = O32_CopyFile(astring1, astring2, arg3);
+  rc = CALL_ODINFUNC(CopyFileA)(astring1, astring2, arg3);
   FreeAsciiString(astring2);
   FreeAsciiString(astring1);
@@ -770 +770 @@
                     nNumberOfBytesToLockHigh));
 }
-
-
-
-
 //******************************************************************************
 //******************************************************************************
@@ -781 +777 @@
 {
     dprintf(("KERNEL32: MoveFileA %s %s", arg1, arg2));
-    return O32_MoveFile(arg1, arg2);
+    return OSLibDosMoveFile(arg1, arg2);
 }
 //******************************************************************************
@@ -790 +786 @@
               DWORD, fdwFlags)
 {
-    dprintf(("KERNEL32:  MoveFileExA %s to %s, not complete!\n", arg1, arg2));
-    return O32_MoveFile(arg1, arg2);
+    dprintf(("KERNEL32:  MoveFileExA %s to %s %x, not complete!\n", arg1, arg2, fdwFlags));
+    return OSLibDosMoveFile(arg1, arg2);
 }
 //******************************************************************************
@@ -804 +800 @@
   asciisrc  = UnicodeToAsciiString((LPWSTR)lpSrc);
   asciidest = UnicodeToAsciiString((LPWSTR)lpDest);
-  rc = O32_MoveFile(asciisrc, asciidest);
+  rc = MoveFileA(asciisrc, asciidest);
   FreeAsciiString(asciisrc);
   FreeAsciiString(asciidest);
@@ -816 +812 @@
               DWORD, fdwFlags)
 {
-    dprintf(("KERNEL32:  MoveFileExW %s to %s, not complete!\n", arg1, arg2));
+    dprintf(("KERNEL32:  MoveFileExW %ls to %ls %x, not complete!", arg1, arg2, fdwFlags));
     return MoveFileW(arg1, arg2);
 }