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

Elizabeth Figura : wined3d: Handle a null vertex declaration in glsl_vertex_pipe_vdecl().
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: dc6b34987a7bc0c3c84d0aabb0f1c4f179b98d27 URL: https://gitlab.winehq.org/wine/wine/-/commit/dc6b34987a7bc0c3c84d0aabb0f1c4… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 6 21:30:32 2024 -0500 wined3d: Handle a null vertex declaration in glsl_vertex_pipe_vdecl(). Fixes: db63c8be29fdadf95e4ce2788f5b39e58b0cfe86 --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b4bfbe1c55b..feea9957069 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11765,10 +11765,10 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, const BOOL legacy_clip_planes = needs_legacy_glsl_syntax(gl_info); BOOL transformed = context->stream_info.position_transformed; BOOL wasrhw = context->last_was_rhw; - bool point_size = vdecl->point_size; - bool specular = vdecl->specular; - bool diffuse = vdecl->diffuse; - bool normal = vdecl->normal; + bool point_size = vdecl && vdecl->point_size; + bool specular = vdecl && vdecl->specular; + bool diffuse = vdecl && vdecl->diffuse; + bool normal = vdecl && vdecl->normal; unsigned int i; context->last_was_rhw = transformed;

1 0

Elizabeth Figura : wined3d: Always output normalized fog coordinates from the vertex shader.
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 421059c88052af596cd4654e4cd772d15dc6b5b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/421059c88052af596cd4654e4cd772… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sun May 5 12:16:52 2024 -0500 wined3d: Always output normalized fog coordinates from the vertex shader. Historically we used a 0-255 scale in cases where the fog coordinate attribute was passed through directly, apparently in order to avoid doing float division on the value passed to glFogCoordfEXT(). This benefit was probably always dubious, and now is simply unnecessary as we no longer use GL FFP fog nor immediate mode draws. Get rid of the GLSL equivalent code to scale fog up to the 0-255 range and then back down to 0-1. --- dlls/wined3d/glsl_shader.c | 7 +++---- dlls/wined3d/utils.c | 5 ----- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index feea9957069..b45494b9f12 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9297,7 +9297,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr break; case WINED3D_FFP_VS_FOG_FOGCOORD: - shader_addline(buffer, "ffp_varying_fogcoord = ffp_attrib_specular.w * 255.0;\n"); + shader_addline(buffer, "ffp_varying_fogcoord = ffp_attrib_specular.w;\n"); break; case WINED3D_FFP_VS_FOG_RANGE: @@ -12240,10 +12240,9 @@ static void glsl_fragment_pipe_fog(struct wined3d_context *context, if (state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE) { - if (use_vshader) + if (use_vshader || state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE + || context->stream_info.position_transformed) new_source = FOGSOURCE_VS; - else if (state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE || context->stream_info.position_transformed) - new_source = FOGSOURCE_COORD; else new_source = FOGSOURCE_FFP; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8c90908ec76..779af782b6c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5834,11 +5834,6 @@ void get_fog_start_end(const struct wined3d_context *context, const struct wined *end = 0.0f; break; - case FOGSOURCE_COORD: - *start = 255.0f; - *end = 0.0f; - break; - case FOGSOURCE_FFP: tmpvalue.d = state->render_states[WINED3D_RS_FOGSTART]; *start = tmpvalue.f; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index abdb97f9d9f..f49a604422d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1827,7 +1827,6 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state enum fogsource { FOGSOURCE_FFP, FOGSOURCE_VS, - FOGSOURCE_COORD, }; /* Direct3D terminology with little modifications. We do not have an issued

1 0

Elizabeth Figura : wined3d: Do not create a framebuffer with attachments whose clear is delayed.
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 14b97f8cfd31f34649823aa5ffcfeda0e322c897 URL: https://gitlab.winehq.org/wine/wine/-/commit/14b97f8cfd31f34649823aa5ffcfed… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Apr 29 14:42:53 2024 -0500 wined3d: Do not create a framebuffer with attachments whose clear is delayed. They may not have a VkImage yet, and if we are delaying their clear we will not have ensured that they have one. --- dlls/wined3d/texture.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 688dc35de98..eeb2ea3a7cc 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6254,12 +6254,13 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { + unsigned int i, attachment_count, immediate_rt_count = 0, delay_count = 0; VkClearValue clear_values[WINED3D_MAX_RENDER_TARGETS + 1]; VkImageView views[WINED3D_MAX_RENDER_TARGETS + 1]; - unsigned int i, attachment_count, delay_count = 0; struct wined3d_rendertarget_view_vk *rtv_vk; struct wined3d_rendertarget_view *view; const struct wined3d_vk_info *vk_info; + struct wined3d_fb_state immediate_fb; struct wined3d_device_vk *device_vk; VkCommandBuffer vk_command_buffer; VkRenderPassBeginInfo begin_desc; @@ -6313,6 +6314,7 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk wined3d_rendertarget_view_validate_location(view, view->resource->draw_binding); wined3d_rendertarget_view_invalidate_location(view, ~view->resource->draw_binding); + immediate_fb.render_targets[immediate_rt_count++] = view; rtv_vk = wined3d_rendertarget_view_vk(view); views[attachment_count] = wined3d_rendertarget_view_vk_get_image_view(rtv_vk, context_vk); wined3d_rendertarget_view_vk_barrier(rtv_vk, context_vk, WINED3D_BIND_RENDER_TARGET); @@ -6349,6 +6351,7 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk wined3d_rendertarget_view_validate_location(view, view->resource->draw_binding); wined3d_rendertarget_view_invalidate_location(view, ~view->resource->draw_binding); + immediate_fb.depth_stencil = view; rtv_vk = wined3d_rendertarget_view_vk(view); views[attachment_count] = wined3d_rendertarget_view_vk_get_image_view(rtv_vk, context_vk); wined3d_rendertarget_view_vk_barrier(rtv_vk, context_vk, WINED3D_BIND_DEPTH_STENCIL); @@ -6384,8 +6387,8 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk if (delay_count) TRACE_(d3d_perf)("Partial clear: %u immediate, %u delayed.\n", attachment_count, delay_count); - if (!(vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, fb, - rt_count, flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL), flags))) + if (!(vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, &immediate_fb, + immediate_rt_count, flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL), flags))) { ERR("Failed to get render pass.\n"); return; @@ -6441,19 +6444,13 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk wined3d_context_vk_destroy_vk_framebuffer(context_vk, vk_framebuffer, context_vk->current_command_buffer.id); - for (i = 0; i < rt_count; ++i) - { - if (!(view = fb->render_targets[i])) - continue; - - wined3d_context_vk_reference_rendertarget_view(context_vk, wined3d_rendertarget_view_vk(view)); - } + for (i = 0; i < immediate_rt_count; ++i) + wined3d_context_vk_reference_rendertarget_view(context_vk, + wined3d_rendertarget_view_vk(immediate_fb.render_targets[i])); if (depth_stencil) - { - view = fb->depth_stencil; - wined3d_context_vk_reference_rendertarget_view(context_vk, wined3d_rendertarget_view_vk(view)); - } + wined3d_context_vk_reference_rendertarget_view(context_vk, + wined3d_rendertarget_view_vk(immediate_fb.depth_stencil)); } static void vk_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device,

1 0

Elizabeth Figura : wined3d: Use separate signature elements for oFog and oPts.
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: ce0ccf1a771492d500e29759ec141f0fc3f92918 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce0ccf1a771492d500e29759ec141f… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu May 9 19:55:25 2024 -0500 wined3d: Use separate signature elements for oFog and oPts. --- dlls/wined3d/shader.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 09ecc51b608..252046f0a39 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1478,7 +1478,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co case 2: /* oPts */ reg_maps->output_registers |= 1u << 11; - shader_signature_from_usage(&output_signature_elements[11], + shader_signature_from_usage(&output_signature_elements[12], WINED3D_DECL_USAGE_PSIZE, 0, 11, WINED3DSP_WRITEMASK_1); break; } @@ -1822,8 +1822,14 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co } else if (reg_maps->output_registers) { - unsigned int count = wined3d_popcount(reg_maps->output_registers); struct wined3d_shader_signature_element *e; + unsigned int count = 0; + + for (i = 0; i < ARRAY_SIZE(output_signature_elements); ++i) + { + if (output_signature_elements[i].semantic_name) + ++count; + } if (!(output_signature->elements = calloc(count, sizeof(*output_signature->elements)))) return E_OUTOFMEMORY; @@ -1832,9 +1838,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co e = output_signature->elements; for (i = 0; i < ARRAY_SIZE(output_signature_elements); ++i) { - if (!(reg_maps->output_registers & (1u << i))) - continue; - *e++ = output_signature_elements[i]; + if (output_signature_elements[i].semantic_name) + *e++ = output_signature_elements[i]; } }

1 0

Giovanni Mascellani : d3d11/tests: Add a test for NV12 textures.
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 864aebbfc66ad1a92d348d2ea3a5ad551e84f522 URL: https://gitlab.winehq.org/wine/wine/-/commit/864aebbfc66ad1a92d348d2ea3a5ad… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 31 17:20:14 2024 +0200 d3d11/tests: Add a test for NV12 textures. --- dlls/d3d11/tests/Makefile.in | 2 +- dlls/d3d11/tests/d3d11.c | 314 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 315 insertions(+), 1 deletion(-)

1 0

Paul Gofman : kernelbase: Preprocess wildcarded mask and pass it with NtQueryDirectoryFile().
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: e1d2fb8e058c8a70d01e56e5a89ca22ecbc0e164 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1d2fb8e058c8a70d01e56e5a89ca2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 3 20:13:21 2024 -0600 kernelbase: Preprocess wildcarded mask and pass it with NtQueryDirectoryFile(). --- dlls/kernel32/tests/file.c | 156 +++++++++++++++++++++++++------------------ dlls/kernelbase/file.c | 154 +++++++++++------------------------------- dlls/ntdll/tests/directory.c | 5 ++ 3 files changed, 137 insertions(+), 178 deletions(-)

1 0

Paul Gofman : ntdll: Fix test_NtQueryDirectoryFile() on Win11.
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 5b061122f38eae96d4586314b1a8df385ffc4245 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b061122f38eae96d4586314b1a8df… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 3 16:44:57 2024 -0600 ntdll: Fix test_NtQueryDirectoryFile() on Win11. --- dlls/ntdll/tests/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 0ace8097352..b2484609689 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -683,7 +683,7 @@ static void test_NtQueryDirectoryFile(void) memset( data, 0x55, data_size ); io.Status = 0xdeadbeef; io.Information = 0xdeadbeef; - status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, data_size + 16, + status = pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, data_size + 32, FileBothDirectoryInformation, FALSE, NULL, TRUE ); ok( status == STATUS_SUCCESS, "wrong status %lx\n", status ); ok( io.Status == STATUS_SUCCESS, "wrong status %lx\n", io.Status );

1 0

Paul Gofman : ntdll: Do not ignore trailing dots in match_filename().
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 31ab5ec2d7ea977e2649b8402822776c2e1540c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/31ab5ec2d7ea977e2649b840282277… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 3 16:46:51 2024 -0600 ntdll: Do not ignore trailing dots in match_filename(). --- dlls/ntdll/tests/directory.c | 10 +++------- dlls/ntdll/unix/file.c | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index b2484609689..f02a95bc391 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -453,13 +453,12 @@ static void test_NtQueryDirectoryFile(void) { const WCHAR *mask; int found[ARRAY_SIZE(testfiles)]; - BOOL todo_missing; } mask_tests[] = { - {L"*.", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1}, TRUE}, - {L"*.*", {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1}, TRUE}, - {L"*.**", {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1}, TRUE}, + {L"*.", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1}}, + {L"*.*", {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1}}, + {L"*.**", {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1}}, {L"*", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, {L"**", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, {L"??.???", {0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0}}, @@ -517,10 +516,7 @@ static void test_NtQueryDirectoryFile(void) RtlInitUnicodeString(&mask, mask_tests[i].mask); test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, FALSE, TRUE); for (j = 0; j < test_dir_count; j++) - { - todo_wine_if(mask_tests[i].todo_missing && !mask_tests[i].found[j]) ok(testfiles[j].nfound == mask_tests[i].found[j], "%S, got %d.\n", testfiles[j].name, testfiles[j].nfound); - } winetest_pop_context(); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 1cafe7aa8b7..ce3bc24c5f4 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1487,8 +1487,8 @@ static BOOLEAN match_filename( const WCHAR *name, int length, const UNICODE_STRI break; } } - while (mask < mask_end && ((*mask == '.') || (*mask == '*'))) - mask++; /* Ignore trailing '.' or '*' in mask */ + while (mask < mask_end && *mask == '*') + mask++; return (name == name_end && mask == mask_end); }

