wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Alexandre Julliard : makefiles: Default to building test resource dlls as PE.
by Alexandre Julliard 09 Apr '19

09 Apr '19

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

Alexandre Julliard : makefiles: Add a helper to generate a winegcc command line.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: cc7c6a734b76a33d2696c49236fd4626ff6d9077 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc7c6a734b76a33d2696c492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 09:34:05 2019 +0200 makefiles: Add a helper to generate a winegcc command line. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 59 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 1a21b3d..3f09f3b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2224,6 +2224,28 @@ static struct strarray get_shared_lib_names( const char *libname ) /******************************************************************* + * output_winegcc_command + */ +static void output_winegcc_command( struct makefile *make, int cross ) +{ + output( "\t%s -o $@", tools_path( make, "winegcc" )); + output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); + if (cross) + { + output_filename( "-b" ); + output_filename( crosstarget ); + output_filename( "--lib-suffix=.cross.a" ); + } + else + { + output_filenames( target_flags ); + output_filenames( unwind_flags ); + } +} + + +/******************************************************************* * output_symlink_rule * * Output a rule to create a symlink. @@ -2870,11 +2892,8 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); + output_filename( "-s" ); output_filenames( dll_flags ); output_filename( "-shared" ); output_filename( source->filename ); @@ -2903,10 +2922,8 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filename( "--lib-suffix=.cross.a" ); + output_winegcc_command( make, 1 ); + output_filename( "-s" ); output_filenames( dll_flags ); output_filename( "-shared" ); output_filename( source->filename ); @@ -3107,11 +3124,7 @@ static void output_module( struct makefile *make ) output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); if (spec_file) { output( " -shared %s", spec_file ); @@ -3262,22 +3275,15 @@ static void output_test_module( struct makefile *make ) strarray_add( &make->all_targets, strmake( "%s%s", testmodule, dll_ext )); strarray_add( &make->clean_files, strmake( "%s%s", stripped, dll_ext )); output( "%s%s:\n", obj_dir_path( make, testmodule ), dll_ext ); - output( "\t%s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); output_filenames( make->appmode ); output_filenames_obj_dir( make, make->object_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); output( "%s%s:\n", obj_dir_path( make, stripped ), dll_ext ); - output( "\t%s -s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); + output_filename( "-s" ); output_filename( strmake( "-Wb,-F,%s", testmodule )); output_filenames( make->appmode ); output_filenames_obj_dir( make, make->object_files ); @@ -3314,10 +3320,7 @@ static void output_test_module( struct makefile *make ) output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filename( "--lib-suffix=.cross.a" ); + output_winegcc_command( make, 1 ); output_filenames_obj_dir( make, make->crossobj_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" );

1 0

Alexandre Julliard : msvcrt: Don't set invalid std handles with kernel32.
by Alexandre Julliard 09 Apr '19

09 Apr '19

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

Józef Kucia : d3d11/tests: Reduce output produced by test_clear_buffer_unordered_access_view().
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 18883a76762afab3e18e1279a9666240e19d4d03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18883a76762afab3e18e1279… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 8 19:01:27 2019 +0200 d3d11/tests: Reduce output produced by 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 | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 64729d5..3d6cbf5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14524,31 +14524,36 @@ static void test_clear_buffer_unordered_access_view(void) for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i) { + const struct uvec4 *data = NULL; + BOOL all_match; + uvec4 = uvec4_data[i]; ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x) + for (x = 0, all_match = TRUE; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x) { - const struct uvec4 *data = get_readback_uvec4(&rb, x, 0); const struct uvec4 broken_result = {uvec4.x, uvec4.x, uvec4.x, uvec4.x}; /* Intel */ - ok(compare_uvec4(data, &uvec4) || broken(compare_uvec4(data, &broken_result)), - "Got {%#x, %#x, %#x, %#x}, expected {%#x, %#x, %#x, %#x} at %u.\n", - data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, i); + data = get_readback_uvec4(&rb, x, 0); + if (!(compare_uvec4(data, &uvec4) || broken(compare_uvec4(data, &broken_result)))) + all_match = FALSE; } + ok(all_match, "Got {%#x, %#x, %#x, %#x}, expected {%#x, %#x, %#x, %#x} at %u.\n", + data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, x); release_resource_readback(&rb); ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x) + for (x = 0, all_match = TRUE; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x) { - const struct uvec4 *data = get_readback_uvec4(&rb, x, 0); struct uvec4 broken_result; + data = get_readback_uvec4(&rb, x, 0); uvec4 = U(uav_desc).Buffer.FirstElement <= x ? fe_uvec4 : uvec4_data[i]; broken_result.x = broken_result.y = broken_result.z = broken_result.w = uvec4.x; - ok(compare_uvec4(data, &uvec4) || broken(compare_uvec4(data, &broken_result)), - "Got {%#x, %#x, %#x, %#x}, expected {%#x, %#x, %#x, %#x} at %u.\n", - data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, i); + if (!(compare_uvec4(data, &uvec4) || broken(compare_uvec4(data, &broken_result)))) + all_match = FALSE; } + ok(all_match, "Got {%#x, %#x, %#x, %#x}, expected {%#x, %#x, %#x, %#x} at %u.\n", + data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, x); release_resource_readback(&rb); } @@ -14574,17 +14579,16 @@ static void test_clear_buffer_unordered_access_view(void) uvec4 = uvec4_data[i]; ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4.x); ++x) - todo_wine check_rgba_sint8(get_readback_color(&rb, x, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, 0, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, 7, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, 15, 0, 0), &uvec4); release_resource_readback(&rb); ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4.x); ++x) - { - uvec4 = U(uav_desc).Buffer.FirstElement <= x ? fe_uvec4 : uvec4_data[i]; - todo_wine check_rgba_sint8(get_readback_color(&rb, x, 0, 0), &uvec4); - } + todo_wine check_rgba_sint8(get_readback_color(&rb, 0, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, U(uav_desc).Buffer.FirstElement - 1, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, U(uav_desc).Buffer.FirstElement, 0, 0), &fe_uvec4); release_resource_readback(&rb); }

