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

Henri Verbeet : vkd3d-shader: Rename the vkd3d_tessellator_partitioning enumeration.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: vkd3d Branch: master Commit: 7e4fc14a3154e663fed4d1075ea3bd1d6181eb5a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7e4fc14a3154e663fed4d10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 23 14:08:14 2020 +0430 vkd3d-shader: Rename the vkd3d_tessellator_partitioning enumeration. To vkd3d_shader_tessellator_partitioning. 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/spirv.c | 10 +++++----- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 66793dc..d49fecd 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -302,12 +302,14 @@ enum vkd3d_shader_tessellator_output_primitive VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TESSELLATOR_OUTPUT_PRIMITIVE), }; -enum vkd3d_tessellator_partitioning +enum vkd3d_shader_tessellator_partitioning { - VKD3D_TESSELLATOR_PARTITIONING_INTEGER = 1, - VKD3D_TESSELLATOR_PARTITIONING_POW2 = 2, - VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 3, - VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 4, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER = 0x1, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2 = 0x2, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 0x3, + VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 0x4, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TESSELLATOR_PARTITIONING), }; /* Extends vkd3d_shader_spirv_target_info. */ @@ -317,7 +319,7 @@ struct vkd3d_shader_spirv_domain_shader_target_info const void *next; enum vkd3d_shader_tessellator_output_primitive output_primitive; - enum vkd3d_tessellator_partitioning partitioning; + enum vkd3d_shader_tessellator_partitioning partitioning; }; /* root signature 1.0 */ diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7c8ddab..7636316 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5652,7 +5652,7 @@ static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_d } static void vkd3d_dxbc_compiler_emit_tessellator_partitioning(struct vkd3d_dxbc_compiler *compiler, - enum vkd3d_tessellator_partitioning partitioning) + enum vkd3d_shader_tessellator_partitioning partitioning) { SpvExecutionMode mode; @@ -5661,14 +5661,14 @@ static void vkd3d_dxbc_compiler_emit_tessellator_partitioning(struct vkd3d_dxbc_ switch (partitioning) { - case VKD3D_TESSELLATOR_PARTITIONING_INTEGER: - case VKD3D_TESSELLATOR_PARTITIONING_POW2: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2: mode = SpvExecutionModeSpacingEqual; break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: mode = SpvExecutionModeSpacingFractionalOdd; break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: mode = SpvExecutionModeSpacingFractionalEven; break; default: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index ee9b45c..1b59e4c 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -524,20 +524,20 @@ static void shader_dump_tessellator_output_primitive(struct vkd3d_string_buffer } static void shader_dump_tessellator_partitioning(struct vkd3d_string_buffer *buffer, - enum vkd3d_tessellator_partitioning partitioning) + enum vkd3d_shader_tessellator_partitioning partitioning) { switch (partitioning) { - case VKD3D_TESSELLATOR_PARTITIONING_INTEGER: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_INTEGER: shader_addline(buffer, "integer"); break; - case VKD3D_TESSELLATOR_PARTITIONING_POW2: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_POW2: shader_addline(buffer, "pow2"); break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: shader_addline(buffer, "fractional_odd"); break; - case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: + case VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: shader_addline(buffer, "fractional_even"); break; default: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c8734ef..dfbbdfd 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -774,7 +774,7 @@ struct vkd3d_shader_instruction struct vkd3d_shader_thread_group_size thread_group_size; enum vkd3d_tessellator_domain tessellator_domain; enum vkd3d_shader_tessellator_output_primitive tessellator_output_primitive; - enum vkd3d_tessellator_partitioning tessellator_partitioning; + enum vkd3d_shader_tessellator_partitioning tessellator_partitioning; float max_tessellation_factor; struct vkd3d_shader_index_range index_range; struct vkd3d_shader_indexable_temp indexable_temp;

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_tessellator_output_primitive enumeration.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: vkd3d Branch: master Commit: 500079a54abc7275a80b1b9b16d7698dcf795181 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=500079a54abc7275a80b1b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 23 14:08:13 2020 +0430 vkd3d-shader: Rename the vkd3d_tessellator_output_primitive enumeration. To vkd3d_shader_tessellator_output_primitive, consistent with vkd3d-shader naming conventions. 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/spirv.c | 10 +++++----- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7b3494e..66793dc 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -292,12 +292,14 @@ struct vkd3d_shader_spirv_target_info unsigned int output_swizzle_count; }; -enum vkd3d_tessellator_output_primitive +enum vkd3d_shader_tessellator_output_primitive { - VKD3D_TESSELLATOR_OUTPUT_POINT = 1, - VKD3D_TESSELLATOR_OUTPUT_LINE = 2, - VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW = 3, - VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 4, + VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT = 0x1, + VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE = 0x2, + VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW = 0x3, + VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 0x4, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TESSELLATOR_OUTPUT_PRIMITIVE), }; enum vkd3d_tessellator_partitioning @@ -314,7 +316,7 @@ struct vkd3d_shader_spirv_domain_shader_target_info enum vkd3d_shader_structure_type type; const void *next; - enum vkd3d_tessellator_output_primitive output_primitive; + enum vkd3d_shader_tessellator_output_primitive output_primitive; enum vkd3d_tessellator_partitioning partitioning; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9b655e4..7c8ddab 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5623,7 +5623,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_co } static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_dxbc_compiler *compiler, - enum vkd3d_tessellator_output_primitive primitive) + enum vkd3d_shader_tessellator_output_primitive primitive) { SpvExecutionMode mode; @@ -5632,15 +5632,15 @@ static void vkd3d_dxbc_compiler_emit_tessellator_output_primitive(struct vkd3d_d switch (primitive) { - case VKD3D_TESSELLATOR_OUTPUT_POINT: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT: mode = SpvExecutionModePointMode; break; - case VKD3D_TESSELLATOR_OUTPUT_LINE: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE: return; - case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW: mode = SpvExecutionModeVertexOrderCw; break; - case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW: mode = SpvExecutionModeVertexOrderCcw; break; default: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 279ede0..ee9b45c 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -501,20 +501,20 @@ static void shader_dump_tessellator_domain(struct vkd3d_string_buffer *buffer, } static void shader_dump_tessellator_output_primitive(struct vkd3d_string_buffer *buffer, - enum vkd3d_tessellator_output_primitive output_primitive) + enum vkd3d_shader_tessellator_output_primitive output_primitive) { switch (output_primitive) { - case VKD3D_TESSELLATOR_OUTPUT_POINT: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_POINT: shader_addline(buffer, "point"); break; - case VKD3D_TESSELLATOR_OUTPUT_LINE: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_LINE: shader_addline(buffer, "line"); break; - case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CW: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CW: shader_addline(buffer, "triangle_cw"); break; - case VKD3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW: + case VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW: shader_addline(buffer, "triangle_ccw"); break; default: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ecfd665..c8734ef 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -773,7 +773,7 @@ struct vkd3d_shader_instruction struct vkd3d_shader_tgsm_structured tgsm_structured; struct vkd3d_shader_thread_group_size thread_group_size; enum vkd3d_tessellator_domain tessellator_domain; - enum vkd3d_tessellator_output_primitive tessellator_output_primitive; + enum vkd3d_shader_tessellator_output_primitive tessellator_output_primitive; enum vkd3d_tessellator_partitioning tessellator_partitioning; float max_tessellation_factor; struct vkd3d_shader_index_range index_range;

1 0

Henri Verbeet : vkd3d-shader: Allow vkd3d_shader_compile() to handle multiple target types.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: vkd3d Branch: master Commit: 95fa257a3703ccd30203a432f8968f2c602df066 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=95fa257a3703ccd30203a43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 23 14:08:12 2020 +0430 vkd3d-shader: Allow vkd3d_shader_compile() to handle multiple target types. 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/vkd3d_shader_main.c | 15 ++++++++++++--- libs/vkd3d/state.c | 1 + programs/vkd3d-compiler/main.c | 1 + tests/vkd3d_shader_api.c | 2 ++ 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 5c9e42e..7b3494e 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -234,6 +234,14 @@ enum vkd3d_shader_source_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SOURCE_TYPE), }; +enum vkd3d_shader_target_type +{ + VKD3D_SHADER_TARGET_NONE, + VKD3D_SHADER_TARGET_SPIRV_BINARY, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET_TYPE), +}; + struct vkd3d_shader_compile_info { enum vkd3d_shader_structure_type type; @@ -242,6 +250,7 @@ struct vkd3d_shader_compile_info struct vkd3d_shader_code source; enum vkd3d_shader_source_type source_type; + enum vkd3d_shader_target_type target_type; const struct vkd3d_shader_compile_option *options; unsigned int option_count; @@ -663,7 +672,7 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES -int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv); +int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, @@ -693,7 +702,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature * Function pointer typedefs for vkd3d-shader functions. */ typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *spirv); + struct vkd3d_shader_code *out); 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, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5e47122..3255094 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -120,10 +120,19 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ return VKD3D_ERROR_INVALID_ARGUMENT; } + switch (compile_info->target_type) + { + case VKD3D_SHADER_TARGET_SPIRV_BINARY: + break; + default: + WARN("Invalid shader target type %#x.\n", compile_info->target_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + return VKD3D_OK; } -int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) +int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) { struct vkd3d_shader_instruction instruction; struct vkd3d_dxbc_compiler *spirv_compiler; @@ -131,7 +140,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, s struct vkd3d_shader_parser parser; int ret; - TRACE("compile_info %p, spirv %p.\n", compile_info, spirv); + TRACE("compile_info %p, out %p.\n", compile_info, out); if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) return ret; @@ -174,7 +183,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, s } if (ret >= 0) - ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, spirv); + ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, out); vkd3d_dxbc_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2a1107f..55953ac 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1351,6 +1351,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device, compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; compile_info.options = NULL; compile_info.option_count = 0; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 9013f21..48ca42a 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -193,6 +193,7 @@ int main(int argc, char **argv) info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; info.options = options.compile_options; info.option_count = options.compile_option_count; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 5b47703..6aef004 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -60,6 +60,7 @@ static void test_invalid_shaders(void) info.source.code = ps_break_code; info.source.size = sizeof(ps_break_code); info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; info.options = &option; info.option_count = 1; @@ -136,6 +137,7 @@ static void test_vkd3d_shader_pfns(void) compile_info.next = NULL; compile_info.source = vs; compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; compile_info.options = NULL; compile_info.option_count = 0;

