October 2022 - Wine-commits

Ziqing Hui : win32u: Add font links for MS Gothic.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: 7afdc11cd2bd0955394246e737c7c02617c9ddf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/7afdc11cd2bd0955394246e737c7c0… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 18 17:33:54 2022 +0800 win32u: Add font links for MS Gothic. --- dlls/win32u/font.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 5ba111436d7..9ead47e1983 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1500,6 +1500,10 @@ static const WCHAR microsoft_sans_serifW[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; +static const WCHAR ms_gothicW[] = + {'M','S',' ','G','o','t','h','i','c',0}; +static const WCHAR ms_p_gothicW[] = + {'M','S',' ','P','G','o','t','h','i','c',0}; static const WCHAR ms_ui_gothicW[] = {'M','S',' ','U','I',' ','G','o','t','h','i','c',0}; static const WCHAR sim_sunW[] = @@ -1626,9 +1630,30 @@ static const char system_link_tahoma_non_cjk[] = "MALGUN.TTF,Malgun Gothic\0" "SEGUISYM.TTF,Segoe UI Symbol\0"; +static const char system_link_ms_gothic[] = + "MINGLIU.TTC,MingLiU\0" + "SIMSUN.TTC,SimSun\0" + "GULIM.TTC,GulimChe\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_ms_p_gothic[] = + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + static const char system_link_ms_ui_gothic[] = "MICROSS.TTF,Microsoft Sans Serif\0" - "MINGLIU.TTC,PMingLiU\0""SIMSUN.TTC,SimSun\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" "GULIM.TTC,Gulim\0" "YUGOTHM.TTC,Yu Gothic UI\0" "MSJH.TTC,Microsoft JhengHei UI\0" @@ -1793,6 +1818,8 @@ default_system_link[] = system_link_tahoma_jp, sizeof(system_link_tahoma_jp), system_link_tahoma_kr, sizeof(system_link_tahoma_kr), }, + { ms_gothicW, FALSE, system_link_ms_gothic, sizeof(system_link_ms_gothic) }, + { ms_p_gothicW, FALSE, system_link_ms_p_gothic, sizeof(system_link_ms_p_gothic) }, { ms_ui_gothicW, FALSE, system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic) }, { microsoft_jheng_heiW, FALSE, system_link_microsoft_jheng_hei, sizeof(system_link_microsoft_jheng_hei) }, { microsoft_jheng_hei_boldW, FALSE, system_link_microsoft_jheng_hei_bold, sizeof(system_link_microsoft_jheng_hei_bold) },

1 0

Eric Pouech : oleaut32/tests: Fix test failing on UTF-8 locale.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: fe5989bbd26c43c04948dd29bbd67bd1ec8c250f URL: https://gitlab.winehq.org/wine/wine/-/commit/fe5989bbd26c43c04948dd29bbd67b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Oct 20 16:14:38 2022 +0200 oleaut32/tests: Fix test failing on UTF-8 locale. Method decriptor's strings are internally stored in ANSI, and potentially converted from Unicode using current code page. Test was expecting loss in Unicode to ANSI conversion. Adapt test to also support loss-less conversion (that's the case when code page is UTF-8). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52873 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/oleaut32/tests/typelib.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 2e926a5bc36..e0ad9719f1c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -104,6 +104,19 @@ static const BOOL abi_supports_stdcall = TRUE; static const BOOL abi_supports_stdcall = FALSE; #endif +static BOOL compare_wstr(const WCHAR* wstr, const WCHAR* ref) +{ + char nameA[16]; + WCHAR nameW[16]; + + if (!wcscmp(wstr, ref)) return TRUE; /* for UTF code pages */ + + WideCharToMultiByte(CP_ACP, 0, ref, -1, nameA, sizeof(nameA), NULL, NULL); + MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, ARRAY_SIZE(nameW)); + + return !wcscmp(wstr, nameW); +} + static HRESULT WINAPI collection_QueryInterface(ICollection *iface, REFIID riid, void **ret) { if (IsEqualIID(riid, &IID_IUnknown) || @@ -1975,8 +1988,6 @@ static void test_CreateTypeLib(SYSKIND sys) { TYPEKIND kind; DESCKIND desckind; BINDPTR bindptr; - char nameA[16]; - WCHAR nameW[16]; switch(sys){ case SYS_WIN32: @@ -2484,9 +2495,6 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(hres == S_OK, "got %08lx\n", hres); SysFreeString(V_BSTR(&paramdescex.varDefaultValue)); - WideCharToMultiByte(CP_ACP, 0, defaultW, -1, nameA, sizeof(nameA), NULL, NULL); - MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, ARRAY_SIZE(nameW)); - hres = ITypeInfo2_GetFuncDesc(ti2, 3, &pfuncdesc); ok(hres == S_OK, "got %08lx\n", hres); @@ -2511,7 +2519,7 @@ static void test_CreateTypeLib(SYSKIND sys) { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), + ok(compare_wstr(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -2523,7 +2531,7 @@ static void test_CreateTypeLib(SYSKIND sys) { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), + ok(compare_wstr(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -3311,7 +3319,7 @@ todo_wine { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), + ok(compare_wstr(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -3323,7 +3331,7 @@ todo_wine { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), + ok(compare_wstr(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)));

1 0

Etaash Mathamsetty : ntoskrnl.exe: Implement IoCreateNotificationEvent.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: e740eaee08479c71f2d3021fef620a99ea7fd7d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/e740eaee08479c71f2d3021fef620a… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Thu Oct 13 19:42:22 2022 -0400 ntoskrnl.exe: Implement IoCreateNotificationEvent. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ---------- dlls/ntoskrnl.exe/sync.c | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6f5564042a6..2c080eaf9f6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4075,16 +4075,6 @@ NTSTATUS WINAPI IoCreateFile(HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUT create_options, ea_buffer, ea_length, file_type, parameters, options, NULL); } -/*********************************************************************** - * IoCreateNotificationEvent (NTOSKRNL.EXE.@) - */ -PKEVENT WINAPI IoCreateNotificationEvent(UNICODE_STRING *name, HANDLE *handle) -{ - FIXME( "stub: %s %p\n", debugstr_us(name), handle ); - return NULL; -} - - /************************************************************************** * __chkstk (NTOSKRNL.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index b8239b0cd7d..409d5752547 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -231,6 +231,32 @@ PKEVENT WINAPI IoCreateSynchronizationEvent( UNICODE_STRING *name, HANDLE *ret_h return event; } +/*********************************************************************** + * IoCreateNotificationEvent (NTOSKRNL.EXE.@) + */ +PKEVENT WINAPI IoCreateNotificationEvent( UNICODE_STRING *name, HANDLE *ret_handle ) +{ + OBJECT_ATTRIBUTES attr; + HANDLE handle; + KEVENT *event; + NTSTATUS ret; + + TRACE( "(%s %p)\n", debugstr_us(name), ret_handle ); + + InitializeObjectAttributes( &attr, name, 0, 0, NULL ); + ret = NtCreateEvent( &handle, EVENT_ALL_ACCESS, &attr, NotificationEvent, TRUE ); + if (ret) return NULL; + + if (kernel_object_from_handle( handle, ExEventObjectType, (void**)&event )) + { + NtClose(handle); + return NULL; + } + + *ret_handle = handle; + return event; +} + /*********************************************************************** * KeSetEvent (NTOSKRNL.EXE.@) */

