Changeset 3819 for trunk/src/kernel32/npipe.cpp

Timestamp:

Jul 12, 2000, 8:21:45 PM (25 years ago)

Author:

sandervl

Message:

PD: added handlemanager support for named & unnamed pipes

File:

• trunk/src/kernel32/npipe.cpp (modified) (15 diffs)

trunk/src/kernel32/npipe.cpp

@@ -1 @@
-/* $Id: npipe.cpp,v 1.8 2000-06-28 21:05:56 phaller Exp $ */
+/* $Id: npipe.cpp,v 1.9 2000-07-12 18:21:44 sandervl Exp $ */
 /*
  * Win32 Named pipes API
@@ -15 +15 @@
 #include <heapstring.h>
 #include <options.h>
+#include <HandleManager.h>
 #include "debugtools.h"
 #include "oslibdos.h"
+
 
 #define DBG_LOCALLOG    DBG_npipe
@@ -32 +34 @@
                                  LPDWORD,lpcbMessage)
 {
-  return(OSLibDosPeekNamedPipe(hPipe,lpvBuffer,cbBuffer,lpcbRead,lpcbAvail,lpcbMessage));
+  return (HMPeekNamedPipe(hPipe,lpvBuffer,cbBuffer,lpcbRead,lpcbAvail,lpcbMessage));
 }
 //******************************************************************************
@@ -43 +45 @@
               DWORD,                cbPipe)
 {
-  // @@@PH Note: HandleManager support is missing!
-  
-  if(!OSLibDosCreatePipe(phRead,
-                          phWrite,
-                          lpsa,
-                          cbPipe))
-    return TRUE;
-  else
-    return(FALSE);
+  return (HMCreatePipe(phRead,phWrite,lpsa,cbPipe));
 }
 
@@ -60 +54 @@
                                      DWORD, nMaxInstances, DWORD, nOutBufferSize,
                                      DWORD, nInBufferSize, DWORD, nDefaultTimeOut,
-                                     void*, lpSecurityAttributes)
-
-{
-  HANDLE hPipe;
-
-  hPipe = OSLibDosCreateNamedPipe(lpName,
-                                  dwOpenMode,
-                                  dwPipeMode,
-                                  nMaxInstances,
-                                  nOutBufferSize,
-                                  nInBufferSize,
-                                  nDefaultTimeOut,
-                                  lpSecurityAttributes);
-
-  return hPipe;
+                                     LPSECURITY_ATTRIBUTES, lpSecurityAttributes)
+
+{
+  return (HMCreateNamedPipe(lpName,
+                            dwOpenMode,
+                            dwPipeMode,
+                            nMaxInstances,
+                            nOutBufferSize,
+                            nInBufferSize,
+                            nDefaultTimeOut,
+                            lpSecurityAttributes));
 
 }
@@ -82 +72 @@
                                      DWORD, nMaxInstances, DWORD, nOutBufferSize,
                                      DWORD, nInBufferSize, DWORD, nDefaultTimeOut,
-                                     void *,lpSecurityAttributes)
+                                     LPSECURITY_ATTRIBUTES,lpSecurityAttributes)
 {
   char *asciiname;
@@ -89 +79 @@
   asciiname  = UnicodeToAsciiString((LPWSTR)lpName);
 
-  hPipe=OSLibDosCreateNamedPipe(asciiname,
-                           dwOpenMode,
-                           dwPipeMode,
-                           nMaxInstances,
-                           nOutBufferSize,
-                           nInBufferSize,
-                           nDefaultTimeOut,
-                           lpSecurityAttributes);
+  hPipe=HMCreateNamedPipe(asciiname,
+                          dwOpenMode,
+                          dwPipeMode,
+                          nMaxInstances,
+                          nOutBufferSize,
+                          nInBufferSize,
+                          nDefaultTimeOut,
+                          lpSecurityAttributes);
 
   FreeAsciiString(asciiname);
@@ -123 +113 @@
  * Author    : Przemyslaw Dobrowolski [Sun, 2000/01/02 12:48]
  *****************************************************************************/
-
 ODINFUNCTION2(BOOL,ConnectNamedPipe,HANDLE,hNamedPipe, LPOVERLAPPED,lpOverlapped)
 {
-  return (OSLibDosConnectNamedPipe(hNamedPipe,lpOverlapped));
+  return (HMConnectNamedPipe(hNamedPipe,lpOverlapped));
 }
 
