September 2020 - Wine-commits

Isabella Bosia : vkd3d-shader: Implement VKD3D_SHADER_TARGET_SPIRV_TEXT.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: vkd3d Branch: master Commit: f222f9901171575cf6ec96b8d53d459fffdbd350 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f222f9901171575cf6ec96b… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Mon Sep 7 12:35:41 2020 +0100 vkd3d-shader: Implement VKD3D_SHADER_TARGET_SPIRV_TEXT. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 13 ++++++++++ libs/vkd3d-shader/spirv.c | 47 +++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 3 +++ 3 files changed, 63 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index fe6e958..5c825df 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -73,6 +73,18 @@ enum vkd3d_shader_compile_option_buffer_uav VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV), }; +enum vkd3d_shader_compile_option_formatting_flags +{ + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NONE = 0x00000000, + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR = 0x00000001, + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT = 0x00000002, + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_SHOW_BYTE_OFFSET = 0x00000004, + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NO_HEADER = 0x00000008, + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES = 0x00000010, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FLAGS), +}; + enum vkd3d_shader_compile_option_name { /** @@ -451,6 +463,7 @@ enum vkd3d_shader_target_type * shaders. */ VKD3D_SHADER_TARGET_SPIRV_BINARY, + VKD3D_SHADER_TARGET_SPIRV_TEXT, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET_TYPE), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6a6d187..530e802 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -50,6 +50,32 @@ static spv_target_env spv_target_env_from_vkd3d(enum vkd3d_shader_spirv_environm } } +static uint32_t get_binary_to_text_options(enum vkd3d_shader_compile_option_formatting_flags formatting) +{ + uint32_t out = 0; + unsigned int i; + + static const struct + { + enum vkd3d_shader_compile_option_formatting_flags vkd3d; + uint32_t spv; + } + valuemap[] = + { + {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR, SPV_BINARY_TO_TEXT_OPTION_COLOR }, + {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT, SPV_BINARY_TO_TEXT_OPTION_INDENT }, + {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_SHOW_BYTE_OFFSET, SPV_BINARY_TO_TEXT_OPTION_SHOW_BYTE_OFFSET}, + {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NO_HEADER, SPV_BINARY_TO_TEXT_OPTION_NO_HEADER }, + {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES, SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES }, + }; + + for (i = 0; i < ARRAY_SIZE(valuemap); i++) + if (formatting & valuemap[i].vkd3d) + out |= valuemap[i].spv; + + return out; +} + static enum vkd3d_result vkd3d_spirv_binary_to_text(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_spirv_environment environment, uint32_t options, struct vkd3d_shader_code *out) { @@ -130,6 +156,15 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, #else +static uint32_t get_binary_to_text_options(enum vkd3d_shader_compile_option_formatting_flags formatting) +{ + return 0; +} +static enum vkd3d_result vkd3d_spirv_binary_to_text(const struct vkd3d_shader_code *spirv, + enum vkd3d_shader_spirv_environment environment, uint32_t options, struct vkd3d_shader_code *out) +{ + return VKD3D_ERROR; +} static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_spirv_environment environment) {} static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, @@ -9187,6 +9222,18 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (compiler->failed) return VKD3D_ERROR_INVALID_SHADER; + if (compile_info->target_type == VKD3D_SHADER_TARGET_SPIRV_TEXT) + { + struct vkd3d_shader_code text; + enum vkd3d_shader_spirv_environment environment = vkd3d_dxbc_compiler_get_target_environment(compiler); + if (vkd3d_spirv_binary_to_text(spirv, environment, + get_binary_to_text_options(VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES | + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT), + &text) != VKD3D_OK) + return VKD3D_ERROR; + *spirv = text; + } + return VKD3D_OK; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e3abaf7..6984843 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1063,6 +1063,9 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( static const enum vkd3d_shader_target_type dxbc_tpf_types[] = { VKD3D_SHADER_TARGET_SPIRV_BINARY, +#ifdef HAVE_SPIRV_TOOLS + VKD3D_SHADER_TARGET_SPIRV_TEXT, +#endif }; TRACE("source_type %#x, count %p.\n", source_type, count);

1 0

Isabella Bosia : vkd3d-shader: Add formatting compiler options.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: vkd3d Branch: master Commit: 75f239dcbecb77c21e554cfbd4d01f24a6099507 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=75f239dcbecb77c21e554cf… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Mon Sep 7 12:35:42 2020 +0100 vkd3d-shader: Add formatting compiler options. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 2 ++ libs/vkd3d-shader/spirv.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 5c825df..b048bd7 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -97,6 +97,8 @@ enum vkd3d_shader_compile_option_name VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG = 0x00000001, /** \a value is a member of enum vkd3d_shader_compile_option_buffer_uav. */ VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV = 0x00000002, + /** \a value is a member of enum vkd3d_shader_compile_option_formatting_flags. */ + VKD3D_SHADER_COMPILE_OPTION_FORMATTING = 0x00000003, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 530e802..913b017 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2207,6 +2207,7 @@ struct vkd3d_dxbc_compiler unsigned int spec_constant_count; struct vkd3d_shader_spec_constant *spec_constants; size_t spec_constants_size; + enum vkd3d_shader_compile_option_formatting_flags formatting; }; static bool is_control_point_phase(const struct vkd3d_shader_phase *phase) @@ -2267,6 +2268,9 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader vkd3d_spirv_builder_init(&compiler->spirv_builder, vkd3d_dxbc_compiler_get_entry_point_name(compiler)); + compiler->formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES | + VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT; + for (i = 0; i < compile_info->option_count; ++i) { const struct vkd3d_shader_compile_option *option = &compile_info->options[i]; @@ -2286,6 +2290,10 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader WARN("Ignoring unrecognised value %#x for option %#x.\n", option->value, option->name); break; + case VKD3D_SHADER_COMPILE_OPTION_FORMATTING: + compiler->formatting = option->value; + break; + default: WARN("Ignoring unrecognised option %#x with value %#x.\n", option->name, option->value); break; @@ -9227,9 +9235,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_code text; enum vkd3d_shader_spirv_environment environment = vkd3d_dxbc_compiler_get_target_environment(compiler); if (vkd3d_spirv_binary_to_text(spirv, environment, - get_binary_to_text_options(VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES | - VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT), - &text) != VKD3D_OK) + get_binary_to_text_options(compiler->formatting), &text) != VKD3D_OK) return VKD3D_ERROR; *spirv = text; }

