wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Rémi Bernon : windows.gaming.input: Stub ICustomGameControllerFactory for RawGameController.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 5adbc011d92531b0abbcf2a30a0388d6a6750cef URL: https://source.winehq.org/git/wine.git/?a=commit;h=5adbc011d92531b0abbcf2a3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 7 10:40:24 2022 +0100 windows.gaming.input: Stub ICustomGameControllerFactory for RawGameController. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/controller.c | 46 +++++++++++++++++++++++++++++++++- dlls/windows.gaming.input/main.c | 5 ++-- dlls/windows.gaming.input/private.h | 2 +- 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index 75ead342004..27c5d6ebd32 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -27,6 +27,7 @@ struct controller_statics { IActivationFactory IActivationFactory_iface; IRawGameControllerStatics IRawGameControllerStatics_iface; + ICustomGameControllerFactory ICustomGameControllerFactory_iface; LONG ref; }; @@ -56,6 +57,12 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_ICustomGameControllerFactory )) + { + IInspectable_AddRef( (*out = &impl->ICustomGameControllerFactory_iface) ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -189,11 +196,48 @@ static const struct IRawGameControllerStaticsVtbl statics_vtbl = statics_FromGameController, }; +DEFINE_IINSPECTABLE( controller_factory, ICustomGameControllerFactory, struct controller_statics, IActivationFactory_iface ) + +static HRESULT WINAPI controller_factory_CreateGameController( ICustomGameControllerFactory *iface, IGameControllerProvider *provider, + IInspectable **value ) +{ + FIXME( "iface %p, provider %p, value %p stub!\n", iface, provider, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_factory_OnGameControllerAdded( ICustomGameControllerFactory *iface, IGameController *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_factory_OnGameControllerRemoved( ICustomGameControllerFactory *iface, IGameController *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct ICustomGameControllerFactoryVtbl controller_factory_vtbl = +{ + controller_factory_QueryInterface, + controller_factory_AddRef, + controller_factory_Release, + /* IInspectable methods */ + controller_factory_GetIids, + controller_factory_GetRuntimeClassName, + controller_factory_GetTrustLevel, + /* ICustomGameControllerFactory methods */ + controller_factory_CreateGameController, + controller_factory_OnGameControllerAdded, + controller_factory_OnGameControllerRemoved, +}; + static struct controller_statics controller_statics = { {&factory_vtbl}, {&statics_vtbl}, + {&controller_factory_vtbl}, 1, }; -IActivationFactory *controller_factory = &controller_statics.IActivationFactory_iface; +ICustomGameControllerFactory *controller_factory = &controller_statics.ICustomGameControllerFactory_iface; diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index 03d47e1ce2f..d4bfec108ef 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -169,6 +169,7 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** { static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; const WCHAR *buffer = WindowsGetStringRawBuffer( class_str, NULL ); + HRESULT hr = S_OK; TRACE( "class %s, factory %p.\n", debugstr_w(buffer), factory ); @@ -177,13 +178,13 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** *factory = NULL; if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_RawGameController )) - IActivationFactory_AddRef( (*factory = controller_factory) ); + hr = ICustomGameControllerFactory_QueryInterface( controller_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Gamepad )) IActivationFactory_AddRef( (*factory = gamepad_factory) ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Custom_GameControllerFactoryManager )) IActivationFactory_AddRef( (*factory = manager_factory) ); - if (*factory) return S_OK; + if (SUCCEEDED(hr) && *factory) return S_OK; return REGDB_E_CLASSNOTREG; } diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index a0bd45b3f20..fbec3d8189d 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -36,7 +36,7 @@ #include "windows.gaming.input.custom.h" extern HINSTANCE windows_gaming_input; -extern IActivationFactory *controller_factory; +extern ICustomGameControllerFactory *controller_factory; extern IActivationFactory *gamepad_factory; extern IActivationFactory *manager_factory;

1 0

