December 2022 - Wine-Commits

Zebediah Figura : wined3d: Require pipeline statistics queries to create a feature level 10.0 device.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: a25ae51c1462eb2219f28d184a0d5838109da572 URL: https://gitlab.winehq.org/wine/wine/-/commit/a25ae51c1462eb2219f28d184a0d58… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 19:11:26 2022 -0600 wined3d: Require pipeline statistics queries 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 a7b2ff76e28..12bef2fba51 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2265,6 +2265,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->features2.features.geometryShader && info->features2.features.depthClamp && info->features2.features.depthBiasClamp + && info->features2.features.pipelineStatisticsQuery && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; }

1 0

Zebediah Figura : wined3d: Require vertex pipeline image stores and atomics to create a feature level 11.1 device.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: ec62575e9d99fc35752760cc37ded207febdfd11 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec62575e9d99fc35752760cc37ded2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 19:19:40 2022 -0600 wined3d: Require vertex pipeline image stores and atomics to create a feature level 11.1 device. --- dlls/wined3d/adapter_vk.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 12bef2fba51..713aaec9e39 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2283,6 +2283,11 @@ static bool feature_level_11_supported(const struct wined3d_physical_device_info && info->features2.features.tessellationShader; } +static bool feature_level_11_1_supported(const struct wined3d_physical_device_info *info) +{ + return info->features2.features.vertexPipelineStoresAndAtomics; +} + static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_physical_device_info *info, const struct shader_caps *shader_caps) { @@ -2314,6 +2319,9 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p if (!feature_level_11_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_10_1; + if (!feature_level_11_1_supported(info)) + return WINED3D_FEATURE_LEVEL_11; + return WINED3D_FEATURE_LEVEL_11_1; }

1 0

Zebediah Figura : wined3d: Require depth bias clamp to create a feature level 10.0 device.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 80771f1c4bfe2d864e32b93a6c5e4d748879dc2d URL: https://gitlab.winehq.org/wine/wine/-/commit/80771f1c4bfe2d864e32b93a6c5e4d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 18:40:08 2022 -0600 wined3d: Require depth bias clamp 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 d38882ff5ab..e5a9e80decb 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.multiViewport && info->features2.features.geometryShader && info->features2.features.depthClamp + && info->features2.features.depthBiasClamp && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; }

1 0

Zebediah Figura : wined3d: Require precise occlusion queries to create a feature level 9.2 device.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: c20b8da9e3ee086ad4ead4bb2c341565b49c0659 URL: https://gitlab.winehq.org/wine/wine/-/commit/c20b8da9e3ee086ad4ead4bb2c3415… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 19:09:11 2022 -0600 wined3d: Require precise occlusion queries to create a feature level 9.2 device. --- dlls/wined3d/adapter_vk.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 03f7b4bfb5f..a7b2ff76e28 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2247,6 +2247,11 @@ static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, adapter_vk->a.d3d_info.feature_level, vram_bytes, sysmem_bytes); } +static bool feature_level_9_2_supported(const struct wined3d_physical_device_info *info) +{ + return info->features2.features.occlusionQueryPrecise; +} + static bool feature_level_9_3_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) { return shader_model >= 3 @@ -2293,6 +2298,9 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p if (shader_model <= 1) return WINED3D_FEATURE_LEVEL_8; + if (!feature_level_9_2_supported(info)) + return WINED3D_FEATURE_LEVEL_9_1; + if (!feature_level_9_3_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_9_2;

1 0

Zebediah Figura : wined3d: Disable wide line support.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: d6666cd02deea49badbd1c32aa0b61b2b270027b URL: https://gitlab.winehq.org/wine/wine/-/commit/d6666cd02deea49badbd1c32aa0b61… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 18:45:37 2022 -0600 wined3d: Disable wide line 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 e5a9e80decb..03f7b4bfb5f 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 VkPhysicalDeviceFeatures *features = &info->features2.features; features->depthBounds = VK_FALSE; + features->wideLines = VK_FALSE; features->alphaToOne = VK_FALSE; features->textureCompressionETC2 = VK_FALSE; features->textureCompressionASTC_LDR = VK_FALSE;

1 0

Alexandre Julliard : oleaut32: Fix A<->W conversion when storing names in typelibs.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 680d17b453ad651ecb12be5d12a7e6baf84a4de1 URL: https://gitlab.winehq.org/wine/wine/-/commit/680d17b453ad651ecb12be5d12a7e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 13:19:49 2022 +0100 oleaut32: Fix A<->W conversion when storing names in typelibs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52873 --- dlls/oleaut32/typelib.c | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 602b9a1ee17..d92d0234c6c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2252,12 +2252,12 @@ static void MSFT_ReadValue( VARIANT * pVar, int offset, TLBContext *pcx ) if(size == -1){ V_BSTR(pVar) = NULL; }else{ + int len; ptr = heap_alloc_zero(size); MSFT_Read(ptr, size, pcx, DO_NOT_SEEK); - V_BSTR(pVar)=SysAllocStringLen(NULL,size); - /* FIXME: do we need a AtoW conversion here? */ - V_UNION(pVar, bstrVal[size])='\0'; - while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; + len = MultiByteToWideChar(CP_ACP, 0, ptr, size, NULL, 0 ); + V_BSTR(pVar)=SysAllocStringLen(NULL,len); + MultiByteToWideChar(CP_ACP, 0, ptr, size, V_BSTR(pVar), len ); heap_free(ptr); } } @@ -5734,23 +5734,12 @@ static HRESULT TLB_CopyElemDesc( const ELEMDESC *src, ELEMDESC *dest, char **buf return S_OK; } -static HRESULT TLB_SanitizeBSTR(BSTR str) -{ - UINT len = SysStringLen(str), i; - for (i = 0; i < len; ++i) - if (str[i] > 0x7f) - str[i] = '?'; - return S_OK; -} - static HRESULT TLB_SanitizeVariant(VARIANT *var) { if (V_VT(var) == VT_INT) return VariantChangeType(var, var, 0, VT_I4); else if (V_VT(var) == VT_UINT) return VariantChangeType(var, var, 0, VT_UI4); - else if (V_VT(var) == VT_BSTR) - return TLB_SanitizeBSTR(V_BSTR(var)); return S_OK; } @@ -9421,7 +9410,8 @@ static DWORD WMSFT_encode_variant(VARIANT *value, WMSFT_TLBFile *file) } case VT_BSTR: { - int i, len = (6+SysStringLen(V_BSTR(&v))+3) & ~0x3; + int mb_len = WideCharToMultiByte(CP_ACP, 0, V_BSTR(&v), SysStringLen(V_BSTR(&v)), NULL, 0, NULL, NULL ); + int i, len = (6 + mb_len + 3) & ~0x3; char *data; if(file->custdata_seg.data){ @@ -9434,15 +9424,9 @@ static DWORD WMSFT_encode_variant(VARIANT *value, WMSFT_TLBFile *file) } *((unsigned short *)data) = V_VT(value); - *((unsigned int *)(data+2)) = SysStringLen(V_BSTR(&v)); - for(i=0; i<SysStringLen(V_BSTR(&v)); i++) { - if(V_BSTR(&v)[i] <= 0x7f) - data[i+6] = V_BSTR(&v)[i]; - else - data[i+6] = '?'; - } - WideCharToMultiByte(CP_ACP, 0, V_BSTR(&v), SysStringLen(V_BSTR(&v)), &data[6], len-6, NULL, NULL); - for(i=6+SysStringLen(V_BSTR(&v)); i<len; i++) + *((unsigned int *)(data+2)) = mb_len; + WideCharToMultiByte(CP_ACP, 0, V_BSTR(&v), SysStringLen(V_BSTR(&v)), &data[6], mb_len, NULL, NULL); + for (i = 6 + mb_len; i < len; i++) data[i] = 0x57; /* TODO: Check if the encoded data is already present in custdata_seg */

1 0

Alexandre Julliard : kernel32/tests: Fix a string comparison test in utf-8 locales.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: b771d417d8f7f514ea57ff41e06cb96f912b48e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b771d417d8f7f514ea57ff41e06cb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 14:10:51 2022 +0100 kernel32/tests: Fix a string comparison test in utf-8 locales. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52964 --- dlls/kernel32/tests/locale.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 723c24873c6..40706c15755 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1816,8 +1816,13 @@ static void test_CompareStringA(void) static const char ABC_FF[] = {'A','B','C',0,0xFF}; int ret, i; char a[256]; + BOOL is_utf8; + CPINFOEXA cpinfo; LCID lcid = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT); + GetCPInfoExA( CP_ACP, 0, &cpinfo ); + is_utf8 = cpinfo.CodePage == CP_UTF8; + for (i = 0; i < ARRAY_SIZE(comparestringa_data); i++) { const struct comparestringa_entry *entry = &comparestringa_data[i]; @@ -1945,13 +1950,13 @@ static void test_CompareStringA(void) ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 3, ABC_FF, 3); ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 5, ABC_FF, 3); - ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); + ok(ret == CSTR_GREATER_THAN || (is_utf8 && ret == CSTR_EQUAL), "expected CSTR_GREATER_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 3, ABC_FF, 5); - ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ok(ret == CSTR_LESS_THAN || (is_utf8 && ret == CSTR_EQUAL), "expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 5, ABC_FF, 5); - ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ok(ret == CSTR_LESS_THAN || (is_utf8 && ret == CSTR_EQUAL), "expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_FF, 5, ABC_EE, 5); - ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); + ok(ret == CSTR_GREATER_THAN || (is_utf8 && ret == CSTR_EQUAL), "expected CSTR_GREATER_THAN, got %d\n", ret); } static void test_CompareStringW(void)

1 0

Zebediah Figura : server: Inherit the SO_RCVTIMEO value in accept_socket().
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 03391aab2457d8e4341339ba619acd8a2f071654 URL: https://gitlab.winehq.org/wine/wine/-/commit/03391aab2457d8e4341339ba619acd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:10:06 2022 -0600 server: Inherit the SO_RCVTIMEO value in accept_socket(). --- dlls/ws2_32/tests/sock.c | 3 +-- server/sock.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cb99ceb4b24..6f2bcb73a06 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4828,8 +4828,7 @@ static void test_accept_inheritance(void) len = sizeof(value); ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); - todo_wine_if (i == 6) - ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); + ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); } len = sizeof(linger); diff --git a/server/sock.c b/server/sock.c index a64ea8f7e56..a64cb22404e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2002,6 +2002,7 @@ static struct sock *accept_socket( struct sock *sock ) acceptsock->sndbuf = sock->sndbuf; acceptsock->rcvbuf = sock->rcvbuf; acceptsock->sndtimeo = sock->sndtimeo; + acceptsock->rcvtimeo = sock->rcvtimeo; acceptsock->connect_time = current_time; if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event );

1 0

Zebediah Figura : server: Inherit address reuse flags in accept_socket().
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: ddc6c3fb23ae9a6ad584b596e8c5a7ff8ef1b4c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ddc6c3fb23ae9a6ad584b596e8c5a7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:08:10 2022 -0600 server: Inherit address reuse flags in accept_socket(). --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 32c2172f0db..d8500144bd0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4828,7 +4828,7 @@ static void test_accept_inheritance(void) len = sizeof(value); ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); - todo_wine_if (i == 0 || (i >= 3 && i <= 6)) + todo_wine_if (i >= 3 && i <= 6) ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); } diff --git a/server/sock.c b/server/sock.c index c130821b7f4..8fe6086b8f6 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1988,16 +1988,19 @@ static struct sock *accept_socket( struct sock *sock ) } /* newly created socket gets the same properties of the listening socket */ - acceptsock->state = SOCK_CONNECTED; - acceptsock->bound = 1; - acceptsock->nonblocking = sock->nonblocking; - acceptsock->mask = sock->mask; - acceptsock->proto = sock->proto; - acceptsock->type = sock->type; - acceptsock->family = sock->family; - acceptsock->window = sock->window; - acceptsock->message = sock->message; - acceptsock->connect_time = current_time; + acceptsock->state = SOCK_CONNECTED; + acceptsock->bound = 1; + acceptsock->nonblocking = sock->nonblocking; + acceptsock->mask = sock->mask; + acceptsock->proto = sock->proto; + acceptsock->type = sock->type; + acceptsock->family = sock->family; + acceptsock->window = sock->window; + acceptsock->message = sock->message; + acceptsock->reuseaddr = sock->reuseaddr; + acceptsock->exclusiveaddruse = sock->exclusiveaddruse; + acceptsock->connect_time = current_time; + if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event ); if (!(acceptsock->fd = create_anonymous_fd( &sock_fd_ops, acceptfd, &acceptsock->obj, get_fd_options( sock->fd ) )))