1 0

Józef Kucia : d3d11/tests: Use check_readback_data_color() in test_clear_buffer_unordered_access_view().
by Alexandre Julliard 08 Apr '19

08 Apr '19

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: Return client thread object pointer from get_next_device_request if available.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 2ee040382f1ae505b1109ee9c236a871f272a4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ee040382f1ae505b1109ee9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 14:04:43 2019 +0200 server: Return client thread object pointer from get_next_device_request if available. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + include/wine/server_protocol.h | 5 ++--- server/device.c | 4 ++-- server/protocol.def | 2 +- server/request.h | 8 ++++---- server/trace.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 11c9f4a..d570a61 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -981,6 +981,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) client_tid = reply->client_tid; in_size = reply->in_size; out_size = reply->out_size; + NtCurrentTeb()->Reserved5[1] = wine_server_get_ptr( reply->client_thread ); } else { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 60b02f7..88b933c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5240,12 +5240,11 @@ struct get_next_device_request_reply struct reply_header __header; irp_params_t params; obj_handle_t next; - process_id_t client_pid; thread_id_t client_tid; + client_ptr_t client_thread; data_size_t in_size; data_size_t out_size; /* VARARG(next_data,bytes); */ - char __pad_52[4]; }; @@ -6647,6 +6646,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 577 +#define SERVER_PROTOCOL_VERSION 578 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index 7ee10cb..c798694 100644 --- a/server/device.c +++ b/server/device.c @@ -866,8 +866,8 @@ DECL_HANDLER(get_next_device_request) irp = LIST_ENTRY( ptr, struct irp_call, mgr_entry ); if (irp->thread) { - reply->client_pid = get_process_id( irp->thread->process ); - reply->client_tid = get_thread_id( irp->thread ); + reply->client_thread = get_kernel_object_ptr( manager, &irp->thread->obj ); + reply->client_tid = get_thread_id( irp->thread ); } reply->params = irp->params; iosb = irp->iosb; diff --git a/server/protocol.def b/server/protocol.def index 5adc83d..b6ad514 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3618,8 +3618,8 @@ struct handle_info @REPLY irp_params_t params; /* irp parameters */ obj_handle_t next; /* handle to the next irp */ - process_id_t client_pid; /* pid of process calling irp */ thread_id_t client_tid; /* tid of thread calling irp */ + client_ptr_t client_thread; /* pointer to thread object of calling irp */ data_size_t in_size; /* total needed input size */ data_size_t out_size; /* needed output size */ VARARG(next_data,bytes); /* input data of the next irp */ diff --git a/server/request.h b/server/request.h index b10ccd9..a3e9513 100644 --- a/server/request.h +++ b/server/request.h @@ -2287,10 +2287,10 @@ C_ASSERT( FIELD_OFFSET(struct get_next_device_request_request, status) == 20 ); C_ASSERT( sizeof(struct get_next_device_request_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, params) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, next) == 32 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, client_pid) == 36 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, client_tid) == 40 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, in_size) == 44 ); -C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, out_size) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, client_tid) == 36 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, client_thread) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, in_size) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_next_device_request_reply, out_size) == 52 ); C_ASSERT( sizeof(struct get_next_device_request_reply) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_kernel_object_ptr_request, manager) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_kernel_object_ptr_request, handle) == 16 ); diff --git a/server/trace.c b/server/trace.c index 3562823..d4d0c3e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4285,8 +4285,8 @@ static void dump_get_next_device_request_reply( const struct get_next_device_req { dump_irp_params( " params=", &req->params ); fprintf( stderr, ", next=%04x", req->next ); - fprintf( stderr, ", client_pid=%04x", req->client_pid ); fprintf( stderr, ", client_tid=%04x", req->client_tid ); + dump_uint64( ", client_thread=", &req->client_thread ); fprintf( stderr, ", in_size=%u", req->in_size ); fprintf( stderr, ", out_size=%u", req->out_size ); dump_varargs_bytes( ", next_data=", cur_size );

