November 2021 - Wine-commits

Jan Sikorski : ntdll: Save status from attaching dependencies in process_attach().
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 064dd051d80f1353fcb4af91cd0d78e936d1f7c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=064dd051d80f1353fcb4af91… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Nov 22 14:59:48 2021 +0100 ntdll: Save status from attaching dependencies in process_attach(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5cf538f3319..c6d9689f408 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1552,7 +1552,7 @@ static NTSTATUS process_attach( LDR_DDAG_NODE *node, LPVOID lpReserved ) if (wm->ldr.ActivationContext) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); /* Recursively attach all DLLs this one depends on */ - walk_node_dependencies( node, lpReserved, process_attach ); + status = walk_node_dependencies( node, lpReserved, process_attach ); if (!wm->ldr.InInitializationOrderLinks.Flink) InsertTailList(&NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList,

1 0

Eric Pouech : dbghelp: Fix potential crash when loading a builtin PE module embedded in an ELF image.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 5e56bc3b21c5955962f93c4369720964e3e05a94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e56bc3b21c5955962f93c43… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:19:46 2021 +0100 dbghelp: Fix potential crash when loading a builtin PE module embedded in an ELF image. Regression introduced by ced12a1a3aca214c64887e1dc65df67015015394. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index fe65683c6e1..1b64bb57eb7 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -990,7 +990,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam module_remove(pcs, altmodule); } - if ((dbghelp_options & SYMOPT_DEFERRED_LOADS) == 0) + if ((dbghelp_options & SYMOPT_DEFERRED_LOADS) == 0 && !module_get_container(pcs, module)) module_load_debug(module); return module->module.BaseOfImage; }

1 0

Eric Pouech : dbghelp: Protect against missing compiland when adding global function.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 0bbb161c41dd6dcb505ddef40d18d32065925341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bbb161c41dd6dcb505ddef4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:19:59 2021 +0100 dbghelp: Protect against missing compiland when adding global function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52045 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 435d94bc8eb..2443dbf7e73 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -353,8 +353,11 @@ struct symt_function* symt_new_function(struct module* module, init_function_or_inlinesite(sym, module, SymTagFunction, &compiland->symt, name, addr, size, sig_type); sym->next_inlinesite = NULL; /* first of list */ symt_add_module_ht(module, (struct symt_ht*)sym); - p = vector_add(&compiland->vchildren, &module->pool); - *p = &sym->symt; + if (compiland) + { + p = vector_add(&compiland->vchildren, &module->pool); + *p = &sym->symt; + } } return sym; }

1 0

Eric Pouech : dbghelp/dwarf: Don't unmap the fmap of a DWZ module twice.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 441838b7b2be48b0a74dca8b2ae0e3d1f9b12318 URL: https://source.winehq.org/git/wine.git/?a=commit;h=441838b7b2be48b0a74dca8b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:20:13 2021 +0100 dbghelp/dwarf: Don't unmap the fmap of a DWZ module twice. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 9d60aeb5ad4..67440e97fe8 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -4131,7 +4131,6 @@ static void dwarf2_unload_dwz(dwarf2_dwz_alternate_t* dwz) image_unmap_section(&dwz->sectmap[section_line]); image_unmap_section(&dwz->sectmap[section_ranges]); - image_unmap_file(dwz->fmap); HeapFree(GetProcessHeap(), 0, dwz); }

1 0

Eric Pouech : dbghelp: Remove incorrect FIXME in SymEnumerateLoadedModules.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 4cc7a3ba905f0cb10daa7eaec0bea2c955becc33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cc7a3ba905f0cb10daa7eae… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:20:27 2021 +0100 dbghelp: Remove incorrect FIXME in SymEnumerateLoadedModules. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 1b64bb57eb7..8119f941e2a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1246,7 +1246,6 @@ BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess, if (!EnumProcessModules(hProcess, hMods, 256 * sizeof(hMods[0]), &sz)) { /* hProcess should also be a valid process handle !! */ - FIXME("If this happens, bump the number in mod\n"); HeapFree(GetProcessHeap(), 0, hMods); return FALSE; }

