November 2021 - Wine-Devel - list.winehq.org

[PATCH 6/6] wined3d: Respect the BO memory offset in wined3d_context_gl_map_bo_address().

by Zebediah Figura

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0c8ee0f605b..f02a0f400a6 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2739,7 +2739,7 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, return NULL; } - return (uint8_t *)map_ptr + (uintptr_t)data->addr; + return (uint8_t *)map_ptr + bo->buffer_offset + (uintptr_t)data->addr; } static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct wined3d_const_bo_address *data, @@ -2771,7 +2771,7 @@ static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct for (i = 0; i < range_count; ++i) { GL_EXTCALL(glFlushMappedBufferRangeAPPLE(bo->binding, - (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); + bo->b.buffer_offset + (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); checkGLcall("glFlushMappedBufferRangeAPPLE"); } } -- 2.32.0

Nov. 30, 2021

[PATCH 5/6] wined3d: Do not pass an offset and size to wined3d_bo_gl_map().

by Zebediah Figura

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 700ccace2e5..0c8ee0f605b 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2669,8 +2669,7 @@ void wined3d_context_gl_submit_command_fence(struct wined3d_context_gl *context_ wined3d_context_gl_poll_fences(context_gl); } -static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, - struct wined3d_context_gl *context_gl, size_t offset, size_t size, uint32_t flags) +static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_gl *context_gl, uint32_t flags) { struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); const struct wined3d_gl_info *gl_info; @@ -2712,13 +2711,11 @@ map: if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))))) - map_ptr += offset; + map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))); } else { - if ((map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))))) - map_ptr += offset; + map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); } wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); @@ -2736,10 +2733,13 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, if (!(bo = data->buffer_object)) return data->addr; - if (!(map_ptr = wined3d_bo_gl_map(wined3d_bo_gl(bo), context_gl, (uintptr_t)data->addr, size, flags))) + if (!(map_ptr = wined3d_bo_gl_map(wined3d_bo_gl(bo), context_gl, flags))) + { ERR("Failed to map bo.\n"); + return NULL; + } - return map_ptr; + return (uint8_t *)map_ptr + (uintptr_t)data->addr; } static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct wined3d_const_bo_address *data, -- 2.32.0

Nov. 30, 2021

[PATCH 4/6] wined3d: Always map the whole OpenGL buffer.

by Zebediah Figura

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 675c26ac6fe..700ccace2e5 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2712,7 +2712,8 @@ map: if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, offset, size, wined3d_resource_gl_map_flags(bo, flags))); + if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))))) + map_ptr += offset; } else { @@ -2757,11 +2758,12 @@ static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { + /* The offset passed to glFlushMappedBufferRange() is relative to the + * mapped range, but we map the whole buffer anyway. */ for (i = 0; i < range_count; ++i) { - /* The offset passed to glFlushMappedBufferRange() is relative to - * the mapped range, so don't add data->addr in this case. */ - GL_EXTCALL(glFlushMappedBufferRange(bo->binding, ranges[i].offset, ranges[i].size)); + GL_EXTCALL(glFlushMappedBufferRange(bo->binding, + bo->b.buffer_offset + (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); } } else if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) -- 2.32.0

Nov. 30, 2021

[PATCH 3/6] wined3d: Don't return the BO address offset if glMapBuffer() fails.

by Zebediah Figura

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0b0d594b4b1..675c26ac6fe 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2716,8 +2716,8 @@ map: } else { - map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); - map_ptr += offset; + if ((map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))))) + map_ptr += offset; } wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); -- 2.32.0

Nov. 30, 2021

