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

Timestamp:

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

Author:

sandervl

Message:

Rewrote CopyFile, MoveFile & RemoveDirectory

File:

• trunk/src/kernel32/directory.cpp (modified) (4 diffs)

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);
 }