April 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt: Don't set invalid std handles with kernel32.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: b5408ff58cd7803a251dd020a01e1ff170788713 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5408ff58cd7803a251dd020… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 14:06:43 2019 +0200 msvcrt: Don't set invalid std handles with kernel32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 851a89c..8f91ca9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -417,6 +417,7 @@ static void msvcrt_set_fd(ioinfo *fdinfo, HANDLE hand, int flag) fdinfo->lookahead[2] = '\n'; fdinfo->exflag &= EF_CRIT_INIT; + if (hand == MSVCRT_NO_CONSOLE) hand = 0; switch (fdinfo-MSVCRT___pioinfo[0]) { case 0: SetStdHandle(STD_INPUT_HANDLE, hand); break;

1 0

Alexandre Julliard : makefiles: Default to building test modules as PE.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 1459a0105d6124f7eb58c2885500bf678068abf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1459a0105d6124f7eb58c288… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 09:48:23 2019 +0200 makefiles: Default to building test modules as PE. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 - dlls/gameux/tests/test.gdf.xml | 2 +- dlls/imagehlp/tests/integrity.c | 2 +- dlls/ntdll/tests/info.c | 8 ----- dlls/shell32/tests/shlexec.c | 6 ++-- tools/makedep.c | 80 +++++++++-------------------------------- tools/runtest | 10 +++--- 7 files changed, 28 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1459a0105d6124f7eb58…

1 0

Alexandre Julliard : makefiles: Default to building test resource dlls as PE.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 0022af881e567093621b20d29794503be9400e0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0022af881e567093621b20d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 09:39:47 2019 +0200 makefiles: Default to building test resource dlls as PE. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 102 +++++++++++++++++++++++--------------------------------- 1 file changed, 42 insertions(+), 60 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 3f09f3b..c1cbf78 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2872,66 +2872,39 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, struct strarray imports = get_expanded_file_local_var( make, obj, "IMPORTS" ); struct strarray dll_flags = get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" ); struct strarray all_libs, dep_libs = empty_strarray; + char *dll_name, *obj_name; if (!imports.count) imports = make->imports; if (!dll_flags.count) dll_flags = make->extradllflags; - all_libs = add_import_libs( make, &dep_libs, imports, 0 ); - add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ + all_libs = add_import_libs( make, &dep_libs, imports, !!crosstarget ); + add_import_libs( make, &dep_libs, get_default_imports( make ), !!crosstarget ); /* dependencies only */ strarray_addall( &all_libs, libs ); + dll_name = strmake( "%s.dll%s", obj, crosstarget ? "" : dll_ext ); + obj_name = strmake( "%s%s", obj_dir_path( make, obj ), crosstarget ? ".cross.o" : ".o" ); - strarray_add( &make->clean_files, strmake( "%s.dll%s", obj, dll_ext )); + strarray_add( &make->clean_files, dll_name ); strarray_add( &make->object_files, strmake( "%s.res", obj )); - output( "%s.res: %s.dll%s\n", obj_dir_path( make, obj ), obj_dir_path( make, obj ), dll_ext ); - output( "\techo \"%s.dll TESTDLL \\\"%s.dll%s\\\"\" | %s -o $@\n", obj, - obj_dir_path( make, obj ), dll_ext, tools_path( make, "wrc" )); + if (crosstarget) strarray_add( &make->crossobj_files, strmake( "%s.res", obj )); + output( "%s.res: %s\n", obj_dir_path( make, obj ), obj_dir_path( make, dll_name )); + output( "\techo \"%s.dll TESTDLL \\\"%s\\\"\" | %s -o $@\n", obj, + obj_dir_path( make, dll_name ), tools_path( make, "wrc" )); - output( "%s.dll%s:", obj_dir_path( make, obj ), dll_ext ); + output( "%s:", obj_dir_path( make, dll_name )); output_filename( source->filename ); - output_filename( strmake( "%s.o", obj_dir_path( make, obj ))); + output_filename( obj_name ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output_winegcc_command( make, 0 ); + output_winegcc_command( make, !!crosstarget ); output_filename( "-s" ); output_filenames( dll_flags ); output_filename( "-shared" ); output_filename( source->filename ); - output_filename( strmake( "%s.o", obj_dir_path( make, obj ))); + output_filename( obj_name ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); - - if (crosstarget) - { - dep_libs = empty_strarray; - all_libs = add_import_libs( make, &dep_libs, imports, 1 ); - add_import_libs( make, &dep_libs, get_default_imports( make ), 1 ); /* dependencies only */ - strarray_addall( &all_libs, libs ); - - strarray_add( &make->clean_files, strmake( "%s.dll", obj )); - strarray_add( &make->crossobj_files, strmake( "%s.cross.res", obj )); - output( "%s.cross.res: %s.dll\n", obj_dir_path( make, obj ), obj_dir_path( make, obj ) ); - output( "\techo \"%s.dll TESTDLL \\\"%s.dll\\\"\" | %s -o $@\n", obj, - obj_dir_path( make, obj ), tools_path( make, "wrc" )); - - output( "%s.dll:", obj_dir_path( make, obj )); - output_filename( source->filename ); - output_filename( strmake( "%s.cross.o", obj_dir_path( make, obj ))); - output_filenames( dep_libs ); - output_filename( tools_path( make, "winebuild" )); - output_filename( tools_path( make, "winegcc" )); - output( "\n" ); - output_winegcc_command( make, 1 ); - output_filename( "-s" ); - output_filenames( dll_flags ); - output_filename( "-shared" ); - output_filename( source->filename ); - output_filename( strmake( "%s.cross.o", obj_dir_path( make, obj ))); - output_filenames( all_libs ); - output_filename( "$(LDFLAGS)" ); - output( "\n" ); - } } @@ -2944,30 +2917,39 @@ static void output_source_default( struct makefile *make, struct incl_file *sour int is_dll_src = (make->testdll && strendswith( source->name, ".c" ) && find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); - int need_cross = (make->testdll || - (source->file->flags & FLAG_C_IMPLIB) || - (make->module && make->staticlib)); + int need_cross = (crosstarget && + (make->testdll || + (source->file->flags & FLAG_C_IMPLIB) || + (make->module && make->staticlib))); + int need_obj = (!need_cross || + (make->testdll && !is_dll_src) || + (source->file->flags & FLAG_C_IMPLIB) || + (make->module && make->staticlib)); if ((source->file->flags & FLAG_GENERATED) && (!make->testdll || !strendswith( source->filename, "testlist.c" ))) strarray_add( &make->clean_files, source->filename ); if (source->file->flags & FLAG_C_IMPLIB) strarray_add( &make->implib_objs, strmake( "%s.o", obj )); - strarray_add( is_dll_src ? &make->clean_files : &make->object_files, strmake( "%s.o", obj )); - output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t$(CC) -c -o $@ %s", source->filename ); - output_filenames( make->include_args ); - output_filenames( make->define_args ); - output_filenames( extradefs ); - if (make->module || make->staticlib || make->sharedlib || make->testdll) + + if (need_obj) { - output_filenames( dll_flags ); - if (make->use_msvcrt) output_filenames( msvcrt_flags ); + strarray_add( is_dll_src ? &make->clean_files : &make->object_files, strmake( "%s.o", obj )); + output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); + output( "\t$(CC) -c -o $@ %s", source->filename ); + output_filenames( make->include_args ); + output_filenames( make->define_args ); + output_filenames( extradefs ); + if (make->module || make->staticlib || make->sharedlib || make->testdll) + { + output_filenames( dll_flags ); + if (make->use_msvcrt) output_filenames( msvcrt_flags ); + } + output_filenames( extra_cflags ); + output_filenames( cpp_flags ); + output_filename( "$(CFLAGS)" ); + output( "\n" ); } - output_filenames( extra_cflags ); - output_filenames( cpp_flags ); - output_filename( "$(CFLAGS)" ); - output( "\n" ); - if (crosstarget && need_cross) + if (need_cross) { strarray_add( is_dll_src ? &make->clean_files : &make->crossobj_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj_dir_path( make, obj ), source->filename ); @@ -2994,8 +2976,8 @@ static void output_source_default( struct makefile *make, struct incl_file *sour dll_ext, obj ); } } - output( "%s.o", obj_dir_path( make, obj )); - if (crosstarget && need_cross) output( " %s.cross.o", obj_dir_path( make, obj )); + if (need_obj) output_filename( strmake( "%s.o", obj_dir_path( make, obj ))); + if (need_cross) output_filename( strmake( "%s.cross.o", obj_dir_path( make, obj ))); output( ":" ); output_filenames( source->dependencies ); output( "\n" );

1 0

Józef Kucia : d3d11/tests: Use check_readback_data_color() in test_clear_buffer_unordered_access_view().
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: a9b53f5912c22bc9fc01b8322b7a954101eb32a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9b53f5912c22bc9fc01b832… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 8 19:01:26 2019 +0200 d3d11/tests: Use check_readback_data_color() in test_clear_buffer_unordered_access_view(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 78 ++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9b53f5912c22bc9fc01…

1 0

Jacek Caban : server: Allow creating thread kernel objects.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 4c0e81728f6db575d9cbd8feb8a5374f1adec9bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c0e81728f6db575d9cbd8fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 14:03:38 2019 +0200 server: Allow creating thread kernel objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 1 - server/thread.c | 10 +++++++++- server/thread.h | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 4a564ef..50a1b99 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -822,7 +822,6 @@ static void test_ob_reference(const WCHAR *test_path) status = ObReferenceObjectByHandle(thread_handle, SYNCHRONIZE, *pPsThreadType, KernelMode, &obj2, NULL); ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); - todo_wine ok(obj1 == obj2, "obj1 != obj2\n"); ObDereferenceObject(obj1); diff --git a/server/thread.c b/server/thread.c index f5f98eb..b1d324f 100644 --- a/server/thread.c +++ b/server/thread.c @@ -133,6 +133,7 @@ static struct object_type *thread_get_type( struct object *obj ); static int thread_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int thread_map_access( struct object *obj, unsigned int access ); static void thread_poll_event( struct fd *fd, int event ); +static struct list *thread_get_kernel_obj_list( struct object *obj ); static void destroy_thread( struct object *obj ); static const struct object_ops thread_ops = @@ -153,7 +154,7 @@ static const struct object_ops thread_ops = no_link_name, /* link_name */ NULL, /* unlink_name */ no_open_file, /* open_file */ - no_kernel_obj_list, /* get_kernel_obj_list */ + thread_get_kernel_obj_list, /* get_kernel_obj_list */ no_close_handle, /* close_handle */ destroy_thread /* destroy */ }; @@ -209,6 +210,7 @@ static inline void init_thread_structure( struct thread *thread ) list_init( &thread->mutex_list ); list_init( &thread->system_apc ); list_init( &thread->user_apc ); + list_init( &thread->kernel_object ); for (i = 0; i < MAX_INFLIGHT_FDS; i++) thread->inflight[i].server = thread->inflight[i].client = -1; @@ -304,6 +306,12 @@ static void thread_poll_event( struct fd *fd, int event ) release_object( thread ); } +static struct list *thread_get_kernel_obj_list( struct object *obj ) +{ + struct thread *thread = (struct thread *)obj; + return &thread->kernel_object; +} + /* cleanup everything that is no longer needed by a dead thread */ /* used by destroy_thread and kill_thread */ static void cleanup_thread( struct thread *thread ) diff --git a/server/thread.h b/server/thread.h index e4332df..bafc08e 100644 --- a/server/thread.h +++ b/server/thread.h @@ -89,6 +89,7 @@ struct thread timeout_t creation_time; /* Thread creation time */ timeout_t exit_time; /* Thread exit time */ struct token *token; /* security token associated with this thread */ + struct list kernel_object; /* list of kernel object pointers */ }; struct thread_snapshot

