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

Timestamp:

Oct 2, 2000, 6:00:36 AM (25 years ago)

Author:

bird

Message:

Made corrections for Borland TLS. (Beyond Compare works now)

File:

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

trunk/src/kernel32/winimagepe2lx.cpp

@@ -1 @@
-/* $Id: winimagepe2lx.cpp,v 1.15 2000-09-22 04:35:09 bird Exp $ */
+/* $Id: winimagepe2lx.cpp,v 1.16 2000-10-02 04:00:35 bird Exp $ */
 
 /*
@@ -270 +270 @@
          *  And we'll have to make the pages before it readable.
          */
-        ULONG iSection = getSectionIndexFromRVA(ulRVAResourceSection);
+        LONG iSection = getSectionIndexFromRVA(ulRVAResourceSection);
         if (iSection >= 0)
         {
@@ -313 +313 @@
     {
         PIMAGE_TLS_DIRECTORY pTLSDir;
+        LONG                 iSection;
+        iSection = getSectionIndexFromRVA(pNtHdrs->OptionalHeader.
+                                          DataDirectory[IMAGE_DIRECTORY_ENTRY_TLS].
+                                          VirtualAddress);
         pTLSDir = (PIMAGE_TLS_DIRECTORY)getPointerFromRVA(pNtHdrs->OptionalHeader.
                                                           DataDirectory[IMAGE_DIRECTORY_ENTRY_TLS].
                                                           VirtualAddress);
 
-        if (pTLSDir != NULL)
+        if (pTLSDir != NULL && iSection != -1)
         {
             PVOID pv;
             ULONG ulBorlandRVAFix = 0UL;
 
-            pv = getPointerFromRVA(pTLSDir->StartAddressOfRawData);
             /*
              * Borland seems to have problems getting things right...
-             * Needs to subtract image base to make the TLSDir "RVA"s real
-             * RVAs before converting them to pointers.
+             *      Uses real pointers with baserelocations.
+             * Needs to subtract image loadaddress to make the TLSDir them RVAs.
+             *
+             * We'll check if the StartAddressOfRawData pointer is an RVA or an real address by
+             * check if it is within the TLS section or not.
+             * ASSUMES: StartAddressOfRawData is in the same section as the TLS Directory.
              */
-            if ((pv == NULL || pTLSDir->StartAddressOfRawData == 0UL)
-                && pTLSDir->StartAddressOfRawData > this->pNtHdrs->OptionalHeader.ImageBase)
-                {
-                ulBorlandRVAFix = this->pNtHdrs->OptionalHeader.ImageBase;
-                pv = getPointerFromRVA(pTLSDir->StartAddressOfRawData - ulBorlandRVAFix);
-                }
+            if (paSections[iSection].ulRVA > pTLSDir->StartAddressOfRawData ||
+                paSections[iSection].ulRVA + paSections[iSection].cbVirtual <= pTLSDir->StartAddressOfRawData)
+                { /* StartAddressOfRawData was not an RVA within the same section as the TLS directory */
+                ulBorlandRVAFix = paSections[iSection].ulAddress - paSections[iSection].ulRVA;
+                }
+            pv = getPointerFromRVA(pTLSDir->StartAddressOfRawData - ulBorlandRVAFix);
             if (pv == NULL || pTLSDir->StartAddressOfRawData == 0UL)
             {
@@ -729 +736 @@
  *            RVA == 0 is ignored.
  */
-ULONG Win32Pe2LxImage::getSectionIndexFromRVA(ULONG ulRVA)
-{
-    int i;
+LONG Win32Pe2LxImage::getSectionIndexFromRVA(ULONG ulRVA)
+{
+    LONG i;
     #ifdef DEBUG
         if (paSections == NULL)