December 2021 - Wine-devel - list.winehq.org

[PATCH v2] darwin: Fix non-Metal build
by Keno Fischer 06 Jan '22

06 Jan '22

The build was relying on QuartzCore definitions even if Metal was not found, so move the appropriate import out of the ifdef and add the QuartzCore framework to the make line. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> --- v2: Drop `-framework QuartzCore` from configure.ac as suggested by Dean Greer <gcenx83(a)gmail.com>. configure | 2 +- configure.ac | 2 +- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/cocoa_window.m | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index d57fc6cf43b..bf65b916b7d 100755 --- a/configure +++ b/configure @@ -10321,7 +10321,7 @@ fi fi if test "$ac_cv_header_Metal_Metal_h" = "yes" then - METAL_LIBS="-framework Metal -framework QuartzCore" + METAL_LIBS="-framework Metal" fi diff --git a/configure.ac b/configure.ac index de79b47ea2a..1a36e98f3e8 100644 --- a/configure.ac +++ b/configure.ac @@ -757,7 +757,7 @@ case $host_os in fi if test "$ac_cv_header_Metal_Metal_h" = "yes" then - AC_SUBST(METAL_LIBS,"-framework Metal -framework QuartzCore") + AC_SUBST(METAL_LIBS,"-framework Metal") fi dnl Check for MTLDevice registryID property diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 6329e8e76c8..fc3dddbdae7 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,7 +1,7 @@ MODULE = winemac.drv IMPORTS = uuid rpcrt4 user32 gdi32 advapi32 win32u DELAYIMPORTS = ole32 shell32 imm32 -EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo $(METAL_LIBS) +EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo -framework QuartzCore $(METAL_LIBS) EXTRADLLFLAGS = -mcygwin diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d0672b7fb06..a18fc069604 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -25,8 +25,8 @@ #import <CoreVideo/CoreVideo.h> #ifdef HAVE_METAL_METAL_H #import <Metal/Metal.h> -#import <QuartzCore/QuartzCore.h> #endif +#import <QuartzCore/QuartzCore.h> #import "cocoa_window.h" -- 2.25.1

7 16

[PATCH 2/2] win32u: Allow selecting 32-bit DDBs into display compatible DCs.
by Zhiyi Zhang 06 Jan '22

06 Jan '22

