- Wine-Devel - list.winehq.org

[PATCH 3/8] kernelbase: Close PEB ConsoleHandle in AttachConsole.
by Jacek Caban Aug. 13, 2020

Aug. 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 1 - dlls/kernelbase/console.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 2 deletions(-)

2 1

[PATCH] xactengine3: Reduce code duplication in xact_classes.idl.
by Zebediah Figura Aug. 13, 2020

Aug. 13, 2020

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/xactengine3_7/xact_classes.idl | 42 +++-------------------------- 1 file changed, 3 insertions(+), 39 deletions(-) diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 2ed8d337ac8..40c00f4ff06 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,60 +20,24 @@ #pragma makedep register -#if XACT3_VER == 0x0300 [ - helpstring("XACT3.0 Class"), threading(both), +#if XACT3_VER == 0x0300 uuid(3b80ee2a-b0f5-4780-9e30-90cb39685b03) -] -coclass XACTEngine30 { interface IXACT30Engine; } #elif XACT3_VER == 0x0301 -[ - helpstring("XACT3.1 Class"), - threading(both), uuid(962f5027-99be-4692-a468-85802cf8de61) -] -coclass XACTEngine31 { interface IXACT32Engine; } #elif XACT3_VER == 0x0302 -[ - helpstring("XACT3.2 Class"), - threading(both), uuid(d3332f02-3dd0-4de9-9aec-20d85c4111b6) -] -coclass XACTEngine32 { interface IXACT32Engine; } #elif XACT3_VER == 0x0303 -[ - helpstring("XACT3.3 Class"), - threading(both), uuid(94c1affa-66e7-4961-9521-cfdef3128d4f) -] -coclass XACTEngine33 { interface IXACT37Engine; } #elif XACT3_VER == 0x0304 -[ - helpstring("XACT3.4 Class"), - threading(both), uuid(0977d092-2d95-4e43-8d42-9ddcc2545ed5) -] -coclass XACTEngine34 { interface IXACT37Engine; } #elif XACT3_VER == 0x0305 -[ - helpstring("XACT3.5 Class"), - threading(both), uuid(074b110f-7f58-4743-aea5-12f15b5074ed) -] -coclass XACTEngine35 { interface IXACT37Engine; } #elif XACT3_VER == 0x0306 -[ - helpstring("XACT3.6 Class"), - threading(both), uuid(248d8a3b-6256-44d3-a018-2ac96c459f47) -] -coclass XACTEngine36 { interface IXACT37Engine; } #else /* XACT3_VER == 0x0307 or not defined */ -[ - helpstring("XACT3.7 Class"), - threading(both), uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) -] -coclass XACTEngine37 { interface IXACT37Engine; } #endif +] +coclass XACTEngine {} -- 2.27.0

1 0

[PATCH 2/2] urlmon: Call parse_host in combine_uri to set related parse_data fields.
by Jacek Caban Aug. 13, 2020

Aug. 13, 2020

