August 2023 - Wine-commits - list.winehq.org

Zebediah Figura : wined3d: Move struct wined3d_shader_resource_view_gl to wined3d_gl.h.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: wine Branch: master Commit: 62510642a0823d709d4dda30014c872887722ee0 URL: https://gitlab.winehq.org/wine/wine/-/commit/62510642a0823d709d4dda30014c87… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:29:20 2023 -0600 wined3d: Move struct wined3d_shader_resource_view_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 23 +++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 25 +------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index c6cfd3606e4..40abd36f3b7 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1068,4 +1068,27 @@ HRESULT wined3d_rendertarget_view_gl_init(struct wined3d_rendertarget_view_gl *v const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops); +struct wined3d_shader_resource_view_gl +{ + struct wined3d_shader_resource_view v; + struct wined3d_bo_user bo_user; + struct wined3d_gl_view gl_view; +}; + +static inline struct wined3d_shader_resource_view_gl *wined3d_shader_resource_view_gl( + struct wined3d_shader_resource_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_shader_resource_view_gl, v); +} + +void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, unsigned int unit, + struct wined3d_sampler_gl *sampler_gl, struct wined3d_context_gl *context_gl); +void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resource_view_gl *srv_gl, + struct wined3d_context_gl *context_gl); +HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view_gl *view_gl, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops); +void wined3d_shader_resource_view_gl_update(struct wined3d_shader_resource_view_gl *srv_gl, + struct wined3d_context_gl *context_gl); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 699dbe585d6..7a4766b5736 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3991,8 +3991,6 @@ HRESULT wined3d_rendertarget_view_no3d_init(struct wined3d_rendertarget_view *vi const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -#include "wined3d_gl.h" - struct wined3d_shader_resource_view { LONG refcount; @@ -4008,28 +4006,7 @@ struct wined3d_shader_resource_view void wined3d_shader_resource_view_cleanup(struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; -struct wined3d_shader_resource_view_gl -{ - struct wined3d_shader_resource_view v; - struct wined3d_bo_user bo_user; - struct wined3d_gl_view gl_view; -}; - -static inline struct wined3d_shader_resource_view_gl *wined3d_shader_resource_view_gl( - struct wined3d_shader_resource_view *view) -{ - return CONTAINING_RECORD(view, struct wined3d_shader_resource_view_gl, v); -} - -void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, unsigned int unit, - struct wined3d_sampler_gl *sampler_gl, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; -void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resource_view_gl *srv_gl, - struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; -HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view_gl *view_gl, - const struct wined3d_view_desc *desc, struct wined3d_resource *resource, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -void wined3d_shader_resource_view_gl_update(struct wined3d_shader_resource_view_gl *srv_gl, - struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +#include "wined3d_gl.h" struct wined3d_unordered_access_view {

1 0

