December 2020 - Wine-commits

Alexandre Julliard : makedep: No longer use wine/port.h.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 0b9963ad346927fc7958687fa419c9f8062fdd32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9963ad346927fc7958687f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:25:17 2020 +0100 makedep: No longer use wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 14 -------------- tools/makedep.c | 10 ++++++++-- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index b1354395ca9..9c2eb7277bf 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -165,8 +165,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); * Function definitions (only when using libwine_port) */ -#ifndef NO_LIBWINE_PORT - #ifndef HAVE_GETOPT_LONG_ONLY extern char *optarg; extern int optind; @@ -230,16 +228,4 @@ int symlink(const char *from, const char *to); extern int mkstemps(char *template, int suffix_len); -#else /* NO_LIBWINE_PORT */ - -#define __WINE_NOT_PORTABLE(func) func##_is_not_portable func##_is_not_portable - -#define getopt_long __WINE_NOT_PORTABLE(getopt_long) -#define getopt_long_only __WINE_NOT_PORTABLE(getopt_long_only) -#define lstat __WINE_NOT_PORTABLE(lstat) -#define pread __WINE_NOT_PORTABLE(pread) -#define pwrite __WINE_NOT_PORTABLE(pwrite) - -#endif /* NO_LIBWINE_PORT */ - #endif /* !defined(__WINE_WINE_PORT_H) */ diff --git a/tools/makedep.c b/tools/makedep.c index cee64fd61bf..f769713a8cf 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -19,20 +19,26 @@ */ #include "config.h" -#define NO_LIBWINE_PORT -#include "wine/port.h" #include <assert.h> #include <ctype.h> #include <errno.h> +#include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <stdarg.h> #include <signal.h> #include <string.h> +#include <sys/types.h> +#include <sys/stat.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#if defined(_WIN32) && !defined(__CYGWIN__) +#include <direct.h> +#include <io.h> +#define mkdir(path,mode) mkdir(path) +#endif #include "wine/list.h" struct strarray

1 0

Zebediah Figura : vkd3d-compiler: Do not validate the target type when preprocessing.
by Alexandre Julliard 01 Dec '20

01 Dec '20

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

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

01 Dec '20

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: Default to HLSL as a source format when preprocessing.
by Alexandre Julliard 01 Dec '20

01 Dec '20

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