1 0

Zebediah Figura : server: Inherit the SO_SNDBUF value in accept_socket().
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: a58cd78ca9efa160ea13783839c461b8d3c65bec URL: https://gitlab.winehq.org/wine/wine/-/commit/a58cd78ca9efa160ea13783839c461… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:08:54 2022 -0600 server: Inherit the SO_SNDBUF value in accept_socket(). --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d8500144bd0..974cf087778 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4828,7 +4828,7 @@ static void test_accept_inheritance(void) len = sizeof(value); ret = getsockopt(server, int_tests[i].optname, int_tests[i].optval, (char *)&value, &len); ok(!ret, "test %u: got error %u\n", i, WSAGetLastError()); - todo_wine_if (i >= 3 && i <= 6) + todo_wine_if (i >= 4 && i <= 6) ok(value == int_tests[i].value, "test %u: got value %#x\n", i, value); } diff --git a/server/sock.c b/server/sock.c index 8fe6086b8f6..e84b3c68017 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1999,6 +1999,7 @@ static struct sock *accept_socket( struct sock *sock ) acceptsock->message = sock->message; acceptsock->reuseaddr = sock->reuseaddr; acceptsock->exclusiveaddruse = sock->exclusiveaddruse; + acceptsock->sndbuf = sock->sndbuf; acceptsock->connect_time = current_time; if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event );

1 0