Changeset 6232 for trunk/src

Timestamp:

Jul 8, 2001, 5:13:16 AM (24 years ago)

Author:

bird

Message:

Reorganized it a little bit. Finding that the environment isn't updated by Open32/Odin32... GetEnv2 is mostly working I think.

File:

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

trunk/src/win32k/misc/env.c

@@ -1 @@
-/* $Id: env.c,v 1.5 2001-02-10 11:11:47 bird Exp $
+/* $Id: env.c,v 1.6 2001-07-08 03:13:16 bird Exp $
  *
  * Environment access functions
@@ -29 +29 @@
 #include "macros.h"
 #include "env.h"
+
+/*******************************************************************************
+*   Internal Functions                                                         *
+*******************************************************************************/
+const char *GetEnv1(BOOL fExecChild);
+const char *GetEnv2(BOOL fExecChild);
 
 
@@ -116 +122 @@
      *  2), testing will show which one of them are the better.
      */
-
     #if 1
+    return GetEnv1(fExecChild);
+    #else
+    const char *pszEnv = GetEnv2(fExecChild);
+    if (pszEnv == NULL)
+        pszEnv = GetEnv1(fExecChild);
+    return pszEnv;
+    #endif
+}
+
+
+/**
+ * Method 1.
+ */
+const char *GetEnv1(BOOL fExecChild)
+{
     PPTDA   pPTDACur;                   /* Pointer to the current (system context) PTDA */
     PPTDA   pPTDA;                      /* PTDA in question. */
@@ -162 +182 @@
 
     return NULL;
-
-
-    #else
-
-
+}
+
+
+/**
+ * Method 2.
+ */
+const char *GetEnv2(BOOL fExecChild)
+{
     struct InfoSegLDT * pLIS;           /* Pointer to local infosegment. */
     PVOID               pv;             /* Address to return. */
@@ -194 +217 @@
         kprintf(("GetEnv: VirtToLin2 failed to thunk %04x:0000 to linar address\n", pLIS->LIS_AX));
     }
+
     return (const char *)pv;
-    #endif
-}
+}
+
+
+
+
+/**
+ * Relase environment block retrieved by GetEnv.
+ * @param   pszEnv  Pointer to environment block.
+ */
+void RelaseEnv(const char *pszEnv)
+{
+    #if 0
+    pszEnv = pszEnv; /* nothing to do! */
+    #else
+    pszEnv = pszEnv; /* nothing to do yet! */
+    #endif
+}