1 0

Isabella Bosia : vkd3d-compiler: Add get_target_type_info helper.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: vkd3d Branch: master Commit: c6e36bf240d0d340c72f68d0938484cfef3a4c12 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c6e36bf240d0d340c72f68d… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Mon Sep 7 12:35:43 2020 +0100 vkd3d-compiler: Add get_target_type_info helper. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index a6c935c..0461f4a 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -55,7 +55,7 @@ source_type_info[] = " This is the format used for Direct3D shader model 4 and 5 shaders."}, }; -static const struct +static const struct target_type_info { enum vkd3d_shader_target_type type; const char *name; @@ -246,6 +246,17 @@ static enum vkd3d_shader_target_type parse_target_type(const char *target) return VKD3D_SHADER_TARGET_NONE; } +static const struct target_type_info *get_target_type_info(enum vkd3d_shader_target_type type) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(target_type_info); ++i) + if (type == target_type_info[i].type) + return &target_type_info[i]; + + return NULL; +} + static bool parse_command_line(int argc, char **argv, struct options *options) { enum vkd3d_shader_compile_option_buffer_uav buffer_uav; @@ -359,7 +370,7 @@ static void print_target_types(enum vkd3d_shader_source_type source_type) { const enum vkd3d_shader_target_type *target_types; const char *source_type_name; - unsigned int count, i, j; + unsigned int count, i; for (i = 0; i < ARRAY_SIZE(source_type_info); ++i) { @@ -374,14 +385,9 @@ static void print_target_types(enum vkd3d_shader_source_type source_type) fprintf(stdout, "Supported target types for source type '%s':\n", source_type_name); for (i = 0; i < count; ++i) { - for (j = 0; j < ARRAY_SIZE(target_type_info); ++j) - { - if (target_types[i] == target_type_info[j].type) - { - fprintf(stdout, " %s %s", target_type_info[j].name, target_type_info[j].description); - break; - } - } + const struct target_type_info *type = get_target_type_info(target_types[i]); + if (type) + fprintf(stdout, " %s %s", type->name, type->description); } }

1 0

Isabella Bosia : vkd3d-compiler: Add get_source_type_info helper.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: vkd3d Branch: master Commit: 76c8c05fdb6682dae8c1ff77dfbc4c444535134e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=76c8c05fdb6682dae8c1ff7… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Mon Sep 7 12:35:44 2020 +0100 vkd3d-compiler: Add get_source_type_info helper. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 0461f4a..a5cf031 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -42,7 +42,7 @@ enum OPTION_VERSION, }; -static const struct +static const struct source_type_info { enum vkd3d_shader_source_type type; const char *name; @@ -246,6 +246,17 @@ static enum vkd3d_shader_target_type parse_target_type(const char *target) return VKD3D_SHADER_TARGET_NONE; } +static const struct source_type_info *get_source_type_info(enum vkd3d_shader_source_type type) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(source_type_info); ++i) + if (type == source_type_info[i].type) + return &source_type_info[i]; + + return NULL; +} + static const struct target_type_info *get_target_type_info(enum vkd3d_shader_target_type type) { unsigned int i; @@ -349,38 +360,25 @@ static bool parse_command_line(int argc, char **argv, struct options *options) static void print_source_types(void) { const enum vkd3d_shader_source_type *source_types; - unsigned int count, i, j; + unsigned int count, i; source_types = vkd3d_shader_get_supported_source_types(&count); fputs("Supported source types:\n", stdout); for (i = 0; i < count; ++i) { - for (j = 0; j < ARRAY_SIZE(source_type_info); ++j) - { - if (source_types[i] == source_type_info[j].type) - { - fprintf(stdout, " %s %s\n", source_type_info[j].name, source_type_info[j].description); - break; - } - } + const struct source_type_info *type = get_source_type_info(source_types[i]); + if (type) + fprintf(stdout, " %s %s", type->name, type->description); } + } static void print_target_types(enum vkd3d_shader_source_type source_type) { const enum vkd3d_shader_target_type *target_types; - const char *source_type_name; + const char *source_type_name = get_source_type_info(source_type)->name; unsigned int count, i; - for (i = 0; i < ARRAY_SIZE(source_type_info); ++i) - { - if (source_type == source_type_info[i].type) - { - source_type_name = source_type_info[i].name; - break; - } - } - target_types = vkd3d_shader_get_supported_target_types(source_type, &count); fprintf(stdout, "Supported target types for source type '%s':\n", source_type_name); for (i = 0; i < count; ++i)

1 0

Isabella Bosia : vkd3d-compiler: Validate target type.
by Alexandre Julliard 07 Sep '20

07 Sep '20

Module: vkd3d Branch: master Commit: 6d7bef1f8d406fd5563646888c4575b7143e7864 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6d7bef1f8d406fd55636468… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Mon Sep 7 12:35:45 2020 +0100 vkd3d-compiler: Validate target type. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index a5cf031..cb23b81 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -268,6 +268,23 @@ static const struct target_type_info *get_target_type_info(enum vkd3d_shader_tar return NULL; } +static bool validate_target_type( + enum vkd3d_shader_source_type source_type, + enum vkd3d_shader_target_type target_type) +{ + unsigned int i, count; + const enum vkd3d_shader_target_type *supported_types = + vkd3d_shader_get_supported_target_types(source_type, &count); + + for (i = 0; i < ARRAY_SIZE(target_type_info); ++i) + { + if (target_type == supported_types[i]) + return true; + } + + return false; +} + static bool parse_command_line(int argc, char **argv, struct options *options) { enum vkd3d_shader_compile_option_buffer_uav buffer_uav; @@ -348,6 +365,14 @@ static bool parse_command_line(int argc, char **argv, struct options *options) } } + if (!validate_target_type(options->source_type, options->target_type)) + { + fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n", + get_target_type_info(options->target_type)->name, + get_source_type_info(options->source_type)->name); + return false; + } + if (options->print_target_types) return true;

1 0

Jiajin Cui : gdiplus: Make gdi_alpha_blend fallback to StretchBlt if current Compositing Mode is SourceCopy.
by Alexandre Julliard 04 Sep '20

04 Sep '20

Module: wine Branch: master Commit: 5754bd9c0ae4c74f94b02f242056820a3f483db3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5754bd9c0ae4c74f94b02f24… Author: Jiajin Cui <cuijiajin(a)uniontech.com> Date: Thu Sep 3 17:17:43 2020 +0800 gdiplus: Make gdi_alpha_blend fallback to StretchBlt if current Compositing Mode is SourceCopy. 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 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5db8973c7b..868aea5642 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -331,8 +331,14 @@ static void round_points(POINT *pti, GpPointF *ptf, INT count) static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_width, INT dst_height, HDC hdc, INT src_x, INT src_y, INT src_width, INT src_height) { - if (GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && - GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) + CompositingMode comp_mode; + INT technology = GetDeviceCaps(graphics->hdc, TECHNOLOGY); + INT shadeblendcaps = GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS); + + GdipGetCompositingMode(graphics, &comp_mode); + + if ((technology == DT_RASPRINTER && shadeblendcaps == SB_NONE) + || comp_mode == CompositingModeSourceCopy) { TRACE("alpha blending not supported by device, fallback to StretchBlt\n");

1 0

Alexandre Julliard : ntdll: Pop the Unix stack completely in call_user_apc_dispatcher().
by Alexandre Julliard 04 Sep '20

04 Sep '20

Module: wine Branch: master Commit: cc9d69b20bda583142288b0cfb0ab472348a2b51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc9d69b20bda583142288b0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 4 21:06:09 2020 +0200 ntdll: Pop the Unix stack completely in call_user_apc_dispatcher(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 12 +++++------- dlls/ntdll/unix/signal_arm64.c | 14 +++++--------- dlls/ntdll/unix/signal_i386.c | 32 +++++++++++++++++--------------- dlls/ntdll/unix/signal_x86_64.c | 12 +++++------- 4 files changed, 32 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 89baf6db3d..e8971d22db 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -602,18 +602,16 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "mov sp, r0\n\t" "b 2f\n" "1:\tldr r0, [r10]\n\t" - "sub r11, r0, #0x1a0\n\t" - "cmp r11, sp\n\t" - "movlo sp, r11\n\t" + "sub sp, r0, #0x1a0\n\t" "mov r0, #3\n\t" "movt r0, #32\n\t" - "str r0, [r11]\n\t" /* context.ContextFlags = CONTEXT_FULL */ - "mov r1, r11\n\t" + "str r0, [sp]\n\t" /* context.ContextFlags = CONTEXT_FULL */ + "mov r1, sp\n\t" "mov r0, #~1\n\t" "bl " __ASM_NAME("NtGetContextThread") "\n\t" "mov r0, #0xc0\n\t" - "str r0, [r11, #4]\n\t" /* context.R0 = STATUS_USER_APC */ - "mov r0, r11\n\t" + "str r0, [sp, #4]\n\t" /* context.R0 = STATUS_USER_APC */ + "mov r0, sp\n\t" "mov ip, #0\n\t" "str ip, [r10]\n\t" "2:\tmov r1, r5\n\t" /* ctx */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 51cc6cbcf2..e08d6a2ee1 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -655,21 +655,17 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "mov sp, x0\n\t" "b 2f\n" "1:\tldr x0, [x25]\n\t" - "sub x19, x0, #0x390\n\t" - "mov x0, sp\n\t" - "cmp x19, x0\n\t" - "csel x0, x19, x0, lo\n\t" - "mov sp, x0\n\t" + "sub sp, x0, #0x390\n\t" "mov w2, #0x400000\n\t" /* context.ContextFlags = CONTEXT_FULL */ "movk w2, #7\n\t" - "mov x1, x19\n\t" - "str w2, [x19]\n\t" + "str w2, [sp]\n\t" + "mov x1, sp\n\t" "mov x0, #~1\n\t" "bl " __ASM_NAME("NtGetContextThread") "\n\t" "mov w2, #0xc0\n\t" /* context.X0 = STATUS_USER_APC */ - "str x2, [x19, #8]\n\t" + "str x2, [sp, #8]\n\t" "str xzr, [x25]\n\t" - "mov x0, x19\n" /* context */ + "mov x0, sp\n" /* context */ "2:\tldr lr, [x0, #0xf8]\n\t" /* context.Lr */ "mov x1, x20\n\t" /* ctx */ "mov x2, x21\n\t" /* arg1 */ diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 45482b819c..e0ba27d3e9 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1669,34 +1669,36 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "jz 1f\n\t" "movl 0xc4(%esi),%eax\n\t" /* context_ptr->Rsp */ "leal -0x2f8(%eax),%eax\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) + params */ - "movl %esi,4(%eax)\n\t" - "movl 8(%esp),%ecx\n\t" /* ctx */ - "movl %ecx,8(%eax)\n\t" - "movl 12(%esp),%ecx\n\t" /* arg1 */ - "movl %ecx,12(%eax)\n\t" - "movl 16(%esp),%ecx\n\t" /* arg2 */ - "movl %ecx,16(%eax)\n\t" "movl 20(%esp),%ecx\n\t" /* func */ "movl %ecx,20(%eax)\n\t" + "movl 8(%esp),%ebx\n\t" /* ctx */ + "movl 12(%esp),%edx\n\t" /* arg1 */ + "movl 16(%esp),%ecx\n\t" /* arg2 */ "leal 4(%eax),%esp\n\t" "jmp 2f\n" "1:\tmovl %fs:0x1f8,%eax\n\t" /* x86_thread_data()->syscall_frame */ "leal -0x2cc(%eax),%esi\n\t" - "movl %esp,%ecx\n\t" + "movl %esp,%ebx\n\t" "cmpl %esp,%esi\n\t" "cmovbl %esi,%esp\n\t" - "pushl 20(%ecx)\n\t" /* func */ - "pushl 16(%ecx)\n\t" /* arg2 */ - "pushl 12(%ecx)\n\t" /* arg1 */ - "pushl 8(%ecx)\n\t" /* ctx */ - "pushl %esi\n\t" /* context */ "movl $0x00010007,(%esi)\n\t" /* context.ContextFlags = CONTEXT_FULL */ "pushl %esi\n\t" /* context */ "pushl $0xfffffffe\n\t" "call " __ASM_STDCALL("NtGetContextThread",8) "\n\t" "movl $0xc0,0xb0(%esi)\n" /* context.Eax = STATUS_USER_APC */ - "2:\tmovl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame = NULL */ - "pushl $0xdeaddead\n\t" + "movl 20(%ebx),%eax\n\t" /* func */ + "movl 16(%ebx),%ecx\n\t" /* arg2 */ + "movl 12(%ebx),%edx\n\t" /* arg1 */ + "movl 8(%ebx),%ebx\n\t" /* ctx */ + "leal -20(%esi),%esp\n\t" + "movl %eax,16(%esp)\n" /* func */ + "2:\tmovl %ecx,12(%esp)\n\t" /* arg2 */ + "movl %edx,8(%esp)\n\t" /* arg1 */ + "movl %ebx,4(%esp)\n\t" /* ctx */ + "movl %esi,(%esp)\n\t" /* context */ + "movl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame = NULL */ + "movl 0xb4(%esi),%ebp\n\t" /* context.Ebp */ + "pushl 0xb8(%esi)\n\t" /* context.Eip */ "jmp *%edi\n" ) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 31e87cfdc2..e11b2c70b5 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2013,26 +2013,24 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "leaq -0x5c0(%rax),%rsp\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) */ "jmp 2f\n" "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "leaq -0x4d0(%rax),%r10\n\t" + "leaq -0x4d0(%rax),%rsp\n\t" + "andq $~15,%rsp\n\t" "movq %rdx,%r12\n\t" /* ctx */ "movq %r8,%r13\n\t" /* arg1 */ "movq %r9,%r14\n\t" /* arg2 */ - "cmpq %rsp,%r10\n\t" - "cmovbq %r10,%rsp\n\t" - "andq $~15,%rsp\n\t" "movq %rsp,%rdx\n\t" /* context */ "movl $0x10000b,0x30(%rdx)\n\t" /* context.ContextFlags */ "movq $~1,%rcx\n\t" "call " __ASM_NAME("NtGetContextThread") "\n\t" "movq %rsp,%rcx\n\t" /* context */ - "movl $0xc0,%eax\n\t" - "movq %rax,0x78(%rcx)\n\t" /* context.Rax = STATUS_USER_APC */ + "movq $0xc0,0x78(%rcx)\n\t" /* context.Rax = STATUS_USER_APC */ "movq %r12,%rdx\n\t" /* ctx */ "movq %r13,%r8\n\t" /* arg1 */ "movq %r14,%r9\n" /* arg2 */ "2:\tmovq $0,0x328(%rbx)\n\t" "movq %rsi,0x20(%rsp)\n\t" /* func */ - "leaq -8(%rsp),%rsp\n\t" + "movq 0xa0(%rcx),%rbp\n\t" /* context.Rbp */ + "pushq 0xf8(%rcx)\n\t" /* context.Rip */ "jmp *%rdi" )

1 0

Zhiyi Zhang : ddraw/tests: Add display mode frequency tests.
by Alexandre Julliard 04 Sep '20

04 Sep '20

Module: wine Branch: master Commit: d4fdb1f62cf54b5f6f0e6f4b8a19605b24f1b4f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4fdb1f62cf54b5f6f0e6f4b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Sep 4 16:56:29 2020 +0800 ddraw/tests: Add display mode frequency tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 41 +++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 293 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4fdb1f62cf54b5f6f0e…

1 0

Zhiyi Zhang : ddraw: Report correct frequency in GetDisplayMode().
by Alexandre Julliard 04 Sep '20

04 Sep '20

Module: wine Branch: master Commit: 5ec9505a5ca50f98c1ce5110909c0c1cca340093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ec9505a5ca50f98c1ce5110… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Sep 4 16:56:41 2020 +0800 ddraw: Report correct frequency in GetDisplayMode(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/tests/ddraw1.c | 1 - dlls/ddraw/tests/ddraw2.c | 2 -- dlls/ddraw/tests/ddraw4.c | 2 -- dlls/ddraw/tests/ddraw7.c | 2 -- 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d7545e5c82..c3c335d978 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1652,7 +1652,7 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 DDSD->dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; DDSD->dwWidth = mode.width; DDSD->dwHeight = mode.height; - DDSD->u2.dwRefreshRate = 60; + DDSD->u2.dwRefreshRate = mode.refresh_rate; DDSD->u4.ddpfPixelFormat.dwSize = sizeof(DDSD->u4.ddpfPixelFormat); ddrawformat_from_wined3dformat(&DDSD->u4.ddpfPixelFormat, mode.format_id); DDSD->u1.lPitch = mode.width * DDSD->u4.ddpfPixelFormat.u1.dwRGBBitCount / 8; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 6f0948bbab..2fac4d4b0b 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13865,7 +13865,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index abcd2010b2..6b58479853 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -14763,7 +14763,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), @@ -14796,7 +14795,6 @@ static void test_get_display_mode(void) surface_desc.dwWidth); ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, surface_desc.dwHeight); - todo_wine ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", param.new_frequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 071acbaced..d438132764 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17824,7 +17824,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), @@ -17857,7 +17856,6 @@ static void test_get_display_mode(void) surface_desc.dwWidth); ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, surface_desc.dwHeight); - todo_wine ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", param.new_frequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp, diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0f87d46ec0..288624728f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18086,7 +18086,6 @@ static void test_get_display_mode(void) devmode.dmPelsWidth, surface_desc.dwWidth); ok(surface_desc.dwHeight == devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, surface_desc.dwHeight); - todo_wine_if(devmode.dmDisplayFrequency != 60) ok(surface_desc.dwRefreshRate == devmode.dmDisplayFrequency, "Expected frequency %u, got %u.\n", devmode.dmDisplayFrequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwSize == sizeof(surface_desc.ddpfPixelFormat), @@ -18119,7 +18118,6 @@ static void test_get_display_mode(void) surface_desc.dwWidth); ok(surface_desc.dwHeight == param.new_height, "Expected height %u, got %u.\n", param.new_height, surface_desc.dwHeight); - todo_wine ok(surface_desc.dwRefreshRate == param.new_frequency, "Expected frequency %u, got %u.\n", param.new_frequency, surface_desc.dwRefreshRate); ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == param.new_bpp,

