July 2020 - Wine-commits - list.winehq.org

Henri Verbeet : vkd3d-shader: Pass a vkd3d_shader_compile_info structure to vkd3d_shader_scan_dxbc().
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: vkd3d Branch: master Commit: 11f82d985c4e2f32f0b8c2ccabe2aca51eada245 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=11f82d985c4e2f32f0b8c2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 15:17:55 2020 +0430 vkd3d-shader: Pass a vkd3d_shader_compile_info structure to vkd3d_shader_scan_dxbc(). In order to allow it to handle different source types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 18 +++--- libs/vkd3d-shader/spirv.c | 33 ++--------- libs/vkd3d-shader/vkd3d_shader.map | 4 +- libs/vkd3d-shader/vkd3d_shader_main.c | 97 +++++++++++++++++++------------- libs/vkd3d-shader/vkd3d_shader_private.h | 23 +++++++- libs/vkd3d/state.c | 41 ++++++++++---- tests/vkd3d_shader_api.c | 20 +++++-- 7 files changed, 141 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=11f82d985c4e2f32f0b…

1 0

Henri Verbeet : vkd3d-shader: Report error messages from vkd3d_shader_parse_input_signature().
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: vkd3d Branch: master Commit: d135b4687b79bc45928c467510b4c3f0a79b8ea0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d135b4687b79bc45928c467… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 15:17:56 2020 +0430 vkd3d-shader: Report error messages from vkd3d_shader_parse_input_signature(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 8 ++------ libs/vkd3d-shader/vkd3d_shader_main.c | 21 ++++++++++++++++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- libs/vkd3d/state.c | 2 +- tests/vkd3d_shader_api.c | 2 +- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 96d0545..0dd9829 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -767,7 +767,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info); int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_signature *signature); + struct vkd3d_shader_signature *signature, char **messages); struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( const struct vkd3d_shader_signature *signature, const char *semantic_name, unsigned int semantic_index, unsigned int stream_index); @@ -798,7 +798,7 @@ typedef void (*PFN_vkd3d_shader_free_scan_descriptor_info)( struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info); typedef int (*PFN_vkd3d_shader_parse_input_signature)(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_signature *signature); + struct vkd3d_shader_signature *signature, char **messages); typedef struct vkd3d_shader_signature_element * (*PFN_vkd3d_shader_find_signature_element)( const struct vkd3d_shader_signature *signature, const char *semantic_name, unsigned int semantic_index, unsigned int stream_index); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index f738abe..a00dbe9 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2132,17 +2132,13 @@ static int isgn_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) } int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_signature *signature) + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature) { - struct vkd3d_shader_message_context message_context; int ret; memset(signature, 0, sizeof(*signature)); - if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_NONE, NULL)) - return VKD3D_ERROR; - if ((ret = parse_dxbc(dxbc, dxbc_length, &message_context, isgn_handler, signature)) < 0) + if ((ret = parse_dxbc(dxbc, dxbc_length, message_context, isgn_handler, signature)) < 0) ERR("Failed to parse input signature.\n"); - vkd3d_shader_message_context_cleanup(&message_context); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5d50487..6511a89 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -971,11 +971,26 @@ void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signatu } int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_signature *signature) + struct vkd3d_shader_signature *signature, char **messages) { - TRACE("dxbc {%p, %zu}, signature %p.\n", dxbc->code, dxbc->size, signature); + struct vkd3d_shader_message_context message_context; + int ret; + + TRACE("dxbc {%p, %zu}, signature %p, messages %p.\n", dxbc->code, dxbc->size, signature, messages); + + if (messages) + *messages = NULL; + if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) + return VKD3D_ERROR; - return shader_parse_input_signature(dxbc->code, dxbc->size, signature); + ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature); + vkd3d_shader_message_context_trace_messages(&message_context); + if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + ret = VKD3D_ERROR_OUT_OF_MEMORY; + + vkd3d_shader_message_context_cleanup(&message_context); + + return ret; } struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ae2f6c2..79056b3 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -840,7 +840,7 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, void free_shader_desc(struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_signature *signature) DECLSPEC_HIDDEN; + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature) DECLSPEC_HIDDEN; struct vkd3d_dxbc_compiler; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 93f22ce..449f242 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2316,7 +2316,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s switch (shader_stages[i].stage) { case VK_SHADER_STAGE_VERTEX_BIT: - if ((ret = vkd3d_shader_parse_input_signature(&dxbc, &input_signature)) < 0) + if ((ret = vkd3d_shader_parse_input_signature(&dxbc, &input_signature, NULL)) < 0) { hr = hresult_from_vkd3d_result(ret); goto fail; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index be63b39..6977945 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -134,7 +134,7 @@ static void test_vkd3d_shader_pfns(void) pfn_vkd3d_shader_free_root_signature(&root_signature_desc); pfn_vkd3d_shader_free_shader_code(&dxbc); - rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature); + rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); element = pfn_vkd3d_shader_find_signature_element(&signature, "position", 0, 0); ok(element, "Could not find shader signature element.\n");

