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

Eric Pouech : dbghelp/tests: Add tests about SymLoadModule and finding pdb files.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 0ca1350a0345b51f05d9c5edd6560f3f32f19a3b URL: https://gitlab.winehq.org/wine/wine/-/commit/0ca1350a0345b51f05d9c5edd6560f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Feb 23 11:09:37 2024 +0100 dbghelp/tests: Add tests about SymLoadModule and finding pdb files. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/path.c | 233 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 233 insertions(+)

1 0

Eric Pouech : dbghelp: Don't fail on loading 64bit modules on 32bit applications.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 1648569fad8637f7901ad412c733d268997914a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/1648569fad8637f7901ad412c733d2… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Mar 1 17:16:39 2024 +0100 dbghelp: Don't fail on loading 64bit modules on 32bit applications. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/pe_module.c | 3 +-- dlls/dbghelp/tests/path.c | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 909ac794c38..06e70c35037 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -268,12 +268,11 @@ BOOL pe_map_file(HANDLE file, struct image_file_map* fmap) memcpy(&fmap->u.pe.opt.header32, &nthdr->OptionalHeader, sizeof(fmap->u.pe.opt.header32)); break; case IMAGE_NT_OPTIONAL_HDR64_MAGIC: - if (sizeof(void*) == 4) return FALSE; fmap->addr_size = 64; memcpy(&fmap->u.pe.opt.header64, &nthdr->OptionalHeader, sizeof(fmap->u.pe.opt.header64)); break; default: - return FALSE; + goto error; } fmap->u.pe.builtin = !memcmp((const IMAGE_DOS_HEADER*)mapping + 1, builtin_signature, sizeof(builtin_signature)); diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index 479985d1c7e..9074d42ac94 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -1575,9 +1575,7 @@ static void test_load_modules_path(void) ok(ret, "SymInitialize failed: %lu\n", GetLastError()); make_path(filename, topdir, NULL, L"bar.dll"); base = SymLoadModuleExW(dummy, NULL, filename, NULL, 0x4000, 0x6666, NULL, 0); - todo_wine_if(sizeof(void*) == 4) ok(base == 0x4000, "SymLoadModuleExW failed: %lu\n", GetLastError()); - if (base == 0x4000 && sizeof(void*) != 4) { /* temp */ im.SizeOfStruct = sizeof(im); ret = SymGetModuleInfoW64(dummy, base, &im); ok(ret, "SymGetModuleInfow64 failed: %lu\n", GetLastError()); @@ -1610,7 +1608,6 @@ static void test_load_modules_path(void) } todo_wine ok(IsEqualGUID(&im.PdbSig70, &guid1), "Unexpected PDB GUID\n"); - } /* temp */ ret = SymCleanup(dummy); ok(ret, "SymCleanup failed: %lu\n", GetLastError()); for (ptr = test->test_files; *ptr; ptr++) @@ -1638,7 +1635,6 @@ static void test_load_modules_path(void) ok(ret, "Couldn't create directory %ls\n", filename); } ret = RemoveDirectoryW(topdir); - todo_wine /* bug in Wine not closing all mappings */ ok(ret, "Couldn't remove directory\n"); }

1 0

