Changeset 8773 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Jun 26, 2002, 9:13:00 AM (23 years ago)

Author:

sandervl

Message:

KSO: Console Ctrl Handlers updates; GetFileType on std files doesn't always return TYPE_CHAR; Enable writing to STDERRconodin32.cpp

File:

• trunk/src/kernel32/wprocess.cpp (modified) (20 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.155 2002-06-16 08:20:36 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.156 2002-06-26 07:13:00 sandervl Exp $ */
 
 /*
@@ -41 +41 @@
 
 #include "console.h"
+#include "wincon.h"
 #include "cio.h"
 #include "versionos2.h"    /*PLF Wed  98-03-18 02:36:51*/
@@ -72 +73 @@
 //Process database
 PDB          ProcessPDB = {0};
+ENVDB        ProcessENVDB = {0};
+CONCTRLDATA  ProcessConCtrlData = {0};
 STARTUPINFOA StartupInfo = {0};
 CHAR         unknownPDBData[16] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 ,0 ,0};
@@ -193 +196 @@
 }
 //******************************************************************************
-// Set up the TIB selector and memory for the main thread 
+// Set up the TIB selector and memory for the main thread
 //******************************************************************************
 TEB *WIN32API InitializeMainThread()
@@ -240 +243 @@
     ProcessPDB.tls_bits[1]     = 0;
 
-    GetSystemTime(&ProcessPDB.creationTime) ;
+    GetSystemTime(&ProcessPDB.creationTime);
 
     /* Initialize the critical section */
-    InitializeCriticalSection( &ProcessPDB.crit_section );
+    InitializeCriticalSection(&ProcessPDB.crit_section );
+
+    //initialize the environment db entry.
+    ProcessPDB.env_db          = &ProcessENVDB;
+    ProcessENVDB.startup_info  = &StartupInfo;
+    ProcessENVDB.environ       = GetEnvironmentStringsA();
+    ProcessENVDB.cmd_line      = (CHAR*)(void*)pszCmdLineA;
+    ProcessENVDB.cmd_lineW     = (WCHAR*)(void*)pszCmdLineW;
+    ProcessENVDB.break_handlers = &ProcessConCtrlData;
+    ProcessConCtrlData.fIgnoreCtrlC = FALSE; /* TODO! Should be inherited from parent. */
+    ProcessConCtrlData.pHead = ProcessConCtrlData.pTail = (PCONCTRL)malloc(sizeof(CONCTRL));
+    ProcessConCtrlData.pHead->pfnHandler = (void*)DefaultConsoleCtrlHandler;
+    ProcessConCtrlData.pHead->pNext = ProcessConCtrlData.pHead->pPrev = NULL;
+    ProcessConCtrlData.pHead->flFlags = ODIN32_CONCTRL_FLAGS_INIT;
+    InitializeCriticalSection(&ProcessENVDB.section);
 
 //         ProcessPDB.startup_info    = &StartupInfo;
     ProcessPDB.unknown10       = (PVOID)&unknownPDBData[0];
     StartupInfo.cb             = sizeof(StartupInfo);
-    StartupInfo.hStdInput      = GetStdHandle(STD_INPUT_HANDLE);
-    StartupInfo.hStdOutput     = GetStdHandle(STD_OUTPUT_HANDLE);
-    StartupInfo.hStdError      = GetStdHandle(STD_ERROR_HANDLE);
+    ProcessENVDB.hStdin  = StartupInfo.hStdInput  = GetStdHandle(STD_INPUT_HANDLE);
+    ProcessENVDB.hStdout = StartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+    ProcessENVDB.hStderr = StartupInfo.hStdError  = GetStdHandle(STD_ERROR_HANDLE);
 
     return teb;
@@ -295 +312 @@
     SID_IDENTIFIER_AUTHORITY sidIdAuth = {0};
     winteb->o.odin.threadinfo.dwType = SECTYPE_PROCESS | SECTYPE_INITIALIZED;
