April 2018 - Wine-commits - list.winehq.org

Matteo Bruni : ddraw/tests: Remove a few unnecessary render state settings.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 267bd0d3ead26bbe297a467366aa290fd0f714f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=267bd0d3ead26bbe297a4673… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 13 00:07:45 2018 +0200 ddraw/tests: Remove a few unnecessary render state settings. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 -- dlls/ddraw/tests/ddraw2.c | 13 ------------- dlls/ddraw/tests/ddraw4.c | 22 ---------------------- 3 files changed, 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=267bd0d3ead26bbe297a…

1 0

Józef Kucia : libs/vkd3d-shader: Introduce VKD3DSPR_INVALID.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: 83ce4553ea2bf08e2957b7ab2eb6833d93dbf377 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=83ce4553ea2bf08e2957b7a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:37 2018 +0200 libs/vkd3d-shader: Introduce VKD3DSPR_INVALID. Fixes clang warnings. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0b5c3cf..5f87eae 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1378,8 +1378,8 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr token = *(*ptr)++; register_type = (token & VKD3D_SM4_REGISTER_TYPE_MASK) >> VKD3D_SM4_REGISTER_TYPE_SHIFT; - if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table) - || register_type_table[register_type] == ~0u) + if (register_type >= ARRAY_SIZE(register_type_table) + || register_type_table[register_type] == VKD3DSPR_INVALID) { FIXME("Unhandled register type %#x.\n", register_type); param->type = VKD3DSPR_TEMP; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 04e6b09..09c2e1d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -352,6 +352,8 @@ enum vkd3d_shader_register_type VKD3DSPR_COVERAGE, VKD3DSPR_SAMPLEMASK, VKD3DSPR_GSINSTID, + + VKD3DSPR_INVALID = ~0u, }; enum vkd3d_shader_resource_type

1 0

