Changeset 3412 for trunk/src/win32k/misc/env.c

Timestamp:

Apr 17, 2000, 4:26:04 AM (25 years ago)

Author:

bird

Message:

Much of the coding is done. But will have to select/change strategy for
getting the environment data soon.

File:

• trunk/src/win32k/misc/env.c (modified) (7 diffs)

trunk/src/win32k/misc/env.c

@@ -1 @@
-/* $Id: env.c,v 1.1 2000-04-17 01:56:50 bird Exp $
+/* $Id: env.c,v 1.2 2000-04-17 02:26:04 bird Exp $
  *
- * Enviroment access functions
+ * Environment access functions
  *
  * Copyright (c) 2000 knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
@@ -9 +9 @@
  */
 
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+#define INCL_DOSERRORS                  /* Error codes */
+#define INCL_OS2KRNL_VM                 /* OS2KRNL: Virtual Memory Management */
+
 
 /*******************************************************************************
@@ -14 +20 @@
 *******************************************************************************/
 #include <os2.h>
+
 #include "dev32.h"
 #include "dev32hlp.h"
+#include "log.h"
+#include "ptda.h"
+#include "OS2Krnl.h"
 #include <string.h>
 
 #include "env.h"
-#include <infoseg.h>                    /* Infosegments definitions. */
 
 
 /**
- * Scans the given environment data for a given enviroment variable and returns
+ * Scans the given environment data for a given environment variable and returns
  * its value if found.
  * @returns   Pointer to environment variable value for the variable given in
@@ -74 +83 @@
 /**
  * Get the linear pointer to the environment data.
+ *
  * @returns   Pointer to environment data.
  *            NULL on failure.
  */
-const char *GetEnv()
+const char *GetEnv(void)
 {
     /*  There is probably two ways of getting the environment data for a the
@@ -91 +101 @@
      */
 
-    #if 0
-    PPTDA   pPTDA;                      /* Current PTDA */
-    PPTDA   pPTDAExecChild;             /* Current PTDAs pPTDAExecChild */
+    #if 1
+    PPTDA   pPTDACur;                   /* Pointer to the current (system context) PTDA */
+    PPTDA   pPTDA;                      /* PTDA in question. */
     USHORT  hobEnviron;                 /* Object handle of the environ block */
     APIRET  rc;                         /* Return from VMObjHandleInfo. */
@@ -103 +113 @@
      *  Get the current PTDA. (Fail if this call failes.)
      *  IF pPTDAExecChild isn't NULL THEN try get environment for that first.
-     *  IF failed or no pPTDAExecChild THEN try get enviroment from pPTDA.
+     *  IF failed or no pPTDAExecChild THEN try get environment from pPTDA.
      */
-    pPTDA = ptdaGetCur();
-    if (pPTDA == NULL)
+    pPTDACur = ptdaGetCur();
+    if (pPTDA != NULL)
+    {
+        pPTDA = ptdaGet_pPTDAExecChild(pPTDA);
+        if (pPTDA != NULL)
+        {
+            hobEnviron = ptdaGet_ptda_environ(pPTDA);
+            if (hobEnviron != 0)
+            {
+                rc = VMObjHandleInfo(hobEnviron, SSToDS(&ulAddr), SSToDS(&ushPTDA));
+                if (rc == NO_ERROR)
+                    return (const char *)ulAddr;
+                kprintf(("GetEnv: VMObjHandleInfo failed with rc=%d for hob=0x%04x\n", rc, hobEnviron));
+            }
+        }
+
+        hobEnviron = ptdaGet_ptda_environ(pPTDACur);
+        if (hobEnviron != 0)
+        {
+            rc = VMObjHandleInfo(hobEnviron, SSToDS(&ulAddr), SSToDS(&ushPTDA));
+            if (rc != NO_ERROR)
+            {
+                kprintf(("GetEnv: VMObjHandleInfo failed with rc=%d for hob=0x%04x\n", rc, hobEnviron));
+            }
+        }
+    }
+    else
     {
         kprintf(("GetEnv: Failed to get current PTDA.\n"));
     }
-    pPTDAExecChild = ptdaGetpPTDAExecChild(pPTDA);
-    if (pPTDAExecChild != NULL)
-    {
-        hobEnviron = ptdaGetptda_environ(pPTDAExecChild);
-        if (hobEnviron != 0)
-        {
-            rc = VMObjHandleInfo(hobEnviron, &ulAddr, &ushPTDA);
-            if (rc != NO_ERROR)
-                ulAddr = 0;
-        }
-    }
-
-    if (ulAddr == 0) /* failed or non pPTDAExecChild */
-    {
-        hobEnviron = ptdaGetptda_environ(pPTDA);
-        if (hobEnviron != 0)
-        {
-            rc = VMObjHandleInfo(hobEnviron, &ulAddr, &ushPTDA);
-            if (rc != NO_ERROR)
-                ulAddr = 0;
-        }
-    }
 
     return (const char *)ulAddr;
+
     #else
+
     struct InfoSegLDT * pLIS;           /* Pointer to local infosegment. */
     PVOID               pv;             /* Address to return. */
@@ -147 +162 @@
     {
         kprintf(("GetEnv: Failed to get local info segment\n"));
-        return NULL
+        return NULL;
     }
 
     if (pLIS->LIS_AX <= 3)
     {
-        kprintf(("GetEnv: enviroment selector is %d, ie. NULL\n", pLIS->LIS_AX));
+        kprintf(("GetEnv: environment selector is %d, ie. NULL\n", pLIS->LIS_AX));
         return NULL;
     }