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

Timestamp:

Sep 20, 2000, 11:32:58 PM (25 years ago)

Author:

hugh

Message:

Implemented Serial APIs

File:

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

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.40 2000-09-18 19:26:15 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.41 2000-09-20 21:32:50 hugh Exp $ */
 
 /*
@@ -91 +91 @@
   dprintf(("FindFirstFileA %s", lpFileName));
   if(lpFileName == NULL || lpFindFileData == NULL) {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return -1;
+  SetLastError(ERROR_INVALID_PARAMETER);
+  return -1;
   }
   namelen = strlen(lpFileName);
   if(lpFileName[namelen-1] == '\\') {
-        filename = (char *)alloca(namelen+1);
-        strcpy(filename, lpFileName);
-        filename[namelen-1] = 0;
-  }
-  else  filename = (char *)lpFileName;
+  filename = (char *)alloca(namelen+1);
+  strcpy(filename, lpFileName);
+  filename[namelen-1] = 0;
+  }
+  else  filename = (char *)lpFileName;
 
   return (HANDLE)OSLibDosFindFirst(filename,lpFindFileData);
@@ -244 +244 @@
 {
    if (lpft1 == NULL || lpft2 == NULL) {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return -1;
-   }     
+  SetLastError(ERROR_INVALID_PARAMETER);
+  return -1;
+   }
 
    if(lpft1->dwHighDateTime > lpft2->dwHighDateTime)
-        return 1;
+  return 1;
 
    if(lpft1->dwHighDateTime < lpft2->dwHighDateTime)
-        return -1;
+  return -1;
 
    if(lpft1->dwLowDateTime > lpft2->dwLowDateTime)
-        return 1;
+  return 1;
 
    if(lpft1->dwLowDateTime < lpft2->dwLowDateTime)
-        return -1;
+  return -1;
 
    return 0; //equal
@@ -342 +342 @@
   if((dwCopyFlags & COPY_FILE_FAIL_IF_EXISTS) != 0)
   {
-        failIfExists = TRUE;
+      failIfExists = TRUE;
   }
 
@@ -416 +416 @@
   rc = OSLibDosDelete((LPSTR)lpszFile);
   if(!rc) {
-        dprintf(("DeleteFileA %s returned FALSE; last error %x", lpszFile, GetLastError()));
-        if(GetLastError() == 20) {
-                return TRUE;
-        }
-  } 
+    dprintf(("DeleteFileA %s returned FALSE; last error %x", lpszFile, GetLastError()));
+  if(GetLastError() == 20) {
+    return TRUE;
+  }
+  }
   else  dprintf(("DeleteFileA %s", lpszFile));
 
@@ -509 +509 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION5(BOOL,         ReadFileEx, 
+ODINFUNCTION5(BOOL,         ReadFileEx,
               HANDLE,       hFile,
               LPVOID,       lpBuffer,
@@ -557 +557 @@
  *****************************************************************************/
 
-ODINFUNCTION5(BOOL,         WriteFileEx, 
+ODINFUNCTION5(BOOL,         WriteFileEx,
               HANDLE,       hFile,
               LPVOID,       lpBuffer,
@@ -599 +599 @@
     }
     else {
-        rc = O32_GetFileAttributes((LPSTR)lpszFileName);
-        if(rc == -1 && lpszFileName[strlen(lpszFileName)-1] != '\\') {
-                char *filename = (char *)alloca(strlen(lpszFileName)+2); //+2!!!!!!
-                strcpy(filename, lpszFileName);
+  rc = O32_GetFileAttributes((LPSTR)lpszFileName);
+  if(rc == -1 && lpszFileName[strlen(lpszFileName)-1] != '\\') {
+    char *filename = (char *)alloca(strlen(lpszFileName)+2); //+2!!!!!!
+    strcpy(filename, lpszFileName);
                 strcat(filename, "\\");
-                rc = O32_GetFileAttributes((LPSTR)filename);
-        }
+    rc = O32_GetFileAttributes((LPSTR)filename);
+  }
     }
     //SvL: Open32 returns FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_NORMAL for
     //     directories whereas NT 4 (SP6) only returns FILE_ATTRIBUTE_DIRECTORY
     if(rc != -1 && (rc & FILE_ATTRIBUTE_DIRECTORY)) {
-        rc = FILE_ATTRIBUTE_DIRECTORY;
+  rc = FILE_ATTRIBUTE_DIRECTORY;
     }
 
@@ -671 +671 @@
 {
     char *ptr;
-    dprintf(("KERNEL32:  GetFullPathName %s\n", arg1));
+    DWORD rc;
+    dprintf(("KERNEL32:  GetFullPathName called with %s %d %s \n", arg1, arg2, arg3));
       while((ptr = strchr(arg1, '/')) != NULL)
         *ptr = '\\';
@@ -913 +914 @@
   length = lstrlenA(lpszLongPath) + 1;
   if(length > cchBuffer) {
-        if(lpszShortPath) {
-                *lpszShortPath = 0;
-        }
+  if(lpszShortPath) {
+          *lpszShortPath = 0;
+  }
         return(length); //return length required (including 0 terminator)
   }
@@ -938 +939 @@
   length = lstrlenW(lpszLongPath) + 1;
   if(length > cchBuffer) {
-        if(lpszShortPath) {
-                *lpszShortPath = 0;
-        }
+  if(lpszShortPath) {
+          *lpszShortPath = 0;
+  }
         return(length); //return length required (including 0 terminator)
   }
@@ -1142 +1143 @@
 
     lpAsciiPath = UnicodeToAsciiString( (LPWSTR) lpPathName);
-    hChange = FindFirstChangeNotificationA(lpAsciiPath, bWatchSubtree, 
+    hChange = FindFirstChangeNotificationA(lpAsciiPath, bWatchSubtree,
                                            dwNotifyFilter );
     if (lpAsciiPath) FreeAsciiString(lpAsciiPath);