Józef Kucia : libs/vkd3d-shader: Get rid of redundant assignment from vkd3d_shader_find_signature_element( ).
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: 736d3c23fd5d37a40ddf0c368768d1ecb5470bed URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=736d3c23fd5d37a40ddf0c3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:38 2018 +0200 libs/vkd3d-shader: Get rid of redundant assignment from vkd3d_shader_find_signature_element(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 4934819..9db8b56 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -227,7 +227,7 @@ struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( const struct vkd3d_shader_signature *signature, const char *semantic_name, unsigned int semantic_index, unsigned int stream_index) { - struct vkd3d_shader_signature_element *e = signature->elements; + struct vkd3d_shader_signature_element *e; unsigned int i; TRACE("signature %p, semantic_name %s, semantic_index %u, stream_index %u.\n",

1 0

Józef Kucia : libs/vkd3d: Fix memory leak in d3d12_command_queue_ExecuteCommandLists().
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: 277cdd4e9541a11d63eb8d78ca3ab26d3901769b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=277cdd4e9541a11d63eb8d7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:39 2018 +0200 libs/vkd3d: Fix memory leak in d3d12_command_queue_ExecuteCommandLists(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5605ab0..a056ca3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4222,6 +4222,7 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm if (!(vk_queue = vkd3d_queue_acquire(command_queue->vkd3d_queue))) { ERR("Failed to acquire queue %p.\n", command_queue->vkd3d_queue); + vkd3d_free(buffers); return; }

1 0

Józef Kucia : libs/vkd3d: Fix memory leak in d3d12_pipeline_state_init_compute_uav_counters().
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: 8b8128b05596a897cd37d815872a77c90734edce URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8b8128b05596a897cd37d81… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:40 2018 +0200 libs/vkd3d: Fix memory leak in d3d12_pipeline_state_init_compute_uav_counters(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 1749c00..b89f854 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1321,7 +1321,10 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel if (!(binding_desc = vkd3d_calloc(uav_counter_count, sizeof(*binding_desc)))) return E_OUTOFMEMORY; if (!(state->uav_counters = vkd3d_calloc(uav_counter_count, sizeof(*state->uav_counters)))) + { + vkd3d_free(binding_desc); return E_OUTOFMEMORY; + } state->uav_counter_mask = shader_info->uav_counter_mask; memset(&context, 0, sizeof(context));

1 0

Józef Kucia : libs/vkd3d: Return early if there are no descriptors to update.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: 2a430ae9916bec21429205f20cbb42f4dc3e5be8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2a430ae9916bec21429205f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:41 2018 +0200 libs/vkd3d: Return early if there are no descriptors to update. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index a056ca3..b7b774b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2048,6 +2048,10 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list descriptor_count = 0; for (i = 0; i < descriptor_table->range_count; ++i) descriptor_count += descriptor_table->ranges[i].descriptor_count; + + if (!descriptor_count) + return; + if (!(descriptor_writes = vkd3d_calloc(descriptor_count, sizeof(*descriptor_writes)))) return; if (!(image_infos = vkd3d_calloc(descriptor_count, sizeof(*image_infos))))

1 0

Józef Kucia : build: Do not try to rebuild headers when widl is not found.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: ab15973e6bbf7d08b6ff3cec62ec070aa4795d0e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ab15973e6bbf7d08b6ff3ce… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:43 2018 +0200 build: Do not try to rebuild headers when widl is not found. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 8 ++++++-- configure.ac | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index d10a0e3..8f0fc5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -147,7 +147,11 @@ vkd3d_v_widl_1 = EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl +if HAVE_WIDL $(VKD3D_V_WIDL)$(WIDL) -o $@ $< +else + echo "widl is required to generate $<" +endif EXTRA_DIST += $(vkd3d_demos_shaders) @@ -173,7 +177,7 @@ CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/i CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def) -if HAS_CROSSTARGET32 +if HAVE_CROSSTARGET32 CROSS32_CC = @CROSSCC32@ CROSS32_DLLTOOL = @CROSSTARGET32(a)-dlltool CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a) @@ -198,7 +202,7 @@ else crosstest32: endif -if HAS_CROSSTARGET64 +if HAVE_CROSSTARGET64 CROSS64_CC = @CROSSCC64@ CROSS64_DLLTOOL = @CROSSTARGET64(a)-dlltool CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a) diff --git a/configure.ac b/configure.ac index f9616e3..d00630b 100644 --- a/configure.ac +++ b/configure.ac @@ -88,8 +88,9 @@ VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popco VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) -AM_CONDITIONAL([HAS_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) -AM_CONDITIONAL([HAS_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) +AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) +AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) +AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT

1 0

Józef Kucia : libs/vkd3d: Propagate error code in vkd3d_fence_worker_stop().
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: 830f7c1e4978f0a37454c0d19e013c93eea415c1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=830f7c1e4978f0a37454c0d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:35 2018 +0200 libs/vkd3d: Propagate error code in vkd3d_fence_worker_stop(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d9ad8f3..5605ab0 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -309,7 +309,7 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, if (FAILED(hr = device->join_thread(worker->u.handle))) { ERR("Failed to join fence worker thread, hr %#x.\n", hr); - return E_FAIL; + return hr; } } else

1 0

Józef Kucia : libs/vkd3d-shader: Fix error code variable type in vkd3d_shader_compile_dxbc().
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: vkd3d Branch: master Commit: 7dd9420877854883b7491e582ee014b82fafb8cf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7dd9420877854883b7491e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:36 2018 +0200 libs/vkd3d-shader: Fix error code variable type in vkd3d_shader_compile_dxbc(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 1bb89b3..4934819 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -64,7 +64,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_dxbc_compiler *spirv_compiler; struct vkd3d_shader_scan_info scan_info; struct vkd3d_shader_parser parser; - bool ret; + int ret; TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface %p.\n", dxbc->code, dxbc->size, spirv, compiler_options, shader_interface);

1 0

Zebediah Figura : rpcrt4: We don't need to marshal type 0.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: c3ebd20283b7950727e04901013011c2a4d78b12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3ebd20283b7950727e04901… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 10 20:30:28 2018 -0500 rpcrt4: We don't need to marshal type 0. Because it's not a type, but the lack of one. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index cbe8223..6356fb9 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -5753,7 +5753,8 @@ static unsigned char *union_arm_marshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned c m(pStubMsg, pMemory, desc); } } - else FIXME("no marshaller for embedded type %02x\n", *desc); + else if (*desc) + FIXME("no marshaller for embedded type %02x\n", *desc); } return NULL; } @@ -5826,7 +5827,8 @@ static unsigned char *union_arm_unmarshall(PMIDL_STUB_MESSAGE pStubMsg, m(pStubMsg, ppMemory, desc, fMustAlloc); } } - else FIXME("no marshaller for embedded type %02x\n", *desc); + else if (*desc) + FIXME("no marshaller for embedded type %02x\n", *desc); } return NULL; } @@ -5884,7 +5886,8 @@ static void union_arm_buffer_size(PMIDL_STUB_MESSAGE pStubMsg, m(pStubMsg, pMemory, desc); } } - else FIXME("no buffersizer for embedded type %02x\n", *desc); + else if (*desc) + FIXME("no buffersizer for embedded type %02x\n", *desc); } } @@ -5932,7 +5935,8 @@ static ULONG union_arm_memory_size(PMIDL_STUB_MESSAGE pStubMsg, return m(pStubMsg, desc); } } - else FIXME("no marshaller for embedded type %02x\n", *desc); + else if (*desc) + FIXME("no marshaller for embedded type %02x\n", *desc); } TRACE("size %d\n", size);

1 0