Changeset 4304 for trunk/src/kernel32/winimagepe2lx.cpp

Timestamp:

Sep 22, 2000, 6:35:09 AM (25 years ago)

Author:

bird

Message:

Changed hinstance to address of module.

File:

• trunk/src/kernel32/winimagepe2lx.cpp (modified) (9 diffs)

trunk/src/kernel32/winimagepe2lx.cpp

@@ -1 @@
-/* $Id: winimagepe2lx.cpp,v 1.14 2000-09-02 21:14:50 bird Exp $ */
+/* $Id: winimagepe2lx.cpp,v 1.15 2000-09-22 04:35:09 bird Exp $ */
 
 /*
@@ -147 +147 @@
 Win32Pe2LxImage::Win32Pe2LxImage(HINSTANCE hinstance, BOOL fWin32k)
     : Win32ImageBase(hinstance),
-    paSections(NULL), cSections(0), pNtHdrs(NULL), fWin32k(fWin32k)
+    paSections(NULL), cSections(0), pNtHdrs(NULL), fWin32k(fWin32k),
+    hmod(hinstance)
 {
     setFullPath(szFileName);
@@ -174 +175 @@
  *            Validate the NT headers.
  *            Read the PE section table the set the RVAs in paSections.
+ *            Set instance handle to address of header.
  *            Locate and set the entrypoint.
  *            Locate the resource directory (if any). (pResRootDir, ulRVAResourceSection)
@@ -242 +244 @@
         return FALSE;
     }
+
+    /* Set instance handle to address of header. */
+    hinstance = (HINSTANCE)paSections[0].ulAddress;
 
     /* Locate and set the entrypoint. */
@@ -401 +406 @@
              * If there is a buffer overflow we'll allocate more storage and retry.
              */
-            rc = W32kQueryOTEs(hinstance, pQOte, cbQte);
+            rc = W32kQueryOTEs(hmod, pQOte, cbQte);
             while (rc == ERROR_BUFFER_OVERFLOW && cbQte < 32000);
             {
@@ -413 +418 @@
                 }
 
-                rc = W32kQueryOTEs(hinstance, pQOte, cbQte);
+                rc = W32kQueryOTEs(hmod, pQOte, cbQte);
             }
 
@@ -508 +513 @@
                                                    + sizeof(qsLObjrec_t) * pLrec->ctObj);
                     }
-                if (pLrec->hmte == hinstance)
+                if (pLrec->hmte == hmod)
                     break;
 
@@ -757 +762 @@
     ULONG       ulApiAddr;
 
-    rc = DosQueryProcAddr(hinstance, 0, name, (PFN *)&ulApiAddr);
+    rc = DosQueryProcAddr(hmod, 0, name, (PFN *)&ulApiAddr);
     return rc == NO_ERROR ? ulApiAddr : 0;
 }
@@ -778 +783 @@
     ULONG       ulApiAddr;
 
-    rc = DosQueryProcAddr(hinstance, ordinal, NULL, (PFN *)&ulApiAddr);
+    rc = DosQueryProcAddr(hmod, ordinal, NULL, (PFN *)&ulApiAddr);
 
     return rc == NO_ERROR ? ulApiAddr : 0;