- Wine-Devel - list.winehq.org

[PATCH 2/4] setupapi: Fix CabinetName passed to SPFILENOTIFY_CABINETINFO handler.
by Vijay Kiran Kamuju July 2, 2020

July 2, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/4] setupapi/tests: Add more tests for SPFILENOTIFY_FILEINCABINET handler.
by Vijay Kiran Kamuju July 2, 2020

July 2, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 4/4] mshtml: Add IMarkupServices::CreateMarkupPointer implementation.
by Jacek Caban July 2, 2020

July 2, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 6 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/range.c | 294 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 22 +++ 4 files changed, 321 insertions(+), 2 deletions(-)

2 1

[PATCH 3/4] mshtml.idl: Add missing MoveUnitBounded to IMarkupPointer2.
by Jacek Caban July 2, 2020

July 2, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtml.idl | 4 ++++ 1 file changed, 4 insertions(+)

2 1

[PATCH 2/4] mshtml: Add IHTMLDocument4::namespaces property implementation.
by Jacek Caban July 2, 2020

July 2, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 25 +++++- dlls/mshtml/mshtml_private.h | 4 + dlls/mshtml/omnavigator.c | 154 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 23 ++++++ 4 files changed, 202 insertions(+), 4 deletions(-)

2 1

[PATCH 1/4] mshtml.idl: Add IHTMLNamespaceCollection declaration.
by Jacek Caban July 2, 2020

July 2, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 5 +++++ include/mshtml.idl | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+)

1 0

[PATCH vkd3d 5/5] vkd3d-compiler: Add a long option to specify the output file.
by Henri Verbeet July 2, 2020

July 2, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 1586b45..da03df2 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -32,6 +32,7 @@ enum { OPTION_HELP = CHAR_MAX + 1, + OPTION_OUTPUT, OPTION_STRIP_DEBUG, OPTION_VERSION, }; @@ -100,7 +101,7 @@ static void print_usage(const char *program_name) "[options...] file\n" "Options:\n" " -h, --help Display this information and exit.\n" - " -o <file> Write the output to <file>.\n" + " -o, --output=<file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" " -- Stop option processing. Any subsequent argument is\n" @@ -153,10 +154,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) static struct option long_options[] = { - {"help", no_argument, NULL, OPTION_HELP}, - {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, - {"version", no_argument, NULL, OPTION_VERSION}, - {NULL, 0, NULL, 0}, + {"help", no_argument, NULL, OPTION_HELP}, + {"output", required_argument, NULL, OPTION_OUTPUT}, + {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {"version", no_argument, NULL, OPTION_VERSION}, + {NULL, 0, NULL, 0}, }; memset(options, 0, sizeof(*options)); @@ -168,6 +170,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) switch (option) { + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; break; -- 2.11.0

2 1

[PATCH vkd3d 4/5] vkd3d-compiler: Add a --version option.
by Henri Verbeet July 2, 2020

July 2, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index e975572..1586b45 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -33,6 +33,7 @@ enum { OPTION_HELP = CHAR_MAX + 1, OPTION_STRIP_DEBUG, + OPTION_VERSION, }; static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) @@ -101,6 +102,7 @@ static void print_usage(const char *program_name) " -h, --help Display this information and exit.\n" " -o <file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" + " -V, --version Display version information and exit.\n" " -- Stop option processing. Any subsequent argument is\n" " interpreted as a filename.\n"; @@ -111,6 +113,7 @@ struct options { const char *filename; const char *output_filename; + bool print_version; struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; @@ -152,6 +155,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) { {"help", no_argument, NULL, OPTION_HELP}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {"version", no_argument, NULL, OPTION_VERSION}, {NULL, 0, NULL, 0}, }; @@ -159,7 +163,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "ho:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "ho:V", long_options, NULL)) == -1) break; switch (option) @@ -172,6 +176,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, 1); break; + case OPTION_VERSION: + case 'V': + options->print_version = true; + return true; + default: return false; } @@ -198,6 +207,12 @@ int main(int argc, char **argv) return 1; } + if (options.print_version) + { + fprintf(stdout, "vkd3d shader compiler version " PACKAGE_VERSION "\n"); + return 0; + } + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; -- 2.11.0

2 1

[PATCH vkd3d 2/5] vkd3d-compiler: Use getopt to parse command-line options.
by Henri Verbeet July 2, 2020

July 2, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 61 ++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 03dc322..8fa4d4f 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -22,12 +22,18 @@ #include <stdlib.h> #include <sys/stat.h> #include <unistd.h> +#include <getopt.h> #include "vkd3d_common.h" #include "vkd3d_shader.h" #define MAX_COMPILE_OPTIONS 1 +enum +{ + OPTION_STRIP_DEBUG = CHAR_MAX + 1, +}; + static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) { struct stat st; @@ -86,23 +92,15 @@ static bool write_shader(const struct vkd3d_shader_code *shader, const char *fil return true; } -static const struct -{ - const char *name; - enum vkd3d_shader_compile_option_name compile_option; -} -compiler_options[] = -{ - {"--strip-debug", VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG}, -}; - static void print_usage(const char *program_name) { static const char usage[] = "[options...] file\n" "Options:\n" " -o <file> Write the output to <file>.\n" - " --strip-debug Strip debug information from the output.\n"; + " --strip-debug Strip debug information from the output.\n" + " -- Stop option processing. Any subsequent argument is\n" + " interpreted as a filename.\n"; fprintf(stderr, "Usage: %s %s", program_name, usage); } @@ -145,36 +143,41 @@ static void add_compile_option(struct options *options, static bool parse_command_line(int argc, char **argv, struct options *options) { - unsigned int i, j; + int option; - if (argc < 2) - return false; + static struct option long_options[] = + { + {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {NULL, 0, NULL, 0}, + }; memset(options, 0, sizeof(*options)); - for (i = 1; i < argc - 1; ++i) + for (;;) { - if (!strcmp(argv[i], "-o")) - { - if (i + 1 >= argc - 1) - return false; - options->output_filename = argv[++i]; - continue; - } + if ((option = getopt_long(argc, argv, "o:", long_options, NULL)) == -1) + break; - for (j = 0; j < ARRAY_SIZE(compiler_options); ++j) + switch (option) { - if (!strcmp(argv[i], compiler_options[j].name)) - { - add_compile_option(options, compiler_options[j].compile_option, 1); + case 'o': + options->output_filename = optarg; + break; + + case OPTION_STRIP_DEBUG: + add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, 1); break; - } + + default: + return false; } - if (j == ARRAY_SIZE(compiler_options)) - return false; } + if (optind >= argc) + return false; + options->filename = argv[argc - 1]; + return true; } -- 2.11.0

2 1

[PATCH vkd3d 1/5] vkd3d-compiler: Print a slightly more elaborate usage message.
by Henri Verbeet July 2, 2020

July 2, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 48ca42a..03dc322 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -98,12 +98,13 @@ compiler_options[] = static void print_usage(const char *program_name) { - unsigned int i; + static const char usage[] = + "[options...] file\n" + "Options:\n" + " -o <file> Write the output to <file>.\n" + " --strip-debug Strip debug information from the output.\n"; - fprintf(stderr, "usage: %s", program_name); - for (i = 0; i < ARRAY_SIZE(compiler_options); ++i) - fprintf(stderr, " [%s]", compiler_options[i].name); - fprintf(stderr, " [-o <out_spirv_filename>] <dxbc_filename>\n"); + fprintf(stderr, "Usage: %s %s", program_name, usage); } struct options -- 2.11.0

2 1