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

Timestamp:

Oct 6, 1999, 1:26:02 AM (26 years ago)

Author:

phaller

Message:

Fix: problems while initializing SHELL32/NEW

File:

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

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.3 1999-09-28 00:37:39 phaller Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.4 1999-10-05 23:23:47 phaller Exp $ */
 
 /*
@@ -351 +351 @@
   hinstance = (HINSTANCE)realBaseAddress;
 
-  if(processImports((char *)win32file) == FALSE) {
-        fout << "Failed to process imports!" << endl;
-        goto failure;
-  }
-
+  //PH: get pResDir pointer correct first, since processImports may
+  //    implicitly call functions depending on it.
   IMAGE_SECTION_HEADER sh;
   if(GetSectionHdrByName (win32file, &sh, ".rsrc")) {
@@ -361 +358 @@
         pResDir = (PIMAGE_RESOURCE_DIRECTORY)(sh.VirtualAddress + realBaseAddress);
         pResourceSectionStart = (ULONG)pResSection->virtaddr - oh.ImageBase;
+  }
+
+  if(processImports((char *)win32file) == FALSE) {
+        fout << "Failed to process imports!" << endl;
+        goto failure;
   }