Changeset 3584 for trunk/kStuff/kLdr/testcase/tst-0-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-0-driver.c (modified) (14 diffs)

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

@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <kLdr.h>
 #include "tst.h"
 #include <stdarg.h>
@@ -76 +75 @@
     char szBuf[512];
     char *psz;
-    size_t cch;
+    KSIZE cch;
     HKLDRMOD hMod;
     int rc;
@@ -145 +144 @@
             szBuf[cch + 2] = '\0';
             rc = kLdrDyldGetName(hMod2, szBuf, cch);
-            if (rc == KLDR_ERR_BUFFER_OVERFLOW)
+            if (rc == KERR_BUFFER_OVERFLOW)
             {
                 if (!szBuf[0])
@@ -155 +154 @@
             }
             else
-                Failure("kLdrDyldGetName(\"tst-0-d\",,,) -> rc=%d (%#x) instead of KLDR_ERR_BUFFER_OVERFLOW\n", rc, rc);
+                Failure("kLdrDyldGetName(\"tst-0-d\",,,) -> rc=%d (%#x) instead of KERR_BUFFER_OVERFLOW\n", rc, rc);
 
             /* check that we can query the module by the returned name. */
@@ -183 +182 @@
             szBuf[cch + 2] = '\0';
             rc = kLdrDyldGetFilename(hMod2, szBuf, cch);
-            if (rc == KLDR_ERR_BUFFER_OVERFLOW)
+            if (rc == KERR_BUFFER_OVERFLOW)
             {
                 if (!szBuf[0])
@@ -193 +192 @@
             }
             else
-                Failure("kLdrDyldGetFilename(\"tst-0-d\",,,) -> rc=%d (%#x) instead of KLDR_ERR_BUFFER_OVERFLOW\n", rc, rc);
+                Failure("kLdrDyldGetFilename(\"tst-0-d\",,,) -> rc=%d (%#x) instead of KERR_BUFFER_OVERFLOW\n", rc, rc);
 
             /* check that we can query the module by the returned filename. */
@@ -252 +251 @@
         if (!g_cErrors)
         {
-            uintptr_t uValue;
-            uint32_t fKind;
+            KUPTR uValue;
+            KU32  fKind;
 
             fKind = 0xffeeffee;
-            uValue = ~(uintptr_t)42;
-            rc = kLdrDyldQuerySymbol(hMod, NIL_KLDRMOD_SYM_ORDINAL, MY_NAME("FuncA"), &uValue, &fKind);
-            if (!rc)
-            {
-                if (uValue == ~(uintptr_t)42)
+            uValue = ~(KUPTR)42;
+            rc = kLdrDyldQuerySymbol(hMod, NIL_KLDRMOD_SYM_ORDINAL, MY_NAME("FuncA"), NULL, &uValue, &fKind);
+            if (!rc)
+            {
+                if (uValue == ~(KUPTR)42)
                     Failure("kLdrDyldQuerySymbol(\"tst-0-a\",,\"FuncA\",): uValue wasn't set.\n");
                 if (fKind == 0xffeeffee)
@@ -289 +288 @@
                 if (!rc)
                 {
-                    uintptr_t offSegment;
-                    uint32_t iSegment;
+                    KUPTR offSegment;
+                    KU32 iSegment;
 
                     if (hMod3 != hMod)
@@ -316 +315 @@
                     iSegment = 0x42424242;
                     offSegment = 0x87654321;
-                    rc = kLdrDyldFindByAddress(~(uintptr_t)16, &hMod3, &iSegment, &offSegment);
+                    rc = kLdrDyldFindByAddress(~(KUPTR)16, &hMod3, &iSegment, &offSegment);
                     if (!rc)
                         Failure("negative kLdrDyldFindByAddress test returned successfully!\n");
-                    if (iSegment != ~(uint32_t)0)
+                    if (iSegment != ~(KU32)0)
                         Failure("negative kLdrDyldFindByAddress: bad iSegment=%#x\n", iSegment);
-                    if (offSegment != ~(uintptr_t)0)
+                    if (offSegment != ~(KUPTR)0)
                         Failure("negative kLdrDyldFindByAddress: bad offSegment=%p\n", (void *)offSegment);
                     if (hMod3 != NIL_HKLDRMOD)
@@ -334 +333 @@
 
             fKind = 0xffeeffee;
-            uValue = ~(uintptr_t)42;
-            rc = kLdrDyldQuerySymbol(hMod2, NIL_KLDRMOD_SYM_ORDINAL, MY_NAME("FuncD"), &uValue, &fKind);
-            if (!rc)
-            {
-                if (uValue == ~(uintptr_t)42)
+            uValue = ~(KUPTR)42;
+            rc = kLdrDyldQuerySymbol(hMod2, NIL_KLDRMOD_SYM_ORDINAL, MY_NAME("FuncD"), NULL, &uValue, &fKind);
+            if (!rc)
+            {
+                if (uValue == ~(KUPTR)42)
                     Failure("kLdrDyldQuerySymbol(\"tst-0-d\",,\"FuncD\",): uValue wasn't set.\n");
                 if (fKind == 0xffeeffee)
@@ -407 +406 @@
         HKLDRMOD hModC;
         int (*pfnFuncC)(void);
-        uintptr_t uValue;
+        KUPTR uValue;
 
         rc = kLdrDyldLoad("tst-0-a", NULL, NULL, KLDRDYLD_SEARCH_HOST, 0, &hModA, NULL, 0);
@@ -426 +425 @@
         if (!rc)
         {
-            rc = kLdrDyldQuerySymbol(hModA, NIL_KLDRMOD_SYM_ORDINAL, MY_NAME("FuncA"), &uValue, NULL);
+            rc = kLdrDyldQuerySymbol(hModA, NIL_KLDRMOD_SYM_ORDINAL, MY_NAME("FuncA"), NULL, &uValue, NULL);
             if (!rc)
                 pfnFuncA = (int (*)(void))uValue;
@@ -434 +433 @@
         if (!rc)
         {
-            rc = kLdrDyldQuerySymbol(hModB, NIL_KLDRMOD_SYM_ORDINAL, MY_NAME("FuncB"), &uValue, NULL);
+            rc = kLdrDyldQuerySymbol(hModB, NIL_KLDRMOD_SYM_ORDINAL, MY_NAME("FuncB"), NULL, &uValue, NULL);
             if (!rc)
                 pfnFuncB = (int (*)(void))uValue;
@@ -442 +441 @@
         if (!rc)
         {
-            rc = kLdrDyldQuerySymbol(hModC, NIL_KLDRMOD_SYM_ORDINAL, MY_NAME("FuncC"), &uValue, NULL);
+            rc = kLdrDyldQuerySymbol(hModC, NIL_KLDRMOD_SYM_ORDINAL, MY_NAME("FuncC"), NULL, &uValue, NULL);
             if (!rc)
                 pfnFuncC = (int (*)(void))uValue;