commit 4634447d6bb8c3f80d35ba8a0ad72134fd51635d
author Eric Pouech <pouech-eric@wanadoo.fr> Fri Jan 14 19:54:38 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Jan 14 19:54:38 2005 +0000
tree 23c81426b9b1247db5d85fe5fb7b75f20cfb20b4
parent 3e55df3925d24c1085362d267b7d9dcc87d4e56b

- got rid of include/async.h
- fixed some overlapped issues in socket handling
- moved kernel32.CancelIo implementation to ntdll

dlls/kernel/file.c

diff --git a/dlls/kernel/file.c b/dlls/kernel/file.c
index e63bb8e..b1817ac 100644
--- a/dlls/kernel/file.c
+++ b/dlls/kernel/file.c
@@ -43,7 +43,8 @@
 #include "excpt.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
-#include "async.h"
+#include "thread.h"
+#include "wine/server.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(file);
 
@@ -512,7 +513,7 @@
         else
         {
             /* busy loop */
-            while ( (volatile DWORD)lpOverlapped->Internal == STATUS_PENDING )
+            while ( ((volatile OVERLAPPED*)lpOverlapped)->Internal == STATUS_PENDING )
                 Sleep( 10 );
         }
     }
@@ -532,7 +533,7 @@
     }
     if ( r == WAIT_FAILED )
     {
-        ERR("wait operation failed\n");
+        WARN("wait operation failed\n");
         return FALSE;
     }
     if (lpTransferred) *lpTransferred = lpOverlapped->InternalHigh;
@@ -556,17 +557,14 @@
  */
 BOOL WINAPI CancelIo(HANDLE handle)
 {
-    async_private *ovp,*t;
+    IO_STATUS_BLOCK    io_status;
 
-    TRACE("handle = %p\n",handle);
-
-    for (ovp = NtCurrentTeb()->pending_list; ovp; ovp = t)
+    NtCancelIoFile(handle, &io_status);
+    if (io_status.u.Status)
     {
-        t = ovp->next;
-        if ( ovp->handle == handle )
-             cancel_async ( ovp );
+        SetLastError( RtlNtStatusToDosError( io_status.u.Status ) );
+        return FALSE;
     }
-    SleepEx(1,TRUE);
     return TRUE;
 }