1 0

Henri Verbeet : vkd3d-shader: Report error messages from vkd3d_shader_parse_root_signature().
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: vkd3d Branch: master Commit: 33eb944bf425a1fe21cf9b54daa299092fe730b1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=33eb944bf425a1fe21cf9b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 15:17:57 2020 +0430 vkd3d-shader: Report error messages from vkd3d_shader_parse_root_signature(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 13 ++++++++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 6 ++---- libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++++ libs/vkd3d/vkd3d_main.c | 4 ++-- tests/vkd3d_shader_api.c | 2 +- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 0dd9829..8ee6724 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -753,7 +753,7 @@ void vkd3d_shader_free_messages(char *messages); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_versioned_root_signature_desc *root_signature); + struct vkd3d_shader_versioned_root_signature_desc *root_signature, char **messages); void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signature_desc *root_signature); /* FIXME: Add support for returning error messages (ID3DBlob). */ @@ -784,7 +784,7 @@ typedef void (*PFN_vkd3d_shader_free_messages)(char *messages); typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_versioned_root_signature_desc *root_signature); + struct vkd3d_shader_versioned_root_signature_desc *root_signature, char **messages); typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_shader_versioned_root_signature_desc *root_signature); typedef int (*PFN_vkd3d_shader_serialize_root_signature)( diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index a00dbe9..28159a9 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2679,17 +2679,24 @@ static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *cont } int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_versioned_root_signature_desc *root_signature) + struct vkd3d_shader_versioned_root_signature_desc *root_signature, char **messages) { struct vkd3d_shader_message_context message_context; int ret; - TRACE("dxbc {%p, %zu}, root_signature %p.\n", dxbc->code, dxbc->size, root_signature); + TRACE("dxbc {%p, %zu}, root_signature %p, messages %p.\n", dxbc->code, dxbc->size, root_signature, messages); memset(root_signature, 0, sizeof(*root_signature)); - if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_NONE, NULL)) + if (messages) + *messages = NULL; + if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) return VKD3D_ERROR; + ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, rts0_handler, root_signature); + vkd3d_shader_message_context_trace_messages(&message_context); + if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + ret = VKD3D_ERROR_OUT_OF_MEMORY; + vkd3d_shader_message_context_cleanup(&message_context); if (ret < 0) vkd3d_shader_free_root_signature(root_signature); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6511a89..0785c14 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -133,15 +133,13 @@ void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *c vkd3d_string_buffer_cleanup(&context->messages); } -#define vkd3d_shader_message_context_trace_messages(context) \ - vkd3d_shader_message_context_trace_messages_(context, __FUNCTION__) -static void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, +void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, const char *function) { vkd3d_string_buffer_trace_(&context->messages, function); } -static char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) +char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) { char *messages; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 79056b3..3161087 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -830,8 +830,13 @@ struct vkd3d_shader_message_context }; void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; +char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN; +void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, + const char *function) DECLSPEC_HIDDEN; +#define vkd3d_shader_message_context_trace_messages(context) \ + vkd3d_shader_message_context_trace_messages_(context, __FUNCTION__) void vkd3d_shader_error(struct vkd3d_shader_message_context *context, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 5d7c71e..3fd9c1b 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -174,7 +174,7 @@ int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_versioned_root_signature_desc desc, converted_desc; int ret; - if ((ret = vkd3d_shader_parse_root_signature(dxbc, &desc)) < 0) + if ((ret = vkd3d_shader_parse_root_signature(dxbc, &desc, NULL)) < 0) { WARN("Failed to parse root signature, vkd3d result %d.\n", ret); return ret; @@ -389,7 +389,7 @@ static HRESULT d3d12_versioned_root_signature_deserializer_init(struct d3d12_ver deserializer->ID3D12VersionedRootSignatureDeserializer_iface.lpVtbl = &d3d12_versioned_root_signature_deserializer_vtbl; deserializer->refcount = 1; - if ((ret = vkd3d_shader_parse_root_signature(dxbc, &deserializer->desc.vkd3d)) < 0) + if ((ret = vkd3d_shader_parse_root_signature(dxbc, &deserializer->desc.vkd3d, NULL)) < 0) { WARN("Failed to parse root signature, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 6977945..a730c86 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -129,7 +129,7 @@ static void test_vkd3d_shader_pfns(void) rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); - rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc); + rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); pfn_vkd3d_shader_free_root_signature(&root_signature_desc); pfn_vkd3d_shader_free_shader_code(&dxbc);

