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

Timestamp:

Jan 10, 2003, 1:57:14 PM (23 years ago)

Author:

sandervl

Message:

implemented Get/SetHandleInformation; CloseHandle change for HANDLE_FLAG_PROTECT_FROM_CLOSE; inheritance support added to DuplicateHandle

File:

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

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.110 2002-12-19 12:55:27 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.111 2003-01-10 12:57:13 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -430 +430 @@
  HFILE  hFile;
  ULONG  ulAction;
- DWORD  os2flags = OPEN_FLAGS_NOINHERIT;
+ DWORD  os2flags = OPEN_FLAGS_NOINHERIT; //default is not inherited by child processes
  char lOemFileName[260];
 
@@ -843 +843 @@
    ULONG   fileAttr = FILE_NORMAL;
    ULONG   openFlag = 0;
-   ULONG   openMode = 0;
+   ULONG   openMode = OPEN_FLAGS_NOINHERIT; //default is not inherited by child processes
    APIRET  rc = ERROR_NOT_ENOUGH_MEMORY;;
 
@@ -1020 +1020 @@
    ULONG   fileAttr = FILE_NORMAL;
    ULONG   openFlag = 0;
-   ULONG   openMode = 0;
+   ULONG   openMode = OPEN_FLAGS_NOINHERIT; //default is not inherited by child processes
    APIRET  rc = ERROR_NOT_ENOUGH_MEMORY;
    HFILE   hFile;
@@ -1471 +1471 @@
 }
 //******************************************************************************
+//******************************************************************************
+DWORD OSLibDosSetFHState(DWORD hFile, DWORD dwFlags)
+{
+   DWORD  ulMode;
+   APIRET rc;
+   
+   rc = DosQueryFHState(hFile, &ulMode);
+   if(rc != NO_ERROR) return error2WinError(rc);
+
+   //turn off non-participating bits
+   ulMode &= 0x7F88;
+
+   if(dwFlags & HANDLE_FLAG_INHERIT_W) {
+       ulMode &= ~OPEN_FLAGS_NOINHERIT;
+   }
+   else 
+       ulMode |= OPEN_FLAGS_NOINHERIT;
+
+   rc = DosSetFHState(hFile, ulMode);
+   return error2WinError(rc);
+}
+//******************************************************************************
 //Returns time spent in kernel & user mode in milliseconds
 //******************************************************************************
@@ -1515 +1537 @@
                                DWORD   nDefaultTimeOut,
                                LPSECURITY_ATTRIBUTES lpSecurityAttributes)
-{  DWORD dwOS2Mode     = 0;
+{  DWORD dwOS2Mode     = NP_NOINHERIT; //default is not inherited by child processes
    DWORD dwOS2PipeMode = 0;
    LPSTR lpOS2Name;
@@ -1574 +1596 @@
   rc = DosOpen(lpOS2Name, &hPipe, &ulAction, 0, FILE_NORMAL, FILE_OPEN,
                ((dwOpenMode & PIPE_ACCESS_INBOUND_W) ? OPEN_ACCESS_READWRITE : OPEN_ACCESS_READONLY) |
-               OPEN_SHARE_DENYNONE, NULL);
+               OPEN_SHARE_DENYNONE | OPEN_FLAGS_NOINHERIT, NULL);
 
   if(rc == NO_ERROR) {
@@ -1646 +1668 @@
   ULONG rc, ulAction;
   ULONG openFlag = 0;
-  ULONG openMode = 0;
+  ULONG openMode = OPEN_FLAGS_NOINHERIT; //default is not inherited by child processes
 
 
@@ -2609 +2631 @@
         if (DosOpen("\\DEV\\CD-ROM2$", &hCDRom2, &ulAction, 0,
                     FILE_NORMAL, OPEN_ACTION_OPEN_IF_EXISTS,
-                    OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY, NULL)
+                    OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY | OPEN_FLAGS_NOINHERIT, NULL)
             == NO_ERROR)
         {
@@ -2864 +2886 @@
         if (DosOpen("\\DEV\\CD-ROM2$", &hCDRom2, &ulAction, 0,
                     FILE_NORMAL, OPEN_ACTION_OPEN_IF_EXISTS,
-                    OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY, NULL)
+                    OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY | OPEN_FLAGS_NOINHERIT, NULL)
             == NO_ERROR)
         {