November 2023 - Wine-commits

Henri Verbeet : vkd3d-shader: Implement scanning combined resource/sampler information.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: vkd3d Branch: master Commit: 9de793f180a5f890d1e484ffba35bbda946e6db0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9de793f180a5f890d1e484ffba35b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 15 01:26:32 2023 +0200 vkd3d-shader: Implement scanning combined resource/sampler information. --- include/vkd3d_shader.h | 67 ++++++++++++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 160 +++++++++++++++++++++++++++++++++- tests/vkd3d_shader_api.c | 127 +++++++++++++++++++++++++++ 4 files changed, 354 insertions(+), 1 deletion(-)

1 0

Alex Henrie : user32/tests: Allocate clipboard data with HeapAlloc.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: 88e66d0785dbc80bb49834676ef00a71963d0e4f URL: https://gitlab.winehq.org/wine/wine/-/commit/88e66d0785dbc80bb49834676ef00a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 11 14:40:00 2023 -0700 user32/tests: Allocate clipboard data with HeapAlloc. This partially reverts commit faae2162b89e951a94f74f65986f6a1015366cf3. --- dlls/user32/tests/clipboard.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 819188fa8e3..87df06b6621 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1531,10 +1531,10 @@ static void test_handles( HWND hwnd ) if (0) /* crashes on vista64 */ { - ptr = malloc( sizeof(void *) ); + ptr = HeapAlloc( GetProcessHeap(), 0, 0 ); h = SetClipboardData( format_id2, ptr ); ok( !h, "got %p\n", h ); - free( ptr ); + HeapFree( GetProcessHeap(), 0, ptr ); } h = SetClipboardData( format_id2, empty_fixed ); @@ -1547,12 +1547,12 @@ static void test_handles( HWND hwnd ) ok( h == hmoveable, "got %p\n", h ); ok( is_moveable( h ), "expected moveable mem %p\n", h ); - ptr = malloc( 37 ); + ptr = HeapAlloc( GetProcessHeap(), 0, 37 ); h = SetClipboardData( 0xdeadfade, ptr ); ok( h == ptr || !h, "got %p\n", h ); if (!h) /* heap blocks are rejected on >= win8 */ { - free( ptr ); + HeapFree( GetProcessHeap(), 0, ptr ); ptr = NULL; }

1 0