@@ -238 +227 @@
   return(rc);
 }
+
 /*****************************************************************************
  * Name      : BOOL WIN32API DisconnectNamedPipe
@@ -254 +244 @@
 ODINFUNCTION1(BOOL,DisconnectNamedPipe,HANDLE,hNamedPipe)
 {
-  return (OSLibDosDisconnectNamedPipe(hNamedPipe));
+  return (HMDisconnectNamedPipe(hNamedPipe));
 }
 
@@ -285 +275 @@
                                           DWORD   nMaxUserNameSize)
 {
-  dprintf(("KERNEL32: GetNamedPipeHandleStateA(%08xh,%08xh,%08xh,%08xh,%08xh,%08xh,%08xh) not implemented (yet)\n",
-           hNamedPipe,
-           lpState,
-           lpCurInstances,
-           lpMaxCollectionCount,
-           lpCollectDataTimeout,
-           lpUserName,
-           nMaxUserNameSize));
-
-  return (FALSE);
+  // Not implemented but waiting to implementation in hmnpipe.cpp
+  return ( HMGetNamedPipeHandleState( hNamedPipe,
+                                       lpState,
+                                       lpCurInstances,
+                                       lpMaxCollectionCount,
+                                       lpCollectDataTimeout,
+                                       lpUserName,
+                                       nMaxUserNameSize));
 }
 
@@ -326 +314 @@
                                           DWORD   nMaxUserNameSize)
 {
-  dprintf(("KERNEL32: GetNamedPipeHandleStateW(%08xh,%08xh,%08xh,%08xh,%08xh,%08xh,%08xh) not implemented\n",
-           hNamedPipe,
-           lpState,
-           lpCurInstances,
-           lpMaxCollectionCount,
-           lpCollectDataTimeout,
-           lpUserName,
-           nMaxUserNameSize));
-
-  return (FALSE);
+  char *asciiname;
+  BOOL rc;
+
+  asciiname  = UnicodeToAsciiString((LPWSTR)lpUserName);
+
+  // Not implemented but waiting to implementation in hmnpipe.cpp
+  rc= HMGetNamedPipeHandleState( hNamedPipe,
+                                  lpState,
+                                  lpCurInstances,
+                                  lpMaxCollectionCount,
+                                  lpCollectDataTimeout,
+                                  asciiname,
+                                  nMaxUserNameSize);
+
+
+  FreeAsciiString(asciiname);
+
+  return (rc);
 }
 
@@ -361 +357 @@
                                   LPDWORD lpMaxInstances)
 {
-  dprintf(("KERNEL32: GetNamedPipeInfo(%08xh,%08xh,%08xh,%08xh,%08xh) not implemented\n",
-           hNamedPipe,
-           lpFlags,
-           lpOutBufferSize,
-           lpInBufferSize,
-           lpMaxInstances));
-
-  return (FALSE);
+  // Not implemented but waiting to implementation in hmnpipe.cpp
+  return ( HMGetNamedPipeInfo( hNamedPipe,
+                               lpFlags,
+                               lpOutBufferSize,
+                               lpInBufferSize,
+                               lpMaxInstances));
+
 }
 
@@ -395 +390 @@
                                       LPDWORD lpdwCollectDataTimeout)
 {
-  dprintf(("KERNEL32: SetNamedPipeHandleState(%08xh,%08xh,%08xh,%08xh) not implemented.\n",
-           hNamedPipe,
-           lpdwMode,
-           lpcbMaxCollect,
-           lpdwCollectDataTimeout));
-
-  return (FALSE);
+  // Not implemented but waiting to implementation in hmnpipe.cpp
+  return ( HMSetNamedPipeHandleState( hNamedPipe,
+                               lpdwMode,
+                               lpcbMaxCollect,
+                               lpdwCollectDataTimeout));
 }
 
@@ -432 +425 @@
                                       LPOVERLAPPED,lpo)
 {
-  return(OSLibDosTransactNamedPipe( hNamedPipe,
-                                    lpvWriteBuf,
-                                    cbWriteBuf,
-                                    lpvReadBuf,
-                                    cbReadBuf,
-                                    lpcbRead,
-                                    lpo));
-
+  return(HMTransactNamedPipe( hNamedPipe,
+                              lpvWriteBuf,
+                              cbWriteBuf,
+                              lpvReadBuf,
+                              cbReadBuf,
+                              lpcbRead,
+                              lpo));
 }