Eric Pouech : dbghelp: Don't search the passed path in SymFindFileInPath.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: c1b8db0c28ac5b7a14567bfb6df2c0af364de6a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1b8db0c28ac5b7a14567bfb6df2c0… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sun Dec 31 10:11:29 2023 +0100 dbghelp: Don't search the passed path in SymFindFileInPath. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/path.c | 8 +------- dlls/dbghelp/tests/path.c | 11 ----------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index ec182c969d3..f45807c634f 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -398,13 +398,6 @@ BOOL WINAPI SymFindFileInPathW(HANDLE hProcess, PCWSTR searchPath, PCWSTR full_p filename = file_name(full_path); - /* first check full path to file */ - if (sffip_cb(full_path, &s)) - { - lstrcpyW(buffer, full_path); - return TRUE; - } - while (searchPath) { ptr = wcschr(searchPath, ';'); @@ -425,6 +418,7 @@ BOOL WINAPI SymFindFileInPathW(HANDLE hProcess, PCWSTR searchPath, PCWSTR full_p return TRUE; } } + SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index 9074d42ac94..0efe55defd2 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -957,12 +957,7 @@ static BOOL CALLBACK path_cb(PCWSTR filename, void* _usr) BOOL ret; pv->cb_count++; - /* wine returns paths in relative form, but relative to search path... - * fail (== continue search) until it's fixed - */ - todo_wine_if(!filename[0] || filename[1] != ':') ok(filename[0] && filename[1] == ':', "Expecting full path, but got %ls\n", filename); - if (!filename[0] || filename[1] != ':') return TRUE; memset(&ssii, 0, sizeof(ssii)); ssii.sizeofstruct = sizeof(ssii); @@ -1161,7 +1156,6 @@ static void test_find_in_path_pe(void) image_tests[i].lookup_size_of_image, 0, SSRVOPT_DWORDPTR, found, path_cb, &pv); - todo_wine ok(pv.cb_count == image_tests[i].expected_cb_count, "Mismatch in cb count, got %u (expected %lu)\n", pv.cb_count, image_tests[i].expected_cb_count); @@ -1184,9 +1178,7 @@ static void test_find_in_path_pe(void) } else { - todo_wine_if(i == 26 || i == 27) ok(!ret, "File reported found, while failure is expected\n"); - todo_wine_if(i == 26 || i == 27 || (GetLastError() != ERROR_FILE_NOT_FOUND)) ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Unexpected error %lu\n", GetLastError()); } for (ptr = image_tests[i].files; *ptr; ptr++) @@ -1378,7 +1370,6 @@ static void test_find_in_path_pdb(void) 0, pdb_tests[i].lookup_age, SSRVOPT_GUIDPTR, found, path_cb, &pv); - todo_wine ok(pv.cb_count == pdb_tests[i].expected_cb_count, "Mismatch in cb count, got %u (expected %lu)\n", pv.cb_count, pdb_tests[i].expected_cb_count); @@ -1401,9 +1392,7 @@ static void test_find_in_path_pdb(void) } else { - todo_wine_if(i == 26 || i == 27) ok(!ret, "File reported found, while failure is expected\n"); - todo_wine ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Unexpected error %lu\n", GetLastError()); }

1 0

Henri Verbeet : vkd3d-shader: Add documentation for the INT64 and FLOAT64 feature flags.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: vkd3d Branch: master Commit: 6acca1f85e26ddc8837936dc30efa38e2dd6747c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6acca1f85e26ddc8837936dc30efa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 4 17:03:08 2024 +0100 vkd3d-shader: Add documentation for the INT64 and FLOAT64 feature flags. --- include/vkd3d_shader.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2f4478a7..6fa98f3d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -199,7 +199,13 @@ enum vkd3d_shader_compile_option_fragment_coordinate_origin /** Advertises feature availability. \since 1.11 */ enum vkd3d_shader_compile_option_feature_flags { + /** The SPIR-V target environment supports 64-bit integer types. This + * corresponds to the "shaderInt64" feature in the Vulkan API, and the + * "GL_ARB_gpu_shader_int64" extension in the OpenGL API. */ VKD3D_SHADER_COMPILE_OPTION_FEATURE_INT64 = 0x00000001, + /** The SPIR-V target environment supports 64-bit floating-point types. + * This corresponds to the "shaderFloat64" feature in the Vulkan API, and + * the "GL_ARB_gpu_shader_fp64" extension in the OpenGL API. */ VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64 = 0x00000002, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLAGS),

1 0

