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

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_signature_flags enumeration to vkd3d_shader_root_signature_flags.
by Alexandre Julliard July 21, 2020

July 21, 2020

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 July 21, 2020

July 21, 2020

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

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_parameter1 structure to vkd3d_shader_root_parameter1.
by Alexandre Julliard July 21, 2020

July 21, 2020

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_version enumeration to vkd3d_shader_root_signature_version.
by Alexandre Julliard July 21, 2020

July 21, 2020

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

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.148.
by Alexandre Julliard July 20, 2020

July 20, 2020

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 July 20, 2020

July 20, 2020

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

Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO in WINECON_SetEditionMode.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: 96c5109a0f1a4b203e2a0575764a2577f5270c52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96c5109a0f1a4b203e2a0575… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:38:26 2020 +0200 wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO in WINECON_SetEditionMode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 2ad9cc84ee..1fad63d72c 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -173,17 +173,9 @@ BOOL WINECON_GetConsoleTitle(HANDLE hConIn, WCHAR* buffer, size_t len) */ static BOOL WINECON_SetEditionMode(HANDLE hConIn, int edition_mode) { - BOOL ret; - - SERVER_START_REQ( set_console_input_info ) - { - req->handle = wine_server_obj_handle( hConIn ); - req->mask = SET_CONSOLE_INPUT_INFO_EDITION_MODE; - req->edition_mode = edition_mode; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_EDITION_MODE }; + params.info.edition_mode = edition_mode; + return DeviceIoControl(hConIn, IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL, NULL); } /******************************************************************

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO in WINECON_SetHistoryMode.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: bd12ec5dfff885a1bd5a5d05b2ec48129e6f4398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd12ec5dfff885a1bd5a5d05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:38:18 2020 +0200 wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO in WINECON_SetHistoryMode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 35c2f8e92d..2ad9cc84ee 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -128,17 +128,9 @@ static BOOL WINECON_SetHistorySize(HANDLE hConIn, int size) */ static BOOL WINECON_SetHistoryMode(HANDLE hConIn, int mode) { - BOOL ret; - - SERVER_START_REQ(set_console_input_info) - { - req->handle = wine_server_obj_handle( hConIn ); - req->mask = SET_CONSOLE_INPUT_INFO_HISTORY_MODE; - req->history_mode = mode; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_HISTORY_MODE }; + params.info.history_mode = mode; + return DeviceIoControl(hConIn, IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL, NULL); } /******************************************************************

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_SET_INPUT_INFO ioctl.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: dcd02876ea73f65dc286038f0f70189c4994152f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcd02876ea73f65dc286038f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:38:00 2020 +0200 server: Introduce IOCTL_CONDRV_SET_INPUT_INFO ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 11 +++++++++ server/console.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index fedf3f308c..f6888443c9 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -32,6 +32,7 @@ #define IOCTL_CONDRV_WRITE_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 11, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_PEEK CTL_CODE(FILE_DEVICE_CONSOLE, 12, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_SET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 14, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_GET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 15, METHOD_BUFFERED, FILE_READ_PROPERTIES) /* console output ioctls */ @@ -64,10 +65,20 @@ typedef struct /* IOCTL_CONDRV_GET_INPUT_INFO result */ struct condrv_input_info { + unsigned int input_cp; /* console input codepage */ + unsigned int output_cp; /* console output codepage */ unsigned int history_mode; /* whether we duplicate lines in history */ unsigned int history_size; /* number of lines in history */ unsigned int edition_mode; /* index to the edition mode flavors */ unsigned int input_count; /* number of available input records */ + condrv_handle_t win; /* renderer window handle */ +}; + +/* IOCTL_CONDRV_SET_INPUT_INFO params */ +struct condrv_input_info_params +{ + unsigned int mask; /* setting mask */ + struct condrv_input_info info; /* input_info */ }; /* IOCTL_CONDRV_GET_OUTPUT_INFO result */ diff --git a/server/console.c b/server/console.c index 3c562cb507..a348ed5bca 100644 --- a/server/console.c +++ b/server/console.c @@ -1577,13 +1577,75 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * set_error( STATUS_INVALID_PARAMETER ); return 0; } + info.input_cp = console->input_cp; + info.output_cp = console->output_cp; info.history_mode = console->history_mode; info.history_size = console->history_size; info.edition_mode = console->edition_mode; info.input_count = console->recnum; + info.win = console->win; return set_reply_data( &info, sizeof(info) ) != NULL; } + case IOCTL_CONDRV_SET_INPUT_INFO: + { + const struct condrv_input_info_params *params = get_req_data(); + if (get_req_data_size() != sizeof(*params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_HISTORY_MODE) + { + console->history_mode = params->info.history_mode; + } + if ((params->mask & SET_CONSOLE_INPUT_INFO_HISTORY_SIZE) && + console->history_size != params->info.history_size) + { + struct history_line **mem = NULL; + int i, delta; + + if (params->info.history_size) + { + if (!(mem = mem_alloc( params->info.history_size * sizeof(*mem) ))) return 0; + memset( mem, 0, params->info.history_size * sizeof(*mem) ); + } + + delta = (console->history_index > params->info.history_size) ? + (console->history_index - params->info.history_size) : 0; + + for (i = delta; i < console->history_index; i++) + { + mem[i - delta] = console->history[i]; + console->history[i] = NULL; + } + console->history_index -= delta; + + for (i = 0; i < console->history_size; i++) + free( console->history[i] ); + free( console->history ); + console->history = mem; + console->history_size = params->info.history_size; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_EDITION_MODE) + { + console->edition_mode = params->info.edition_mode; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE) + { + console->input_cp = params->info.input_cp; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE) + { + console->output_cp = params->info.output_cp; + } + if (params->mask & SET_CONSOLE_INPUT_INFO_WIN) + { + console->win = params->info.win; + } + return 1; + } + case IOCTL_CONDRV_GET_TITLE: if (!console->title_len) return 1; return set_reply_data( console->title, min( console->title_len, get_reply_max_size() )) != NULL;

1 0

Alexandre Julliard : ntdll: Move the token functions to the Unix library.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: dd77ff754b949c21c986b61592cdc91884f2e175 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd77ff754b949c21c986b615… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 12:23:53 2020 +0200 ntdll: Move the token functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/misc.c | 20 -- dlls/ntdll/nt.c | 631 -------------------------------------------- dlls/ntdll/ntdll.spec | 47 ++-- dlls/ntdll/ntdll_misc.h | 3 - dlls/ntdll/sec.c | 10 - dlls/ntdll/sync.c | 83 ------ dlls/ntdll/unix/security.c | 635 +++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 660 insertions(+), 770 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd77ff754b949c21c986…

1 0