Changeset 3571 for trunk/kStuff/kLdr/kLdrHlpMem.c

Timestamp:

Aug 31, 2007, 4:39:26 AM (18 years ago)

Author:

bird

Message:

Eliminated KLDRPROT.

File:

• trunk/kStuff/kLdr/kLdrHlpMem.c (modified) (4 diffs)

trunk/kStuff/kLdr/kLdrHlpMem.c

@@ -64 +64 @@
 
 #ifdef __OS2__
-static ULONG kldrHlpPageProtToNative(KLDRPROT enmProt)
+static ULONG kldrHlpPageProtToNative(KPROT enmProt)
 {
     switch (enmProt)
     {
-        case KLDRPROT_NOACCESS:             return PAG_EXECUTE | PAG_READ | PAG_WRITE;
-        case KLDRPROT_READONLY:             return PAG_COMMIT | PAG_READ;
-        case KLDRPROT_READWRITE:            return PAG_COMMIT | PAG_READ | PAG_WRITE;
-        case KLDRPROT_EXECUTE:              return PAG_COMMIT | PAG_EXECUTE;
-        case KLDRPROT_EXECUTE_READ:         return PAG_COMMIT | PAG_EXECUTE | PAG_READ;
-        case KLDRPROT_EXECUTE_READWRITE:    return PAG_COMMIT | PAG_EXECUTE | PAG_READ | PAG_WRITE;
+        case KPROT_NOACCESS:             return PAG_EXECUTE | PAG_READ | PAG_WRITE;
+        case KPROT_READONLY:             return PAG_COMMIT | PAG_READ;
+        case KPROT_READWRITE:            return PAG_COMMIT | PAG_READ | PAG_WRITE;
+        case KPROT_EXECUTE:              return PAG_COMMIT | PAG_EXECUTE;
+        case KPROT_EXECUTE_READ:         return PAG_COMMIT | PAG_EXECUTE | PAG_READ;
+        case KPROT_EXECUTE_READWRITE:    return PAG_COMMIT | PAG_EXECUTE | PAG_READ | PAG_WRITE;
         default:
             kldrHlpAssert(0);
@@ -80 +80 @@
 }
 #elif defined(__WIN__)
-static DWORD kldrHlpPageProtToNative(KLDRPROT enmProt)
+static DWORD kldrHlpPageProtToNative(KPROT enmProt)
 {
     switch (enmProt)
     {
-        case KLDRPROT_NOACCESS:             return PAGE_NOACCESS;
-        case KLDRPROT_READONLY:             return PAGE_READONLY;
-        case KLDRPROT_READWRITE:            return PAGE_READWRITE;
-        case KLDRPROT_EXECUTE:              return PAGE_EXECUTE;
-        case KLDRPROT_EXECUTE_READ:         return PAGE_EXECUTE_READ;
-        case KLDRPROT_EXECUTE_READWRITE:    return PAGE_EXECUTE_READWRITE;
+        case KPROT_NOACCESS:             return PAGE_NOACCESS;
+        case KPROT_READONLY:             return PAGE_READONLY;
+        case KPROT_READWRITE:            return PAGE_READWRITE;
+        case KPROT_EXECUTE:              return PAGE_EXECUTE;
+        case KPROT_EXECUTE_READ:         return PAGE_EXECUTE_READ;
+        case KPROT_EXECUTE_READWRITE:    return PAGE_EXECUTE_READWRITE;
         default:
             kldrHlpAssert(0);
@@ -107 +107 @@
  * @param   enmProt     The new protection. Copy-on-write is invalid.
  */
-int     kldrHlpPageAlloc(void **ppv, KSIZE cb, KLDRPROT enmProt, unsigned fFixed)
+int     kldrHlpPageAlloc(void **ppv, KSIZE cb, KPROT enmProt, unsigned fFixed)
 {
 #ifdef __OS2__
@@ -162 +162 @@
  * @param   enmProt     The new protection. Copy-on-write is invalid.
  */
-int     kldrHlpPageProtect(void *pv, KSIZE cb, KLDRPROT enmProt)
+int     kldrHlpPageProtect(void *pv, KSIZE cb, KPROT enmProt)
 {
 #ifdef __OS2__