1 0

Etaash Mathamsetty : ntoskrnl.exe: Fix formatting in IoCreateSynchronizationEvent.
by Alexandre Julliard 20 Oct '22

20 Oct '22

Module: wine Branch: master Commit: f58c48b85e4e1379223b1a51df7c4ed483a745db URL: https://gitlab.winehq.org/wine/wine/-/commit/f58c48b85e4e1379223b1a51df7c4e… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Thu Oct 13 19:44:54 2022 -0400 ntoskrnl.exe: Fix formatting in IoCreateSynchronizationEvent. --- dlls/ntoskrnl.exe/sync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 409d5752547..ada468c73dc 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -215,7 +215,7 @@ PKEVENT WINAPI IoCreateSynchronizationEvent( UNICODE_STRING *name, HANDLE *ret_h KEVENT *event; NTSTATUS ret; - TRACE( "(%p %p)\n", name, ret_handle ); + TRACE( "(%s %p)\n", debugstr_us(name), ret_handle ); InitializeObjectAttributes( &attr, name, 0, 0, NULL ); ret = NtCreateEvent( &handle, EVENT_ALL_ACCESS, &attr, SynchronizationEvent, TRUE ); @@ -223,7 +223,7 @@ PKEVENT WINAPI IoCreateSynchronizationEvent( UNICODE_STRING *name, HANDLE *ret_h if (kernel_object_from_handle( handle, ExEventObjectType, (void**)&event )) { - NtClose( handle); + NtClose( handle ); return NULL; }

1 0

