Changeset 2858 for trunk/kLdr/kLdrModPE.c

Timestamp:

Nov 6, 2006, 1:23:14 AM (19 years ago)

Author:

bird

Message:

bugfixing - dinner break.

File:

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

trunk/kLdr/kLdrModPE.c

@@ -204 +204 @@
      */
     cchFilename = kLdrHlpStrLen(kLdrRdrName(pRdr));
-    cb = sizeof(KLDRMOD)
-       + s.FileHdr.NumberOfSections * sizeof(KLDRSEG)
-       + sizeof(KLDRMODPE) - sizeof(IMAGE_SECTION_HEADER)
-       + s.FileHdr.NumberOfSections * sizeof(IMAGE_SECTION_HEADER)
+    cb = KLDR_ALIGN_Z(KLDR_OFFSETOF(KLDRMODPE, aShdrs[s.FileHdr.NumberOfSections]), 16)
+       + KLDR_OFFSETOF(KLDRMOD, aSegments[s.FileHdr.NumberOfSections + 1])
        + cchFilename + 1;
     pModPE = (PKLDRMODPE)kldrHlpAlloc(cb);
     if (!pModPE)
         return KLDR_ERR_NO_MEMORY;
+    *ppModPE = pModPE;
 
     /* KLDRMOD */
-    pMod = (PKLDRMOD)((uint8_t *)pModPE + sizeof(KLDRMOD) + (s.FileHdr.NumberOfSections + 1) * sizeof(KLDRSEG));
+    pMod = (PKLDRMOD)((uint8_t *)pModPE + KLDR_ALIGN_Z(KLDR_OFFSETOF(KLDRMODPE, aShdrs[s.FileHdr.NumberOfSections]), 16));
     pMod->pvData = pModPE;
     pMod->pRdr = pRdr;
@@ -252 +251 @@
     pModPE->Hdrs.Signature = s.Signature;
     pModPE->Hdrs.FileHeader = s.FileHdr;
-    *ppModPE = pModPE;
 
     /*
@@ -811 +809 @@
 
 /** @copydoc kLdrModEnumSymbols */
-static int kldrModPEEnumSymbols(PKLDRMOD pMod, uint32_t fFlags, const void *pvBits, KLDRADDR BaseAddress,
-                                PFNKLDRMODENUMSYMS pfnCallback, void *pvUser)
+static int kldrModPEEnumSymbols(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress,
+                                uint32_t fFlags, PFNKLDRMODENUMSYMS pfnCallback, void *pvUser)
 {
     PKLDRMODPE                      pModPE = (PKLDRMODPE)pMod->pvData;
@@ -890 +888 @@
 
 /** @copydoc kLdrModGetImport */
-static int kldrModPEGetImport(PKLDRMOD pMod, void *pvBits, uint32_t iImport, char *pszName, size_t cchName)
+static int kldrModPEGetImport(PKLDRMOD pMod, const void *pvBits, uint32_t iImport, char *pszName, size_t cchName)
 {
     PKLDRMODPE                      pModPE = (PKLDRMODPE)pMod->pvData;
@@ -1940 +1938 @@
 }
 
+
+/**
+ * The PE module interpreter method table.
+ */
+KLDRMODOPS g_kLdrModPEOps =
+{
+    "PE",
+    NULL,
+    kldrModPECreate,
+    kldrModPEDestroy,
+    kldrModPEQuerySymbol,
+    kldrModPEEnumSymbols,
+    kldrModPEGetImport,
+    kldrModPENumberOfImports,
+    NULL /* can execute one is optional */,
+    kldrModPEGetStackInfo,
+    kldrModPEQueryMainEntrypoint,
+    kldrModPEEnumDbgInfo,
+    kldrModPEHasDbgInfo,
+    kldrModPEMap,
+    kldrModPEUnmap,
+    kldrModPEAllocTLS,
+    kldrModPEFreeTLS,
+    kldrModPEReload,
+    kldrModPEFixupMapping,
+    kldrModPECallInit,
+    kldrModPECallTerm,
+    kldrModPECallThread,
+    kldrModPESize,
+    kldrModPEGetBits,
+    kldrModPERelocateBits,
+    42 /* the end */
+};