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

Timestamp:

Aug 27, 2007, 9:54:05 PM (18 years ago)

Author:

bird

Message:

Use the new type system.

File:

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

trunk/kStuff/kLdr/kLdrHlpMem.c

@@ -52 +52 @@
 static void            *g_pvStub = NULL;
 /** The size of the stub object - 0 if no stub. */
-static size_t           g_cbStub = 0;
+static KSIZE            g_cbStub = 0;
 
 #elif defined(__WIN__)
@@ -107 +107 @@
  * @param   enmProt     The new protection. Copy-on-write is invalid.
  */
-int     kldrHlpPageAlloc(void **ppv, size_t cb, KLDRPROT enmProt, unsigned fFixed)
+int     kldrHlpPageAlloc(void **ppv, KSIZE cb, KLDRPROT enmProt, unsigned fFixed)
 {
 #ifdef __OS2__
@@ -162 +162 @@
  * @param   enmProt     The new protection. Copy-on-write is invalid.
  */
-int     kldrHlpPageProtect(void *pv, size_t cb, KLDRPROT enmProt)
+int     kldrHlpPageProtect(void *pv, KSIZE cb, KLDRPROT enmProt)
 {
 #ifdef __OS2__
@@ -184 +184 @@
             if (rc)
                 return rc;
-            pv = (void *)((uintptr_t)pv + 0x1000);
+            pv = (void *)((KUPTR)pv + 0x1000);
             cb -= 0x1000;
         }
@@ -215 +215 @@
  * @param   cb          The byte count requested from kldrHlpPageAlloc().
  */
-int     kldrHlpPageFree(void *pv, size_t cb)
+int     kldrHlpPageFree(void *pv, KSIZE cb)
 {
 #ifdef __OS2__
@@ -223 +223 @@
      * Deal with any portion overlapping with the stub.
      */
-    uintptr_t offStub = (uintptr_t)pv - (uintptr_t)g_pvStub;
+    KUPTR offStub = (KUPTR)pv - (KUPTR)g_pvStub;
     if (offStub < g_cbStub)
     {
         /* decommit the pages in the stub. */
-        size_t cbStub = KLDR_MIN(g_cbStub - offStub, cb);
+        KSIZE cbStub = KLDR_MIN(g_cbStub - offStub, cb);
         rc = DosSetMem(pv, cbStub, PAG_DECOMMIT);
         if (rc)
@@ -236 +236 @@
                 if (!DosSetMem(pv, 0x1000, PAG_DECOMMIT))
                     rc = 0;
-                pv = (void *)((uintptr_t)pv + 0x1000);
+                pv = (void *)((KUPTR)pv + 0x1000);
                 cbStub -= 0x1000;
                 cb -= 0x1000;
@@ -251 +251 @@
             if (!cb)
                 return 0;
-            pv = (void *)((uintptr_t)pv + cbStub);
+            pv = (void *)((KUPTR)pv + cbStub);
         }
     }