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

Henri Verbeet : vkd3d-shader: Rename the vkd3d_tessellator_output_primitive enumeration.
by Alexandre Julliard 23 Jun '20

23 Jun '20

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: Rename the vkd3d_tessellator_partitioning enumeration.
by Alexandre Julliard 23 Jun '20

23 Jun '20

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: Allow the name of the SPIR-V entry point to be specified.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: vkd3d Branch: master Commit: 25ef0550623dced01a37b2f9b5cf75cbd3ae9acc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=25ef0550623dced01a37b2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 23 14:08:15 2020 +0430 vkd3d-shader: Allow the name of the SPIR-V entry point to be specified. 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 | 19 +++++++++++++------ libs/vkd3d/state.c | 1 + 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d49fecd..1cfc0fa 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -279,6 +279,8 @@ struct vkd3d_shader_spirv_target_info enum vkd3d_shader_structure_type type; const void *next; + const char *entry_point; /* "main" if NULL. */ + enum vkd3d_shader_spirv_environment environment; const enum vkd3d_shader_spirv_extension *extensions; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7636316..49994a3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1666,7 +1666,7 @@ static uint32_t vkd3d_spirv_get_type_id(struct vkd3d_spirv_builder *builder, } } -static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder) +static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder, const char *entry_point) { vkd3d_spirv_stream_init(&builder->debug_stream); vkd3d_spirv_stream_init(&builder->annotation_stream); @@ -1682,7 +1682,7 @@ static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder) rb_init(&builder->declarations, vkd3d_spirv_declaration_compare); builder->main_function_id = vkd3d_spirv_alloc_id(builder); - vkd3d_spirv_build_op_name(builder, builder->main_function_id, "main"); + vkd3d_spirv_build_op_name(builder, builder->main_function_id, entry_point); } static void vkd3d_spirv_builder_begin_main_function(struct vkd3d_spirv_builder *builder) @@ -1714,7 +1714,7 @@ static void vkd3d_spirv_builder_free(struct vkd3d_spirv_builder *builder) } static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, - struct vkd3d_shader_code *spirv) + struct vkd3d_shader_code *spirv, const char *entry_point) { uint64_t capability_mask = builder->capability_mask; struct vkd3d_spirv_stream stream; @@ -1754,7 +1754,7 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, /* entry point declarations */ vkd3d_spirv_build_op_memory_model(&stream, SpvAddressingModelLogical, SpvMemoryModelGLSL450); vkd3d_spirv_build_op_entry_point(&stream, builder->execution_model, builder->main_function_id, - "main", builder->iface, builder->iface_element_count); + entry_point, builder->iface, builder->iface_element_count); /* execution mode declarations */ if (builder->invocation_count) @@ -2122,6 +2122,13 @@ static bool is_control_point_phase(const struct vkd3d_shader_phase *phase) static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler); +static const char *vkd3d_dxbc_compiler_get_entry_point_name(const struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; + + return info && info->entry_point ? info->entry_point : "main"; +} + struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_info *scan_info) @@ -2162,7 +2169,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader return NULL; } - vkd3d_spirv_builder_init(&compiler->spirv_builder); + vkd3d_spirv_builder_init(&compiler->spirv_builder, vkd3d_dxbc_compiler_get_entry_point_name(compiler)); for (i = 0; i < compile_info->option_count; ++i) { @@ -8740,7 +8747,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (compiler->strip_debug) vkd3d_spirv_stream_clear(&builder->debug_stream); - if (!vkd3d_spirv_compile_module(builder, spirv)) + if (!vkd3d_spirv_compile_module(builder, spirv, vkd3d_dxbc_compiler_get_entry_point_name(compiler))) return VKD3D_ERROR; if (TRACE_ON()) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 55953ac..db342df 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2174,6 +2174,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; ps_target_info.next = NULL; + ps_target_info.entry_point = "main"; ps_target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; ps_target_info.extensions = vk_info->shader_extensions; ps_target_info.extension_count = vk_info->shader_extension_count;

1 0

Henri Verbeet : include: Correct the "vkd3d_shader_binding_flag" type name in some comments.
by Alexandre Julliard 23 Jun '20

23 Jun '20

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

Zebediah Figura : kernel32: Open the INI file in PROFILE_GetSection.
by Alexandre Julliard 22 Jun '20

22 Jun '20

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: Correct definition of PRTL_AVL_ALLOCATE_ROUTINE.
by Alexandre Julliard 22 Jun '20

22 Jun '20

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

Alex Henrie : include: Add RTL_GENERIC_TABLE.
by Alexandre Julliard 22 Jun '20

22 Jun '20

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

Jeff Smith : gdiplus/tests: Fix debug value in test_graphics_clear().
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 11c68bb50e563e65fa28272430f682aefa92ad20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11c68bb50e563e65fa282724… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jun 17 17:26:50 2020 -0500 gdiplus/tests: Fix debug value in test_graphics_clear(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index d32453fa38..93729650de 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5913,7 +5913,7 @@ static void test_graphics_clear(void) if (!match) { bits = data.Scan0; - trace("format %#x, bits %02x,%02x,%02x,%02x %02x,%02x,%02x,%02x\n", PixelFormat32bppPARGB, + trace("format %#x, bits %02x,%02x,%02x,%02x %02x,%02x,%02x,%02x\n", PixelFormat32bppARGB, bits[0], bits[1], bits[2], bits[3], bits[4], bits[5], bits[6], bits[7]); } status = GdipBitmapUnlockBits(bitmap, &data);

1 0

Ziqing Hui : windowscodecs/tests: Format ok() message for tests/ddsformat.c.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 7b24d3efc7abd147a4efac2268d9ae5839a8a15e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b24d3efc7abd147a4efac22… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jun 19 10:37:16 2020 +0800 windowscodecs/tests: Format ok() message for tests/ddsformat.c. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 223 ++++++++++++++++++----------------- 1 file changed, 113 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b24d3efc7abd147a4ef…

1 0

Shawn M. Chapla : gdiplus/tests: Add GDI/GDI+ graphics interop test.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 739d0a1dfa92d65c7f9839b2e682933b67ee3fee URL: https://source.winehq.org/git/wine.git/?a=commit;h=739d0a1dfa92d65c7f9839b2… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Fri Jun 19 13:21:16 2020 -0400 gdiplus/tests: Add GDI/GDI+ graphics interop test. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index f2ff589ab5..7040327e67 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6792,6 +6792,97 @@ static void test_hdc_caching(void) DeleteObject(hbm); } +static void test_gdi_interop(void) +{ + GpBitmap *bitmap; + GpGraphics *graphics; + GpMatrix *transform; + GpBrush *brush; + GpStatus stat; + HDC hdc; + HBRUSH hbrush, holdbrush; + ARGB color; + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + stat = GdipCreateMatrix(&transform); + expect(Ok, stat); + + stat = GdipSetMatrixElements(transform, 1.0, 0.0, 0.0, 1.0, 50.0, 50.0); + expect(Ok, stat); + + /* GDI+: Set world transform. Should not matter to GDI. */ + stat = GdipSetWorldTransform(graphics, transform); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &hdc); + expect(Ok, stat); + + hbrush = CreateSolidBrush(0xff0000); + + holdbrush = SelectObject(hdc, hbrush); + + /* GDI: Draw a rectangle at physical coords (5, 5) to (12, 10). */ + Rectangle(hdc, 5, 5, 12, 10); + + holdbrush = SelectObject(hdc, holdbrush); + + /* GDI: Set view port origin. Should not matter to GDI+. */ + SetViewportOrgEx(hdc, 20, 20, NULL); + + GdipReleaseDC(graphics, hdc); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + /* GDI+: Draw a rectangle at physical coords (85, 85) to (88, 95). */ + stat = GdipFillRectangleI(graphics, brush, 35, 35, 3, 10); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &hdc); + expect(Ok, stat); + + holdbrush = SelectObject(hdc, hbrush); + + /* GDI: Draw a rectangle at physical coords (25, 25) to (30, 34). + Updated view port origin should still be in effect. */ + Rectangle(hdc, 5, 5, 10, 14); + + SelectObject(hdc, holdbrush); + + DeleteObject(hbrush); + stat = GdipReleaseDC(graphics, hdc); + expect(Ok, stat); + + stat = GdipDeleteMatrix(transform); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap, 6, 6, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 26, 26, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 86, 86, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -6885,6 +6976,7 @@ START_TEST(graphics) test_GdipGraphicsSetAbort(); test_cliphrgn_transform(); test_hdc_caching(); + test_gdi_interop(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0