Alex Henrie : uuid: Add devguid.h.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: e72a16b57f66b63a16bb3d1619ac4d42632cb141 URL: https://gitlab.winehq.org/wine/wine/-/commit/e72a16b57f66b63a16bb3d1619ac4d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 18 22:51:52 2022 -0600 uuid: Add devguid.h. Needed to compile Tera Term. --- dlls/dinput/dinput_main.c | 2 +- dlls/dinput/tests/hid.c | 2 +- dlls/setupapi/tests/devinst.c | 2 +- libs/uuid/uuid.c | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 9738397ef5a..d3db22c70b5 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -43,8 +43,8 @@ #include "winerror.h" #include "objbase.h" #include "rpcproxy.h" -#include "initguid.h" #include "devguid.h" +#include "initguid.h" #include "dinputd.h" #include "dinput_private.h" diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 6a0d7a52fab..5467af32493 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -40,6 +40,7 @@ #include "cfgmgr32.h" #include "newdev.h" #include "dbt.h" +#include "devguid.h" #include "objbase.h" @@ -51,7 +52,6 @@ #include "ddk/hidsdi.h" #include "ddk/hidpi.h" #include "ddk/hidport.h" -#include "devguid.h" #include "dinput.h" #include "dinputd.h" #include "hidusage.h" diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index bfa564fe746..c4eebdf0ab8 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -26,8 +26,8 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" -#include "initguid.h" #include "devguid.h" +#include "initguid.h" #include "devpkey.h" #include "setupapi.h" #include "cfgmgr32.h" diff --git a/libs/uuid/uuid.c b/libs/uuid/uuid.c index aa7ad3dd678..1ba0397414e 100644 --- a/libs/uuid/uuid.c +++ b/libs/uuid/uuid.c @@ -91,6 +91,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "shimgdata.h" #include "comsvcs.h" #include "directmanipulation.h" +#include "devguid.h" #define __WINE_INIT_NPI_MODULEID #include "netiodef.h"

1 0

Biswapriyo Nath : include: Add the PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER typedef.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: c9198735fd44762ead120ac2509a3c59b8768915 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c9198735fd44762ead120ac2509a3… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 20 10:26:08 2022 +0530 include: Add the PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER typedef. --- include/vkd3d_d3d12.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index e30df590..0f93b9bc 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2621,6 +2621,9 @@ interface ID3D12VersionedRootSignatureDeserializer : IUnknown const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *GetUnconvertedRootSignatureDesc(); }; +typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)( + const void *data, SIZE_T data_size, REFIID iid, void **deserializer); + [local] HRESULT __stdcall D3D12CreateRootSignatureDeserializer( const void *data, SIZE_T data_size, REFIID iid, void **deserializer);

1 0