1 0

Nikolay Sivov : evr: Create and initialize mixer transform attributes.
by Alexandre Julliard 04 Sep '20

04 Sep '20

Module: wine Branch: master Commit: f949087624c970d3b32969d10a49640b1d4bbea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f949087624c970d3b32969d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 4 18:52:51 2020 +0300 evr: Create and initialize mixer transform attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 28 +++++++++++++++++++++++----- dlls/evr/tests/evr.c | 24 ++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index d92bb6c170..d9f86a7fc9 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -70,11 +70,9 @@ struct video_mixer struct output_stream output; COLORREF bkgnd_color; - IDirect3DDeviceManager9 *device_manager; - IMediaEventSink *event_sink; - + IMFAttributes *attributes; CRITICAL_SECTION cs; }; @@ -246,6 +244,8 @@ static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) video_mixer_clear_types(mixer); if (mixer->device_manager) IDirect3DDeviceManager9_Release(mixer->device_manager); + if (mixer->attributes) + IMFAttributes_Release(mixer->attributes); DeleteCriticalSection(&mixer->cs); free(mixer); } @@ -360,9 +360,17 @@ static HRESULT WINAPI video_mixer_transform_GetOutputStreamInfo(IMFTransform *if static HRESULT WINAPI video_mixer_transform_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) { - FIXME("%p, %p.\n", iface, attributes); + struct video_mixer *mixer = impl_from_IMFTransform(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, attributes); + + if (!attributes) + return E_POINTER; + + *attributes = mixer->attributes; + IMFAttributes_AddRef(*attributes); + + return S_OK; } static HRESULT WINAPI video_mixer_transform_GetInputStreamAttributes(IMFTransform *iface, DWORD id, @@ -1317,6 +1325,8 @@ HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID ri HRESULT evr_mixer_create(IUnknown *outer, void **out) { struct video_mixer *object; + MFVideoNormalizedRect rect; + HRESULT hr; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1335,6 +1345,14 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->input_count = 1; video_mixer_init_input(&object->inputs[0]); InitializeCriticalSection(&object->cs); + if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) + { + IUnknown_Release(&object->IUnknown_inner); + return hr; + } + rect.left = rect.top = 0.0f; + rect.right = rect.bottom = 1.0f; + IMFAttributes_SetBlob(object->attributes, &VIDEO_ZOOM_RECT, (const UINT8 *)&rect, sizeof(rect)); *out = &object->IUnknown_inner; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 6a5d80df41..ba97eba53d 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -419,6 +419,7 @@ static void test_default_mixer(void) DWORD input_count, output_count; IMFVideoProcessor *processor; IMFVideoDeviceID *deviceid; + MFVideoNormalizedRect rect; DWORD input_id, output_id; IMFTransform *transform; DXVA2_ValueRange range; @@ -508,6 +509,29 @@ todo_wine hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetAttributes(transform, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetAttributes(transform, &attributes); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetAttributes(transform, &attributes2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(attributes == attributes2, "Unexpected attributes instance.\n"); + IMFAttributes_Release(attributes2); + + hr = IMFAttributes_GetCount(attributes, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected attribute count %u.\n", count); + + memset(&rect, 0, sizeof(rect)); + hr = IMFAttributes_GetBlob(attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&rect, sizeof(rect), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rect.left == 0.0f && rect.top == 0.0f && rect.right == 1.0f && rect.bottom == 1.0f, + "Unexpected zoom rect (%f, %f) - (%f, %f).\n", rect.left, rect.top, rect.right, rect.bottom); + + IMFAttributes_Release(attributes); + hr = IMFVideoDeviceID_GetDeviceID(deviceid, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr);

1 0