Changeset 9997 for trunk/src/kernel32/winimagepeldr.cpp

Timestamp:

Apr 9, 2003, 12:39:41 PM (22 years ago)

Author:

sandervl

Message:

Unmap memory view when deleting PE dll object

File:

• trunk/src/kernel32/winimagepeldr.cpp (modified) (33 diffs)

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.106 2003-03-31 11:54:28 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.107 2003-04-09 10:39:40 sandervl Exp $ */
 
 /*
@@ -112 +112 @@
     nrNameExports(0), nrOrdExports(0), nameexports(NULL), ordexports(NULL),
     memmap(NULL), pFixups(NULL), dwFixupSize(0), curnameexport(NULL), curordexport(NULL),
-    nrOrdExportsRegistered(0)
+    nrOrdExportsRegistered(0), peview(NULL)
 {
     HFILE  dllfile;
@@ -148 +148 @@
 {
     if(memmap)
+    {
+        if(peview) {
+            memmap->unmapViewOfFile(peview);
+            peview = NULL;
+        }
         memmap->Release();
+        memmap = NULL;
+    }
 
     if(hFile) {
@@ -171 +178 @@
 DWORD Win32PeLdrImage::init(ULONG reservedMem, ULONG ulPEOffset)
 {
- LPVOID win32file = NULL;
  ULONG  filesize, ulRead, ulNewPos;
  PIMAGE_SECTION_HEADER psh;
@@ -252 +258 @@
         goto failure;
     }
-    win32file = memmap->mapViewOfFile(0, 0, 2);
+    peview = memmap->mapViewOfFile(0, 0, 2);
 
     if(DosQueryPathInfo(szFileName, FIL_QUERYFULLNAME, szFullPath, sizeof(szFullPath)) == 0) {
@@ -303 +309 @@
     commitPage(realBaseAddress, FALSE);
 
-    nSections = NR_SECTIONS(win32file);
+    nSections = NR_SECTIONS(peview);
     section = (Section *)malloc(nSections*sizeof(Section));
     if(section == NULL) {
@@ -313 +319 @@
 
     imageSize = 0;
-    if ((psh = (PIMAGE_SECTION_HEADER)SECTIONHDROFF (win32file)) != NULL)
+    if ((psh = (PIMAGE_SECTION_HEADER)SECTIONHDROFF (peview)) != NULL)
     {
         dprintf((LOG, "*************************PE SECTIONS START**************************" ));
@@ -327 +333 @@
             dprintf((LOG, "Section flags:        %x\n\n", psh[i].Characteristics ));
 
-            if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_BASERELOC))
+            if(IsSectionType(peview, &psh[i], IMAGE_DIRECTORY_ENTRY_BASERELOC))
             {
                 dprintf((LOG, ".reloc" ));
@@ -335 +341 @@
                 continue;
             }
-            if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_EXPORT))
+            if(IsSectionType(peview, &psh[i], IMAGE_DIRECTORY_ENTRY_EXPORT))
             {
                 //SvL: Angus.exe has empty export section that's really an
@@ -347 +353 @@
                 }
             }
-            if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_RESOURCE))
+            if(IsSectionType(peview, &psh[i], IMAGE_DIRECTORY_ENTRY_RESOURCE))
             {
                 dprintf((LOG, ".rsrc" ));
@@ -355 +361 @@
                 continue;
             }
-            if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_TLS))
+            if(IsSectionType(peview, &psh[i], IMAGE_DIRECTORY_ENTRY_TLS))
             {
                 dprintf((LOG, "TLS section"));
-                tlsDir = (IMAGE_TLS_DIRECTORY *)ImageDirectoryOffset(win32file, IMAGE_DIRECTORY_ENTRY_TLS);
+                tlsDir = (IMAGE_TLS_DIRECTORY *)ImageDirectoryOffset(peview, IMAGE_DIRECTORY_ENTRY_TLS);
                 if(tlsDir) {
                     addSection(SECTION_TLS, psh[i].PointerToRawData,
@@ -366 +372 @@
                 continue;
             }
-            if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_DEBUG))
+            if(IsSectionType(peview, &psh[i], IMAGE_DIRECTORY_ENTRY_DEBUG))
             {
                 dprintf((LOG, ".rdebug" ));
@@ -374 +380 @@
                 continue;
             }
-            if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_IMPORT))
+            if(IsSectionType(peview, &psh[i], IMAGE_DIRECTORY_ENTRY_IMPORT))
             {
                 int type = SECTION_IMPORT;
@@ -465 +471 @@
 
     if(realBaseAddress != oh.ImageBase && !(dwFlags & FLAG_PELDR_LOADASDATAFILE)) {
-        pFixups     = (PIMAGE_BASE_RELOCATION)ImageDirectoryOffset(win32file, IMAGE_DIRECTORY_ENTRY_BASERELOC);
-        dwFixupSize = ImageDirectorySize(win32file, IMAGE_DIRECTORY_ENTRY_BASERELOC);
+        pFixups     = (PIMAGE_BASE_RELOCATION)ImageDirectoryOffset(peview, IMAGE_DIRECTORY_ENTRY_BASERELOC);
+        dwFixupSize = ImageDirectorySize(peview, IMAGE_DIRECTORY_ENTRY_BASERELOC);
         commitPage((ULONG)pFixups, FALSE);
     }
@@ -475 +481 @@
     if(!(dwFlags & FLAG_PELDR_LOADASDATAFILE))
     {
-        if(tlsDir = (IMAGE_TLS_DIRECTORY *)ImageDirectoryOffset(win32file, IMAGE_DIRECTORY_ENTRY_TLS))
+        if(tlsDir = (IMAGE_TLS_DIRECTORY *)ImageDirectoryOffset(peview, IMAGE_DIRECTORY_ENTRY_TLS))
         {
             Section *sect;
@@ -620 +626 @@
         }
 #endif
-        if(processExports((char *)win32file) == FALSE) {
+        if(processExports() == FALSE) {
             dprintf((LOG, "Failed to process exported apis" ));
             lasterror = LDRERROR_EXPORTS;
@@ -655 +661 @@
     if(!(dwFlags & (FLAG_PELDR_LOADASDATAFILE | FLAG_PELDR_SKIPIMPORTS)))
     {
-        if(processImports((char *)win32file) == FALSE) {
+        if(processImports() == FALSE) {
             dprintf((LOG, "Failed to process imports!" ));
             lasterror = LDRERROR_IMPORTS;
@@ -1381 +1387 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32PeLdrImage::processExports(char *win32file)
+BOOL Win32PeLdrImage::processExports()
 {
  IMAGE_SECTION_HEADER    sh;
@@ -1392 +1398 @@
   /* get section header and pointer to data directory for .edata section */
   if((ped = (PIMAGE_EXPORT_DIRECTORY)ImageDirectoryOffset
-     (win32file, IMAGE_DIRECTORY_ENTRY_EXPORT)) != NULL &&
-     GetSectionHdrByImageDir(win32file, IMAGE_DIRECTORY_ENTRY_EXPORT, &sh) ) {
-
-        dprintf((LOG, "Exported Functions: " ));
+     (peview, IMAGE_DIRECTORY_ENTRY_EXPORT)) != NULL &&
+     GetSectionHdrByImageDir(peview, IMAGE_DIRECTORY_ENTRY_EXPORT, &sh) ) 
+  {
+
+    dprintf((LOG, "Exported Functions: " ));
     ptrOrd     = (USHORT *)((ULONG)ped->AddressOfNameOrdinals +
-                            (ULONG)win32file);
+                            (ULONG)peview);
     ptrNames   = (ULONG *)((ULONG)ped->AddressOfNames +
-                            (ULONG)win32file);
+                            (ULONG)peview);
     ptrAddress = (ULONG *)((ULONG)ped->AddressOfFunctions +
-                            (ULONG)win32file);
+                            (ULONG)peview);
     nrOrdExports  = ped->NumberOfFunctions;
     nrNameExports = ped->NumberOfNames;
