marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntoskrnl.exe: Implement thread object constructor. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46205
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Jacek Caban 2019-04-08 14:03:50 +02:00 committed by Alexandre Julliard
parent 4c0e81728f
commit b0b89cb569
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/ntoskrnl.exe/ntoskrnl.c
View File

@ -2479,11 +2479,23 @@ PEPROCESS WINAPI IoGetCurrentProcess(void)
} }
static void *create_thread_object( HANDLE handle )
{
struct _KTHREAD *thread;
if (!(thread = alloc_kernel_object( PsThreadType, handle, sizeof(*thread), 0 ))) return NULL;
thread->header.Type = 6;
thread->header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */
return thread;
}
static const WCHAR thread_type_name[] = {'T','h','r','e','a','d',0}; static const WCHAR thread_type_name[] = {'T','h','r','e','a','d',0};
static struct _OBJECT_TYPE thread_type = static struct _OBJECT_TYPE thread_type =
{ {
thread_type_name, thread_type_name,
create_thread_object
}; };
POBJECT_TYPE PsThreadType = &thread_type; POBJECT_TYPE PsThreadType = &thread_type;

8
dlls/ntoskrnl.exe/ntoskrnl_private.h
View File

@ -21,12 +21,18 @@
#ifndef __WINE_NTOSKRNL_PRIVATE_H #ifndef __WINE_NTOSKRNL_PRIVATE_H
#define __WINE_NTOSKRNL_PRIVATE_H #define __WINE_NTOSKRNL_PRIVATE_H
struct _OBJECT_TYPE { struct _OBJECT_TYPE
{
const WCHAR *name; /* object type name used for type validation */ const WCHAR *name; /* object type name used for type validation */
void *(*constructor)(HANDLE); /* used for creating an object from server handle */ void *(*constructor)(HANDLE); /* used for creating an object from server handle */
void (*release)(void*); /* called when the last reference is released */ void (*release)(void*); /* called when the last reference is released */
}; };
struct _KTHREAD
{
DISPATCHER_HEADER header;
};
void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ) DECLSPEC_HIDDEN; void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ) DECLSPEC_HIDDEN;
HANDLE kernel_object_handle( void *obj, unsigned int access ) DECLSPEC_HIDDEN; HANDLE kernel_object_handle( void *obj, unsigned int access ) DECLSPEC_HIDDEN;
NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) DECLSPEC_HIDDEN; NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) DECLSPEC_HIDDEN;

7
dlls/ntoskrnl.exe/tests/driver.c
View File

@ -726,6 +726,7 @@ static void test_ob_reference(const WCHAR *test_path)
POBJECT_TYPE (WINAPI *pObGetObjectType)(void*); POBJECT_TYPE (WINAPI *pObGetObjectType)(void*);
OBJECT_ATTRIBUTES attr = { sizeof(attr) }; OBJECT_ATTRIBUTES attr = { sizeof(attr) };
HANDLE event_handle, file_handle, file_handle2, thread_handle; HANDLE event_handle, file_handle, file_handle2, thread_handle;
DISPATCHER_HEADER *header;
FILE_OBJECT *file; FILE_OBJECT *file;
void *obj1, *obj2; void *obj1, *obj2;
POBJECT_TYPE obj1_type; POBJECT_TYPE obj1_type;
@ -824,6 +825,12 @@ static void test_ob_reference(const WCHAR *test_path)
ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status);
ok(obj1 == obj2, "obj1 != obj2\n"); ok(obj1 == obj2, "obj1 != obj2\n");
header = obj1;
ok(header->Type == 6, "Type = %u\n", header->Type);
status = wait_single(header, 0);
ok(status == 0 || status == STATUS_TIMEOUT, "got %#x\n", status);
ObDereferenceObject(obj1); ObDereferenceObject(obj1);
ObDereferenceObject(obj2); ObDereferenceObject(obj2);