Rémi Bernon : windows.gaming.input: Make QueryInterface implementations consistent.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 0d3c026bdbac619fb78026a090a3592575df6768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d3c026bdbac619fb78026a0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 7 10:40:23 2022 +0100 windows.gaming.input: Make QueryInterface implementations consistent. When COM aggregation is involved it is important to add a reference to the returned iface and not to the inner object. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/controller.c | 6 ++---- dlls/windows.gaming.input/gamepad.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index 654d0795eac..75ead342004 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -46,15 +46,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID IsEqualGUID( iid, &IID_IAgileObject ) || IsEqualGUID( iid, &IID_IActivationFactory )) { - IUnknown_AddRef( iface ); - *out = iface; + IInspectable_AddRef( (*out = &impl->IActivationFactory_iface) ); return S_OK; } if (IsEqualGUID( iid, &IID_IRawGameControllerStatics )) { - IUnknown_AddRef( iface ); - *out = &impl->IRawGameControllerStatics_iface; + IInspectable_AddRef( (*out = &impl->IRawGameControllerStatics_iface) ); return S_OK; } diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index 231e923b5e8..ab95b4c8d89 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -46,15 +46,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID IsEqualGUID( iid, &IID_IAgileObject ) || IsEqualGUID( iid, &IID_IActivationFactory )) { - IUnknown_AddRef( iface ); - *out = iface; + IInspectable_AddRef( (*out = &impl->IActivationFactory_iface) ); return S_OK; } if (IsEqualGUID( iid, &IID_IGamepadStatics )) { - IUnknown_AddRef( iface ); - *out = &impl->IGamepadStatics_iface; + IInspectable_AddRef( (*out = &impl->IGamepadStatics_iface) ); return S_OK; }

1 0

Martin Storsjö : configure: Tweak PE tools suggestion for ARM64.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: ebe0fce6e4a2c89ed322b90c78aa9c942d44d3f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebe0fce6e4a2c89ed322b90c… Author: Martin Storsjö <martin(a)martin.st> Date: Mon Mar 7 12:05:12 2022 +0200 configure: Tweak PE tools suggestion for ARM64. llvm-mingw isn't strictly required - plain clang, llvm-dlltool and lld also suffice. Those tools are commonly available in distribution packages. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 3df610cbf11..8cdee2b354a 100755 --- a/configure +++ b/configure @@ -11747,7 +11747,7 @@ esac fi case $host_cpu in - aarch64*) test "x$CROSSTARGET" != x || as_fn_error $? "PE cross-compilation is required for ARM64, please install llvm-mingw." "$LINENO" 5 ;; + aarch64*) test "x$CROSSTARGET" != x || as_fn_error $? "PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5 ;; esac diff --git a/configure.ac b/configure.ac index ab3490b21cd..8fcdb15bbad 100644 --- a/configure.ac +++ b/configure.ac @@ -990,7 +990,7 @@ WINE_NOTICE_WITH(mingw,[test "x$CROSSTARGET" = "x"], [MinGW compiler not found, cross-compiling PE files won't be supported.]) case $host_cpu in - aarch64*) test "x$CROSSTARGET" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install llvm-mingw.]) ;; + aarch64*) test "x$CROSSTARGET" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.]) ;; esac dnl **** External libraries ****

1 0

Santino Mazza : bcrypt: Validate key size when importing RSA public key.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 83bb9eb9aa4444c187a5f93917387e663114a960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83bb9eb9aa4444c187a5f939… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Mon Mar 7 09:43:59 2022 +0100 bcrypt: Validate key size when importing RSA public key. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 1 + dlls/bcrypt/tests/bcrypt.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 0fb78ce39a5..072b7915b1e 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1413,6 +1413,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; + if (size != input_len) return NTE_BAD_DATA; return key_asymmetric_create( (struct key **)ret_key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ); } else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB )) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 5fb29a0e0ff..4d7516a55ac 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2122,11 +2122,9 @@ static void test_RSA(void) ret = BCryptDestroyKey(key); ok(!ret, "got %#lx\n", ret); - todo_wine - { - ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlobWithInvalidPublicExpSize, sizeof(rsaPublicBlobWithInvalidPublicExpSize), 0); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlobWithInvalidPublicExpSize, + sizeof(rsaPublicBlobWithInvalidPublicExpSize), 0); ok(ret == NTE_BAD_DATA, "got %#lx\n", ret); - } ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, buf, size, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);