Device context bit depths other than 32-bit are emulated and the real bit depth for display DCs is still 32-bit. Thus, a 32-bit DDB should be allowed to be selected into a display compatible DC even if the DC reports a different bit depth. Fix a regression from d171d11. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51805 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 2 -- dlls/win32u/bitmap.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index e745fb9c7b3..a857b295849 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2301,7 +2301,6 @@ static void test_display_dc(void) bpp = GetDeviceCaps(mem_dc, BITSPIXEL); ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp); old_hbitmap = SelectObject(mem_dc, hbitmap); - todo_wine ok(!!old_hbitmap, "Failed to select bitmap.\n"); bpp = GetDeviceCaps(mem_dc, BITSPIXEL); ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp); @@ -2329,7 +2328,6 @@ static void test_display_dc(void) ok(!old_hbitmap || broken(!!old_hbitmap) /* Win7 dual-QXL test bot and XP */, "Selecting bitmap succeeded.\n"); else - todo_wine_if(bpps[i] == 32) ok(!!old_hbitmap || broken(!old_hbitmap) /* Win7 dual-QXL test bot and XP */, "Failed to select bitmap.\n"); diff --git a/dlls/win32u/bitmap.c b/dlls/win32u/bitmap.c index 00c8b347af5..2be88715948 100644 --- a/dlls/win32u/bitmap.c +++ b/dlls/win32u/bitmap.c @@ -401,7 +401,9 @@ HGDIOBJ WINAPI NtGdiSelectBitmap( HDC hdc, HGDIOBJ handle ) if (!is_bitmapobj_dib( bitmap ) && bitmap->dib.dsBm.bmBitsPixel != 1 && - bitmap->dib.dsBm.bmBitsPixel != NtGdiGetDeviceCaps( hdc, BITSPIXEL )) + bitmap->dib.dsBm.bmBitsPixel != NtGdiGetDeviceCaps( hdc, BITSPIXEL ) && + /* Display compatible DCs should accept 32-bit DDBs because other color depths are emulated */ + !(NtGdiGetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASDISPLAY && bitmap->dib.dsBm.bmBitsPixel == 32)) { WARN( "Wrong format bitmap %u bpp\n", bitmap->dib.dsBm.bmBitsPixel ); GDI_ReleaseObj( handle ); -- 2.32.0

2 1

[PATCH 1/2] user32/tests: Test selecting DDBs of different depth into display compatible DCs.
by Zhiyi Zhang 06 Jan '22

06 Jan '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 110 +++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index bd348576726..e745fb9c7b3 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2180,13 +2180,17 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ static void test_display_dc(void) { + static const INT bpps[] = {1, 4, 8, 16, 24, 32}; + HBITMAP hbitmap, old_hbitmap; + INT count, old_count, i, bpp; DWORD device_idx, mode_idx; DEVMODEA dm, dm2, dm3; - INT count, old_count; DISPLAY_DEVICEA dd; + HDC hdc, mem_dc; + DIBSECTION dib; + BITMAP bitmap; BOOL ret; LONG res; - HDC hdc; /* Test DCs covering the entire virtual screen */ hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); @@ -2199,6 +2203,51 @@ static void test_display_dc(void) check_display_dc(hdc, &dm, FALSE); + /* Test that CreateCompatibleBitmap() for display DCs creates DDBs */ + hbitmap = CreateCompatibleBitmap(hdc, dm.dmPelsWidth, dm.dmPelsHeight); + ok(!!hbitmap, "CreateCompatibleBitmap failed, error %d.\n", GetLastError()); + count = GetObjectW(hbitmap, sizeof(dib), &dib); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + count = GetObjectW(hbitmap, sizeof(bitmap), &bitmap); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + ok(bitmap.bmBitsPixel == dm.dmBitsPerPel, "Expected %d, got %d.\n", dm.dmBitsPerPel, + bitmap.bmBitsPixel); + DeleteObject(hbitmap); + + /* Test selecting a DDB of a different depth into a display compatible DC */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + mem_dc = CreateCompatibleDC(hdc); + hbitmap = CreateBitmap(dm.dmPelsWidth, dm.dmPelsHeight, 1, bpps[i], NULL); + ok(!!hbitmap, "CreateBitmap failed, error %d.\n", GetLastError()); + old_hbitmap = SelectObject(mem_dc, hbitmap); + if (bpps[i] != 1 && bpps[i] != 32) + ok(!old_hbitmap, "Selecting bitmap succeeded.\n"); + else + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + + SelectObject(mem_dc, old_hbitmap); + DeleteObject(hbitmap); + DeleteDC(mem_dc); + + winetest_pop_context(); + } + + /* Test selecting a DDB of the same color depth into a display compatible DC */ + mem_dc = CreateCompatibleDC(hdc); + bpp = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(bpp == dm.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm.dmBitsPerPel, bpp); + hbitmap = CreateCompatibleBitmap(hdc, dm.dmPelsWidth, dm.dmPelsHeight); + count = GetObjectW(hbitmap, sizeof(bitmap), &bitmap); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + ok(bitmap.bmBitsPixel == dm.dmBitsPerPel, "Expected %d, got %d.\n", dm.dmBitsPerPel, bitmap.bmBitsPixel); + old_hbitmap = SelectObject(mem_dc, hbitmap); + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + SelectObject(mem_dc, old_hbitmap); + DeleteDC(mem_dc); + /* Tests after mode changes to a different resolution */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); @@ -2226,7 +2275,7 @@ static void test_display_dc(void) dm2.dmSize = sizeof(dm2); for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) { - if (dm2.dmBitsPerPel != dm.dmBitsPerPel) + if (dm2.dmBitsPerPel != dm.dmBitsPerPel && dm2.dmBitsPerPel != 1) break; } if (dm2.dmBitsPerPel && dm2.dmBitsPerPel != dm.dmBitsPerPel) @@ -2239,6 +2288,59 @@ static void test_display_dc(void) { check_display_dc(hdc, &dm2, FALSE); + /* Test selecting a compatible bitmap of a different color depth previously created for + * a display DC into a new compatible DC */ + count = GetObjectW(hbitmap, sizeof(bitmap), &bitmap); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + ok(bitmap.bmBitsPixel == dm.dmBitsPerPel, "Expected %d, got %d.\n", dm.dmBitsPerPel, + bitmap.bmBitsPixel); + + /* Note that hbitmap is of a different color depth and it can be successfully selected + * into the new compatible DC */ + mem_dc = CreateCompatibleDC(hdc); + bpp = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp); + old_hbitmap = SelectObject(mem_dc, hbitmap); + todo_wine + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + bpp = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp); + SelectObject(mem_dc, old_hbitmap); + DeleteDC(mem_dc); + DeleteObject(hbitmap); + + /* Test selecting a DDB of a different color depth into a display compatible DC */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + mem_dc = CreateCompatibleDC(hdc); + hbitmap = CreateBitmap(dm2.dmPelsWidth, dm2.dmPelsHeight, 1, bpps[i], NULL); + ok(!!hbitmap, "CreateBitmap failed, error %d.\n", GetLastError()); + old_hbitmap = SelectObject(mem_dc, hbitmap); + /* On Win7 dual-QXL test bot and XP, only 1-bit DDBs and DDBs with the same color + * depth can be selected to the compatible DC. On newer versions of Windows, only + * 1-bit and 32-bit DDBs can be selected into the compatible DC even if + * GetDeviceCaps(BITSPIXEL) reports a different color depth, for example, 16-bit. + * It's most likely due to the fact that lower color depth are emulated on newer + * versions of Windows as the real color depth is still 32-bit */ + if (bpps[i] != 1 && bpps[i] != 32) + todo_wine_if(bpps[i] == dm2.dmBitsPerPel) + ok(!old_hbitmap || broken(!!old_hbitmap) /* Win7 dual-QXL test bot and XP */, + "Selecting bitmap succeeded.\n"); + else + todo_wine_if(bpps[i] == 32) + ok(!!old_hbitmap || broken(!old_hbitmap) /* Win7 dual-QXL test bot and XP */, + "Failed to select bitmap.\n"); + + SelectObject(mem_dc, old_hbitmap); + DeleteObject(hbitmap); + DeleteDC(mem_dc); + + winetest_pop_context(); + } + hbitmap = NULL; + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); } @@ -2248,6 +2350,8 @@ static void test_display_dc(void) win_skip("Failed to find a different color depth other than %u.\n", dm.dmBitsPerPel); } + if (hbitmap) + DeleteObject(hbitmap); DeleteDC(hdc); /* Test DCs covering a specific monitor */ -- 2.32.0

