- Wine-Devel - list.winehq.org

[PATCH v2] wined3d: Fix the odd line condition in gen_yv12_read().
by Anton Baskanov Aug. 31, 2021

Aug. 31, 2021

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- The original condition is true for every other line, which is incorrect since the chroma has only half the resolution. Fixes comb artifacts around color transitions. v2: Added a comment. --- dlls/wined3d/glsl_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ae90148dc8..fb809052d83 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12621,8 +12621,10 @@ static void gen_yv12_read(struct wined3d_string_buffer *buffer, * Don't forget to clamp the y values in into the range, otherwise we'll * get filtering bleeding. */ - /* Read odd lines from the right side (add 0.5 to the x coordinate). */ - shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.5 + 1.0 / 6.0) >= 0.5)\n"); + /* Read odd lines from the right side (add 0.5 to the x coordinate). Keep + * in mind that each line of the chroma plane corresponds to 2 lines of the + * resulting image. */ + shader_addline(buffer, " if (fract(texcoord.y * size.y * 0.25) >= 0.5)\n"); shader_addline(buffer, " texcoord.x += 0.5;\n"); /* Clamp, keep the half pixel origin in mind. */ -- 2.25.1

1 0

[PATCH] d2d1: Fix the stack overflow error caused by d2d_cdt_triangulate().
by 陈长胜 Aug. 31, 2021

Aug. 31, 2021

4 3

[PATCH vkd3d v4 9/9] vkd3d-shader: Decorate SPIR-V for non-uniform access where flagged in dxbc.
by Conor McCarthy Aug. 30, 2021

Aug. 30, 2021