1 0

Henri Verbeet : vkd3d-shader: Report error messages from vkd3d_shader_serialize_root_signature().
by Alexandre Julliard 30 Jul '20

30 Jul '20

Module: vkd3d Branch: master Commit: 1279d5df9eddcb99a90c77813a96a228da47c6a5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1279d5df9eddcb99a90c778… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 15:17:58 2020 +0430 vkd3d-shader: Report error messages from vkd3d_shader_serialize_root_signature(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 6 +- libs/vkd3d-shader/dxbc.c | 221 +++++++++++++++++++++---------- libs/vkd3d-shader/vkd3d_shader_private.h | 21 ++- libs/vkd3d/vkd3d_main.c | 26 +++- tests/vkd3d_shader_api.c | 2 +- 5 files changed, 192 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=1279d5df9eddcb99a90…

1 0

Jactry Zeng : wininet: Handle empty expires for cookie setting.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: c06e00ee6a15fd77faf66b28edac5e84ad30b550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c06e00ee6a15fd77faf66b28… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jul 29 13:39:28 2020 +0200 wininet: Handle empty expires for cookie setting. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 2 +- dlls/wininet/tests/internet.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 1786b3d281..66c012a0db 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -977,7 +977,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D substr_skip(&data, len); - if(end_ptr - data.str < ARRAY_SIZE(buf)-1) { + if(end_ptr > data.str && (end_ptr - data.str < ARRAY_SIZE(buf) - 1)) { memcpy(buf, data.str, data.len*sizeof(WCHAR)); buf[data.len] = 0; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e69b45a7e6..ef1adefd1a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -510,7 +510,7 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookieA("http://testing.example.com/bar/foo", NULL, buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); - ok(len == 24, "len = %u\n", 24); + ok(len == 24, "len = %u\n", len); ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n"); ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n"); ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n"); @@ -524,16 +524,26 @@ static void test_complicated_cookie(void) len = 1024; ret = InternetGetCookieA("http://testing.example.com/bar/foo", "A", buffer, &len); ok(ret == TRUE,"InternetGetCookie failed\n"); - ok(len == 24, "len = %u\n", 24); + ok(len == 24, "len = %u\n", len); /* test persistent cookies */ ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); + /* test invalid expires parameter */ + ret = InternetSetCookieA("http://testing.example.com", NULL, "Q=R; expires="); + ok(ret, "InternetSetCookie failed %#x.\n", GetLastError()); + len = 1024; + memset(buffer, 0xac, sizeof(buffer)); + ret = InternetGetCookieA("http://testing.example.com/", NULL, buffer, &len); + ok(ret, "InternetGetCookie failed %#x.\n", GetLastError()); + ok(len == 29, "got len %u.\n", len); + ok(!!strstr(buffer, "Q=R"), "cookie is not present.\n"); + len = sizeof(buffer); ret = InternetGetCookieA("http://testing.example.com/foobar", NULL, buffer, &len); - ok(ret, "got error %u\n", GetLastError()); - ok(len == 24, "got len %u\n", len); + ok(ret, "got error %#x\n", GetLastError()); + ok(len == 29, "got len %u\n", len); ok(!!strstr(buffer, "A=B"), "cookie is not present\n"); /* remove persistent cookie */

1 0

Daniel Lehman : msvcp140_1: Add stub msvcp140_1.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 4401d4608894ba71937cd02571b689869c77f555 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4401d4608894ba71937cd025… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Jul 28 22:55:45 2020 -0700 msvcp140_1: Add stub msvcp140_1. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/msvcp140_1/Makefile.in | 1 + dlls/msvcp140_1/msvcp140_1.spec | 7 +++++++ 4 files changed, 11 insertions(+) diff --git a/configure b/configure index 529b416472..443e986ed5 100755 --- a/configure +++ b/configure @@ -1464,6 +1464,7 @@ enable_msvcp110 enable_msvcp120 enable_msvcp120_app enable_msvcp140 +enable_msvcp140_1 enable_msvcp60 enable_msvcp70 enable_msvcp71 @@ -20915,6 +20916,7 @@ wine_fn_config_makefile dlls/msvcp120/tests enable_tests wine_fn_config_makefile dlls/msvcp120_app enable_msvcp120_app wine_fn_config_makefile dlls/msvcp140 enable_msvcp140 wine_fn_config_makefile dlls/msvcp140/tests enable_tests +wine_fn_config_makefile dlls/msvcp140_1 enable_msvcp140_1 wine_fn_config_makefile dlls/msvcp60 enable_msvcp60 wine_fn_config_makefile dlls/msvcp60/tests enable_tests wine_fn_config_makefile dlls/msvcp70 enable_msvcp70 diff --git a/configure.ac b/configure.ac index f2d0c9cd26..dea25b0c3f 100644 --- a/configure.ac +++ b/configure.ac @@ -3512,6 +3512,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp120/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp120_app) WINE_CONFIG_MAKEFILE(dlls/msvcp140) WINE_CONFIG_MAKEFILE(dlls/msvcp140/tests) +WINE_CONFIG_MAKEFILE(dlls/msvcp140_1) WINE_CONFIG_MAKEFILE(dlls/msvcp60) WINE_CONFIG_MAKEFILE(dlls/msvcp60/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp70) diff --git a/dlls/msvcp140_1/Makefile.in b/dlls/msvcp140_1/Makefile.in new file mode 100644 index 0000000000..6582299d7d --- /dev/null +++ b/dlls/msvcp140_1/Makefile.in @@ -0,0 +1 @@ +MODULE = msvcp140_1.dll diff --git a/dlls/msvcp140_1/msvcp140_1.spec b/dlls/msvcp140_1/msvcp140_1.spec new file mode 100644 index 0000000000..bfe82ab00d --- /dev/null +++ b/dlls/msvcp140_1/msvcp140_1.spec @@ -0,0 +1,7 @@ +@ stub _Aligned_get_default_resource +@ stub _Aligned_new_delete_resource +@ stub _Aligned_set_default_resource +@ stub _Unaligned_get_default_resource +@ stub _Unaligned_new_delete_resource +@ stub _Unaligned_set_default_resource +@ stub null_memory_resource

1 0

Hans Leidekker : bcrypt: Allow importing private ECDSA keys.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: d17b118f030407a973a4aaaab58774449a6235cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d17b118f030407a973a4aaaa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 29 14:34:14 2020 +0200 bcrypt: Allow importing private ECDSA keys. Based on a patch by Derek Lesho. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 4 ++++ dlls/bcrypt/gnutls.c | 1 + dlls/bcrypt/tests/bcrypt.c | 39 +++++++++++++++++++++++++++++++++------ 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index bea2001a67..b6bb73a715 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1201,6 +1201,10 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP key_size = 32; magic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; break; + case ALG_ID_ECDSA_P256: + key_size = 32; + magic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; + break; default: FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(type) ); diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 19a00e2ee2..a80bce47f9 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -952,6 +952,7 @@ NTSTATUS key_import_ecc( struct key *key, UCHAR *buf, ULONG len ) switch (key->alg_id) { case ALG_ID_ECDH_P256: + case ALG_ID_ECDSA_P256: curve = GNUTLS_ECC_CURVE_SECP256R1; break; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index eb7a72e0ff..e37a33e38a 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1670,6 +1670,18 @@ static void test_key_import_export(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static BYTE eccPrivkey[] = +{ + /* X */ + 0x26, 0xff, 0x0e, 0xf9, 0x71, 0x93, 0xf8, 0xed, 0x59, 0xfa, 0x24, 0xec, 0x18, 0x13, 0xfe, 0xf5, + 0x0b, 0x4a, 0xb1, 0x27, 0xb7, 0xab, 0x3e, 0x4f, 0xc5, 0x5a, 0x91, 0xa3, 0x6e, 0x21, 0x61, 0x65, + /* Y */ + 0x62, 0x7b, 0x8b, 0x30, 0x7a, 0x63, 0x4c, 0x1a, 0xf4, 0x54, 0x54, 0xbb, 0x75, 0x59, 0x68, 0x36, + 0xfe, 0x49, 0x95, 0x75, 0x9e, 0x20, 0x3e, 0x69, 0x58, 0xb9, 0x7a, 0x84, 0x03, 0x45, 0x5c, 0x10, + /* d */ + 0xb9, 0xcd, 0xbe, 0xd4, 0x75, 0x5d, 0x05, 0xe5, 0x83, 0x0c, 0xd3, 0x37, 0x34, 0x15, 0xe3, 0x2c, + 0xe5, 0x85, 0x15, 0xa9, 0xee, 0xba, 0x94, 0x03, 0x03, 0x0b, 0x86, 0xea, 0x85, 0x40, 0xbd, 0x35, +}; static BYTE eccPubkey[] = { /* X */ @@ -1696,11 +1708,12 @@ static BYTE certSignature[] = static void test_ECDSA(void) { - BYTE buffer[sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPubkey)]; + BYTE buffer[sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPrivkey)]; BCRYPT_ECCKEY_BLOB *ecckey = (void *)buffer; - BCRYPT_ALG_HANDLE alg = NULL; - BCRYPT_KEY_HANDLE key = NULL; + BCRYPT_ALG_HANDLE alg; + BCRYPT_KEY_HANDLE key; NTSTATUS status; + ULONG size; status = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDSA_P256_ALGORITHM, NULL, 0); if (status) @@ -1713,11 +1726,12 @@ static void test_ECDSA(void) memcpy(ecckey + 1, eccPubkey, sizeof(eccPubkey)); ecckey->cbKey = 2; - status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, sizeof(buffer), 0); + size = sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPubkey); + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); - ecckey->cbKey = sizeof(eccPubkey) / 2; - status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, sizeof(buffer), 0); + ecckey->cbKey = 32; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %08x\n", status); status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); @@ -1725,6 +1739,19 @@ static void test_ECDSA(void) status = pBCryptVerifySignature(key, NULL, certHash, sizeof(certHash), certSignature, sizeof(certSignature), 0); ok(!status, "BCryptVerifySignature failed: %08x\n", status); + pBCryptDestroyKey(key); + + ecckey->dwMagic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; + memcpy(ecckey + 1, eccPrivkey, sizeof(eccPrivkey)); + + ecckey->cbKey = 2; + size = sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPrivkey); + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->cbKey = 32; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); + ok(!status, "BCryptImportKeyPair failed: %08x\n", status); pBCryptDestroyKey(key); pBCryptCloseAlgorithmProvider(alg, 0);