1 0

Eric Pouech : dbghelp: In SymEnumerateLoadedModules, don't limit the number of modules.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: f10635ab08e43853ce7a577286822399da92bece URL: https://source.winehq.org/git/wine.git/?a=commit;h=f10635ab08e43853ce7a5772… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:20:40 2021 +0100 dbghelp: In SymEnumerateLoadedModules, don't limit the number of modules. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 8119f941e2a..363f6314b22 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1249,6 +1249,12 @@ BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess, HeapFree(GetProcessHeap(), 0, hMods); return FALSE; } + if (sz > 256 * sizeof(hMods[0])) + { + hMods = HeapReAlloc(GetProcessHeap(), 0, hMods, sz); + if (!hMods || !EnumProcessModules(hProcess, hMods, sz, &sz)) + return FALSE; + } sz /= sizeof(HMODULE); for (i = 0; i < sz; i++) {

1 0

Alexandre Julliard : makefiles: Stop creating importlib symlinks.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: e694c798b60780aef891edfa23268bb897017561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e694c798b60780aef891edfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 20 13:03:53 2021 +0100 makefiles: Stop creating importlib symlinks. We always pass the full path to winegcc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2de02aab411..99f824d5f8b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2005,24 +2005,6 @@ static int needs_delay_lib( const struct makefile *make ) } -/******************************************************************* - * needs_implib_symlink - */ -static int needs_implib_symlink( const struct makefile *make ) -{ - if (!make->module) return 0; - if (!make->importlib) return 0; - if (make->is_win16 && make->disabled) return 0; - if (strncmp( make->obj_dir, "dlls/", 5 )) return 0; - if (!strcmp( make->module, make->importlib )) return 0; - if (!strchr( make->importlib, '.' ) && - !strncmp( make->module, make->importlib, strlen( make->importlib )) && - !strcmp( make->module + strlen( make->importlib ), ".dll" )) - return 0; - return 1; -} - - /******************************************************************* * add_unix_libraries */ @@ -2185,8 +2167,6 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra if (ext) lib = replace_extension( lib, ".a", ext ); strarray_add_uniq( deps, lib ); strarray_add( &ret, lib ); - if (needs_implib_symlink( submakes[j] )) - strarray_add_uniq( deps, strmake( "dlls/lib%s%s", name, ext ? ext : ".a" )); } else strarray_add( &ret, strmake( "-l%s", name )); } @@ -2554,27 +2534,6 @@ static void output_uninstall_rules( struct makefile *make ) } -/******************************************************************* - * output_importlib_symlinks - */ -static struct strarray output_importlib_symlinks( const struct makefile *make ) -{ - struct strarray ret = empty_strarray; - const char *lib, *dst, *ext[2] = { "a", "cross.a" }; - int i, count = 1 + !!crosstarget; - - for (i = 0; i < count; i++) - { - lib = strmake( "lib%s.%s", make->importlib, ext[i] ); - dst = strmake( "dlls/%s", lib ); - output( "%s: %s\n", dst, obj_dir_path( make, lib )); - output_symlink_rule( concat_paths( make->obj_dir + strlen("dlls/"), lib ), dst, 0 ); - strarray_add( &ret, dst ); - } - return ret; -} - - /******************************************************************* * output_po_files */ @@ -3336,8 +3295,6 @@ static void output_import_lib( struct makefile *make ) strmake( "lib%s.cross.a", make->importlib ), strmake( "d%s/lib%s.a", pe_dir, make->importlib )); } - if (needs_implib_symlink( make )) - strarray_addall( &top_makefile->clean_files, output_importlib_symlinks( make )); }

1 0

