August 2020 - Wine-devel - list.winehq.org

[PATCH 1/3] ucrtbase: Fix precision handling in %#g when printing 0.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- We were duplicating bug in native implementation that is fixed in newest ucrtbase version. dlls/msvcrt/printf.h | 5 +---- dlls/ucrtbase/tests/printf.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 9 deletions(-)

1 0

[PATCH] vbscript: Return correct error for null start in InStr and more tests
by Dmitry Kislyuk 06 Aug '20

06 Aug '20

2 1

[PATCH vkd3d 2/5] vkd3d-compiler: Also print the vkd3d-shader version when printing the vkd3d-compiler version.
by Henri Verbeet 06 Aug '20

06 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 9b50c10..e2f9ae5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -265,7 +265,9 @@ int main(int argc, char **argv) if (options.print_version) { - fprintf(stdout, "vkd3d shader compiler version " PACKAGE_VERSION "\n"); + const char *version = vkd3d_shader_get_version(NULL, NULL); + + fprintf(stdout, "vkd3d shader compiler version " PACKAGE_VERSION " using %s\n", version); return 0; } -- 2.11.0

2 1

[PATCH vkd3d 5/5] vkd3d-shader: Introduce vkd3d_shader_get_supported_target_types().
by Henri Verbeet 06 Aug '20