Biswapriyo Nath : include: Add the PFN_D3D12_SERIALIZE_ROOT_SIGNATURE typedef.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: 6f1f14d97a9f7688d1c838060180035c15f30613 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6f1f14d97a9f7688d1c8380601800… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 20 10:26:08 2022 +0530 include: Add the PFN_D3D12_SERIALIZE_ROOT_SIGNATURE typedef. --- include/vkd3d_d3d12.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 0f93b9bc..394dfa50 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2633,6 +2633,10 @@ typedef HRESULT (__stdcall *PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZ [local] HRESULT __stdcall D3D12CreateVersionedRootSignatureDeserializer( const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +typedef HRESULT (__stdcall *PFN_D3D12_SERIALIZE_ROOT_SIGNATURE)( + const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, + D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); + [local] HRESULT __stdcall D3D12SerializeRootSignature( const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob);

1 0

Zebediah Figura : tests: Add a basic shader test for compute shaders.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: 75494a4ae697583b246223c215f18b8a1e96c133 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/75494a4ae697583b246223c215f18… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 13 16:37:31 2021 -0500 tests: Add a basic shader test for compute shaders. --- Makefile.am | 1 + tests/compute.shader_test | 21 +++++ tests/d3d12.c | 20 ---- tests/d3d12_test_utils.h | 20 ++++ tests/shader_runner.c | 31 +++++- tests/shader_runner.h | 2 + tests/shader_runner_d3d11.c | 101 +++++++++++++++++--- tests/shader_runner_d3d12.c | 220 +++++++++++++++++++++++++++++++++---------- tests/shader_runner_d3d9.c | 6 ++ tests/shader_runner_vulkan.c | 75 +++++++++++++-- tests/vulkan_procs.h | 2 + 11 files changed, 406 insertions(+), 93 deletions(-)

1 0

Zebediah Figura : tests: Add a basic shader test for typed UAV loads.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: 62fd13059b9d62832ed51a6bfa926c3b6f0e98d7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/62fd13059b9d62832ed51a6bfa926… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 13 16:51:10 2021 -0500 tests: Add a basic shader test for typed UAV loads. --- Makefile.am | 1 + tests/uav-load.shader_test | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/Makefile.am b/Makefile.am index 66a93ab4..1340be10 100644 --- a/Makefile.am +++ b/Makefile.am @@ -146,6 +146,7 @@ vkd3d_shader_tests = \ tests/texture-load-typed.shader_test \ tests/trigonometry.shader_test \ tests/uav.shader_test \ + tests/uav-load.shader_test \ tests/writemask-assignop-0.shader_test \ tests/writemask-assignop-1.shader_test \ tests/writemask-assignop-2.shader_test \ diff --git a/tests/uav-load.shader_test b/tests/uav-load.shader_test new file mode 100644 index 00000000..88adb6d5 --- /dev/null +++ b/tests/uav-load.shader_test @@ -0,0 +1,30 @@ +[require] +shader model >= 5.0 + +[uav 0] +format r32 float +size (3, 1) + +0.1 0.2 0.3 + +[uav 1] +format r32 float +size (1, 1) + +0.5 + +[compute shader] +RWTexture2D<float> u, v; + [numthreads(1, 1, 1)] +void main() +{ + u[uint2(1, 0)] = (u[uint2(0, 0)] += v[uint2(0, 0)]); + u[uint2(2, 0)] = u[uint2(0, 0)]; +} + +[test] +todo dispatch 1 1 1 +probe uav 0 (0, 0) r (0.6) +probe uav 0 (1, 0) r (0.6) +probe uav 0 (2, 0) r (0.6) +probe uav 1 (0, 0) r (0.5)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Cast array indices inside of add_array_load().
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: 7115a94063e91151d4c3a89ef067a9bd275ccdd0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7115a94063e91151d4c3a89ef067a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 13 22:33:08 2022 -0500 vkd3d-shader/hlsl: Cast array indices inside of add_array_load(). Mostly in the interest of keeping the yacc code as simple as possible. --- libs/vkd3d-shader/hlsl.y | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 03004c60..dbb9571d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -748,23 +748,35 @@ static bool add_matrix_index(struct hlsl_ctx *ctx, struct list *instrs, } static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *array, - struct hlsl_ir_node *index, const struct vkd3d_shader_location loc) + struct hlsl_ir_node *index, const struct vkd3d_shader_location *loc) { const struct hlsl_type *expr_type = array->data_type; + struct hlsl_ir_expr *cast; + + if (index->data_type->type != HLSL_CLASS_SCALAR) + { + hlsl_error(ctx, &index->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Array index is not scalar."); + return false; + } + + if (!(cast = hlsl_new_cast(ctx, index, hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT), &index->loc))) + return false; + list_add_tail(instrs, &cast->node.entry); + index = &cast->node; if (expr_type->type == HLSL_CLASS_MATRIX) - return add_matrix_index(ctx, instrs, array, index, &loc); + return add_matrix_index(ctx, instrs, array, index, loc); if (expr_type->type != HLSL_CLASS_ARRAY && expr_type->type != HLSL_CLASS_VECTOR) { if (expr_type->type == HLSL_CLASS_SCALAR) - hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX, "Scalar expressions cannot be array-indexed."); + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX, "Scalar expressions cannot be array-indexed."); else - hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX, "Expression cannot be array-indexed."); + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_INDEX, "Expression cannot be array-indexed."); return false; } - if (!add_load_index(ctx, instrs, array, index, &loc)) + if (!add_load_index(ctx, instrs, array, index, loc)) return false; return true; @@ -4209,26 +4221,11 @@ postfix_expr: | postfix_expr '[' expr ']' { struct hlsl_ir_node *array = node_from_list($1), *index = node_from_list($3); - struct hlsl_ir_expr *cast; list_move_tail($1, $3); vkd3d_free($3); - if (index->data_type->type != HLSL_CLASS_SCALAR) - { - hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Array index is not scalar."); - destroy_instr_list($1); - YYABORT; - } - - if (!(cast = hlsl_new_cast(ctx, index, hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT), &index->loc))) - { - destroy_instr_list($1); - YYABORT; - } - list_add_tail($1, &cast->node.entry); - - if (!add_array_load(ctx, $1, array, &cast->node, @2)) + if (!add_array_load(ctx, $1, array, index, &@2)) { destroy_instr_list($1); YYABORT;

1 0