1 0

Gijs Vermeulen : amstream: Increase parent IAMMediaStream refcount in IAudioMediaStream::CreateSample().
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 08c076f542b7397aa78939b922ca348dd6a66588 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c076f542b7397aa78939b9… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jul 29 14:43:59 2020 +0200 amstream: Increase parent IAMMediaStream refcount in IAudioMediaStream::CreateSample(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 2 ++ dlls/amstream/tests/amstream.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 112891eeb7..e888caaa98 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -201,6 +201,7 @@ static ULONG WINAPI IAudioStreamSampleImpl_Release(IAudioStreamSample *iface) if (!ref) { + IAMMediaStream_Release(&This->parent->IAMMediaStream_iface); CloseHandle(This->update_event); HeapFree(GetProcessHeap(), 0, This); } @@ -375,6 +376,7 @@ static HRESULT audiostreamsample_create(struct audio_stream *parent, IAudioData object->IAudioStreamSample_iface.lpVtbl = &AudioStreamSample_Vtbl; object->ref = 1; object->parent = parent; + IAMMediaStream_AddRef(&parent->IAMMediaStream_iface); object->audio_data = audio_data; object->update_event = CreateEventW(NULL, FALSE, FALSE, NULL); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c5cdd7aaee..e9e9a6d825 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1505,8 +1505,11 @@ static void test_media_streams(void) hr = IAudioMediaStream_CreateSample(audio_media_stream, NULL, 0, &audio_sample); ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); + + EXPECT_REF(audio_stream, 3); hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample); ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr); + EXPECT_REF(audio_stream, 4); hr = IAudioMediaStream_GetMultiMediaStream(audio_media_stream, NULL); ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr);

