Changeset 6296 for trunk/src/win32k/k32/k32SetEnvironment.cpp

Timestamp:

Jul 10, 2001, 6:41:10 PM (24 years ago)

Author:

bird

Message:

Use PTDA not PID and allways take loader sem.

File:

• trunk/src/win32k/k32/k32SetEnvironment.cpp (modified) (7 diffs)

trunk/src/win32k/k32/k32SetEnvironment.cpp

@@ -1 @@
-/* $Id: k32SetEnvironment.cpp,v 1.1 2001-07-08 02:52:11 bird Exp $
+/* $Id: k32SetEnvironment.cpp,v 1.2 2001-07-10 16:39:17 bird Exp $
  *
  * k32SetEnvironment - Sets the Odin32 environment for a process.
@@ -15 +15 @@
 #define INCL_DOSERRORS
 #define INCL_OS2KRNL_TK
+#define INCL_OS2KRNL_PTDA
 #define INCL_OS2KRNL_SEM
 #define INCL_OS2KRNL_LDR
@@ -24 +25 @@
 *******************************************************************************/
 #include <os2.h>
+#include <memory.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
 #include "OS2Krnl.h"
@@ -56 +58 @@
     PPTD    pptd;
 
-
     /*
      * Validate pid a little bit...
@@ -63 +64 @@
     {
         kprintf(("k32SetEnvironment: invalid pid=%x\n", pid));
+        return ERROR_INVALID_PARAMETER;
+    }
+
+    if (pid != 0)
+    {
+        kprintf(("k32SetEnvironment: currently only supported for current pid. pid=%x\n", pid));
         return ERROR_INVALID_PARAMETER;
     }
@@ -81 +88 @@
      * Get Per Task Data and try set next environment pointer.
      */
-    pptd = GetTaskData(pid);
+    pptd = GetTaskData(ptdaGetCur(), TRUE);
     if (pptd)
     {
-        if (pptd->cUsage != 0 && pptd->pszzOdin32Env)
+        if (*(PULONG)&pptd->lockOdin32Env)
+        {
             D32Hlp_VMUnLock(&pptd->lockOdin32Env);
+            memset(&pptd->lockOdin32Env, 0, sizeof(pptd->lockOdin32Env));
+        }
         pptd->pszzOdin32Env = NULL;
         if (pptd->cUsage != 0 && pszzEnvironment != NULL && cchEnvironment != 0)
         {
-            /*
-             * Currently we're limited to the current process.
-             */
-            if (pid != 0 || GetTaskData(0) != pptd)
-            {
-                kprintf(("k32SetEnvironment: not current process (pid=%d)\n", pid));
-                LDRClearSem();
-                return ERROR_INVALID_PARAMETER;
-            }
-
-
             /*
              * Lock the memory (so we don't block or trap during environment searchs).
@@ -110 +109 @@
             {
                 kprintf(("k32SetEnvironment: VMLock2 failed with rc=%d\n", rc));
+                memset(&pptd->lockOdin32Env, 0, sizeof(pptd->lockOdin32Env));
             }
         }