Henri Verbeet : vkd3d-shader/ir: Introduce vsir_register_is_descriptor().
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: vkd3d Branch: master Commit: 215a2c4edec192c5fe1a409605da483b3ab9d8c8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/215a2c4edec192c5fe1a409605da4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 11 18:48:12 2023 +0100 vkd3d-shader/ir: Introduce vsir_register_is_descriptor(). --- libs/vkd3d-shader/spirv.c | 17 +---------------- libs/vkd3d-shader/tpf.c | 17 +---------------- libs/vkd3d-shader/vkd3d_shader_private.h | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d2621ffa..19f56a3a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3396,21 +3396,6 @@ static bool spirv_compiler_get_register_info(const struct spirv_compiler *compil return true; } -static bool register_is_descriptor(const struct vkd3d_shader_register *reg) -{ - switch (reg->type) - { - case VKD3DSPR_SAMPLER: - case VKD3DSPR_RESOURCE: - case VKD3DSPR_CONSTBUFFER: - case VKD3DSPR_UAV: - return true; - - default: - return false; - } -} - static bool spirv_compiler_enable_descriptor_indexing(struct spirv_compiler *compiler, enum vkd3d_shader_register_type reg_type, enum vkd3d_shader_resource_type resource_type) { @@ -3536,7 +3521,7 @@ static void spirv_compiler_emit_dereference_register(struct spirv_compiler *comp FIXME("Relative addressing not implemented.\n"); /* Handle arrayed registers, e.g. v[3][0]. */ - if (reg->idx_count > 1 && !register_is_descriptor(reg)) + if (reg->idx_count > 1 && !vsir_register_is_descriptor(reg)) indexes[index_count++] = spirv_compiler_emit_register_addressing(compiler, &reg->idx[0]); } diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index d0d2ea82..60fa3b98 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -1751,21 +1751,6 @@ static bool shader_sm4_read_reg_idx(struct vkd3d_shader_sm4_parser *priv, const return true; } -static bool sm4_register_is_descriptor(enum vkd3d_sm4_register_type register_type) -{ - switch (register_type) - { - case VKD3D_SM4_RT_SAMPLER: - case VKD3D_SM4_RT_RESOURCE: - case VKD3D_SM4_RT_CONSTBUFFER: - case VKD3D_SM5_RT_UAV: - return true; - - default: - return false; - } -} - static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_register *param, enum vkd3d_shader_src_modifier *modifier) { @@ -1943,7 +1928,7 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui break; } } - else if (!shader_is_sm_5_1(priv) && sm4_register_is_descriptor(register_type)) + else if (!shader_is_sm_5_1(priv) && vsir_register_is_descriptor(param)) { /* SM5.1 places a symbol identifier in idx[0] and moves * other values up one slot. Normalize to SM5.1. */ diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e5d59063..bff49453 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -833,6 +833,21 @@ struct vkd3d_shader_register void vsir_register_init(struct vkd3d_shader_register *reg, enum vkd3d_shader_register_type reg_type, enum vkd3d_data_type data_type, unsigned int idx_count); +static inline bool vsir_register_is_descriptor(const struct vkd3d_shader_register *reg) +{ + switch (reg->type) + { + case VKD3DSPR_SAMPLER: + case VKD3DSPR_RESOURCE: + case VKD3DSPR_CONSTBUFFER: + case VKD3DSPR_UAV: + return true; + + default: + return false; + } +} + struct vkd3d_shader_dst_param { struct vkd3d_shader_register reg;

1 0

Zebediah Figura : wined3d: Invalidate all sampler slots to which a texture is bound in texture_resource_unload().
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: 17542e9f5254e2475f356a7b7ede31eefad06fa7 URL: https://gitlab.winehq.org/wine/wine/-/commit/17542e9f5254e2475f356a7b7ede31… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 9 18:55:26 2023 -0600 wined3d: Invalidate all sampler slots to which a texture is bound in texture_resource_unload(). --- dlls/wined3d/texture.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1f4c4b80d3c..3dfecc949d1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3509,6 +3509,7 @@ static void texture_resource_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = texture_from_resource(resource); struct wined3d_device *device = resource->device; + const struct wined3d_state *state = &device->cs->state; unsigned int location = resource->map_binding; struct wined3d_context *context; unsigned int sub_count, i; @@ -3553,8 +3554,13 @@ static void texture_resource_unload(struct wined3d_resource *resource) context_release(context); wined3d_texture_force_reload(texture); - if (texture->resource.bind_count) - device_invalidate_state(device, STATE_SAMPLER(texture->sampler)); + + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + { + if (state->textures[i] == texture) + device_invalidate_state(device, STATE_SAMPLER(i)); + } + wined3d_texture_set_dirty(texture); resource_unload(&texture->resource);

1 0

Zebediah Figura : wined3d: Remove the no longer used "sampler" field of struct wined3d_texture.
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: b186455cfad2ecd041da231af354f0f9a4a841cd URL: https://gitlab.winehq.org/wine/wine/-/commit/b186455cfad2ecd041da231af354f0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 9 18:55:52 2023 -0600 wined3d: Remove the no longer used "sampler" field of struct wined3d_texture. --- dlls/wined3d/cs.c | 21 ++------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 96207bcc525..6822f467276 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1498,8 +1498,7 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) if (op->texture) { - if (InterlockedIncrement(&op->texture->resource.bind_count) == 1) - op->texture->sampler = op->stage; + InterlockedIncrement(&op->texture->resource.bind_count); if (texture_binding_might_invalidate_ps(op->texture, prev, d3d_info)) device_invalidate_state(cs->c.device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); @@ -1519,23 +1518,7 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) if (prev) { - if (InterlockedDecrement(&prev->resource.bind_count) && prev->sampler == op->stage) - { - unsigned int i; - - /* Search for other stages the texture is bound to. Shouldn't - * happen if applications bind textures to a single stage only. */ - TRACE("Searching for other stages the texture is bound to.\n"); - for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) - { - if (cs->state.textures[i] == prev) - { - TRACE("Texture is also bound to stage %u.\n", i); - prev->sampler = i; - break; - } - } - } + InterlockedDecrement(&prev->resource.bind_count); if (!op->texture && op->stage < d3d_info->ffp_fragment_caps.max_blend_stages) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 10b9d3c3a73..4f7cacda858 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3329,7 +3329,6 @@ struct wined3d_texture unsigned int sysmem_count; float pow2_matrix[16]; unsigned int lod; - DWORD sampler; uint32_t flags; DWORD update_map_binding;

1 0

Zebediah Figura : wined3d: Do not use atomics to update the resource bind count.
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: d2992dba93b8c3a991ede44d624cce01fc49c166 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2992dba93b8c3a991ede44d624cce… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 1 19:41:54 2023 -0500 wined3d: Do not use atomics to update the resource bind count. It is only accessed from the CS thread now. --- dlls/wined3d/cs.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6822f467276..00fc9aa0b45 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1328,9 +1328,9 @@ static void wined3d_cs_exec_set_stream_sources(struct wined3d_cs *cs, const void struct wined3d_buffer *buffer = op->streams[i].buffer; if (buffer) - InterlockedIncrement(&buffer->resource.bind_count); + ++buffer->resource.bind_count; if (prev) - InterlockedDecrement(&prev->resource.bind_count); + --prev->resource.bind_count; } memcpy(&cs->state.streams[op->start_idx], op->streams, op->count * sizeof(*op->streams)); @@ -1363,9 +1363,9 @@ static void wined3d_cs_exec_set_stream_outputs(struct wined3d_cs *cs, const void struct wined3d_buffer *buffer = op->outputs[i].buffer; if (buffer) - InterlockedIncrement(&buffer->resource.bind_count); + ++buffer->resource.bind_count; if (prev) - InterlockedDecrement(&prev->resource.bind_count); + --prev->resource.bind_count; } memcpy(cs->state.stream_output, op->outputs, sizeof(op->outputs)); @@ -1395,9 +1395,9 @@ static void wined3d_cs_exec_set_index_buffer(struct wined3d_cs *cs, const void * cs->state.index_offset = op->offset; if (op->buffer) - InterlockedIncrement(&op->buffer->resource.bind_count); + ++op->buffer->resource.bind_count; if (prev) - InterlockedDecrement(&prev->resource.bind_count); + --prev->resource.bind_count; device_invalidate_state(cs->c.device, STATE_INDEXBUFFER); } @@ -1429,9 +1429,9 @@ static void wined3d_cs_exec_set_constant_buffers(struct wined3d_cs *cs, const vo cs->state.cb[op->type][op->start_idx + i] = op->buffers[i]; if (buffer) - InterlockedIncrement(&buffer->resource.bind_count); + ++buffer->resource.bind_count; if (prev) - InterlockedDecrement(&prev->resource.bind_count); + --prev->resource.bind_count; } device_invalidate_state(cs->c.device, STATE_CONSTANT_BUFFER(op->type)); @@ -1498,7 +1498,7 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) if (op->texture) { - InterlockedIncrement(&op->texture->resource.bind_count); + ++op->texture->resource.bind_count; if (texture_binding_might_invalidate_ps(op->texture, prev, d3d_info)) device_invalidate_state(cs->c.device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); @@ -1518,7 +1518,7 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) if (prev) { - InterlockedDecrement(&prev->resource.bind_count); + --prev->resource.bind_count; if (!op->texture && op->stage < d3d_info->ffp_fragment_caps.max_blend_stages) { @@ -1565,9 +1565,9 @@ static void wined3d_cs_exec_set_shader_resource_views(struct wined3d_cs *cs, con cs->state.shader_resource_view[op->type][op->start_idx + i] = view; if (view) - InterlockedIncrement(&view->resource->bind_count); + ++view->resource->bind_count; if (prev) - InterlockedDecrement(&prev->resource->bind_count); + --prev->resource->bind_count; } if (op->type != WINED3D_SHADER_TYPE_COMPUTE) @@ -1607,9 +1607,9 @@ static void wined3d_cs_exec_set_unordered_access_views(struct wined3d_cs *cs, co cs->state.unordered_access_view[op->pipeline][op->start_idx + i] = view; if (view) - InterlockedIncrement(&view->resource->bind_count); + ++view->resource->bind_count; if (prev) - InterlockedDecrement(&prev->resource->bind_count); + --prev->resource->bind_count; if (view && initial_count != ~0u) wined3d_unordered_access_view_set_counter(view, initial_count);

1 0

Eric Pouech : msvcrt/tests: Improve environment tests (initial conditions).
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: b6d4be61eb1fc9f3f654dcc6e613d6cd7d1dd1b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6d4be61eb1fc9f3f654dcc6e613d6… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Nov 10 09:13:28 2023 +0100 msvcrt/tests: Improve environment tests (initial conditions). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/tests/environ.c | 150 ++++++++++++++++++++++++-------------------- 1 file changed, 82 insertions(+), 68 deletions(-) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 22f697a12ea..74add49e010 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -46,6 +46,8 @@ static const char *a_very_long_env_string = static char ***(__cdecl *p__p__environ)(void); static WCHAR ***(__cdecl *p__p__wenviron)(void); +static char ***(__cdecl *p__p___initenv)(void); +static wchar_t ***(__cdecl *p__p___winitenv)(void); static void (__cdecl *p_get_environ)(char ***); static void (__cdecl *p_get_wenviron)(WCHAR ***); static errno_t (__cdecl *p_putenv_s)(const char*, const char*); @@ -61,6 +63,8 @@ static void init(void) p__p__environ = (void *)GetProcAddress(hmod, "__p__environ"); p__p__wenviron = (void *)GetProcAddress(hmod, "__p__wenviron"); + p__p___initenv = (void *)GetProcAddress(hmod, "__p___initenv"); + p__p___winitenv = (void *)GetProcAddress(hmod, "__p___winitenv"); p_environ = (void *)GetProcAddress(hmod, "_environ"); p_wenviron = (void *)GetProcAddress(hmod, "_wenviron"); p_get_environ = (void *)GetProcAddress(hmod, "_get_environ"); @@ -79,21 +83,32 @@ static void test_system(void) ok(ret == 0, "Expected system to return 0, got %d\n", ret); } +static wchar_t *env_get_valueW( wchar_t **envp, const wchar_t *var ) +{ + unsigned i; + size_t len = wcslen( var ); + + if (!envp) return NULL; + for (i = 0; envp[i] != NULL; i++) + { + wchar_t *ptr; + + if (!(ptr = wcschr( envp[i], L'=' ))) continue; + + if (ptr - envp[i] == len && !memcmp( envp[i], var, len * sizeof(wchar_t) )) + return ptr + 1; + } + return NULL; +} + static void test__environ(void) { int argc; - char **argv, **envp = NULL; - int i, mode = 0; + char **argv, **envp = NULL, **initenv = NULL; + int mode = 0; ok( p_environ != NULL, "Expected the pointer to _environ to be non-NULL\n" ); - if (p_environ) - ok( *p_environ != NULL, "Expected _environ to be initialized on startup\n" ); - - if (!p_environ || !*p_environ) - { - skip( "_environ pointers are not valid\n" ); - return; - } + ok( *p_environ != NULL, "Expected _environ to be initialized on startup\n" ); if (sizeof(void*) != sizeof(int)) ok( !p__p__environ, "__p__environ() should be 32-bit only\n"); @@ -110,32 +125,38 @@ static void test__environ(void) else win_skip( "_get_environ() is not available\n" ); + if (p__p___initenv) + { + initenv = *p__p___initenv(); + + todo_wine + ok( initenv == *p_environ, + "Expected _environ to be equal to initial env\n" ); + } + else + skip( "__p___initenv() is not available\n" ); + /* Note that msvcrt from Windows versions older than Vista * expects the mode pointer parameter to be valid.*/ __getmainargs(&argc, &argv, &envp, 0, &mode); - ok( envp != NULL, "Expected initial environment block pointer to be non-NULL\n" ); - if (!envp) - { - skip( "Initial environment block pointer is not valid\n" ); - return; - } + ok( envp != NULL, + "Expected initial environment block pointer to be non-NULL\n" ); + todo_wine + ok( envp == *p_environ, + "Expected initial environment to be equal to _environ\n" ); - for (i = 0; ; i++) + ok( _putenv("cat=dog") == 0, "failed setting cat=dog\n" ); + if (p__p___initenv) { - if ((*p_environ)[i]) - { - ok( envp[i] != NULL, "Expected environment block pointer element to be non-NULL\n" ); - ok( !strcmp((*p_environ)[i], envp[i]), - "Expected _environ and environment block pointer strings (%s vs. %s) to match\n", - (*p_environ)[i], envp[i] ); - } - else - { - ok( !envp[i], "Expected environment block pointer element to be NULL, got %p\n", envp[i] ); - break; - } + char **retptr = *p__p___initenv(); + + ok( retptr != *p_environ, + "Expected _environ[] not to be equal to initial env\n" ); + ok( retptr == initenv, + "Unexpected modification of initial env\n" ); } + ok( _putenv("cat=") == 0, "failed setting cat=\n" ); } static void test__wenviron(void) @@ -143,36 +164,38 @@ static void test__wenviron(void) int argc; char **argv, **envp = NULL; WCHAR **wargv, **wenvp = NULL; - int i, mode = 0; + int mode = 0; ok( p_wenviron != NULL, "Expected the pointer to _wenviron to be non-NULL\n" ); - if (p_wenviron) - ok( *p_wenviron == NULL, "Expected _wenviron to be NULL, got %p\n", *p_wenviron ); - else - { - win_skip( "Pointer to _wenviron is not valid\n" ); - return; - } + ok( !*p_wenviron, "Expected _wenviron[] to be NULL, got %p\n", *p_wenviron ); if (sizeof(void*) != sizeof(int)) ok( !p__p__wenviron, "__p__wenviron() should be 32-bit only\n"); else - ok( *p__p__wenviron() == NULL, "Expected _wenviron pointers to be NULL\n" ); + ok( !*p__p__wenviron(), "Expected _wenviron to be NULL, got %p\n", *p_wenviron ); if (p_get_wenviron) { WCHAR **retptr; p_get_wenviron(&retptr); - ok( retptr == NULL, - "Expected _wenviron pointers to be NULL\n" ); + ok( retptr == *p_wenviron, "Expected _wenviron pointers to be NULL\n" ); } else win_skip( "_get_wenviron() is not available\n" ); + if (p__p___winitenv) + { + wchar_t ***retptr = p__p___winitenv(); + todo_wine + ok( !*retptr, "Expected initial env to be NULL\n" ); + } + else + skip( "__p___winitenv() is not available\n" ); + /* __getmainargs doesn't initialize _wenviron. */ __getmainargs(&argc, &argv, &envp, 0, &mode); - ok( *p_wenviron == NULL, "Expected _wenviron to be NULL, got %p\n", *p_wenviron); + ok( !*p_wenviron, "Expected _wenviron to be NULL\n"); ok( envp != NULL, "Expected initial environment block pointer to be non-NULL\n" ); if (!envp) { @@ -182,24 +205,33 @@ static void test__wenviron(void) /* Neither does calling the non-Unicode environment manipulation functions. */ ok( _putenv("cat=dog") == 0, "failed setting cat=dog\n" ); - ok( *p_wenviron == NULL, "Expected _wenviron to be NULL, got %p\n", *p_wenviron); - ok( _putenv("cat=") == 0, "failed deleting cat\n" ); + ok( !*p_wenviron, "Expected _wenviron to be NULL\n" ); /* _wenviron isn't initialized until __wgetmainargs is called or * one of the Unicode environment manipulation functions is called. */ - ok( _wputenv(L"cat=dog") == 0, "failed setting cat=dog\n" ); + ok( _wputenv(L"cat=dog2") == 0, "failed setting cat=dog2\n" ); ok( *p_wenviron != NULL, "Expected _wenviron to be non-NULL\n" ); - ok( _wputenv(L"cat=") == 0, "failed deleting cat\n" ); __wgetmainargs(&argc, &wargv, &wenvp, 0, &mode); - - ok( *p_wenviron != NULL, "Expected _wenviron to be non-NULL\n" ); ok( wenvp != NULL, "Expected initial environment block pointer to be non-NULL\n" ); - if (!wenvp) + todo_wine + ok( wenvp == *p_wenviron, "Expected initial environment to be _wenviron[]\n" ); + + if (p__p___winitenv) { - skip( "Initial environment block pointer is not valid\n" ); - return; + wchar_t ***retptr = p__p___winitenv(); + wchar_t *value; + + ok( *retptr != NULL, "Expected *__p___winitenv() to be NULL\n" ); + ok( *retptr != *p_wenviron, + "Expected _wenviron to be different from __p___winitenv() %p %p\n", *retptr, *p_wenviron ); + /* test that w-initial env is derived from current _environ[] and not from ansi initial env */ + value = env_get_valueW( *retptr, L"cat" ); + todo_wine + ok( value && !wcscmp( value, L"dog" ), + "Expecting initial env to be derived from current env (got %ls)\n", value ); } + _putenv("cat="); /* Examine the returned pointer from __p__wenviron(), * if available, after _wenviron is initialized. */ @@ -216,22 +248,6 @@ static void test__wenviron(void) ok( retptr == *p_wenviron, "Expected _wenviron pointers to be identical\n" ); } - - for (i = 0; ; i++) - { - if ((*p_wenviron)[i]) - { - ok( wenvp[i] != NULL, "Expected environment block pointer element to be non-NULL\n" ); - ok( !wcscmp((*p_wenviron)[i], wenvp[i]), - "Expected _wenviron and environment block pointer strings (%s vs. %s) to match\n", - wine_dbgstr_w((*p_wenviron)[i]), wine_dbgstr_w(wenvp[i]) ); - } - else - { - ok( !wenvp[i], "Expected environment block pointer element to be NULL, got %p\n", wenvp[i] ); - break; - } - } } static void test_environment_manipulation(void) @@ -312,8 +328,6 @@ START_TEST(environ) { init(); - /* The environ tests should always be run first, as they assume - * that the process has not manipulated the environment. */ test__environ(); test__wenviron(); test_environment_manipulation();

1 0

Eric Pouech : msvcrt/tests: Add tests about allocation of environment entries.
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: 8b50afed2701a3555aff786ad127bdc7dba6b7c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b50afed2701a3555aff786ad127bd… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Nov 10 09:13:28 2023 +0100 msvcrt/tests: Add tests about allocation of environment entries. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/tests/environ.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 74add49e010..eeee2c8f77d 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -83,6 +83,15 @@ static void test_system(void) ok(ret == 0, "Expected system to return 0, got %d\n", ret); } +static unsigned env_get_entry_countA( char **env ) +{ + unsigned count; + + if (!env) return 0; + for (count = 0; env[count] != NULL; count++) {} + return count; +} + static wchar_t *env_get_valueW( wchar_t **envp, const wchar_t *var ) { unsigned i; @@ -255,6 +264,9 @@ static void test_environment_manipulation(void) char buf[256]; errno_t ret; size_t len; + unsigned count; + char* first; + char* second; ok( _putenv("cat=") == 0, "_putenv failed on deletion of nonexistent environment variable\n" ); ok( _putenv("cat=dog") == 0, "failed setting cat=dog\n" ); @@ -322,6 +334,38 @@ static void test_environment_manipulation(void) ok( !buf[0], "buf = %s\n", buf); ok( errno == 0xdeadbeef, "errno = %d\n", errno); } + + /* test stability of _environ[] pointers */ + ok( _putenv( "__winetest_cat=" ) == 0, "Couldn't reset env var\n" ); + ok( _putenv( "__winetest_dog=" ) == 0, "Couldn't reset env var\n" ); + count = env_get_entry_countA( *p_environ ); + ok( _putenv( "__winetest_cat=mew") == 0, "Couldn't set env var\n" ); + ok( !strcmp( (*p_environ)[count], "__winetest_cat=mew"), "Unexpected env var value\n" ); + first = (*p_environ)[count]; + ok( getenv("__winetest_cat") == strchr( (*p_environ)[count], '=') + 1, "Expected getenv() to return pointer inside _environ[] entry\n" ); + ok( _putenv( "__winetest_dog=bark" ) == 0, "Couldn't set env var\n" ); + ok( !strcmp( (*p_environ)[count + 1], "__winetest_dog=bark" ), "Unexpected env var value\n" ); + ok( getenv( "__winetest_dog" ) == strchr( (*p_environ)[count + 1], '=' ) + 1, "Expected getenv() to return pointer inside _environ[] entry\n" ); + todo_wine + ok( first == (*p_environ)[count], "Expected stability of _environ[count] pointer\n" ); + second = (*p_environ)[count + 1]; + ok( count + 2 == env_get_entry_countA( *p_environ ), "Unexpected count\n" ); + + ok( _putenv( "__winetest_cat=purr" ) == 0, "Couldn't set env var\n" ); + ok( !strcmp( (*p_environ)[count], "__winetest_cat=purr" ), "Unexpected env var value\n" ); + ok( getenv( "__winetest_cat" ) == strchr( (*p_environ)[count], '=' ) + 1, "Expected getenv() to return pointer inside _environ[] entry\n" ); + todo_wine + ok( second == (*p_environ)[count + 1], "Expected stability of _environ[count] pointer\n" ); + ok( !strcmp( (*p_environ)[count + 1], "__winetest_dog=bark" ), "Couldn't get env var value\n" ); + ok( getenv( "__winetest_dog" ) == strchr( (*p_environ)[count + 1], '=' ) + 1, "Expected getenv() to return pointer inside _environ[] entry\n" ); + ok( count + 2 == env_get_entry_countA( *p_environ ), "Unexpected count\n" ); + ok( _putenv( "__winetest_cat=" ) == 0, "Couldn't reset env vat\n" ); + todo_wine + ok( second == (*p_environ)[count], "Expected _environ[count] to be second\n" ); + ok( !strcmp( (*p_environ)[count], "__winetest_dog=bark" ), "Unexpected env var value\n" ); + ok( count + 1 == env_get_entry_countA( *p_environ ), "Unexpected count\n" ); + ok( _putenv( "__winetest_dog=" ) == 0, "Couldn't reset env var\n" ); + ok( count == env_get_entry_countA( *p_environ ), "Unexpected count\n" ); } START_TEST(environ)

1 0

Eric Pouech : msvcrt/tests: Add tests about intricating kernel32 and msvcrt env calls.
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: a5d7cc47edb6c76be9ba1c6f94c5c1ef8b1076f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5d7cc47edb6c76be9ba1c6f94c5c1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Nov 10 09:13:28 2023 +0100 msvcrt/tests: Add tests about intricating kernel32 and msvcrt env calls. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/tests/environ.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index eeee2c8f77d..15e75a2caaf 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -366,6 +366,15 @@ static void test_environment_manipulation(void) ok( count + 1 == env_get_entry_countA( *p_environ ), "Unexpected count\n" ); ok( _putenv( "__winetest_dog=" ) == 0, "Couldn't reset env var\n" ); ok( count == env_get_entry_countA( *p_environ ), "Unexpected count\n" ); + + /* in putenv, only changed variable is updated (no other reload of kernel info is done) */ + ret = SetEnvironmentVariableA( "__winetest_cat", "meow" ); + ok( ret, "SetEnvironmentVariableA failed: %lu\n", GetLastError() ); + ok( _putenv( "__winetest_dog=bark" ) == 0, "Couldn't set env var\n" ); + todo_wine + ok( getenv( "__winetest_cat" ) == NULL, "msvcrt env cache shouldn't have been updated\n" ); + ok( _putenv( "__winetest_cat=" ) == 0, "Couldn't reset env var\n" ); + ok( _putenv( "__winetest_dog=" ) == 0, "Couldn't reset env var\n" ); } START_TEST(environ)