1 0

Paul Gofman : ntdll/tests: Test NtQueryDirectoryFile() masks with more files.
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 6300beb28cc5a6b4c76abe102c5bdd18b48c0d8a URL: https://gitlab.winehq.org/wine/wine/-/commit/6300beb28cc5a6b4c76abe102c5bdd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 5 16:57:02 2024 -0600 ntdll/tests: Test NtQueryDirectoryFile() masks with more files. --- dlls/ntdll/tests/directory.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index f02a95bc391..702e348b234 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -72,7 +72,14 @@ static struct testfile_s { { 0, FILE_ATTRIBUTE_NORMAL, {'e','a','.','t','m','p'}, "normal" }, { 0, FILE_ATTRIBUTE_NORMAL, {'e','a'}, "normal" }, { 0, FILE_ATTRIBUTE_DIRECTORY, {'.'}, ". directory" }, - { 0, FILE_ATTRIBUTE_DIRECTORY, {'.','.'}, ".. directory" } + { 0, FILE_ATTRIBUTE_DIRECTORY, {'.','.'}, ".. directory" }, + { 0, FILE_ATTRIBUTE_NORMAL, {'e','a','.','t','m','p','.','t','m','p'}, "normal" }, + { 0, FILE_ATTRIBUTE_NORMAL, {'.','a'}, "normal" }, + { 0, FILE_ATTRIBUTE_NORMAL, {'.','a','.','a'}, "normal" }, + { 0, FILE_ATTRIBUTE_NORMAL, {'a','.'}, "normal" }, + { 0, FILE_ATTRIBUTE_NORMAL, {'.','.','a'}, "normal" }, + { 0, FILE_ATTRIBUTE_NORMAL, {'.','a','a'}, "normal" }, + { 0, FILE_ATTRIBUTE_NORMAL, {'a','.', '.'}, "normal" }, }; static const int test_dir_count = ARRAY_SIZE(testfiles); static const int max_test_dir_size = ARRAY_SIZE(testfiles) + 5; /* size of above plus some for .. etc */ @@ -96,7 +103,8 @@ static void set_up_attribute_test(const WCHAR *testdir) if (lstrcmpW(testfiles[i].name, dotW) == 0 || lstrcmpW(testfiles[i].name, dotdotW) == 0) continue; - lstrcpyW( buf, testdir ); + lstrcpyW( buf, L"\\\\?\\" ); + lstrcatW( buf, testdir ); lstrcatW( buf, backslashW ); lstrcatW( buf, testfiles[i].name ); if (testfiles[i].attr & FILE_ATTRIBUTE_DIRECTORY) { @@ -131,7 +139,8 @@ static void tear_down_attribute_test(const WCHAR *testdir) WCHAR buf[MAX_PATH]; if (lstrcmpW(testfiles[i].name, dotW) == 0 || lstrcmpW(testfiles[i].name, dotdotW) == 0) continue; - lstrcpyW( buf, testdir ); + lstrcpyW( buf, L"\\\\?\\" ); + lstrcatW( buf, testdir ); lstrcatW( buf, backslashW ); lstrcatW( buf, testfiles[i].name ); if (testfiles[i].attr & FILE_ATTRIBUTE_DIRECTORY) { @@ -456,12 +465,12 @@ static void test_NtQueryDirectoryFile(void) } mask_tests[] = { - {L"*.", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1}}, - {L"*.*", {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1}}, - {L"*.**", {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1}}, - {L"*", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, - {L"**", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, - {L"??.???", {0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0}}, + {L"*.", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1}}, + {L"*.*", {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, + {L"*.**", {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, + {L"*", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, + {L"**", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, + {L"??.???", {0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; OBJECT_ATTRIBUTES attr;