1 0

Jacek Caban : ntoskrnl.exe: Don' t add device to the list if IoCreateDevice fails.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 80d53026bf22a11aafaf3c4ba8fab6b1fe3b6cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80d53026bf22a11aafaf3c4b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 14:03:27 2019 +0200 ntoskrnl.exe: Don't add device to the list if IoCreateDevice fails. Spotted by Zebediah Figura. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c1a74f1..804c7f6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1502,9 +1502,6 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, device->DeviceType = type; device->StackSize = 1; - device->NextDevice = driver->DeviceObject; - driver->DeviceObject = device; - SERVER_START_REQ( create_device ) { req->rootdir = 0; @@ -1521,6 +1518,9 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, return status; } + device->NextDevice = driver->DeviceObject; + driver->DeviceObject = device; + *ret_device = device; return STATUS_SUCCESS; }

1 0

Piotr Caban : inetcomm: Don't use strcasecmp.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: df019afaa3e1c858102e1964ecc0db0627441aed URL: https://source.winehq.org/git/wine.git/?a=commit;h=df019afaa3e1c858102e1964… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:30:15 2019 +0200 inetcomm: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index a2854be..bb0f9bd 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -27,6 +27,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winuser.h" #include "objbase.h" #include "ole2.h" @@ -765,13 +766,13 @@ static void init_content_encoding(MimeBody *body, header_t *header) { const char *encoding = header->value.u.pszVal; - if(!strcasecmp(encoding, "base64")) + if(!_strnicmp(encoding, "base64", -1)) body->encoding = IET_BASE64; - else if(!strcasecmp(encoding, "quoted-printable")) + else if(!_strnicmp(encoding, "quoted-printable", -1)) body->encoding = IET_QP; - else if(!strcasecmp(encoding, "7bit")) + else if(!_strnicmp(encoding, "7bit", -1)) body->encoding = IET_7BIT; - else if(!strcasecmp(encoding, "8bit")) + else if(!_strnicmp(encoding, "8bit", -1)) body->encoding = IET_8BIT; else FIXME("unknown encoding %s\n", debugstr_a(encoding));

