- Wine-Commits - list.winehq.org

Rémi Bernon : msvcrt: Fix _dupenv_s behavior with missing env var.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: wine Branch: master Commit: 5a08eab3033edf1f858776523699f333d793a8c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a08eab3033edf1f858776523699f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 23 12:20:30 2023 +0100 msvcrt: Fix _dupenv_s behavior with missing env var. --- dlls/msvcr80/tests/msvcr80.c | 3 --- dlls/msvcrt/environ.c | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c index 34f50cd6a69..961bef504b6 100644 --- a/dlls/msvcr80/tests/msvcr80.c +++ b/dlls/msvcr80/tests/msvcr80.c @@ -197,11 +197,8 @@ static void test_dupenv_s(void) len = 0xdeadbeef; tmp = (void *)0xdeadbeef; ret = p_dupenv_s( &tmp, &len, "nonexistent" ); - todo_wine ok( !ret, "_dupenv_s returned %d\n", ret ); - todo_wine ok( !len, "_dupenv_s returned length is %Id\n", len ); - todo_wine ok( !tmp, "_dupenv_s returned pointer is %p\n", tmp ); } diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 729eb0560bd..e9c15b732ba 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -249,7 +249,12 @@ int CDECL _dupenv_s(char **buffer, size_t *numberOfElements, const char *varname if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; - if (!(e = getenv(varname))) return *_errno() = EINVAL; + if (!(e = getenv(varname))) + { + *buffer = NULL; + if (numberOfElements) *numberOfElements = 0; + return 0; + } sz = strlen(e) + 1; if (!(*buffer = malloc(sz)))

1 0

Rémi Bernon : msvcrt: Fix _wdupenv_s behavior with missing env var.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: wine Branch: master Commit: aafef01cc2a0c49ed902e63edac6da4b0278e53f URL: https://gitlab.winehq.org/wine/wine/-/commit/aafef01cc2a0c49ed902e63edac6da… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 23 12:21:03 2023 +0100 msvcrt: Fix _wdupenv_s behavior with missing env var. --- dlls/msvcr80/tests/msvcr80.c | 3 --- dlls/msvcrt/environ.c | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c index 961bef504b6..fa04b024031 100644 --- a/dlls/msvcr80/tests/msvcr80.c +++ b/dlls/msvcr80/tests/msvcr80.c @@ -211,11 +211,8 @@ static void test_wdupenv_s(void) len = 0xdeadbeef; tmp = (void *)0xdeadbeef; ret = p_wdupenv_s( &tmp, &len, L"nonexistent" ); - todo_wine ok( !ret, "_wdupenv_s returned %d\n", ret ); - todo_wine ok( !len, "_wdupenv_s returned length is %Id\n", len ); - todo_wine ok( !tmp, "_wdupenv_s returned pointer is %p\n", tmp ); } diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index e9c15b732ba..2c2a3353582 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -279,7 +279,12 @@ int CDECL _wdupenv_s(wchar_t **buffer, size_t *numberOfElements, if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; - if (!(e = _wgetenv(varname))) return *_errno() = EINVAL; + if (!(e = _wgetenv(varname))) + { + *buffer = NULL; + if (numberOfElements) *numberOfElements = 0; + return 0; + } sz = wcslen(e) + 1; if (!(*buffer = malloc(sz * sizeof(wchar_t))))

1 0

Zebediah Figura : wined3d: Require gather offset support to create a feature level 11.0 device.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: wine Branch: master Commit: f236ee46dad71e4113dfc670766f1aa580d3a50d URL: https://gitlab.winehq.org/wine/wine/-/commit/f236ee46dad71e4113dfc670766f1a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 19:46:45 2022 -0600 wined3d: Require gather offset support to create a feature level 11.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index e04b09fbbec..ea5ad2e7d3a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2272,6 +2272,7 @@ static bool feature_level_11_supported(const struct wined3d_physical_device_info && info->features2.features.multiDrawIndirect && info->features2.features.drawIndirectFirstInstance && info->features2.features.fragmentStoresAndAtomics + && info->features2.features.shaderImageGatherExtended && info->features2.features.tessellationShader; }

1 0

Rémi Bernon : ntdll: Avoid shrinking large heap block to small block.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: wine Branch: master Commit: 63fb16338c4017a80cbe49d0f5f232babb1a5f1a URL: https://gitlab.winehq.org/wine/wine/-/commit/63fb16338c4017a80cbe49d0f5f232… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 20 14:20:20 2023 +0100 ntdll: Avoid shrinking large heap block to small block. Even though this is a waste of memory it seems to trip on some UAF with some games. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54475 --- dlls/ntdll/heap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index afe38eddaa8..6688fab9690 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -2092,7 +2092,6 @@ static NTSTATUS heap_resize_large( struct heap *heap, ULONG flags, struct block SIZE_T old_block_size = large->block_size; *old_size = large->data_size; - if (block_size < HEAP_MIN_LARGE_BLOCK_SIZE / 4) return STATUS_NO_MEMORY; /* shrinking large block to small block */ if (old_block_size < block_size) return STATUS_NO_MEMORY; /* FIXME: we could remap zero-pages instead */

1 0

Zebediah Figura : wined3d: Require shader cull distance support to create a feature level 10.0 device.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: wine Branch: master Commit: a0043c96708bd14c182070e0cf8033f1d1bd10e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0043c96708bd14c182070e0cf8033… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 20:03:48 2022 -0600 wined3d: Require shader cull distance support to create a feature level 10.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 21b1875c619..ce3f59d8af0 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2258,6 +2258,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->features2.features.depthBiasClamp && info->features2.features.pipelineStatisticsQuery && info->features2.features.shaderClipDistance + && info->features2.features.shaderCullDistance && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; }

