Changeset 2869 for trunk/kLdr/kLdrModPE.c

Timestamp:

Nov 12, 2006, 3:47:25 AM (19 years ago)

Author:

bird

Message:

the simple testcase works.

File:

• trunk/kLdr/kLdrModPE.c (modified) (2 diffs)

trunk/kLdr/kLdrModPE.c

@@ -241 +241 @@
     pMod->enmFmt = KLDRFMT_PE;
     if (s.FileHdr.Characteristics & IMAGE_FILE_DLL)
-        pMod->enmType = s.FileHdr.Characteristics & IMAGE_FILE_RELOCS_STRIPPED
+        pMod->enmType = !(s.FileHdr.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)
             ? KLDRTYPE_SHARED_LIBRARY_RELOCATABLE
             : KLDRTYPE_SHARED_LIBRARY_FIXED;
     else
-        pMod->enmType = s.FileHdr.Characteristics & IMAGE_FILE_RELOCS_STRIPPED
+        pMod->enmType = !(s.FileHdr.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)
             ? KLDRTYPE_EXECUTABLE_RELOCATABLE
             : KLDRTYPE_EXECUTABLE_FIXED;
@@ -1580 +1580 @@
                 rc = pfnGetImport(pMod, iImp, IMAGE_ORDINAL32(pThunk->u1.Ordinal), NULL, &Value, &fKind, pvUser);
             else if (KLDRMODPE_VALID_RVA(pModPE, pThunk->u1.Ordinal))
-                rc = pfnGetImport(pMod, iImp, NIL_KLDRMOD_SYM_ORDINAL,
-                                  KLDRMODPE_RVA2TYPE(pvMapping, pThunk->u1.Ordinal, const char *),
-                                  &Value, &fKind, pvUser);
+            {
+                const IMAGE_IMPORT_BY_NAME *pName = KLDRMODPE_RVA2TYPE(pvMapping, pThunk->u1.Ordinal, const IMAGE_IMPORT_BY_NAME *);
+                rc = pfnGetImport(pMod, iImp, NIL_KLDRMOD_SYM_ORDINAL, pName->Name, &Value, &fKind, pvUser);
+            }
             else
             {