Based in part on vkd3d-proton patches by Philip Rebohle and Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v4: Add 'nonuniform' to trace output for non-uniform registers. Supersedes 212272. --- libs/vkd3d-shader/dxbc.c | 3 ++- libs/vkd3d-shader/spirv.c | 31 +++++++++++++++++++++--- libs/vkd3d-shader/trace.c | 14 +++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/d3d12.c | 3 +-- 5 files changed, 46 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4fa5213b..fb7f2164 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1186,6 +1186,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr { param->type = register_type_table[register_type]; } + param->non_uniform = false; param->data_type = data_type; *modifier = VKD3DSPSM_NONE; @@ -1234,7 +1235,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr WARN("Ignoring minimum precision %#x.\n", min_precis); if (non_uniform) - FIXME("Ignoring extended modifier NON_UNIFORM.\n"); + param->non_uniform = true; } else if (type) { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 695882c7..4a84fab3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1842,7 +1842,8 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilitySampledImageArrayDynamicIndexing) || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageBufferArrayDynamicIndexing) || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageTexelBufferArrayDynamicIndexingEXT) - || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageImageArrayDynamicIndexing)) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageImageArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityShaderNonUniformEXT)) vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_descriptor_indexing"); if (builder->ext_instr_set_glsl_450) @@ -2675,6 +2676,15 @@ static void vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(struct vkd3d_dxb vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, variable_id, &binding); } +static void vkd3d_dxbc_compiler_decorate_nonuniform(struct vkd3d_dxbc_compiler *compiler, + uint32_t expression_id) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_enable_capability(builder, SpvCapabilityShaderNonUniformEXT); + vkd3d_spirv_build_op_decorate(builder, expression_id, SpvDecorationNonUniformEXT, NULL, 0); +} + static const struct vkd3d_symbol *vkd3d_dxbc_compiler_put_symbol(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_symbol *symbol) { @@ -3319,6 +3329,8 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, register_info->storage_class, type_id); register_info->id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, register_info->id, indexes, index_count); + if (reg->non_uniform) + vkd3d_dxbc_compiler_decorate_nonuniform(compiler, register_info->id); } } @@ -7998,8 +8010,16 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil return; } - image->image_id = load ? vkd3d_spirv_build_op_load(builder, - image->image_type_id, image->id, SpvMemoryAccessMaskNone) : 0; + if (load) + { + image->image_id = vkd3d_spirv_build_op_load(builder, image->image_type_id, image->id, SpvMemoryAccessMaskNone); + if (resource_reg->non_uniform) + vkd3d_dxbc_compiler_decorate_nonuniform(compiler, image->image_id); + } + else + { + image->image_id = 0; + } image->image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource_reg, &symbol->info.resource.range, image->resource_type_info, @@ -8028,9 +8048,14 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil sampler_id = vkd3d_spirv_build_op_load(builder, vkd3d_spirv_get_op_type_sampler(builder), sampler_var_id, SpvMemoryAccessMaskNone); + if (sampler_reg->non_uniform) + vkd3d_dxbc_compiler_decorate_nonuniform(compiler, sampler_id); + sampled_image_type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image->image_type_id); image->sampled_image_id = vkd3d_spirv_build_op_sampled_image(builder, sampled_image_type_id, image->image_id, sampler_id); + if (resource_reg->non_uniform) + vkd3d_dxbc_compiler_decorate_nonuniform(compiler, image->sampled_image_id); } else { diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index df0ebf05..39fe8451 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -324,6 +324,7 @@ struct vkd3d_d3d_asm_colours { const char *reset; const char *literal; + const char *modifier; const char *opcode; const char *reg; const char *swizzle; @@ -804,6 +805,11 @@ static void shader_print_subscript_range(struct vkd3d_d3d_asm_compiler *compiler vkd3d_string_buffer_printf(&compiler->buffer, "*]"); } +static void shader_print_nonuniform(struct vkd3d_d3d_asm_compiler *compiler) +{ + shader_addline(&compiler->buffer, " %s{ nonuniform }%s", compiler->colours.modifier, compiler->colours.reset); +} + static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_register *reg, bool is_declaration) { @@ -1192,6 +1198,9 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, "%c", write_mask_chars[3]); shader_addline(buffer, "%s", compiler->colours.reset); } + + if (param->reg.non_uniform) + shader_print_nonuniform(compiler); } static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, @@ -1261,6 +1270,9 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, } if (src_modifier == VKD3DSPSM_ABS || src_modifier == VKD3DSPSM_ABSNEG) shader_addline(buffer, "|"); + + if (param->reg.non_uniform) + shader_print_nonuniform(compiler); } static void shader_dump_ins_modifiers(struct vkd3d_d3d_asm_compiler *compiler, @@ -1787,6 +1799,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, { .reset = "", .literal = "", + .modifier = "", .opcode = "", .reg = "", .swizzle = "", @@ -1797,6 +1810,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, { .reset = "\x1b[m", .literal = "\x1b[95m", + .modifier = "\x1b[2;37m", .opcode = "\x1b[96;1m", .reg = "\x1b[96m", .swizzle = "\x1b[93m", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 54ac5326..bd4f9ff1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -621,6 +621,7 @@ struct vkd3d_shader_register_index struct vkd3d_shader_register { enum vkd3d_shader_register_type type; + bool non_uniform; enum vkd3d_data_type data_type; struct vkd3d_shader_register_index idx[3]; enum vkd3d_immconst_type immconst_type; diff --git a/tests/d3d12.c b/tests/d3d12.c index 6948b1a0..9b471f2e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34962,7 +34962,7 @@ static void test_unbounded_resource_arrays(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(output_buffers[i], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); /* Buffers at index >= 64 are aliased. */ - todo_if(i != 10 && i != 74) + todo_if(i != 74) check_readback_data_uint(&rb, NULL, (i < 64 ? 63 - i : 127 - i) ^ 0x35, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -35109,7 +35109,6 @@ static void test_unbounded_samplers(void) { unsigned int value = get_readback_uint(&rb, i, 0, 0); unsigned int expected = (i & 1) ? 100 : 10; - todo_if(i & 1) ok(value == expected, "Got %u, expected %u at %u.\n", value, expected, i); } release_resource_readback(&rb); -- 2.32.0

1 0

[PATCH vkd3d 4/5] vkd3d-compiler: Default to monochrome output when NO_COLOUR/NO_COLOR is set.
by Henri Verbeet Aug. 30, 2021

Aug. 30, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- README | 5 +++++ programs/vkd3d-compiler/main.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README b/README index 3c70ede8..ed53f202 100644 --- a/README +++ b/README @@ -45,6 +45,11 @@ removed in the future versions of vkd3d. Some of debug variables are lists of elements. Elements must be separated by commas or semicolons. + * NO_COLOR - this is an alias of NO_COLOUR. + + * NO_COLOUR - when set, vkd3d-compiler will default to monochrome output, + even when the output supports colour. + * VKD3D_CONFIG - a list of options that change the behavior of libvkd3d. * vk_debug - enables Vulkan debug extensions. diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 40e27ed5..ac01d59a 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -674,7 +674,7 @@ int main(int argc, char **argv) } } - if (!options.explicit_colour && has_colour(output)) + if (!options.explicit_colour && !getenv("NO_COLOUR") && !getenv("NO_COLOR") && has_colour(output)) options.formatting |= VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR; add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting); -- 2.20.1

2 1

[PATCH vkd3d 3/5] vkd3d-compiler: Mention the default target type in the help text for -b.
by Henri Verbeet Aug. 30, 2021

Aug. 30, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4c7a462b..40e27ed5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -162,7 +162,8 @@ static void print_usage(const char *program_name) "Options:\n" " -h, --help Display this information and exit.\n" " -b <type> Specify the target type. Use --print-target-types to\n" - " list valid target types for a given source type.\n" + " list valid target types for a given source type. The\n" + " default target type is 'spirv-binary'.\n" " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" -- 2.20.1

2 1

[PATCH vkd3d 2/5] vkd3d-compiler: Reference --print-target-types in the help text for -b.
by Henri Verbeet Aug. 30, 2021

Aug. 30, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Like we do for -x. programs/vkd3d-compiler/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 71f90f86..4c7a462b 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -161,7 +161,8 @@ static void print_usage(const char *program_name) "[options...] [file]\n" "Options:\n" " -h, --help Display this information and exit.\n" - " -b <type> Specify the target type.\n" + " -b <type> Specify the target type. Use --print-target-types to\n" + " list valid target types for a given source type.\n" " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" -- 2.20.1

2 1

[PATCH vkd3d 5/5] build: Install the gears and triangle demos.
by Henri Verbeet Aug. 30, 2021

Aug. 30, 2021

These were originally intended more as documentation than as end-user executables, but there's some value in using them for diagnostic purposes, much like e.g. glxgears. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index c66f7b50..f8385ab0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,8 +96,8 @@ vkd3d_test_headers = \ tests/d3d12_test_utils.h vkd3d_demos = \ - demos/gears \ - demos/triangle + demos/vkd3d-gears \ + demos/vkd3d-triangle vkd3d_demos_headers = \ demos/demo.h \ @@ -286,13 +286,15 @@ endif if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ -noinst_PROGRAMS = $(vkd3d_demos) +bin_PROGRAMS += $(vkd3d_demos) -demos_gears_CFLAGS = $(DEMOS_CFLAGS) -demos_gears_LDADD = $(DEMOS_LDADD) -lm +demos_vkd3d_gears_SOURCES = demos/gears.c +demos_vkd3d_gears_CFLAGS = $(DEMOS_CFLAGS) +demos_vkd3d_gears_LDADD = $(DEMOS_LDADD) -lm -demos_triangle_CFLAGS = $(DEMOS_CFLAGS) -demos_triangle_LDADD = $(DEMOS_LDADD) +demos_vkd3d_triangle_SOURCES = demos/triangle.c +demos_vkd3d_triangle_CFLAGS = $(DEMOS_CFLAGS) +demos_vkd3d_triangle_LDADD = $(DEMOS_LDADD) endif noinst_HEADERS = $(vkd3d_test_headers) $(vkd3d_demos_headers) @@ -362,7 +364,9 @@ if HAVE_CROSSTARGET32 CROSS32_CC = @CROSSCC32@ CROSS32_DLLTOOL = @CROSSTARGET32(a)-dlltool CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a) -CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) $(vkd3d_demos:=.cross32.exe) $(vkd3d_shader_runners:=.cross32.exe) +CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) \ + $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) \ + $(vkd3d_shader_runners:=.cross32.exe) CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES) CLEANFILES += $(CROSS32_FILES) @@ -387,7 +391,9 @@ if HAVE_CROSSTARGET64 CROSS64_CC = @CROSSCC64@ CROSS64_DLLTOOL = @CROSSTARGET64(a)-dlltool CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a) -CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) $(vkd3d_demos:=.cross64.exe) $(vkd3d_shader_runners:=.cross64.exe) +CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) \ + $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) \ + $(vkd3d_shader_runners:=.cross64.exe) CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES) CLEANFILES += $(CROSS64_FILES) -- 2.20.1

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Use vkd3d_swizzle_get_component() in shader_dump_src_param().
by Henri Verbeet Aug. 30, 2021

Aug. 30, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index df0ebf05..26bc7885 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1239,11 +1239,12 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, if (param->reg.type != VKD3DSPR_IMMCONST && param->reg.type != VKD3DSPR_IMMCONST64 && param->reg.type != VKD3DSPR_SAMPLER) { + unsigned int swizzle_x = vkd3d_swizzle_get_component(swizzle, 0); + unsigned int swizzle_y = vkd3d_swizzle_get_component(swizzle, 1); + unsigned int swizzle_z = vkd3d_swizzle_get_component(swizzle, 2); + unsigned int swizzle_w = vkd3d_swizzle_get_component(swizzle, 3); + static const char swizzle_chars[] = "xyzw"; - DWORD swizzle_x = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(0)) & VKD3D_SHADER_SWIZZLE_MASK; - DWORD swizzle_y = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(1)) & VKD3D_SHADER_SWIZZLE_MASK; - DWORD swizzle_z = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(2)) & VKD3D_SHADER_SWIZZLE_MASK; - DWORD swizzle_w = (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(3)) & VKD3D_SHADER_SWIZZLE_MASK; if (swizzle_x == swizzle_y && swizzle_x == swizzle_z -- 2.20.1

1 0

[PATCH] dpnet: Don't assign a COM object to the 3rd param of QueryInterface
by Michael Stefaniuc Aug. 30, 2021

Aug. 30, 2021

It is supposed to hold a COM interface pointer. Also do some minor cleanups en passant: - Rename the 3rd param to better match its use - Avoid using the IUnknown method names - Use S_OK instead of DPN_OK Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dpnet/client.c | 15 ++++++--------- dlls/dpnet/lobbiedapp.c | 15 ++++++--------- dlls/dpnet/peer.c | 15 ++++++--------- dlls/dpnet/threadpool.c | 15 ++++++--------- 4 files changed, 24 insertions(+), 36 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 4459373a14c..b9f55c35b29 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -56,18 +56,15 @@ static inline IDirectPlay8ClientImpl *impl_from_IDirectPlay8Client(IDirectPlay8C /* IDirectPlay8Client IUnknown parts follow: */ static HRESULT WINAPI IDirectPlay8ClientImpl_QueryInterface(IDirectPlay8Client *iface, REFIID riid, - void **ppobj) + void **ret_iface) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectPlay8Client)) { - IUnknown_AddRef(iface); - *ppobj = This; - return DPN_OK; + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectPlay8Client)) { + IDirectPlay8Client_AddRef(iface); + *ret_iface = iface; + return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + WARN("(%p)->(%s,%p): not found\n", iface, debugstr_guid(riid), ret_iface); return E_NOINTERFACE; } diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index d58571aca87..71beb2de2cf 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -42,18 +42,15 @@ static inline IDirectPlay8LobbiedApplicationImpl *impl_from_IDirectPlay8LobbiedA /* IDirectPlay8LobbiedApplication IUnknown parts follow: */ static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_QueryInterface(IDirectPlay8LobbiedApplication *iface, - REFIID riid, void **ppobj) + REFIID riid, void **ret_iface) { - IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface); - - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectPlay8LobbiedApplication)) { - IUnknown_AddRef(iface); - *ppobj = This; - return DPN_OK; + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectPlay8LobbiedApplication)) { + IDirectPlay8LobbiedApplication_AddRef(iface); + *ret_iface = iface; + return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + WARN("(%p)->(%s,%p): not found\n", iface, debugstr_guid(riid), ret_iface); return E_NOINTERFACE; } diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 329d9b3a828..bd143e83176 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -60,19 +60,16 @@ static inline IDirectPlay8PeerImpl *impl_from_IDirectPlay8Peer(IDirectPlay8Peer /* IUnknown interface follows */ static HRESULT WINAPI IDirectPlay8PeerImpl_QueryInterface(IDirectPlay8Peer *iface, REFIID riid, - void **ppobj) + void **ret_iface) { - IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); - - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDirectPlay8Peer)) + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectPlay8Peer)) { - IUnknown_AddRef(iface); - *ppobj = This; - return DPN_OK; + IDirectPlay8Peer_AddRef(iface); + *ret_iface = iface; + return S_OK; } - WARN("(%p)->(%s,%p): not found\n", This, debugstr_guid(riid), ppobj); + WARN("(%p)->(%s,%p): not found\n", iface, debugstr_guid(riid), ret_iface); return E_NOINTERFACE; } diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c index 22d871b40b4..37dda49e84d 100644 --- a/dlls/dpnet/threadpool.c +++ b/dlls/dpnet/threadpool.c @@ -46,19 +46,16 @@ static inline IDirectPlay8ThreadPoolImpl *impl_from_IDirectPlay8ThreadPool(IDire /* IUnknown interface follows */ static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_QueryInterface(IDirectPlay8ThreadPool *iface, - REFIID riid, void **ppobj) + REFIID riid, void **ret_iface) { - IDirectPlay8ThreadPoolImpl *This = impl_from_IDirectPlay8ThreadPool(iface); - - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDirectPlay8ThreadPool)) + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectPlay8ThreadPool)) { - IUnknown_AddRef(iface); - *ppobj = This; - return DPN_OK; + IDirectPlay8ThreadPool_AddRef(iface); + *ret_iface = iface; + return S_OK; } - WARN("(%p)->(%s,%p): not found\n", This, debugstr_guid(riid), ppobj); + WARN("(%p)->(%s,%p): not found\n", iface, debugstr_guid(riid), ret_iface); return E_NOINTERFACE; } -- 2.31.1

2 1

[PATCH vkd3d] vkd3d-shader/hlsl: Cleanup HLSL context during error path.
by Giovanni Mascellani Aug. 30, 2021

Aug. 30, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0d9186ae..40731e67 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1821,6 +1821,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d hlsl_error(&ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Entry point \"%s\" is not defined.", entry_point); + hlsl_ctx_cleanup(&ctx); return VKD3D_ERROR_INVALID_SHADER; } -- 2.33.0

3 2