1 0

Rémi Bernon : msvcr80/tests: Test _dupenv_s outcome with missing env var.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: wine Branch: master Commit: a48d470e97e158d834fba582d707b55a05706d27 URL: https://gitlab.winehq.org/wine/wine/-/commit/a48d470e97e158d834fba582d707b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 23 12:18:11 2023 +0100 msvcr80/tests: Test _dupenv_s outcome with missing env var. --- dlls/msvcr80/tests/msvcr80.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c index a2a3734f6c0..0910dc83b3d 100644 --- a/dlls/msvcr80/tests/msvcr80.c +++ b/dlls/msvcr80/tests/msvcr80.c @@ -62,6 +62,7 @@ static int (__cdecl *p__close)(int); static intptr_t (__cdecl *p__get_osfhandle)(int); static int (__cdecl *p_strcmp)(const char *, const char *); static int (__cdecl *p_strncmp)(const char *, const char *, size_t); +static int (__cdecl *p_dupenv_s)(char **, size_t *, const char *); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hcrt,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -83,6 +84,7 @@ static BOOL init(void) SET(p_strcmp, "strcmp"); SET(p_strncmp, "strncmp"); + SET(p_dupenv_s, "_dupenv_s"); return TRUE; } @@ -184,6 +186,23 @@ static void test_strcmp(void) ok( ret == 0, "wrong ret %d\n", ret ); } +static void test_dupenv_s(void) +{ + size_t len; + char *tmp; + int ret; + + len = 0xdeadbeef; + tmp = (void *)0xdeadbeef; + ret = p_dupenv_s( &tmp, &len, "nonexistent" ); + todo_wine + ok( !ret, "_dupenv_s returned %d\n", ret ); + todo_wine + ok( !len, "_dupenv_s returned length is %Id\n", len ); + todo_wine + ok( !tmp, "_dupenv_s returned pointer is %p\n", tmp ); +} + START_TEST(msvcr80) { if(!init()) @@ -191,4 +210,5 @@ START_TEST(msvcr80) test_ioinfo_flags(); test_strcmp(); + test_dupenv_s(); }

1 0