2 1

[PATCH vkd3d v3 1/3] vkd3d-compiler: Print usage instructions only if --help is specified.
by Zebediah Figura 06 Jan '22

06 Jan '22

vkd3d-compiler is hardly the only program to print usage instructions on all invalid invocations, but it's rather annoying to have one's whole screen wiped due to a typo. It also makes it hard to notice the actual error messages printed on e.g. `vkd3d-compiler -x`. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4d7d628ca..4e56e8fa5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -209,6 +209,7 @@ struct options enum vkd3d_shader_source_type source_type; enum vkd3d_shader_target_type target_type; bool preprocess_only; + bool print_help; bool print_version; bool print_source_types; bool print_target_types; @@ -446,6 +447,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->preprocess_only = true; break; + case 'h': + case OPTION_HELP: + options->print_help = true; + return true; + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; @@ -623,9 +629,12 @@ int main(int argc, char **argv) int ret; if (!parse_command_line(argc, argv, &options)) + return 1; + + if (options.print_help) { print_usage(argv[0]); - return 1; + return 0; } if (options.print_version) -- 2.34.1

5 13

[PATCH vkd3d v3 05/12] vkd3d-shader/hlsl: Add Gather methods with offset and tests.
by Francisco Casas 06 Jan '22

06 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 4 + libs/vkd3d-shader/hlsl.c | 4 + libs/vkd3d-shader/hlsl.h | 4 + libs/vkd3d-shader/hlsl.y | 109 +++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_sm4.c | 67 ++++++++++++++++ tests/hlsl-gather-offset.shader_test | 93 +++++++++++++++++++++++ tests/hlsl-gather.shader_test | 107 ++++++++++++++++++++++++++ 7 files changed, 388 insertions(+) create mode 100644 tests/hlsl-gather-offset.shader_test create mode 100644 tests/hlsl-gather.shader_test diff --git a/Makefile.am b/Makefile.am index 16848f5a..749df363 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,8 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-gather-offset.shader_test \ + tests/hlsl-gather.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -294,6 +296,8 @@ XFAIL_TESTS = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-gather-offset.shader_test \ + tests/hlsl-gather.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-nested-arrays.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index b426e461..82820daf 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1277,6 +1277,10 @@ static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const stru { [HLSL_RESOURCE_LOAD] = "load_resource", [HLSL_RESOURCE_SAMPLE] = "sample", + [HLSL_RESOURCE_GATHER_RED] = "gather4r", + [HLSL_RESOURCE_GATHER_GREEN] = "gather4g", + [HLSL_RESOURCE_GATHER_BLUE] = "gather4b", + [HLSL_RESOURCE_GATHER_ALPHA] = "gather4a", }; vkd3d_string_buffer_printf(buffer, "%s(resource = ", type_names[load->load_type]); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 2396adb4..49fa8d9d 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -378,6 +378,10 @@ enum hlsl_resource_load_type { HLSL_RESOURCE_LOAD, HLSL_RESOURCE_SAMPLE, + HLSL_RESOURCE_GATHER_RED, + HLSL_RESOURCE_GATHER_GREEN, + HLSL_RESOURCE_GATHER_BLUE, + HLSL_RESOURCE_GATHER_ALPHA, }; struct hlsl_ir_resource_load diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 33bfee5b..9aa0138d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1930,6 +1930,115 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl list_add_tail(instrs, &load->node.entry); return true; } + else if (!strcmp(name, "Gather") || !strcmp(name, "GatherRed") || !strcmp(name, "GatherBlue") + || !strcmp(name, "GatherGreen") || !strcmp(name, "GatherAlpha")) + { + const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); + enum hlsl_resource_load_type load_type; + const struct hlsl_type *sampler_type; + struct hlsl_ir_resource_load *load; + struct hlsl_ir_node *offset = NULL; + struct hlsl_ir_load *sampler_load; + struct hlsl_type *result_type; + struct hlsl_ir_node *coords; + int status_out_arg; + int read_channel; + + if (!strcmp(name, "Gather") || !strcmp(name, "GatherRed")) + { + load_type = HLSL_RESOURCE_GATHER_RED; + read_channel = 0; + } + else if (!strcmp(name, "GatherGreen")) + { + load_type = HLSL_RESOURCE_GATHER_GREEN; + read_channel = 1; + } + else if (!strcmp(name, "GatherBlue")) + { + load_type = HLSL_RESOURCE_GATHER_BLUE; + read_channel = 2; + } + else if (!strcmp(name, "GatherAlpha")) + { + load_type = HLSL_RESOURCE_GATHER_ALPHA; + read_channel = 3; + } + else { + assert(!"Unexpected Gather method."); + } + + + if (!strcmp(name, "Gather")) + { + if (params->args_count != 2 && params->args_count != 3) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Wrong number of arguments to method 'Gather': expected 2 or 3, but got %u.", params->args_count); + return false; + } + } + else if (params->args_count < 2 || params->args_count == 5 || params->args_count > 7) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Wrong number of arguments to method '%s': expected 2,3,4,6 or 7, but got %u.", name, params->args_count); + return false; + } + + status_out_arg = -1; + if (params->args_count == 4) + status_out_arg = 3; + if (params->args_count == 7) + status_out_arg = 6; + if (status_out_arg != -1) + FIXME("Ignoring 'status' output parameter.\n"); + + if (params->args_count == 6 || params->args_count == 7) + FIXME("Ignoring multiple offset parameters.\n"); + + if (params->args_count == 3 || params->args_count == 4) + { + if (!(offset = add_implicit_conversion(ctx, instrs, params->args[2], + hlsl_get_vector_type(ctx, HLSL_TYPE_INT, sampler_dim), loc))) + offset = params->args[2]; + } + + sampler_type = params->args[0]->data_type; + if (sampler_type->type != HLSL_CLASS_OBJECT || sampler_type->base_type != HLSL_TYPE_SAMPLER + || sampler_type->sampler_dim != HLSL_SAMPLER_DIM_GENERIC) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, sampler_type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Wrong type for argument 0 of %s(): expected 'sampler', but got '%s'.", name, string->buffer); + hlsl_release_string_buffer(ctx, string); + return false; + } + + if (read_channel >= object_type->e.resource_format->dimx) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Method %s() requires at least %d channels.", name, read_channel+1); + return false; + } + + result_type = hlsl_get_vector_type(ctx, object_type->e.resource_format->base_type, 4); + + /* Only HLSL_IR_LOAD can return an object. */ + sampler_load = hlsl_ir_load(params->args[0]); + + if (!(coords = add_implicit_conversion(ctx, instrs, params->args[1], + hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, sampler_dim), loc))) + coords = params->args[1]; + + if (!(load = hlsl_new_resource_load(ctx, result_type, + load_type, object_load->src.var, object_load->src.offset.node, + sampler_load->src.var, sampler_load->src.offset.node, coords, offset, loc))) + return false; + list_add_tail(instrs, &load->node.entry); + return true; + } else { struct vkd3d_string_buffer *string; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 11e1f59a..be35d125 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1654,6 +1654,56 @@ static void write_sm4_loop(struct hlsl_ctx *ctx, write_sm4_instruction(buffer, &instr); } + +static void write_sm4_gather(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, + const struct hlsl_deref *resource, const struct hlsl_deref *sampler, const struct hlsl_ir_node *coords, + unsigned int swizzle, const struct hlsl_ir_node *texel_offset) +{ + struct sm4_instruction instr; + unsigned int writemask; + int n_srcs = 0; + + memset(&instr, 0, sizeof(instr)); + + /* TODO: possible optimization, if the offset ranges from -8 to 7, an VKD3D_SM4_OP_GATHER4 with + an aoffimmi modifier can be used. */ + instr.opcode = texel_offset? VKD3D_SM5_OP_GATHER4_PO : VKD3D_SM4_OP_GATHER4; + + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); + instr.dst_count = 1; + + sm4_register_from_node(&instr.srcs[n_srcs].reg, &writemask, &instr.srcs[n_srcs].swizzle_type, coords); + instr.srcs[n_srcs].swizzle = hlsl_swizzle_from_writemask(writemask); + n_srcs++; + + if (texel_offset) + { + sm4_register_from_node(&instr.srcs[n_srcs].reg, &writemask, &instr.srcs[n_srcs].swizzle_type, texel_offset); + instr.srcs[n_srcs].swizzle = hlsl_swizzle_from_writemask(writemask); + + n_srcs++; + } + + sm4_register_from_deref(ctx, &instr.srcs[n_srcs].reg, &writemask, &instr.srcs[n_srcs].swizzle_type, + resource, resource_type); + instr.srcs[n_srcs].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); + n_srcs++; + + sm4_register_from_deref(ctx, &instr.srcs[n_srcs].reg, &writemask, NULL, + sampler, sampler->var->data_type); + instr.srcs[n_srcs].reg.type = VKD3D_SM4_RT_SAMPLER; + instr.srcs[n_srcs].reg.dim = VKD3D_SM4_DIMENSION_VEC4; + instr.srcs[n_srcs].swizzle_type = VKD3D_SM4_SWIZZLE_SCALAR; + instr.srcs[n_srcs].swizzle = swizzle; + n_srcs++; + + instr.src_count = n_srcs; + + write_sm4_instruction(buffer, &instr); +} + + static void write_sm4_resource_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_resource_load *load) { @@ -1694,6 +1744,23 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, write_sm4_sample(ctx, buffer, resource_type, &load->node, &load->resource, &load->sampler, coords, texel_offset); break; + + case HLSL_RESOURCE_GATHER_RED: + write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, + &load->sampler, coords, HLSL_SWIZZLE(X, X, X, X), texel_offset); + break; + case HLSL_RESOURCE_GATHER_GREEN: + write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, + &load->sampler, coords, HLSL_SWIZZLE(Y, Y, Y, Y), texel_offset); + break; + case HLSL_RESOURCE_GATHER_BLUE: + write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, + &load->sampler, coords, HLSL_SWIZZLE(Z, Z, Z, Z), texel_offset); + break; + case HLSL_RESOURCE_GATHER_ALPHA: + write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, + &load->sampler, coords, HLSL_SWIZZLE(W, W, W, W), texel_offset); + break; } } diff --git a/tests/hlsl-gather-offset.shader_test b/tests/hlsl-gather-offset.shader_test new file mode 100644 index 00000000..d7e1a233 --- /dev/null +++ b/tests/hlsl-gather-offset.shader_test @@ -0,0 +1,93 @@ +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[texture 0] +size (3, 3) +0.0 0.0 0.0 0.4 0.1 0.0 0.5 0.0 0.2 0.0 0.0 0.4 +0.0 0.1 0.5 0.0 0.1 0.1 0.0 0.4 0.2 0.1 0.5 0.0 +0.0 0.2 0.0 0.4 0.1 0.2 0.5 0.0 0.2 0.2 0.0 0.4 + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Gather(s, float2(0.2, 0.2), int2(1, 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.2, 0.1) + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherRed(s, float2(0.6, 0.6), int2(-1, 0)); +} + +[test] +draw quad +probe all rgba (0.0, 0.1, 0.1, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.2, 0.2), int2(0, 1)); +} + +[test] +draw quad +probe all rgba (0.2, 0.2, 0.1, 0.1) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.8, 0.8), int2(-1, -1)); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.0, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherBlue(s, float2(0.2, 0.8), int2(1, 0)); +} + +[test] +draw quad +probe all rgba (0.5, 0.0, 0.5, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherAlpha(s, float2(0.2, 0.8), int2(0, -1)); +} + +[test] +draw quad +probe all rgba (0.0, 0.4, 0.0, 0.4) diff --git a/tests/hlsl-gather.shader_test b/tests/hlsl-gather.shader_test new file mode 100644 index 00000000..2682c6ef --- /dev/null +++ b/tests/hlsl-gather.shader_test @@ -0,0 +1,107 @@ +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[texture 0] +size (3, 3) +0.0 0.0 0.0 0.4 0.1 0.0 0.5 0.0 0.2 0.0 0.0 0.4 +0.0 0.1 0.5 0.0 0.1 0.1 0.0 0.4 0.2 0.1 0.5 0.0 +0.0 0.2 0.0 0.4 0.1 0.2 0.5 0.0 0.2 0.2 0.0 0.4 + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Gather(s, float2(0.2, 0.2)); +} + +[test] +draw quad +probe all rgba (0.0, 0.1, 0.1, 0.0) + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherRed(s, float2(0.6, 0.6), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.2, 0.1) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.2, 0.2), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.0, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.8, 0.8)); +} + +[test] +draw quad +probe all rgba (0.2, 0.2, 0.1, 0.1) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.2, 0.2), int2(0, 0), int2(0, 0), int2(0, 0), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.0, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherBlue(s, float2(0.2, 0.8), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.0, 0.5, 0.0, 0.5) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherAlpha(s, float2(0.2, 0.8), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.4, 0.0, 0.4, 0.0) -- 2.25.1

