Changeset 281 for trunk/src/pe2lx/pe.cpp

Timestamp:

Jul 7, 1999, 10:11:58 AM (26 years ago)

Author:

sandervl

Message:

Major changes in PE2LX/KERNEL32 for TLS support. DLL VERSION INCREASED TO 3 AS THIS CHANGE MAKES IT INCOMPATIBLE WITH APPS CONVERTED WITH PREVIOUS VERSION OF PE2LX (OR WIN32K)

File:

• trunk/src/pe2lx/pe.cpp (modified) (5 diffs)

trunk/src/pe2lx/pe.cpp

@@ -1 @@
-/* $Id: pe.cpp,v 1.5 1999-07-06 08:50:11 sandervl Exp $ */
+/* $Id: pe.cpp,v 1.6 1999-07-07 08:11:11 sandervl Exp $ */
 
 /*
@@ -230 +230 @@
   else  OS2Exe.SetModuleName(os2file);
 
+  OS2Exe.SetEntryPoint(oh.AddressOfEntryPoint+oh.ImageBase);
+
   nSections = NR_SECTIONS(win32file);
 
@@ -276 +278 @@
                         continue;
                 }
+                if(strcmp(psh[i].Name, ".tls") == 0)
+                {
+                  IMAGE_TLS_DIRECTORY *tlsDir;
+
+                        tlsDir = (IMAGE_TLS_DIRECTORY *)ImageDirectoryOffset(win32file, IMAGE_DIRECTORY_ENTRY_TLS);
+                        if(tlsDir) {
+                                cout << "TLS Directory" << endl;
+                                cout << "TLS Address of Index     " << hex((ULONG)tlsDir->AddressOfIndex) << endl;
+                                cout << "TLS Address of Callbacks " << hex((ULONG)tlsDir->AddressOfCallBacks) << endl;
+                                cout << "TLS SizeOfZeroFill       " << hex(tlsDir->SizeOfZeroFill) << endl;
+                                cout << "TLS Characteristics      " << hex(tlsDir->Characteristics) << endl;
+                                OS2Exe.SetTLSAddress(tlsDir->StartAddressOfRawData);
+                                OS2Exe.SetTLSIndexAddress((ULONG)tlsDir->AddressOfIndex);
+                                OS2Exe.SetTLSInitSize(tlsDir->EndAddressOfRawData - tlsDir->StartAddressOfRawData);
+                                OS2Exe.SetTLSTotalSize(tlsDir->EndAddressOfRawData - tlsDir->StartAddressOfRawData + tlsDir->SizeOfZeroFill);
+                                OS2Exe.SetTLSCallBackAddr((ULONG)tlsDir->AddressOfCallBacks);
+                        }
+                }
 
                 if ((psh[i].Characteristics & IMAGE_SCN_CNT_CODE)
@@ -287 +307 @@
                                 OS2Exe.SetEntryAddress(oh.AddressOfEntryPoint - oh.BaseOfCode);
                         else    OS2Exe.SetEntryAddress(oh.AddressOfEntryPoint-psh[i].VirtualAddress);
+
                         OS2Exe.StoreSection((char *)win32file+psh[i].PointerToRawData,
                                             psh[i].SizeOfRawData, psh[i].Misc.VirtualSize,
@@ -332 +353 @@
   prel = (PIMAGE_BASE_RELOCATION) ImageDirectoryOffset (win32file, IMAGE_DIRECTORY_ENTRY_BASERELOC);
   OS2Exe.SetNrOff32Fixups((prel) ? oh.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size/2 : 0);
+
+  //SvL: Add EntryPoint & TLS fixups (if required)
+  OS2Exe.AddExtraFixups();
 
   if(prel) {