From 5423e0d9e6fc60300a042c3933716fbcf3334fd6 Mon Sep 17 00:00:00 2001 From: Andrew Boyarshin Date: Tue, 9 Feb 2021 13:38:50 +0100 Subject: [PATCH] widl: Fix handling of output_name in option parsing. Do not overwrite explicitly stated paths, such as header_name or proxy_name. Instead, use output_name when specified as a fallback. Signed-off-by: Andrew Boyarshin Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- tools/widl/widl.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 99b24e86fdc..8da887ea636 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -831,19 +831,17 @@ int main(int argc,char *argv[]) set_everything(TRUE); } - if (!output_name) output_name = dup_basename(input_name, ".idl"); - if (do_header + do_typelib + do_proxies + do_client + - do_server + do_regscript + do_idfile + do_dlldata == 1) + do_server + do_regscript + do_idfile + do_dlldata == 1 && output_name) { - if (do_header) header_name = output_name; - else if (do_typelib) typelib_name = output_name; - else if (do_proxies) proxy_name = output_name; - else if (do_client) client_name = output_name; - else if (do_server) server_name = output_name; - else if (do_regscript) regscript_name = output_name; - else if (do_idfile) idfile_name = output_name; - else if (do_dlldata) dlldata_name = output_name; + if (do_header && !header_name) header_name = output_name; + else if (do_typelib && !typelib_name) typelib_name = output_name; + else if (do_proxies && !proxy_name) proxy_name = output_name; + else if (do_client && !client_name) client_name = output_name; + else if (do_server && !server_name) server_name = output_name; + else if (do_regscript && !regscript_name) regscript_name = output_name; + else if (do_idfile && !idfile_name) idfile_name = output_name; + else if (do_dlldata && !dlldata_name) dlldata_name = output_name; } if (!dlldata_name && do_dlldata)