1 0

Gijs Vermeulen : amstream: Increase IAudioData refcount in IAudioMediaStream::CreateSample().
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 1b3121c2ed0d02c4f516c760a3e701321a2f8f4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b3121c2ed0d02c4f516c760… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jul 29 14:44:00 2020 +0200 amstream: Increase IAudioData refcount in IAudioMediaStream::CreateSample(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 2 ++ dlls/amstream/tests/amstream.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index e888caaa98..85613f4f0e 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -202,6 +202,7 @@ static ULONG WINAPI IAudioStreamSampleImpl_Release(IAudioStreamSample *iface) if (!ref) { IAMMediaStream_Release(&This->parent->IAMMediaStream_iface); + IAudioData_Release(This->audio_data); CloseHandle(This->update_event); HeapFree(GetProcessHeap(), 0, This); } @@ -378,6 +379,7 @@ static HRESULT audiostreamsample_create(struct audio_stream *parent, IAudioData object->parent = parent; IAMMediaStream_AddRef(&parent->IAMMediaStream_iface); object->audio_data = audio_data; + IAudioData_AddRef(audio_data); object->update_event = CreateEventW(NULL, FALSE, FALSE, NULL); *audio_stream_sample = &object->IAudioStreamSample_iface; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index e9e9a6d825..6631fd312a 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1507,9 +1507,11 @@ static void test_media_streams(void) ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); EXPECT_REF(audio_stream, 3); + EXPECT_REF(audio_data, 1); hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample); ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr); EXPECT_REF(audio_stream, 4); + EXPECT_REF(audio_data, 2); hr = IAudioMediaStream_GetMultiMediaStream(audio_media_stream, NULL); ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr);

