commit 88cd32b2d15bccdac5e9a26206a6e1727b5360bc
author Martin Wilck <Martin.Wilck@fujitsu-siemens.com> Wed Jan 09 20:30:51 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Jan 09 20:30:51 2002 +0000
tree b155836953cb58a1ceae4202d8bebc23135be3d7
parent 06ffc1aba34734b03f9023eb04522bb14d041bb6

More general approach to file descriptor types and flags.

files/file.c

diff --git a/files/file.c b/files/file.c
index 4dd4847..06ea389 100644
--- a/files/file.c
+++ b/files/file.c
@@ -210,7 +210,7 @@
  * Retrieve the Unix handle corresponding to a file handle.
  * Returns -1 on failure.
  */
-int FILE_GetUnixHandleType( HANDLE handle, DWORD access, DWORD *type )
+static int FILE_GetUnixHandleType( HANDLE handle, DWORD access, enum fd_type *type, DWORD *flags )
 {
     int ret, fd = -1;
 
@@ -225,6 +225,7 @@
                 fd = reply->fd;
             }
             if (type) *type = reply->type;
+            if (flags) *flags = reply->flags;
         }
         SERVER_END_REQ;
         if (ret) return -1;
@@ -250,7 +251,7 @@
  */
 int FILE_GetUnixHandle( HANDLE handle, DWORD access )
 {
-    return FILE_GetUnixHandleType(handle, access, NULL);
+    return FILE_GetUnixHandleType( handle, access, NULL, NULL );
 }
 
 /*************************************************************************
@@ -1449,7 +1450,8 @@
                         LPDWORD bytesRead, LPOVERLAPPED overlapped )
 {
     int unix_handle, result;
-    DWORD type;
+    enum fd_type type;
+    DWORD flags;
 
     TRACE("%d %p %ld %p %p\n", hFile, buffer, bytesToRead, 
           bytesRead, overlapped );
@@ -1457,11 +1459,10 @@
     if (bytesRead) *bytesRead = 0;  /* Do this before anything else */
     if (!bytesToRead) return TRUE;
 
-    unix_handle = FILE_GetUnixHandleType( hFile, GENERIC_READ, &type );
+    unix_handle = FILE_GetUnixHandleType( hFile, GENERIC_READ, &type, &flags );
 
-    switch (type)
+    if (flags & FD_FLAG_OVERLAPPED)
     {
-    case FD_TYPE_OVERLAPPED:
 	if (unix_handle == -1) return FALSE;
         if ( (overlapped==NULL) || NtResetEvent( overlapped->hEvent, NULL ) )
         {
@@ -1506,13 +1507,16 @@
         /* fail on return, with ERROR_IO_PENDING */
         SetLastError(ERROR_IO_PENDING);
         return FALSE;
-
-    case FD_TYPE_CONSOLE:
-	return ReadConsoleA(hFile, buffer, bytesToRead, bytesRead, NULL);
-
-    case FD_TYPE_TIMEOUT:
+    }
+    if (flags & FD_FLAG_TIMEOUT)
+    {
         close(unix_handle);
         return FILE_TimeoutRead(hFile, buffer, bytesToRead, bytesRead);
+    }
+    switch(type)
+    {
+    case FD_TYPE_CONSOLE:
+	return ReadConsoleA(hFile, buffer, bytesToRead, bytesRead, NULL);
 
     default:
 	/* normal unix files */
@@ -1668,7 +1672,8 @@
                          LPDWORD bytesWritten, LPOVERLAPPED overlapped )
 {
     int unix_handle, result;
-    DWORD type;
+    enum fd_type type;
+    DWORD flags;
 
     TRACE("%d %p %ld %p %p\n", hFile, buffer, bytesToWrite, 
           bytesWritten, overlapped );
@@ -1676,11 +1681,10 @@
     if (bytesWritten) *bytesWritten = 0;  /* Do this before anything else */
     if (!bytesToWrite) return TRUE;
 
-    unix_handle = FILE_GetUnixHandleType( hFile, GENERIC_WRITE, &type );
+    unix_handle = FILE_GetUnixHandleType( hFile, GENERIC_WRITE, &type, &flags );
 
-    switch (type)
+    if (flags & FD_FLAG_OVERLAPPED)
     {
-    case FD_TYPE_OVERLAPPED:
 	if (unix_handle == -1) return FALSE;
         if ( (overlapped==NULL) || NtResetEvent( overlapped->hEvent, NULL ) )
         {
@@ -1727,7 +1731,10 @@
         /* fail on return, with ERROR_IO_PENDING */
         SetLastError(ERROR_IO_PENDING);
         return FALSE;
+    }
 
+    switch(type)
+    {
     case FD_TYPE_CONSOLE:
 	TRACE("%d %s %ld %p %p\n", hFile, debugstr_an(buffer, bytesToWrite), bytesToWrite, 
 	      bytesWritten, overlapped );