06 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 4 ++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 36 ++++++++++++++++++++++++++++++----- tests/vkd3d_shader_api.c | 24 +++++++++++++++-------- 4 files changed, 52 insertions(+), 13 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 3dc3bb0..af97b04 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -751,6 +751,8 @@ struct vkd3d_shader_signature const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count); +const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( + enum vkd3d_shader_source_type source_type, unsigned int *count); int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); @@ -784,6 +786,8 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature */ typedef const char *(*PFN_vkd3d_shader_get_version)(unsigned int *major, unsigned int *minor); typedef const enum vkd3d_shader_source_type *(*PFN_vkd3d_shader_get_supported_source_types)(unsigned int *count); +typedef const enum vkd3d_shader_target_type *(*PFN_vkd3d_shader_get_supported_target_types)( + enum vkd3d_shader_source_type source_type, unsigned int *count); typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 15a1403..1937131 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -10,6 +10,7 @@ global: vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; vkd3d_shader_get_supported_source_types; + vkd3d_shader_get_supported_target_types; vkd3d_shader_get_version; vkd3d_shader_parse_input_signature; vkd3d_shader_parse_root_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 7a5c405..3e7b6cc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -256,6 +256,7 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info) { const enum vkd3d_shader_source_type *source_types; + const enum vkd3d_shader_target_type *target_types; unsigned int count, i; if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) @@ -276,13 +277,16 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ return VKD3D_ERROR_INVALID_ARGUMENT; } - switch (compile_info->target_type) + target_types = vkd3d_shader_get_supported_target_types(compile_info->source_type, &count); + for (i = 0; i < count; ++i) { - case VKD3D_SHADER_TARGET_SPIRV_BINARY: + if (target_types[i] == compile_info->target_type) break; - default: - WARN("Invalid shader target type %#x.\n", compile_info->target_type); - return VKD3D_ERROR_INVALID_ARGUMENT; + } + if (i == count) + { + WARN("Invalid shader target type %#x.\n", compile_info->target_type); + return VKD3D_ERROR_INVALID_ARGUMENT; } return VKD3D_OK; @@ -1056,3 +1060,25 @@ const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(uns *count = ARRAY_SIZE(types); return types; } + +const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( + enum vkd3d_shader_source_type source_type, unsigned int *count) +{ + static const enum vkd3d_shader_target_type dxbc_tpf_types[] = + { + VKD3D_SHADER_TARGET_SPIRV_BINARY, + }; + + TRACE("source_type %#x, count %p.\n", source_type, count); + + switch (source_type) + { + case VKD3D_SHADER_SOURCE_DXBC_TPF: + *count = ARRAY_SIZE(dxbc_tpf_types); + return dxbc_tpf_types; + + default: + *count = 0; + return NULL; + } +} diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index df2a4f2..d0f3f5d 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -76,6 +76,7 @@ static void test_invalid_shaders(void) static void test_vkd3d_shader_pfns(void) { PFN_vkd3d_shader_get_supported_source_types pfn_vkd3d_shader_get_supported_source_types; + PFN_vkd3d_shader_get_supported_target_types pfn_vkd3d_shader_get_supported_target_types; PFN_vkd3d_shader_free_scan_descriptor_info pfn_vkd3d_shader_free_scan_descriptor_info; PFN_vkd3d_shader_serialize_root_signature pfn_vkd3d_shader_serialize_root_signature; PFN_vkd3d_shader_find_signature_element pfn_vkd3d_shader_find_signature_element; @@ -92,12 +93,13 @@ static void test_vkd3d_shader_pfns(void) unsigned int major, minor, expected_major, expected_minor; struct vkd3d_shader_scan_descriptor_info descriptor_info; const enum vkd3d_shader_source_type *source_types; + const enum vkd3d_shader_target_type *target_types; struct vkd3d_shader_signature_element *element; struct vkd3d_shader_compile_info compile_info; + unsigned int i, j, source_count, target_count; struct vkd3d_shader_signature signature; struct vkd3d_shader_code dxbc, spirv; const char *version, *p; - unsigned int i, count; bool b; int rc; @@ -124,6 +126,7 @@ static void test_vkd3d_shader_pfns(void) static const struct vkd3d_shader_code vs = {vs_code, sizeof(vs_code)}; pfn_vkd3d_shader_get_supported_source_types = vkd3d_shader_get_supported_source_types; + pfn_vkd3d_shader_get_supported_target_types = vkd3d_shader_get_supported_target_types; pfn_vkd3d_shader_free_scan_descriptor_info = vkd3d_shader_free_scan_descriptor_info; pfn_vkd3d_shader_serialize_root_signature = vkd3d_shader_serialize_root_signature; pfn_vkd3d_shader_find_signature_element = vkd3d_shader_find_signature_element; @@ -143,20 +146,25 @@ static void test_vkd3d_shader_pfns(void) ok(major == expected_major, "Got unexpected major version %u.\n", major); ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); - source_types = pfn_vkd3d_shader_get_supported_source_types(&count); + source_types = pfn_vkd3d_shader_get_supported_source_types(&source_count); ok(source_types, "Got unexpected source types array %p.\n", source_types); - ok(count, "Got unexpected source type count %u.\n", count); + ok(source_count, "Got unexpected source type count %u.\n", source_count); b = false; - for (i = 0; i < count; ++i) + for (i = 0; i < source_count; ++i) { - if (source_types[i] == VKD3D_SHADER_SOURCE_DXBC_TPF) + target_types = pfn_vkd3d_shader_get_supported_target_types(source_types[i], &target_count); + ok(target_types, "Got unexpected target types array %p.\n", target_types); + ok(target_count, "Got unexpected target type count %u.\n", target_count); + + for (j = 0; j < target_count; ++j) { - b = true; - break; + if (source_types[i] == VKD3D_SHADER_SOURCE_DXBC_TPF + && target_types[j] == VKD3D_SHADER_TARGET_SPIRV_BINARY) + b = true; } } - ok(b, "The dxbc-tpf source type is not supported.\n"); + ok(b, "The dxbc-tpf source type with spirv-binary target type is not supported.\n"); rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Introduce vkd3d_shader_get_supported_source_types().
by Henri Verbeet 06 Aug '20

