Changeset 6090 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

Rewrote CopyFile, MoveFile & RemoveDirectory

Location:

trunk/src/kernel32

Files:

• Fileio.cpp (modified) (8 diffs)
• directory.cpp (modified) (4 diffs)
• heapstring.cpp (modified) (4 diffs)
• oslibdos.cpp (modified) (2 diffs)
• oslibdos.h (modified) (2 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);
 }

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.36 2001-05-28 16:23:42 phaller Exp $ */
+/* $Id: directory.cpp,v 1.37 2001-06-24 14:13:04 sandervl Exp $ */
 
 /*
@@ -144 +144 @@
   int  rc;
 
-  rc = O32_GetCurrentDirectory(nBufferLength, asciidir);
+  rc = CALL_ODINFUNC(GetCurrentDirectoryA)(nBufferLength, asciidir);
   if(rc != 0)
     AsciiToUnicode(asciidir, lpBuffer);
@@ -507 +507 @@
 
 
-ODINFUNCTION1(BOOL,   RemoveDirectoryA,
-              LPCSTR, lpstrDirectory)
+ODINFUNCTION1(BOOL, RemoveDirectoryA, LPCSTR, lpstrDirectory)
 {
   int len = strlen(lpstrDirectory);
   
+  if(lpstrDirectory == NULL) {
+     SetLastError(ERROR_INVALID_PARAMETER);
+     return FALSE;
+  }
   // cut off trailing backslashes
   if ( (lpstrDirectory[len - 1] == '\\') ||
@@ -523 +526 @@
   }
   
-  dprintf(("RemoveDirectory %s", 
-          lpstrDirectory));
-
-  return O32_RemoveDirectory(lpstrDirectory);
+  dprintf(("RemoveDirectory %s", lpstrDirectory));
+
+  return OSLibDosRemoveDir(lpstrDirectory);
 }
 

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.39 2001-04-04 14:20:32 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.40 2001-06-24 14:13:04 sandervl Exp $ */
 
 /*
@@ -58 +58 @@
            arg1));
 
-  return O32_lstrlen(arg1);
+  return strlen(arg1);
 }
 
@@ -160 +160 @@
       return 1;
 
-    return O32_lstrcmp(arg1, arg2);
+    return strcmp(arg1, arg2);
 }
 
@@ -428 +428 @@
       return 1;
 
-  return O32_lstrcmpi(arg1, arg2);
+  return strcmpi(arg1, arg2);
 }
 

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.69 2001-06-23 19:43:50 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.70 2001-06-24 14:13:04 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -521 +521 @@
 
   rc = DosClose(hFile);
+  SetLastError(error2WinError(rc));
+  return (rc == NO_ERROR);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibDosCopyFile(LPCSTR lpszOldFile, LPCSTR lpszNewFile, BOOL fFailIfExist)
+{
+ APIRET rc;
+
+  rc = DosCopy((PSZ)lpszOldFile, (PSZ)lpszNewFile, fFailIfExist ? 0: DCPY_EXISTING);
+  SetLastError(error2WinError(rc));
+  return (rc == NO_ERROR);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibDosMoveFile(LPCSTR lpszOldFile, LPCSTR lpszNewFile)
+{
+ APIRET rc;
+
+  rc = DosMove((PSZ)lpszOldFile, (PSZ)lpszNewFile);
+  SetLastError(error2WinError(rc));
+  return (rc == NO_ERROR);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibDosRemoveDir(LPCSTR lpszDir)
+{
+ APIRET rc;
+
+  rc = DosDeleteDir((PSZ)lpszDir);
   SetLastError(error2WinError(rc));
   return (rc == NO_ERROR);

trunk/src/kernel32/oslibdos.h

@@ -1 @@
-/* $Id: oslibdos.h,v 1.32 2001-06-20 20:51:59 sandervl Exp $ */
+/* $Id: oslibdos.h,v 1.33 2001-06-24 14:13:05 sandervl Exp $ */
 
 /*
@@ -77 +77 @@
 BOOL OSLibDosClose(DWORD hFile);
 BOOL OSLibDosDelete(char *lpszFileName);
+BOOL OSLibDosCopyFile(LPCSTR lpszOldFile, LPCSTR lpszNewFile, BOOL fFailIfExist);
+BOOL OSLibDosMoveFile(LPCSTR lpszOldFile, LPCSTR lpszNewFile);
+BOOL OSLibDosRemoveDir(LPCSTR lpszDir);
 
 #define OSLIB_SETPTR_FILE_CURRENT       0