@@ -1409 +1416 @@
     for(i=0;i<ped->NumberOfNames;i++)
     {
-    fForwarder = FALSE;
+        fForwarder = FALSE;
         ord        = ptrOrd[i] + ped->Base;
-        name       = (char *)((ULONG)ptrNames[i] + (ULONG)win32file);
+        name       = (char *)((ULONG)ptrNames[i] + (ULONG)peview);
         RVAExport  = ptrAddress[ptrOrd[i]];
 
@@ -1421 +1428 @@
             fForwarder = AddForwarder(oh.ImageBase + RVAExport, name, ord);
         }
-    if(!fForwarder) {
+        if(!fForwarder) {
             //points to code (virtual address relative to oh.ImageBase
             AddNameExport(oh.ImageBase + RVAExport, name, ord);
@@ -1429 +1436 @@
     for(i=0;i<max(ped->NumberOfNames,ped->NumberOfFunctions);i++)
     {
-    fForwarder = FALSE;
+        fForwarder = FALSE;
         ord = ped->Base + i;  //Correct??
         RVAExport = ptrAddress[i];
@@ -1439 +1446 @@
             fForwarder = AddForwarder(oh.ImageBase + RVAExport, NULL, ord);
         }
-    if(!fForwarder && RVAExport) {
+        if(!fForwarder && RVAExport) {
             //points to code (virtual address relative to oh.ImageBase
             dprintf((LOG, "ord %d at 0x%08x (0x%08x)", ord, RVAExport, realBaseAddress + RVAExport));
@@ -1675 +1682 @@
  **/
 //******************************************************************************
-BOOL Win32PeLdrImage::processImports(char *win32file)
+BOOL Win32PeLdrImage::processImports()
 {
     PIMAGE_IMPORT_DESCRIPTOR pID;
@@ -1707 +1714 @@
 
     /* 1) get module names */
-    pID = (PIMAGE_IMPORT_DESCRIPTOR)ImageDirectoryOffset(win32file, IMAGE_DIRECTORY_ENTRY_IMPORT);
+    pID = (PIMAGE_IMPORT_DESCRIPTOR)ImageDirectoryOffset(peview, IMAGE_DIRECTORY_ENTRY_IMPORT);
     if (pID == NULL)
         return TRUE;
-    if (!GetSectionHdrByImageDir(win32file, IMAGE_DIRECTORY_ENTRY_IMPORT, &shID))
+    if (!GetSectionHdrByImageDir(peview, IMAGE_DIRECTORY_ENTRY_IMPORT, &shID))
         return TRUE;
 
@@ -1719 +1726 @@
         //test RVA inside ID-Section
         if (pID[i].Name >= shID.VirtualAddress && pID[i].Name < shID.VirtualAddress + max(shID.Misc.VirtualSize, shID.SizeOfRawData)) {
-            pszTmp = (char*)(pID[i].Name + (ULONG)win32file);
+            pszTmp = (char*)(pID[i].Name + (ULONG)peview);
         }
         else {
             //is the "Extra"-section already found or do we have to find it?
             if (pID[i].Name < shExtra.VirtualAddress || pID[i].Name >= shExtra.VirtualAddress + max(shExtra.Misc.VirtualSize, shExtra.SizeOfRawData)) {
-                if (!GetSectionHdrByRVA(win32file, &shExtra, pID[i].Name))
+                if (!GetSectionHdrByRVA(peview, &shExtra, pID[i].Name))
                     return FALSE;
             }
-            pszTmp = (char*)(pID[i].Name + (ULONG)win32file);
+            pszTmp = (char*)(pID[i].Name + (ULONG)peview);
         }
         Size += strlen(pszTmp) + 1;
@@ -1744 +1751 @@
         //test RVA inside ID-Section
         if (pID[i].Name >= shID.VirtualAddress && pID[i].Name < shID.VirtualAddress + max(shID.Misc.VirtualSize, shID.SizeOfRawData)) {
-            pszTmp = (char*)(pID[i].Name + (ULONG)win32file);
+            pszTmp = (char*)(pID[i].Name + (ULONG)peview);
         }
         else {
@@ -1751 +1758 @@
             if (pID[i].Name < shExtra.VirtualAddress || pID[i].Name >= shExtra.VirtualAddress + max(shExtra.Misc.VirtualSize, shExtra.SizeOfRawData))
             {
-                if (GetSectionHdrByRVA(win32file, &shExtra, pID[i].Name)) {
+                if (GetSectionHdrByRVA(peview, &shExtra, pID[i].Name)) {
                     return FALSE;
                 }
             }
-            pszTmp = (char*)(pID[i].Name + (ULONG)win32file);
+            pszTmp = (char*)(pID[i].Name + (ULONG)peview);
         }
 
@@ -1770 +1777 @@
     /* 2) functions */
     pszCurModule = pszModules;
-    pOH = (PIMAGE_OPTIONAL_HEADER)OPTHEADEROFF(win32file);
+    pOH = (PIMAGE_OPTIONAL_HEADER)OPTHEADEROFF(peview);
     for (i = 0; i < cModules; i++)
     {
@@ -1804 +1811 @@
         if ((ULONG)pulImport < shExtra.VirtualAddress || (ULONG)pulImport >= shExtra.VirtualAddress + max(shExtra.Misc.VirtualSize, shExtra.SizeOfRawData))
         {
-            if (!GetSectionHdrByRVA(win32file, &shExtra, (ULONG)pulImport))
+            if (!GetSectionHdrByRVA(peview, &shExtra, (ULONG)pulImport))
             {
                 dprintf((LOG, "warning: could not find section for Thunk RVA %x", pulImport ));
@@ -1849 +1856 @@
         }
 
-        pulImport  = (PULONG)((ULONG)pulImport + (ULONG)win32file);
+        pulImport  = (PULONG)((ULONG)pulImport + (ULONG)peview);
         j          = 0;
-        ulCurFixup = (ULONG)pID[i].FirstThunk + (ULONG)win32file;
+        ulCurFixup = (ULONG)pID[i].FirstThunk + (ULONG)peview;
 
         section    = findSectionByOS2Addr(ulCurFixup);
@@ -1873 +1880 @@
                 if (pulImport[j] < shExtra.VirtualAddress || pulImport[j] >= shExtra.VirtualAddress + max(shExtra.Misc.VirtualSize, shExtra.SizeOfRawData))
                 {
-                    if (!GetSectionHdrByRVA(win32file, &shExtra, pulImport[j]))
+                    if (!GetSectionHdrByRVA(peview, &shExtra, pulImport[j]))
                     {
                         dprintf((LOG, "warning: could not find section for Import Name RVA ", pulImport[j] ));
@@ -1880 +1887 @@
                 }
                 //KSO - Aug 6 1998 1:15am:this eases comparing...
-                char *pszFunctionName = (char*)(pulImport[j] + (ULONG)win32file + 2);
+                char *pszFunctionName = (char*)(pulImport[j] + (ULONG)peview + 2);
                 dprintf((LOG, "0x%08x Imported function %s (0x%08x)", ulCurFixup,  pszFunctionName, WinImage->getApi(pszFunctionName)));
                 StoreImportByName(WinImage, pszFunctionName, ulCurFixup);