1 0

Paul Gofman : ntdll: Ignore leading dots in hash_short_file_name().
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 0a2ebadf243d7cf53d04c1dd0cae6f22f78bdcc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a2ebadf243d7cf53d04c1dd0cae6f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 3 19:41:55 2024 -0600 ntdll: Ignore leading dots in hash_short_file_name(). --- dlls/kernel32/tests/file.c | 6 ++---- dlls/ntdll/unix/file.c | 8 ++++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 940b1441e19..dc9f67e2f03 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3063,11 +3063,9 @@ static void test_FindFirstFile_wildcards(void) {0, "* ..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, {0, " *..", ""}, {0, "..* ", ", '.', '..', '..a', '..a.a'"}, - {1, "a*.", ", '..a', '.a', '.aaa', 'a', 'aa', 'aaa', 'aaaa'"}, + {0, "a*.", ", '..a', '.a', '.aaa', 'a', 'aa', 'aaa', 'aaaa'"}, {0, "*a ", ", '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, - - /* a.a.a not found due to short name mismatch, a.a.a -> "AA6BF5~1.A on Windows. */ - {1, "*aa*", ", '.aaa', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, "*aa*", ", '.aaa', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, {1, "<.<.<", ", '..a', '..a.a', '.a..a', '.a.a', 'a..a', 'a.a.a'"}, {1, "<.<.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a..a', 'a.a', 'a.a.a', ' .a'"}, diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index ce3bc24c5f4..89fd942ea3b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1383,13 +1383,17 @@ static ULONG hash_short_file_name( const WCHAR *name, int length, LPWSTR buffer } /* Find last dot for start of the extension */ - for (p = name + 1, ext = NULL; p < end - 1; p++) if (*p == '.') ext = p; + p = name; + while (*p == '.') ++p; + for (p = p + 1, ext = NULL; p < end - 1; p++) if (*p == '.') ext = p; /* Copy first 4 chars, replacing invalid chars with '_' */ - for (i = 4, p = name, dst = buffer; i > 0; i--, p++) + for (i = 4, p = name, dst = buffer; i > 0; p++) { if (p == end || p == ext) break; + if (*p == '.') continue; *dst++ = is_invalid_dos_char(*p) ? '_' : *p; + i--; } /* Pad to 5 chars with '~' */ while (i-- >= 0) *dst++ = '~';

1 0