February 2023 - Wine-commits

Zebediah Figura : wined3d: Require fragment shader image stores and atomics to create a feature level 11.0 device.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 1fa1b9bb509a440a90451d77c5fbaf7c217a0c41 URL: https://gitlab.winehq.org/wine/wine/-/commit/1fa1b9bb509a440a90451d77c5fbaf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 19:29:23 2022 -0600 wined3d: Require fragment shader image stores and atomics to create a feature level 11.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0f0409ee462..e04b09fbbec 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2271,6 +2271,7 @@ static bool feature_level_11_supported(const struct wined3d_physical_device_info return shader_model >= 5 && info->features2.features.multiDrawIndirect && info->features2.features.drawIndirectFirstInstance + && info->features2.features.fragmentStoresAndAtomics && info->features2.features.tessellationShader; }

1 0

Zebediah Figura : wined3d: Require gather offset support to create a feature level 11.0 device.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: f236ee46dad71e4113dfc670766f1aa580d3a50d URL: https://gitlab.winehq.org/wine/wine/-/commit/f236ee46dad71e4113dfc670766f1a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 19:46:45 2022 -0600 wined3d: Require gather offset support to create a feature level 11.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index e04b09fbbec..ea5ad2e7d3a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2272,6 +2272,7 @@ static bool feature_level_11_supported(const struct wined3d_physical_device_info && info->features2.features.multiDrawIndirect && info->features2.features.drawIndirectFirstInstance && info->features2.features.fragmentStoresAndAtomics + && info->features2.features.shaderImageGatherExtended && info->features2.features.tessellationShader; }

1 0

Zebediah Figura : wined3d: Require shader clip distance support to create a feature level 10.0 device.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 75d22152a6ea6863cf15c7baaef442b501e6fa42 URL: https://gitlab.winehq.org/wine/wine/-/commit/75d22152a6ea6863cf15c7baaef442… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 20:03:39 2022 -0600 wined3d: Require shader clip distance support to create a feature level 10.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index ea5ad2e7d3a..21b1875c619 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2257,6 +2257,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->features2.features.depthClamp && info->features2.features.depthBiasClamp && info->features2.features.pipelineStatisticsQuery + && info->features2.features.shaderClipDistance && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; }

1 0

Zebediah Figura : wined3d: Require shader cull distance support to create a feature level 10.0 device.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: a0043c96708bd14c182070e0cf8033f1d1bd10e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0043c96708bd14c182070e0cf8033… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 20:03:48 2022 -0600 wined3d: Require shader cull distance support to create a feature level 10.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 21b1875c619..ce3f59d8af0 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2258,6 +2258,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->features2.features.depthBiasClamp && info->features2.features.pipelineStatisticsQuery && info->features2.features.shaderClipDistance + && info->features2.features.shaderCullDistance && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; }

1 0

