Re: [PATCH v3 0/3] MR5195: ws2_32: Implement TCP_KEEPALIVE, TCP_KEEPCNT and TCP_KEEPINTVL socket options

[Florian Will (＠w-flo)]

On Fri Mar  1 09:00:51 2024 +0000, Zebediah Figura wrote:
> +    /* TCP_KEEPCNT and TCP_KEEPINTVL are supported on win10 and later */
> +    value = 5;
> +    err = setsockopt(s, IPPROTO_TCP, TCP_KEEPCNT, (char*)&value, 4);
> +    if (!err || WSAGetLastError() != WSAENOPROTOOPT || winetest_platform_is_wine)
> +    {
> +        todo_wine ok(!err, "setsockopt TCP_KEEPCNT failed: %d\n", WSAGetLastError());
> +        value = 0;
> +        err = getsockopt(s, IPPROTO_TCP, TCP_KEEPCNT, (char*)&value, &size);
> +        todo_wine ok(!err, "getsockopt TCP_KEEPCNT failed\n");
> +        todo_wine ok(value == 5, "TCP_KEEPCNT should be 5, is %ld\n", value);
>
> I'd rather write this as:
> +    err = setsockopt(s, IPPROTO_TCP, TCP_KEEPCNT, (char*)&value, 4);
> +    todo_wine ok(!err || broken(WSAGetLastError() != WSAENOPROTOOPT), "...");
> +    if (!err)
> +    {
> +        value = 0;
> +        err = getsockopt(s, IPPROTO_TCP, TCP_KEEPCNT, (char*)&value, &size);
> +        todo_wine ok(!err, "getsockopt TCP_KEEPCNT failed\n");
> +        todo_wine ok(value == 5, "TCP_KEEPCNT should be 5, is %ld\n", value);

Thanks, I changed it according to your suggestion. I used `== WSAENOPROTOOPT` instead of `!= WSAENOPROTOOPT` as that seems to be correct here.