December 2020 - Wine-Commits

Michael Stefaniuc : cryptdlg: Use wide-char string literals.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: b3e684826fb653983e4189de482eb4e2783cd50f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3e684826fb653983e4189de… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 1 00:58:24 2020 +0100 cryptdlg: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptdlg/main.c | 91 +++++++++++++++++++--------------------------------- 1 file changed, 33 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b3e684826fb653983e41…

1 0

Zebediah Figura : vkd3d-compiler: Default to HLSL as a source format when preprocessing.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: vkd3d Branch: master Commit: 6d5fd68f1d9dc2bb4c74e41c12f5cba2e9b81e88 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6d5fd68f1d9dc2bb4c74e41… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 30 11:16:46 2020 -0600 vkd3d-compiler: Default to HLSL as a source format when preprocessing. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 91c8e04..f1e597a 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -397,8 +397,8 @@ static bool parse_command_line(int argc, char **argv, struct options *options) }; memset(options, 0, sizeof(*options)); - options->source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; - options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + options->source_type = VKD3D_SHADER_SOURCE_NONE; + options->target_type = VKD3D_SHADER_TARGET_NONE; options->formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; @@ -483,6 +483,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) if (options->print_target_types) return true; + if (options->source_type == VKD3D_SHADER_SOURCE_NONE) + options->source_type = options->preprocess_only ? VKD3D_SHADER_SOURCE_HLSL : VKD3D_SHADER_SOURCE_DXBC_TPF; + if (options->target_type == VKD3D_SHADER_TARGET_NONE && !options->preprocess_only) + options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + if (!options->preprocess_only && !validate_target_type(options->source_type, options->target_type)) { fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n",

1 0

Zebediah Figura : vkd3d-compiler: Check whether the source format is binary when checking if the output is a tty, when preprocessing.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: vkd3d Branch: master Commit: 10ab0ff12472ab0e9b24d1a2f156db5a0d156f52 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=10ab0ff12472ab0e9b24d1a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 30 11:16:45 2020 -0600 vkd3d-compiler: Check whether the source format is binary when checking if the output is a tty, when preprocessing. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index b79396e..91c8e04 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -639,12 +639,21 @@ int main(int argc, char **argv) if (!(output = open_output(options.output_filename, &close_output))) goto done; - if (!options.output_filename && get_target_type_info(options.target_type)->is_binary - && isatty(fileno(output))) + if (!options.output_filename && isatty(fileno(output))) { - fprintf(stderr, "Output is a tty and output format is binary, exiting.\n" - "If this is really what you intended, specify the output explicitly.\n"); - goto done; + bool is_binary; + + if (options.preprocess_only) + is_binary = get_source_type_info(options.source_type)->is_binary; + else + is_binary = get_target_type_info(options.target_type)->is_binary; + + if (is_binary) + { + fprintf(stderr, "Output is a tty and output format is binary, exiting.\n" + "If this is really what you intended, specify the output explicitly.\n"); + goto done; + } } if (!options.explicit_colour && has_colour(output))

1 0

Zebediah Figura : vkd3d-compiler: Do not validate the target type when preprocessing.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: vkd3d Branch: master Commit: b40b191498c5755c003d6aa9a5277febf42e720d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b40b191498c5755c003d6aa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 30 11:16:44 2020 -0600 vkd3d-compiler: Do not validate the target type when preprocessing. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index cec2ebb..b79396e 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -483,7 +483,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) if (options->print_target_types) return true; - if (!validate_target_type(options->source_type, options->target_type)) + if (!options->preprocess_only && !validate_target_type(options->source_type, options->target_type)) { fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n", get_target_type_info(options->target_type)->name,

1 0