Zebediah Figura : shell32: Implement Paste in the item menu.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: af7f11bb2a5c2018f90fbf465ac4d190f8381a1a URL: https://gitlab.winehq.org/wine/wine/-/commit/af7f11bb2a5c2018f90fbf465ac4d1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 3 22:00:51 2024 -0600 shell32: Implement Paste in the item menu. Based on a patch by Michael Müller. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34319 --- dlls/shell32/shell32.rc | 1 + dlls/shell32/shlview_cmenu.c | 67 +++++++++- dlls/shell32/tests/shlfolder.c | 18 +-- po/ar.po | 275 +++++++++++++++++++++-------------------- po/ast.po | 275 +++++++++++++++++++++-------------------- po/bg.po | 275 +++++++++++++++++++++-------------------- po/ca.po | 275 +++++++++++++++++++++-------------------- po/cs.po | 275 +++++++++++++++++++++-------------------- po/da.po | 275 +++++++++++++++++++++-------------------- po/de.po | 275 +++++++++++++++++++++-------------------- po/el.po | 275 +++++++++++++++++++++-------------------- po/en.po | 275 +++++++++++++++++++++-------------------- po/en_US.po | 275 +++++++++++++++++++++-------------------- po/eo.po | 275 +++++++++++++++++++++-------------------- po/es.po | 275 +++++++++++++++++++++-------------------- po/fa.po | 275 +++++++++++++++++++++-------------------- po/fi.po | 275 +++++++++++++++++++++-------------------- po/fr.po | 275 +++++++++++++++++++++-------------------- po/he.po | 275 +++++++++++++++++++++-------------------- po/hi.po | 275 +++++++++++++++++++++-------------------- po/hr.po | 275 +++++++++++++++++++++-------------------- po/hu.po | 275 +++++++++++++++++++++-------------------- po/it.po | 275 +++++++++++++++++++++-------------------- po/ja.po | 275 +++++++++++++++++++++-------------------- po/ka.po | 275 +++++++++++++++++++++-------------------- po/ko.po | 275 +++++++++++++++++++++-------------------- po/lt.po | 275 +++++++++++++++++++++-------------------- po/ml.po | 275 +++++++++++++++++++++-------------------- po/nb_NO.po | 275 +++++++++++++++++++++-------------------- po/nl.po | 275 +++++++++++++++++++++-------------------- po/or.po | 275 +++++++++++++++++++++-------------------- po/pa.po | 275 +++++++++++++++++++++-------------------- po/pl.po | 275 +++++++++++++++++++++-------------------- po/pt_BR.po | 275 +++++++++++++++++++++-------------------- po/pt_PT.po | 275 +++++++++++++++++++++-------------------- po/rm.po | 275 +++++++++++++++++++++-------------------- po/ro.po | 275 +++++++++++++++++++++-------------------- po/ru.po | 275 +++++++++++++++++++++-------------------- po/si.po | 275 +++++++++++++++++++++-------------------- po/sk.po | 275 +++++++++++++++++++++-------------------- po/sl.po | 275 +++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 275 +++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 275 +++++++++++++++++++++-------------------- po/sv.po | 275 +++++++++++++++++++++-------------------- po/ta.po | 275 +++++++++++++++++++++-------------------- po/te.po | 275 +++++++++++++++++++++-------------------- po/th.po | 275 +++++++++++++++++++++-------------------- po/tr.po | 275 +++++++++++++++++++++-------------------- po/uk.po | 275 +++++++++++++++++++++-------------------- po/wa.po | 275 +++++++++++++++++++++-------------------- po/wine.pot | 275 +++++++++++++++++++++-------------------- po/zh_CN.po | 275 +++++++++++++++++++++-------------------- po/zh_TW.po | 275 +++++++++++++++++++++-------------------- 53 files changed, 6975 insertions(+), 6861 deletions(-)

1 0