3 4

[PATCH vkd3d] vkd3d-shader/hlsl: Support array initializers.
by Francisco Casas 05 Jan '22

05 Jan '22

The new function initialize_var_recursive() "pops" arguments from the parse_variable_def initializer to initialize the members of var for both struct and array initialization recursively. initializer_i is used to keep track of the index of the next input parameter to read. This approach should scale well for nested arrays and structs. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- The new definition of free_parse_variable_def() is unorthodox, but I think it helps illustrate how the parse_variable_def memory should be free on the different scenarios. The exercise of writting it this way allowed to find a memory leak. Ignoring inner braces on initializers is still pending, this could be achieved through a flattening method or at the parser level. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 4 + libs/vkd3d-shader/hlsl.y | 207 +++++++++--------- .../hlsl-array-initializer-local.shader_test | 21 ++ .../hlsl-array-initializer-static.shader_test | 21 ++ 4 files changed, 155 insertions(+), 98 deletions(-) create mode 100644 tests/hlsl-array-initializer-local.shader_test create mode 100644 tests/hlsl-array-initializer-static.shader_test diff --git a/Makefile.am b/Makefile.am index 20fee06d..91e396ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,6 +61,8 @@ vkd3d_shader_tests = \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-array-initializer-local.shader_test \ + tests/hlsl-array-initializer-static.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ @@ -289,6 +291,8 @@ XFAIL_TESTS = \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-array-initializer-local.shader_test \ + tests/hlsl-array-initializer-static.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 636882c4..52c32878 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -904,7 +904,8 @@ static bool expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hlsl_base_type t2) { - if (t1 > HLSL_TYPE_LAST_SCALAR || t2 > HLSL_TYPE_LAST_SCALAR) { + if (t1 > HLSL_TYPE_LAST_SCALAR || t2 > HLSL_TYPE_LAST_SCALAR) + { FIXME("Unexpected base type.\n"); return HLSL_TYPE_FLOAT; } @@ -1278,71 +1279,113 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem return true; } -static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, - struct parse_initializer *initializer) +static void initialize_var_recursive(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, unsigned int reg_offset, + struct hlsl_type *type, struct parse_variable_def *v, unsigned int *initializer_i, struct list *instrs) { - struct hlsl_type *type = var->data_type; - struct hlsl_struct_field *field; - unsigned int i = 0; - - if (initializer_size(initializer) != hlsl_type_component_count(type)) + if (type->type <= HLSL_CLASS_LAST_NUMERIC) { - hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", - hlsl_type_component_count(type), initializer_size(initializer)); - free_parse_initializer(initializer); - return; - } + unsigned int writemask_offset = 0; + unsigned int components_read = 0; - list_move_tail(list, initializer->instrs); - vkd3d_free(initializer->instrs); + if (type->type == HLSL_CLASS_MATRIX) + hlsl_fixme(ctx, &var->loc, "Matrix initializer\n"); - LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) - { - struct hlsl_ir_node *node = initializer->args[i]; - struct hlsl_ir_store *store; - struct hlsl_ir_constant *c; + while (components_read < hlsl_type_component_count(type)) + { + struct hlsl_ir_store *store; + struct hlsl_ir_constant *c; + struct hlsl_ir_node *node; + unsigned int width; - if (i++ >= initializer->args_count) - break; + assert(*initializer_i < v->initializer.args_count); + node = v->initializer.args[*initializer_i]; + *initializer_i += 1; - if (hlsl_type_component_count(field->type) == hlsl_type_component_count(node->data_type)) - { - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, node->loc))) - break; - list_add_tail(list, &c->node.entry); + width = hlsl_type_component_count(node->data_type); + components_read += width; - if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc))) - break; - list_add_tail(list, &store->node.entry); + if (components_read > hlsl_type_component_count(type)) + { + hlsl_error(ctx, &node->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Initializer argument has spare components.\n"); + return; + } + + if (!(node = add_implicit_conversion(ctx, instrs, node, + hlsl_get_vector_type(ctx, type->base_type, width), &node->loc))) + return; + + if (!(c = hlsl_new_uint_constant(ctx, reg_offset, node->loc))) + return; + list_add_tail(instrs, &c->node.entry); + + if (!(store = hlsl_new_store(ctx, var, &c->node, node, + ((1u << width) - 1) << writemask_offset, node->loc))) + return; + list_add_tail(instrs, &store->node.entry); + + writemask_offset += width; } - else + } + else if (type->type == HLSL_CLASS_STRUCT) + { + struct hlsl_struct_field *field; + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) { - hlsl_fixme(ctx, &node->loc, "Implicit cast in structure initializer."); + initialize_var_recursive(ctx, var, reg_offset + field->reg_offset, field->type, v, + initializer_i, instrs); } + return; } + else if (type->type == HLSL_CLASS_ARRAY) + { + for (int i = 0; i < type->e.array.elements_count; i++) + { + struct hlsl_type *elem_type = type->e.array.type; + unsigned int elem_offset = i * elem_type->reg_size; - vkd3d_free(initializer->args); + initialize_var_recursive(ctx, var, reg_offset + elem_offset, elem_type, v, + initializer_i, instrs); + } + return; + } + else if (type->type == HLSL_CLASS_OBJECT) + { + hlsl_fixme(ctx, &var->loc, "Initializers for objects not supported yet.\n"); + return; + } } -static void free_parse_variable_def(struct parse_variable_def *v) +static void free_parse_variable_def(struct parse_variable_def *v, int freeness) { - free_parse_initializer(&v->initializer); - vkd3d_free(v->arrays.sizes); - vkd3d_free(v->name); - vkd3d_free((void *)v->semantic.name); - vkd3d_free(v); + /* 0 : If v's names and instructions were passed to another struct. */ + /* 1 : If only v's names were passed to another struct. */ + /* 2 : If v still retains the ownership of all its members. */ + if (freeness == 0) + { + vkd3d_free(v->initializer.args); + vkd3d_free(v->initializer.instrs); + } + if (freeness == 1) + { + free_parse_initializer(&v->initializer); + } + if (freeness == 2) + { + free_parse_initializer(&v->initializer); + vkd3d_free(v->name); + vkd3d_free((void *)v->semantic.name); + } + vkd3d_free(v->arrays.sizes); + vkd3d_free(v); } static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) { struct parse_variable_def *v, *v_next; - struct hlsl_ir_function_decl *func; struct list *statements_list; - struct hlsl_ir_var *var; - struct hlsl_type *type; - bool local = true; if (basic_type->type == HLSL_CLASS_MATRIX) assert(basic_type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); @@ -1350,7 +1393,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (!(statements_list = make_empty_list(ctx))) { LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) - free_parse_variable_def(v); + free_parse_variable_def(v,2); vkd3d_free(var_list); return NULL; } @@ -1360,9 +1403,12 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) { + struct hlsl_type *type = basic_type; + struct hlsl_ir_function_decl *func; + struct hlsl_ir_var *var; + bool local = true; unsigned int i; - type = basic_type; for (i = 0; i < v->arrays.count; ++i) type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]); @@ -1371,7 +1417,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (!(var = hlsl_new_var(ctx, v->name, type, v->loc, &v->semantic, modifiers, &v->reg_reservation))) { - free_parse_variable_def(v); + free_parse_variable_def(v,2); continue; } @@ -1424,7 +1470,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); hlsl_free_var(var); - vkd3d_free(v); + free_parse_variable_def(v,1); continue; } @@ -1436,78 +1482,43 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t "Variable \"%s\" was already declared in this scope.", var->name); hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); hlsl_free_var(var); - vkd3d_free(v); + free_parse_variable_def(v,1); continue; } if (v->initializer.args_count) { unsigned int size = initializer_size(&v->initializer); - struct hlsl_ir_load *load; - if (type->type <= HLSL_CLASS_LAST_NUMERIC - && type->dimx * type->dimy != size && size != 1) - { - if (size < type->dimx * type->dimy) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - } - if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) - && hlsl_type_component_count(type) != size) + if (hlsl_type_component_count(type) != size && (size != 1 || type->type > HLSL_CLASS_LAST_NUMERIC)) { hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); + free_parse_variable_def(v,1); continue; } - if (type->type == HLSL_CLASS_STRUCT) + if(var->data_type->type <= HLSL_CLASS_LAST_NUMERIC) { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; - } - if (type->type > HLSL_CLASS_LAST_NUMERIC) - { - FIXME("Initializers for non scalar/struct variables not supported yet.\n"); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - if (v->arrays.count) - { - hlsl_fixme(ctx, &v->loc, "Array initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; + struct hlsl_ir_load *load; + + load = hlsl_new_var_load(ctx, var, var->loc); + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); } - if (v->initializer.args_count > 1) + else { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - - load = hlsl_new_var_load(ctx, var, var->loc); - list_add_tail(v->initializer.instrs, &load->node.entry); - add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); - vkd3d_free(v->initializer.args); + unsigned int initializer_i = 0; + initialize_var_recursive(ctx, var, 0, var->data_type, v, &initializer_i, v->initializer.instrs); + } if (modifiers & HLSL_STORAGE_STATIC) list_move_tail(&ctx->static_initializers, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); - vkd3d_free(v->initializer.instrs); } - vkd3d_free(v); + + free_parse_variable_def(v,0); } vkd3d_free(var_list); return statements_list; diff --git a/tests/hlsl-array-initializer-local.shader_test b/tests/hlsl-array-initializer-local.shader_test new file mode 100644 index 00000000..e9310b98 --- /dev/null +++ b/tests/hlsl-array-initializer-local.shader_test @@ -0,0 +1,21 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + float4 array_loc[2][4] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34, + 41, 42, 43, 44, + 51, 52, 53, 54, + 61, 62, 63, 64, + 71, 72, 73, 74, + 81, 82, 83, 84, + }; + + return array_loc[1][2]; +} + +[test] +draw quad +probe all rgba (71, 72, 73, 74) + diff --git a/tests/hlsl-array-initializer-static.shader_test b/tests/hlsl-array-initializer-static.shader_test new file mode 100644 index 00000000..f103dd9a --- /dev/null +++ b/tests/hlsl-array-initializer-static.shader_test @@ -0,0 +1,21 @@ +[pixel shader] +static const float4 array_st[4][2] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34, + 41, 42, 43, 44, + 51, 52, 53, 54, + 61, 62, 63, 64, + 71, 72, 73, 74, + 81, 82, 83, 84, +}; + +float4 main() : SV_TARGET +{ + return array_st[2][1]; +} + +[test] +draw quad +probe all rgba (61, 62, 63, 64) + -- 2.25.1

3 4

[PATCH 1/4] winemenubuilder: Reuse buffer in wchars_to_xml_text (Coverity)
by Alex Henrie 04 Jan '22

04 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/winemenubuilder/winemenubuilder.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 16dc32a8859..620086f9776 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -319,7 +319,9 @@ static char *wchars_to_xml_text(const WCHAR *string) { int i, pos; char *text = wchars_to_utf8_chars( string ); - char *ret = xmalloc( 6 * strlen(text) + 1 ); + static char *ret; + + ret = xrealloc( ret, 6 * strlen(text) + 1 ); for (i = pos = 0; text[i]; i++) { -- 2.34.1

3 6

[PATCH] d2d: Suppress last empty segment also for D2D1_FIGURE_END_OPEN
by Stefan Brüns 04 Jan '22

04 Jan '22

When the last vertex is coincident with the first vertex, the last segment should be suppressed for both END_OPEN and END_CLOSED. When the last, zero length segment is not omitted d2d_geometry_intersect_self will add invalid segments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51139 Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- dlls/d2d1/geometry.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a7074899fda..95aaf199ad2 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2917,8 +2917,9 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_EndFigure(ID2D1GeometrySink *ifa { ++geometry->u.path.segment_count; figure->flags |= D2D_FIGURE_FLAG_CLOSED; - if (!memcmp(&figure->vertices[0], &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) - --figure->vertex_count; + } + if (!memcmp(&figure->vertices[0], &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) { + --figure->vertex_count; } if (!d2d_geometry_add_figure_outline(geometry, figure, figure_end)) -- 2.34.1

3 6

[PATCH] wmphoto: Fix memory leak on error path in wmp_decoder_create (Coverity)
by Alex Henrie 03 Jan '22

03 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wmphoto/jxrlib.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wmphoto/jxrlib.c b/dlls/wmphoto/jxrlib.c index 757312b5f0f..3d7dedb869d 100644 --- a/dlls/wmphoto/jxrlib.c +++ b/dlls/wmphoto/jxrlib.c @@ -358,7 +358,10 @@ HRESULT CDECL wmp_decoder_create(struct decoder_info *info, struct decoder **res if (PKImageDecode_Create_WMP(&decoder)) return E_FAIL; This = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*This)); if (!This) + { + decoder->Release(&decoder); return E_OUTOFMEMORY; + } This->decoder_iface.vtable = &wmp_decoder_vtable; This->WMPStream_iface.Close = &wmp_stream_Close; -- 2.34.1

2 1

[PATCH] include: Fix the definition of D3D_PRIMITIVE enum members.
by Zebediah Figura 03 Jan '22

03 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/d3dcommon.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 05577d34daf..7a53a84079d 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -319,7 +319,7 @@ typedef enum D3D_PRIMITIVE D3D_PRIMITIVE_17_CONTROL_POINT_PATCH, D3D_PRIMITIVE_18_CONTROL_POINT_PATCH, D3D_PRIMITIVE_19_CONTROL_POINT_PATCH, - D3D_PRIMITIVE_20_CONTROL_POINT_PATCH = 28, + D3D_PRIMITIVE_20_CONTROL_POINT_PATCH, D3D_PRIMITIVE_21_CONTROL_POINT_PATCH, D3D_PRIMITIVE_22_CONTROL_POINT_PATCH, D3D_PRIMITIVE_23_CONTROL_POINT_PATCH, @@ -363,7 +363,7 @@ typedef enum D3D_PRIMITIVE D3D11_PRIMITIVE_17_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_18_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_19_CONTROL_POINT_PATCH, - D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH = 28, + D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_21_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_22_CONTROL_POINT_PATCH, D3D11_PRIMITIVE_23_CONTROL_POINT_PATCH, -- 2.34.1

2 1