1 0

Jacek Caban : ntoskrnl.exe: Reimplement PsGetCurrentProcessId and PsGetCurrentThreadId on top of KeGetCurrentThread.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: d9d55bb1d02f81d61f56bea511939508dd245275 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9d55bb1d02f81d61f56bea5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 14:04:29 2019 +0200 ntoskrnl.exe: Reimplement PsGetCurrentProcessId and PsGetCurrentThreadId on top of KeGetCurrentThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 17 ++++++++--------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 403c398..11c9f4a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -93,9 +93,8 @@ static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', /* tid of the thread running client request */ static DWORD request_thread; -/* pid/tid of the client thread */ +/* tid of the client thread */ static DWORD client_tid; -static DWORD client_pid; struct wine_driver { @@ -980,7 +979,6 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) irp = wine_server_ptr_handle( reply->next ); irp_params = reply->params; client_tid = reply->client_tid; - client_pid = reply->client_pid; in_size = reply->in_size; out_size = reply->out_size; } @@ -2482,12 +2480,17 @@ PEPROCESS WINAPI IoGetCurrentProcess(void) static void *create_thread_object( HANDLE handle ) { + THREAD_BASIC_INFORMATION info; 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 */ + + if (!NtQueryInformationThread( handle, ThreadBasicInformation, &info, sizeof(info), NULL )) + thread->id = info.ClientId; + return thread; } @@ -2971,9 +2974,7 @@ NTSTATUS WINAPI PsCreateSystemThread(PHANDLE ThreadHandle, ULONG DesiredAccess, */ HANDLE WINAPI PsGetCurrentProcessId(void) { - if (GetCurrentThreadId() == request_thread) - return UlongToHandle(client_pid); - return UlongToHandle(GetCurrentProcessId()); + return KeGetCurrentThread()->id.UniqueProcess; } @@ -2982,9 +2983,7 @@ HANDLE WINAPI PsGetCurrentProcessId(void) */ HANDLE WINAPI PsGetCurrentThreadId(void) { - if (GetCurrentThreadId() == request_thread) - return UlongToHandle(client_tid); - return UlongToHandle(GetCurrentThreadId()); + return KeGetCurrentThread()->id.UniqueThread; } diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 4b58182..f5a7628 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -31,6 +31,7 @@ struct _OBJECT_TYPE struct _KTHREAD { DISPATCHER_HEADER header; + CLIENT_ID id; }; void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : ntoskrnl.exe: Implement KeGetCurrentThread.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: f680eda832bdbd910f8916ea657bc2934669c8e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f680eda832bdbd910f8916ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 14:04:07 2019 +0200 ntoskrnl.exe: Implement KeGetCurrentThread. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45844 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++++++++++-- dlls/ntoskrnl.exe/tests/driver.c | 24 +++++++++++++++--------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a02dc1c..403c398 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -961,6 +961,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) for (;;) { + NtCurrentTeb()->Reserved5[1] = NULL; if (!in_buff && !(in_buff = HeapAlloc( GetProcessHeap(), 0, in_size ))) { ERR( "failed to allocate buffer\n" ); @@ -2506,8 +2507,22 @@ POBJECT_TYPE PsThreadType = &thread_type; */ PRKTHREAD WINAPI KeGetCurrentThread(void) { - FIXME("() stub\n"); - return NULL; + struct _KTHREAD *thread = NtCurrentTeb()->Reserved5[1]; + + if (!thread) + { + HANDLE handle = GetCurrentThread(); + + /* FIXME: we shouldn't need it, GetCurrentThread() should be client thread already */ + if (GetCurrentThreadId() == request_thread) handle = OpenThread( 0, FALSE, client_tid ); + + kernel_object_from_handle( handle, PsThreadType, (void**)&thread ); + if (handle != GetCurrentThread()) NtClose( handle ); + + NtCurrentTeb()->Reserved5[1] = thread; + } + + return thread; } /*********************************************************************** diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index ac6568f..81baffa 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -210,15 +210,6 @@ static void *get_proc_address(const char *name) return ret; } -static void test_currentprocess(void) -{ - PEPROCESS current; - - current = IoGetCurrentProcess(); -todo_wine - ok(current != NULL, "Expected current process to be non-NULL\n"); -} - static FILE_OBJECT *last_created_file; static void test_irp_struct(IRP *irp, DEVICE_OBJECT *device) @@ -316,6 +307,21 @@ static NTSTATUS wait_single_handle(HANDLE handle, ULONGLONG timeout) return ZwWaitForSingleObject(handle, FALSE, &integer); } +static void test_currentprocess(void) +{ + PEPROCESS current; + PETHREAD thread; + NTSTATUS ret; + + current = IoGetCurrentProcess(); +todo_wine + ok(current != NULL, "Expected current process to be non-NULL\n"); + + thread = PsGetCurrentThread(); + ret = wait_single( thread, 0 ); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); +} + static void run_thread(PKSTART_ROUTINE proc, void *arg) { OBJECT_ATTRIBUTES attr = {0};

1 0

Jacek Caban : ntoskrnl.exe: Implement thread object constructor.
by Alexandre Julliard 08 Apr '19

08 Apr '19

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

Jacek Caban : server: Allow creating thread kernel objects.
by Alexandre Julliard 08 Apr '19

08 Apr '19

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

← Newer
1
...
48
49
50
51
52
53
54
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2019