Changeset 4164 for trunk/src/win32k/include/probkrnl.h

Timestamp:

Sep 2, 2000, 11:08:23 PM (25 years ago)

Author:

bird

Message:

Merged in the Grace branch. New Win32k!

File:

• trunk/src/win32k/include/probkrnl.h (modified) (7 diffs)

trunk/src/win32k/include/probkrnl.h

@@ -1 @@
-/* $Id: probkrnl.h,v 1.13 2000-04-17 01:56:49 bird Exp $
+/* $Id: probkrnl.h,v 1.14 2000-09-02 21:08:04 bird Exp $
  *
  * Include file for ProbKrnl.
@@ -16 +16 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-#define NBR_OF_KRNLIMPORTS      18      /* When this is changed make sure to   */
+#define NBR_OF_KRNLIMPORTS      42      /* When this is changed make sure to   */
                                         /* update the arrays in d32init.c and  */
-                                        /* probkrnl.c */
+                                        /* probkrnl.c, make test faker in      */
+                                        /* test.h and the appropriate fake.c   */
+                                        /* fakea.asm.                          */
 #define MAX_LENGTH_NAME         32      /* Max length for the function. */
 
@@ -24 +26 @@
 #define EPT_PROC                0x00    /* procedure - overload procedure*/
 #define EPT_PROCIMPORT          0x01    /* procedure 32bit - import only */
-#define EPT_VARIMPORT           0x02    /* variable/non-procedure 32bit - not implemented yet */
-#define EPT_32BIT               0x00    /* 16 bit entry-point  */
-#define EPT_16BIT               0x80    /* 32 bit entry-point */
+#define EPT_VARIMPORT           0x02    /* variable/non-procedure 32bit */
+#define EPT_NOT_REQ             0x04    /* Not required flag. */
+#define EPT_32BIT               0x00    /* 32 bit entry-point  */
+#define EPT_16BIT               0x80    /* 16 bit entry-point */
 #define EPT_BIT_MASK            0x80    /* Mask bit entry-point */
 #define EPT16BitEntry(a)    (((a).fType & EPT_BIT_MASK) == EPT_16BIT)
@@ -34 +37 @@
 #define EPT_PROC32              (EPT_PROC | EPT_32BIT)
 #define EPT_PROCIMPORT32        (EPT_PROCIMPORT | EPT_32BIT)
+#define EPT_PROCIMPORTNR32      (EPT_PROCIMPORT | EPT_32BIT | EPT_NOT_REQ)
 #define EPT_VARIMPORT32         (EPT_VARIMPORT | EPT_32BIT)
 
@@ -41 +45 @@
 #define EPT_VARIMPORT16         (EPT_VARIMPORT | EPT_16BIT)
 
-/* Kernel type: SMP/UNI/W4 */
-#define TYPE_UNI                0       /* Any UNI processor kernel except Warp 4 fp13 and above. */
-#define TYPE_SMP                1       /* SMP Warp3 Adv. or Warp 4.5 SMP */
-#define TYPE_W4                 2       /* Warp4 fp13 and above. */
+
+/* Kernel type: SMP/UNI/W4 (flags matches KF_* in options.h)  */
+#if 0
+#define TYPE_UNI                0x00     /* Any UNI processor kernel except Warp 4 fp13 and above. */
+#define TYPE_SMP                0x01     /* SMP Warp3 Adv. or Warp 4.5 SMP */
+#define TYPE_W4                 0x02     /* Warp4 fp13 and above. */
+#endif
 
 
@@ -73 +80 @@
 {
     unsigned short usBuild;             /* Build number */
-    unsigned char  fchBldType;          /* R, H, A */
-    unsigned char  fchType;             /* TYPE_SMP, TYPE_UNI, TYPE_W4 */
+    unsigned short fKernel;             /* Kernel flag (KF_* defines in options.h). */
     unsigned char  cObjects;            /* Count of objects */
     struct
@@ -91 +97 @@
 *   NOTE! These are only available at init time!                               *
 *******************************************************************************/
-extern IMPORTKRNLSYM _aImportTab[NBR_OF_KRNLIMPORTS]; /* 'aImportTab' in PrbKrnl.c */
-extern unsigned short int _usBuild;     /* 'ulBuild'         in PrbKrnl.c */
-extern unsigned short int _usVerMajor;  /* 'usVerMajor'      in PrbKrnl.c */
-extern unsigned short int _usVerMinor;  /* 'usVerMinor'      in PrbKrnl.c */
-extern KRNLDBENTRY aKrnlSymDB[];        /* defined in symdb.c (for 16-bit usage) */
-extern KRNLDBENTRY _aKrnlSymDB[];       /* defined in symdb.c (for 32-bit usage) */
+extern IMPORTKRNLSYM DATA16_GLOBAL  aImportTab[NBR_OF_KRNLIMPORTS]; /* Defined in ProbKrnl.c */
+extern char          DATA16_GLOBAL  szUsrSym[50];                   /* Defined in ProbKrnl.c */
+extern KRNLDBENTRY   DATA16_INIT    aKrnlSymDB[];                   /* Defined in symdb.c (for 16-bit usage) */
 
+#if defined(__IBMC__) || defined(__IBMCPP__)
+    #pragma map( aImportTab , "_aImportTab" )
+    #pragma map( szUsrSym   , "_szUsrSym"   )
+    #pragma map( aKrnlSymDB , "_aKrnlSymDB" )
+#endif
 
 #if defined(INCL_16) && defined(MAX_DISKDD_CMD) /* 16-bit only */
 int ProbeKernel(PRPINITIN pReqPack);
+
+#if 0 /*ndef CODE16_INIT*/
+#pragma alloc_text(CODE16_INIT, ProbeKernel)
 #endif
 
 #endif
 
+#endif
+