Changeset 2959

Timestamp:

Feb 11, 2007, 5:31:45 AM (19 years ago)

Author:

bird

Message:

Fixed a couple of bugs.

Location:

trunk/kLdr

Files:

• kLdrModPE.c (modified) (1 diff)
• tstkLdrMod.c (modified) (5 diffs)

trunk/kLdr/kLdrModPE.c

@@ -1254 +1254 @@
     if (rc)
         return rc;
-    KLDRMODPE_ASSERT(pModPE->pvMapping);
+    KLDRMODPE_ASSERT(!pModPE->pvMapping);
     return 0;
 

trunk/kLdr/tstkLdrMod.c

@@ -213 +213 @@
     if (iSymbol != NIL_KLDRMOD_SYM_ORDINAL)
     {
+        fKind2 = 0;
         rc = kLdrModQuerySymbol(pMod, pvUser, MY_BASEADDRESS, iSymbol, NULL, 0, NULL, NULL, NULL,
                                 &uValue2, &fKind2);
@@ -228 +229 @@
     if (pchSymbol)
     {
+        fKind2 = 0;
         rc = kLdrModQuerySymbol(pMod, pvUser, MY_BASEADDRESS, NIL_KLDRMOD_SYM_ORDINAL, pchSymbol, cchSymbol, pszVersion,
                                 NULL, NULL, &uValue2, &fKind2);
@@ -351 +353 @@
      * Negative symbol query tests.
      */
-    fKind = 0xdeadf00d;
+    fKind = 0;
     Value = 0x0badc0de;
     rc = kLdrModQuerySymbol(pMod, pvBits, MY_BASEADDRESS, NIL_KLDRMOD_SYM_ORDINAL - 20, NULL, 0, NULL, NULL, NULL,
@@ -357 +359 @@
     if (rc)
     {
-        if (fKind != 0)
-            return Failure("fKind wasn't cleared on failure.");
         if (Value != 0)
             return Failure("Value wasn't cleared on failure.");
     }
 
-    fKind = 0xdeadf00d;
+    fKind = 0;
     Value = 0x0badc0de;
     rc = kLdrModQuerySymbol(pMod, pvBits, MY_BASEADDRESS, NIL_KLDRMOD_SYM_ORDINAL, NULL, 0, NULL, NULL, NULL,
@@ -369 +369 @@
     if (!rc)
         return Failure("NIL ordinal succeeded!");
-    if (fKind != 0)
-        return Failure("fKind wasn't cleared on failure.");
     if (Value != 0)
         return Failure("Value wasn't cleared on failure.");