commit 52900c818f951dc22ee8cb8249c098d4f4ab1aba
author Alexandre Julliard <julliard@winehq.org> Wed Aug 09 22:33:42 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Aug 09 22:33:42 2000 +0000
tree 686ffa939cbdd5f3328d32e49b4bcba7ee29d72c
parent 46733de12bff0fb7835516ad8693d48e939a08e0

Make PDB, ENVDB and STARTUPINFO global variables.
Added 'module' field in PDB, and removed Wine-specific fields.

scheduler/thread.c

diff --git a/scheduler/thread.c b/scheduler/thread.c
index 04c6062..50ccc3c 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -35,9 +35,6 @@
 /* TEB of the initial thread */
 static TEB initial_teb;
 
-/* The initial process PDB */
-static PDB initial_pdb;
-
 /***********************************************************************
  *           THREAD_IsWin16
  */
@@ -216,7 +213,7 @@
     {
         THREAD_InitTEB( &initial_teb );
         assert( initial_teb.teb_sel );
-        initial_teb.process = &initial_pdb;
+        initial_teb.process = &current_process;
         SYSDEPS_SetCurThread( &initial_teb );
     }
 }
@@ -233,8 +230,8 @@
 
     if ((teb = THREAD_InitStack( NULL, stack_size, alloc_stack16 )))
     {
-        teb->tibflags = (PROCESS_Current()->flags & PDB32_WIN16_PROC) ? 0 : TEBF_WIN32;
-        teb->process  = PROCESS_Current();
+        teb->tibflags = (current_process.flags & PDB32_WIN16_PROC) ? 0 : TEBF_WIN32;
+        teb->process  = &current_process;
         teb->socket   = fd;
         fcntl( fd, F_SETFD, 1 ); /* set close on exec flag */
         TRACE("(%p) succeeded\n", teb);
@@ -368,24 +365,23 @@
  */
 DWORD WINAPI TlsAlloc( void )
 {
-    PDB *process = PROCESS_Current();
     DWORD i, mask, ret = 0;
-    DWORD *bits = process->tls_bits;
-    EnterCriticalSection( &process->crit_section );
+    DWORD *bits = current_process.tls_bits;
+    EnterCriticalSection( &current_process.crit_section );
     if (*bits == 0xffffffff)
     {
         bits++;
         ret = 32;
         if (*bits == 0xffffffff)
         {
-            LeaveCriticalSection( &process->crit_section );
+            LeaveCriticalSection( &current_process.crit_section );
             SetLastError( ERROR_NO_MORE_ITEMS );
             return 0xffffffff;
         }
     }
     for (i = 0, mask = 1; i < 32; i++, mask <<= 1) if (!(*bits & mask)) break;
     *bits |= mask;
-    LeaveCriticalSection( &process->crit_section );
+    LeaveCriticalSection( &current_process.crit_section );
     return ret + i;
 }
 
@@ -402,27 +398,26 @@
 BOOL WINAPI TlsFree(
     DWORD index) /* [in] TLS Index to free */
 {
-    PDB *process = PROCESS_Current();
     DWORD mask;
-    DWORD *bits = process->tls_bits;
+    DWORD *bits = current_process.tls_bits;
     if (index >= 64)
     {
         SetLastError( ERROR_INVALID_PARAMETER );
         return FALSE;
     }
-    EnterCriticalSection( &process->crit_section );
+    EnterCriticalSection( &current_process.crit_section );
     if (index >= 32) bits++;
     mask = (1 << (index & 31));
     if (!(*bits & mask))  /* already free? */
     {
-        LeaveCriticalSection( &process->crit_section );
+        LeaveCriticalSection( &current_process.crit_section );
         SetLastError( ERROR_INVALID_PARAMETER );
         return FALSE;
     }
     *bits &= ~mask;
     NtCurrentTeb()->tls_array[index] = 0;
     /* FIXME: should zero all other thread values */
-    LeaveCriticalSection( &process->crit_section );
+    LeaveCriticalSection( &current_process.crit_section );
     return TRUE;
 }