Changeset 1853 for trunk/src

Timestamp:

Nov 27, 1999, 1:05:40 AM (26 years ago)

Author:

sandervl

Message:

TLS fix

Location:

trunk/src/kernel32

Files:

• Fileio.cpp (modified) (2 diffs)
• winimagepeldr.cpp (modified) (2 diffs)
• wintls.cpp (modified) (4 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.15 1999-11-12 14:57:12 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.16 1999-11-27 00:05:39 sandervl Exp $ */
 
 /*
@@ -390 +390 @@
     dprintf(("KERNEL32:  GetFileAttributesW\n"));
     astring = UnicodeToAsciiString((LPWSTR)arg1);
-    rc = O32_GetFileAttributes(astring);
+    rc = ODIN_GetFileAttributesA(astring);
     FreeAsciiString(astring);
     return(rc);

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.17 1999-11-26 00:05:19 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.18 1999-11-27 00:05:39 sandervl Exp $ */
 
 /*
@@ -451 +451 @@
         setTLSIndexAddr((LPDWORD)(sect->realvirtaddr + ((ULONG)tlsDir->AddressOfIndex - sect->virtaddr)));
 
-        sect = findSectionByAddr((ULONG)tlsDir->AddressOfCallBacks);
-        if(sect == NULL) {
-                fout << "Couldn't find TLS AddressOfCallBacks section!!" << endl;
-                goto failure;
-        }
-        setTLSCallBackAddr((PIMAGE_TLS_CALLBACK *)(sect->realvirtaddr + ((ULONG)tlsDir->AddressOfCallBacks - sect->virtaddr)));
+        if((ULONG)tlsDir->AddressOfCallBacks != 0) {
+                sect = findSectionByAddr((ULONG)tlsDir->AddressOfCallBacks);
+                if(sect == NULL) {
+                        fout << "Couldn't find TLS AddressOfCallBacks section!!" << endl;
+                        goto failure;
+                }
+                setTLSCallBackAddr((PIMAGE_TLS_CALLBACK *)(sect->realvirtaddr + ((ULONG)tlsDir->AddressOfCallBacks - sect->virtaddr)));
+        }
    }
 

trunk/src/kernel32/wintls.cpp

@@ -1 @@
-/* $Id: wintls.cpp,v 1.6 1999-11-09 19:22:33 sandervl Exp $ */
+/* $Id: wintls.cpp,v 1.7 1999-11-27 00:05:40 sandervl Exp $ */
 /*
  * Win32 TLS API functions
@@ -72 +72 @@
    dprintf(("tlsIndexAddr     %x", tlsIndexAddr));
    dprintf(("tlsCallbackAddr  %x", tlsCallBackAddr));
-   dprintf(("*tlsCallbackAddr %x", *tlsCallBackAddr));
+   dprintf(("*tlsCallbackAddr %x", (tlsCallBackAddr) ? *tlsCallBackAddr : 0));
    tibmem = (char *)VirtualAlloc(0, tlsTotalSize, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE);
    if(tibmem == NULL) {
@@ -86 +86 @@
    *tlsIndexAddr = tlsIndex;
 
-   if((ULONG)*tlsCallBackAddr != 0) {
+   if(tlsCallBackAddr && (ULONG)*tlsCallBackAddr != 0) {
         pCallback = tlsCallBackAddr;
         while(*pCallback) {
@@ -112 +112 @@
    dprintf(("Win32ImageBase::tlsDetachThread for module %x, thread id %x", hinstance, GetCurrentThreadId()));
 
-   if((ULONG)*tlsCallBackAddr != 0) {
+   if(tlsCallBackAddr && (ULONG)*tlsCallBackAddr != 0) {
         pCallback = tlsCallBackAddr;
         while(*pCallback) {