Zebediah Figura : wined3d: Disable 64-bit integer support.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 26c1edf4b242f75fb6af45ec67afbde3d9587bd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/26c1edf4b242f75fb6af45ec67afbd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 20:07:35 2022 -0600 wined3d: Disable 64-bit integer support. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index ce3f59d8af0..cf8a7aec6dc 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -299,6 +299,7 @@ static void wined3d_disable_vulkan_features(struct wined3d_physical_device_info features->shaderSampledImageArrayDynamicIndexing = VK_FALSE; features->shaderStorageBufferArrayDynamicIndexing = VK_FALSE; features->shaderStorageImageArrayDynamicIndexing = VK_FALSE; + features->shaderInt64 = VK_FALSE; features->shaderInt16 = VK_FALSE; features->shaderResourceResidency = VK_FALSE; features->shaderResourceMinLod = VK_FALSE;

1 0

Rémi Bernon : ntdll: Avoid shrinking large heap block to small block.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 63fb16338c4017a80cbe49d0f5f232babb1a5f1a URL: https://gitlab.winehq.org/wine/wine/-/commit/63fb16338c4017a80cbe49d0f5f232… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 20 14:20:20 2023 +0100 ntdll: Avoid shrinking large heap block to small block. Even though this is a waste of memory it seems to trip on some UAF with some games. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54475 --- dlls/ntdll/heap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index afe38eddaa8..6688fab9690 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -2092,7 +2092,6 @@ static NTSTATUS heap_resize_large( struct heap *heap, ULONG flags, struct block SIZE_T old_block_size = large->block_size; *old_size = large->data_size; - if (block_size < HEAP_MIN_LARGE_BLOCK_SIZE / 4) return STATUS_NO_MEMORY; /* shrinking large block to small block */ if (old_block_size < block_size) return STATUS_NO_MEMORY; /* FIXME: we could remap zero-pages instead */

1 0

Rémi Bernon : msvcr80/tests: Test _dupenv_s outcome with missing env var.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: a48d470e97e158d834fba582d707b55a05706d27 URL: https://gitlab.winehq.org/wine/wine/-/commit/a48d470e97e158d834fba582d707b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 23 12:18:11 2023 +0100 msvcr80/tests: Test _dupenv_s outcome with missing env var. --- dlls/msvcr80/tests/msvcr80.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c index a2a3734f6c0..0910dc83b3d 100644 --- a/dlls/msvcr80/tests/msvcr80.c +++ b/dlls/msvcr80/tests/msvcr80.c @@ -62,6 +62,7 @@ static int (__cdecl *p__close)(int); static intptr_t (__cdecl *p__get_osfhandle)(int); static int (__cdecl *p_strcmp)(const char *, const char *); static int (__cdecl *p_strncmp)(const char *, const char *, size_t); +static int (__cdecl *p_dupenv_s)(char **, size_t *, const char *); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hcrt,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -83,6 +84,7 @@ static BOOL init(void) SET(p_strcmp, "strcmp"); SET(p_strncmp, "strncmp"); + SET(p_dupenv_s, "_dupenv_s"); return TRUE; } @@ -184,6 +186,23 @@ static void test_strcmp(void) ok( ret == 0, "wrong ret %d\n", ret ); } +static void test_dupenv_s(void) +{ + size_t len; + char *tmp; + int ret; + + len = 0xdeadbeef; + tmp = (void *)0xdeadbeef; + ret = p_dupenv_s( &tmp, &len, "nonexistent" ); + todo_wine + ok( !ret, "_dupenv_s returned %d\n", ret ); + todo_wine + ok( !len, "_dupenv_s returned length is %Id\n", len ); + todo_wine + ok( !tmp, "_dupenv_s returned pointer is %p\n", tmp ); +} + START_TEST(msvcr80) { if(!init()) @@ -191,4 +210,5 @@ START_TEST(msvcr80) test_ioinfo_flags(); test_strcmp(); + test_dupenv_s(); }

1 0

Rémi Bernon : msvcr80/tests: Test _wdupenv_s outcome with missing env var.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 6017344edb37e99a03617154bd54dc2d29a73b21 URL: https://gitlab.winehq.org/wine/wine/-/commit/6017344edb37e99a03617154bd54dc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 23 12:18:11 2023 +0100 msvcr80/tests: Test _wdupenv_s outcome with missing env var. --- dlls/msvcr80/tests/msvcr80.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c index 0910dc83b3d..34f50cd6a69 100644 --- a/dlls/msvcr80/tests/msvcr80.c +++ b/dlls/msvcr80/tests/msvcr80.c @@ -63,6 +63,7 @@ static intptr_t (__cdecl *p__get_osfhandle)(int); static int (__cdecl *p_strcmp)(const char *, const char *); static int (__cdecl *p_strncmp)(const char *, const char *, size_t); static int (__cdecl *p_dupenv_s)(char **, size_t *, const char *); +static int (__cdecl *p_wdupenv_s)(wchar_t **, size_t *, const wchar_t *); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hcrt,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -85,6 +86,7 @@ static BOOL init(void) SET(p_strcmp, "strcmp"); SET(p_strncmp, "strncmp"); SET(p_dupenv_s, "_dupenv_s"); + SET(p_wdupenv_s, "_wdupenv_s"); return TRUE; } @@ -203,6 +205,23 @@ static void test_dupenv_s(void) ok( !tmp, "_dupenv_s returned pointer is %p\n", tmp ); } +static void test_wdupenv_s(void) +{ + wchar_t *tmp; + size_t len; + int ret; + + len = 0xdeadbeef; + tmp = (void *)0xdeadbeef; + ret = p_wdupenv_s( &tmp, &len, L"nonexistent" ); + todo_wine + ok( !ret, "_wdupenv_s returned %d\n", ret ); + todo_wine + ok( !len, "_wdupenv_s returned length is %Id\n", len ); + todo_wine + ok( !tmp, "_wdupenv_s returned pointer is %p\n", tmp ); +} + START_TEST(msvcr80) { if(!init()) @@ -211,4 +230,5 @@ START_TEST(msvcr80) test_ioinfo_flags(); test_strcmp(); test_dupenv_s(); + test_wdupenv_s(); }

1 0

Rémi Bernon : msvcrt: Fix _dupenv_s behavior with missing env var.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: 5a08eab3033edf1f858776523699f333d793a8c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a08eab3033edf1f858776523699f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 23 12:20:30 2023 +0100 msvcrt: Fix _dupenv_s behavior with missing env var. --- dlls/msvcr80/tests/msvcr80.c | 3 --- dlls/msvcrt/environ.c | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c index 34f50cd6a69..961bef504b6 100644 --- a/dlls/msvcr80/tests/msvcr80.c +++ b/dlls/msvcr80/tests/msvcr80.c @@ -197,11 +197,8 @@ static void test_dupenv_s(void) len = 0xdeadbeef; tmp = (void *)0xdeadbeef; ret = p_dupenv_s( &tmp, &len, "nonexistent" ); - todo_wine ok( !ret, "_dupenv_s returned %d\n", ret ); - todo_wine ok( !len, "_dupenv_s returned length is %Id\n", len ); - todo_wine ok( !tmp, "_dupenv_s returned pointer is %p\n", tmp ); } diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 729eb0560bd..e9c15b732ba 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -249,7 +249,12 @@ int CDECL _dupenv_s(char **buffer, size_t *numberOfElements, const char *varname if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; - if (!(e = getenv(varname))) return *_errno() = EINVAL; + if (!(e = getenv(varname))) + { + *buffer = NULL; + if (numberOfElements) *numberOfElements = 0; + return 0; + } sz = strlen(e) + 1; if (!(*buffer = malloc(sz)))

1 0

Rémi Bernon : msvcrt: Fix _wdupenv_s behavior with missing env var.
by Alexandre Julliard 23 Feb '23

23 Feb '23

Module: wine Branch: master Commit: aafef01cc2a0c49ed902e63edac6da4b0278e53f URL: https://gitlab.winehq.org/wine/wine/-/commit/aafef01cc2a0c49ed902e63edac6da… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 23 12:21:03 2023 +0100 msvcrt: Fix _wdupenv_s behavior with missing env var. --- dlls/msvcr80/tests/msvcr80.c | 3 --- dlls/msvcrt/environ.c | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c index 961bef504b6..fa04b024031 100644 --- a/dlls/msvcr80/tests/msvcr80.c +++ b/dlls/msvcr80/tests/msvcr80.c @@ -211,11 +211,8 @@ static void test_wdupenv_s(void) len = 0xdeadbeef; tmp = (void *)0xdeadbeef; ret = p_wdupenv_s( &tmp, &len, L"nonexistent" ); - todo_wine ok( !ret, "_wdupenv_s returned %d\n", ret ); - todo_wine ok( !len, "_wdupenv_s returned length is %Id\n", len ); - todo_wine ok( !tmp, "_wdupenv_s returned pointer is %p\n", tmp ); } diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index e9c15b732ba..2c2a3353582 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -279,7 +279,12 @@ int CDECL _wdupenv_s(wchar_t **buffer, size_t *numberOfElements, if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; - if (!(e = _wgetenv(varname))) return *_errno() = EINVAL; + if (!(e = _wgetenv(varname))) + { + *buffer = NULL; + if (numberOfElements) *numberOfElements = 0; + return 0; + } sz = wcslen(e) + 1; if (!(*buffer = malloc(sz * sizeof(wchar_t))))

1 0