ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid accessing the htask16 TEB field from ntdll.

This commit is contained in:
Alexandre Julliard 2005-06-05 18:24:35 +00:00
parent 73f6718134
commit 9b57a950d7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/kernel/task.c
View File

@ -79,7 +79,7 @@ THHOOK *pThhook = &DefaultThhook;
static UINT16 nTaskCount = 0;
static HTASK16 initial_task;
static HTASK16 initial_task, main_task;
/***********************************************************************
* TASK_InstallTHHook
@ -419,11 +419,10 @@ void TASK_CreateMainTask(void)
pTask->hPrevInstance = 0;
pTask->teb = NtCurrentTeb();
NtCurrentTeb()->htask16 = pTask->hSelf;
/* Add the task to the linked list */
/* (no need to get the win16 lock, we are the only thread at this point) */
TASK_LinkTask( pTask->hSelf );
main_task = pTask->hSelf;
}
@ -1177,7 +1176,9 @@ void WINAPI GetTaskQueueES16(void)
*/
HTASK16 WINAPI GetCurrentTask(void)
{
return NtCurrentTeb()->htask16;
HTASK16 ret = NtCurrentTeb()->htask16;
if (!ret) ret = main_task;
return ret;
}
/***********************************************************************

1
dlls/ntdll/thread.c
View File

@ -266,7 +266,6 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR *
teb->reply_fd = -1;
teb->wait_fd[0] = -1;
teb->wait_fd[1] = -1;
teb->htask16 = NtCurrentTeb()->htask16;
info->pthread_info.teb_base = teb;
NtAllocateVirtualMemory( NtCurrentProcess(), &info->pthread_info.teb_base, 0, &size,