wine-commits June 2023

wine-commits@winehq.org

1 participants
633 discussions

Hans Leidekker : bcrypt: Add RC4 algorithm stub.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 9742fe8996625c6e9a5876a732de7dd794408987 URL: https://gitlab.winehq.org/wine/wine/-/commit/9742fe8996625c6e9a5876a732de7d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 28 15:48:53 2023 +0200 bcrypt: Add RC4 algorithm stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55160 --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 32 +++++++++++++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 98223e90ac6..5dc21484ccb 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -117,6 +117,7 @@ enum alg_id /* cipher */ ALG_ID_3DES, ALG_ID_AES, + ALG_ID_RC4, /* hash */ ALG_ID_SHA256, diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index ca5b934a8d5..2c09f03db9a 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -104,6 +104,7 @@ builtin_algorithms[] = { { BCRYPT_3DES_ALGORITHM, BCRYPT_CIPHER_INTERFACE, 522, 0, 0 }, { BCRYPT_AES_ALGORITHM, BCRYPT_CIPHER_INTERFACE, 654, 0, 0 }, + { BCRYPT_RC4_ALGORITHM, BCRYPT_CIPHER_INTERFACE, 654, 0, 0 }, { BCRYPT_SHA256_ALGORITHM, BCRYPT_HASH_INTERFACE, 286, 32, 512 }, { BCRYPT_SHA384_ALGORITHM, BCRYPT_HASH_INTERFACE, 382, 48, 1024 }, { BCRYPT_SHA512_ALGORITHM, BCRYPT_HASH_INTERFACE, 382, 64, 1024 }, @@ -202,7 +203,7 @@ static const struct algorithm pseudo_algorithms[] = {{ MAGIC_ALG }, ALG_ID_SHA256 }, {{ MAGIC_ALG }, ALG_ID_SHA384 }, {{ MAGIC_ALG }, ALG_ID_SHA512 }, - {{ 0 }}, /* RC4 */ + {{ MAGIC_ALG }, ALG_ID_RC4 }, {{ MAGIC_ALG }, ALG_ID_RNG }, {{ MAGIC_ALG }, ALG_ID_MD5, 0, BCRYPT_ALG_HANDLE_HMAC_FLAG }, {{ MAGIC_ALG }, ALG_ID_SHA1, 0, BCRYPT_ALG_HANDLE_HMAC_FLAG }, @@ -568,6 +569,7 @@ struct hash struct hash_impl inner; }; +#define BLOCK_LENGTH_RC4 1 #define BLOCK_LENGTH_3DES 8 #define BLOCK_LENGTH_AES 16 @@ -708,6 +710,20 @@ static NTSTATUS get_aes_property( enum chain_mode mode, const WCHAR *prop, UCHAR return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS get_rc4_property( enum chain_mode mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + if (!wcscmp( prop, BCRYPT_BLOCK_LENGTH )) + { + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL; + if (buf) *(ULONG *)buf = BLOCK_LENGTH_RC4; + return STATUS_SUCCESS; + } + + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS get_rsa_property( enum chain_mode mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { if (!wcscmp( prop, BCRYPT_PADDING_SCHEMES )) @@ -746,6 +762,9 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop case ALG_ID_AES: return get_aes_property( alg->mode, prop, buf, size, ret_size ); + case ALG_ID_RC4: + return get_rc4_property( alg->mode, prop, buf, size, ret_size ); + case ALG_ID_RSA: return get_rsa_property( alg->mode, prop, buf, size, ret_size ); @@ -813,6 +832,17 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA FIXME( "unsupported aes algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; + case ALG_ID_RC4: + if (!wcscmp( prop, BCRYPT_CHAINING_MODE )) + { + if (!wcscmp( (WCHAR *)value, BCRYPT_CHAIN_MODE_NA )) return STATUS_SUCCESS; + + FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); + return STATUS_NOT_IMPLEMENTED; + } + FIXME( "unsupported rc4 algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + default: FIXME( "unsupported algorithm %u\n", alg->id ); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 4d7277c3152..f58df8bcbbd 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -3561,6 +3561,35 @@ static void test_SecretAgreement(void) ok(status == STATUS_SUCCESS, "got %#lx\n", status); } +static void test_RC4(void) +{ + BCRYPT_ALG_HANDLE alg; + NTSTATUS status; + ULONG len, size; + + status = BCryptOpenAlgorithmProvider(&alg, BCRYPT_RC4_ALGORITHM, NULL, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + + len = size = 0; + status = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(len, "expected non-zero len\n"); + ok(size == sizeof(len), "got %lu\n", size); + + len = size = 0; + status = BCryptGetProperty(alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(len == 1, "got %lu\n", len); + ok(size == sizeof(len), "got %lu\n", size); + + size = sizeof(BCRYPT_CHAIN_MODE_NA); + status = BCryptSetProperty(alg, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_NA, size, 0); + ok(!status, "got %#lx\n", status); + + status = BCryptCloseAlgorithmProvider(alg, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); +} + START_TEST(bcrypt) { HMODULE module; @@ -3597,6 +3626,7 @@ START_TEST(bcrypt) test_DSA(); test_SecretAgreement(); test_rsa_encrypt(); + test_RC4(); FreeLibrary(module); }

