October 2023 - Wine-Commits

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

Oct. 10, 2023

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

Nikolay Sivov : vkd3d-shader/tpf: Write 'continue' instruction.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: vkd3d Branch: master Commit: c5414fa92f8aecdb9b60e6cfe76e29387e00b88d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c5414fa92f8aecdb9b60e6cfe76e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 25 20:44:05 2023 +0200 vkd3d-shader/tpf: Write 'continue' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/tpf.c | 4 ++++ tests/hlsl/for.shader_test | 4 ++-- tests/hlsl/loop.shader_test | 12 ++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index fb0bbdaa..d03b0aca 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -5200,6 +5200,10 @@ static void write_sm4_jump(const struct tpf_writer *tpf, const struct hlsl_ir_ju instr.opcode = VKD3D_SM4_OP_BREAK; break; + case HLSL_IR_JUMP_CONTINUE: + instr.opcode = VKD3D_SM4_OP_CONTINUE; + break; + case HLSL_IR_JUMP_DISCARD_NZ: { instr.opcode = VKD3D_SM4_OP_DISCARD | VKD3D_SM4_CONDITIONAL_NZ; diff --git a/tests/hlsl/for.shader_test b/tests/hlsl/for.shader_test index beb521e7..e0b0edc1 100644 --- a/tests/hlsl/for.shader_test +++ b/tests/hlsl/for.shader_test @@ -4,7 +4,7 @@ void main(out float tex : texcoord, inout float4 pos : sv_position) tex = pos.x; } -[pixel shader todo] +[pixel shader] float4 main(float tex : texcoord) : sv_target { int i; @@ -22,7 +22,7 @@ float4 main(float tex : texcoord) : sv_target } [test] -todo draw quad +draw quad probe ( 0, 0, 159, 480) rgba (10.0, 35.0, 0.0, 0.0) probe (161, 0, 479, 480) rgba (10.0, 38.0, 0.0, 0.0) probe (481, 0, 640, 480) rgba ( 5.0, 10.0, 0.0, 0.0) diff --git a/tests/hlsl/loop.shader_test b/tests/hlsl/loop.shader_test index 9f8bcb92..bf26b69c 100644 --- a/tests/hlsl/loop.shader_test +++ b/tests/hlsl/loop.shader_test @@ -42,7 +42,7 @@ uniform 0 float 4.0 draw quad probe all rgba (20.0, 20.0, 20.0, 20.0) -[pixel shader todo] +[pixel shader] float a; float4 main() : sv_target @@ -68,10 +68,10 @@ float4 main() : sv_target [test] uniform 0 float 4.0 -todo draw quad -todo probe all rgba (409.1, 409.1, 409.1, 409.1) +draw quad +probe all rgba (409.1, 409.1, 409.1, 409.1) -[pixel shader todo] +[pixel shader] float a; float4 main() : sv_target @@ -98,5 +98,5 @@ float4 main() : sv_target [test] uniform 0 float 4.0 -todo draw quad -todo probe all rgba (410.1, 410.1, 410.1, 410.1) +draw quad +probe all rgba (410.1, 410.1, 410.1, 410.1)

1 0

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

Oct. 10, 2023

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 Oct. 10, 2023

Oct. 10, 2023

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

Nikolay Sivov : tests: Add some tests for 'break'/'continue' in loops.
by Alexandre Julliard Oct. 10, 2023

Oct. 10, 2023

Module: vkd3d Branch: master Commit: 89f493b900197d18ea170a86d66a7369d23edd35 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/89f493b900197d18ea170a86d66a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 14:49:59 2023 +0200 tests: Add some tests for 'break'/'continue' in loops. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/hlsl/loop.shader_test | 59 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/tests/hlsl/loop.shader_test b/tests/hlsl/loop.shader_test index 75a31f7a..9f8bcb92 100644 --- a/tests/hlsl/loop.shader_test +++ b/tests/hlsl/loop.shader_test @@ -41,3 +41,62 @@ float4 main() : sv_target uniform 0 float 4.0 draw quad probe all rgba (20.0, 20.0, 20.0, 20.0) + +[pixel shader todo] +float a; + +float4 main() : sv_target +{ + int i = 0; + float res = a; + + while (i < 10) + { + if (i == 5) + { + res += 0.1f; + break; + } + res += 1.0f; + i++; + if (i == 2) continue; + res += 100.f; + } + + return res; +} + +[test] +uniform 0 float 4.0 +todo draw quad +todo probe all rgba (409.1, 409.1, 409.1, 409.1) + +[pixel shader todo] +float a; + +float4 main() : sv_target +{ + int i = 0; + float res = a; + + do + { + res += 1.0f; + if (i == 5) + { + res += 0.1f; + break; + } + i++; + if (i == 2) continue; + res += 100.f; + } + while (i < 10); + + return res; +} + +[test] +uniform 0 float 4.0 +todo draw quad +todo probe all rgba (410.1, 410.1, 410.1, 410.1)

1 0

Eric Pouech : dbghelp: Simplify allocation code.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

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

Zebediah Figura : shell32: Fix parsing empty arguments in parse_dde_command().
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

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 Oct. 9, 2023

Oct. 9, 2023

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

Alistair Leslie-Hughes : d3dx9: Support empty mesh in D3DXLoadMeshHierarchyFromXInMemory().
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

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

Rémi Bernon : include: Avoid narrowing warning in wine_dbgstr_fourcc.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

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