Torge Matthies : crypt32: Fix CMS SignedData encoding.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: wine Branch: master Commit: 75488b303b31501afbdb9b1dcd60130b8fc675fc URL: https://gitlab.winehq.org/wine/wine/-/commit/75488b303b31501afbdb9b1dcd6013… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Aug 21 04:02:55 2023 +0200 crypt32: Fix CMS SignedData encoding. Several items here were encoded conditionally even though they aren't marked as optional in the spec. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/crypt32/encode.c | 52 +++++++++++++++++------------------------------- dlls/crypt32/tests/msg.c | 38 +++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 34 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index adfdad96fd9..9e362b8db21 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4345,30 +4345,19 @@ static BOOL WINAPI CRYPT_AsnEncodeCMSSignerInfo(DWORD dwCertEncodingType, BOOL CRYPT_AsnEncodeCMSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData, DWORD *pcbData) { + struct DERSetDescriptor digestAlgorithmsSet = { signedInfo->cSignerInfo, + signedInfo->rgSignerInfo, sizeof(CMSG_CMS_SIGNER_INFO), + offsetof(CMSG_CMS_SIGNER_INFO, HashAlgorithm), + CRYPT_AsnEncodeAlgorithmIdWithNullParams }; struct AsnEncodeSequenceItem items[7] = { { &signedInfo->version, CRYPT_AsnEncodeInt, 0 }, + { &digestAlgorithmsSet, CRYPT_DEREncodeItemsAsSet, 0 }, + { &signedInfo->content, CRYPT_AsnEncodePKCSContentInfoInternal, 0 } }; - struct DERSetDescriptor digestAlgorithmsSet = { 0 }, certSet = { 0 }; - struct DERSetDescriptor crlSet = { 0 }, signerSet = { 0 }; + struct DERSetDescriptor certSet = { 0 }, crlSet = { 0 }, signerSet = { 0 }; struct AsnEncodeTagSwappedItem swapped[2] = { { 0 } }; - DWORD cItem = 1, cSwapped = 0; - BOOL ret = TRUE; + DWORD cItem = 3, cSwapped = 0; - if (signedInfo->cSignerInfo) - { - digestAlgorithmsSet.cItems = signedInfo->cSignerInfo; - digestAlgorithmsSet.items = signedInfo->rgSignerInfo; - digestAlgorithmsSet.itemSize = sizeof(CMSG_CMS_SIGNER_INFO); - digestAlgorithmsSet.itemOffset = - offsetof(CMSG_CMS_SIGNER_INFO, HashAlgorithm); - digestAlgorithmsSet.encode = CRYPT_AsnEncodeAlgorithmIdWithNullParams; - items[cItem].pvStructInfo = &digestAlgorithmsSet; - items[cItem].encodeFunc = CRYPT_DEREncodeItemsAsSet; - cItem++; - } - items[cItem].pvStructInfo = &signedInfo->content; - items[cItem].encodeFunc = CRYPT_AsnEncodePKCSContentInfoInternal; - cItem++; if (signedInfo->cCertEncoded) { certSet.cItems = signedInfo->cCertEncoded; @@ -4399,22 +4388,17 @@ BOOL CRYPT_AsnEncodeCMSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData, cSwapped++; cItem++; } - if (ret && signedInfo->cSignerInfo) - { - signerSet.cItems = signedInfo->cSignerInfo; - signerSet.items = signedInfo->rgSignerInfo; - signerSet.itemSize = sizeof(CMSG_CMS_SIGNER_INFO); - signerSet.itemOffset = 0; - signerSet.encode = CRYPT_AsnEncodeCMSSignerInfo; - items[cItem].pvStructInfo = &signerSet; - items[cItem].encodeFunc = CRYPT_DEREncodeItemsAsSet; - cItem++; - } - if (ret) - ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, - items, cItem, 0, NULL, pvData, pcbData); + signerSet.cItems = signedInfo->cSignerInfo; + signerSet.items = signedInfo->rgSignerInfo; + signerSet.itemSize = sizeof(CMSG_CMS_SIGNER_INFO); + signerSet.itemOffset = 0; + signerSet.encode = CRYPT_AsnEncodeCMSSignerInfo; + items[cItem].pvStructInfo = &signerSet; + items[cItem].encodeFunc = CRYPT_DEREncodeItemsAsSet; + cItem++; - return ret; + return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, + items, cItem, 0, NULL, pvData, pcbData); } static BOOL WINAPI CRYPT_AsnEncodeRecipientInfo(DWORD dwCertEncodingType, diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8b550ee8b88..fa48d978e17 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1256,6 +1256,18 @@ static void test_signed_msg_update(void) CRYPT_DELETEKEYSET); } +static const BYTE unsignedEmptyBareContent[] = { +0x30,0x0b,0x02,0x01,0x01,0x31,0x00,0x30,0x02,0x06,0x00,0x31,0x00 }; +static const BYTE unsignedEmptyContent[] = { +0x30,0x1a,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02,0xa0,0x0d, +0x30,0x0b,0x02,0x01,0x01,0x31,0x00,0x30,0x02,0x06,0x00,0x31,0x00 }; +static const BYTE detachedUnsignedBareContent[] = { +0x30,0x14,0x02,0x01,0x01,0x31,0x00,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x07,0x01,0x31,0x00 }; +static const BYTE detachedUnsignedContent[] = { +0x30,0x23,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02,0xa0,0x16, +0x30,0x14,0x02,0x01,0x01,0x31,0x00,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x07,0x01,0x31,0x00 }; static const BYTE signedEmptyBareContent[] = { 0x30,0x50,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86, 0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x02,0x06,0x00,0x31,0x37,0x30,0x35,0x02, @@ -1590,6 +1602,32 @@ static void test_signed_msg_encoding(void) HCRYPTKEY key; DWORD size; + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, + CMSG_DETACHED_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %lx\n", GetLastError()); + + check_param("detached unsigned empty bare content", msg, + CMSG_BARE_CONTENT_PARAM, unsignedEmptyBareContent, + sizeof(unsignedEmptyBareContent)); + check_param("detached unsigned empty content", msg, CMSG_CONTENT_PARAM, + unsignedEmptyContent, sizeof(unsignedEmptyContent)); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %lx\n", GetLastError()); + check_param("detached unsigned bare content", msg, CMSG_BARE_CONTENT_PARAM, + detachedUnsignedBareContent, sizeof(detachedUnsignedBareContent)); + check_param("detached unsigned content", msg, CMSG_CONTENT_PARAM, + detachedUnsignedContent, sizeof(detachedUnsignedContent)); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, + "Expected CRYPT_E_INVALID_INDEX, got %lx\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, + "Expected CRYPT_E_INVALID_INDEX, got %lx\n", GetLastError()); + + CryptMsgClose(msg); + certInfo.SerialNumber.cbData = sizeof(serialNum); certInfo.SerialNumber.pbData = serialNum; certInfo.Issuer.cbData = sizeof(encodedCommonName);