1 0

Hans Leidekker : winscard: Map only the reader name in map_states_inA/W().
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 88f4dabc2772aa83b4d8157e6fd1676a8fdc905e URL: https://gitlab.winehq.org/wine/wine/-/commit/88f4dabc2772aa83b4d8157e6fd167… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 27 10:33:19 2023 +0200 winscard: Map only the reader name in map_states_inA/W(). --- dlls/winscard/tests/winscard.c | 4 +++- dlls/winscard/winscard.c | 10 ++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/winscard/tests/winscard.c b/dlls/winscard/tests/winscard.c index e6a58c5e46b..d596f9ca400 100644 --- a/dlls/winscard/tests/winscard.c +++ b/dlls/winscard/tests/winscard.c @@ -109,12 +109,14 @@ static void test_SCardEstablishContext(void) memset( states, 0, sizeof(states) ); states[0].szReader = "\\\\?PnP?\\Notification"; states[1].szReader = readers; + states[1].cbAtr = sizeof(states[1].rgbAtr) + 1; ret = SCardGetStatusChangeA( context, 1000, states, 2 ); ok( ret == SCARD_S_SUCCESS, "got %lx\n", ret ); + ok( states[1].cbAtr <= sizeof(states[1].rgbAtr), "got %lu\n", states[1].cbAtr ); states[1].dwCurrentState = states[1].dwEventState & ~SCARD_STATE_CHANGED; ret = SCardGetStatusChangeA( context, 1000, states, 2 ); - todo_wine ok( ret == SCARD_S_SUCCESS, "got %lx\n", ret ); + ok( ret == SCARD_S_SUCCESS, "got %lx\n", ret ); ret = SCardConnectA( context, readers, SCARD_SHARE_SHARED, SCARD_PROTOCOL_Tx, &connect, NULL ); if (ret == SCARD_E_READER_UNAVAILABLE) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 026a17295d4..9555aa4ed80 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -569,14 +569,11 @@ done: static LONG map_states_inA( const SCARD_READERSTATEA *src, struct reader_state *dst, DWORD count ) { DWORD i; + memset( dst, 0, sizeof(*dst) * count ); for (i = 0; i < count; i++) { if (src[i].szReader && ansi_to_utf8( src[i].szReader, (char **)&dst[i].reader ) < 0) return SCARD_E_NO_MEMORY; - dst[i].current_state = src[i].dwCurrentState; - dst[i].event_state = src[i].dwEventState; - dst[i].atr_size = src[i].cbAtr; - memcpy( dst[i].atr, src[i].rgbAtr, src[i].cbAtr ); } return SCARD_S_SUCCESS; } @@ -635,14 +632,11 @@ LONG WINAPI SCardGetStatusChangeA( SCARDCONTEXT context, DWORD timeout, SCARD_RE static LONG map_states_inW( SCARD_READERSTATEW *src, struct reader_state *dst, DWORD count ) { DWORD i; + memset( dst, 0, sizeof(*dst) * count ); for (i = 0; i < count; i++) { if (src[i].szReader && utf16_to_utf8( src[i].szReader, (char **)&dst[i].reader ) < 0) return SCARD_E_NO_MEMORY; - dst[i].current_state = src[i].dwCurrentState; - dst[i].event_state = src[i].dwEventState; - dst[i].atr_size = src[i].cbAtr; - memcpy( dst[i].atr, src[i].rgbAtr, src[i].cbAtr ); } return SCARD_S_SUCCESS; }

1 0