Alexandre Julliard : makefiles: Don't append .fake extension to fake dlls.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 62d335053f7ce675a6ae92b6a9f128ad3e9d4c0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d335053f7ce675a6ae92b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 20 13:07:47 2021 +0100 makefiles: Don't append .fake extension to fake dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 ------ dlls/ntdll/unix/loader.c | 11 +---------- dlls/setupapi/fakedll.c | 27 ++++++++------------------- tools/makedep.c | 11 ++++------- tools/widl/widl.c | 2 -- 5 files changed, 13 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a754579bf54..5cf538f3319 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2788,9 +2788,6 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne RtlAppendUnicodeToString( new_name, name ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status != STATUS_DLL_NOT_FOUND) goto done; - RtlAppendUnicodeToString( new_name, L".fake" ); - status = open_dll_file( new_name, pwm, mapping, image_info, id ); - if (status != STATUS_DLL_NOT_FOUND) goto done; new_name->Length = len; RtlAppendUnicodeToString( new_name, L"\\programs\\" ); @@ -2799,9 +2796,6 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne RtlAppendUnicodeToString( new_name, name ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status != STATUS_DLL_NOT_FOUND) goto done; - RtlAppendUnicodeToString( new_name, L".fake" ); - status = open_dll_file( new_name, pwm, mapping, image_info, id ); - if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( new_name ); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 3d26da194e4..00b07edb1f3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1720,16 +1720,6 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, SECTION_IMAGE_INFORMATION info; enum loadorder loadorder; - /* remove .fake extension if present */ - if (image_info->image_flags & IMAGE_FLAGS_WineFakeDll) - { - static const WCHAR fakeW[] = {'.','f','a','k','e',0}; - WCHAR *ext = wcsrchr( filename, '.' ); - - TRACE( "%s is a fake Wine dll\n", debugstr_w(filename) ); - if (ext && !wcsicmp( ext, fakeW )) *ext = 0; - } - init_unicode_string( &nt_name, filename ); loadorder = get_load_order( &nt_name ); @@ -1742,6 +1732,7 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, } else if (image_info->image_flags & IMAGE_FLAGS_WineFakeDll) { + TRACE( "%s is a fake Wine dll\n", debugstr_w(filename) ); if (loadorder == LO_NATIVE) return STATUS_DLL_NOT_FOUND; loadorder = LO_BUILTIN; /* builtin with no fallback since mapping a fake dll is not useful */ } diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 8ff29fb4f92..a4b8df4dfb4 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -253,8 +253,7 @@ static int read_file( const WCHAR *name, void **data, SIZE_T *size ) st.st_size - header_size ) == st.st_size - header_size) { *data = file_buffer; - if ((lstrlenW(name) > 2 && !wcscmp( name + lstrlenW(name) - 2, L"16" )) || - (lstrlenW(name) > 7 && !wcscmp( name + lstrlenW(name) - 7, L"16.fake" ))) + if (lstrlenW(name) > 2 && !wcscmp( name + lstrlenW(name) - 2, L"16" )) extract_16bit_image( nt, data, size ); ret = 1; } @@ -432,11 +431,11 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) len = lstrlenW( name ); if (build_dir) maxlen = lstrlenW(build_dir) + ARRAY_SIZE(L"\\programs") + len + 1; while ((path = enum_load_path( i++ ))) maxlen = max( maxlen, lstrlenW(path) ); - maxlen += ARRAY_SIZE(pe_dir) + len + ARRAY_SIZE(L".fake"); + maxlen += ARRAY_SIZE(pe_dir) + len + 1; if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen * sizeof(WCHAR) ))) return NULL; - pos = maxlen - len - ARRAY_SIZE(L".fake"); + pos = maxlen - len - 1; lstrcpyW( file + pos, name ); file[--pos] = '\\'; @@ -451,8 +450,6 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) ptr = prepend( ptr, L"\\dlls", 5 ); ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); if ((res = read_file( ptr, &data, size ))) goto done; - lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size ))) goto done; /* now as a program */ ptr = file + pos; @@ -463,8 +460,6 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) ptr = prepend( ptr, L"\\programs", 9 ); ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); if ((res = read_file( ptr, &data, size ))) goto done; - lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size ))) goto done; } file[pos + len + 1] = 0; @@ -888,7 +883,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size, } /* copy a fake dll file to the dest directory */ -static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL delete, struct list *delay_copy ) +static int install_fake_dll( WCHAR *dest, WCHAR *file, BOOL delete, struct list *delay_copy ) { int ret; SIZE_T size; @@ -899,7 +894,6 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL de WCHAR *end = name + lstrlenW(name); SIZE_T len = end - name; - if (ext) lstrcpyW( end, ext ); if (!(ret = read_file( file, &data, &size ))) { *end = 0; @@ -987,16 +981,11 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *wildcard, { lstrcatW( name, L"\\" ); lstrcatW( name, data.name ); - if (wcschr( data.name, '.' )) /* module possibly already has an extension */ - { - if (install_fake_dll( dest, file, NULL, delete, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", delete, &delay_copy )) continue; - } + if (wcschr( data.name, '.' ) && install_fake_dll( dest, file, delete, &delay_copy )) + continue; lstrcatW( name, default_ext ); - if (install_fake_dll( dest, file, NULL, delete, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", delete, &delay_copy )) continue; } - else install_fake_dll( dest, file, NULL, delete, &delay_copy ); + install_fake_dll( dest, file, delete, &delay_copy ); } while (!_wfindnext( handle, &data )); _findclose( handle ); @@ -1014,7 +1003,7 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, B if (build_dir) maxlen = lstrlenW(build_dir) + ARRAY_SIZE(L"\\programs") + 1; for (i = 0; (path = enum_load_path(i)); i++) maxlen = max( maxlen, lstrlenW(path) ); - maxlen += 2 * max_dll_name_len + 2 + ARRAY_SIZE(pe_dir) + 10; /* ".dll.fake" */ + maxlen += 2 * max_dll_name_len + 2 + ARRAY_SIZE(pe_dir) + 10; /* ".dll" */ if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen * sizeof(WCHAR) ))) return FALSE; if (!(dest = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(dirname) + max_dll_name_len) * sizeof(WCHAR) ))) diff --git a/tools/makedep.c b/tools/makedep.c index 99f824d5f8b..acc8f49bfba 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2731,9 +2731,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, for (i = 0; i < source->importlibdeps.count; i++) { struct makefile *submake = find_importlib_module( source->importlibdeps.str[i] ); - const char *module = submake->module; - if (*dll_ext && !submake->is_cross) module = strmake( "%s.fake", module ); - output_filename( obj_dir_path( submake, module )); + output_filename( obj_dir_path( submake, submake->module )); } output( "\n" ); } @@ -3221,11 +3219,10 @@ static void output_fake_module( struct makefile *make ) if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); - strarray_add( &make->all_targets, strmake( "%s.fake", make->module )); - add_install_rule( make, make->module, strmake( "%s.fake", make->module ), - strmake( "d%s/%s", pe_dir, make->module )); + strarray_add( &make->all_targets, make->module ); + add_install_rule( make, make->module, make->module, strmake( "d%s/%s", pe_dir, make->module )); - output( "%s.fake:", obj_dir_path( make, make->module )); + output( "%s:", obj_dir_path( make, make->module )); if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, make->res_files ); output_filename( tools_path( make, "winebuild" )); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index aa73601233f..0b5f07236f0 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -688,8 +688,6 @@ int open_typelib( const char *name ) if (strendswith( name, ".dll" )) namelen -= 4; TRYOPEN( strmake( "%.*s/%.*s/%s", (int)strlen(dlldirs.str[i]) - 2, dlldirs.str[i], namelen, name, name )); - TRYOPEN( strmake( "%.*s/%.*s/%s.fake", (int)strlen(dlldirs.str[i]) - 2, dlldirs.str[i], - namelen, name, name )); } else {

1 0

Alexandre Julliard : makefiles: Add a separate variable to keep track of source test files.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 859338a4d4810965cbfb521c0a7cbf7fbfb07a21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=859338a4d4810965cbfb521c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 20 13:26:51 2021 +0100 makefiles: Add a separate variable to keep track of source test files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index acc8f49bfba..bf8d3a126e3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -206,6 +206,7 @@ struct makefile struct strarray in_files; struct strarray ok_files; struct strarray pot_files; + struct strarray test_files; struct strarray clean_files; struct strarray distclean_files; struct strarray uninstall_files; @@ -3016,6 +3017,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour strarray_add( &make->c2man_files, source->filename ); if (make->testdll && !is_dll_src) { + strarray_add( &make->test_files, obj ); strarray_add( &make->ok_files, strmake( "%s.ok", obj )); output( "%s.ok:\n", obj_dir_path( make, obj )); output( "\t%s%s $(RUNTESTFLAGS) -T . -M %s -p %s%s %s && touch $@\n", @@ -3886,12 +3888,8 @@ static void output_linguas( const struct makefile *make ) static void output_testlist( const struct makefile *make ) { const char *dest = obj_dir_path( make, "testlist.c" ); - struct strarray files = empty_strarray; unsigned int i; - for (i = 0; i < make->ok_files.count; i++) - strarray_add( &files, replace_extension( make->ok_files.str[i], ".ok", "" )); - output_file = create_temp_file( dest ); output( "/* Automatically generated by make depend; DO NOT EDIT!! */\n\n" ); @@ -3900,11 +3898,13 @@ static void output_testlist( const struct makefile *make ) output( "#define STANDALONE\n" ); output( "#include \"wine/test.h\"\n\n" ); - for (i = 0; i < files.count; i++) output( "extern void func_%s(void);\n", files.str[i] ); + for (i = 0; i < make->test_files.count; i++) + output( "extern void func_%s(void);\n", make->test_files.str[i] ); output( "\n" ); output( "const struct test winetest_testlist[] =\n" ); output( "{\n" ); - for (i = 0; i < files.count; i++) output( " { \"%s\", func_%s },\n", files.str[i], files.str[i] ); + for (i = 0; i < make->test_files.count; i++) + output( " { \"%s\", func_%s },\n", make->test_files.str[i], make->test_files.str[i] ); output( " { 0, 0 }\n" ); output( "};\n" ); @@ -3960,7 +3960,7 @@ static void output_stub_makefile( struct makefile *make ) if (make->install_rules[INSTALL_LIB].count) strarray_add( &targets, "install-lib" ); if (make->install_rules[INSTALL_DEV].count) strarray_add( &targets, "install-dev" ); if (make->clean_files.count) strarray_add( &targets, "clean" ); - if (make->ok_files.count) + if (make->test_files.count) { strarray_add( &targets, "check" ); strarray_add( &targets, "test" );

1 0

Alexandre Julliard : makefiles: Don't use bundled libraries to build native programs.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 53e207fde0a62850eaf6b2316788a6729f47a55e URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e207fde0a62850eaf6b231… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 22 18:32:35 2021 +0100 makefiles: Don't use bundled libraries to build native programs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index bf8d3a126e3..d0dc9e3d01d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3404,7 +3404,8 @@ static void output_shared_lib( struct makefile *make ) strarray_addall( &dep_libs, get_local_dependencies( make, basename, make->in_files )); strarray_addall( &all_libs, get_expanded_file_local_var( make, basename, "LDFLAGS" )); - strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); + strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); + strarray_addall( &all_libs, libs ); output( "%s:", obj_dir_path( make, make->sharedlib )); output_filenames_obj_dir( make, make->object_files ); @@ -3518,7 +3519,10 @@ static void output_programs( struct makefile *make ) if (!objs.count) objs = make->object_files; if (!strarray_exists( &all_libs, "-nodefaultlibs" )) - strarray_addall( &all_libs, add_unix_libraries( make, &deps )); + { + strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); + strarray_addall( &all_libs, libs ); + } output( "%s:", obj_dir_path( make, program ) ); output_filenames_obj_dir( make, objs );

1 0