Changeset 6841 for branches/splittup/src/win32k/include/dev32.h

Timestamp:

Sep 27, 2001, 5:08:35 AM (24 years ago)

Author:

bird

Message:

Win32k/kKrnlLib splittup: done the major stuff.

File:

• branches/splittup/src/win32k/include/dev32.h (modified) (4 diffs)

branches/splittup/src/win32k/include/dev32.h

@@ -1 @@
-/* $Id: dev32.h,v 1.12 2001-07-08 03:03:14 bird Exp $
+/* $Id: dev32.h,v 1.12.2.1 2001-09-27 03:08:18 bird Exp $
  *
  * dev32 - header file for 32-bit part of the driver.
@@ -60 +60 @@
 #if !defined(__cplusplus) && defined(RING0)
 USHORT _loadds _Far32 _Pascal R0Init32(RP32INIT *pRpInit);
-USHORT _loadds _Far32 _Pascal GetKernelInfo32(PKRNLINFO pKrnlInfo);
-USHORT _loadds _Far32 _Pascal VerifyImportTab32(void);
-USHORT _loadds _Far32 _Pascal ElfIOCtl(PRP32GENIOCTL pRpIOCtl);
 USHORT _loadds _Far32 _Pascal Win32kIOCtl(PRP32GENIOCTL pRpIOCtl);
 USHORT _loadds _Far32 _Pascal Win32kOpen(PRP32OPENCLOSE pRpOpen);
 USHORT _loadds _Far32 _Pascal Win32kClose(PRP32OPENCLOSE pRpClose);
 #endif
-#ifdef _OS2KLDR_H_
-PMTE _System GetOS2KrnlMTE(void); /* (devfirst.asm) */
-#endif
 ULONG  _Optlink InitCallGate(void);
-ULONG  _Optlink x86DisableWriteProtect(void);
-ULONG  _Optlink x86RestoreWriteProtect(ULONG flWP);
 
 
@@ -79 +71 @@
  * Global variables
  */
-extern PULONG pulTKSSBase32;
 extern USHORT CallGateGDT;
 
@@ -97 +88 @@
  * @returns    32-bit FLAT pointer.
  */
-#ifdef RING0
-    #define SSToDS(a)   ((PVOID)((ULONG)(a) + *pulTKSSBase32))
-#else
-    #define SSToDS(a)   ((PVOID)(a))
+#ifndef SSToDS
+    #ifdef RING0
+        #define SSToDS(a)   ((PVOID)((ULONG)(a) + TKSSBase))
+    #else
+        #define SSToDS(a)   ((PVOID)(a))
+    #endif
 #endif