1 0

Gijs Vermeulen : amstream: Implement IAudioStreamSample::GetMediaStream().
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 67b7d597c92798a9719ee0fe10d6bde5bf116536 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67b7d597c92798a9719ee0fe… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jul 29 12:30:35 2020 +0200 amstream: Implement IAudioStreamSample::GetMediaStream(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 12 ++++++++-- dlls/amstream/tests/amstream.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 85613f4f0e..0761050a65 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -213,9 +213,17 @@ static ULONG WINAPI IAudioStreamSampleImpl_Release(IAudioStreamSample *iface) /*** IStreamSample methods ***/ static HRESULT WINAPI IAudioStreamSampleImpl_GetMediaStream(IAudioStreamSample *iface, IMediaStream **media_stream) { - FIXME("(%p)->(%p): stub\n", iface, media_stream); + IAudioStreamSampleImpl *sample = impl_from_IAudioStreamSample(iface); - return E_NOTIMPL; + TRACE("sample %p, media_stream %p.\n", iface, media_stream); + + if (!media_stream) + return E_POINTER; + + IAMMediaStream_AddRef(&sample->parent->IAMMediaStream_iface); + *media_stream = (IMediaStream *)&sample->parent->IAMMediaStream_iface; + + return S_OK; } static HRESULT WINAPI IAudioStreamSampleImpl_GetSampleTimes(IAudioStreamSample *iface, STREAM_TIME *start_time, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 6631fd312a..d1c3992585 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5629,6 +5629,57 @@ static void test_ddrawstream_getsetdirectdraw(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_audiostreamsample_get_media_stream(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IAudioStreamSample *audio_sample; + IAudioMediaStream *audio_stream; + IMediaStream *stream, *stream2; + IAudioData *audio_data; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_CreateSample(audio_stream, audio_data, 0, &audio_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Crashes on native. */ + if (0) + { + hr = IAudioStreamSample_GetMediaStream(audio_sample, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + EXPECT_REF(stream, 4); + hr = IAudioStreamSample_GetMediaStream(audio_sample, &stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream2 == stream, "Expected stream %p, got %p.\n", stream, stream2); + EXPECT_REF(stream, 5); + + IMediaStream_Release(stream2); + + IAudioMediaStream_Release(audio_stream); + ref = IAudioStreamSample_Release(audio_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAudioData_Release(audio_data); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { const WCHAR *test_avi_path; @@ -5675,6 +5726,7 @@ START_TEST(amstream) test_audiostreamsample_update(); test_audiostreamsample_completion_status(); test_audiostreamsample_get_sample_times(); + test_audiostreamsample_get_media_stream(); test_ddrawstream_initialize(); test_ddrawstream_getsetdirectdraw();

1 0