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

Alexandre Julliard : makefiles: Store resource files in a separate array.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 5edcae420aaf3972f669a16d17f62ca9e82f97e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5edcae420aaf3972f669a16d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 09:52:43 2019 +0200 makefiles: Store resource files in a separate array. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 307b7a3..20fec7f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -205,6 +205,7 @@ struct makefile struct strarray uninstall_files; struct strarray object_files; struct strarray crossobj_files; + struct strarray res_files; struct strarray c2man_files; struct strarray dlldata_files; struct strarray implib_objs; @@ -2567,8 +2568,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c unsigned int i; if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name ); - strarray_add( &make->object_files, strmake( "%s.res", obj )); - if (crosstarget) strarray_add( &make->crossobj_files, strmake( "%s.res", obj )); + strarray_add( &make->res_files, strmake( "%s.res", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s -o $@", tools_path( make, "wrc" ) ); if (make->is_win16) output_filename( "-m16" ); @@ -2622,8 +2622,7 @@ static void output_source_mc( struct makefile *make, struct incl_file *source, c { unsigned int i; - strarray_add( &make->object_files, strmake( "%s.res", obj )); - if (crosstarget) strarray_add( &make->crossobj_files, strmake( "%s.res", obj )); + strarray_add( &make->res_files, strmake( "%s.res", obj )); strarray_add( &make->clean_files, strmake( "%s.pot", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s -U -O res -o $@ %s", tools_path( make, "wmc" ), source->filename ); @@ -2652,8 +2651,7 @@ static void output_source_mc( struct makefile *make, struct incl_file *source, c */ static void output_source_res( struct makefile *make, struct incl_file *source, const char *obj ) { - strarray_add( &make->object_files, source->name ); - if (crosstarget) strarray_add( &make->crossobj_files, source->name ); + strarray_add( &make->res_files, source->name ); } @@ -2883,8 +2881,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, obj_name = strmake( "%s%s", obj_dir_path( make, obj ), crosstarget ? ".cross.o" : ".o" ); strarray_add( &make->clean_files, dll_name ); - strarray_add( &make->object_files, strmake( "%s.res", obj )); - if (crosstarget) strarray_add( &make->crossobj_files, strmake( "%s.res", obj )); + strarray_add( &make->res_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" )); @@ -3101,6 +3098,7 @@ static void output_module( struct makefile *make ) } if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); @@ -3113,6 +3111,7 @@ static void output_module( struct makefile *make ) } else output_filenames( make->appmode ); output_filenames_obj_dir( make, make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); @@ -3260,6 +3259,7 @@ static void output_test_module( struct makefile *make ) output_winegcc_command( make, !!crosstarget ); output_filenames( make->appmode ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); @@ -3269,11 +3269,13 @@ static void output_test_module( struct makefile *make ) output_filename( strmake( "-Wb,-F,%s", testmodule )); output_filenames( make->appmode ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); output( "%s%s %s%s:", obj_dir_path( make, testmodule ), ext, obj_dir_path( make, stripped ), ext ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); @@ -3621,7 +3623,7 @@ static void output_sources( struct makefile *make ) if (top_makefile->submakes[i]->testdll && !top_makefile->submakes[i]->disabled) strarray_add( &tests, top_makefile->submakes[i]->testdll ); for (i = 0; i < tests.count; i++) - strarray_add( &make->object_files, replace_extension( tests.str[i], ".dll", "_test.res" )); + strarray_add( &make->res_files, replace_extension( tests.str[i], ".dll", "_test.res" )); } if (make->dlldata_files.count) @@ -3674,7 +3676,8 @@ static void output_sources( struct makefile *make ) } strarray_addall( &make->clean_files, make->object_files ); - strarray_addall_uniq( &make->clean_files, make->crossobj_files ); + strarray_addall( &make->clean_files, make->crossobj_files ); + strarray_addall( &make->clean_files, make->res_files ); strarray_addall( &make->clean_files, make->all_targets ); strarray_addall( &make->clean_files, make->extra_targets );

1 0

Alexandre Julliard : makefiles: Unify APPMODE and EXTRADLLFLAGS variables.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 1d6a4102444f0f2dfd9f131ad4dc9811343cbd0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d6a4102444f0f2dfd9f131a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 10:13:37 2019 +0200 makefiles: Unify APPMODE and EXTRADLLFLAGS variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rundll.exe16/Makefile.in | 2 +- programs/svchost/Makefile.in | 2 +- programs/winhelp.exe16/Makefile.in | 2 +- programs/winoldap.mod16/Makefile.in | 2 +- tools/make_makefiles | 1 + tools/makedep.c | 29 +++++++++++++++-------------- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/programs/rundll.exe16/Makefile.in b/programs/rundll.exe16/Makefile.in index fe08104..4ea0fe9 100644 --- a/programs/rundll.exe16/Makefile.in +++ b/programs/rundll.exe16/Makefile.in @@ -1,4 +1,4 @@ MODULE = rundll.exe16 -APPMODE = -m16 +APPMODE = -mconsole -m16 C_SRCS = rundll.c diff --git a/programs/svchost/Makefile.in b/programs/svchost/Makefile.in index b24af3b..0cbf5be 100644 --- a/programs/svchost/Makefile.in +++ b/programs/svchost/Makefile.in @@ -1,5 +1,5 @@ MODULE = svchost.exe -APPMODE = -municode +APPMODE = -mconsole -municode IMPORTS = advapi32 C_SRCS = \ diff --git a/programs/winhelp.exe16/Makefile.in b/programs/winhelp.exe16/Makefile.in index ad1695b..a9deacb 100644 --- a/programs/winhelp.exe16/Makefile.in +++ b/programs/winhelp.exe16/Makefile.in @@ -1,4 +1,4 @@ MODULE = winhelp.exe16 -APPMODE = -m16 +APPMODE = -mconsole -m16 C_SRCS = winhelp.c diff --git a/programs/winoldap.mod16/Makefile.in b/programs/winoldap.mod16/Makefile.in index cedf378..01fbf78 100644 --- a/programs/winoldap.mod16/Makefile.in +++ b/programs/winoldap.mod16/Makefile.in @@ -1,4 +1,4 @@ MODULE = winoldap.mod16 -APPMODE = -m16 +APPMODE = -mconsole -m16 C_SRCS = winoldap.c diff --git a/tools/make_makefiles b/tools/make_makefiles index 455ff9e..3936310 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -445,6 +445,7 @@ sub update_makefiles(@) if ($file =~ /^programs\//) { die "APPMODE should be defined in $file" unless defined $make{"APPMODE"} ; + die "APPMODE should contain -mconsole or -mwindows in $file" unless $make{"APPMODE"} =~ /-m(console|windows)/; die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.exe"; } else diff --git a/tools/makedep.c b/tools/makedep.c index 20fec7f..227d589 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -170,7 +170,6 @@ struct makefile struct strarray define_args; struct strarray programs; struct strarray scripts; - struct strarray appmode; struct strarray imports; struct strarray subdirs; struct strarray delayimports; @@ -195,6 +194,7 @@ struct makefile int disabled; int use_msvcrt; int is_win16; + int is_exe; struct makefile **submakes; /* values generated at output time */ @@ -2143,11 +2143,11 @@ static struct strarray get_default_imports( const struct makefile *make ) struct strarray ret = empty_strarray; if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) return ret; - if (strarray_exists( &make->appmode, "-mno-cygwin" )) strarray_add( &ret, "msvcrt" ); + if (strarray_exists( &make->extradllflags, "-mno-cygwin" )) strarray_add( &ret, "msvcrt" ); + strarray_add( &ret, "winecrt0" ); if (make->is_win16) strarray_add( &ret, "kernel" ); strarray_add( &ret, "kernel32" ); strarray_add( &ret, "ntdll" ); - strarray_add( &ret, "winecrt0" ); return ret; } @@ -3070,8 +3070,7 @@ static void output_module( struct makefile *make ) char *spec_file = NULL; unsigned int i; - if (!make->appmode.count) - spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); + if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 0 )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, 0 )); add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ @@ -3106,10 +3105,10 @@ static void output_module( struct makefile *make ) output_winegcc_command( make, 0 ); if (spec_file) { - output( " -shared %s", spec_file ); - output_filenames( make->extradllflags ); + output_filename( "-shared" ); + output_filename( spec_file ); } - else output_filenames( make->appmode ); + output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); @@ -3257,7 +3256,7 @@ static void output_test_module( struct makefile *make ) strarray_add( &make->clean_files, strmake( "%s%s", stripped, ext )); output( "%s%s:\n", obj_dir_path( make, testmodule ), ext ); output_winegcc_command( make, !!crosstarget ); - output_filenames( make->appmode ); + output_filenames( make->extradllflags ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); @@ -3267,7 +3266,7 @@ static void output_test_module( struct makefile *make ) output_winegcc_command( make, !!crosstarget ); output_filename( "-s" ); output_filename( strmake( "-Wb,-F,%s", testmodule )); - output_filenames( make->appmode ); + output_filenames( make->extradllflags ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); @@ -3469,7 +3468,7 @@ static void output_subdirs( struct makefile *make ) if (!submake->staticlib) { strarray_add( &builddeps_deps, subdir ); - if (!submake->appmode.count) + if (!submake->is_exe) { output( "manpages htmlpages sgmlpages xmlpages::\n" ); output( "\t(a)cd %s && $(MAKE) $@\n", subdir ); @@ -3977,7 +3976,6 @@ static void load_sources( struct makefile *make ) make->programs = get_expanded_make_var_array( make, "PROGRAMS" ); make->scripts = get_expanded_make_var_array( make, "SCRIPTS" ); - make->appmode = get_expanded_make_var_array( make, "APPMODE" ); make->imports = get_expanded_make_var_array( make, "IMPORTS" ); make->delayimports = get_expanded_make_var_array( make, "DELAYIMPORTS" ); make->extradllflags = get_expanded_make_var_array( make, "EXTRADLLFLAGS" ); @@ -3987,9 +3985,12 @@ static void load_sources( struct makefile *make ) if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module; + strarray_addall( &make->extradllflags, get_expanded_make_var_array( make, "APPMODE" )); make->disabled = make->base_dir && strarray_exists( &disabled_dirs, make->base_dir ); - make->is_win16 = strarray_exists( &make->extradllflags, "-m16" ) || strarray_exists( &make->appmode, "-m16" ); - make->use_msvcrt = strarray_exists( &make->appmode, "-mno-cygwin" ); + make->is_win16 = strarray_exists( &make->extradllflags, "-m16" ); + make->use_msvcrt = strarray_exists( &make->extradllflags, "-mno-cygwin" ); + make->is_exe = strarray_exists( &make->extradllflags, "-mconsole" ) || + strarray_exists( &make->extradllflags, "-mwindows" ); for (i = 0; i < make->imports.count && !make->use_msvcrt; i++) make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ) ||

1 0

Michael Stefaniuc : wineps.drv: Avoid using the comma operator.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 23be5e516bbba671915a0c30d8c7353b418e8718 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23be5e516bbba671915a0c30… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Apr 5 21:03:56 2019 +0200 wineps.drv: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index c4d0a96..c1de724 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -271,7 +271,7 @@ DWORD PSDRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, } dst_x = dst->visrect.left; - dst_y = dst->visrect.top, + dst_y = dst->visrect.top; dst_width = dst->visrect.right - dst->visrect.left; dst_height = dst->visrect.bottom - dst->visrect.top; if (src->width * dst->width < 0)

1 0

Piotr Caban : d3d11: Don't use strcasecmp.
by Alexandre Julliard 08 Apr '19

08 Apr '19

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 : inetcomm: Don't use strcasecmp.
by Alexandre Julliard 08 Apr '19

08 Apr '19

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 : dinput: Don't use strcasecmp.
by Alexandre Julliard 08 Apr '19

08 Apr '19

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

Piotr Caban : dbghelp: Don't use strcasecmp.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 061f65f9aaa5e6c9e34f407293906a2cc9033f0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=061f65f9aaa5e6c9e34f4072… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:30:40 2019 +0200 dbghelp: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/pe_module.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index adb66d6..54fbe36 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2684,7 +2684,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, { ptr = (const char*)imp + sizeof(*imp) + strlen(imp->filename); if (i >= CV_MAX_MODULES) FIXME("Out of bounds!!!\n"); - if (!strcasecmp(pdb_lookup->filename, imp->filename)) + if (!_strnicmp(pdb_lookup->filename, imp->filename, -1)) { if (module_index != -1) FIXME("Twice the entry\n"); else module_index = i; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index c077c07..58530e7 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -127,7 +127,7 @@ BOOL pe_find_section(struct image_file_map* fmap, const char* name, sectname = memcpy(tmp, sectname, IMAGE_SIZEOF_SHORT_NAME); tmp[IMAGE_SIZEOF_SHORT_NAME] = '\0'; } - if (!strcasecmp(sectname, name)) + if (!_strnicmp(sectname, name, -1)) { ism->fmap = fmap; ism->sidx = i;

1 0

Jacek Caban : ntoskrnl.exe: Don' t add device to the list if IoCreateDevice fails.
by Alexandre Julliard 08 Apr '19

08 Apr '19

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

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

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