1 0

Akihiro Sagawa : cmd: Use towlower()/towupper() for WCHARs.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: wine Branch: master Commit: 91de94ab9967749c8e7ece8123db947f996b092f URL: https://gitlab.winehq.org/wine/wine/-/commit/91de94ab9967749c8e7ece8123db94… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 18 12:51:54 2023 +0900 cmd: Use towlower()/towupper() for WCHARs. Found with Coccinelle. --- programs/cmd/builtins.c | 2 +- programs/cmd/directory.c | 12 ++++-------- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 397eb567277..419e812103a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3496,7 +3496,7 @@ void WCMD_setshow_default (const WCHAR *args) { /* Restore old directory if drive letter would change, and CD x:\directory /D (or pushd c:\directory) not supplied */ if ((wcsstr(quals, L"/D") == NULL) && - (param1[1] == ':') && (toupper(param1[0]) != toupper(cwd[0]))) { + (param1[1] == ':') && (towupper(param1[0]) != towupper(cwd[0]))) { SetCurrentDirectoryW(cwd); } } diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index dfe7e925419..b9b8656fd70 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -328,10 +328,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le } /* /L convers all names to lower case */ - if (lower) { - WCHAR *p = fd[i].cFileName; - while ( (*p = tolower(*p)) ) ++p; - } + if (lower) wcslwr( fd[i].cFileName ); /* /Q gets file ownership information */ if (usernames) { @@ -558,8 +555,7 @@ void WCMD_directory (WCHAR *args) /* Prefill quals with (uppercased) DIRCMD env var */ if (GetEnvironmentVariableW(L"DIRCMD", string, ARRAY_SIZE(string))) { - p = string; - while ( (*p = toupper(*p)) ) ++p; + wcsupr( string ); lstrcatW(string,quals); lstrcpyW(quals, string); } @@ -827,7 +823,7 @@ void WCMD_directory (WCHAR *args) /* Output disk free (trailer) and volume information (header) if the drive letter changes */ - if (lastDrive != toupper(thisEntry->dirName[0])) { + if (lastDrive != towupper(thisEntry->dirName[0])) { /* Trailer Information */ if (lastDrive != '?') { @@ -835,7 +831,7 @@ void WCMD_directory (WCHAR *args) WCMD_dir_trailer(prevEntry->dirName[0]); } - lastDrive = toupper(thisEntry->dirName[0]); + lastDrive = towupper(thisEntry->dirName[0]); if (!bare) { WCHAR drive[3]; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 298606f6caa..528e4a83800 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -347,7 +347,7 @@ static void WCMD_show_prompt (BOOL newLine) { } else { p++; - switch (toupper(*p)) { + switch (towupper(*p)) { case '$': *q++ = '$'; break;