1 0

Henri Verbeet : include: Correct the "vkd3d_shader_binding_flag" type name in some comments.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: vkd3d Branch: master Commit: 73145653ac13554bf156126ed3d3bbfd103cc42e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=73145653ac13554bf156126… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 23 14:08:16 2020 +0430 include: Correct the "vkd3d_shader_binding_flag" type name in some comments. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1cfc0fa..358e90d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -148,7 +148,7 @@ struct vkd3d_shader_resource_binding unsigned int register_space; unsigned int register_index; enum vkd3d_shader_visibility shader_visibility; - unsigned int flags; /* vkd3d_shader_binding_flags */ + unsigned int flags; /* vkd3d_shader_binding_flag */ struct vkd3d_shader_descriptor_binding binding; }; @@ -160,7 +160,7 @@ struct vkd3d_shader_combined_resource_sampler unsigned int resource_index; unsigned int sampler_index; enum vkd3d_shader_visibility shader_visibility; - unsigned int flags; /* vkd3d_shader_binding_flags */ + unsigned int flags; /* vkd3d_shader_binding_flag */ struct vkd3d_shader_descriptor_binding binding; };

1 0

Alex Henrie : include: Correct definition of PRTL_AVL_ALLOCATE_ROUTINE.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 37a7fab9ede409041c736da384ceb08ff513509c URL: https://source.winehq.org/git/wine.git/?a=commit;h=37a7fab9ede409041c736da3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jun 22 01:16:05 2020 -0600 include: Correct definition of PRTL_AVL_ALLOCATE_ROUTINE. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/ntddk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index b9f8295db8..497d42da39 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -165,7 +165,7 @@ typedef enum _RTL_GENERIC_COMPARE_RESULTS { typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_AVL_COMPARE_ROUTINE)(struct _RTL_AVL_TABLE *, void *, void *); -typedef void (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); +typedef void * (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); typedef void (WINAPI *PRTL_AVL_FREE_ROUTINE )(struct _RTL_AVL_TABLE *, void *buffer);