1 0

Piotr Caban : d3d11: Don't use strcasecmp.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 87553b009dbafe9202f1800caca1ba5346958f1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=87553b009dbafe9202f1800c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:31:03 2019 +0200 d3d11: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/inputlayout.c | 3 ++- dlls/d3d11/shader.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 127ea29..de40eda 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -21,6 +21,7 @@ #include "wine/port.h" #include "d3d11_private.h" +#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d11); @@ -32,7 +33,7 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co for (i = 0; i < s->element_count; ++i) { - if (!strcasecmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx + if (!_strnicmp(e[i].semantic_name, semantic_name, -1) && e[i].semantic_idx == semantic_idx && e[i].stream_idx == stream_idx) return &e[i]; } diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 2276dd7..a506aac 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -21,6 +21,7 @@ #include "wine/port.h" #include "d3d11_private.h" +#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d11); @@ -1026,7 +1027,7 @@ static HRESULT validate_stream_output_entries(const D3D11_SO_DECLARATION_ENTRY * continue; if (e1->Stream == e2->Stream - && !strcasecmp(e1->SemanticName, e2->SemanticName) + && !_strnicmp(e1->SemanticName, e2->SemanticName, -1) && e1->SemanticIndex == e2->SemanticIndex && e1->StartComponent < e2->StartComponent + e2->ComponentCount && e1->StartComponent + e1->ComponentCount > e2->StartComponent)

