wine-commits September 2022

wine-commits@winehq.org

1 participants
553 discussions

Eric Pouech : winedbg: Enhance printing of variables or fields.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 001665d7354ca9a21de0d2a5cbfe0839e92446cd URL: https://gitlab.winehq.org/wine/wine/-/commit/001665d7354ca9a21de0d2a5cbfe08… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 30 18:15:26 2022 +0200 winedbg: Enhance printing of variables or fields. Prints 'int a[10]' (instead of 'int[10] a'). Ditto for variables/fields of type function pointer. And for pure type printing, no longer prints --none-- for arrays and function pointers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/dbg.y | 4 ++-- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/expr.c | 2 +- programs/winedbg/stack.c | 3 ++- programs/winedbg/symbol.c | 40 +++++++++++++++++++++++++--------------- programs/winedbg/types.c | 39 ++++++++++++++++++++++----------------- 6 files changed, 54 insertions(+), 38 deletions(-)

1 0

Eric Pouech : dbghelp: Expose local static variables' address.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: b990eaa8a686c5b4b1ff4b6b7610742a3db3ec34 URL: https://gitlab.winehq.org/wine/wine/-/commit/b990eaa8a686c5b4b1ff4b6b761074… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 30 18:15:04 2022 +0200 dbghelp: Expose local static variables' address. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/type.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 1e0a3423ea3..fd887718d8c 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -192,7 +192,7 @@ struct symt_data struct symt* type; union /* depends on kind */ { - /* DataIs{Global, FileStatic}: + /* DataIs{Global, FileStatic, StaticLocal}: * with loc.kind * loc_absolute loc.offset is address * loc_tlsrel loc.offset is TLS index address diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 9d39d490965..cb1c7f7bc0d 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -143,6 +143,7 @@ BOOL symt_get_address(const struct symt* type, ULONG64* addr) { case DataIsGlobal: case DataIsFileStatic: + case DataIsStaticLocal: *addr = ((const struct symt_data*)type)->u.var.offset; break; default: return FALSE;

1 0

Eric Pouech : dbghelp: Remove address field from symt_compiland.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 99eb63bd7a41b87d472bb622a5faf24d1fcd91c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/99eb63bd7a41b87d472bb622a5faf2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 30 18:14:24 2022 +0200 dbghelp: Remove address field from symt_compiland. It's mostly always set at 0, and native dbghelp doesn't expose it anyway. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/coff.c | 3 +-- dlls/dbghelp/dbghelp_private.h | 3 +-- dlls/dbghelp/dwarf.c | 7 ++----- dlls/dbghelp/elf_module.c | 3 +-- dlls/dbghelp/msc.c | 4 ++-- dlls/dbghelp/pe_module.c | 3 +-- dlls/dbghelp/stabs.c | 2 +- dlls/dbghelp/symbol.c | 4 +--- 8 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index 0f29b131a86..efba167081e 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -114,8 +114,7 @@ static int coff_add_file(struct CoffFileSet* coff_files, struct module* module, file = coff_files->files + coff_files->nfiles; file->startaddr = 0xffffffff; file->endaddr = 0; - file->compiland = symt_new_compiland(module, 0, - source_new(module, NULL, filename)); + file->compiland = symt_new_compiland(module, source_new(module, NULL, filename)); file->linetab_offset = -1; file->linecnt = 0; file->entries = NULL; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 24ac003df71..1e0a3423ea3 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -815,8 +815,7 @@ extern struct symt_ht* extern struct symt_module* symt_new_module(struct module* module) DECLSPEC_HIDDEN; extern struct symt_compiland* - symt_new_compiland(struct module* module, ULONG_PTR address, - unsigned src_idx) DECLSPEC_HIDDEN; + symt_new_compiland(struct module* module, unsigned src_idx) DECLSPEC_HIDDEN; extern struct symt_public* symt_new_public(struct module* module, struct symt_compiland* parent, diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 71163ced733..30cd35076d3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2970,7 +2970,7 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) struct vector* children; dwarf2_debug_info_t* child = NULL; unsigned int i; - struct attribute stmt_list, low_pc; + struct attribute stmt_list; struct attribute comp_dir; struct attribute language; @@ -2981,15 +2981,12 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) if (!dwarf2_find_attribute(di, DW_AT_comp_dir, &comp_dir)) comp_dir.u.string = NULL; - if (!dwarf2_find_attribute(di, DW_AT_low_pc, &low_pc)) - low_pc.u.uvalue = 0; - if (!dwarf2_find_attribute(di, DW_AT_language, &language)) language.u.uvalue = DW_LANG_C; ctx->language = language.u.uvalue; - ctx->compiland = symt_new_compiland(ctx->module_ctx->module, ctx->module_ctx->load_offset + low_pc.u.uvalue, + ctx->compiland = symt_new_compiland(ctx->module_ctx->module, source_new(ctx->module_ctx->module, comp_dir.u.string, name.u.string)); dwarf2_cache_cuhead(ctx->module_ctx->module->format_info[DFI_DWARF]->u.dwarf2_info, ctx->compiland, &ctx->head); di->symt = &ctx->compiland->symt; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 404c7c11dbb..4d96b5c60a7 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -699,8 +699,7 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, { case ELF_STT_FILE: if (symname) - compiland = symt_new_compiland(module, sym.st_value, - source_new(module, NULL, symname)); + compiland = symt_new_compiland(module, source_new(module, NULL, symname)); else compiland = NULL; continue; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a5b688bae17..0109e4dd255 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2504,14 +2504,14 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, case S_OBJNAME: TRACE("S-ObjName-V3 %s\n", sym->objname_v3.name); - compiland = symt_new_compiland(msc_dbg->module, 0 /* FIXME */, + compiland = symt_new_compiland(msc_dbg->module, source_new(msc_dbg->module, NULL, sym->objname_v3.name)); break; case S_OBJNAME_ST: TRACE("S-ObjName-V1 %s\n", terminate_string(&sym->objname_v1.p_name)); - compiland = symt_new_compiland(msc_dbg->module, 0 /* FIXME */, + compiland = symt_new_compiland(msc_dbg->module, source_new(msc_dbg->module, NULL, terminate_string(&sym->objname_v1.p_name))); break; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 3e697912718..6b61c1de6e5 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -470,8 +470,7 @@ static BOOL pe_load_coff_symbol_table(struct module* module) if (name[0] == '_') name++; if (!compiland && lastfilename) - compiland = symt_new_compiland(module, 0, - source_new(module, NULL, lastfilename)); + compiland = symt_new_compiland(module, source_new(module, NULL, lastfilename)); if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) symt_new_public(module, compiland, name, FALSE, diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index b22fb714973..badb07e3b5c 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1570,7 +1570,7 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, { stabs_reset_includes(); source_idx = source_new(module, srcpath, ptr); - compiland = symt_new_compiland(module, 0 /* FIXME */, source_idx); + compiland = symt_new_compiland(module, source_idx); } else { diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index adc36da4a49..7d0cc6005f2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -228,8 +228,7 @@ struct symt_module* symt_new_module(struct module* module) return sym; } -struct symt_compiland* symt_new_compiland(struct module* module, - ULONG_PTR address, unsigned src_idx) +struct symt_compiland* symt_new_compiland(struct module* module, unsigned src_idx) { struct symt_compiland* sym; struct symt_compiland** p; @@ -240,7 +239,6 @@ struct symt_compiland* symt_new_compiland(struct module* module, { sym->symt.tag = SymTagCompiland; sym->container = module->top; - sym->address = address; sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); sym->user = NULL;

1 0

Alexandre Julliard : mmdevapi/tests: Mark some failing tests as flaky.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 1237ae4f9de336c8d47f93ae40b9efcca968f55d URL: https://gitlab.winehq.org/wine/wine/-/commit/1237ae4f9de336c8d47f93ae40b9ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 30 18:43:25 2022 +0200 mmdevapi/tests: Mark some failing tests as flaky. --- dlls/mmdevapi/tests/render.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index ac714980c6f..8e000f03acb 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1034,11 +1034,12 @@ static void test_clock(int share) * BufferSize must be rounded up, maximum 2s says MSDN * but it is rounded down modulo fragment ! */ if (share) - ok(gbsize == bufsize, - "BufferSize %u at rate %lu\n", gbsize, pwfx->nSamplesPerSec); + ok(gbsize == bufsize, + "BufferSize %u at rate %lu\n", gbsize, pwfx->nSamplesPerSec); else - ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, - "BufferSize %u misfits fragment size %u at rate %lu\n", gbsize, fragment, pwfx->nSamplesPerSec); + flaky + ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, + "BufferSize %u misfits fragment size %u at rate %lu\n", gbsize, fragment, pwfx->nSamplesPerSec); /* In shared mode, GetCurrentPadding decreases in multiples of * fragment size (i.e. updated only at period ticks), whereas @@ -1111,6 +1112,7 @@ static void test_clock(int share) ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos > 0, "Position %u vs. last %u\n", (UINT)pos,0); /* in rare cases is slept*1.1 not enough with dmix */ + flaky ok(pos*1000/freq <= slept*1.4, "Position %u too far after playing %ums\n", (UINT)pos, slept); last = pos; @@ -2211,6 +2213,7 @@ static void test_worst_case(void) for(i = 0; i <= 99; i++){ /* 100 x 10ms = 1 second */ r = WaitForSingleObject(event, 60 + defp / 10000); + flaky_wine ok(r == WAIT_OBJECT_0, "Wait iteration %d gave %lx\n", i, r); /* the app has nearly one period time to feed data */

1 0

Rémi Bernon : regedit: Add a direct import for shcore.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 4c60f67f00afbdfe6ab9db3fcd57b299d1317f0f URL: https://gitlab.winehq.org/wine/wine/-/commit/4c60f67f00afbdfe6ab9db3fcd57b2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 29 18:04:31 2022 +0200 regedit: Add a direct import for shcore. For CommandLineToArgvW. --- programs/regedit/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index 9f8fb5af165..77ef7b3163a 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -1,5 +1,5 @@ MODULE = regedit.exe -IMPORTS = advapi32 +IMPORTS = advapi32 shcore DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 EXTRADLLFLAGS = -mwindows -municode

1 0

Rémi Bernon : regedit: Call InitCommonControls after command-line has been processed.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 99b3862e67b0841e2eb4f5f0d099b0403917c581 URL: https://gitlab.winehq.org/wine/wine/-/commit/99b3862e67b0841e2eb4f5f0d099b0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 29 18:03:26 2022 +0200 regedit: Call InitCommonControls after command-line has been processed. Avoid triggering the load of comctl32 early. --- programs/regedit/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index e776ec9d0f7..b1035629726 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -132,8 +132,6 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi HACCEL hAccel; BOOL is_wow64; - InitCommonControls(); - if (ProcessCmdLine(GetCommandLineW())) { return 0; } @@ -161,6 +159,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi Wow64RevertWow64FsRedirection( redir ); } + InitCommonControls(); + /* Initialize global strings */ LoadStringW(hInstance, IDS_APP_TITLE, szTitle, ARRAY_SIZE(szTitle)); LoadStringW(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueName, ARRAY_SIZE(g_pszDefaultValueName));

1 0

Rémi Bernon : shcore: Use delay import for user32 and ole32.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 81e9b72dc967c2fa3aab4eca238f4a017fddd36a URL: https://gitlab.winehq.org/wine/wine/-/commit/81e9b72dc967c2fa3aab4eca238f4a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 29 18:02:45 2022 +0200 shcore: Use delay import for user32 and ole32. And drop gdi32 which isn't required. --- dlls/shcore/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in index 7c4d161a558..61840e9a056 100644 --- a/dlls/shcore/Makefile.in +++ b/dlls/shcore/Makefile.in @@ -1,6 +1,7 @@ MODULE = shcore.dll IMPORTLIB = shcore -IMPORTS = user32 gdi32 ole32 advapi32 +IMPORTS = advapi32 +DELAYIMPORTS = user32 ole32 EXTRADLLFLAGS = -Wb,--prefer-native

1 0

Rémi Bernon : makedep: Link with imported libs before delay imported libs.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: c90e03e3cb1740c03f69f7f87354f7a8f24c6656 URL: https://gitlab.winehq.org/wine/wine/-/commit/c90e03e3cb1740c03f69f7f87354f7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 29 20:05:30 2022 +0200 makedep: Link with imported libs before delay imported libs. In order to favor direct imports over delayed imports, for instance when the delay imported module forwards symbols from the imported module. --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 527cbd3c058..d7e045bdd6e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3176,8 +3176,8 @@ static void output_module( struct makefile *make ) if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); - strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, make->is_cross )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, make->is_cross )); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, make->is_cross )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, make->is_cross ) ); if (!make->use_msvcrt)

1 0

Rémi Bernon : makedep: Link default imports separately from direct imports.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 214223edc39eab074a6923f83f4bc00d4485ec03 URL: https://gitlab.winehq.org/wine/wine/-/commit/214223edc39eab074a6923f83f4bc0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 29 20:04:44 2022 +0200 makedep: Link default imports separately from direct imports. --- tools/makedep.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 7045dab9541..527cbd3c058 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2151,19 +2151,17 @@ static const char *get_crt_define( const struct makefile *make ) /******************************************************************* - * add_default_imports + * get_default_imports */ -static struct strarray add_default_imports( const struct makefile *make, struct strarray imports ) +static struct strarray get_default_imports( const struct makefile *make, struct strarray imports ) { struct strarray ret = empty_strarray; const char *crt_dll = get_default_crt( make ); unsigned int i; for (i = 0; i < imports.count; i++) - { - if (is_crt_module( imports.str[i] )) crt_dll = imports.str[i]; - else strarray_add( &ret, imports.str[i] ); - } + if (is_crt_module( imports.str[i] )) + crt_dll = imports.str[i]; strarray_add( &ret, "winecrt0" ); if (crt_dll) strarray_add( &ret, crt_dll ); @@ -2180,6 +2178,7 @@ enum import_type { IMPORT_TYPE_DIRECT, IMPORT_TYPE_DELAYED, + IMPORT_TYPE_DEFAULT, }; /******************************************************************* @@ -2196,6 +2195,9 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra const char *name = imports.str[i]; const char *lib = NULL; + /* add crt import lib only when adding the default imports libs */ + if (is_crt_module( imports.str[i] ) && type != IMPORT_TYPE_DEFAULT) continue; + if (name[0] == '-') { switch (name[1]) @@ -2964,15 +2966,18 @@ 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; + struct strarray all_libs = empty_strarray, dep_libs = empty_strarray; + struct strarray default_imports = empty_strarray; char *dll_name, *obj_name, *output_file; const char *debug_file; if (!imports.count) imports = make->imports; if (!dll_flags.count) dll_flags = make->extradllflags; - if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) imports = add_default_imports( make, imports ); + if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); + + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, make->is_cross ) ); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, make->is_cross ) ); - all_libs = add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, make->is_cross ); dll_name = strmake( "%s.dll%s", obj, make->is_cross ? "" : dll_ext ); obj_name = strmake( "%s%s", obj_dir_path( make, obj ), make->is_cross ? ".cross.o" : ".o" ); output_file = obj_dir_path( make, dll_name ); @@ -3152,6 +3157,7 @@ static char *get_unix_lib_name( struct makefile *make ) */ static void output_module( struct makefile *make ) { + struct strarray default_imports = empty_strarray; struct strarray all_libs = empty_strarray; struct strarray dep_libs = empty_strarray; struct strarray imports = make->imports; @@ -3168,11 +3174,11 @@ static void output_module( struct makefile *make ) if (*dll_ext && !make->is_cross && !make->data_only) module_name = strmake( "%s%s", make->module, dll_ext ); - if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) - imports = add_default_imports( make, imports ); + if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, make->is_cross )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, make->is_cross )); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, make->is_cross ) ); if (!make->use_msvcrt) { @@ -3458,14 +3464,16 @@ static void output_test_module( struct makefile *make ) char *testmodule = replace_extension( make->testdll, ".dll", "_test.exe" ); char *stripped = replace_extension( make->testdll, ".dll", "_test-stripped.exe" ); char *testres = replace_extension( make->testdll, ".dll", "_test.res" ); - struct strarray dep_libs = empty_strarray; - struct strarray all_libs = add_import_libs( make, &dep_libs, add_default_imports( make, make->imports ), - IMPORT_TYPE_DIRECT, make->is_cross ); + struct strarray default_imports = get_default_imports( make, make->imports ); + struct strarray dep_libs = empty_strarray, all_libs = empty_strarray; struct makefile *parent = get_parent_makefile( make ); const char *ext = make->is_cross ? "" : dll_ext; const char *debug_file; char *output_file; + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, IMPORT_TYPE_DIRECT, make->is_cross ) ); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, make->is_cross ) ); + strarray_add( &make->all_targets, strmake( "%s%s", testmodule, ext )); strarray_add( &make->clean_files, strmake( "%s%s", stripped, ext )); output_file = strmake( "%s%s", obj_dir_path( make, testmodule ), ext );

1 0

Rémi Bernon : makedep: Add an import type parameter to add_import_libs.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: c1a0b74d98ca8b266af6e2add402eeb6ae1ca56f URL: https://gitlab.winehq.org/wine/wine/-/commit/c1a0b74d98ca8b266af6e2add402ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 29 19:53:45 2022 +0200 makedep: Add an import type parameter to add_import_libs. --- tools/makedep.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 69b4a4c660b..7045dab9541 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2176,12 +2176,17 @@ static struct strarray add_default_imports( const struct makefile *make, struct return ret; } +enum import_type +{ + IMPORT_TYPE_DIRECT, + IMPORT_TYPE_DELAYED, +}; /******************************************************************* * add_import_libs */ static struct strarray add_import_libs( const struct makefile *make, struct strarray *deps, - struct strarray imports, int delay, int is_cross ) + struct strarray imports, enum import_type type, int is_cross ) { struct strarray ret = empty_strarray; unsigned int i, j; @@ -2215,7 +2220,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra { const char *ext = NULL; - if (delay && !delay_load_flag && (is_cross || !*dll_ext)) ext = ".delay.a"; + if (type == IMPORT_TYPE_DELAYED && !delay_load_flag && (is_cross || !*dll_ext)) ext = ".delay.a"; else if (is_cross) ext = ".cross.a"; if (ext) lib = replace_extension( lib, ".a", ext ); strarray_add_uniq( deps, lib ); @@ -2967,7 +2972,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, if (!dll_flags.count) dll_flags = make->extradllflags; if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) imports = add_default_imports( make, imports ); - all_libs = add_import_libs( make, &dep_libs, imports, 0, make->is_cross ); + all_libs = add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, make->is_cross ); dll_name = strmake( "%s.dll%s", obj, make->is_cross ? "" : dll_ext ); obj_name = strmake( "%s%s", obj_dir_path( make, obj ), make->is_cross ? ".cross.o" : ".o" ); output_file = obj_dir_path( make, dll_name ); @@ -3166,8 +3171,8 @@ static void output_module( struct makefile *make ) if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) imports = add_default_imports( make, imports ); - strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 1, make->is_cross )); - strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, 0, make->is_cross )); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, make->is_cross )); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, make->is_cross )); if (!make->use_msvcrt) { @@ -3331,7 +3336,7 @@ static void output_unix_lib( struct makefile *make ) strarray_add( &unix_imports, "winecrt0" ); if (spec_file) strarray_add( &unix_deps, spec_file ); - strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, 0, 0 )); + strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, IMPORT_TYPE_DIRECT, 0 )); strarray_addall( &unix_libs, get_expanded_make_var_array( make, "UNIX_LIBS" )); strarray_addall( &unix_libs, libs ); } @@ -3455,7 +3460,7 @@ static void output_test_module( struct makefile *make ) char *testres = replace_extension( make->testdll, ".dll", "_test.res" ); struct strarray dep_libs = empty_strarray; struct strarray all_libs = add_import_libs( make, &dep_libs, add_default_imports( make, make->imports ), - 0, make->is_cross ); + IMPORT_TYPE_DIRECT, make->is_cross ); struct makefile *parent = get_parent_makefile( make ); const char *ext = make->is_cross ? "" : dll_ext; const char *debug_file;

1 0

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 September 2022