Zebediah Figura : wined3d: Require fragment shader image stores and atomics to create a feature level 11.0 device.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: wine Branch: master Commit: 1fa1b9bb509a440a90451d77c5fbaf7c217a0c41 URL: https://gitlab.winehq.org/wine/wine/-/commit/1fa1b9bb509a440a90451d77c5fbaf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 19:29:23 2022 -0600 wined3d: Require fragment shader image stores and atomics to create a feature level 11.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0f0409ee462..e04b09fbbec 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2271,6 +2271,7 @@ static bool feature_level_11_supported(const struct wined3d_physical_device_info return shader_model >= 5 && info->features2.features.multiDrawIndirect && info->features2.features.drawIndirectFirstInstance + && info->features2.features.fragmentStoresAndAtomics && info->features2.features.tessellationShader; }

1 0

Alexandre Julliard : kernel32/tests: Add a missing dependency comment.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: wine Branch: master Commit: c2f4aaf78dc500d037a10aecfd1750141d13536f URL: https://gitlab.winehq.org/wine/wine/-/commit/c2f4aaf78dc500d037a10aecfd1750… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 23 11:25:16 2023 +0100 kernel32/tests: Add a missing dependency comment. --- dlls/kernel32/tests/resource.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/tests/resource.rc b/dlls/kernel32/tests/resource.rc index 58902e7a015..0db0ddf2bd8 100644 --- a/dlls/kernel32/tests/resource.rc +++ b/dlls/kernel32/tests/resource.rc @@ -25,4 +25,5 @@ MENUITEM "foo", 1 } +/* @makedep: wine_test.manifest */ 124 24 wine_test.manifest

1 0

Henri Verbeet : vkd3d-shader/dxbc: Pass a vkd3d_shader_code structure to parse_dxbc().
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: vkd3d Branch: master Commit: a06320c1fcfc2b9e83827493a0fc83ed1f8d3961 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a06320c1fcfc2b9e83827493a0fc8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 20 15:57:29 2023 +0100 vkd3d-shader/dxbc: Pass a vkd3d_shader_code structure to parse_dxbc(). --- libs/vkd3d-shader/dxbc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 03ebc38f..a3e79503 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1725,12 +1725,14 @@ static const char *shader_get_string(const char *data, size_t data_size, DWORD o return data + offset; } -static int parse_dxbc(const char *data, size_t data_size, +static int parse_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context, const char *source_name, int (*section_handler)(const struct vkd3d_shader_dxbc_section_desc *section, void *ctx), void *ctx) { const struct vkd3d_shader_location location = {.source_name = source_name}; uint32_t checksum[4], calculated_checksum[4]; + const char *data = dxbc->code; + size_t data_size = dxbc->size; const char *ptr = data; int ret = VKD3D_OK; uint32_t chunk_count; @@ -1941,7 +1943,7 @@ int shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, int ret; memset(signature, 0, sizeof(*signature)); - if ((ret = parse_dxbc(dxbc->code, dxbc->size, message_context, NULL, isgn_handler, signature)) < 0) + if ((ret = parse_dxbc(dxbc, message_context, NULL, isgn_handler, signature)) < 0) ERR("Failed to parse input signature.\n"); return ret; @@ -2030,7 +2032,7 @@ static int shader_extract_from_dxbc(const struct vkd3d_shader_code *dxbc, memset(&desc->output_signature, 0, sizeof(desc->output_signature)); memset(&desc->patch_constant_signature, 0, sizeof(desc->patch_constant_signature)); - ret = parse_dxbc(dxbc->code, dxbc->size, message_context, source_name, shdr_handler, desc); + ret = parse_dxbc(dxbc, message_context, source_name, shdr_handler, desc); if (!desc->byte_code) ret = VKD3D_ERROR_INVALID_ARGUMENT; @@ -2559,7 +2561,7 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, *messages = NULL; vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO); - ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, NULL, rts0_handler, root_signature); + ret = parse_dxbc(dxbc, &message_context, NULL, rts0_handler, root_signature); vkd3d_shader_message_context_trace_messages(&message_context); if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY;

1 0

