Changeset 4018 for branches/GRACE/src

Timestamp:

Aug 15, 2000, 9:03:27 AM (25 years ago)

Author:

bird

Message:

32-bits GetDosVar don't work. Get module handle from PTDA. (which btw is much
faster). So, I've added a new import, ptda_module.

Location:

branches/GRACE/src/win32k

Files:

• dev16/probkrnl.c (modified) (3 diffs)
• dev32/d32init.c (modified) (2 diffs)
• include/OS2KPTDA.h (modified) (2 diffs)
• include/probkrnl.h (modified) (2 diffs)
• ldr/myldrOpenPath.cpp (modified) (3 diffs)
• misc/OS2KPTDA.c (modified) (4 diffs)

branches/GRACE/src/win32k/dev16/probkrnl.c

@@ -1 @@
-/* $Id: probkrnl.c,v 1.20.4.4 2000-08-15 06:15:59 bird Exp $
+/* $Id: probkrnl.c,v 1.20.4.5 2000-08-15 07:03:23 bird Exp $
  *
  * Description:   Autoprobes the os2krnl file and os2krnl[*].sym files.
@@ -119 +119 @@
     {FALSE, -1, 10, "ptda_start",           -1,  -1,  -1,  -1, EPT_VARIMPORT16},   /* 28 */
     {FALSE, -1, 12, "ptda_environ",         -1,  -1,  -1,  -1, EPT_VARIMPORT16},   /* 29 */
+    {FALSE, -1, 11, "ptda_module",          -1,  -1,  -1,  -1, EPT_VARIMPORT16},   /* 29 */
 
 };
@@ -1660 +1661 @@
         int         i;
 
-        printf16("/* $Id: probkrnl.c,v 1.20.4.4 2000-08-15 06:15:59 bird Exp $\n"
+        printf16("/* $Id: probkrnl.c,v 1.20.4.5 2000-08-15 07:03:23 bird Exp $\n"
                  "*\n"
                  "* Autogenerated kernel symbol database.\n"

branches/GRACE/src/win32k/dev32/d32init.c

@@ -1 @@
-/* $Id: d32init.c,v 1.19.4.3 2000-08-15 06:16:01 bird Exp $
+/* $Id: d32init.c,v 1.19.4.4 2000-08-15 07:03:25 bird Exp $
  *
  * d32init.c - 32-bits init routines.
@@ -1154 +1154 @@
         0,                              /* 27 */
         0,                              /* 28 */
-        0                               /* 29 */
+        0,                              /* 29 */
+        0                               /* 30 */
     };
     int i;

branches/GRACE/src/win32k/include/OS2KPTDA.h

@@ -1 @@
-/* $Id: OS2KPTDA.h,v 1.1 2000-07-16 22:21:19 bird Exp $
+/* $Id: OS2KPTDA.h,v 1.1.2.1 2000-08-15 07:03:25 bird Exp $
  *
  * PTDA access functions.
@@ -55 +55 @@
 
 USHORT  ptdaGet_ptda_environ(PPTDA pPTDA);
-
+USHORT  ptdaGet_ptda_module(PPTDA pPTDA);
 
 #ifdef __cplusplus

branches/GRACE/src/win32k/include/probkrnl.h

@@ -1 @@
-/* $Id: probkrnl.h,v 1.13.4.2 2000-08-14 08:57:07 bird Exp $
+/* $Id: probkrnl.h,v 1.13.4.3 2000-08-15 07:03:25 bird Exp $
  *
  * Include file for ProbKrnl.
@@ -16 +16 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-#define NBR_OF_KRNLIMPORTS      30      /* When this is changed make sure to   */
+#define NBR_OF_KRNLIMPORTS      31      /* When this is changed make sure to   */
                                         /* update the arrays in d32init.c and  */
                                         /* probkrnl.c */

branches/GRACE/src/win32k/ldr/myldrOpenPath.cpp

@@ -1 @@
-/* $Id: myldrOpenPath.cpp,v 1.1.2.1 2000-08-15 06:16:04 bird Exp $
+/* $Id: myldrOpenPath.cpp,v 1.1.2.2 2000-08-15 07:03:26 bird Exp $
  *
  * myldrOpenPath - ldrOpenPath used to open executables we'll override
@@ -16 +16 @@
 #define INCL_NOPMAPI
 #define INCL_OS2KRNL_TCB
+#define INCL_OS2KRNL_PTDA
 
 /*******************************************************************************
@@ -134 +135 @@
         else
         {
-            struct InfoSegLDT *pInfoSeg;
-            pInfoSeg = (struct InfoSegLDT *)D32Hlp_GetDOSVar(DHGETDOSV_LOCINFOSEG, 0);
-            if (pInfoSeg != NULL)
+            PPTDA   pPTDA = ptdaGetCur();
+            if (pPTDA)
             {
-                pExe = getModuleByhMTE(pInfoSeg->LIS_DI); /* LIS_DI is the same as hmod in LINFOSEG from bsedos16.h.  */
+                pExe = getModuleByhMTE(ptdaGet_ptda_module(pPTDA));
                 #ifdef DEBUG            /* While testing! */
                 kprintf(("myldrOpenPath: getModuleByhMTE returned 0x%x08 for hmod=0x%04\n",
-                         pExe, pInfoSeg->LIS_DI));
+                         pExe, ptdaGet_ptda_module(pPTDA)));
                 #endif
             }
-            #ifdef DEBUG                /* While testing! */
-            else
-                dprintf(("myldrOpenPath: D32Hlp_GetDOSVar(DHGETDOSV_LOCINFOSEG) failed.\n"));
-            #endif
         }
 

branches/GRACE/src/win32k/misc/OS2KPTDA.c

@@ -1 @@
-/* $Id: OS2KPTDA.c,v 1.1 2000-07-16 22:21:17 bird Exp $
+/* $Id: OS2KPTDA.c,v 1.1.2.1 2000-08-15 07:03:27 bird Exp $
  *
  * PTDA access functions.
@@ -28 +28 @@
 extern ULONG    pptda_start;
 extern ULONG    pptda_environ;
+extern ULONG    pptda_module;
 
 
@@ -35 +36 @@
  * @returns     Content of the pPTDA->ptda_environ member.
  * @param       pPTDA   PTDA Pointer. (NULL is not allowed!)
- * @sketch
  */
 USHORT  ptdaGet_ptda_environ(PPTDA pPTDA)
@@ -42 +42 @@
 }
 
+
+/**
+ * Gets the ptda_module PTDA member. This member holds the MTE handle of the process's
+ * executable image.
+ * @returns     Content of the pPTDA->ptda_module member.
+ * @param       pPTDA   PTDA Pointer. (NULL is not allowed!)
+ */
+USHORT  ptdaGet_ptda_module(PPTDA pPTDA)
+{
+    return *(PUSHORT)(void*)(((char*)(void*)pPTDA) + (pptda_module - pptda_start));
+}
+