Changeset 550 for trunk/include

Timestamp:

Aug 18, 1999, 7:18:01 PM (26 years ago)

Author:

sandervl

Message:

PE loader changes

Location:

trunk/include

Files:

• nameid.h (modified) (3 diffs)
• windll.h (modified) (3 diffs)
• winimage.h (modified) (7 diffs)

trunk/include/nameid.h

@@ -1 @@
-/* $Id: nameid.h,v 1.2 1999-05-27 15:17:58 phaller Exp $ */
+/* $Id: nameid.h,v 1.3 1999-08-18 17:16:05 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
 int SYSTEM ConvertNameId(ULONG hModule, char *);
 
-void SYSTEM UpCase(char *mixedcase);
-
 #ifndef ULONG
 #define ULONG unsigned long
@@ -24 +22 @@
 
 ULONG GetOS2ModuleHandle(ULONG hmod);
+char *StripPath(char *path);
 
 #ifdef __cplusplus

trunk/include/windll.h

@@ -1 @@
-/* $Id: windll.h,v 1.4 1999-08-18 12:24:52 sandervl Exp $ */
+/* $Id: windll.h,v 1.5 1999-08-18 17:16:05 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
 #include "winimage.h"
 
-#ifndef CCHMAXPATH
-#define CCHMAXPATH 260
-#endif
 #ifndef HINSTANCE
 #define HINSTANCE ULONG
@@ -89 +86 @@
 private:
         ULONG     referenced;
-        char      szModule[CCHMAXPATH];
-
-        char     *StripPath(char *path);
 
 

trunk/include/winimage.h

@@ -1 @@
-/* $Id: winimage.h,v 1.5 1999-08-18 12:24:53 sandervl Exp $ */
+/* $Id: winimage.h,v 1.6 1999-08-18 17:16:05 sandervl Exp $ */
 
 /*
@@ -27 +27 @@
 #endif
 
+#ifndef CCHMAXPATH
+#define CCHMAXPATH 260
+#endif
 
 //SvL: Amount of memory the peldr dll reserves for win32 exes without fixups
@@ -125 +128 @@
         char *getFullPath()           { return fullpath; };
 
+        char *getModuleName()         { return szModule; };
+
         HRSRC   findResourceA(LPCSTR lpszName, LPSTR lpszType);
         HRSRC   findResourceW(LPWSTR lpszName, LPWSTR lpszType);
@@ -163 +168 @@
      Section *findSectionByAddr(ULONG addr);
 
-        BOOL  storeSections();
+        BOOL  storeSections(char *win32file);
         BOOL  setMemFlags();
         BOOL  setFixups(PIMAGE_BASE_RELOCATION prel);
@@ -182 +187 @@
         Win32Resource            *winres;
 
-        IMAGE_OPTIONAL_HEADER oh;
-        IMAGE_FILE_HEADER     fh;
+        IMAGE_OPTIONAL_HEADER oh;
+        IMAGE_FILE_HEADER     fh;
 
         ULONG                 errorState, entryPoint;
@@ -193 +198 @@
         ULONG                 nrsections, imageSize, imageVirtBase, imageVirtEnd;
         //OS/2 virtual base address
-        ULONG                 baseAddress, realBaseAddress;
+        ULONG                 realBaseAddress;
         Section               section[MAX_SECTION];
 
         char                 *szFileName, *fullpath;
+        char                  szModule[CCHMAXPATH];
 
         HINSTANCE             hinstance;
@@ -226 +232 @@
 extern ofstream fout;
 
+//SvL: This structure is placed at the end of the first page of the image (header 
+//     page), so we can determine the Win32Image pointer from a HINSTANCE variable
+//     (which is actually the address of the win32 module)
+typedef struct 
+{
+  Win32Image *image;
+  ULONG       magic; 
+} WINIMAGE_LOOKUP;
+
+#define WINIMAGE_LOOKUPADDR(a)  (WINIMAGE_LOOKUP *)((ULONG)a + PAGE_SIZE - sizeof(WINIMAGE_LOOKUP))
+
 #endif //__PE2LX__