Changeset 4162 for branches/GRACE/src/win32k/include

Timestamp:

Sep 2, 2000, 10:49:29 PM (25 years ago)

Author:

bird

Message:

Bugfixing, DevSegDf.h,...

Location:

branches/GRACE/src/win32k/include

Files:

• options.h (modified) (3 diffs)
• probkrnl.h (modified) (2 diffs)

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

@@ -1 @@
-/* $Id: options.h,v 1.10.4.3 2000-08-28 22:42:38 bird Exp $
+/* $Id: options.h,v 1.10.4.4 2000-09-02 20:49:15 bird Exp $
  *
  * Options.
@@ -52 +52 @@
             (unsigned short)~0,     /* usVerMajor    */     \
             (unsigned short)~0,     /* usVerMinor    */     \
-            FLAGS_PE_PE2LX,         /* fPE           */     \
+            FLAGS_PE_MIXED,         /* fPE           */     \
             INFOLEVEL_QUIET,        /* ulInfoLevel   */     \
             FALSE,                  /* fElf          */     \
@@ -131 +131 @@
 #pragma pack()
 
-
 /*******************************************************************************
 *   Global Variables                                                           *
 *******************************************************************************/
-extern struct options options;      /* defined in d32globals.c */
+extern struct options DATA16_GLOBAL options;    /* defined in d16globals.c */
 #if defined(__IBMC__) || defined(__IBMCPP__)
     #pragma map( options , "_options"  )

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

@@ -1 @@
-/* $Id: probkrnl.h,v 1.13.4.9 2000-08-30 04:11:30 bird Exp $
+/* $Id: probkrnl.h,v 1.13.4.10 2000-09-02 20:49:15 bird Exp $
  *
  * Include file for ProbKrnl.
@@ -97 +97 @@
 *   NOTE! These are only available at init time!                               *
 *******************************************************************************/
-extern IMPORTKRNLSYM _aImportTab[NBR_OF_KRNLIMPORTS]; /* 'aImportTab' 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
+