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

Timestamp:

Aug 22, 1999, 4:25:13 PM (26 years ago)

Author:

sandervl

Message:

PE loader bugfixes

File:

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

trunk/src/kernel32/winimage.cpp

@@ -1 @@
-/* $Id: winimage.cpp,v 1.12 1999-08-21 19:47:30 sandervl Exp $ */
+/* $Id: winimage.cpp,v 1.13 1999-08-22 14:24:35 sandervl Exp $ */
 
 /*
@@ -62 +62 @@
     imageVirtBase(-1), realBaseAddress(0), imageVirtEnd(0),
     nrNameExports(0), nrOrdExports(0), nameexports(NULL), ordexports(NULL),
-    szFileName(NULL), NameTable(NULL), Win32Table(NULL), fullpath(NULL),
+    NameTable(NULL), Win32Table(NULL), fullpath(NULL),
     tlsAddress(0), tlsIndexAddr(0), tlsInitSize(0), tlsTotalSize(0), tlsCallBackAddr(0), tlsIndex(-1),
     pResSection(NULL), pResDir(NULL), winres(NULL), VersionId(-1)
@@ -75 +75 @@
     foutInit = TRUE;
   }
-  this->szFileName = szFileName;
+  strcpy(this->szFileName, szFileName);
 
   strcpy(szModule, StripPath(szFileName));
@@ -98 +98 @@
     imageVirtBase(-1), realBaseAddress(0), imageVirtEnd(0),
     nrNameExports(0), nrOrdExports(0), nameexports(NULL), ordexports(NULL),
-    szFileName(NULL), NameTable(NULL), Win32Table(NULL), fullpath(NULL),
+    NameTable(NULL), Win32Table(NULL), fullpath(NULL),
     tlsAddress(0), tlsIndexAddr(0), tlsInitSize(0), tlsTotalSize(0), tlsCallBackAddr(0), tlsIndex(-1),
     pResSection(NULL), pResDir(NULL), winres(NULL)
@@ -106 +106 @@
 #endif
   OS2ImageInit(hinstance, NameTableId, Win32TableId);
+
+  szFileName[0] = 0;
 
   char *name = OS2GetDllName(hinstance);
@@ -422 +424 @@
         return(FALSE);
   }
-  entryPoint = realBaseAddress + oh.AddressOfEntryPoint;
+  if(oh.AddressOfEntryPoint) {
+        entryPoint = realBaseAddress + oh.AddressOfEntryPoint;
+  }
+  else {
+        fout << "EntryPoint == NULL" << endl;
+        entryPoint = NULL;
+  }
 
   if(tlsDir != NULL) {