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

Timestamp:

Jun 1, 2000, 1:28:48 PM (25 years ago)

Author:

sandervl

Message:

Rewrote file io apis

File:

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

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.33 2000-05-22 19:07:53 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.34 2000-06-01 11:28:45 sandervl Exp $ */
 
 /*
@@ -234 +234 @@
 //******************************************************************************
 ODINFUNCTION2(INT, CompareFileTime,
-              FILETIME *, arg1,
-              FILETIME *, arg2)
-{
-  return O32_CompareFileTime(arg1, arg2);
+              FILETIME *, lpft1,
+              FILETIME *, lpft2)
+{
+   if (lpft1 == NULL || lpft2 == NULL) {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return -1;
+   }     
+
+   if(lpft1->dwHighDateTime > lpft2->dwHighDateTime)
+        return 1;
+
+   if(lpft1->dwHighDateTime < lpft2->dwHighDateTime)
+        return -1;
+
+   if(lpft1->dwLowDateTime > lpft2->dwLowDateTime)
+        return 1;
+
+   if(lpft1->dwLowDateTime < lpft2->dwLowDateTime)
+        return -1;
+
+   return 0; //equal
 }
 //******************************************************************************
@@ -288 +305 @@
  BOOL rc;
 
-  rc = O32_DeleteFile(lpszFile);
+#if 0
+  return 1;
+#else
+  rc = OSLibDosDelete((LPSTR)lpszFile);
   if(!rc) {
         dprintf(("DeleteFileA %s returned FALSE; last error %x", lpszFile, GetLastError()));
@@ -298 +318 @@
 
   return rc;
+#endif
 }
 //******************************************************************************
@@ -382 +403 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION4(DWORD, SetFilePointer,
-              HANDLE, hFile,
-              LONG, lDistanceToMove,
-              PLONG, lpDistanceToMoveHigh,
-              DWORD, dwMoveMethod)
-{
-  dprintf(("KERNEL32: SetFilePointer(%08xh,%08xh,%08xh,%08xh)\n",
-           hFile,
-           lDistanceToMove,
-           lpDistanceToMoveHigh,
-           dwMoveMethod));
-
-  return(HMSetFilePointer(hFile,
-                         lDistanceToMove,
-                         lpDistanceToMoveHigh,
-                         dwMoveMethod));
+ODINFUNCTION5(BOOL,         ReadFileEx, 
+              HANDLE,       hFile,
+              LPVOID,       lpBuffer,
+              DWORD,        nNumberOfBytesToRead,
+              LPOVERLAPPED, lpOverlapped,
+              LPOVERLAPPED_COMPLETION_ROUTINE,  lpCompletionRoutine)
+{
+  return (HMReadFileEx(hFile,
+                       lpBuffer,
+                       nNumberOfBytesToRead,
+                       lpOverlapped, lpCompletionRoutine));
 }
 //******************************************************************************
@@ -408 +424 @@
               LPOVERLAPPED, lpOverlapped)
 {
-  dprintf(("KERNEL32: WriteFile(%08xh,%08xh,%08xh,%08xh,%08xh)\n",
-           hFile,
-           buffer,
-           nrbytes,
-           nrbyteswritten,
-           lpOverlapped));
-
   return (HMWriteFile(hFile,
                       buffer,
@@ -420 +429 @@
                       nrbyteswritten,
                       lpOverlapped));
+}
+/*****************************************************************************
+ * Name      : BOOL WriteFileEx
+ * Purpose   : The WriteFileEx function writes data to a file. It is designed
+ *             solely for asynchronous operation, unlike WriteFile, which is
+ *             designed for both synchronous and asynchronous operation.
+ *             WriteFileEx reports its completion status asynchronously,
+ *             calling a specified completion routine when writing is completed
+ *             and the calling thread is in an alertable wait state.
+ * Parameters: HANDLE       hFile                handle of file to write
+ *             LPVOID       lpBuffer             address of buffer
+ *             DWORD        nNumberOfBytesToRead number of bytes to write
+ *             LPOVERLAPPED lpOverlapped         address of offset
+ *             LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine address of completion routine
+ * Variables :
+ * Result    : TRUE / FALSE
+ * Remark    :
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
+ *****************************************************************************/
+
+ODINFUNCTION5(BOOL,         WriteFileEx, 
+              HANDLE,       hFile,
+              LPVOID,       lpBuffer,
+              DWORD,        nNumberOfBytesToWrite,
+              LPOVERLAPPED, lpOverlapped,
+              LPOVERLAPPED_COMPLETION_ROUTINE,  lpCompletionRoutine)
+{
+  return (HMWriteFileEx(hFile,
+                        lpBuffer,
+                        nNumberOfBytesToWrite,
+                        lpOverlapped, lpCompletionRoutine));
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION4(DWORD, SetFilePointer,
+              HANDLE, hFile,
+              LONG, lDistanceToMove,
+              PLONG, lpDistanceToMoveHigh,
+              DWORD, dwMoveMethod)
+{
+  dprintf(("KERNEL32: SetFilePointer(%08xh,%08xh,%08xh,%08xh)\n",
+           hFile,
+           lDistanceToMove,
+           lpDistanceToMoveHigh,
+           dwMoveMethod));
+
+  return(HMSetFilePointer(hFile,
+                         lDistanceToMove,
+                         lpDistanceToMoveHigh,
+                         dwMoveMethod));
 }
 //******************************************************************************
@@ -751 +812 @@
            lpOverlapped));
 
-  return(HMUnlockFile(hFile,
-                      lpOverlapped->Offset,
-                      lpOverlapped->OffsetHigh,
-                      nNumberOfBytesToLockLow,
-                      nNumberOfBytesToLockHigh));
+  return(HMUnlockFileEx(hFile, dwReserved,
+                        nNumberOfBytesToLockLow,
+                        nNumberOfBytesToLockHigh,
+                        lpOverlapped));
 }
 //******************************************************************************