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

Timestamp:

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

Author:

bird

Message:

Eliminated KLDRPROT.

File:

• trunk/kStuff/kLdr/kLdrRdrFile.c (modified) (6 diffs)

trunk/kStuff/kLdr/kLdrRdrFile.c

@@ -279 +279 @@
  * @param   enmProt     kLdr protection.
  */
-static ULONG kldrRdrFileGetNtMapProt(KLDRPROT enmProt)
+static ULONG kldrRdrFileGetNtMapProt(KPROT enmProt)
 {
     switch (enmProt)
     {
-        case KLDRPROT_NOACCESS:             return PAGE_NOACCESS;
-        case KLDRPROT_READONLY:             return PAGE_READONLY;
-        case KLDRPROT_READWRITE:            return PAGE_READWRITE;
-        case KLDRPROT_WRITECOPY:            return PAGE_WRITECOPY;
-        case KLDRPROT_EXECUTE:              return PAGE_EXECUTE;
-        case KLDRPROT_EXECUTE_READ:         return PAGE_EXECUTE_READ;
-        case KLDRPROT_EXECUTE_READWRITE:    return PAGE_EXECUTE_READWRITE;
-        case KLDRPROT_EXECUTE_WRITECOPY:    return PAGE_EXECUTE_WRITECOPY;
+        case KPROT_NOACCESS:             return PAGE_NOACCESS;
+        case KPROT_READONLY:             return PAGE_READONLY;
+        case KPROT_READWRITE:            return PAGE_READWRITE;
+        case KPROT_WRITECOPY:            return PAGE_WRITECOPY;
+        case KPROT_EXECUTE:              return PAGE_EXECUTE;
+        case KPROT_EXECUTE_READ:         return PAGE_EXECUTE_READ;
+        case KPROT_EXECUTE_READWRITE:    return PAGE_EXECUTE_READWRITE;
+        case KPROT_EXECUTE_WRITECOPY:    return PAGE_EXECUTE_WRITECOPY;
         default:                            return ~(ULONG)0;
     }
@@ -302 +302 @@
  * @param   enmProt     kLdr protection.
  */
-static ULONG kldrRdrFileGetNtAllocProt(KLDRPROT enmProt)
+static ULONG kldrRdrFileGetNtAllocProt(KPROT enmProt)
 {
     switch (enmProt)
     {
-        case KLDRPROT_NOACCESS:             return PAGE_NOACCESS;
-        case KLDRPROT_READONLY:             return PAGE_READONLY;
-        case KLDRPROT_WRITECOPY:
-        case KLDRPROT_READWRITE:            return PAGE_READWRITE;
-        case KLDRPROT_EXECUTE:              return PAGE_EXECUTE;
-        case KLDRPROT_EXECUTE_READ:         return PAGE_EXECUTE_READ;
-        case KLDRPROT_EXECUTE_WRITECOPY:
-        case KLDRPROT_EXECUTE_READWRITE:    return PAGE_EXECUTE_READWRITE;
+        case KPROT_NOACCESS:             return PAGE_NOACCESS;
+        case KPROT_READONLY:             return PAGE_READONLY;
+        case KPROT_WRITECOPY:
+        case KPROT_READWRITE:            return PAGE_READWRITE;
+        case KPROT_EXECUTE:              return PAGE_EXECUTE;
+        case KPROT_EXECUTE_READ:         return PAGE_EXECUTE_READ;
+        case KPROT_EXECUTE_WRITECOPY:
+        case KPROT_EXECUTE_READWRITE:    return PAGE_EXECUTE_READWRITE;
         default:                            return ~(ULONG)0;
     }
@@ -413 +413 @@
         int rc;
         void *pv;
-        KLDRPROT enmProt;
+        KPROT enmProt;
 
         if (paSegments[i].RVA == NIL_KLDRADDR)
@@ -424 +424 @@
             switch (enmProt)
             {
-                case KLDRPROT_NOACCESS:
-                case KLDRPROT_READONLY:
-                case KLDRPROT_READWRITE:
-                case KLDRPROT_WRITECOPY:
-                    enmProt = KLDRPROT_READWRITE;
+                case KPROT_NOACCESS:
+                case KPROT_READONLY:
+                case KPROT_READWRITE:
+                case KPROT_WRITECOPY:
+                    enmProt = KPROT_READWRITE;
                     break;
-                case KLDRPROT_EXECUTE:
-                case KLDRPROT_EXECUTE_READ:
-                case KLDRPROT_EXECUTE_READWRITE:
-                case KLDRPROT_EXECUTE_WRITECOPY:
-                    enmProt = KLDRPROT_EXECUTE_READWRITE;
+                case KPROT_EXECUTE:
+                case KPROT_EXECUTE_READ:
+                case KPROT_EXECUTE_READWRITE:
+                case KPROT_EXECUTE_WRITECOPY:
+                    enmProt = KPROT_EXECUTE_READWRITE;
                     break;
                 default:
@@ -444 +444 @@
         {
             /* copy on write -> normal write. */
-            if (enmProt == KLDRPROT_EXECUTE_WRITECOPY)
-                enmProt = KLDRPROT_EXECUTE_READWRITE;
-            else if (enmProt == KLDRPROT_WRITECOPY)
-                enmProt = KLDRPROT_READWRITE;
+            if (enmProt == KPROT_EXECUTE_WRITECOPY)
+                enmProt = KPROT_EXECUTE_READWRITE;
+            else if (enmProt == KPROT_WRITECOPY)
+                enmProt = KPROT_READWRITE;
         }
 
@@ -771 +771 @@
      * Generic mapping code using kldrHlpPageAlloc(), kldrHlpPageFree() and kldrHlpPageProtect().
      */
-    rc = kldrHlpPageAlloc(&pPrep->pv, pPrep->cb, KLDRPROT_EXECUTE_READWRITE, fFixed);
+    rc = kldrHlpPageAlloc(&pPrep->pv, pPrep->cb, KPROT_EXECUTE_READWRITE, fFixed);
     if (rc)
         return rc;