From: Alex Henrie <alexhenrie24(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49662 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/uri.c | 29 ++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 7 +++---- 2 files changed, 31 insertions(+), 5 deletions(-)

2 1

[PATCH 3/5] include/dxgi1_2.idl: fix order of functions in IDXGIFactory2 interface
by Biswapriyo Nath Aug. 13, 2020

Aug. 13, 2020

2 1

[PATCH 1/5] include/dxgi.idl: fix typo in DXGI_SWAP_CHAIN_FLAG_RESTRICTED_CONTENT member name
by Biswapriyo Nath Aug. 13, 2020

Aug. 13, 2020

2 1

[PATCH] wined3d: Rename wined3d_sm4_immconst_type to wined3d_sm4_dimension.
by Zebediah Figura Aug. 13, 2020

Aug. 13, 2020

From: Zebediah Figura <zfigura(a)codeweavers.com> These bits are used in all register tokens, not just immediate constants. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/shader_sm4.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index db3297e8e99..443cfe7e4bd 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -98,8 +98,8 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_SWIZZLE_TYPE_SHIFT 2 #define WINED3D_SM4_SWIZZLE_TYPE_MASK (0x3u << WINED3D_SM4_SWIZZLE_TYPE_SHIFT) -#define WINED3D_SM4_IMMCONST_TYPE_SHIFT 0 -#define WINED3D_SM4_IMMCONST_TYPE_MASK (0x3u << WINED3D_SM4_IMMCONST_TYPE_SHIFT) +#define WINED3D_SM4_DIMENSION_SHIFT 0 +#define WINED3D_SM4_DIMENSION_MASK (0x3u << WINED3D_SM4_DIMENSION_SHIFT) #define WINED3D_SM4_WRITEMASK_SHIFT 4 #define WINED3D_SM4_WRITEMASK_MASK (0xfu << WINED3D_SM4_WRITEMASK_SHIFT) @@ -397,10 +397,10 @@ enum wined3d_sm4_swizzle_type WINED3D_SM4_SWIZZLE_SCALAR = 0x2, }; -enum wined3d_sm4_immconst_type +enum wined3d_sm4_dimension { - WINED3D_SM4_IMMCONST_SCALAR = 0x1, - WINED3D_SM4_IMMCONST_VEC4 = 0x2, + WINED3D_SM4_DIMENSION_SCALAR = 0x1, + WINED3D_SM4_DIMENSION_VEC4 = 0x2, }; enum wined3d_sm4_resource_type @@ -1487,12 +1487,11 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p if (register_type == WINED3D_SM4_RT_IMMCONST) { - enum wined3d_sm4_immconst_type immconst_type = - (token & WINED3D_SM4_IMMCONST_TYPE_MASK) >> WINED3D_SM4_IMMCONST_TYPE_SHIFT; + enum wined3d_sm4_dimension dimension = (token & WINED3D_SM4_DIMENSION_MASK) >> WINED3D_SM4_DIMENSION_SHIFT; - switch (immconst_type) + switch (dimension) { - case WINED3D_SM4_IMMCONST_SCALAR: + case WINED3D_SM4_DIMENSION_SCALAR: param->immconst_type = WINED3D_IMMCONST_SCALAR; if (end - *ptr < 1) { @@ -1503,7 +1502,7 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p *ptr += 1; break; - case WINED3D_SM4_IMMCONST_VEC4: + case WINED3D_SM4_DIMENSION_VEC4: param->immconst_type = WINED3D_IMMCONST_VEC4; if (end - *ptr < 4) { @@ -1515,7 +1514,7 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p break; default: - FIXME("Unhandled immediate constant type %#x.\n", immconst_type); + FIXME("Unhandled dimension %#x.\n", dimension); break; } } -- 2.28.0

2 1

[PATCH 5/5] include/dxgi1_6.idl: add missing values in DXGI_ADAPTER_FLAG3 enum
by Biswapriyo Nath Aug. 13, 2020

Aug. 13, 2020

1 0

[PATCH 4/5] include/dxgi1_5.idl: add missing values in DXGI_HDR_METADATA_TYPE enum
by Biswapriyo Nath Aug. 13, 2020

Aug. 13, 2020

1 0

[PATCH 2/5] include/dxgi1_2.idl: add missing values in DXGI_SCALING enum
by Biswapriyo Nath Aug. 13, 2020

Aug. 13, 2020

1 0

[PATCH vkd3d 4/5] vkd3d-compiler: Support reading from standard input.
by Henri Verbeet Aug. 13, 2020

Aug. 13, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 100 ++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 27 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 0051277..a6c935c 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -68,44 +68,58 @@ target_type_info[] = " This is the format used for Vulkan shaders.\n"}, }; -static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) +static bool read_shader(struct vkd3d_shader_code *shader, FILE *f) { + size_t size = 4096; struct stat st; - void *code; - FILE *fd; + size_t pos = 0; + uint8_t *data; + size_t ret; memset(shader, 0, sizeof(*shader)); - if (stat(filename, &st) == -1) + if (fstat(fileno(f), &st) == -1) { - fprintf(stderr, "Could not stat file: '%s'.\n", filename); + fprintf(stderr, "Could not stat input.\n"); return false; } - shader->size = st.st_size; - if (!(fd = fopen(filename, "rb"))) + if (S_ISREG(st.st_mode)) + size = st.st_size; + + if (!(data = malloc(size))) { - fprintf(stderr, "Cannot open file for reading: '%s'.\n", filename); + fprintf(stderr, "Out of memory.\n"); return false; } - if (!(code = malloc(shader->size))) + for (;;) { - fprintf(stderr, "Out of memory.\n"); - fclose(fd); - return false; + if (pos >= size) + { + if (size > SIZE_MAX / 2 || !(data = realloc(data, size * 2))) + { + fprintf(stderr, "Out of memory.\n"); + free(data); + return false; + } + size *= 2; + } + + if (!(ret = fread(&data[pos], 1, size - pos, f))) + break; + pos += ret; } - shader->code = code; - if (fread(code, 1, shader->size, fd) != shader->size) + if (!feof(f)) { - fprintf(stderr, "Could not read shader bytecode from file: '%s'.\n", filename); - free(code); - fclose(fd); + free(data); return false; } - fclose(fd); + shader->code = data; + shader->size = pos; + return true; } @@ -117,7 +131,7 @@ static bool write_shader(const struct vkd3d_shader_code *shader, FILE *f) static void print_usage(const char *program_name) { static const char usage[] = - "[options...] file\n" + "[options...] [file]\n" "Options:\n" " -h, --help Display this information and exit.\n" " -b <type> Specify the target type. Currently the only valid value\n" @@ -136,7 +150,10 @@ static void print_usage(const char *program_name) " -x <type> Specify the type of the source. Valid values are\n" " 'dxbc-tpf' and 'none'.\n" " -- Stop option processing. Any subsequent argument is\n" - " interpreted as a filename.\n"; + " interpreted as a filename.\n" + "\n" + "If the input file is '-' or not specified, input will be read from standard\n" + "input.\n"; fprintf(stderr, "Usage: %s %s", program_name, usage); } @@ -312,10 +329,8 @@ static bool parse_command_line(int argc, char **argv, struct options *options) if (options->print_target_types) return true; - if (optind >= argc) - return false; - - options->filename = argv[argc - 1]; + if (optind < argc) + options->filename = argv[argc - 1]; return true; } @@ -370,6 +385,25 @@ static void print_target_types(enum vkd3d_shader_source_type source_type) } } +static FILE *open_input(const char *filename, bool *close) +{ + FILE *f; + + *close = false; + + if (!filename || !strcmp(filename, "-")) + return stdin; + + if (!(f = fopen(filename, "rb"))) + { + fprintf(stderr, "Unable to open '%s' for reading.\n", filename); + return NULL; + } + + *close = true; + return f; +} + static FILE *open_output(const char *filename, bool *close) { FILE *f; @@ -391,12 +425,12 @@ static FILE *open_output(const char *filename, bool *close) int main(int argc, char **argv) { + bool close_input = false, close_output = false; struct vkd3d_shader_compile_info info; struct vkd3d_shader_code spirv; - bool close_output = false; struct options options; + FILE *input, *output; char *messages; - FILE *output; int fail = 1; int ret; @@ -426,6 +460,16 @@ int main(int argc, char **argv) return 0; } + if (!(input = open_input(options.filename, &close_input))) + goto done; + + if (!options.filename && isatty(fileno(input))) + { + fprintf(stderr, "Input is a tty and input format is binary, exiting.\n" + "If this is really what you intended, specify the input explicitly.\n"); + goto done; + } + if (!(output = open_output(options.output_filename, &close_output))) goto done; @@ -445,7 +489,7 @@ int main(int argc, char **argv) info.log_level = VKD3D_SHADER_LOG_INFO; info.source_name = options.filename; - if (!read_shader(&info.source, options.filename)) + if (!read_shader(&info.source, input)) { fprintf(stderr, "Failed to read input shader.\n"); goto done; @@ -474,5 +518,7 @@ int main(int argc, char **argv) done: if (close_output) fclose(output); + if (close_input) + fclose(input); return fail; } -- 2.11.0

2 1