1 0

Zebediah Figura : kernel32: Open the INI file in PROFILE_GetSection.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 9fa54bf690810c96fe11251d3cc0cfdc22a188d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fa54bf690810c96fe11251d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 21 19:24:12 2020 -0500 kernel32: Open the INI file in PROFILE_GetSection. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 62 ++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 7c50fb9a61..dfda24446c 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -856,16 +856,26 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) * Returns all keys of a section. * If return_values is TRUE, also include the corresponding values. */ -static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, +static INT PROFILE_GetSection( const WCHAR *filename, LPCWSTR section_name, LPWSTR buffer, UINT len, BOOL return_values ) { + PROFILESECTION *section; PROFILEKEY *key; if(!buffer) return 0; TRACE("%s,%p,%u\n", debugstr_w(section_name), buffer, len); - while (section) + EnterCriticalSection( &PROFILE_CritSect ); + + if (!PROFILE_Open( filename, FALSE )) + { + LeaveCriticalSection( &PROFILE_CritSect ); + buffer[0] = 0; + return 0; + } + + for (section = CurProfile->section; section; section = section->next) { if (!strcmpiW( section->name, section_name )) { @@ -889,6 +899,9 @@ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, } } *buffer = '\0'; + + LeaveCriticalSection( &PROFILE_CritSect ); + if (len <= 1) /*If either lpszSection or lpszKey is NULL and the supplied destination buffer is too small to hold all the strings, @@ -901,9 +914,11 @@ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, } return oldlen - len; } - section = section->next; } buffer[0] = buffer[1] = '\0'; + + LeaveCriticalSection( &PROFILE_CritSect ); + return 0; } @@ -1039,6 +1054,16 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, if (!buffer || !len) return 0; if (!def_val) def_val = emptyW; if (!section) return GetPrivateProfileSectionNamesW( buffer, len, filename ); + if (!entry) + { + ret = PROFILE_GetSection( filename, section, buffer, len, FALSE ); + if (!buffer[0]) + { + PROFILE_CopyEntry( buffer, def_val, len ); + ret = strlenW( buffer ); + } + return ret; + } /* strip any trailing ' ' of def_val. */ p = def_val + strlenW(def_val) - 1; @@ -1059,22 +1084,10 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, if (PROFILE_Open( filename, FALSE )) { - if (entry) - { - PROFILEKEY *key = PROFILE_Find( &CurProfile->section, section, entry, FALSE, FALSE ); - PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len ); - TRACE("-> %s\n", debugstr_w( buffer )); - ret = strlenW( buffer ); - } - else - { - ret = PROFILE_GetSection( CurProfile->section, section, buffer, len, FALSE ); - if (!buffer[0]) - { - PROFILE_CopyEntry( buffer, def_val, len ); - ret = strlenW( buffer ); - } - } + PROFILEKEY *key = PROFILE_Find( &CurProfile->section, section, entry, FALSE, FALSE ); + PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len ); + TRACE("-> %s\n", debugstr_w( buffer )); + ret = strlenW( buffer ); } else { @@ -1229,8 +1242,6 @@ UINT WINAPI GetPrivateProfileIntA( LPCSTR section, LPCSTR entry, INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len, LPCWSTR filename ) { - int ret = 0; - if (!section || !buffer) { SetLastError(ERROR_INVALID_PARAMETER); @@ -1239,14 +1250,7 @@ INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, TRACE("(%s, %p, %d, %s)\n", debugstr_w(section), buffer, len, debugstr_w(filename)); - RtlEnterCriticalSection( &PROFILE_CritSect ); - - if (PROFILE_Open( filename, FALSE )) - ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, TRUE); - - RtlLeaveCriticalSection( &PROFILE_CritSect ); - - return ret; + return PROFILE_GetSection( filename, section, buffer, len, TRUE ); } /***********************************************************************

1 0

Alex Henrie : include: Add RTL_GENERIC_TABLE.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 449b8c7e9212d0a80e28babff20f2755b7370872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=449b8c7e9212d0a80e28babf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jun 22 01:16:06 2020 -0600 include: Add RTL_GENERIC_TABLE. And fix RtlInitializeGenericTable's return type while updating the ntdll functions to use the newly added typedefs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtl.c | 15 ++++++++------- include/ddk/ntddk.h | 40 ++++++++++++++++++++++++++++++++++------ 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index bf91423eba..4a4a7b31de 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -429,30 +429,31 @@ RtlDeleteSecurityObject( PSECURITY_DESCRIPTOR *ObjectDescriptor ) /****************************************************************************** * RtlInitializeGenericTable [NTDLL.@] */ -PVOID WINAPI RtlInitializeGenericTable(PVOID pTable, PVOID arg2, PVOID arg3, PVOID arg4, PVOID arg5) +void WINAPI RtlInitializeGenericTable(RTL_GENERIC_TABLE *table, PRTL_GENERIC_COMPARE_ROUTINE compare, + PRTL_GENERIC_ALLOCATE_ROUTINE allocate, PRTL_GENERIC_FREE_ROUTINE free, + void *context) { - FIXME("(%p,%p,%p,%p,%p) stub!\n", pTable, arg2, arg3, arg4, arg5); - return NULL; + FIXME("(%p, %p, %p, %p, %p) stub!\n", table, compare, allocate, free, context); } /****************************************************************************** * RtlEnumerateGenericTableWithoutSplaying [NTDLL.@] */ -PVOID RtlEnumerateGenericTableWithoutSplaying(PVOID pTable, PVOID *RestartKey) +void * RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, void *previous) { static int warn_once; if (!warn_once++) - FIXME("(%p,%p) stub!\n", pTable, RestartKey); + FIXME("(%p, %p) stub!\n", table, previous); return NULL; } /****************************************************************************** * RtlNumberGenericTableElements [NTDLL.@] */ -ULONG RtlNumberGenericTableElements(PVOID pTable) +ULONG RtlNumberGenericTableElements(RTL_GENERIC_TABLE *table) { - FIXME("(%p) stub!\n", pTable); + FIXME("(%p) stub!\n", table); return 0; } diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 497d42da39..41ad3d721b 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -146,6 +146,40 @@ typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION LARGE_INTEGER ValidDataLength; } FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION; +typedef enum _RTL_GENERIC_COMPARE_RESULTS +{ + GenericLessThan, + GenericGreaterThan, + GenericEqual +} RTL_GENERIC_COMPARE_RESULTS; + +typedef struct _RTL_SPLAY_LINKS +{ + struct _RTL_SPLAY_LINKS *Parent; + struct _RTL_SPLAY_LINKS *LeftChild; + struct _RTL_SPLAY_LINKS *RightChild; +} RTL_SPLAY_LINKS, *PRTL_SPLAY_LINKS; + +struct _RTL_GENERIC_TABLE; + +typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_GENERIC_COMPARE_ROUTINE)(struct _RTL_GENERIC_TABLE *, void *, void *); +typedef void * (WINAPI *PRTL_GENERIC_ALLOCATE_ROUTINE)(struct _RTL_GENERIC_TABLE *, LONG); +typedef void (WINAPI *PRTL_GENERIC_FREE_ROUTINE)(struct _RTL_GENERIC_TABLE *Table, void *); + +typedef struct _RTL_GENERIC_TABLE +{ + PRTL_SPLAY_LINKS TableRoot; + LIST_ENTRY InsertOrderList; + LIST_ENTRY *OrderedPointer; + ULONG WhichOrderedElement; + ULONG NumberGenericTableElements; + PRTL_GENERIC_COMPARE_ROUTINE CompareRoutine; + PRTL_GENERIC_ALLOCATE_ROUTINE AllocateRoutine; + PRTL_GENERIC_FREE_ROUTINE FreeRoutine; + void *TableContext; +} RTL_GENERIC_TABLE; +typedef RTL_GENERIC_TABLE *PRTL_GENERIC_TABLE; + typedef struct _RTL_BALANCED_LINKS { struct _RTL_BALANCED_LINKS *Parent; struct _RTL_BALANCED_LINKS *LeftChild; @@ -157,12 +191,6 @@ typedef RTL_BALANCED_LINKS *PRTL_BALANCED_LINKS; struct _RTL_AVL_TABLE; -typedef enum _RTL_GENERIC_COMPARE_RESULTS { - GenericLessThan, - GenericGreaterThan, - GenericEqual -} RTL_GENERIC_COMPARE_RESULTS; - typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_AVL_COMPARE_ROUTINE)(struct _RTL_AVL_TABLE *, void *, void *); typedef void * (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG);