Hans Leidekker : winscard: Implement SCARD_AUTOALLOCATE for multi-string return values.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: 08a4a9803d823b10b990b0dfd00d88c27a73d1bd URL: https://gitlab.winehq.org/wine/wine/-/commit/08a4a9803d823b10b990b0dfd00d88… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 26 13:57:41 2023 +0200 winscard: Implement SCARD_AUTOALLOCATE for multi-string return values. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55137 --- dlls/winscard/tests/winscard.c | 17 ++- dlls/winscard/winscard.c | 244 +++++++++++++++++++++++++---------------- 2 files changed, 162 insertions(+), 99 deletions(-)

1 0

Arkadiusz Hiler : win32u: Don't affect nonclient area unless requested.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: d4b2865eb7f2612e52b3fee6ae121e59c2d28296 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4b2865eb7f2612e52b3fee6ae121e… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Jun 27 23:01:34 2023 +0300 win32u: Don't affect nonclient area unless requested. The state of the caption / nonclient area should be only changed when FLASHW_CAPTION or FLASHW_STOP are used. --- dlls/win32u/window.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 871227645a7..f008735f2e3 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4511,11 +4511,11 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info ) win = get_win_ptr( info->hwnd ); if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return FALSE; - if (info->dwFlags && !(win->flags & WIN_NCACTIVATED)) + if (info->dwFlags & FLASHW_CAPTION && !(win->flags & WIN_NCACTIVATED)) { win->flags |= WIN_NCACTIVATED; } - else + else if (!info->dwFlags) { win->flags &= ~WIN_NCACTIVATED; } @@ -4536,7 +4536,10 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info ) else wparam = (hwnd == NtUserGetForegroundWindow()); release_win_ptr( win ); - send_message( hwnd, WM_NCACTIVATE, wparam, 0 ); + + if (!info->dwFlags || info->dwFlags & FLASHW_CAPTION) + send_message( hwnd, WM_NCACTIVATE, wparam, 0 ); + user_driver->pFlashWindowEx( info ); return wparam; }

1 0

Xin Xu : include: Fix spelling error in InterlockedDecrementSizeT().
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: wine Branch: master Commit: d291f40472923cfe614589a53b9eb5a9345292a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/d291f40472923cfe614589a53b9eb5… Author: Xin Xu <xxsemail(a)qq.com> Date: Wed Jun 28 19:56:00 2023 +0800 include: Fix spelling error in InterlockedDecrementSizeT(). --- include/winnt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index c0967ac4459..8d803eaceb1 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -7184,13 +7184,13 @@ static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 #endif -#define InterlockedDecrementSizeT(a) InterlockeDecrement64((LONGLONG *)(a)) +#define InterlockedDecrementSizeT(a) InterlockedDecrement64((LONGLONG *)(a)) #define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONGLONG *)(a), (b)) #define InterlockedIncrementSizeT(a) InterlockedIncrement64((LONGLONG *)(a)) #else /* _WIN64 */ -#define InterlockedDecrementSizeT(a) InterlockeDecrement((LONG *)(a)) +#define InterlockedDecrementSizeT(a) InterlockedDecrement((LONG *)(a)) #define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)(a), (b)) #define InterlockedIncrementSizeT(a) InterlockedIncrement((LONG *)(a))

1 0

Alistair Leslie-Hughes : include: Avoid including unnecessary Windows headers.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: vkd3d Branch: master Commit: d5a0b3afc4aec78c6b687872630ba088dddd52d9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d5a0b3afc4aec78c6b687872630ba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 29 18:13:10 2023 +1000 include: Avoid including unnecessary Windows headers. We only require a few types and declarations. --- include/private/vkd3d_common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 4f9dc4d6..6be3cee8 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -20,6 +20,7 @@ #define __VKD3D_COMMON_H #include "config.h" +#define WIN32_LEAN_AND_MEAN #include "vkd3d_windows.h" #include "vkd3d_types.h" @@ -28,6 +29,7 @@ #include <stdbool.h> #include <stdint.h> #include <stdio.h> +#include <stdlib.h> #ifdef _MSC_VER #include <intrin.h>

1 0

