wine-commits October 2023

wine-commits@winehq.org

1 participants
702 discussions

Nikolay Sivov : vkd3d: Add partial implementation for CreateHeap1().
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: vkd3d Branch: master Commit: 6ba75fd92f76a34f7de755784ddc72139118d1bf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6ba75fd92f76a34f7de755784ddc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 7 19:50:59 2023 +0200 vkd3d: Add partial implementation for CreateHeap1(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d/device.c | 16 +++++++++++++--- libs/vkd3d/resource.c | 8 ++++++-- libs/vkd3d/vkd3d_private.h | 2 +- tests/d3d12.c | 16 ++++++++++++++++ 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index ea07b761..3e17400a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3645,7 +3645,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap(ID3D12Device5 *iface, TRACE("iface %p, desc %p, iid %s, heap %p.\n", iface, desc, debugstr_guid(iid), heap); - if (FAILED(hr = d3d12_heap_create(device, desc, NULL, &object))) + if (FAILED(hr = d3d12_heap_create(device, desc, NULL, NULL, &object))) { *heap = NULL; return hr; @@ -4024,10 +4024,20 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap1(ID3D12Device5 *iface, const D3D12_HEAP_DESC *desc, ID3D12ProtectedResourceSession *protected_session, REFIID iid, void **heap) { - FIXME("iface %p, desc %p, protected_session %p, iid %s, heap %p stub!\n", + struct d3d12_device *device = impl_from_ID3D12Device5(iface); + struct d3d12_heap *object; + HRESULT hr; + + TRACE("iface %p, desc %p, protected_session %p, iid %s, heap %p.\n", iface, desc, protected_session, debugstr_guid(iid), heap); - return E_NOTIMPL; + if (FAILED(hr = d3d12_heap_create(device, desc, NULL, protected_session, &object))) + { + *heap = NULL; + return hr; + } + + return return_interface(&object->ID3D12Heap_iface, &IID_ID3D12Heap, iid, heap); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateReservedResource1(ID3D12Device5 *iface, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 14fb24a9..ad1d2d66 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -574,11 +574,15 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, } HRESULT d3d12_heap_create(struct d3d12_device *device, const D3D12_HEAP_DESC *desc, - const struct d3d12_resource *resource, struct d3d12_heap **heap) + const struct d3d12_resource *resource, ID3D12ProtectedResourceSession *protected_session, + struct d3d12_heap **heap) { struct d3d12_heap *object; HRESULT hr; + if (protected_session) + FIXME("Protected session is not supported.\n"); + if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; @@ -2064,7 +2068,7 @@ static HRESULT vkd3d_allocate_resource_memory( heap_desc.Properties = *heap_properties; heap_desc.Alignment = 0; heap_desc.Flags = heap_flags; - if (SUCCEEDED(hr = d3d12_heap_create(device, &heap_desc, resource, &resource->heap))) + if (SUCCEEDED(hr = d3d12_heap_create(device, &heap_desc, resource, NULL, &resource->heap))) resource->flags |= VKD3D_RESOURCE_DEDICATED_HEAP; return hr; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9e2daae2..625a4312 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -682,7 +682,7 @@ struct d3d12_heap }; HRESULT d3d12_heap_create(struct d3d12_device *device, const D3D12_HEAP_DESC *desc, - const struct d3d12_resource *resource, struct d3d12_heap **heap); + const struct d3d12_resource *resource, ID3D12ProtectedResourceSession *protected_session, struct d3d12_heap **heap); struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface); #define VKD3D_RESOURCE_PUBLIC_FLAGS \ diff --git a/tests/d3d12.c b/tests/d3d12.c index d61309e9..3fa9ec4e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1849,6 +1849,7 @@ static void test_create_heap(void) ID3D12Device *device, *tmp_device; bool is_pool_L1_supported; HRESULT hr, expected_hr; + ID3D12Device4 *device4; unsigned int i, j; ID3D12Heap *heap; ULONG refcount; @@ -2063,6 +2064,21 @@ static void test_create_heap(void) vkd3d_test_pop_context(); } + if (SUCCEEDED(ID3D12Device_QueryInterface(device, &IID_ID3D12Device4, (void **)&device4))) + { + desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + memset(&desc.Properties, 0, sizeof(desc.Properties)); + desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT; + desc.Alignment = 0; + desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES; + hr = ID3D12Device4_CreateHeap1(device4, &desc, NULL, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr); + + ID3D12Heap_Release(heap); + + ID3D12Device4_Release(device4); + } + done: refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);

1 0

Conor McCarthy : vkd3d-shader/spirv: When declaring a CBV initialise the register with the register index range.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: vkd3d Branch: master Commit: 75c2af3640809619d8b6c55e1c9eec66d0ac2cb5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/75c2af3640809619d8b6c55e1c9ee… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 6 14:14:23 2023 +1000 vkd3d-shader/spirv: When declaring a CBV initialise the register with the register index range. The declaration instruction register contains id, range first, and range last. The backend includes range first in the variable name. After commit e8b3561252 it was always zero, and since commit 67f0196c33 it is UINT_MAX, so constant buffers are named, e.g., "%cb0_4294967295". --- libs/vkd3d-shader/spirv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b3f6947b..1c8b52e6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5633,8 +5633,10 @@ static void spirv_compiler_emit_cbv_declaration(struct spirv_compiler *compiler, struct vkd3d_symbol reg_symbol; unsigned int size; - vsir_register_init(&reg, VKD3DSPR_CONSTBUFFER, VKD3D_DATA_FLOAT, 1); + vsir_register_init(&reg, VKD3DSPR_CONSTBUFFER, VKD3D_DATA_FLOAT, 3); reg.idx[0].offset = register_id; + reg.idx[1].offset = range->first; + reg.idx[2].offset = range->last; size = size_in_bytes / (VKD3D_VEC4_SIZE * sizeof(uint32_t));

1 0

Zebediah Figura : vkd3d-shader/spirv: Add a debug name for the push constant buffer.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: vkd3d Branch: master Commit: a4c5f3a7988b6a480fa40a0b7dd5e8ea5bfb8550 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a4c5f3a7988b6a480fa40a0b7dd5e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 7 18:39:08 2022 -0600 vkd3d-shader/spirv: Add a debug name for the push constant buffer. --- libs/vkd3d-shader/spirv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d490e745..b3f6947b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5518,13 +5518,14 @@ static void spirv_compiler_emit_push_constant_buffers(struct spirv_compiler *com struct_id = vkd3d_spirv_build_op_type_struct(builder, member_ids, count); vkd3d_spirv_build_op_decorate(builder, struct_id, SpvDecorationBlock, NULL, 0); - vkd3d_spirv_build_op_name(builder, struct_id, "push_cb"); + vkd3d_spirv_build_op_name(builder, struct_id, "push_cb_struct"); vkd3d_free(member_ids); pointer_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, struct_id); var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, pointer_type_id, storage_class, 0); compiler->push_constants_var_id = var_id; + vkd3d_spirv_build_op_name(builder, var_id, "push_cb"); for (i = 0, j = 0; i < compiler->shader_interface.push_constant_buffer_count; ++i) {

1 0

Henri Verbeet : vkd3d-shader/tpf: Get rid of the output map.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: vkd3d Branch: master Commit: 98d158d004fedfcc954998c141efe90a707933d6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98d158d004fedfcc954998c141efe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 5 22:47:24 2023 +0200 vkd3d-shader/tpf: Get rid of the output map. Map output registers in the backend instead, as needed. --- libs/vkd3d-shader/d3d_asm.c | 4 +--- libs/vkd3d-shader/spirv.c | 7 ++++++- libs/vkd3d-shader/tpf.c | 47 --------------------------------------------- 3 files changed, 7 insertions(+), 51 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 6a3513a2..620a2d22 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -880,9 +880,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const break; case VKD3DSPR_COLOROUT: - shader_addline(buffer, "o"); - if (!shader_ver_ge(&compiler->shader_version, 4, 0)) - shader_addline(buffer, "C"); + shader_addline(buffer, "oC"); break; case VKD3DSPR_DEPTHOUT: diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 07e276c5..d490e745 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3003,9 +3003,11 @@ static bool spirv_compiler_get_register_name(char *buffer, unsigned int buffer_s snprintf(buffer, buffer_size, "vicp%u", idx); break; case VKD3DSPR_OUTPUT: - case VKD3DSPR_COLOROUT: snprintf(buffer, buffer_size, "o%u", idx); break; + case VKD3DSPR_COLOROUT: + snprintf(buffer, buffer_size, "oC%u", idx); + break; case VKD3DSPR_DEPTHOUT: case VKD3DSPR_DEPTHOUTGE: case VKD3DSPR_DEPTHOUTLE: @@ -5061,6 +5063,9 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, if (is_patch_constant) location += shader_signature_next_location(&compiler->output_signature); + else if (compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL + && signature_element->sysval_semantic == VKD3D_SHADER_SV_TARGET) + location = signature_element->semantic_index; id = spirv_compiler_emit_array_variable(compiler, &builder->global_stream, storage_class, component_type, output_component_count, array_sizes, 2); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 0fc16b4c..fb0bbdaa 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -618,8 +618,6 @@ struct vkd3d_shader_sm4_parser { const uint32_t *start, *end, *ptr; - unsigned int output_map[MAX_REG_OUTPUT]; - enum vkd3d_shader_opcode phase; bool has_control_point_phase; unsigned int input_register_masks[MAX_REG_OUTPUT]; @@ -1656,31 +1654,6 @@ static enum vkd3d_sm4_swizzle_type vkd3d_sm4_get_default_swizzle_type( return register_type_info->default_src_swizzle_type; } -static void map_register(const struct vkd3d_shader_sm4_parser *sm4, struct vkd3d_shader_register *reg) -{ - switch (sm4->p.shader_version.type) - { - case VKD3D_SHADER_TYPE_PIXEL: - if (reg->type == VKD3DSPR_OUTPUT) - { - unsigned int reg_idx = reg->idx[0].offset; - - if (reg_idx >= ARRAY_SIZE(sm4->output_map)) - { - /* Validated later */ - break; - } - - reg->type = VKD3DSPR_COLOROUT; - reg->idx[0].offset = sm4->output_map[reg_idx]; - } - break; - - default: - break; - } -} - static enum vkd3d_data_type map_data_type(char t) { switch (t) @@ -1944,8 +1917,6 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui ++param->idx_count; } - map_register(priv, param); - return true; } @@ -2476,7 +2447,6 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t { struct vkd3d_shader_version version; uint32_t version_token, token_count; - unsigned int i; if (byte_code_size / sizeof(*byte_code) < 2) { @@ -2536,23 +2506,6 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t return false; sm4->ptr = sm4->start; - memset(sm4->output_map, 0xff, sizeof(sm4->output_map)); - for (i = 0; i < output_signature->element_count; ++i) - { - struct signature_element *e = &output_signature->elements[i]; - - if (version.type == VKD3D_SHADER_TYPE_PIXEL - && ascii_strcasecmp(e->semantic_name, "SV_Target")) - continue; - if (e->register_index >= ARRAY_SIZE(sm4->output_map)) - { - WARN("Invalid output index %u.\n", e->register_index); - continue; - } - - sm4->output_map[e->register_index] = e->semantic_index; - } - init_sm4_lookup_tables(&sm4->lookup); return true;

1 0

Henri Verbeet : vkd3d-shader/hlsl: Get rid of the vkd3d_sm4_* forward declarations in hlsl.h.
by Alexandre Julliard 10 Oct '23

10 Oct '23

Module: vkd3d Branch: master Commit: 31ce7c3a385c23deb430f8ef30ac72d287f780ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/31ce7c3a385c23deb430f8ef30ac7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 5 22:34:28 2023 +0200 vkd3d-shader/hlsl: Get rid of the vkd3d_sm4_* forward declarations in hlsl.h. These are no longer needed outside of tpf.c. --- libs/vkd3d-shader/hlsl.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index e45256bc..6e6d8227 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -25,9 +25,6 @@ #include "vkd3d_d3dcommon.h" #include "vkd3d_d3dx9shader.h" -enum vkd3d_sm4_register_type; -enum vkd3d_sm4_swizzle_type; - /* The general IR structure is inspired by Mesa GLSL hir, even though the code * ends up being quite different in practice. Anyway, here comes the relevant * licensing information.

1 0

Zebediah Figura : shell32: Fix parsing empty arguments in parse_dde_command().
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: eb06f991725d21e1ce4e3353a377e8708ae8471f URL: https://gitlab.winehq.org/wine/wine/-/commit/eb06f991725d21e1ce4e3353a377e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 9 11:56:43 2023 -0500 shell32: Fix parsing empty arguments in parse_dde_command(). This fixes a hang in Microsoft Visual C++ 1.52 installation. --- dlls/shell32/dde.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index dcaf641f8f4..976dc2e394a 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -391,7 +391,7 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) else { if (!(p = wcspbrk(command, L",()[]"))) goto error; - while (p[-1] == ' ') p--; + while (p > command && p[-1] == ' ') p--; } new_argv = realloc(argv, (argc + 1) * sizeof(*argv));

1 0

Eric Pouech : dbghelp: Read debuggee environment by page.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 152e72c82c3450aad4ca1a31acc96fe6bd86f2e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/152e72c82c3450aad4ca1a31acc96f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Oct 9 09:46:33 2023 +0200 dbghelp: Read debuggee environment by page. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 76761e4caf7..b15ece25c88 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -404,7 +404,7 @@ static BOOL check_live_target(struct process* pcs, BOOL wow64, BOOL child_wow64) do { - size_t read_size = sysinfo.dwAllocationGranularity - (env & (sysinfo.dwAllocationGranularity - 1)); + size_t read_size = sysinfo.dwPageSize - (env & (sysinfo.dwPageSize - 1)); if (!(new_buf = realloc(buf, buf_size + read_size))) break; buf = new_buf;

1 0

Eric Pouech : dbghelp: Simplify allocation code.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 733bf916065da27ab11b2f21f7fe7b17cd9a34cf URL: https://gitlab.winehq.org/wine/wine/-/commit/733bf916065da27ab11b2f21f7fe7b… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Oct 9 09:46:33 2023 +0200 dbghelp: Simplify allocation code. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 3ce3ef6f707..76761e4caf7 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -400,17 +400,13 @@ static BOOL check_live_target(struct process* pcs, BOOL wow64, BOOL child_wow64) { size_t buf_size = 0, i, last_null = -1; WCHAR *buf = NULL; + WCHAR *new_buf; do { size_t read_size = sysinfo.dwAllocationGranularity - (env & (sysinfo.dwAllocationGranularity - 1)); - if (buf) - { - WCHAR *new_buf; - if (!(new_buf = realloc(buf, buf_size + read_size))) break; - buf = new_buf; - } - else if(!(buf = malloc(read_size))) break; + if (!(new_buf = realloc(buf, buf_size + read_size))) break; + buf = new_buf; if (!read_process_memory(pcs, env, (char*)buf + buf_size, read_size)) break; for (i = buf_size / sizeof(WCHAR); i < (buf_size + read_size) / sizeof(WCHAR); i++)

1 0

Rémi Bernon : include: Avoid narrowing warning in wine_dbgstr_fourcc.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: bc7e51b48c9919cbb71a8bc0a7cb821c1dcbb5ec URL: https://gitlab.winehq.org/wine/wine/-/commit/bc7e51b48c9919cbb71a8bc0a7cb82… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 9 15:57:36 2023 +0200 include: Avoid narrowing warning in wine_dbgstr_fourcc. --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index d1d751a2d8a..d0862942be8 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -326,7 +326,7 @@ static inline const char *wine_dbgstr_guid( const GUID *id ) static inline const char *wine_dbgstr_fourcc( unsigned int fourcc ) { - char str[4] = { fourcc, fourcc >> 8, fourcc >> 16, fourcc >> 24 }; + char str[4] = { (char)fourcc, (char)(fourcc >> 8), (char)(fourcc >> 16), (char)(fourcc >> 24) }; if (!fourcc) return "''"; if (isprint( str[0] ) && isprint( str[1] ) && isprint( str[2] ) && isprint( str[3] ))

1 0

Alistair Leslie-Hughes : d3dx9: Support empty mesh in D3DXLoadMeshHierarchyFromXInMemory().
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 21e91690b1688289a3b06951cd2152274998c5ba URL: https://gitlab.winehq.org/wine/wine/-/commit/21e91690b1688289a3b06951cd2152… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 28 12:35:29 2023 +1000 d3dx9: Support empty mesh in D3DXLoadMeshHierarchyFromXInMemory(). --- dlls/d3dx9_36/mesh.c | 51 +++++++++++++++++++++++++++++++++++++--------- dlls/d3dx9_36/tests/mesh.c | 43 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 7aa70783735..d6c13007126 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3506,6 +3506,19 @@ HRESULT WINAPI D3DXLoadSkinMeshFromXof(struct ID3DXFileData *filedata, DWORD opt hr = parse_mesh(filedata, &mesh_data, provide_flags); if (FAILED(hr)) goto cleanup; + if (!mesh_data.num_vertices) + { + if (adjacency_out) + *adjacency_out = NULL; + if (materials_out) + *materials_out = NULL; + if (effects_out) + *effects_out = NULL; + *mesh_out = NULL; + hr = D3D_OK; + goto cleanup; + } + total_vertices = mesh_data.num_vertices; if (mesh_data.fvf & D3DFVF_NORMAL) { /* duplicate vertices with multiple normals */ @@ -3815,12 +3828,15 @@ static HRESULT load_mesh_container(struct ID3DXFileData *filedata, DWORD options hr = filedata_get_name(filedata, &name); if (FAILED(hr)) goto cleanup; - hr = alloc_hier->lpVtbl->CreateMeshContainer(alloc_hier, name, &mesh_data, - materials ? ID3DXBuffer_GetBufferPointer(materials) : NULL, - effects ? ID3DXBuffer_GetBufferPointer(effects) : NULL, - num_materials, - adjacency ? ID3DXBuffer_GetBufferPointer(adjacency) : NULL, - skin_info, mesh_container); + if (mesh_data.pMesh) + { + hr = alloc_hier->lpVtbl->CreateMeshContainer(alloc_hier, name, &mesh_data, + materials ? ID3DXBuffer_GetBufferPointer(materials) : NULL, + effects ? ID3DXBuffer_GetBufferPointer(effects) : NULL, + num_materials, + adjacency ? ID3DXBuffer_GetBufferPointer(adjacency) : NULL, + skin_info, mesh_container); + } cleanup: if (materials) ID3DXBuffer_Release(materials); @@ -4200,13 +4216,21 @@ static HRESULT parse_frame(struct ID3DXFileData *filedata, DWORD options, struct hr = E_OUTOFMEMORY; goto err; } - list_add_tail(container_list, &container->entry); - container->transform = transform; hr = D3DXLoadSkinMeshFromXof(child, options, device, (provide_flags & PROVIDE_ADJACENCY) ? &container->adjacency : NULL, (provide_flags & PROVIDE_MATERIALS) ? &container->materials : NULL, NULL, &container->num_materials, NULL, &container->mesh); + + if (container->mesh) + { + list_add_tail(container_list, &container->entry); + container->transform = transform; + } + else + { + HeapFree(GetProcessHeap(), HEAP_ZERO_MEMORY, container); + } } else if (IsEqualGUID(&type, &TID_D3DRMFrameTransformMatrix)) { D3DXMATRIX new_transform; hr = parse_transform_matrix(child, &new_transform); @@ -4294,13 +4318,20 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(const void *memory, DWORD memory_size, hr = E_OUTOFMEMORY; goto cleanup; } - list_add_tail(&container_list, &container_ptr->entry); - D3DXMatrixIdentity(&container_ptr->transform); hr = D3DXLoadSkinMeshFromXof(filedata, options, device, (provide_flags & PROVIDE_ADJACENCY) ? &container_ptr->adjacency : NULL, (provide_flags & PROVIDE_MATERIALS) ? &container_ptr->materials : NULL, NULL, &container_ptr->num_materials, NULL, &container_ptr->mesh); + if (container_ptr->mesh) + { + list_add_tail(&container_list, &container_ptr->entry); + D3DXMatrixIdentity(&container_ptr->transform); + } + else + { + HeapFree(GetProcessHeap(), 0, container_ptr); + } } else if (IsEqualGUID(&guid, &TID_D3DRMFrame)) { hr = parse_frame(filedata, options, device, &identity, &container_list, provide_flags); } diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 7b7bb215b09..ce68903572b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2068,6 +2068,14 @@ static void D3DXLoadMeshTest(void) "}" "Mesh { 3; 0.0; 0.0; 0.0;, 0.0; 1.0; 0.0;, 3.0; 1.0; 0.0;; 1; 3; 0, 1, 2;; }" "}"; + static const char framed_xfile_empty[] = + "xof 0303txt 0032" + "Frame Box01 {" + " Mesh { 0;; 0;;" + " MeshNormals { 0;; 0;; }" + " }" + "}"; + static const WORD framed_index_buffer[] = { 0, 1, 2 }; static const D3DXVECTOR3 framed_vertex_buffers[3][3] = { {{0.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {1.0, 1.0, 0.0}}, @@ -2508,6 +2516,16 @@ static void D3DXLoadMeshTest(void) ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); frame_hier = NULL; + hr = D3DXLoadMeshHierarchyFromXInMemory(framed_xfile_empty, sizeof(framed_xfile_empty) - 1, + D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, NULL); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + container = frame_hier->pMeshContainer; + ok(!strcmp(frame_hier->Name, "Box01"), "Unexpected name %s.\n", debugstr_a(frame_hier->Name)); + ok(!container, "Unexpected container %p.\n", container); + + hr = D3DXFrameDestroy(frame_hier, &alloc_hier); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + frame_hier = NULL; hr = D3DXLoadMeshFromXInMemory(NULL, 0, D3DXMESH_MANAGED, device, NULL, NULL, NULL, NULL, &mesh); @@ -11317,6 +11335,9 @@ static void test_load_skin_mesh_from_xof(void) "1;" "3; 0, 1, 2;;" "}"; + static const char simple_xfile_empty[] = + "xof 0303txt 0032" + "Mesh { 0;; 0;; }"; static const D3DVERTEXELEMENT9 expected_declaration[] = { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, @@ -11428,6 +11449,28 @@ static void test_load_skin_mesh_from_xof(void) mesh->lpVtbl->Release(mesh); adjacency->lpVtbl->Release(adjacency); file_data->lpVtbl->Release(file_data); + + /* Empty Mesh Test */ + file_data = get_mesh_data(simple_xfile_empty, sizeof(simple_xfile_empty) - 1); + ok(!!file_data, "Failed to load mesh data.\n"); + + adjacency = materials = effects = (void *)0xdeadbeef; + count = 0xdeadbeefu; + skin_info = (void *)0xdeadbeef; + mesh = (void *)0xdeadbeef; + + hr = D3DXLoadSkinMeshFromXof(file_data, 0, device, &adjacency, &materials, &effects, &count, + &skin_info, &mesh); + todo_wine ok(hr == D3DXERR_LOADEDMESHASNODATA, "Unexpected hr %#lx.\n", hr); + ok(!adjacency, "Unexpected adjacency %p.\n", adjacency); + ok(!materials, "Unexpected materials %p.\n", materials); + ok(!effects, "Unexpected effects %p.\n", effects); + ok(count == 0xdeadbeefu, "Unexpected count %lu.\n", count); + ok(skin_info == (void *)0xdeadbeef, "Unexpected skin_info %p.\n", skin_info); + ok(!mesh, "Unexpected mesh %p.\n", mesh); + + file_data->lpVtbl->Release(file_data); + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); DestroyWindow(hwnd);

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2023