1 0

Zebediah Figura : kernel32: Get rid of the last parameter to PROFILE_CopyEntry().
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 60f344852d06e66e59957675ee94332d0b1e073c URL: https://source.winehq.org/git/wine.git/?a=commit;h=60f344852d06e66e59957675… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 21 19:24:11 2020 -0500 kernel32: Get rid of the last parameter to PROFILE_CopyEntry(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 02c6fa5efb..7c50fb9a61 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -101,14 +101,13 @@ static const char hex[16] = "0123456789ABCDEF"; * Copy the content of an entry into a buffer, removing quotes, and possibly * translating environment variables. */ -static void PROFILE_CopyEntry( LPWSTR buffer, LPCWSTR value, int len, - BOOL strip_quote ) +static void PROFILE_CopyEntry( LPWSTR buffer, LPCWSTR value, int len ) { WCHAR quote = '\0'; if(!buffer) return; - if (strip_quote && ((*value == '\'') || (*value == '\"'))) + if (*value == '\'' || *value == '\"') { if (value[1] && (value[strlenW(value)-1] == *value)) quote = *value++; } @@ -877,14 +876,14 @@ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, if (!*key->name && !key->value) continue; /* Skip empty lines */ if (IS_ENTRY_COMMENT(key->name)) continue; /* Skip comments */ if (!return_values && !key->value) continue; /* Skip lines w.o. '=' */ - PROFILE_CopyEntry( buffer, key->name, len - 1, 0 ); + lstrcpynW( buffer, key->name, len - 1 ); len -= strlenW(buffer) + 1; buffer += strlenW(buffer) + 1; if (len < 2) break; if (return_values && key->value) { buffer[-1] = '='; - PROFILE_CopyEntry ( buffer, key->value, len - 1, 0 ); + lstrcpynW( buffer, key->value, len - 1 ); len -= strlenW(buffer) + 1; buffer += strlenW(buffer) + 1; } @@ -1063,7 +1062,7 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, if (entry) { PROFILEKEY *key = PROFILE_Find( &CurProfile->section, section, entry, FALSE, FALSE ); - PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len, TRUE ); + PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len ); TRACE("-> %s\n", debugstr_w( buffer )); ret = strlenW( buffer ); } @@ -1072,7 +1071,7 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, ret = PROFILE_GetSection( CurProfile->section, section, buffer, len, FALSE ); if (!buffer[0]) { - PROFILE_CopyEntry( buffer, def_val, len, TRUE ); + PROFILE_CopyEntry( buffer, def_val, len ); ret = strlenW( buffer ); } }