1 0

Akihiro Sagawa : cmd: DIR command outputs free space for the path.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: wine Branch: master Commit: 322c175cf0291d5c8543e0662a55082d0e53d001 URL: https://gitlab.winehq.org/wine/wine/-/commit/322c175cf0291d5c8543e0662a5508… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 18 12:51:54 2023 +0900 cmd: DIR command outputs free space for the path. When the path contains a mountpoint on Unix or a junction point to another drive on Windows, cmd.exe should show free space for the path instead of the root of the drive. --- programs/cmd/directory.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index b9b8656fd70..6efcbb3a841 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -503,16 +503,14 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /***************************************************************************** * WCMD_dir_trailer * - * Print out the trailer for the supplied drive letter + * Print out the trailer for the supplied path */ -static void WCMD_dir_trailer(WCHAR drive) { - ULARGE_INTEGER avail, total, freebytes; - DWORD status; - WCHAR driveName[] = L"c:\\"; - - driveName[0] = drive; - status = GetDiskFreeSpaceExW(driveName, &avail, &total, &freebytes); - WINE_TRACE("Writing trailer for '%s' gave %ld(%ld)\n", wine_dbgstr_w(driveName), +static void WCMD_dir_trailer(const WCHAR *path) { + ULARGE_INTEGER freebytes; + BOOL status; + + status = GetDiskFreeSpaceExW(path, NULL, NULL, &freebytes); + WINE_TRACE("Writing trailer for '%s' gave %d(%ld)\n", wine_dbgstr_w(path), status, GetLastError()); if (errorlevel==0 && !bare) { @@ -828,7 +826,7 @@ void WCMD_directory (WCHAR *args) /* Trailer Information */ if (lastDrive != '?') { trailerReqd = FALSE; - WCMD_dir_trailer(prevEntry->dirName[0]); + WCMD_dir_trailer(prevEntry->dirName); } lastDrive = towupper(thisEntry->dirName[0]); @@ -858,7 +856,7 @@ void WCMD_directory (WCHAR *args) /* Trailer Information */ if (trailerReqd) { - WCMD_dir_trailer(prevEntry->dirName[0]); + WCMD_dir_trailer(prevEntry->dirName); } exit:

1 0

Piotr Caban : ntdll: Don't overwrite last byte of RuntimeInfo if odd number of bytes is used.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: wine Branch: master Commit: c73bea16eb510c5806c9477eeacc63a6d5092f17 URL: https://gitlab.winehq.org/wine/wine/-/commit/c73bea16eb510c5806c9477eeacc63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 24 14:39:36 2023 +0200 ntdll: Don't overwrite last byte of RuntimeInfo if odd number of bytes is used. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55287 --- dlls/ntdll/unix/env.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 3f00f6f68de..f42c6a8f59f 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1702,7 +1702,7 @@ static inline void dup_unicode_string( const UNICODE_STRING *src, WCHAR **dst, U str->Length = src->Length; str->MaximumLength = src->MaximumLength; memcpy( *dst, src->Buffer, src->MaximumLength ); - *dst += src->MaximumLength / sizeof(WCHAR); + *dst += (src->MaximumLength + 1) / sizeof(WCHAR); } @@ -1798,7 +1798,7 @@ static void *build_wow64_parameters( const RTL_USER_PROCESS_PARAMETERS *params ) + params->WindowTitle.MaximumLength + params->Desktop.MaximumLength + params->ShellInfo.MaximumLength - + params->RuntimeInfo.MaximumLength + + ((params->RuntimeInfo.MaximumLength + 1) & ~1) + params->EnvironmentSize); status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&wow64_params, 0, &size,

