Changeset 712 for trunk/src/kernel32/winimage.cpp

Timestamp:

Aug 27, 1999, 6:51:01 PM (26 years ago)

Author:

sandervl

Message:

Implemented multiple views of memory mapped files + some bugfixes to PE loader code

File:

• trunk/src/kernel32/winimage.cpp (modified) (7 diffs)

trunk/src/kernel32/winimage.cpp

@@ -1 @@
-/* $Id: winimage.cpp,v 1.17 1999-08-26 12:55:37 sandervl Exp $ */
+/* $Id: winimage.cpp,v 1.18 1999-08-27 16:51:01 sandervl Exp $ */
 
 /*
@@ -200 +200 @@
  IMAGE_TLS_DIRECTORY *tlsDir = NULL;
  int    nSections, i;
+ char   szFullPath[CCHMAXPATH] = "";
 
   fImgMapping = VIRTUAL_MapFileA(szFileName, &win32file);
@@ -207 +208 @@
         WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
         goto failure;
+  }
+
+  if(DosQueryPathInfo(szFileName, FIL_QUERYFULLNAME, szFullPath, sizeof(szFullPath)) == 0) {
+        setFullPath(szFullPath);
   }
 
@@ -425 +430 @@
         }
   }
-
-  if(processImports((char *)win32file) == FALSE) {
-        fout << "Failed to process imports!" << endl;
-        goto failure;
-  }
-
   if(fh.Characteristics & IMAGE_FILE_DLL) {
         if(processExports((char *)win32file) == FALSE) {
@@ -437 +436 @@
         }
   }
+
+  if(processImports((char *)win32file) == FALSE) {
+        fout << "Failed to process imports!" << endl;
+        goto failure;
+  }
+
   IMAGE_SECTION_HEADER sh;
   if(GetSectionHdrByName (win32file, &sh, ".rsrc")) {
@@ -797 +802 @@
   apiaddr = WinDll->getApi(ordinal);
   if(apiaddr == 0) {
-    fout << "--->>> NOT FOUND!";
-    *import = (ULONG)MissingApi;
+        fout << "--->>> NOT FOUND!";
+        *import = (ULONG)MissingApi;
   }
   else  *import = apiaddr;
@@ -812 +817 @@
   apiaddr = WinDll->getApi(impname);
   if(apiaddr == 0) {
-    fout << "--->>> NOT FOUND!";
-    *import = (ULONG)MissingApi;
+        fout << "--->>> NOT FOUND!";
+        *import = (ULONG)MissingApi;
   }
   else  *import = apiaddr;