1 0

Christopher Egert : gsm: Enable WAV49 support.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 9799fa80091eeb38865f62fccc8abaaa6e51c52a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9799fa80091eeb38865f62fc… Author: Christopher Egert <cme3000(a)gmail.com> Date: Sun Mar 6 18:33:02 2022 +0100 gsm: Enable WAV49 support. Fixes a regression introduced by 0e7fd41af953b2a9fa23cf6920fac229f2dd2e44 causing missing audio elements in the 64k intros elysian by logicoma and clean state by conspiracy. Signed-off-by: Christopher Egert <cme3000(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/gsm/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/gsm/Makefile.in b/libs/gsm/Makefile.in index 482004cab8d..36c749aa60f 100644 --- a/libs/gsm/Makefile.in +++ b/libs/gsm/Makefile.in @@ -1,5 +1,6 @@ EXTLIB = libgsm.a EXTRAINCL = -I$(srcdir)/inc +EXTRADEFS = -DWAV49 C_SRCS = \ src/add.c \

1 0

Francois Gouget : vkd3d-shader/spirv: Fix the spelling of some comments.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: vkd3d Branch: master Commit: b64482e7c7a6f278266bf80c7f07362e0db3e8ee URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b64482e7c7a6f278266bf80… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 7 16:20:23 2022 +0100 vkd3d-shader/spirv: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1bb4c404..bb5e8c6f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1,6 +1,6 @@ /* * Copyright 2017 Józef Kucia for CodeWeavers - * Copyright 2021 Conor McCarthy for Codeweavers + * Copyright 2021 Conor McCarthy for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -7425,7 +7425,7 @@ static void vkd3d_dxbc_compiler_emit_f16tof32(struct vkd3d_dxbc_compiler *compil type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, 2); scalar_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, 1); - /* FIXME: Consider a single UnpackHalf2x16 intruction per 2 components. */ + /* FIXME: Consider a single UnpackHalf2x16 instruction per 2 components. */ assert(dst->write_mask & VKD3DSP_WRITEMASK_ALL); for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) { @@ -7459,7 +7459,7 @@ static void vkd3d_dxbc_compiler_emit_f32tof16(struct vkd3d_dxbc_compiler *compil scalar_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); zero_id = vkd3d_dxbc_compiler_get_constant_float(compiler, 0.0f); - /* FIXME: Consider a single PackHalf2x16 intruction per 2 components. */ + /* FIXME: Consider a single PackHalf2x16 instruction per 2 components. */ assert(dst->write_mask & VKD3DSP_WRITEMASK_ALL); for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) { @@ -7802,7 +7802,7 @@ static int vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_c /* The OpSwitch instruction is inserted when the endswitch * instruction is processed because we do not know the number - * of case statments in advance.*/ + * of case statements in advance.*/ vkd3d_spirv_begin_function_stream_insertion(builder, cf_info->u.switch_.stream_location); vkd3d_spirv_build_op_switch(builder, cf_info->u.switch_.selector_id, cf_info->u.switch_.default_block_id, cf_info->u.switch_.case_blocks,

1 0

Francois Gouget : announce: Fix a typo in the libvkd3d-shader new interfaces section.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: vkd3d Branch: master Commit: ab3855133d21ea79739e2c30ac3140c647b9fc6b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ab3855133d21ea79739e2c3… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 7 15:38:22 2022 +0100 announce: Fix a typo in the libvkd3d-shader new interfaces section. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ANNOUNCE b/ANNOUNCE index 29a627fc..163e24d9 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -88,7 +88,7 @@ New interfaces: Direct3D 12 and Vulkan binding models. - The VKD3D_SHADER_COMPILE_OPTION_API_VERSION compile option can be used to specify the version of the libvkd3d-shader API the - application is targetting. If left unspecified, + application is targeting. If left unspecified, VKD3D_SHADER_API_VERSION_1_2 will be used. - Various shader translation fixes, for tessellation shaders in particular.

1 0

Francois Gouget : vkd3d: Fix the spelling of a couple of trace message.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: vkd3d Branch: master Commit: 419c746806969884b42ea770eb228f991725a4e4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=419c746806969884b42ea77… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 7 15:37:39 2022 +0100 vkd3d: Fix the spelling of a couple of trace message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 2 +- libs/vkd3d/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e7375fb8..f9b3389f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5982,7 +5982,7 @@ static void STDMETHODCALLTYPE d3d12_command_queue_SetMarker(ID3D12CommandQueue * static void STDMETHODCALLTYPE d3d12_command_queue_BeginEvent(ID3D12CommandQueue *iface, UINT metadata, const void *data, UINT size) { - FIXME("iface %p, metatdata %#x, data %p, size %u stub!\n", + FIXME("iface %p, metadata %#x, data %p, size %u stub!\n", iface, metadata, data, size); } diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 59fa9af9..1ccd242a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3736,7 +3736,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateFence(ID3D12Device *iface, struct d3d12_fence *object; HRESULT hr; - TRACE("iface %p, intial_value %#"PRIx64", flags %#x, riid %s, fence %p.\n", + TRACE("iface %p, initial_value %#"PRIx64", flags %#x, riid %s, fence %p.\n", iface, initial_value, flags, debugstr_guid(riid), fence); if (FAILED(hr = d3d12_fence_create(device, initial_value, flags, &object)))

1 0

Francois Gouget : vkd3d: Add a trailing linefeed to a couple of WARN() messages.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: vkd3d Branch: master Commit: c1e376911ef4fd02803179b947a8b1c470179463 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c1e376911ef4fd02803179b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 7 15:37:24 2022 +0100 vkd3d: Add a trailing linefeed to a couple of WARN() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2d3954d2..0e7800a4 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1862,7 +1862,7 @@ static HRESULT vkd3d_create_compute_pipeline(struct d3d12_device *device, VK_CALL(vkDestroyShaderModule(device->vk_device, pipeline_info.stage.module, NULL)); if (vr < 0) { - WARN("Failed to create Vulkan compute pipeline, hr %#x.", hr); + WARN("Failed to create Vulkan compute pipeline, hr %#x.\n", hr); return hresult_from_vk_result(vr); } @@ -2664,7 +2664,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } if (rt_desc->BlendEnable && rt_desc->LogicOpEnable) { - WARN("Only one of BlendEnable or LogicOpEnable can be set to TRUE."); + WARN("Only one of BlendEnable or LogicOpEnable can be set to TRUE.\n"); hr = E_INVALIDARG; goto fail; }

1 0

Zebediah Figura : vkd3d-utils: Simplify handling of shader messages a bit.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: vkd3d Branch: master Commit: fc5df4d3307ed6d2118e983a7c3927e7ffeaeac5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fc5df4d3307ed6d2118e983… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 6 20:04:35 2022 -0600 vkd3d-utils: Simplify handling of shader messages a bit. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-utils/vkd3d_utils_main.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 9607eddd..22953c46 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -263,20 +263,18 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen } ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages); - if (messages) + + if (messages && messages_blob) { - if (messages_blob) + if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob))) { - if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob))) - { - vkd3d_shader_free_messages(messages); - vkd3d_shader_free_shader_code(&byte_code); - return hr; - } - } - else vkd3d_shader_free_messages(messages); + vkd3d_shader_free_shader_code(&byte_code); + return hr; + } + messages = NULL; } + vkd3d_shader_free_messages(messages); if (!ret) { @@ -351,20 +349,18 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename preprocess_info.include_context = include; ret = vkd3d_shader_preprocess(&compile_info, &preprocessed_code, &messages); - if (messages) + + if (messages && messages_blob) { - if (messages_blob) + if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob))) { - if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob))) - { - vkd3d_shader_free_messages(messages); - vkd3d_shader_free_shader_code(&preprocessed_code); - return hr; - } - } - else vkd3d_shader_free_messages(messages); + vkd3d_shader_free_shader_code(&preprocessed_code); + return hr; + } + messages = NULL; } + vkd3d_shader_free_messages(messages); if (!ret) {

1 0

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 March 2022