Henri Verbeet : vkd3d-shader/dxbc: Introduce API for serialising DXBC blobs.
by Alexandre Julliard Feb. 23, 2023

Feb. 23, 2023

Module: vkd3d Branch: master Commit: b1e13d6e33dd2be6a4b127d6c75fd088c5d6edee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b1e13d6e33dd2be6a4b127d6c75fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 20 11:37:45 2023 +0100 vkd3d-shader/dxbc: Introduce API for serialising DXBC blobs. --- include/vkd3d_shader.h | 31 ++++++++++++++ libs/vkd3d-shader/dxbc.c | 29 +++++++++---- libs/vkd3d-shader/vkd3d_shader.map | 1 + tests/vkd3d_shader_api.c | 84 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index b2c67fa1..51d03e28 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1946,6 +1946,34 @@ VKD3D_SHADER_API void vkd3d_shader_free_dxbc(struct vkd3d_shader_dxbc_desc *dxbc VKD3D_SHADER_API int vkd3d_shader_parse_dxbc(const struct vkd3d_shader_code *dxbc, uint32_t flags, struct vkd3d_shader_dxbc_desc *desc, char **messages); +/** + * Serialise a DXBC description into a blob stored in a vkd3d_shader_code + * structure. + * + * \param section_count The number of DXBC sections to serialise. + * + * \param sections An array of vkd3d_shader_dxbc_section_desc structures + * to serialise. + * + * \param dxbc A pointer to a vkd3d_shader_code structure in which the + * serialised blob will be stored. + * \n + * The output blob is allocated by vkd3d-shader and should be freed with + * vkd3d_shader_free_shader_code() when no longer needed. + * + * \param messages Optional output location for error or informational messages + * produced by the serialiser. + * \n + * This parameter behaves identically to the \a messages parameter of + * vkd3d_shader_compile(). + * + * \return A member of \ref vkd3d_result. + * + * \since 1.7 + */ +VKD3D_SHADER_API int vkd3d_shader_serialize_dxbc(size_t section_count, + const struct vkd3d_shader_dxbc_section_desc *sections, struct vkd3d_shader_code *dxbc, char **messages); + #endif /* VKD3D_SHADER_NO_PROTOTYPES */ /** Type of vkd3d_shader_get_version(). */ @@ -2007,6 +2035,9 @@ typedef void (*PFN_vkd3d_shader_free_dxbc)(struct vkd3d_shader_dxbc_desc *dxbc); /** Type of vkd3d_shader_parse_dxbc(). \since 1.7 */ typedef int (*PFN_vkd3d_shader_parse_dxbc)(const struct vkd3d_shader_code *dxbc, uint32_t flags, struct vkd3d_shader_dxbc_desc *desc, char **messages); +/** Type of vkd3d_shader_serialize_dxbc(). \since 1.7 */ +typedef int (*PFN_vkd3d_shader_serialize_dxbc)(size_t section_count, + const struct vkd3d_shader_dxbc_section_desc *sections, struct vkd3d_shader_code *dxbc, char **messages); #ifdef __cplusplus } diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 8dfb9408..d8eef8a5 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -43,12 +43,18 @@ void dxbc_writer_add_section(struct dxbc_writer *dxbc, uint32_t tag, const void section->data.size = size; } -int dxbc_writer_write(struct dxbc_writer *dxbc, struct vkd3d_shader_code *out) +int vkd3d_shader_serialize_dxbc(size_t section_count, const struct vkd3d_shader_dxbc_section_desc *sections, + struct vkd3d_shader_code *dxbc, char **messages) { size_t size_position, offsets_position, checksum_position, i; struct vkd3d_bytecode_buffer buffer = {0}; uint32_t checksum[4]; + TRACE("section_count %zu, sections %p, dxbc %p, messages %p.\n", section_count, sections, dxbc, messages); + + if (messages) + *messages = NULL; + put_u32(&buffer, TAG_DXBC); checksum_position = bytecode_get_size(&buffer); @@ -57,18 +63,18 @@ int dxbc_writer_write(struct dxbc_writer *dxbc, struct vkd3d_shader_code *out) put_u32(&buffer, 1); /* version */ size_position = put_u32(&buffer, 0); - put_u32(&buffer, dxbc->section_count); + put_u32(&buffer, section_count); offsets_position = bytecode_get_size(&buffer); - for (i = 0; i < dxbc->section_count; ++i) + for (i = 0; i < section_count; ++i) put_u32(&buffer, 0); - for (i = 0; i < dxbc->section_count; ++i) + for (i = 0; i < section_count; ++i) { set_u32(&buffer, offsets_position + i * sizeof(uint32_t), bytecode_get_size(&buffer)); - put_u32(&buffer, dxbc->sections[i].tag); - put_u32(&buffer, dxbc->sections[i].data.size); - bytecode_put_bytes(&buffer, dxbc->sections[i].data.code, dxbc->sections[i].data.size); + put_u32(&buffer, sections[i].tag); + put_u32(&buffer, sections[i].data.size); + bytecode_put_bytes(&buffer, sections[i].data.code, sections[i].data.size); } set_u32(&buffer, size_position, bytecode_get_size(&buffer)); @@ -78,12 +84,17 @@ int dxbc_writer_write(struct dxbc_writer *dxbc, struct vkd3d_shader_code *out) if (!buffer.status) { - out->code = buffer.data; - out->size = buffer.size; + dxbc->code = buffer.data; + dxbc->size = buffer.size; } return buffer.status; } +int dxbc_writer_write(struct dxbc_writer *dxbc, struct vkd3d_shader_code *out) +{ + return vkd3d_shader_serialize_dxbc(dxbc->section_count, dxbc->sections, out, NULL); +} + struct vkd3d_shader_src_param_entry { struct list entry; diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 096cb848..6afc526a 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -18,6 +18,7 @@ global: vkd3d_shader_parse_root_signature; vkd3d_shader_preprocess; vkd3d_shader_scan; + vkd3d_shader_serialize_dxbc; vkd3d_shader_serialize_root_signature; vkd3d_shader_set_log_callback; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 6fb855c2..716352bd 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -318,6 +318,89 @@ static void test_d3dbc(void) ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); } +static void test_dxbc(void) +{ + PFN_vkd3d_shader_serialize_dxbc pfn_vkd3d_shader_serialize_dxbc; + PFN_vkd3d_shader_parse_dxbc pfn_vkd3d_shader_parse_dxbc; + PFN_vkd3d_shader_free_dxbc pfn_vkd3d_shader_free_dxbc; + struct vkd3d_shader_dxbc_desc dxbc_desc; + const uint8_t *dxbc_start, *dxbc_end; + struct vkd3d_shader_code dxbc; + size_t expected_size; + unsigned int i; + int ret; + + static const uint32_t section_0[] = + { + 0x00000000, 0x00000001, 0x00000001, 0x00000002, + 0x00000003, 0x00000005, 0x00000008, 0x0000000d, + 0x00000015, 0x00000022, 0x00000037, 0x00000059, + 0x00000090, 0x000000e9, 0x00000179, 0x00000262, + }; + static const uint8_t section_1[] = + { + 0x1, 0x4, 0x1, 0x5, 0x9, 0x2, 0x6, 0x5, 0x3, 0x5, 0x8, 0x9, 0x7, 0x9, 0x3, 0x2, + 0x3, 0x8, 0x4, 0x6, 0x2, 0x6, 0x4, 0x3, 0x3, 0x8, 0x3, 0x2, 0x7, 0x9, 0x5, 0x0, + 0x2, 0x8, 0x8, 0x4, 0x1, 0x9, 0x7, 0x1, 0x6, 0x9, 0x3, 0x9, 0x9, 0x3, 0x7, 0x5, + 0x1, 0x0, 0x5, 0x8, 0x2, 0x0, 0x9, 0x7, 0x4, 0x9, 0x4, 0x4, 0x5, 0x9, 0x2, 0x3, + }; + static const struct vkd3d_shader_dxbc_section_desc sections[] = + { + {.tag = 0x00424946, .data = {.code = section_0, .size = sizeof(section_0)}}, + {.tag = 0x49504950, .data = {.code = section_1, .size = sizeof(section_1)}}, + }; + static const uint32_t checksum[] = {0x7cfc687d, 0x7e8f4cff, 0x72a4739a, 0xd75c3703}; + + pfn_vkd3d_shader_serialize_dxbc = vkd3d_shader_serialize_dxbc; + pfn_vkd3d_shader_parse_dxbc = vkd3d_shader_parse_dxbc; + pfn_vkd3d_shader_free_dxbc = vkd3d_shader_free_dxbc; + + /* 8 * u32 for the DXBC header */ + expected_size = 8 * sizeof(uint32_t); + for (i = 0; i < ARRAY_SIZE(sections); ++i) + { + /* 1 u32 for the section offset + 2 u32 for the section header. */ + expected_size += 3 * sizeof(uint32_t) + sections[i].data.size; + } + + ret = pfn_vkd3d_shader_serialize_dxbc(ARRAY_SIZE(sections), sections, &dxbc, NULL); + ok(ret == VKD3D_OK, "Got unexpected ret %d.\n", ret); + ok(dxbc.size == expected_size, "Got unexpected size %zu, expected %zu.\n", dxbc_desc.size, expected_size); + + ret = pfn_vkd3d_shader_parse_dxbc(&dxbc, 0, &dxbc_desc, NULL); + ok(ret == VKD3D_OK, "Got unexpected ret %d.\n", ret); + ok(dxbc_desc.tag == 0x43425844, "Got unexpected tag 0x%08x.\n", dxbc_desc.tag); + ok(!memcmp(dxbc_desc.checksum, checksum, sizeof(dxbc_desc.checksum)), + "Got unexpected checksum 0x%08x 0x%08x 0x%08x 0x%08x.\n", + dxbc_desc.checksum[0], dxbc_desc.checksum[1], dxbc_desc.checksum[2], dxbc_desc.checksum[3]); + ok(dxbc_desc.version == 1, "Got unexpected version %#x.\n", dxbc_desc.version); + ok(dxbc_desc.size == expected_size, "Got unexpected size %zu, expected %zu.\n", dxbc_desc.size, expected_size); + ok(dxbc_desc.section_count == ARRAY_SIZE(sections), "Got unexpected section count %zu, expected %zu.\n", + dxbc_desc.section_count, ARRAY_SIZE(sections)); + + dxbc_start = dxbc.code; + dxbc_end = dxbc_start + dxbc.size; + for (i = 0; i < dxbc_desc.section_count; ++i) + { + const struct vkd3d_shader_dxbc_section_desc *section = &dxbc_desc.sections[i]; + const uint8_t *data = section->data.code; + + vkd3d_test_set_context("Section %u", i); + ok(section->tag == sections[i].tag, "Got unexpected tag 0x%08x, expected 0x%08x.\n", + section->tag, sections[i].tag); + ok(section->data.size == sections[i].data.size, "Got unexpected size %zu, expected %zu.\n", + section->data.size, sections[i].data.size); + ok(!memcmp(data, sections[i].data.code, section->data.size), "Got unexpected section data.\n"); + ok(data > dxbc_start && data <= dxbc_end - section->data.size, + "Data {%p, %zu} is not contained within blob {%p, %zu}.\n", + data, section->data.size, dxbc_start, dxbc_end - dxbc_start); + } + vkd3d_test_set_context(NULL); + + pfn_vkd3d_shader_free_dxbc(&dxbc_desc); + vkd3d_shader_free_shader_code(&dxbc); +} + START_TEST(vkd3d_shader_api) { setlocale(LC_ALL, ""); @@ -326,4 +409,5 @@ START_TEST(vkd3d_shader_api) run_test(test_vkd3d_shader_pfns); run_test(test_version); run_test(test_d3dbc); + run_test(test_dxbc); }

1 0