1 0

Zebediah Figura : vkd3d-shader/hlsl: Force sm1 inputs to be 4-component only for vertex shaders.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: vkd3d Branch: master Commit: 926575a6f3fb7dee853280a58401eeb407f1afb5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/926575a6f3fb7dee853280a58401e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 13:00:45 2023 -0500 vkd3d-shader/hlsl: Force sm1 inputs to be 4-component only for vertex shaders. Pixel shaders still have an appropriate writemask. --- libs/vkd3d-shader/hlsl_codegen.c | 5 +++-- tests/vkd3d_shader_api.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index bfa605f4..bae8e5f9 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -321,9 +321,10 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct hlsl_block *block, s if (!semantic->name) return; - vector_type_src = hlsl_get_vector_type(ctx, type->base_type, - (ctx->profile->major_version < 4) ? 4 : hlsl_type_minor_size(type)); vector_type_dst = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type)); + vector_type_src = vector_type_dst; + if (ctx->profile->major_version < 4 && ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX) + vector_type_src = hlsl_get_vector_type(ctx, type->base_type, 4); for (i = 0; i < hlsl_type_major_size(type); ++i) { diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 4893f44f..af75e0fd 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -630,7 +630,7 @@ static void test_scan_signatures(void) { {"COLOR", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, {"TEXCOORD", 2, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 1, 0xf, 0xf}, - {"DEPTH", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf}, + {"DEPTH", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0x1, 0x1}, {"BLENDINDICES", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 3, 0xf, 0xf}, {"VPOS", 0, 0, VKD3D_SHADER_SV_POSITION, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, {"VFACE", 0, 0, VKD3D_SHADER_SV_IS_FRONT_FACE, VKD3D_SHADER_COMPONENT_FLOAT, 1, 0x1, 0x1},

1 0

Nikolay Sivov : tests: Add some tests for "if" statement attributes.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: vkd3d Branch: master Commit: 9605993af3ffe637f36fab2859bd5df7bebeb9c9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9605993af3ffe637f36fab2859bd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 10 09:27:57 2023 +0200 tests: Add some tests for "if" statement attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/hlsl/conditional.shader_test | 68 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/tests/hlsl/conditional.shader_test b/tests/hlsl/conditional.shader_test index d83596fc..2d2ba2e9 100644 --- a/tests/hlsl/conditional.shader_test +++ b/tests/hlsl/conditional.shader_test @@ -14,3 +14,71 @@ probe all rgba (0.9, 0.8, 0.7, 0.6) uniform 0 float4 0.1 0.0 0.0 0.0 draw quad probe all rgba (0.1, 0.2, 0.3, 0.4) + +[pixel shader todo] +float4 main(uniform float4 u) : sv_target +{ + [attr1] + if (u.x > 0.0) + return float4(0.1, 0.2, 0.3, 0.4); + else + return float4(0.9, 0.8, 0.7, 0.6); +} + +[pixel shader todo] +float4 main(uniform float4 u) : sv_target +{ + [flatten] + if (u.x > 0.0) + return float4(0.1, 0.2, 0.3, 0.4); + else + return float4(0.9, 0.8, 0.7, 0.6); +} + +[test] +uniform 0 float4 0.0 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.9, 0.8, 0.7, 0.6) + +[pixel shader fail] +float4 u; + +float main() : sv_target +{ + [branch] [branch] + if (u.x > 0.0) + return float4(0.1, 0.2, 0.3, 0.4); + else + return float4(0.9, 0.8, 0.7, 0.6); +} + +[pixel shader fail] +float4 u; + +float main() : sv_target +{ + [branch] [flatten] + if (u.x > 0.0) + return float4(0.1, 0.2, 0.3, 0.4); + else + return float4(0.9, 0.8, 0.7, 0.6); +} + +% Using older profiles fails to compile with forced control flow instruction +[require] +shader model >= 3.0 + +[pixel shader todo] +float4 main(uniform float4 u) : sv_target +{ + [branch] + if (u.x > 0.0) + return float4(0.1, 0.2, 0.3, 0.4); + else + return float4(0.9, 0.8, 0.7, 0.6); +} + +[test] +uniform 0 float4 0.0 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.9, 0.8, 0.7, 0.6)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Parse "if" statement attributes.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: vkd3d Branch: master Commit: 1153f6bb3496ad53df0caa2dd3767e9659a36733 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1153f6bb3496ad53df0caa2dd3767… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 10 10:03:49 2023 +0200 vkd3d-shader/hlsl: Parse "if" statement attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 36 +++++++++++++++++++++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl/conditional.shader_test | 16 +++++++------- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 29e0ff0c..048f7232 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -6108,19 +6108,39 @@ jump_statement: } selection_statement: - KW_IF '(' expr ')' if_body + attribute_list_optional KW_IF '(' expr ')' if_body { - struct hlsl_ir_node *condition = node_from_block($3); + struct hlsl_ir_node *condition = node_from_block($4); + const struct parse_attribute_list *attributes = &$1; struct hlsl_ir_node *instr; + unsigned int i; + + if (attribute_list_has_duplicates(attributes)) + hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Found duplicate attribute."); - if (!(instr = hlsl_new_if(ctx, condition, $5.then_block, $5.else_block, &@1))) + for (i = 0; i < attributes->count; ++i) { - destroy_block($5.then_block); - destroy_block($5.else_block); + const struct hlsl_attribute *attr = attributes->attrs[i]; + + if (!strcmp(attr->name, "branch") + || !strcmp(attr->name, "flatten")) + { + hlsl_warning(ctx, &@1, VKD3D_SHADER_WARNING_HLSL_IGNORED_ATTRIBUTE, "Unhandled attribute '%s'.", attr->name); + } + else + { + hlsl_warning(ctx, &@1, VKD3D_SHADER_WARNING_HLSL_UNKNOWN_ATTRIBUTE, "Unrecognized attribute '%s'.", attr->name); + } + } + + if (!(instr = hlsl_new_if(ctx, condition, $6.then_block, $6.else_block, &@2))) + { + destroy_block($6.then_block); + destroy_block($6.else_block); YYABORT; } - destroy_block($5.then_block); - destroy_block($5.else_block); + destroy_block($6.then_block); + destroy_block($6.else_block); if (condition->data_type->dimx > 1 || condition->data_type->dimy > 1) { struct vkd3d_string_buffer *string; @@ -6130,7 +6150,7 @@ selection_statement: "if condition type %s is not scalar.", string->buffer); hlsl_release_string_buffer(ctx, string); } - $$ = $3; + $$ = $4; hlsl_block_add_instr($$, instr); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index bf925a44..7cfaba56 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -140,6 +140,7 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_HLSL_UNKNOWN_ATTRIBUTE = 5302, VKD3D_SHADER_WARNING_HLSL_IMAGINARY_NUMERIC_RESULT = 5303, VKD3D_SHADER_WARNING_HLSL_NON_FINITE_RESULT = 5304, + VKD3D_SHADER_WARNING_HLSL_IGNORED_ATTRIBUTE = 5305, VKD3D_SHADER_ERROR_GLSL_INTERNAL = 6000, diff --git a/tests/hlsl/conditional.shader_test b/tests/hlsl/conditional.shader_test index 2d2ba2e9..b3b18dc1 100644 --- a/tests/hlsl/conditional.shader_test +++ b/tests/hlsl/conditional.shader_test @@ -15,7 +15,7 @@ uniform 0 float4 0.1 0.0 0.0 0.0 draw quad probe all rgba (0.1, 0.2, 0.3, 0.4) -[pixel shader todo] +[pixel shader] float4 main(uniform float4 u) : sv_target { [attr1] @@ -25,7 +25,7 @@ float4 main(uniform float4 u) : sv_target return float4(0.9, 0.8, 0.7, 0.6); } -[pixel shader todo] +[pixel shader] float4 main(uniform float4 u) : sv_target { [flatten] @@ -37,8 +37,8 @@ float4 main(uniform float4 u) : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -todo draw quad -todo probe all rgba (0.9, 0.8, 0.7, 0.6) +draw quad +probe all rgba (0.9, 0.8, 0.7, 0.6) [pixel shader fail] float4 u; @@ -52,7 +52,7 @@ float main() : sv_target return float4(0.9, 0.8, 0.7, 0.6); } -[pixel shader fail] +[pixel shader fail todo] float4 u; float main() : sv_target @@ -68,7 +68,7 @@ float main() : sv_target [require] shader model >= 3.0 -[pixel shader todo] +[pixel shader] float4 main(uniform float4 u) : sv_target { [branch] @@ -80,5 +80,5 @@ float4 main(uniform float4 u) : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -todo draw quad -todo probe all rgba (0.9, 0.8, 0.7, 0.6) +draw quad +probe all rgba (0.9, 0.8, 0.7, 0.6)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Change warning code for unknown loop attributes.
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: vkd3d Branch: master Commit: 89eda51855f30cb93e2ff08a552e39fb99276a76 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/89eda51855f30cb93e2ff08a552e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 16 20:19:37 2023 +0200 vkd3d-shader/hlsl: Change warning code for unknown loop attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 048f7232..2fd8ceb9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -493,11 +493,11 @@ static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, || !strcmp(attr->name, "fastopt") || !strcmp(attr->name, "allow_uav_condition")) { - hlsl_fixme(ctx, loc, "Unhandled attribute %s.", attr->name); + hlsl_fixme(ctx, loc, "Unhandled attribute '%s'.", attr->name); } else { - hlsl_warning(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED, "Unrecognized attribute %s.", attr->name); + hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_UNKNOWN_ATTRIBUTE, "Unrecognized attribute '%s'.", attr->name); } }

1 0

Francisco Casas : vkd3d-shader/tpf: Avoid reading constant value components beyond type's width (Valgrind).
by Alexandre Julliard 24 Aug '23

24 Aug '23

Module: vkd3d Branch: master Commit: ed9e236b0173e89265453b6bc993fdce47ea7122 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ed9e236b0173e89265453b6bc993f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Aug 22 03:40:50 2023 -0400 vkd3d-shader/tpf: Avoid reading constant value components beyond type's width (Valgrind). We are passing map writemasks that may have more components than the constant's data type, so a (j < width) check is added to avoid reading components from the constant that are not intended to be used. Remaining values in the register are initialized to zero. --- libs/vkd3d-shader/tpf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 550f9b27..cf2cc0d1 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3715,8 +3715,10 @@ static void sm4_src_from_constant_value(struct sm4_src_register *src, src->reg.dim = VKD3D_SM4_DIMENSION_VEC4; for (i = 0; i < 4; ++i) { - if (map_writemask & (1u << i)) + if ((map_writemask & (1u << i)) && (j < width)) src->reg.immconst_uint[i] = value->u[j++].u; + else + src->reg.immconst_uint[i] = 0; } } }

1 0