wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_signature_version enumeration to vkd3d_shader_root_signature_version.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: vkd3d Branch: master Commit: 0056fc70464c6211d283516782f95105ea5937a6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0056fc70464c6211d283516… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 15:38:02 2020 +0430 vkd3d-shader: Rename the vkd3d_root_signature_version enumeration to vkd3d_shader_root_signature_version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 14 ++++++------ libs/vkd3d-shader/dxbc.c | 41 ++++++++++++++++++----------------- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d/vkd3d_main.c | 15 +++++++------ tests/vkd3d_shader_api.c | 2 +- 5 files changed, 39 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=0056fc70464c6211d28…

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_parameter1 structure to vkd3d_shader_root_parameter1.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: vkd3d Branch: master Commit: 9366248ed2e87b8f91c542a744cebaaa27631ab8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9366248ed2e87b8f91c542a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 15:38:01 2020 +0430 vkd3d-shader: Rename the vkd3d_root_parameter1 structure to vkd3d_shader_root_parameter1. 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 | 18 +++++++++--------- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 26ec469..6eed196 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -547,7 +547,7 @@ struct vkd3d_shader_root_descriptor1 enum vkd3d_shader_root_descriptor_flags flags; }; -struct vkd3d_root_parameter1 +struct vkd3d_shader_root_parameter1 { enum vkd3d_shader_root_parameter_type parameter_type; union @@ -562,7 +562,7 @@ struct vkd3d_root_parameter1 struct vkd3d_root_signature_desc1 { unsigned int parameter_count; - const struct vkd3d_root_parameter1 *parameters; + const struct vkd3d_shader_root_parameter1 *parameters; unsigned int static_sampler_count; const struct vkd3d_shader_static_sampler_desc *static_samplers; enum vkd3d_shader_root_signature_flags flags; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5ddfc20..ca9e7b8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2480,7 +2480,7 @@ static int shader_parse_root_parameters(struct root_signature_parser_context *co } static int shader_parse_root_parameters1(struct root_signature_parser_context *context, - DWORD offset, DWORD count, struct vkd3d_root_parameter1 *parameters) + DWORD offset, DWORD count, struct vkd3d_shader_root_parameter1 *parameters) { const char *ptr; unsigned int i; @@ -2613,7 +2613,7 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size, v_1_1->parameter_count = count; if (v_1_1->parameter_count) { - struct vkd3d_root_parameter1 *parameters; + struct vkd3d_shader_root_parameter1 *parameters; if (!(parameters = vkd3d_calloc(v_1_1->parameter_count, sizeof(*parameters)))) return VKD3D_ERROR_OUT_OF_MEMORY; v_1_1->parameters = parameters; @@ -3198,7 +3198,7 @@ static void free_descriptor_ranges(const struct vkd3d_shader_root_parameter *par } static int convert_root_parameters_to_v_1_0(struct vkd3d_shader_root_parameter *dst, - const struct vkd3d_root_parameter1 *src, unsigned int count) + const struct vkd3d_shader_root_parameter1 *src, unsigned int count) { const struct vkd3d_shader_descriptor_range1 *ranges1; struct vkd3d_shader_descriptor_range *ranges; @@ -3207,7 +3207,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_shader_root_parameter * for (i = 0; i < count; ++i) { - const struct vkd3d_root_parameter1 *p1 = &src[i]; + const struct vkd3d_shader_root_parameter1 *p1 = &src[i]; struct vkd3d_shader_root_parameter *p = &dst[i]; p->parameter_type = p1->parameter_type; @@ -3300,7 +3300,7 @@ fail: return ret; } -static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *parameters, unsigned int count) +static void free_descriptor_ranges1(const struct vkd3d_shader_root_parameter1 *parameters, unsigned int count) { unsigned int i; @@ -3309,14 +3309,14 @@ static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *paramete for (i = 0; i < count; ++i) { - const struct vkd3d_root_parameter1 *p = &parameters[i]; + const struct vkd3d_shader_root_parameter1 *p = &parameters[i]; if (p->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); } } -static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, +static int convert_root_parameters_to_v_1_1(struct vkd3d_shader_root_parameter1 *dst, const struct vkd3d_shader_root_parameter *src, unsigned int count) { const struct vkd3d_shader_descriptor_range *ranges; @@ -3327,7 +3327,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, for (i = 0; i < count; ++i) { const struct vkd3d_shader_root_parameter *p = &src[i]; - struct vkd3d_root_parameter1 *p1 = &dst[i]; + struct vkd3d_shader_root_parameter1 *p1 = &dst[i]; p1->parameter_type = p->parameter_type; switch (p1->parameter_type) @@ -3386,7 +3386,7 @@ static int convert_root_signature_to_v1_1(struct vkd3d_versioned_root_signature_ const struct vkd3d_root_signature_desc *src_desc = &src->u.v_1_0; struct vkd3d_root_signature_desc1 *dst_desc = &dst->u.v_1_1; struct vkd3d_shader_static_sampler_desc *samplers = NULL; - struct vkd3d_root_parameter1 *parameters = NULL; + struct vkd3d_shader_root_parameter1 *parameters = NULL; int ret; if ((dst_desc->parameter_count = src_desc->parameter_count)) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 8dbd17e..d4bd763 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -501,7 +501,7 @@ static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_root_signature_d for (i = 0; i < root_signature->parameter_count; ++i) { - const struct vkd3d_root_parameter1 *parameter = &root_signature->parameters[i]; + const struct vkd3d_shader_root_parameter1 *parameter = &root_signature->parameters[i]; if (parameter->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges);

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_signature_flags enumeration to vkd3d_shader_root_signature_flags.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: vkd3d Branch: master Commit: 197fe4ca6029d66d5a970d36736cd25f9eb395e3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=197fe4ca6029d66d5a970d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 15:38:00 2020 +0430 vkd3d-shader: Rename the vkd3d_root_signature_flags enumeration to vkd3d_shader_root_signature_flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1c01735..26ec469 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -479,18 +479,18 @@ struct vkd3d_shader_root_parameter enum vkd3d_shader_visibility shader_visibility; }; -enum vkd3d_root_signature_flags +enum vkd3d_shader_root_signature_flags { - VKD3D_ROOT_SIGNATURE_FLAG_NONE = 0x0, - VKD3D_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT = 0x1, - VKD3D_ROOT_SIGNATURE_FLAG_DENY_VERTEX_SHADER_ROOT_ACCESS = 0x2, - VKD3D_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS = 0x4, - VKD3D_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS = 0x8, - VKD3D_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS = 0x10, - VKD3D_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS = 0x20, - VKD3D_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT = 0x40, + VKD3D_SHADER_ROOT_SIGNATURE_FLAG_NONE = 0x00, + VKD3D_SHADER_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT = 0x01, + VKD3D_SHADER_ROOT_SIGNATURE_FLAG_DENY_VERTEX_SHADER_ROOT_ACCESS = 0x02, + VKD3D_SHADER_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS = 0x04, + VKD3D_SHADER_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS = 0x08, + VKD3D_SHADER_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS = 0x10, + VKD3D_SHADER_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS = 0x20, + VKD3D_SHADER_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT = 0x40, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_ROOT_SIGNATURE_FLAGS), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_SIGNATURE_FLAGS), }; struct vkd3d_root_signature_desc @@ -499,7 +499,7 @@ struct vkd3d_root_signature_desc const struct vkd3d_shader_root_parameter *parameters; unsigned int static_sampler_count; const struct vkd3d_shader_static_sampler_desc *static_samplers; - enum vkd3d_root_signature_flags flags; + enum vkd3d_shader_root_signature_flags flags; }; /* root signature 1.1 */ @@ -565,7 +565,7 @@ struct vkd3d_root_signature_desc1 const struct vkd3d_root_parameter1 *parameters; unsigned int static_sampler_count; const struct vkd3d_shader_static_sampler_desc *static_samplers; - enum vkd3d_root_signature_flags flags; + enum vkd3d_shader_root_signature_flags flags; }; enum vkd3d_root_signature_version

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_static_sampler_desc structure to vkd3d_shader_static_sampler_desc.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: vkd3d Branch: master Commit: 62113ff8285f577e7d134879bbf4a7487f0d215f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=62113ff8285f577e7d13487… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 15:37:59 2020 +0430 vkd3d-shader: Rename the vkd3d_static_sampler_desc structure to vkd3d_shader_static_sampler_desc. 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 | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 631cbf5..1c01735 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -401,7 +401,7 @@ enum vkd3d_shader_static_border_colour VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STATIC_BORDER_COLOUR), }; -struct vkd3d_static_sampler_desc +struct vkd3d_shader_static_sampler_desc { enum vkd3d_shader_filter filter; enum vkd3d_shader_texture_address_mode address_u; @@ -498,7 +498,7 @@ struct vkd3d_root_signature_desc unsigned int parameter_count; const struct vkd3d_shader_root_parameter *parameters; unsigned int static_sampler_count; - const struct vkd3d_static_sampler_desc *static_samplers; + const struct vkd3d_shader_static_sampler_desc *static_samplers; enum vkd3d_root_signature_flags flags; }; @@ -564,7 +564,7 @@ struct vkd3d_root_signature_desc1 unsigned int parameter_count; const struct vkd3d_root_parameter1 *parameters; unsigned int static_sampler_count; - const struct vkd3d_static_sampler_desc *static_samplers; + const struct vkd3d_shader_static_sampler_desc *static_samplers; enum vkd3d_root_signature_flags flags; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 303bedd..5ddfc20 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2528,7 +2528,7 @@ static int shader_parse_root_parameters1(struct root_signature_parser_context *c } static int shader_parse_static_samplers(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_static_sampler_desc *sampler_descs) + unsigned int offset, unsigned int count, struct vkd3d_shader_static_sampler_desc *sampler_descs) { const char *ptr; unsigned int i; @@ -2629,7 +2629,7 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size, v_1_0->static_sampler_count = count; if (v_1_0->static_sampler_count) { - struct vkd3d_static_sampler_desc *samplers; + struct vkd3d_shader_static_sampler_desc *samplers; if (!(samplers = vkd3d_calloc(v_1_0->static_sampler_count, sizeof(*samplers)))) return VKD3D_ERROR_OUT_OF_MEMORY; v_1_0->static_samplers = samplers; @@ -2713,7 +2713,7 @@ static unsigned int versioned_root_signature_get_static_sampler_count(const stru return desc->u.v_1_1.static_sampler_count; } -static const struct vkd3d_static_sampler_desc *versioned_root_signature_get_static_samplers( +static const struct vkd3d_shader_static_sampler_desc *versioned_root_signature_get_static_samplers( const struct vkd3d_versioned_root_signature_desc *desc) { if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) @@ -2970,7 +2970,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co static int shader_write_static_samplers(struct root_signature_writer_context *context, const struct vkd3d_versioned_root_signature_desc *desc) { - const struct vkd3d_static_sampler_desc *samplers = versioned_root_signature_get_static_samplers(desc); + const struct vkd3d_shader_static_sampler_desc *samplers = versioned_root_signature_get_static_samplers(desc); unsigned int i; for (i = 0; i < versioned_root_signature_get_static_sampler_count(desc); ++i) @@ -3264,8 +3264,8 @@ static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_ { const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1; struct vkd3d_root_signature_desc *dst_desc = &dst->u.v_1_0; + struct vkd3d_shader_static_sampler_desc *samplers = NULL; struct vkd3d_shader_root_parameter *parameters = NULL; - struct vkd3d_static_sampler_desc *samplers = NULL; int ret; if ((dst_desc->parameter_count = src_desc->parameter_count)) @@ -3385,7 +3385,7 @@ static int convert_root_signature_to_v1_1(struct vkd3d_versioned_root_signature_ { const struct vkd3d_root_signature_desc *src_desc = &src->u.v_1_0; struct vkd3d_root_signature_desc1 *dst_desc = &dst->u.v_1_1; - struct vkd3d_static_sampler_desc *samplers = NULL; + struct vkd3d_shader_static_sampler_desc *samplers = NULL; struct vkd3d_root_parameter1 *parameters = NULL; int ret;

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.148.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: a455ff61b40ff73b48d0ccc9c1f14679bb65ab8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a455ff61b40ff73b48d0ccc9… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Jul 20 09:42:17 2020 -0700 winevulkan: Update to VK spec version 1.2.148. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Arthur Huillet <ahuillet(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 62 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 2604 ++++++++++++++++++++------------------- 4 files changed, 1394 insertions(+), 1276 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a455ff61b40ff73b48d0…

1 0

Brendan Shanks : bcrypt: Add tests for BCryptSecretAgreement/BCryptDestroySecret/BCryptDeriveKey.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: e6314baa5eb38af58e4760cb4affcab5549fcfe3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6314baa5eb38af58e4760cb… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jul 17 15:54:01 2020 -0700 bcrypt: Add tests for BCryptSecretAgreement/BCryptDestroySecret/BCryptDeriveKey. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index f6e5c84e8d..eb7a72e0ff 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2574,6 +2574,76 @@ static void test_DSA(void) ok(!ret, "got %08x\n", ret); } +static void test_SecretAgreement(void) +{ + BCRYPT_SECRET_HANDLE secret; + BCRYPT_ALG_HANDLE alg; + BCRYPT_KEY_HANDLE key; + NTSTATUS status; + ULONG size; + + status = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDH_P256_ALGORITHM, NULL, 0); + if (status) + { + skip("Failed to open BCRYPT_ECDH_P256_ALGORITHM provider %08x\n", status); + return; + } + + key = NULL; + status = pBCryptGenerateKeyPair(alg, &key, 256, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(key != NULL, "key not set\n"); + + status = pBCryptFinalizeKeyPair(key, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + + status = pBCryptSecretAgreement(NULL, key, &secret, 0); + ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + + status = pBCryptSecretAgreement(key, NULL, &secret, 0); + ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + + status = pBCryptSecretAgreement(key, key, NULL, 0); + ok(status == STATUS_INVALID_PARAMETER, "got %08x\n", status); + + status = pBCryptSecretAgreement(key, key, &secret, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + + status = pBCryptDeriveKey(NULL, L"HASH", NULL, NULL, 0, &size, 0); + ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + + status = pBCryptDeriveKey(key, L"HASH", NULL, NULL, 0, &size, 0); + ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + + status = pBCryptDeriveKey(secret, NULL, NULL, NULL, 0, &size, 0); + ok(status == STATUS_INVALID_PARAMETER, "got %08x\n", status); + + status = pBCryptDeriveKey(secret, L"HASH", NULL, NULL, 0, &size, 0); + todo_wine + ok(status == STATUS_SUCCESS, "got %08x\n", status); + + status = pBCryptDestroyHash(secret); + ok(status == STATUS_INVALID_PARAMETER, "got %08x\n", status); + + status = pBCryptDestroyKey(secret); + ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + + status = pBCryptDestroySecret(NULL); + ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + + status = pBCryptDestroySecret(alg); + ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + + status = pBCryptDestroySecret(secret); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + + status = pBCryptDestroyKey(key); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + + status = pBCryptCloseAlgorithmProvider(alg, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); +} + START_TEST(bcrypt) { HMODULE module; @@ -2639,6 +2709,7 @@ START_TEST(bcrypt) test_aes_vector(); test_BcryptDeriveKeyCapi(); test_DSA(); + test_SecretAgreement(); FreeLibrary(module); }

1 0

Brendan Shanks : bcrypt: Improve BCryptSecretAgreement/BCryptDestroySecret/BCryptDeriveKey stubs.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: e763821cf4a71109a8b16cf34a81215b502f4f04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e763821cf4a71109a8b16cf3… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jul 17 15:53:59 2020 -0700 bcrypt: Improve BCryptSecretAgreement/BCryptDestroySecret/BCryptDeriveKey stubs. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 6 ++++++ dlls/bcrypt/bcrypt_main.c | 35 ++++++++++++++++++++++++++++------- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 18343a6c74..43be170d77 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -111,6 +111,7 @@ VOID WINAPI A_SHAFinal(SHA_CTX *ctx, PULONG result); #define MAGIC_ALG (('A' << 24) | ('L' << 16) | ('G' << 8) | '0') #define MAGIC_HASH (('H' << 24) | ('A' << 16) | ('S' << 8) | 'H') #define MAGIC_KEY (('K' << 24) | ('E' << 16) | ('Y' << 8) | '0') +#define MAGIC_SECRET (('S' << 24) | ('C' << 16) | ('R' << 8) | 'T') struct object { ULONG magic; @@ -239,6 +240,11 @@ struct key }; #endif +struct secret +{ + struct object hdr; +}; + NTSTATUS get_alg_property( const struct algorithm *, const WCHAR *, UCHAR *, ULONG, ULONG * ) DECLSPEC_HIDDEN; NTSTATUS key_set_property( struct key *, const WCHAR *, UCHAR *, ULONG, ULONG ) DECLSPEC_HIDDEN; diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fee40ebe8d..bea2001a67 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1833,26 +1833,47 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE key, BCRYPT_SECRET_HANDLE *secret, ULONG flags) +NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE privatekey, BCRYPT_KEY_HANDLE publickey, BCRYPT_SECRET_HANDLE *handle, ULONG flags) { - FIXME( "%p, %p, %p, %08x\n", handle, key, secret, flags ); + struct key *privkey = privatekey; + struct key *pubkey = publickey; + struct secret *secret; - if(secret) - *secret = (BCRYPT_SECRET_HANDLE *)0xDEADFEED; + FIXME( "%p, %p, %p, %08x\n", privatekey, publickey, handle, flags ); + if (!privkey || privkey->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!pubkey || pubkey->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!handle) return STATUS_INVALID_PARAMETER; + + if (!(secret = heap_alloc_zero( sizeof(*secret) ))) return STATUS_NO_MEMORY; + secret->hdr.magic = MAGIC_SECRET; + + *handle = secret; return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE secret) +NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE handle) { - FIXME( "%p\n", secret ); + struct secret *secret = handle; + + FIXME( "%p\n", handle ); + + if (!secret || secret->hdr.magic != MAGIC_SECRET) return STATUS_INVALID_HANDLE; + secret->hdr.magic = 0; + heap_free( secret ); return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE secret, LPCWSTR kdf, BCryptBufferDesc *parameter, +NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE handle, LPCWSTR kdf, BCryptBufferDesc *parameter, PUCHAR derived, ULONG derived_size, ULONG *result, ULONG flags) { + struct secret *secret = handle; + FIXME( "%p, %s, %p, %p, %d, %p, %08x\n", secret, debugstr_w(kdf), parameter, derived, derived_size, result, flags ); + + if (!secret || secret->hdr.magic != MAGIC_SECRET) return STATUS_INVALID_HANDLE; + if (!kdf) return STATUS_INVALID_PARAMETER; + return STATUS_INTERNAL_ERROR; }

1 0

Alex Henrie : kernel32: Stub SetFirmwareEnvironmentVariableW.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: f189bd4ba860c7467ddd841dc81be779db3329bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f189bd4ba860c7467ddd841d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jul 19 22:57:22 2020 -0600 kernel32: Stub SetFirmwareEnvironmentVariableW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49581 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-kernel32-l2-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec b/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec index c007021e3e..750badec24 100644 --- a/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec +++ b/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec @@ -94,7 +94,7 @@ @ stdcall RegisterWaitForSingleObject(ptr long ptr ptr long long) kernel32.RegisterWaitForSingleObject @ stdcall SetConsoleTitleA(str) kernel32.SetConsoleTitleA @ stdcall SetFileCompletionNotificationModes(long long) kernel32.SetFileCompletionNotificationModes -@ stub SetFirmwareEnvironmentVariableW +@ stdcall SetFirmwareEnvironmentVariableW(wstr wstr ptr long) kernel32.SetFirmwareEnvironmentVariableW @ stdcall SetHandleCount(long) kernel32.SetHandleCount @ stdcall SetMailslotInfo(long long) kernel32.SetMailslotInfo @ stdcall SetProcessAffinityMask(long long) kernel32.SetProcessAffinityMask diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0c64144d7f..7b89d19c2d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1414,7 +1414,7 @@ @ stdcall -import SetFileTime(long ptr ptr ptr) @ stdcall -import SetFileValidData(ptr int64) # @ stub SetFirmwareEnvironmentVariableA -# @ stub SetFirmwareEnvironmentVariableW +@ stdcall SetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall SetHandleContext(long long) @ stdcall SetHandleCount(long) @ stdcall -import SetHandleInformation(long long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index cfc11c867a..b2bd5980fd 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -770,6 +770,16 @@ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID b return 0; } +/*********************************************************************** + * SetFirmwareEnvironmentVariableW (KERNEL32.@) + */ +BOOL WINAPI SetFirmwareEnvironmentVariableW(const WCHAR *name, const WCHAR *guid, void *buffer, DWORD size) +{ + FIXME("stub: %s %s %p %u\n", debugstr_w(name), debugstr_w(guid), buffer, size); + SetLastError(ERROR_INVALID_FUNCTION); + return FALSE; +} + /********************************************************************** * GetNumaNodeProcessorMask (KERNEL32.@) */

1 0

Jiajin Cui : gdiplus: Fix crash if failed to create bitmap.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: f992bc77c87889c37cbd80aced707e6d1a537c8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f992bc77c87889c37cbd80ac… Author: Jiajin Cui <cuijiajin(a)uniontech.com> Date: Fri Jul 17 17:34:09 2020 +0800 gdiplus: Fix crash if failed to create bitmap. Signed-off-by: Jiajin Cui <cuijiajin(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5194719fd6..1307bdc1ef 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -459,6 +459,9 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); + if(!hbitmap || !temp_bits) + goto done; + if ((GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) || fmt & PixelFormatPAlpha) @@ -470,9 +473,12 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ SelectObject(hdc, hbitmap); gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height, hdc, 0, 0, src_width, src_height); - DeleteDC(hdc); + DeleteObject(hbitmap); +done: + DeleteDC(hdc); + return Ok; }

1 0

Gijs Vermeulen : qcap/tests: Avoid test failures in test_seeking().
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: 5df591fe017df41f1774d30505869fc766585652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df591fe017df41f1774d305… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Jul 20 18:19:46 2020 +0200 qcap/tests: Avoid test failures in test_seeking(). 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/qcap/tests/avimux.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index 572314f8ab..d1a67a01a1 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -784,11 +784,13 @@ static void test_seeking(void) hr = IMediaSeeking_GetDuration(seeking, &time); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!time, "Got duration %s.\n", wine_dbgstr_longlong(time)); + if (hr == S_OK) + ok(!time, "Got duration %s.\n", wine_dbgstr_longlong(time)); hr = IMediaSeeking_GetCurrentPosition(seeking, &time); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!time, "Got duration %s.\n", wine_dbgstr_longlong(time)); + if (hr == S_OK) + ok(!time, "Got duration %s.\n", wine_dbgstr_longlong(time)); hr = IMediaSeeking_GetStopPosition(seeking, &time); ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr);

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
83
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 July 2020