06 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 2 ++ libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 29 ++++++++++++++++++++++++----- tests/vkd3d_shader_api.c | 20 ++++++++++++++++++++ 4 files changed, 47 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 92ce9b9..3dc3bb0 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -750,6 +750,7 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); +const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count); int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); @@ -782,6 +783,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature * Function pointer typedefs for vkd3d-shader functions. */ typedef const char *(*PFN_vkd3d_shader_get_version)(unsigned int *major, unsigned int *minor); +typedef const enum vkd3d_shader_source_type *(*PFN_vkd3d_shader_get_supported_source_types)(unsigned int *count); typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index eca7278..15a1403 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -9,6 +9,7 @@ global: vkd3d_shader_free_scan_descriptor_info; vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; + vkd3d_shader_get_supported_source_types; vkd3d_shader_get_version; vkd3d_shader_parse_input_signature; vkd3d_shader_parse_root_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ab08620..7a5c405 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -255,19 +255,25 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info) { + const enum vkd3d_shader_source_type *source_types; + unsigned int count, i; + if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) { WARN("Invalid structure type %#x.\n", compile_info->type); return VKD3D_ERROR_INVALID_ARGUMENT; } - switch (compile_info->source_type) + source_types = vkd3d_shader_get_supported_source_types(&count); + for (i = 0; i < count; ++i) { - case VKD3D_SHADER_SOURCE_DXBC_TPF: + if (source_types[i] == compile_info->source_type) break; - default: - WARN("Invalid shader source type %#x.\n", compile_info->source_type); - return VKD3D_ERROR_INVALID_ARGUMENT; + } + if (i == count) + { + WARN("Invalid shader source type %#x.\n", compile_info->source_type); + return VKD3D_ERROR_INVALID_ARGUMENT; } switch (compile_info->target_type) @@ -1037,3 +1043,16 @@ const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor) return "vkd3d-shader " PACKAGE_VERSION VKD3D_VCS_ID; } + +const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count) +{ + static const enum vkd3d_shader_source_type types[] = + { + VKD3D_SHADER_SOURCE_DXBC_TPF, + }; + + TRACE("count %p.\n", count); + + *count = ARRAY_SIZE(types); + return types; +} diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index fab17ad..df2a4f2 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -75,6 +75,7 @@ static void test_invalid_shaders(void) static void test_vkd3d_shader_pfns(void) { + PFN_vkd3d_shader_get_supported_source_types pfn_vkd3d_shader_get_supported_source_types; PFN_vkd3d_shader_free_scan_descriptor_info pfn_vkd3d_shader_free_scan_descriptor_info; PFN_vkd3d_shader_serialize_root_signature pfn_vkd3d_shader_serialize_root_signature; PFN_vkd3d_shader_find_signature_element pfn_vkd3d_shader_find_signature_element; @@ -90,11 +91,14 @@ static void test_vkd3d_shader_pfns(void) struct vkd3d_shader_versioned_root_signature_desc root_signature_desc; unsigned int major, minor, expected_major, expected_minor; struct vkd3d_shader_scan_descriptor_info descriptor_info; + const enum vkd3d_shader_source_type *source_types; struct vkd3d_shader_signature_element *element; struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_signature signature; struct vkd3d_shader_code dxbc, spirv; const char *version, *p; + unsigned int i, count; + bool b; int rc; static const struct vkd3d_shader_versioned_root_signature_desc empty_rs_desc = @@ -119,6 +123,7 @@ static void test_vkd3d_shader_pfns(void) }; static const struct vkd3d_shader_code vs = {vs_code, sizeof(vs_code)}; + pfn_vkd3d_shader_get_supported_source_types = vkd3d_shader_get_supported_source_types; pfn_vkd3d_shader_free_scan_descriptor_info = vkd3d_shader_free_scan_descriptor_info; pfn_vkd3d_shader_serialize_root_signature = vkd3d_shader_serialize_root_signature; pfn_vkd3d_shader_find_signature_element = vkd3d_shader_find_signature_element; @@ -138,6 +143,21 @@ static void test_vkd3d_shader_pfns(void) ok(major == expected_major, "Got unexpected major version %u.\n", major); ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); + source_types = pfn_vkd3d_shader_get_supported_source_types(&count); + ok(source_types, "Got unexpected source types array %p.\n", source_types); + ok(count, "Got unexpected source type count %u.\n", count); + + b = false; + for (i = 0; i < count; ++i) + { + if (source_types[i] == VKD3D_SHADER_SOURCE_DXBC_TPF) + { + b = true; + break; + } + } + ok(b, "The dxbc-tpf source type is not supported.\n"); + rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc, NULL); -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Use vkd3d_shader_validate_compile_info() in vkd3d_shader_scan().
by Henri Verbeet 06 Aug '20

