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

Timestamp:

Apr 20, 2000, 12:16:49 AM (25 years ago)

Author:

bird

Message:

Corrected TLS handling to work with BORLAND/INPRISE executables.

File:

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

trunk/src/kernel32/winimagepe2lx.cpp

@@ -1 @@
-/* $Id: winimagepe2lx.cpp,v 1.9 2000-04-19 20:19:13 bird Exp $ */
+/* $Id: winimagepe2lx.cpp,v 1.10 2000-04-19 22:16:49 bird Exp $ */
 
 /*
@@ -274 +274 @@
         {
             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.
+             */
+            if ((pv == NULL || pTLSDir->StartAddressOfRawData == 0UL)
+                && pTLSDir->StartAddressOfRawData > this->pNtHdrs->OptionalHeader.ImageBase)
+                {
+                ulBorlandRVAFix = this->pNtHdrs->OptionalHeader.ImageBase;
+                pv = getPointerFromRVA(pTLSDir->StartAddressOfRawData - ulBorlandRVAFix);
+                }
             if (pv == NULL || pTLSDir->StartAddressOfRawData == 0UL)
             {
@@ -284 +297 @@
             setTLSInitSize(pTLSDir->EndAddressOfRawData - pTLSDir->StartAddressOfRawData);
             setTLSTotalSize(pTLSDir->EndAddressOfRawData - pTLSDir->StartAddressOfRawData + pTLSDir->SizeOfZeroFill);
-            pv = getPointerFromRVA((ULONG)pTLSDir->AddressOfIndex);
+            pv = getPointerFromRVA((ULONG)pTLSDir->AddressOfIndex - ulBorlandRVAFix);
             if (pv == NULL)
             {
@@ -292 +305 @@
             }
             setTLSIndexAddr((LPDWORD)pv);
-            pv = getPointerFromRVA((ULONG)pTLSDir->AddressOfCallBacks);
+            pv = getPointerFromRVA((ULONG)pTLSDir->AddressOfCallBacks - ulBorlandRVAFix);
             if (pv == NULL)
             {