Changeset 6815 for trunk/src/win32k/kKrnlLib/include/OS2KVM.h

Timestamp:

Sep 26, 2001, 5:52:37 AM (24 years ago)

Author:

bird

Message:

Updated to work for kKrnlLib.DLL and internally in kKrnlLib.

File:

• trunk/src/win32k/kKrnlLib/include/OS2KVM.h (modified) (9 diffs)

trunk/src/win32k/kKrnlLib/include/OS2KVM.h

@@ -1 @@
-/* $Id: OS2KVM.h,v 1.1 2001-09-14 01:50:16 bird Exp $
+/* $Id: OS2KVM.h,v 1.2 2001-09-26 03:52:37 bird Exp $
  *
  * OS/2 kernel VM functions.
@@ -225 +225 @@
  * Virtual Address Limit - this pointer might be NULL!
  */
+#ifdef KKRNLLIB
 extern ULONG *pVirtualAddressLimit;
-#define VirtualAddressLimit (pVirtualAddressLimit ? *pVirtualAddressLimit : 0x20000000)
+#define VirtualAddressLimit (pVirtualAddressLimit ? *pVirtualAddressLimit : 0x20000000UL)
+#else
+extern ULONG VirtualAddressLimit;
+#define VirtualAddressLimit (&VirtualAddressLimit ?  VirtualAddressLimit  : 0x20000000UL)
+#endif
 
 /**
  * System arena header.
  */
+#ifdef KKRNLLIB
 extern PVMAH pahvmSys;
 #define ahvmSys (*pahvmSys)
+#else
+extern VMAH ahvmSys;
+#endif
 
 /**
  * Shared arena header.
  */
+#ifdef KKRNLLIB
 extern PVMAH pahvmShr;
 #define ahvmShr (*pahvmShr)
+#else
+extern VMAH  ahvmShr;
+#endif
 
 /**
  * High Shread arena header - only aurora and Warp Server Advanced SMP.
- */
+ * Check if &ahvmhShr is NULL!
+ */
+#ifdef KKRNLLIB
 extern PVMAH pahvmhShr;
 #define ahvmhShr (*pahvmhShr)
+#else
+extern VMAH  ahvmhShr;
+#endif
 
 
@@ -253 +271 @@
     ULONG ulCS,
     ULONG ulEIP);
+HMTE KRNLCALL OrgVMGetOwner(
+    ULONG ulCS,
+    ULONG ulEIP);
 
 APIRET KRNLCALL VMAllocMem(
@@ -264 +285 @@
     ULONG   SomeArg2,
     PVMAC   pvmac);
+APIRET KRNLCALL OrgVMAllocMem(
+    ULONG   cbSize,
+    ULONG   cbCommit,
+    ULONG   flFlags1,
+    HPTDA   hPTDA,
+    USHORT  usVMOwnerId,
+    HMTE    hMTE,
+    ULONG   flFlags2,
+    ULONG   SomeArg2,
+    PVMAC   pvmac);
 
 APIRET KRNLCALL VMFreeMem(
+    ULONG   ulAddress,
+    HPTDA   hPTDA,
+    ULONG   flFlags);
+APIRET KRNLCALL OrgVMFreeMem(
     ULONG   ulAddress,
     HPTDA   hPTDA,
@@ -276 +311 @@
     HPTDA   hPTDA,
     PVMAC   pvmac);
+APIRET KRNLCALL OrgVMMapDebugAlias(
+    ULONG   flVMFlags,
+    ULONG   ulAddress,
+    ULONG   cbSize,
+    HPTDA   hPTDA,
+    PVMAC   pvmac);
 
 APIRET KRNLCALL VMObjHandleInfo(
@@ -281 +322 @@
     PULONG  pulAddr,
     PUSHORT pushPTDA);
+APIRET KRNLCALL OrgVMObjHandleInfo(
+    USHORT  usHob,
+    PULONG  pulAddr,
+    PUSHORT pushPTDA);
 
 #ifdef _OS2KLDR_H_
 PMTE KRNLCALL VMPseudoHandleMap(
+    HMTE    hMTE);
+PMTE KRNLCALL OrgVMPseudoHandleMap(
     HMTE    hMTE);
 #endif
@@ -301 +348 @@
     ULONG   flFlags,
     PULONG  pulSentinelAddress);
+VOID    KRNLCALL OrgvmRecalcShrBound(
+    ULONG   flFlags,
+    PULONG  pulSentinelAddress);
 
 
@@ -317 +367 @@
     VMHOB   usOwner,
     PVMHOB  phob);
+APIRET KRNLCALL OrgVMCreatePseudoHandle(
+    PVOID   pvData,
+    VMHOB   usOwner,
+    PVMHOB  phob);
 
 
@@ -327 +381 @@
 APIRET KRNLCALL VMFreePseudoHandle(
     VMHOB   hob);
-
-
-#endif
+APIRET KRNLCALL OrgVMFreePseudoHandle(
+    VMHOB   hob);
+
+
+#endif