Changeset 4481 for trunk/src/kernel32/wintls.cpp

Timestamp:

Oct 11, 2000, 9:22:29 AM (25 years ago)

Author:

sandervl

Message:

TLS callback fixes

File:

• trunk/src/kernel32/wintls.cpp (modified) (15 diffs)

trunk/src/kernel32/wintls.cpp

@@ -1 @@
-/* $Id: wintls.cpp,v 1.14 2000-10-08 20:05:05 sandervl Exp $ */
+/* $Id: wintls.cpp,v 1.15 2000-10-11 07:22:29 sandervl Exp $ */
 /*
  * Win32 TLS API functions
@@ -87 +87 @@
    *tlsIndexAddr = tlsIndex;
 
-   if(tlsCallBackAddr && (ULONG)*tlsCallBackAddr != 0) {
+   if(tlsCallBackAddr && (ULONG)*tlsCallBackAddr != 0) 
+   {
         pCallback = tlsCallBackAddr;
         while(*pCallback) {
@@ -95 +96 @@
 
             dprintf(("tlsAttachThread: finished calling TLS Callback %x", *pCallback));
-            *pCallback++;
+            pCallback++;
         }
    }
@@ -113 +114 @@
    dprintf(("Win32ImageBase::tlsDetachThread for module %x, thread id %x", hinstance, GetCurrentThreadId()));
 
-   if(tlsCallBackAddr && (ULONG)*tlsCallBackAddr != 0) {
+   if(tlsCallBackAddr && (ULONG)*tlsCallBackAddr != 0) 
+   {
         pCallback = tlsCallBackAddr;
         while(*pCallback) {
@@ -121 +123 @@
 
             dprintf(("tlsDetachThread: finished calling TLS Callback %x", *pCallback));
-            *pCallback++;
+            pCallback++;
         }
    }
@@ -135 +137 @@
 //******************************************************************************
 //******************************************************************************
-
-//******************************************************************************
-//******************************************************************************
 DWORD WIN32API TlsAlloc()
 {
  DWORD index = -1;
-
-#if 1
  THDB *thdb;
  PDB  *pdb;
@@ -171 +168 @@
   LeaveCriticalSection(&pdb->crit_section);
   thdb->tls_array[index] = 0;
-#else
-  index = O32_TlsAlloc();
-#endif
+
   dprintf(("KERNEL32: TlsAlloc returned %d", index));
   return index;
@@ -181 +176 @@
 BOOL WIN32API TlsFree(DWORD index)
 {
-  dprintf(("KERNEL32: TlsFree %d", index));
-#if 1
  THDB  *thdb;
  PDB   *pdb;
@@ -188 +181 @@
  DWORD  mask;
 
+  dprintf(("KERNEL32: TlsFree %d", index));
   if(index >= TLS_MINIMUM_AVAILABLE)
   {
@@ -200 +194 @@
   tlsidx = 0;
   if(index > 32) {
-  tlsidx++;
+     tlsidx++;
   }
   mask = (1 << index);
@@ -213 +207 @@
   SetLastError(ERROR_INVALID_PARAMETER); //TODO: correct error? (does NT even change the last error?)
   return FALSE;
-#else
-  return(O32_TlsFree(index));
-#endif
 }
 //******************************************************************************
@@ -222 +213 @@
 {
  LPVOID rc;
+ THDB  *thdb;
 
   if(index >= TLS_MINIMUM_AVAILABLE)
@@ -230 +222 @@
   SetLastError(ERROR_SUCCESS);
 
-#if 1
- THDB  *thdb;
-
   thdb = GetThreadTHDB();
   rc = thdb->tls_array[index];
-#else
-  rc = O32_TlsGetValue(index);
-#endif
+
   dprintf2(("KERNEL32: TlsGetValue %d returned %X\n", index, rc));
   return(rc);
@@ -245 +232 @@
 BOOL WIN32API TlsSetValue(DWORD index, LPVOID val)
 {
+ THDB *thdb;
+
   dprintf2(("KERNEL32: TlsSetValue %d %x", index, val));
   if(index >= TLS_MINIMUM_AVAILABLE)
@@ -252 +241 @@
   }
   SetLastError(ERROR_SUCCESS);
-#if 1
-  THDB *thdb;
 
   thdb = GetThreadTHDB();
   thdb->tls_array[index] = val;
   return TRUE;
-#else
-  return(O32_TlsSetValue(index, val));
-#endif
-}
-//******************************************************************************
-//******************************************************************************
+}
+//******************************************************************************
+//******************************************************************************