1 0

Eric Pouech : msvcrt/tests: Test adding Unicode env variables.
by Alexandre Julliard 10 Nov '23

10 Nov '23

Module: wine Branch: master Commit: 740e5ac781b4ab405a8ae2f76392a298d7ba0dfe URL: https://gitlab.winehq.org/wine/wine/-/commit/740e5ac781b4ab405a8ae2f76392a2… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Nov 10 09:13:28 2023 +0100 msvcrt/tests: Test adding Unicode env variables. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/tests/environ.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 15e75a2caaf..a3d3156c01a 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -22,6 +22,7 @@ #include <errno.h> #include <stdlib.h> #include <process.h> +#include <winnls.h> static const char *a_very_long_env_string = "LIBRARY_PATH=" @@ -375,6 +376,23 @@ static void test_environment_manipulation(void) ok( getenv( "__winetest_cat" ) == NULL, "msvcrt env cache shouldn't have been updated\n" ); ok( _putenv( "__winetest_cat=" ) == 0, "Couldn't reset env var\n" ); ok( _putenv( "__winetest_dog=" ) == 0, "Couldn't reset env var\n" ); + + /* test setting unicode bits */ + count = env_get_entry_countA( *p_environ ); + ret = WideCharToMultiByte( CP_ACP, 0, L"\u263a", -1, buf, ARRAY_SIZE(buf), 0, 0 ); + ok( ret, "WideCharToMultiByte failed: %lu\n", GetLastError() ); + ok( _wputenv( L"__winetest_cat=\u263a" ) == 0, "Couldn't set env var\n" ); + ok( _wgetenv( L"__winetest_cat" ) && !wcscmp( _wgetenv( L"__winetest_cat" ), L"\u263a" ), "Couldn't retrieve env var\n" ); + ok( getenv( "__winetest_cat" ) && !strcmp( getenv( "__winetest_cat" ), buf ), "Couldn't retrieve env var\n" ); + ok( _wputenv( L"__winetest_cat=" ) == 0, "Couldn't reset env var\n" ); + + ret = WideCharToMultiByte( CP_ACP, 0, L"__winetest_\u263a", -1, buf, ARRAY_SIZE(buf), 0, 0 ); + ok( ret, "WideCharToMultiByte failed: %lu\n", GetLastError() ); + ok( _wputenv( L"__winetest_\u263a=bark" ) == 0, "Couldn't set env var\n" ); + ok( _wgetenv( L"__winetest_\u263a" ) && !wcscmp( _wgetenv( L"__winetest_\u263a" ), L"bark"), "Couldn't retrieve env var\n" ); + ok( getenv( buf ) && !strcmp( getenv( buf ), "bark"), "Couldn't retrieve env var %s\n", wine_dbgstr_a(buf) ); + ok( _wputenv( L"__winetest_\u263a=" ) == 0, "Couldn't reset env var\n" ); + ok( count == env_get_entry_countA( *p_environ ), "Unexpected modification of _environ[]\n" ); } START_TEST(environ)

1 0