1 0

Piotr Caban : dinput: Don't use strcasecmp.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: e7d1107f320285b1182ba2e9cdcbd13a6bdfe9b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7d1107f320285b1182ba2e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:30:32 2019 +0200 dinput: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 7133359..141b922 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winternl.h" #include "winuser.h" #include "winerror.h" #include "winreg.h" @@ -211,9 +212,9 @@ static SysMouseImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) get_app_key(&hkey, &appkey); if (!get_config_key(hkey, appkey, "MouseWarpOverride", buffer, sizeof(buffer))) { - if (!strcasecmp(buffer, "disable")) + if (!_strnicmp(buffer, "disable", -1)) newDevice->warp_override = WARP_DISABLE; - else if (!strcasecmp(buffer, "force")) + else if (!_strnicmp(buffer, "force", -1)) newDevice->warp_override = WARP_FORCE_ON; } if (appkey) RegCloseKey(appkey);

1 0

Jacek Caban : ntoskrnl.exe: Implement thread object constructor.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: b0b89cb569823da908bd75dfff64f44ebeceefd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0b89cb569823da908bd75df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 14:03:50 2019 +0200 ntoskrnl.exe: Implement thread object constructor. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46205 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl_private.h | 8 +++++++- dlls/ntoskrnl.exe/tests/driver.c | 7 +++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 804c7f6..a02dc1c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -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 struct _OBJECT_TYPE thread_type = { thread_type_name, + create_thread_object }; POBJECT_TYPE PsThreadType = &thread_type; diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 5215b43..4b58182 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -21,12 +21,18 @@ #ifndef __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 */ void *(*constructor)(HANDLE); /* used for creating an object from server handle */ 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; 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; diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 50a1b99..ac6568f 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -726,6 +726,7 @@ static void test_ob_reference(const WCHAR *test_path) POBJECT_TYPE (WINAPI *pObGetObjectType)(void*); OBJECT_ATTRIBUTES attr = { sizeof(attr) }; HANDLE event_handle, file_handle, file_handle2, thread_handle; + DISPATCHER_HEADER *header; FILE_OBJECT *file; void *obj1, *obj2; 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(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(obj2);

1 0