Changeset 3584 for trunk/kStuff/kLdr/testcase/tst-3-driver.c

Timestamp:

Sep 3, 2007, 12:46:37 AM (18 years ago)

Author:

bird

Message:

fixed the testcases.

File:

• trunk/kStuff/kLdr/testcase/tst-3-driver.c (modified) (5 diffs)

trunk/kStuff/kLdr/testcase/tst-3-driver.c

@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <kLdr.h>
 #include "tst.h"
+#include <k/kErr.h>
+
 #include <stdarg.h>
 #include <stdio.h>
@@ -86 +87 @@
  * Callback for resolving the Tst3Ext import.
  */
-static int GetImport(PKLDRMOD pMod, uint32_t iImport, uint32_t iSymbol, const char *pchSymbol, size_t cchSymbol,
-                     const char *pszVersion, PKLDRADDR puValue, uint32_t *pfKind, void *pvUser)
+static int GetImport(PKLDRMOD pMod, KU32 iImport, KU32 iSymbol, const char *pchSymbol, KSIZE cchSymbol,
+                     const char *pszVersion, PKLDRADDR puValue, KU32 *pfKind, void *pvUser)
 {
     if (*pfKind != KLDRSYMKIND_REQ_FLAT)
@@ -95 +96 @@
         ||  !strncmp(pchSymbol, "_Tst3Ext", strlen("_Tst3Ext")))
     {
-        *puValue = (uintptr_t)&Tst3Ext;
+        *puValue = (KUPTR)&Tst3Ext;
         *pfKind = KLDRSYMKIND_CODE | (sizeof(pfKind) == 4 ? KLDRSYMKIND_32BIT : KLDRSYMKIND_64BIT);
         return 0;
@@ -124 +125 @@
     /* get bits. */
     cbImage = kLdrModSize(pMod);
-    pvBits = malloc((size_t)cbImage + 0xfff);
+    pvBits = malloc((KSIZE)cbImage + 0xfff);
     if (pvBits)
     {
-        void *pvBits2 = (void *)( ((uintptr_t)pvBits + 0xfff) & ~(uintptr_t)0xfff );
-
-        KLDRADDR BaseAddress = (uintptr_t)pvBits2;
+        void *pvBits2 = (void *)( ((KUPTR)pvBits + 0xfff) & ~(KUPTR)0xfff );
+
+        KLDRADDR BaseAddress = (KUPTR)pvBits2;
         rc = kLdrModGetBits(pMod, pvBits2, BaseAddress, GetImport, NULL);
         if (!rc)
@@ -143 +144 @@
             if (!rc)
             {
-                int (*pfnEntryPoint)(int) = (int (*)(int)) ((uintptr_t)EntryPoint);
+                int (*pfnEntryPoint)(int) = (int (*)(int)) ((KUPTR)EntryPoint);
                 rc = pfnEntryPoint(42);
                 if (rc == 42)