-  
+
     if (NULL != RtlAllocateAndInitializeSid) {
         RtlAllocateAndInitializeSid(&sidIdAuth, 1, 0, 0, 0, 0, 0, 0, 0, 0, &winteb->o.odin.threadinfo.SidUser.User.Sid);
@@ -305 +322 @@
     winteb->o.odin.threadinfo.pTokenGroups = (TOKEN_GROUPS*)malloc(sizeof(TOKEN_GROUPS));
     winteb->o.odin.threadinfo.pTokenGroups->GroupCount = 1;
-  
+
     if (NULL != RtlAllocateAndInitializeSid) {
          RtlAllocateAndInitializeSid(&sidIdAuth, 1, 0, 0, 0, 0, 0, 0, 0, 0, &winteb->o.odin.threadinfo.PrimaryGroup.PrimaryGroup);
     }
     else DebugInt3();
-  
+
     winteb->o.odin.threadinfo.pTokenGroups->Groups[0].Sid = winteb->o.odin.threadinfo.PrimaryGroup.PrimaryGroup;
     winteb->o.odin.threadinfo.pTokenGroups->Groups[0].Attributes = 0; //????
@@ -475 +492 @@
     }
     threadListMutex.leave();
-  
-  
+
+
 #ifdef PROFILE
     // Note: after this point we do not expect any more Win32-API calls,
@@ -485 +502 @@
     ProfilerTerminate();
 #endif /* PROFILE */
-  
+
     //Restore original OS/2 TIB selector
     teb = GetThreadTEB();
@@ -1223 +1240 @@
          */
         cch = strlen(pszPeExe)+1;
-      
+
         // PH 2002-04-11
         // Note: intentional memory leak, pszCmdLineW will not be freed
@@ -1466 +1483 @@
     Win32ImageBase *    pMod;           /* Pointer to the module object. */
     DWORD               cch = 0;        /* Length of the  */
-  
+
     // PH 2002-04-24 Note:
     // WIN2k just crashes in NTDLL if lpszPath is invalid!
@@ -1490 +1507 @@
               // write it additionally, uncounted
               lpszPath[cch] = '\0';
-              
+
             memcpy(lpszPath, pszFn, cch);
         }
@@ -1612 +1629 @@
         if(WinExe)
                 hMod = WinExe->getInstanceHandle();
-        else    
+        else
         {
           // // Just fail this API
@@ -1659 +1676 @@
   if (NULL != lpwszModuleName)
     astring = UnicodeToAsciiString((LPWSTR)lpwszModuleName);
-  
+
   rc = GetModuleHandleA(astring);
   dprintf(("KERNEL32:  OS2GetModuleHandleW %s returned %X\n", astring, rc));
-  
+
   if (NULL != astring)
     FreeAsciiString(astring);
-  
+
   return(rc);
 }
@@ -1844 +1861 @@
       // calculate base length for the new command line
       iNewCommandLineLength = strlen(szAppName) + strlen(lpCommandLine);
-      
+
       if(SubSystem == IMAGE_SUBSYSTEM_WINDOWS_CUI)
         lpszExecutable = "PEC.EXE";
       else
         lpszExecutable = "PE.EXE";
-      
+
       lpszPE = lpszExecutable;
-      
+
       // 2002-04-24 PH
       // set the ODIN32.DEBUG_CHILD environment variable to start new PE processes
@@ -1864 +1881 @@
         strcat(debug_szPE, " ");
         strcat(debug_szPE, lpszExecutable);
-        
+
         // we require more space in the new command line
         iNewCommandLineLength += strlen( debug_szPE );
-        
+
         // only launch the specified executable (ICSDEBUG.EXE)
         lpszPE = debug_szPE;
@@ -1873 +1890 @@
       }
 #endif
-      
+
         //SvL: Allright. Before we call O32_CreateProcess, we must take care of
         //     lpCurrentDirectory ourselves. (Open32 ignores it!)
@@ -1892 +1909 @@
             cmdline = newcmdline;
         }
-      
+
         dprintf(("KERNEL32: CreateProcess starting [%s],[%s]",
                  lpszExecutable,
                  cmdline));
-      
+
         rc = O32_CreateProcess(lpszExecutable, (LPCSTR)cmdline,lpProcessAttributes,
                                lpThreadAttributes, bInheritHandles, dwCreationFlags,
@@ -1944 +1961 @@
         free(cmdline);
 
-    if(lpProcessInfo) 
+    if(lpProcessInfo)
     {
         lpProcessInfo->dwThreadId = MAKE_THREADID(lpProcessInfo->dwProcessId, lpProcessInfo->dwThreadId);
@@ -2042 +2059 @@
   if(fVersionWarp3) {
         Sleep(1000);
-        return 0;        
+        return 0;
   }
   else  return O32_WaitForInputIdle(hProcess, dwTimeOut);