06 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 140bdd4..ab08620 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -839,17 +839,8 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if (messages) *messages = NULL; - if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) - { - WARN("Invalid structure type %#x.\n", compile_info->type); - return VKD3D_ERROR_INVALID_ARGUMENT; - } - - if (compile_info->source_type != VKD3D_SHADER_SOURCE_DXBC_TPF) - { - WARN("Unsupported source type %#x.\n", compile_info->source_type); - return VKD3D_ERROR_INVALID_ARGUMENT; - } + if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) + return ret; if ((scan_descriptor_info = vkd3d_find_struct(compile_info->next, SCAN_DESCRIPTOR_INFO))) { -- 2.11.0

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Introduce vkd3d_shader_get_version().
by Henri Verbeet 06 Aug '20

06 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 21 ++++++++++++-------- include/vkd3d_shader.h | 4 ++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 19 ++++++++++++++++++ libs/vkd3d/device.c | 3 ++- tests/vkd3d_shader_api.c | 37 +++++++++++++++++++++++++++++++++++ 6 files changed, 76 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 00a5f58..b172517 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = @VKD3D_CFLAGS@ -AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/dummy -I$(srcdir)/include/private +AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include/private AM_LDFLAGS = -no-undefined widl_headers = \ @@ -58,7 +58,8 @@ vkd3d_demos_headers = \ demos/demo_win32.h \ demos/demo_xcb.h -BUILT_SOURCES = $(widl_headers) +BUILT_SOURCES = $(widl_headers) \ + include/private/vkd3d_version.h noinst_LTLIBRARIES = libvkd3d-common.la libvkd3d_common_la_SOURCES = \ @@ -109,8 +110,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_main.c \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vkd3d_shaders.h \ - libs/vkd3d/vulkan_procs.h \ - libs/vkd3d_version.c + libs/vkd3d/vulkan_procs.h libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT @@ -208,10 +208,15 @@ libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in Makefile -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ $< > $@ -libs/vkd3d_version.c: dummy-vkd3d-version - $(AM_V_GEN)version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "vkd3d-$(PACKAGE_VERSION)") | $(SED) -n -e '$$s/$.*$/const char vkd3d_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) -.SILENT: libs/vkd3d_version.c -CLEANFILES += libs/vkd3d_version.c +include/private/vkd3d_version.h: dummy-vkd3d-version + @$(MKDIR_P) include/private + version=`(GIT_DIR=$(top_srcdir)/.git git rev-parse --short HEAD 2>/dev/null || echo '') \ + | $(SED) -e 's!$..*$! (git \1)!' \ + | $(SED) -n -e '$$s!$.*$!#define VKD3D_VCS_ID "\1"!p'` \ + && (echo $$version | cmp -s - $@) \ + || echo $$version >$@ || ($(RM) $@ && exit 1) +.SILENT: include/private/vkd3d_version.h +CLEANFILES += include/private/vkd3d_version.h .PHONY: dummy-vkd3d-version dummy-vkd3d-version: diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index de2c0c7..92ce9b9 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -749,6 +749,8 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES +const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); + int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); void vkd3d_shader_free_messages(char *messages); @@ -779,6 +781,8 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature /* * Function pointer typedefs for vkd3d-shader functions. */ +typedef const char *(*PFN_vkd3d_shader_get_version)(unsigned int *major, unsigned int *minor); + typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); typedef void (*PFN_vkd3d_shader_free_messages)(char *messages); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 9c9f0a5..eca7278 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -9,6 +9,7 @@ global: vkd3d_shader_free_scan_descriptor_info; vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; + vkd3d_shader_get_version; vkd3d_shader_parse_input_signature; vkd3d_shader_parse_root_signature; vkd3d_shader_scan; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index cfac8e2..140bdd4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -17,6 +17,7 @@ */ #include "vkd3d_shader_private.h" +#include "vkd3d_version.h" #include <stdio.h> @@ -1027,3 +1028,21 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature vkd3d_free(signature->elements); signature->elements = NULL; } + +const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor) +{ + int x, y; + + TRACE("major %p, minor %p.\n", major, minor); + + if (major || minor) + { + vkd3d_parse_version(PACKAGE_VERSION, &x, &y); + if (major) + *major = x; + if (minor) + *minor = y; + } + + return "vkd3d-shader " PACKAGE_VERSION VKD3D_VCS_ID; +} diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d88fde9..bef6477 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -17,6 +17,7 @@ */ #include "vkd3d_private.h" +#include "vkd3d_version.h" #ifdef HAVE_DLFCN_H #include <dlfcn.h> @@ -460,7 +461,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, VkResult vr; HRESULT hr; - TRACE("Build: %s.\n", vkd3d_build); + TRACE("Build: " PACKAGE_STRING VKD3D_VCS_ID ".\n"); if (!create_info->pfn_signal_event) { diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index e25dd20..fab17ad 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -83,15 +83,18 @@ static void test_vkd3d_shader_pfns(void) PFN_vkd3d_shader_parse_root_signature pfn_vkd3d_shader_parse_root_signature; PFN_vkd3d_shader_free_root_signature pfn_vkd3d_shader_free_root_signature; PFN_vkd3d_shader_free_shader_code pfn_vkd3d_shader_free_shader_code; + PFN_vkd3d_shader_get_version pfn_vkd3d_shader_get_version; PFN_vkd3d_shader_compile pfn_vkd3d_shader_compile; PFN_vkd3d_shader_scan pfn_vkd3d_shader_scan; struct vkd3d_shader_versioned_root_signature_desc root_signature_desc; + unsigned int major, minor, expected_major, expected_minor; struct vkd3d_shader_scan_descriptor_info descriptor_info; struct vkd3d_shader_signature_element *element; struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_signature signature; struct vkd3d_shader_code dxbc, spirv; + const char *version, *p; int rc; static const struct vkd3d_shader_versioned_root_signature_desc empty_rs_desc = @@ -124,9 +127,17 @@ static void test_vkd3d_shader_pfns(void) pfn_vkd3d_shader_parse_root_signature = vkd3d_shader_parse_root_signature; pfn_vkd3d_shader_free_root_signature = vkd3d_shader_free_root_signature; pfn_vkd3d_shader_free_shader_code = vkd3d_shader_free_shader_code; + pfn_vkd3d_shader_get_version = vkd3d_shader_get_version; pfn_vkd3d_shader_compile = vkd3d_shader_compile; pfn_vkd3d_shader_scan = vkd3d_shader_scan; + sscanf(PACKAGE_VERSION, "%d.%d", &expected_major, &expected_minor); + version = pfn_vkd3d_shader_get_version(&major, &minor); + p = strstr(version, "vkd3d-shader " PACKAGE_VERSION); + ok(p == version, "Got unexpected version string \"%s\"\n", version); + ok(major == expected_major, "Got unexpected major version %u.\n", major); + ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); + rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc, NULL); @@ -163,10 +174,36 @@ static void test_vkd3d_shader_pfns(void) pfn_vkd3d_shader_free_scan_descriptor_info(&descriptor_info); } +static void test_version(void) +{ + unsigned int major, minor, expected_major, expected_minor; + const char *version, *p; + + sscanf(PACKAGE_VERSION, "%d.%d", &expected_major, &expected_minor); + + version = vkd3d_shader_get_version(NULL, NULL); + p = strstr(version, "vkd3d-shader " PACKAGE_VERSION); + ok(p == version, "Got unexpected version string \"%s\"\n", version); + + major = ~0u; + vkd3d_shader_get_version(&major, NULL); + ok(major == expected_major, "Got unexpected major version %u.\n", major); + + minor = ~0u; + vkd3d_shader_get_version(NULL, &minor); + ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); + + major = minor = ~0u; + vkd3d_shader_get_version(&major, &minor); + ok(major == expected_major, "Got unexpected major version %u.\n", major); + ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); +} + START_TEST(vkd3d_shader_api) { setlocale(LC_ALL, ""); run_test(test_invalid_shaders); run_test(test_vkd3d_shader_pfns); + run_test(test_version); } -- 2.11.0