Conor McCarthy : vkd3d: Print the thread id in trace messages.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: vkd3d Branch: master Commit: 08cece3a927f4f24053174f108c0a270b99eaf93 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/08cece3a927f4f24053174f108c0a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Mar 16 11:01:18 2023 +1000 vkd3d: Print the thread id in trace messages. --- configure.ac | 1 + libs/vkd3d-common/debug.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/configure.ac b/configure.ac index 3cc94938..b58c2f4d 100644 --- a/configure.ac +++ b/configure.ac @@ -144,6 +144,7 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_BOOL_COMPARE_AND_SWAP], [__sync_bool_compare_and_swap], [__sync_bool_compare_and_swap((int *)0, 0, 0)]) VKD3D_CHECK_FUNC([HAVE_ATOMIC_EXCHANGE_N], [__atomic_exchange_n], [__atomic_exchange_n((int *)0, 0, 0)]) +VKD3D_CHECK_FUNC([HAVE_GETTID], [gettid], [gettid()]) dnl Makefiles case $host_os in diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 4e4af5f9..aa7df5bd 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -31,6 +31,7 @@ #include <stdlib.h> #include <stdbool.h> #include <string.h> +#include <unistd.h> #ifdef HAVE_PTHREAD_H #include <pthread.h> #endif @@ -105,7 +106,13 @@ void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const ch assert(level < ARRAY_SIZE(debug_level_names)); +#ifdef _WIN32 + vkd3d_dbg_output("vkd3d:%04lx:%s:%s ", GetCurrentThreadId(), debug_level_names[level], function); +#elif HAVE_GETTID + vkd3d_dbg_output("vkd3d:%u:%s:%s ", gettid(), debug_level_names[level], function); +#else vkd3d_dbg_output("vkd3d:%s:%s ", debug_level_names[level], function); +#endif va_start(args, fmt); vkd3d_dbg_voutput(fmt, args); va_end(args);

1 0