[PATCH v2 2/6] wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding in glsl_blitter_upload_palette().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4e51402f1cf..327e73796c8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12956,6 +12956,9 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + if (palette) { gl_info->gl_ops.gl.p_glTexImage1D(GL_TEXTURE_1D, 0, GL_RGB, 256, 0, GL_BGRA, -- 2.32.0

Nov. 30, 2021

[PATCH v2 1/6] wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding in wined3d_texture_gl_allocate_mutable_storage().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/texture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d4c7082912b..f0ef42065d3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -930,6 +930,9 @@ static void wined3d_texture_gl_allocate_mutable_storage(struct wined3d_texture_g else layer_count = texture_gl->t.layer_count; + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + for (layer = 0; layer < layer_count; ++layer) { target = wined3d_texture_gl_get_sub_resource_target(texture_gl, layer * level_count); -- 2.32.0

Nov. 30, 2021

Re: [PATCH] ntdll: Set rcx and r11 on exit from syscall dispatcher on x64.

by Paul Gofman

I am sorry, I actually somehow missed the actual test program thus all of my prior questions. While you are probably right in your assessment it still seems to me that these aspects are a bit orthogonal to what I am trying to do. Wine does not handle page faults, host OS does that directly thus we can't track the influence of that on the context, nor I know any application which depends on that. That suggests though that trying to simulate r11 the way my patch does probably doesn't make much sense. I think I will resend the patch without touching r11 at all. Then, if I read your test correctly, WRT rcx handling, you show that the value in rcx stored in the context is not the one my test shows on syscall exit (the rcx in the context is supposed to be the first argument to syscall, right?). But my patch doesn't touch the rcx value in the context (and your test confirms that it should not). On 11/30/21 20:22, Paul Gofman wrote: > Thanks for testing this. First of all, I did not try to simulate every > bit of volatile registers clobbering performed by the kernel. Maybe my > mistake here is rather touching r11 at all (while I mostly care about > rcx now) or at least making those changes in a single patch. Yet your > analysis might be quite helpful, although I can't say I could follow > completely. My questions are inline. > > On 11/30/21 19:56, Jinoh Kang wrote: >> After some testing I found out that the patch's behaviour is inaccurate. >> >> The attached test program does the following: >> >> 1. Set R10 to 0xdeadbeef5a5a5a5a and R11 to 0x0123456789ABCDEF. >> 2. Generate a page fault. > By page fault do you mean exactly page fault per se (transparently > handled by kernel) or access violation? If that's the first not sure > what exactly is it supposed to influence? >> 3. Set R10 to 0xcafebabea5a5a5a5 and R11 to 0xfedcba9876543210. > Set where? If p. 2., concerns access violoation, do you mean in > vectored handle? Or maybe I am not following completely. >> 4. Issue a system call that pauses the current thread. > > Which exactly do you mean, to be sure? > >> 5. Switch to another thread, and dump the previous thread's registers. >> 6. Set all bits in EFLAGS to 1. (0xffffffffffffffff) >> 7. Dump the previous thread's registers again. > > Basically I think it would be much easier to follow if that was > expressed in some sort of pseudocode naming specific functions / seh > handlers etc. > > >> Its output on Windows 10 (20H2) is: >> >>> SharedUserData.SystemCall = 0000000000 >>> >>> Before set context: >>> EFlags = 0x0000000000000246 R11 = 0x0123456789abcdef >>> RIP = 0x00007ffa09e504d4 RCX = 0x0000000000000088 >>> RSP = 0x0000000000ccfef8 R10 = 0xdeadbeef5a5a5a5a >>> >>> After set context: >>> EFlags = 0x0000000000210fd5 R11 = 0x0123456789abcdef >>> RIP = 0x00007ffa09e504d4 RCX = 0x0000000000000088 >>> RSP = 0x0000000000ccfef8 R10 = 0xdeadbeef5a5a5a5a >> From this we can observe the following: >> >> A. KiFastSystemCall doesn't clear bit 1 in R11 by itself. >> Rather, it's the job of NtSetContextThread. > > Yeah, regardless of how this is concluded from a test it looks like > cleaner way to do it to me. > > >> >> B. KiFastSystemCall ignores registers clobbered by the SYSCALL >> instruction. >> It does try to pretend that the 1st argument is being passed to RCX, >> which leaves the actual 1st argument register (R11) unmodified in >> CONTEXT. >> (Also note that this implies the presence of a flag in the real >> kernel >> that records whether R10/R11 are set to valid values or not. >> Otherwise, >> the kernel would be unable to use SYSRET since R11 != RFLAGS, etc.) > >> C. Other entrances to kernel (e.g. a page fault) do record all >> registers. >> These values are preserved until the next time the thread >> switches to >> kernel mode. >> > Again, it would be better to clarify what is meant by page fault but > from this context I suspect you mean access violation (or other > exception)? In Wine this is handled separately, the > syscall_dispatcher() is not involved neither for entering the Unix > part (that is done from signal) nor from continuing to user mode (that > is done by setting registers from the signal handler and returning > right to user mode ntdll entry point). Do you mean your test suggest > some modifications to this part? That might be interesting to know but > I didn't have an intention to cover all of that at once. >

Nov. 30, 2021

[PATCH] ntdll: Remove the no longer used "mutex" argument to server_select().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/server.c | 14 ++++---------- dlls/ntdll/unix/thread.c | 4 ++-- dlls/ntdll/unix/unix_private.h | 3 +-- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index a086d0cb583..1dcd0792072 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -585,8 +585,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO * server_select */ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - timeout_t abs_timeout, context_t *context, pthread_mutex_t *mutex, - user_apc_t *user_apc ) + timeout_t abs_timeout, context_t *context, user_apc_t *user_apc ) { unsigned int ret; int cookie; @@ -635,11 +634,6 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT size = offsetof( select_op_t, signal_and_wait.signal ); } pthread_sigmask( SIG_SETMASK, &old_set, NULL ); - if (mutex) - { - mutex_unlock( mutex ); - mutex = NULL; - } if (signaled) break; ret = wait_select_reply( &cookie ); @@ -669,7 +663,7 @@ unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT f abs_timeout -= now.QuadPart; } - ret = server_select( select_op, size, flags, abs_timeout, NULL, NULL, &apc ); + ret = server_select( select_op, size, flags, abs_timeout, NULL, &apc ); if (ret == STATUS_USER_APC) return invoke_user_apc( NULL, &apc, ret ); /* A test on Windows 2000 shows that Windows always yields during @@ -690,7 +684,7 @@ NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) if (alertable) { - status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); + status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, &apc ); if (status == STATUS_USER_APC) return invoke_user_apc( context, &apc, status ); } return signal_set_full_context( context ); @@ -705,7 +699,7 @@ NTSTATUS WINAPI NtTestAlert(void) user_apc_t apc; NTSTATUS status; - status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); + status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, &apc ); if (status == STATUS_USER_APC) invoke_user_apc( NULL, &apc, STATUS_SUCCESS ); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 00261edb593..7a32f36920f 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1440,7 +1440,7 @@ void wait_suspend( CONTEXT *context ) contexts_to_server( server_contexts, context ); /* wait with 0 timeout, will only return once the thread is no longer suspended */ - server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, server_contexts, NULL, NULL ); + server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, server_contexts, NULL ); contexts_from_server( context, server_contexts ); errno = saved_errno; } @@ -1489,7 +1489,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_c contexts_to_server( server_contexts, context ); server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, - TIMEOUT_INFINITE, server_contexts, NULL, NULL ); + TIMEOUT_INFINITE, server_contexts, NULL ); SERVER_START_REQ( get_exception_status ) { diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 9a9f60a1678..963eb248430 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -158,8 +158,7 @@ extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void server_enter_uninterrupted_section( pthread_mutex_t *mutex, sigset_t *sigset ) DECLSPEC_HIDDEN; extern void server_leave_uninterrupted_section( pthread_mutex_t *mutex, sigset_t *sigset ) DECLSPEC_HIDDEN; extern unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - timeout_t abs_timeout, context_t *context, pthread_mutex_t *mutex, - user_apc_t *user_apc ) DECLSPEC_HIDDEN; + timeout_t abs_timeout, context_t *context, user_apc_t *user_apc ) DECLSPEC_HIDDEN; extern unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, -- 2.32.0