1 0

[PATCH] wuaueng: Add stub DllRegisterServer and DllUnregisterServer functions.
by Vijay Kiran Kamuju 06 Aug '20

06 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49459 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/6] combase: Move CoCreateGuid().
by Nikolay Sivov 06 Aug '20

06 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/Makefile.in | 2 +- dlls/combase/combase.c | 14 ++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 26 -------------------------- dlls/ole32/ole32.spec | 2 +- 5 files changed, 17 insertions(+), 29 deletions(-) diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index 87bb149b594..71537f699b1 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1,6 +1,6 @@ MODULE = combase.dll IMPORTLIB = combase -IMPORTS = advapi32 ole32 user32 gdi32 uuid +IMPORTS = advapi32 ole32 user32 gdi32 uuid rpcrt4 DELAYIMPORTS = oleaut32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index bf1228a1f24..9bf2252fb85 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -440,3 +440,17 @@ HRESULT WINAPI CoFileTimeNow(FILETIME *filetime) GetSystemTimeAsFileTime(filetime); return S_OK; } + +/****************************************************************************** + * CoCreateGuid (combase.@) + */ +HRESULT WINAPI CoCreateGuid(GUID *guid) +{ + RPC_STATUS status; + + if (!guid) return E_INVALIDARG; + + status = UuidCreate(guid); + if (status == RPC_S_OK || status == RPC_S_UUID_LOCAL_ONLY) return S_OK; + return HRESULT_FROM_WIN32(status); +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 9940229c46f..ddfe5c5ca2e 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -78,7 +78,7 @@ @ stdcall CoCopyProxy(ptr ptr) ole32.CoCopyProxy @ stub CoCreateErrorInfo @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) ole32.CoCreateFreeThreadedMarshaler -@ stdcall CoCreateGuid(ptr) ole32.CoCreateGuid +@ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx @ stub CoCreateInstanceFromApp diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 29c8ca6e13a..f96d69c198c 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2186,32 +2186,6 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) return S_OK; } -/****************************************************************************** - * CoCreateGuid [OLE32.@] - * - * Simply forwards to UuidCreate in RPCRT4. - * - * PARAMS - * pguid [O] Points to the GUID to initialize. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * UuidCreate - */ -HRESULT WINAPI CoCreateGuid(GUID *pguid) -{ - DWORD status; - - if(!pguid) return E_INVALIDARG; - - status = UuidCreate(pguid); - if (status == RPC_S_OK || status == RPC_S_UUID_LOCAL_ONLY) return S_OK; - return HRESULT_FROM_WIN32( status ); -} - static inline BOOL is_valid_hex(WCHAR c) { if (!(((c >= '0') && (c <= '9')) || diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 87c950cf438..0713a989eed 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -11,7 +11,7 @@ @ stdcall CoBuildVersion() @ stdcall CoCopyProxy(ptr ptr) @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) -@ stdcall CoCreateGuid(ptr) +@ stdcall CoCreateGuid(ptr) combase.CoCreateGuid @ stdcall CoCreateInstance(ptr ptr long ptr ptr) @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) @ stdcall CoDecrementMTAUsage(ptr) -- 2.27.0

3 13

[PATCH v2 6/6] xactengine3_7: Implement IXACT3Engine::RegisterNotification and IXACT3Engine::UnRegisterNotification functions.
by Vijay Kiran Kamuju 06 Aug '20

06 Aug '20

Based on patches from Ethan Lee and Alistair Leslie-Hughes. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1