- fixed ConnectNamedPipe to properly wait on completion for synchronous operations

- prevent completion port notification by not passing an APC context to the kernel when the low-order bit of the event handle is set (for asynchronous operations)

svn path=/trunk/; revision=15048

reactos/lib/kernel32/file/npipe.c

@@ -300,37 +300,53 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName,
  * @implemented
  */
 BOOL STDCALL
-ConnectNamedPipe(HANDLE hNamedPipe,
+ConnectNamedPipe(IN HANDLE hNamedPipe,
-		 LPOVERLAPPED lpOverlapped)
+                 IN LPOVERLAPPED lpOverlapped)
 {
-  PIO_STATUS_BLOCK IoStatusBlock;
-  IO_STATUS_BLOCK Iosb;
-  HANDLE hEvent;
    NTSTATUS Status;
    
    if (lpOverlapped != NULL)
      {
+        PVOID ApcContext;
+        
         lpOverlapped->Internal = STATUS_PENDING;
-      hEvent = lpOverlapped->hEvent;
+        ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped);
-      IoStatusBlock = (PIO_STATUS_BLOCK)lpOverlapped;
-    }
-  else
-    {
-      IoStatusBlock = &Iosb;
-      hEvent = NULL;
-    }
         
         Status = NtFsControlFile(hNamedPipe,
-			   hEvent,
+                                 lpOverlapped->hEvent,
                                  NULL,
-			   NULL,
+                                 ApcContext,
-			   IoStatusBlock,
+                                 (PIO_STATUS_BLOCK)lpOverlapped,
                                  FSCTL_PIPE_LISTEN,
                                  NULL,
                                  0,
                                  NULL,
                                  0);
-  if ((lpOverlapped == NULL) && (Status == STATUS_PENDING))
+
+        /* return FALSE in case of failure and pending operations! */
+        if (!NT_SUCCESS(Status) || Status == STATUS_PENDING)
+          {
+             SetLastErrorByStatus(Status);
+             return FALSE;
+          }
+     }
+   else
+     {
+        IO_STATUS_BLOCK Iosb;
+        
+        Status = NtFsControlFile(hNamedPipe,
+                                 NULL,
+                                 NULL,
+                                 NULL,
+                                 &Iosb,
+                                 FSCTL_PIPE_LISTEN,
+                                 NULL,
+                                 0,
+                                 NULL,
+                                 0);
+
+        /* wait in case operation is pending */
+        if (Status == STATUS_PENDING)
           {
              Status = NtWaitForSingleObject(hNamedPipe,
                                             FALSE,
@@ -341,12 +357,12 @@ ConnectNamedPipe(HANDLE hNamedPipe,
                }
           }
 
-  if ((!NT_SUCCESS(Status) && Status != STATUS_PIPE_CONNECTED) ||
+        if (!NT_SUCCESS(Status))
-      (Status == STATUS_PENDING))
           {
              SetLastErrorByStatus(Status);
              return FALSE;
           }
+     }
 
    return TRUE;
 }