Nov. 30, 2021

Re: [PATCH v4] ws2_32: Fix setsockopt(TCP_NODELAY) when optlen is less than 4.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=103023 Your paranoid android. === debiant2 (32 bit Arabic:Morocco report) === ws2_32: sock.c:295: Test failed: do_synchronous_recv (128): error 10022: sock.c:707: Test failed: simple_client (128): received less data than expected: 32704 of 32768 sock.c:712: Test failed: simple_client (128): test pattern error: 1984

Nov. 30, 2021

[PATCH v4] ws2_32: Fix setsockopt(TCP_NODELAY) when optlen is less than 4.

by Bastien Orivel

According to MSDN [1], the `TCP_NODELAY` parameter should be of type `BOOL` which is 4 bytes. Due to a bug [2] in rustc passing a byte instead of an int, any program written in rust that tries to set that option on a socket will fail with a "Invalid parameter supplied" error. Turns out that setsockopt on linux does not want optlen to be less than 4 bytes [3]. Windows' behavior is the following: - For optlen <= 0, return SOCKET_ERROR and set last error to WSAEFAULT - For optlen > 0, ignore the optlen value and set the TCP_NODELAY value to one if the first byte of the given optvalue is not 0. This will fix any rust program using the hyper library to do HTTP requests. [1]: https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-o… [2]: https://github.com/rust-lang/rust/blob/44593aeb1387b1be355aeaf0040d5927bd80… [3]: https://github.com/torvalds/linux/blob/d58071a8a76d779eedab38033ae4c821c302… Signed-off-by: Bastien Orivel <eijebong(a)bananium.fr> --- dlls/ws2_32/socket.c | 10 ++++++-- dlls/ws2_32/tests/sock.c | 53 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2db441bee3c..5ac88c47b2e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2868,8 +2868,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int switch(optname) { case TCP_NODELAY: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, optval, optlen ); - + { + INT nodelay = *optval; + if (optlen <= 0) { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&nodelay, sizeof(nodelay) ); + } 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 02713a7c625..464a6e5c8ea 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1259,6 +1259,59 @@ static void test_set_getsockopt(void) ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + /* TCP_NODELAY: optlen doesn't matter on windows, it should work with any positive value */ + size = sizeof(value); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 1); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 1\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 42); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 42\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 0); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + + value = 0x100; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4 and optvalue = 0x100\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + /* 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); -- 2.34.0

Nov. 30, 2021