Conor McCarthy : vkd3d-shader/dxil: Read and validate global abbreviated operands.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: vkd3d Branch: master Commit: de25e8890177a2435e1f146d256fbf09ff8628fd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/de25e8890177a2435e1f146d256fb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 15 15:29:32 2022 +1000 vkd3d-shader/dxil: Read and validate global abbreviated operands. --- libs/vkd3d-shader/dxil.c | 102 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 96 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index cd5fd42e..67dcd26a 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -83,6 +83,7 @@ struct dxil_block size_t abbrev_capacity; size_t abbrev_count; unsigned int blockinfo_bid; + bool has_bid; struct dxil_block **child_blocks; size_t child_block_capacity; @@ -101,6 +102,10 @@ struct sm6_parser struct dxil_block root_block; struct dxil_block *current_block; + struct dxil_global_abbrev **abbrevs; + size_t abbrev_capacity; + size_t abbrev_count; + struct vkd3d_shader_parser p; }; @@ -117,6 +122,12 @@ struct dxil_abbrev struct dxil_abbrev_operand operands[]; }; +struct dxil_global_abbrev +{ + unsigned int block_id; + struct dxil_abbrev abbrev; +}; + static struct sm6_parser *sm6_parser(struct vkd3d_shader_parser *parser) { return CONTAINING_RECORD(parser, struct sm6_parser, p); @@ -236,6 +247,7 @@ static bool dxil_block_handle_blockinfo_record(struct dxil_block *block, struct if (record->operands[0] > UINT_MAX) WARN("Truncating block id %"PRIu64".\n", record->operands[0]); block->blockinfo_bid = record->operands[0]; + block->has_bid = true; break; case BLOCKNAME: case SETRECORDNAME: @@ -403,6 +415,45 @@ static enum vkd3d_result dxil_abbrev_init(struct dxil_abbrev *abbrev, unsigned i return sm6->p.failed ? VKD3D_ERROR_INVALID_SHADER : VKD3D_OK; } +static enum vkd3d_result sm6_parser_add_global_abbrev(struct sm6_parser *sm6) +{ + struct dxil_block *block = sm6->current_block; + unsigned int count = sm6_parser_read_vbr(sm6, 5); + struct dxil_global_abbrev *global_abbrev; + enum vkd3d_result ret; + + assert(block->id == BLOCKINFO_BLOCK); + + if (!vkd3d_array_reserve((void **)&sm6->abbrevs, &sm6->abbrev_capacity, sm6->abbrev_count + 1, sizeof(*sm6->abbrevs)) + || !(global_abbrev = vkd3d_malloc(sizeof(*global_abbrev) + count * sizeof(global_abbrev->abbrev.operands[0])))) + { + ERR("Failed to allocate global abbreviation.\n"); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + if ((ret = dxil_abbrev_init(&global_abbrev->abbrev, count, sm6)) < 0) + { + vkd3d_free(global_abbrev); + return ret; + } + + if (!block->has_bid) + { + WARN("Missing blockinfo block id.\n"); + return VKD3D_ERROR_INVALID_SHADER; + } + if (block->blockinfo_bid == MODULE_BLOCK) + { + FIXME("Unhandled global abbreviation for module block.\n"); + return VKD3D_ERROR_INVALID_SHADER; + } + global_abbrev->block_id = block->blockinfo_bid; + + sm6->abbrevs[sm6->abbrev_count++] = global_abbrev; + + return VKD3D_OK; +} + static enum vkd3d_result sm6_parser_add_block_abbrev(struct sm6_parser *sm6) { struct dxil_block *block = sm6->current_block; @@ -411,10 +462,7 @@ static enum vkd3d_result sm6_parser_add_block_abbrev(struct sm6_parser *sm6) unsigned int count; if (block->id == BLOCKINFO_BLOCK) - { - FIXME("Unhandled global abbreviation.\n"); - return VKD3D_ERROR_INVALID_SHADER; - } + return sm6_parser_add_global_abbrev(sm6); count = sm6_parser_read_vbr(sm6, 5); if (!vkd3d_array_reserve((void **)&block->abbrevs, &block->abbrev_capacity, block->abbrev_count + 1, sizeof(*block->abbrevs)) @@ -580,6 +628,17 @@ static enum vkd3d_result dxil_block_read(struct dxil_block *parent, struct sm6_p return VKD3D_ERROR_INVALID_SHADER; } +static unsigned int sm6_parser_compute_global_abbrev_count_for_block_id(struct sm6_parser *sm6, + unsigned int block_id) +{ + unsigned int i, count; + + for (i = 0, count = 0; i < sm6->abbrev_count; ++i) + count += sm6->abbrevs[i]->block_id == block_id; + + return count; +} + static void dxil_block_destroy(struct dxil_block *block) { unsigned int i; @@ -604,8 +663,8 @@ static void dxil_block_destroy(struct dxil_block *block) static enum vkd3d_result dxil_block_init(struct dxil_block *block, const struct dxil_block *parent, struct sm6_parser *sm6) { + unsigned int i, abbrev_count = 0; enum vkd3d_result ret; - unsigned int i; block->parent = parent; block->level = parent ? parent->level + 1 : 0; @@ -618,10 +677,26 @@ static enum vkd3d_result dxil_block_init(struct dxil_block *block, const struct if (sm6->p.failed) return VKD3D_ERROR_INVALID_SHADER; + if ((block->abbrev_count = sm6_parser_compute_global_abbrev_count_for_block_id(sm6, block->id))) + { + if (!vkd3d_array_reserve((void **)&block->abbrevs, &block->abbrev_capacity, + block->abbrev_count, sizeof(*block->abbrevs))) + { + ERR("Failed to allocate block abbreviations.\n"); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + for (i = 0; i < sm6->abbrev_count; ++i) + if (sm6->abbrevs[i]->block_id == block->id) + block->abbrevs[abbrev_count++] = &sm6->abbrevs[i]->abbrev; + + assert(abbrev_count == block->abbrev_count); + } + if ((ret = dxil_block_read(block, sm6)) < 0) dxil_block_destroy(block); - for (i = 0; i < block->abbrev_count; ++i) + for (i = abbrev_count; i < block->abbrev_count; ++i) vkd3d_free(block->abbrevs[i]); vkd3d_free(block->abbrevs); block->abbrevs = NULL; @@ -630,11 +705,21 @@ static enum vkd3d_result dxil_block_init(struct dxil_block *block, const struct return ret; } +static void dxil_global_abbrevs_cleanup(struct dxil_global_abbrev **abbrevs, unsigned int count) +{ + unsigned int i; + + for (i = 0; i < count; ++i) + vkd3d_free(abbrevs[i]); + vkd3d_free(abbrevs); +} + static void sm6_parser_destroy(struct vkd3d_shader_parser *parser) { struct sm6_parser *sm6 = sm6_parser(parser); dxil_block_destroy(&sm6->root_block); + dxil_global_abbrevs_cleanup(sm6->abbrevs, sm6->abbrev_count); shader_instruction_array_destroy(&parser->instructions); free_shader_desc(&parser->shader_desc); vkd3d_free(sm6); @@ -734,6 +819,7 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return VKD3D_ERROR_INVALID_SHADER; } + /* Estimate instruction count to avoid reallocation in most shaders. */ count = max(token_count, 400) - 400; vkd3d_shader_parser_init(&sm6->p, message_context, source_name, &version, &sm6_parser_ops, (count + (count >> 2)) / 2u + 10); @@ -754,6 +840,10 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return ret; } + dxil_global_abbrevs_cleanup(sm6->abbrevs, sm6->abbrev_count); + sm6->abbrevs = NULL; + sm6->abbrev_count = 0; + length = sm6->ptr - sm6->start - block->start; if (length != block->length) {

1 0

Conor McCarthy : vkd3d-shader/dxil: Read and validate local abbreviated operands.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: vkd3d Branch: master Commit: e9a8bfb2c46004653d6f59f17fae2ca039df057a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e9a8bfb2c46004653d6f59f17fae2… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 15 15:27:41 2022 +1000 vkd3d-shader/dxil: Read and validate local abbreviated operands. --- libs/vkd3d-shader/dxil.c | 248 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 244 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 817a7bea..cd5fd42e 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -53,6 +53,15 @@ enum bitcode_block_abbreviation UNABBREV_RECORD = 3, }; +enum bitcode_abbrev_type +{ + ABBREV_FIXED = 1, + ABBREV_VBR = 2, + ABBREV_ARRAY = 3, + ABBREV_CHAR = 4, + ABBREV_BLOB = 5, +}; + struct dxil_record { unsigned int code; @@ -69,6 +78,10 @@ struct dxil_block unsigned int length; unsigned int level; + /* The abbrev, block and record structs are not relocatable. */ + struct dxil_abbrev **abbrevs; + size_t abbrev_capacity; + size_t abbrev_count; unsigned int blockinfo_bid; struct dxil_block **child_blocks; @@ -91,6 +104,19 @@ struct sm6_parser struct vkd3d_shader_parser p; }; +struct dxil_abbrev_operand +{ + uint64_t context; + bool (*read_operand)(struct sm6_parser *sm6, uint64_t context, uint64_t *operand); +}; + +struct dxil_abbrev +{ + unsigned int count; + bool is_array; + struct dxil_abbrev_operand operands[]; +}; + static struct sm6_parser *sm6_parser(struct vkd3d_shader_parser *parser) { return CONTAINING_RECORD(parser, struct sm6_parser, p); @@ -280,6 +306,208 @@ static enum vkd3d_result sm6_parser_read_unabbrev_record(struct sm6_parser *sm6) return ret; } +static bool sm6_parser_read_literal_operand(struct sm6_parser *sm6, uint64_t context, uint64_t *op) +{ + *op = context; + return !sm6->p.failed; +} + +static bool sm6_parser_read_fixed_operand(struct sm6_parser *sm6, uint64_t context, uint64_t *op) +{ + *op = sm6_parser_read_bits(sm6, context); + return !sm6->p.failed; +} + +static bool sm6_parser_read_vbr_operand(struct sm6_parser *sm6, uint64_t context, uint64_t *op) +{ + *op = sm6_parser_read_vbr(sm6, context); + return !sm6->p.failed; +} + +static bool sm6_parser_read_char6_operand(struct sm6_parser *sm6, uint64_t context, uint64_t *op) +{ + *op = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789._"[sm6_parser_read_bits(sm6, 6)]; + return !sm6->p.failed; +} + +static bool sm6_parser_read_blob_operand(struct sm6_parser *sm6, uint64_t context, uint64_t *op) +{ + int count = sm6_parser_read_vbr(sm6, 6); + sm6_parser_align_32(sm6); + for (; count > 0; count -= 4) + sm6_parser_read_uint32(sm6); + FIXME("Unhandled blob operand.\n"); + return false; +} + +static enum vkd3d_result dxil_abbrev_init(struct dxil_abbrev *abbrev, unsigned int count, struct sm6_parser *sm6) +{ + enum bitcode_abbrev_type prev_type, type; + unsigned int i; + + abbrev->is_array = false; + + for (i = 0, prev_type = 0; i < count && !sm6->p.failed; ++i) + { + if (sm6_parser_read_bits(sm6, 1)) + { + if (prev_type == ABBREV_ARRAY) + { + WARN("Unexpected literal abbreviation after array.\n"); + return VKD3D_ERROR_INVALID_SHADER; + } + abbrev->operands[i].context = sm6_parser_read_vbr(sm6, 8); + abbrev->operands[i].read_operand = sm6_parser_read_literal_operand; + continue; + } + + switch (type = sm6_parser_read_bits(sm6, 3)) + { + case ABBREV_FIXED: + case ABBREV_VBR: + abbrev->operands[i].context = sm6_parser_read_vbr(sm6, 5); + abbrev->operands[i].read_operand = (type == ABBREV_FIXED) ? sm6_parser_read_fixed_operand + : sm6_parser_read_vbr_operand; + break; + + case ABBREV_ARRAY: + if (prev_type == ABBREV_ARRAY || i != count - 2) + { + WARN("Unexpected array abbreviation.\n"); + return VKD3D_ERROR_INVALID_SHADER; + } + abbrev->is_array = true; + --i; + --count; + break; + + case ABBREV_CHAR: + abbrev->operands[i].read_operand = sm6_parser_read_char6_operand; + break; + + case ABBREV_BLOB: + if (prev_type == ABBREV_ARRAY || i != count - 1) + { + WARN("Unexpected blob abbreviation.\n"); + return VKD3D_ERROR_INVALID_SHADER; + } + abbrev->operands[i].read_operand = sm6_parser_read_blob_operand; + break; + } + + prev_type = type; + } + + abbrev->count = count; + + return sm6->p.failed ? VKD3D_ERROR_INVALID_SHADER : VKD3D_OK; +} + +static enum vkd3d_result sm6_parser_add_block_abbrev(struct sm6_parser *sm6) +{ + struct dxil_block *block = sm6->current_block; + struct dxil_abbrev *abbrev; + enum vkd3d_result ret; + unsigned int count; + + if (block->id == BLOCKINFO_BLOCK) + { + FIXME("Unhandled global abbreviation.\n"); + return VKD3D_ERROR_INVALID_SHADER; + } + + count = sm6_parser_read_vbr(sm6, 5); + if (!vkd3d_array_reserve((void **)&block->abbrevs, &block->abbrev_capacity, block->abbrev_count + 1, sizeof(*block->abbrevs)) + || !(abbrev = vkd3d_malloc(sizeof(*abbrev) + count * sizeof(abbrev->operands[0])))) + { + ERR("Failed to allocate block abbreviation.\n"); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + if ((ret = dxil_abbrev_init(abbrev, count, sm6)) < 0) + { + vkd3d_free(abbrev); + return ret; + } + + block->abbrevs[block->abbrev_count++] = abbrev; + + return VKD3D_OK; +} + +static enum vkd3d_result sm6_parser_read_abbrev_record(struct sm6_parser *sm6, unsigned int abbrev_id) +{ + enum vkd3d_result ret = VKD3D_ERROR_INVALID_SHADER; + struct dxil_block *block = sm6->current_block; + struct dxil_record *temp, *record; + unsigned int i, count, array_len; + struct dxil_abbrev *abbrev; + uint64_t code; + + if (abbrev_id >= block->abbrev_count) + { + WARN("Invalid abbreviation id %u.\n", abbrev_id); + return VKD3D_ERROR_INVALID_SHADER; + } + + abbrev = block->abbrevs[abbrev_id]; + if (!(count = abbrev->count)) + return VKD3D_OK; + if (count == 1 && abbrev->is_array) + return VKD3D_ERROR_INVALID_SHADER; + + /* First operand is the record code. The array is included in the count, but will be done separately. */ + count -= abbrev->is_array + 1; + if (!(record = vkd3d_malloc(sizeof(*record) + count * sizeof(record->operands[0])))) + { + ERR("Failed to allocate record with %u operands.\n", count); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + if (!abbrev->operands[0].read_operand(sm6, abbrev->operands[0].context, &code)) + goto fail; + if (code > UINT_MAX) + FIXME("Truncating 64-bit record code %#"PRIx64".\n", code); + record->code = code; + + for (i = 0; i < count; ++i) + if (!abbrev->operands[i + 1].read_operand(sm6, abbrev->operands[i + 1].context, &record->operands[i])) + goto fail; + record->operand_count = count; + + /* An array can occur only as the last operand. */ + if (abbrev->is_array) + { + array_len = sm6_parser_read_vbr(sm6, 6); + if (!(temp = vkd3d_realloc(record, sizeof(*record) + (count + array_len) * sizeof(record->operands[0])))) + { + ERR("Failed to allocate record with %u operands.\n", count + array_len); + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + record = temp; + + for (i = 0; i < array_len; ++i) + { + if (!abbrev->operands[count + 1].read_operand(sm6, abbrev->operands[count + 1].context, + &record->operands[count + i])) + { + goto fail; + } + } + record->operand_count += array_len; + } + + if ((ret = dxil_block_add_record(block, record)) < 0) + goto fail; + + return VKD3D_OK; + +fail: + vkd3d_free(record); + return ret; +} + static enum vkd3d_result dxil_block_init(struct dxil_block *block, const struct dxil_block *parent, struct sm6_parser *sm6); @@ -327,8 +555,9 @@ static enum vkd3d_result dxil_block_read(struct dxil_block *parent, struct sm6_p break; case DEFINE_ABBREV: - FIXME("Unhandled abbreviation definition.\n"); - return VKD3D_ERROR_INVALID_SHADER; + if ((ret = sm6_parser_add_block_abbrev(sm6)) < 0) + return ret; + break; case UNABBREV_RECORD: if ((ret = sm6_parser_read_unabbrev_record(sm6)) < 0) @@ -339,8 +568,12 @@ static enum vkd3d_result dxil_block_read(struct dxil_block *parent, struct sm6_p break; default: - FIXME("Unhandled abbreviated record %u.\n", abbrev_id); - return VKD3D_ERROR_INVALID_SHADER; + if ((ret = sm6_parser_read_abbrev_record(sm6, abbrev_id - 4)) < 0) + { + WARN("Failed to read abbreviated record.\n"); + return ret; + } + break; } } while (!sm6->p.failed); @@ -372,6 +605,7 @@ static enum vkd3d_result dxil_block_init(struct dxil_block *block, const struct struct sm6_parser *sm6) { enum vkd3d_result ret; + unsigned int i; block->parent = parent; block->level = parent ? parent->level + 1 : 0; @@ -387,6 +621,12 @@ static enum vkd3d_result dxil_block_init(struct dxil_block *block, const struct if ((ret = dxil_block_read(block, sm6)) < 0) dxil_block_destroy(block); + for (i = 0; i < block->abbrev_count; ++i) + vkd3d_free(block->abbrevs[i]); + vkd3d_free(block->abbrevs); + block->abbrevs = NULL; + block->abbrev_count = 0; + return ret; }

1 0

Conor McCarthy : vkd3d-compiler: Introduce a dxbc-dxil source type.
by Alexandre Julliard 28 Jun '23

28 Jun '23

Module: vkd3d Branch: master Commit: 8c7704bb7863c54f9a265a4e570a021f84301eff URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8c7704bb7863c54f9a265a4e570a0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 15 15:18:26 2022 +1000 vkd3d-compiler: Introduce a dxbc-dxil source type. --- programs/vkd3d-compiler/main.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index efb3b48d..b94272a5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -30,6 +30,7 @@ #include "vkd3d_common.h" #include "vkd3d_shader.h" +#include "vkd3d_shader_utils.h" #ifdef HAVE_NCURSES #include <term.h> #endif @@ -73,6 +74,10 @@ source_type_info[] = "d3dbc", "Legacy Direct3D byte-code.\n" " This is the format used for Direct3D shader model 1, 2, and 3 shaders.\n", true, VKD3D_SHADER_TARGET_SPIRV_BINARY}, + {VKD3D_SHADER_SOURCE_DXBC_DXIL, + "dxbc-dxil", "A 'DirectX Intermediate Language' shader embedded in a DXBC container.\n" + " This is the format used for Direct3D shader model 6 shaders.\n", + true, VKD3D_SHADER_TARGET_SPIRV_BINARY}, }; static const struct target_type_info @@ -356,6 +361,22 @@ static enum vkd3d_shader_target_type parse_target_type(const char *target) return VKD3D_SHADER_TARGET_NONE; } +static bool parse_dxbc_source_type(const struct vkd3d_shader_code *source, enum vkd3d_shader_source_type *type) +{ + char *messages; + int ret; + + if ((ret = vkd3d_shader_parse_dxbc_source_type(source, type, &messages)) < 0) + { + fprintf(stderr, "Failed to detect dxbc source type, ret %d.\n", ret); + if (messages) + fputs(messages, stderr); + vkd3d_shader_free_messages(messages); + return false; + } + return true; +} + static const struct source_type_info *get_source_type_info(enum vkd3d_shader_source_type type) { unsigned int i; @@ -671,7 +692,10 @@ int main(int argc, char **argv) { memcpy(&token, info.source.code, sizeof(token)); if (token == TAG_DXBC) - options.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + { + if (!parse_dxbc_source_type(&info.source, &options.source_type)) + return 1; + } else if ((token & 0xfffe0000) == 0xfffe0000) options.source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; else

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
64
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 June 2023