1 0

Zebediah Figura : kernel32/tests: Add tests for profile struct functions.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 22a6c60e18d72819055ae8e95f25b925ecd5b965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22a6c60e18d72819055ae8e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 21 19:24:09 2020 -0500 kernel32/tests: Add tests for profile struct functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 72 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 1339b2b20c..ce82a746e7 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -1092,6 +1092,77 @@ static void test_WritePrivateProfileString(void) DeleteFileA(path); } +static void test_profile_struct(void) +{ + static const char expect_data[] = "[s]\r\nkey=616261637573006F\r\n"; + char buffer[20]; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, sizeof(buffer), "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + ret = WritePrivateProfileStructA("s", "key", (void *)"abacus", sizeof("abacus"), "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + ok(check_file_data("./winetest.ini", expect_data), "file doesn't match\n"); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 6, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 8, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + memset(buffer, 0xcc, sizeof(buffer)); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(buffer, "abacus"), "data didn't match\n"); + + memset(buffer, 0xcc, sizeof(buffer)); + ret = GetPrivateProfileStringA("s", "key", "default", buffer, sizeof(buffer), "./winetest.ini"); + ok(ret == 16, "got size %u\n", ret); + ok(!strcmp(buffer, "616261637573006F"), "got %s\n", debugstr_a(buffer)); + + ret = WritePrivateProfileStringA("s", "key", "636163747573006F", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "got error %u\n", GetLastError()); + + ret = WritePrivateProfileStringA("s", "key", "6361637475730083", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + memset(buffer, 0xcc, sizeof(buffer)); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(buffer, "cactus"), "data didn't match\n"); + + ret = WritePrivateProfileStringA("s", "key", "636163747573008Q", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "got error %u\n", GetLastError()); + + ret = WritePrivateProfileStringA("s", "key", "16361637475730083", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + ret = DeleteFileA("./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); +} + START_TEST(profile) { test_profile_int(); @@ -1119,4 +1190,5 @@ START_TEST(profile) "[section2]\r", "CR only"); test_WritePrivateProfileString(); + test_profile_struct(); }

1 0

Nikolay Sivov : mfplat: Add IMFVideoMediaType semi-stub.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: a7d18392e48ec3836af58927e733bb1901ab88cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7d18392e48ec3836af58927… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 17:20:35 2020 +0300 mfplat: Add IMFVideoMediaType semi-stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 487 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 480 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7d18392e48ec3836af5…

1 0