Changeset 2883 for trunk/kLdr/kLdrModLX.c

Timestamp:

Nov 18, 2006, 12:21:33 PM (19 years ago)

Author:

bird

Message:

cleanup.

File:

• trunk/kLdr/kLdrModLX.c (modified) (12 diffs)

trunk/kLdr/kLdrModLX.c

@@ -127 +127 @@
 static int kldrModLXDoProtect(PKLDRMODLX pModLX, void *pvBits, unsigned fUnprotectOrProtect);
 static int kldrModLXDoCallDLL(PKLDRMODLX pModLX, unsigned uOp, uintptr_t uHandle);
-static int32_t kldrModLXDoGetOrdinalByName(PKLDRMODLX pModLX, const char *pszName);
 static int kldrModLXDoForwarderQuery(PKLDRMODLX pModLX, const struct e32_entry *pEntry,
                                      PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser, PKLDRADDR puValue, uint32_t *pfKind);
@@ -259 +258 @@
     cb = KLDR_ALIGN_Z(sizeof(KLDRMODLX), 8)
        + KLDR_ALIGN_Z(KLDR_OFFSETOF(KLDRMOD, aSegments[Hdr.e32_objcnt + 1]), 8)
-       + KLDR_ALIGN_Z(cchFilename + 1, 8),
+       + KLDR_ALIGN_Z(cchFilename + 1, 8)
        + Hdr.e32_ldrsize;
     pModLX = (PKLDRMODLX)kldrHlpAlloc(cb);
@@ -367 +366 @@
      * (The table entry consists of a pascal string followed by a 16-bit ordinal.)
      */
-    pMod->pszName = kldrModLXDoNameTableLookupByOrdinal(pModLX->pbResNameTab,
-                                                        pModLX->pbLoaderSectionLast - pModLX->pbResNameTab + 1,
-                                                        0);
+    pMod->pszName = kldrModLXDoNameTableLookupByOrdinal(pModLX->pbResNameTab,
+                                                        pModLX->pbLoaderSectionLast - pModLX->pbResNameTab + 1,
+                                                        0);
     if (!pMod->pszName)
         return KLDR_ERR_LX_NO_SONAME;
@@ -467 +466 @@
         if ((pModLX->paObjs[i].o32_flags & (OBJREAD | OBJWRITE | OBJEXEC | OBJRSRC)) == OBJRSRC)
             pMod->aSegments[i].enmProt = KLDRPROT_READONLY;
-        //pMod->aSegments[i].f16bit = !(pModLX->paObjs[i].o32_flags & OBJBIGDEF)
-        //pMod->aSegments[i].fIOPL = !(pModLX->paObjs[i].o32_flags & OBJIOPL)
-        //pMod->aSegments[i].fConforming = !(pModLX->paObjs[i].o32_flags & OBJCONFORM)
+        /pMod->aSegments[i].f16bit = !(pModLX->paObjs[i].o32_flags & OBJBIGDEF)
+        pMod->aSegments[i].fIOPL = !(pModLX->paObjs[i].o32_flags & OBJIOPL)
+        
     }
 
@@ -883 +882 @@
 {
     PKLDRMODLX                      pModLX = (PKLDRMODLX)pMod->pvData;
-//    int                             rc;
+/
 
     kldrModLXResolveBaseAddress(pModLX, &BaseAddress);
@@ -927 +926 @@
 static int kldrModLXGetImport(PKLDRMOD pMod, const void *pvBits, uint32_t iImport, char *pszName, size_t cchName)
 {
-    PKLDRMODLX      pModLX = (PKLDRMODLX)pMod->pvData;
+    
     const uint8_t * pb = NULL;
     int             rc;
@@ -1011 +1010 @@
 static int kldrModLXEnumDbgInfo(PKLDRMOD pMod, const void *pvBits, PFNKLDRENUMDBG pfnCallback, void *pvUser)
 {
-    //PKLDRMODLX pModLX = (PKLDRMODLX)pMod->pvData;
+    /