Nikolay Sivov : d3dcompiler: Enable semantic names mapping in compatibility mode.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 2c9f67938f89ca554481bc3a96222db2b4c8eac4 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c9f67938f89ca554481bc3a96222d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 24 01:01:07 2024 +0100 d3dcompiler: Enable semantic names mapping in compatibility mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 14 ++++++++++++-- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 67f69b7f9ef..ded52bad965 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -406,7 +406,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen struct d3dcompiler_include_from_file include_from_file; struct vkd3d_shader_preprocess_info preprocess_info; struct vkd3d_shader_hlsl_source_info hlsl_info; - struct vkd3d_shader_compile_option options[3]; + struct vkd3d_shader_compile_option options[4]; struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_compile_option *option; struct vkd3d_shader_code byte_code; @@ -453,8 +453,11 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen include = &include_from_file.ID3DInclude_iface; } - if (flags & ~(D3DCOMPILE_DEBUG | D3DCOMPILE_PACK_MATRIX_ROW_MAJOR | D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR)) + if (flags & ~(D3DCOMPILE_DEBUG | D3DCOMPILE_PACK_MATRIX_ROW_MAJOR | D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR + | D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY)) + { FIXME("Ignoring flags %#x.\n", flags); + } if (effect_flags) FIXME("Ignoring effect flags %#x.\n", effect_flags); if (secondary_flags) @@ -532,6 +535,13 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen option->value = VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_COLUMN_MAJOR; } + if (flags & D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY) + { + option = &options[compile_info.option_count++]; + option->name = VKD3D_SHADER_COMPILE_OPTION_BACKWARD_COMPATIBILITY; + option->value = VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES; + } + ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages); if (ret) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index d0c3c223353..1814b6e38ea 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -622,7 +622,7 @@ static void test_sampling(void) draw_quad(&test_context, ps_code); v = get_color_vec4(&test_context, 0, 0); - todo_wine ok(compare_vec4(&v, 0.25f, 0.0f, 0.25f, 0.0f, 0), + ok(compare_vec4(&v, 0.25f, 0.0f, 0.25f, 0.0f, 0), "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); ID3D10Blob_Release(ps_code);

1 0

Connor McAdams : webservices/tests: Fix -Warray-bounds warning on gcc 13.2.0.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: eb06945b5b7540e65accca1e76769427e86f40ae URL: https://gitlab.winehq.org/wine/wine/-/commit/eb06945b5b7540e65accca1e767694… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Mar 1 10:16:09 2024 -0500 webservices/tests: Fix -Warray-bounds warning on gcc 13.2.0. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/webservices/tests/channel.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 4cf39c10732..c64027fb86d 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -1217,12 +1217,13 @@ static const char send_record_end[] = { 0x08, 0x02, 0x6e, 0x73, 0x89, 0xff, 0x01 static BOOL send_dict_str( int sock, char *addr, const char *str, int dict_str_count ) { char buf[512], dict_buf[256], body_buf[128], dict_size_buf[5]; + const int max_len = ARRAY_SIZE(dict_buf) - ARRAY_SIZE(dict_size_buf); int offset, dict_buf_size, body_buf_size, dict_size; /* Session dictionary strings. */ - offset = write_size( dict_buf, strlen(str) ); - memcpy( dict_buf + offset, str, strlen(str) ); - dict_buf_size = strlen(str) + offset; + offset = write_size( dict_buf, strnlen(str, max_len) ); + memcpy( dict_buf + offset, str, strnlen(str, max_len) ); + dict_buf_size = strnlen( str, max_len ) + offset; dict_size = write_size( dict_size_buf, dict_buf_size );

1 0

Florian Will : include: Add TCP_KEEPCNT and TCP_KEEPINTVL definitions.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 6d2a900487bb9a41f16de4f0092cc9345580e356 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d2a900487bb9a41f16de4f0092cc9… Author: Florian Will <florian.will(a)gmail.com> Date: Thu Feb 29 13:15:02 2024 +0100 include: Add TCP_KEEPCNT and TCP_KEEPINTVL definitions. --- include/ws2ipdef.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index fcb1f56c005..72e2dad2fa5 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -313,6 +313,8 @@ typedef struct WS(in6_pktinfo) { #define TCP_OFFLOAD_PREFERENCE 11 #define TCP_CONGESTION_ALGORITHM 12 #define TCP_DELAY_FIN_ACK 13 +#define TCP_KEEPCNT 16 +#define TCP_KEEPINTVL 17 #else /* WS_TCP_NODELAY is defined elsewhere */ #define WS_TCP_EXPEDITED_1122 2 @@ -327,6 +329,8 @@ typedef struct WS(in6_pktinfo) { #define WS_TCP_OFFLOAD_PREFERENCE 11 #define WS_TCP_CONGESTION_ALGORITHM 12 #define WS_TCP_DELAY_FIN_ACK 13 +#define WS_TCP_KEEPCNT 16 +#define WS_TCP_KEEPINTVL 17 #endif /* USE_WS_PREFIX */ #define PROTECTION_LEVEL_UNRESTRICTED 10

1 0

Florian Will : ws2_32/tests: Test TCP_KEEP{ALIVE,CNT,INTVL} options.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 26136fda8deceae60357f82acb89121efad30b8f URL: https://gitlab.winehq.org/wine/wine/-/commit/26136fda8deceae60357f82acb8912… Author: Florian Will <florian.will(a)gmail.com> Date: Thu Feb 29 13:02:52 2024 +0100 ws2_32/tests: Test TCP_KEEP{ALIVE,CNT,INTVL} options. --- dlls/ws2_32/tests/sock.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b0287fdd004..01c14d73de6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1193,6 +1193,7 @@ static void test_set_getsockopt(void) DWORD values[3]; BOOL accepts_large_value; BOOL bool_value; + BOOL allow_noprotoopt; /* for old windows or wine todo */ } test_optsize[] = { @@ -1210,6 +1211,9 @@ static void test_set_getsockopt(void) {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_OPENTYPE, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, IPPROTO_TCP, TCP_NODELAY, TRUE, {1, 1, 1}, {0}, TRUE}, + {AF_INET, SOCK_STREAM, IPPROTO_TCP, TCP_KEEPALIVE, FALSE, {0, 0, 4}, {0}, TRUE, FALSE, TRUE}, /* wine todo */ + {AF_INET, SOCK_STREAM, IPPROTO_TCP, TCP_KEEPCNT, FALSE, {0, 0, 4}, {0}, FALSE, FALSE, TRUE}, /* win10+, wine todo*/ + {AF_INET, SOCK_STREAM, IPPROTO_TCP, TCP_KEEPINTVL, FALSE, {0, 0, 4}, {0}, TRUE, FALSE, TRUE}, /* win10+, wine todo */ {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_TTL, TRUE, {1, 1, 4}, {0}, FALSE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_PKTINFO, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, @@ -1453,6 +1457,36 @@ static void test_set_getsockopt(void) ok(!err, "getsockopt TCP_NODELAY failed\n"); ok(!value, "TCP_NODELAY should be 0\n"); + size = sizeof(DWORD); + value = 3600; + err = setsockopt(s, IPPROTO_TCP, TCP_KEEPALIVE, (char*)&value, 4); + todo_wine ok(!err, "setsockopt TCP_KEEPALIVE failed\n"); + value = 0; + err = getsockopt(s, IPPROTO_TCP, TCP_KEEPALIVE, (char*)&value, &size); + todo_wine ok(!err, "getsockopt TCP_KEEPALIVE failed\n"); + todo_wine ok(value == 3600, "TCP_KEEPALIVE should be 3600, is %ld\n", value); + + /* TCP_KEEPCNT and TCP_KEEPINTVL are supported on win10 and later */ + value = 5; + err = setsockopt(s, IPPROTO_TCP, TCP_KEEPCNT, (char*)&value, 4); + todo_wine ok(!err || broken(WSAGetLastError() == WSAENOPROTOOPT), + "setsockopt TCP_KEEPCNT failed: %d\n", WSAGetLastError()); + + if (!err) + { + value = 0; + err = getsockopt(s, IPPROTO_TCP, TCP_KEEPCNT, (char*)&value, &size); + ok(!err, "getsockopt TCP_KEEPCNT failed\n"); + ok(value == 5, "TCP_KEEPCNT should be 5, is %ld\n", value); + + err = setsockopt(s, IPPROTO_TCP, TCP_KEEPINTVL, (char*)&value, 4); + ok(!err, "setsockopt TCP_KEEPINTVL failed\n"); + value = 0; + err = getsockopt(s, IPPROTO_TCP, TCP_KEEPINTVL, (char*)&value, &size); + ok(!err, "getsockopt TCP_KEEPINTVL failed\n"); + ok(value == 5, "TCP_KEEPINTVL should be 5, is %ld\n", value); + } + /* Test for erroneously passing a value instead of a pointer as optval */ size = sizeof(char); err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size); @@ -1517,7 +1551,15 @@ static void test_set_getsockopt(void) size = sizeof(save_value); err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&save_value, &size); - ok(!err, "Unexpected getsockopt result %d.\n", err); + ok(!err || (test_optsize[i].allow_noprotoopt && WSAGetLastError() == WSAENOPROTOOPT), + "Unexpected getsockopt result %d.\n", err); + + if (err) + { + closesocket(s2); + winetest_pop_context(); + continue; + } value64 = 0xffffffff00000001; err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char *)&value64, sizeof(value64));

1 0

Florian Will : ws2_32: Implement TCP_KEEP{ALIVE,CNT,INTVL} options.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 8dc5242e2998afed87bc57db5798eea85877094e URL: https://gitlab.winehq.org/wine/wine/-/commit/8dc5242e2998afed87bc57db5798ee… Author: Florian Will <florian.will(a)gmail.com> Date: Thu Feb 29 13:48:32 2024 +0100 ws2_32: Implement TCP_KEEP{ALIVE,CNT,INTVL} options. --- dlls/ntdll/unix/socket.c | 28 +++++++++++++++++++++ dlls/ws2_32/socket.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 18 +++++++------- include/wine/afd.h | 6 +++++ 4 files changed, 106 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 4e6781df607..4b0dca37e7d 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -2507,6 +2507,34 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_TCP_NODELAY: return do_setsockopt( handle, io, IPPROTO_TCP, TCP_NODELAY, in_buffer, in_size ); +#if defined(TCP_KEEPIDLE) + /* TCP_KEEPALIVE on Windows is often called TCP_KEEPIDLE on Unix */ + case IOCTL_AFD_WINE_GET_TCP_KEEPALIVE: + return do_getsockopt( handle, io, IPPROTO_TCP, TCP_KEEPIDLE, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_TCP_KEEPALIVE: + return do_setsockopt( handle, io, IPPROTO_TCP, TCP_KEEPIDLE, in_buffer, in_size ); +#elif defined(TCP_KEEPALIVE) + /* Mac */ + case IOCTL_AFD_WINE_GET_TCP_KEEPALIVE: + return do_getsockopt( handle, io, IPPROTO_TCP, TCP_KEEPALIVE, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_TCP_KEEPALIVE: + return do_setsockopt( handle, io, IPPROTO_TCP, TCP_KEEPALIVE, in_buffer, in_size ); +#endif + + case IOCTL_AFD_WINE_GET_TCP_KEEPINTVL: + return do_getsockopt( handle, io, IPPROTO_TCP, TCP_KEEPINTVL, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_TCP_KEEPINTVL: + return do_setsockopt( handle, io, IPPROTO_TCP, TCP_KEEPINTVL, in_buffer, in_size ); + + case IOCTL_AFD_WINE_GET_TCP_KEEPCNT: + return do_getsockopt( handle, io, IPPROTO_TCP, TCP_KEEPCNT, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_TCP_KEEPCNT: + return do_setsockopt( handle, io, IPPROTO_TCP, TCP_KEEPCNT, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6aab249a1b8..eb84558cbac 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1931,6 +1931,36 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_TCP_NODELAY, optval, optlen ); + case TCP_KEEPALIVE: + if (*optlen < sizeof(DWORD) || !optval) + { + *optlen = 0; + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + *optlen = sizeof(DWORD); + return server_getsockopt( s, IOCTL_AFD_WINE_GET_TCP_KEEPALIVE, optval, optlen ); + + case TCP_KEEPCNT: + if (*optlen < sizeof(DWORD) || !optval) + { + *optlen = 0; + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + *optlen = sizeof(DWORD); + return server_getsockopt( s, IOCTL_AFD_WINE_GET_TCP_KEEPCNT, optval, optlen ); + + case TCP_KEEPINTVL: + if (*optlen < sizeof(DWORD) || !optval) + { + *optlen = 0; + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + *optlen = sizeof(DWORD); + return server_getsockopt( s, IOCTL_AFD_WINE_GET_TCP_KEEPINTVL, optval, optlen ); + default: FIXME( "unrecognized TCP option %#x\n", optname ); SetLastError( WSAENOPROTOOPT ); @@ -3325,6 +3355,12 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int break; /* case NSPROTO_IPX */ case IPPROTO_TCP: + if (optlen < 0) + { + SetLastError(WSAENOBUFS); + return SOCKET_ERROR; + } + switch(optname) { case TCP_NODELAY: @@ -3336,6 +3372,33 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int value = *optval; return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&value, sizeof(value) ); + case TCP_KEEPALIVE: + if (optlen < sizeof(DWORD) || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + value = *(DWORD*)optval; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_KEEPALIVE, (char*)&value, sizeof(value) ); + + case TCP_KEEPCNT: + if (optlen < sizeof(DWORD) || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + value = *(DWORD*)optval; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_KEEPCNT, (char*)&value, sizeof(value) ); + + case TCP_KEEPINTVL: + if (optlen < sizeof(DWORD) || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + value = *(DWORD*)optval; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_KEEPINTVL, (char*)&value, sizeof(value) ); + default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 01c14d73de6..6954b3e077a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1193,7 +1193,7 @@ static void test_set_getsockopt(void) DWORD values[3]; BOOL accepts_large_value; BOOL bool_value; - BOOL allow_noprotoopt; /* for old windows or wine todo */ + BOOL allow_noprotoopt; /* for old windows only, must work on wine */ } test_optsize[] = { @@ -1211,9 +1211,9 @@ static void test_set_getsockopt(void) {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_OPENTYPE, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, IPPROTO_TCP, TCP_NODELAY, TRUE, {1, 1, 1}, {0}, TRUE}, - {AF_INET, SOCK_STREAM, IPPROTO_TCP, TCP_KEEPALIVE, FALSE, {0, 0, 4}, {0}, TRUE, FALSE, TRUE}, /* wine todo */ - {AF_INET, SOCK_STREAM, IPPROTO_TCP, TCP_KEEPCNT, FALSE, {0, 0, 4}, {0}, FALSE, FALSE, TRUE}, /* win10+, wine todo*/ - {AF_INET, SOCK_STREAM, IPPROTO_TCP, TCP_KEEPINTVL, FALSE, {0, 0, 4}, {0}, TRUE, FALSE, TRUE}, /* win10+, wine todo */ + {AF_INET, SOCK_STREAM, IPPROTO_TCP, TCP_KEEPALIVE, FALSE, {0, 0, 4}, {0}, TRUE}, + {AF_INET, SOCK_STREAM, IPPROTO_TCP, TCP_KEEPCNT, FALSE, {0, 0, 4}, {0}, FALSE, FALSE, TRUE}, /* win10+ */ + {AF_INET, SOCK_STREAM, IPPROTO_TCP, TCP_KEEPINTVL, FALSE, {0, 0, 4}, {0}, TRUE, FALSE, TRUE}, /* win10+ */ {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_TTL, TRUE, {1, 1, 4}, {0}, FALSE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_PKTINFO, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, @@ -1460,16 +1460,16 @@ static void test_set_getsockopt(void) size = sizeof(DWORD); value = 3600; err = setsockopt(s, IPPROTO_TCP, TCP_KEEPALIVE, (char*)&value, 4); - todo_wine ok(!err, "setsockopt TCP_KEEPALIVE failed\n"); + ok(!err, "setsockopt TCP_KEEPALIVE failed\n"); value = 0; err = getsockopt(s, IPPROTO_TCP, TCP_KEEPALIVE, (char*)&value, &size); - todo_wine ok(!err, "getsockopt TCP_KEEPALIVE failed\n"); - todo_wine ok(value == 3600, "TCP_KEEPALIVE should be 3600, is %ld\n", value); + ok(!err, "getsockopt TCP_KEEPALIVE failed\n"); + ok(value == 3600, "TCP_KEEPALIVE should be 3600, is %ld\n", value); /* TCP_KEEPCNT and TCP_KEEPINTVL are supported on win10 and later */ value = 5; err = setsockopt(s, IPPROTO_TCP, TCP_KEEPCNT, (char*)&value, 4); - todo_wine ok(!err || broken(WSAGetLastError() == WSAENOPROTOOPT), + ok(!err || broken(WSAGetLastError() == WSAENOPROTOOPT), "setsockopt TCP_KEEPCNT failed: %d\n", WSAGetLastError()); if (!err) @@ -1551,7 +1551,7 @@ static void test_set_getsockopt(void) size = sizeof(save_value); err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&save_value, &size); - ok(!err || (test_optsize[i].allow_noprotoopt && WSAGetLastError() == WSAENOPROTOOPT), + ok(!err || broken(test_optsize[i].allow_noprotoopt && WSAGetLastError() == WSAENOPROTOOPT), "Unexpected getsockopt result %d.\n", err); if (err) diff --git a/include/wine/afd.h b/include/wine/afd.h index 788adb4a495..aba559ebd8a 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -285,6 +285,12 @@ C_ASSERT( sizeof(struct afd_get_events_params) == 56 ); #define IOCTL_AFD_WINE_SET_IP_RECVTOS WINE_AFD_IOC(296) #define IOCTL_AFD_WINE_GET_SO_EXCLUSIVEADDRUSE WINE_AFD_IOC(297) #define IOCTL_AFD_WINE_SET_SO_EXCLUSIVEADDRUSE WINE_AFD_IOC(298) +#define IOCTL_AFD_WINE_GET_TCP_KEEPALIVE WINE_AFD_IOC(299) +#define IOCTL_AFD_WINE_SET_TCP_KEEPALIVE WINE_AFD_IOC(300) +#define IOCTL_AFD_WINE_GET_TCP_KEEPCNT WINE_AFD_IOC(301) +#define IOCTL_AFD_WINE_SET_TCP_KEEPCNT WINE_AFD_IOC(302) +#define IOCTL_AFD_WINE_GET_TCP_KEEPINTVL WINE_AFD_IOC(303) +#define IOCTL_AFD_WINE_SET_TCP_KEEPINTVL WINE_AFD_IOC(304) struct afd_iovec {

1 0