Changeset 9660 for trunk/src/kernel32/oslibdos.cpp

Timestamp:

Jan 10, 2003, 4:19:54 PM (23 years ago)

Author:

sandervl

Message:

changes for inheritance (check security structure); workaround for PeekNamedPipe with unnamed pipes; support input/output redirection for child processes

File:

• trunk/src/kernel32/oslibdos.cpp (modified) (2 diffs)

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.111 2003-01-10 12:57:13 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.112 2003-01-10 15:19:54 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -1840 +1840 @@
 //******************************************************************************
 BOOL OSLibDosPeekNamedPipe(DWORD   hPipe,
-                        LPVOID  lpvBuffer,
-                        DWORD   cbBuffer,
-                        LPDWORD lpcbRead,
-                        LPDWORD lpcbAvail,
-                        LPDWORD lpcbMessage)
+                           LPVOID  lpvBuffer,
+                           DWORD   cbBuffer,
+                           LPDWORD lpcbRead,
+                           LPDWORD lpcbAvail,
+                           LPDWORD lpcbMessage)
 {
   DWORD     rc;
   AVAILDATA availData ={0};
-  ULONG     ulDummy;
-
-  rc=DosPeekNPipe(hPipe,lpvBuffer,cbBuffer,lpcbRead,&availData,&ulDummy);
+  ULONG     ulState, ulRead, ulMessage;
+  char      buffer;
+
+  if(lpcbRead == NULL) {
+      lpcbRead = &ulRead;
+  }
+  if(lpcbMessage == NULL) {
+      lpcbMessage = &ulMessage;
+  }
+  if(lpvBuffer == NULL) {
+      lpvBuffer = &buffer;
+      cbBuffer = 0;
+  }
+
+  rc = DosPeekNPipe(hPipe,lpvBuffer,cbBuffer,lpcbRead,&availData,&ulState);
 
   dprintf(("DosPeekNPipe returned rc=%d",rc));
 
-  if (!rc)
-  {
-    *lpcbAvail   = availData.cbpipe;
-    *lpcbMessage = availData.cbmessage;
+  //OS/2 doesn't support DosPeekNPipe for unnamed pipes; win32 does
+  if (rc == 1) {
+     dprintf(("WARNING: Pretend broken pipe for PeekNamedPipe with unnamed pipe handle"));
+     SetLastError(ERROR_BROKEN_PIPE_W);
+     return FALSE;
+  }
+  if (rc == NO_ERROR)
+  {
+    if(lpcbAvail) {
+        *lpcbAvail   = availData.cbpipe;
+    }
+    if(lpcbMessage) {
+        *lpcbMessage = availData.cbmessage;
+    }
     SetLastError(ERROR_SUCCESS_W);
     return (TRUE);