wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Alexandre Julliard : ntdll: Store the pthread TEB value on thread init.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: cec3db10f4e5af4aec8782423b1d4d05bb71b7e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cec3db10f4e5af4aec878242… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 12:31:53 2021 +0200 ntdll: Store the pthread TEB value on thread init. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 56dc640e082..6175bb9b230 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -311,11 +311,13 @@ struct amd64_thread_data DWORD_PTR dr7; /* 0318 */ void *exit_frame; /* 0320 exit frame pointer */ struct syscall_frame *syscall_frame; /* 0328 syscall frame pointer */ + void *pthread_teb; /* 0330 thread data for pthread */ }; C_ASSERT( sizeof(struct amd64_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, exit_frame ) == 0x320 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, syscall_frame ) == 0x328 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, pthread_teb ) == 0x330 ); static inline struct amd64_thread_data *amd64_thread_data(void) { @@ -2740,6 +2742,7 @@ void signal_init_thread( TEB *teb ) #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); + arch_prctl( ARCH_GET_FS, &amd64_thread_data()->pthread_teb ); #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) amd64_set_gsbase( teb ); #elif defined(__NetBSD__) @@ -2751,11 +2754,12 @@ void signal_init_thread( TEB *teb ) __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" : : "r" (teb->ThreadLocalStoragePointer), "n" (FIELD_OFFSET(TEB, ThreadLocalStoragePointer))); + amd64_thread_data()->pthread_teb = mac_thread_gsbase(); /* alloc_tls_slot() needs to poke a value to an address relative to each thread's gsbase. Have each thread record its gsbase pointer into its TEB so alloc_tls_slot() can find it. */ - teb->Reserved5[0] = mac_thread_gsbase(); + teb->Reserved5[0] = amd64_thread_data()->pthread_teb; #else # error Please define setting %gs for your architecture #endif

1 0

Alexandre Julliard : wow64win: Add stub dll.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 5388a80e1821568b02f66e795bcb67090d1590b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5388a80e1821568b02f66e79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 10:46:50 2021 +0200 wow64win: Add stub dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 5 +++++ configure.ac | 4 ++++ dlls/wow64win/Makefile.in | 1 + dlls/wow64win/wow64win.spec | 2 ++ 4 files changed, 12 insertions(+) diff --git a/configure b/configure index eaab3b2ef35..f9dce332f63 100755 --- a/configure +++ b/configure @@ -1722,6 +1722,7 @@ enable_wmvcore enable_wnaspi32 enable_wow64 enable_wow64cpu +enable_wow64win enable_wpc enable_wpcap enable_ws2_32 @@ -5750,6 +5751,7 @@ $as_echo "$wine_cv_builtin_ms_va_list" >&6; } notice_platform="64-bit " TARGETFLAGS="$TARGETFLAGS -m64" enable_wow64=${enable_wow64:-yes} + enable_wow64win=${enable_wow64win:-yes} enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; @@ -5865,6 +5867,7 @@ fi $as_echo "$wine_cv_builtin_ms_va_list" >&6; } test $wine_cv_builtin_ms_va_list != no || as_fn_error $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5 enable_wow64=${enable_wow64:-yes} + enable_wow64win=${enable_wow64win:-yes} ;; i[3456789]86*) enable_win16=${enable_win16:-yes} @@ -5875,6 +5878,7 @@ esac enable_win16=${enable_win16:-no} enable_win64=${enable_win64:-no} enable_wow64=${enable_wow64:-no} +enable_wow64win=${enable_wow64win:-no} enable_wow64cpu=${enable_wow64cpu:-no} enable_winetest=${enable_winetest:-$enable_tests} @@ -21152,6 +21156,7 @@ wine_fn_config_makefile dlls/wnaspi32 enable_wnaspi32 wine_fn_config_makefile dlls/wow32 enable_win16 wine_fn_config_makefile dlls/wow64 enable_wow64 wine_fn_config_makefile dlls/wow64cpu enable_wow64cpu +wine_fn_config_makefile dlls/wow64win enable_wow64win wine_fn_config_makefile dlls/wpc enable_wpc wine_fn_config_makefile dlls/wpc/tests enable_tests wine_fn_config_makefile dlls/wpcap enable_wpcap diff --git a/configure.ac b/configure.ac index 84c3137f2dd..1d0f09ad7e1 100644 --- a/configure.ac +++ b/configure.ac @@ -171,6 +171,7 @@ case $host in notice_platform="64-bit " TARGETFLAGS="$TARGETFLAGS -m64" enable_wow64=${enable_wow64:-yes} + enable_wow64win=${enable_wow64win:-yes} enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; @@ -217,6 +218,7 @@ case $host in [wine_cv_builtin_ms_va_list=yes],[wine_cv_builtin_ms_va_list=no])]) test $wine_cv_builtin_ms_va_list != no || AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.]) enable_wow64=${enable_wow64:-yes} + enable_wow64win=${enable_wow64win:-yes} ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} @@ -228,6 +230,7 @@ dnl enable_win16 defaults to yes on x86, to no on other CPUs enable_win16=${enable_win16:-no} enable_win64=${enable_win64:-no} enable_wow64=${enable_wow64:-no} +enable_wow64win=${enable_wow64win:-no} enable_wow64cpu=${enable_wow64cpu:-no} dnl Disable winetest too if tests are disabled @@ -3825,6 +3828,7 @@ WINE_CONFIG_MAKEFILE(dlls/wnaspi32) WINE_CONFIG_MAKEFILE(dlls/wow32,enable_win16) WINE_CONFIG_MAKEFILE(dlls/wow64) WINE_CONFIG_MAKEFILE(dlls/wow64cpu) +WINE_CONFIG_MAKEFILE(dlls/wow64win) WINE_CONFIG_MAKEFILE(dlls/wpc) WINE_CONFIG_MAKEFILE(dlls/wpc/tests) WINE_CONFIG_MAKEFILE(dlls/wpcap) diff --git a/dlls/wow64win/Makefile.in b/dlls/wow64win/Makefile.in new file mode 100644 index 00000000000..3107ce5e537 --- /dev/null +++ b/dlls/wow64win/Makefile.in @@ -0,0 +1 @@ +MODULE = wow64win.dll diff --git a/dlls/wow64win/wow64win.spec b/dlls/wow64win/wow64win.spec new file mode 100644 index 00000000000..8ca119ffb34 --- /dev/null +++ b/dlls/wow64win/wow64win.spec @@ -0,0 +1,2 @@ +#@ extern sdwhcon +#@ extern sdwhwin32

1 0

Alexandre Julliard : wow64: Add stub dll.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 7144e630d57fb47fe977be24f29a25d9226116ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=7144e630d57fb47fe977be24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 10:42:52 2021 +0200 wow64: Add stub dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 5 +++++ configure.ac | 4 ++++ dlls/wow64/Makefile.in | 2 ++ dlls/wow64/wow64.spec | 27 +++++++++++++++++++++++++++ 4 files changed, 38 insertions(+) diff --git a/configure b/configure index c5a0e4d177c..eaab3b2ef35 100755 --- a/configure +++ b/configure @@ -1720,6 +1720,7 @@ enable_wmp enable_wmphoto enable_wmvcore enable_wnaspi32 +enable_wow64 enable_wow64cpu enable_wpc enable_wpcap @@ -5748,6 +5749,7 @@ $as_echo "$wine_cv_builtin_ms_va_list" >&6; } host_cpu="x86_64" notice_platform="64-bit " TARGETFLAGS="$TARGETFLAGS -m64" + enable_wow64=${enable_wow64:-yes} enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; @@ -5862,6 +5864,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_builtin_ms_va_list" >&5 $as_echo "$wine_cv_builtin_ms_va_list" >&6; } test $wine_cv_builtin_ms_va_list != no || as_fn_error $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5 + enable_wow64=${enable_wow64:-yes} ;; i[3456789]86*) enable_win16=${enable_win16:-yes} @@ -5871,6 +5874,7 @@ esac enable_win16=${enable_win16:-no} enable_win64=${enable_win64:-no} +enable_wow64=${enable_wow64:-no} enable_wow64cpu=${enable_wow64cpu:-no} enable_winetest=${enable_winetest:-$enable_tests} @@ -21146,6 +21150,7 @@ wine_fn_config_makefile dlls/wmvcore enable_wmvcore wine_fn_config_makefile dlls/wmvcore/tests enable_tests wine_fn_config_makefile dlls/wnaspi32 enable_wnaspi32 wine_fn_config_makefile dlls/wow32 enable_win16 +wine_fn_config_makefile dlls/wow64 enable_wow64 wine_fn_config_makefile dlls/wow64cpu enable_wow64cpu wine_fn_config_makefile dlls/wpc enable_wpc wine_fn_config_makefile dlls/wpc/tests enable_tests diff --git a/configure.ac b/configure.ac index f0a42cf3b0a..84c3137f2dd 100644 --- a/configure.ac +++ b/configure.ac @@ -170,6 +170,7 @@ case $host in host_cpu="x86_64" notice_platform="64-bit " TARGETFLAGS="$TARGETFLAGS -m64" + enable_wow64=${enable_wow64:-yes} enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; @@ -215,6 +216,7 @@ case $host in [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], [wine_cv_builtin_ms_va_list=yes],[wine_cv_builtin_ms_va_list=no])]) test $wine_cv_builtin_ms_va_list != no || AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.]) + enable_wow64=${enable_wow64:-yes} ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} @@ -225,6 +227,7 @@ esac dnl enable_win16 defaults to yes on x86, to no on other CPUs enable_win16=${enable_win16:-no} enable_win64=${enable_win64:-no} +enable_wow64=${enable_wow64:-no} enable_wow64cpu=${enable_wow64cpu:-no} dnl Disable winetest too if tests are disabled @@ -3820,6 +3823,7 @@ WINE_CONFIG_MAKEFILE(dlls/wmvcore) WINE_CONFIG_MAKEFILE(dlls/wmvcore/tests) WINE_CONFIG_MAKEFILE(dlls/wnaspi32) WINE_CONFIG_MAKEFILE(dlls/wow32,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/wow64) WINE_CONFIG_MAKEFILE(dlls/wow64cpu) WINE_CONFIG_MAKEFILE(dlls/wpc) WINE_CONFIG_MAKEFILE(dlls/wpc/tests) diff --git a/dlls/wow64/Makefile.in b/dlls/wow64/Makefile.in new file mode 100644 index 00000000000..9d0618f8e3e --- /dev/null +++ b/dlls/wow64/Makefile.in @@ -0,0 +1,2 @@ +MODULE = wow64.dll +IMPORTLIB = wow64 diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec new file mode 100644 index 00000000000..f9230ced19a --- /dev/null +++ b/dlls/wow64/wow64.spec @@ -0,0 +1,27 @@ +@ stub Wow64AllocThreadHeap +@ stub Wow64AllocateHeap +@ stub Wow64AllocateTemp +@ stub Wow64ApcRoutine +@ stub Wow64CheckIfNXEnabled +@ stub Wow64EmulateAtlThunk +@ stub Wow64FreeHeap +@ stub Wow64FreeThreadHeap +@ stub Wow64GetWow64ImageOption +@ stub Wow64IsControlFlowGuardEnforced +@ stub Wow64IsStackExtentsCheckEnforced +@ stub Wow64KiUserCallbackDispatcher +@ stub Wow64LdrpInitialize +@ stub Wow64LogPrint +@ stub Wow64NotifyUnsimulateComplete +@ stub Wow64PassExceptionToGuest +@ stub Wow64PrepareForDebuggerAttach +@ stub Wow64PrepareForException +@ stub Wow64RaiseException +@ stub Wow64ShallowThunkAllocObjectAttributes32TO64_FNC +@ stub Wow64ShallowThunkAllocSecurityQualityOfService32TO64_FNC +@ stub Wow64ShallowThunkSIZE_T32TO64 +@ stub Wow64ShallowThunkSIZE_T64TO32 +@ stub Wow64SuspendLocalThread +@ stub Wow64SystemServiceEx +@ stub Wow64ValidateUserCallTarget +@ stub Wow64ValidateUserCallTargetFilter

1 0

Francois Gouget : kernel32: Fix the formatting of an NLS_IsUnicodeOnlyLcid() trace.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: ea236aa9817f89f4aea7393b366248584027cae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea236aa9817f89f4aea7393b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 5 23:40:05 2021 +0200 kernel32: Fix the formatting of an NLS_IsUnicodeOnlyLcid() trace. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 47f55b4b27d..a9dfbf09be2 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -333,7 +333,7 @@ static BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) case LANG_MARATHI: case LANG_PUNJABI: case LANG_SANSKRIT: - TRACE("lcid 0x%08x: langid 0x%4x is Unicode Only\n", lcid, PRIMARYLANGID(lcid)); + TRACE("lcid 0x%08x: langid 0x%04x is Unicode Only\n", lcid, PRIMARYLANGID(lcid)); return TRUE; default: return FALSE;

1 0

Zebediah Figura : server: Report AFD_POLL_CONNECT_ERR if a previous connection attempt failed.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 53e69130cce85bf59830c1f6f3c9f21084216ab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e69130cce85bf59830c1f6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:14:19 2021 -0500 server: Report AFD_POLL_CONNECT_ERR if a previous connection attempt failed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51331 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51366 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 51 ++++++++++++++++++++---------------------------- dlls/ws2_32/tests/sock.c | 16 +++++++-------- server/sock.c | 8 ++++++++ 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 9afb8e86dc9..4b8796157aa 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -464,30 +464,24 @@ static void test_poll(void) memset(out_params, 0xcc, sizeof(out_buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); - todo_wine - { - ok(!ret, "got %#x\n", ret); - ok(!io.Status, "got %#x\n", io.Status); - ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); - ok(out_params->count == 1, "got count %u\n", out_params->count); - ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); - ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); - ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); - } + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#x\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); + ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); memset(out_params, 0xcc, sizeof(out_buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); - todo_wine - { - ok(!ret, "got %#x\n", ret); - ok(!io.Status, "got %#x\n", io.Status); - ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); - ok(out_params->count == 1, "got count %u\n", out_params->count); - ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); - ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); - ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); - } + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#x\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); + ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); ok(ret == -1, "got %d\n", ret); @@ -514,16 +508,13 @@ static void test_poll(void) memset(out_params, 0xcc, sizeof(out_buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); - todo_wine - { - ok(!ret, "got %#x\n", ret); - ok(!io.Status, "got %#x\n", io.Status); - ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); - ok(out_params->count == 1, "got count %u\n", out_params->count); - ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); - ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); - ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); - } + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#x\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); + ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); closesocket(client); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index df5a69b4564..9e7cd3a1d39 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3263,8 +3263,8 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 10; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok(ret == 1, "expected 1, got %d\n", ret); - todo_wine ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); len = sizeof(id); @@ -3285,8 +3285,8 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 10; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok(ret == 1, "got %d\n", ret); - todo_wine ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(ret == 1, "got %d\n", ret); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); /* Calling connect() doesn't reset the socket error, but a successful * connection does. This is kind of tricky to test, because while @@ -3315,8 +3315,8 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 10; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok(ret == 1, "got %d\n", ret); - todo_wine ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(ret == 1, "got %d\n", ret); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); len = sizeof(address); ret = getsockname(fdListen, (struct sockaddr *)&address, &len); @@ -3362,8 +3362,8 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 0; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok(ret == 1, "expected 1, got %d\n", ret); - todo_wine ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); len = sizeof(id); id = 0xdeadbeef; diff --git a/server/sock.c b/server/sock.c index b1cf628abae..58e9cf4302a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2820,6 +2820,14 @@ static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t t output[i].flags = flags; output[i].status = sock_get_ntstatus( sock_error( sock->fd ) ); } + + /* FIXME: do other error conditions deserve a similar treatment? */ + if (sock->state != SOCK_CONNECTING && sock->errors[AFD_POLL_BIT_CONNECT_ERR] && (mask & AFD_POLL_CONNECT_ERR)) + { + req->iosb->status = STATUS_SUCCESS; + output[i].flags |= AFD_POLL_CONNECT_ERR; + output[i].status = sock_get_ntstatus( sock->errors[AFD_POLL_BIT_CONNECT_ERR] ); + } } if (req->iosb->status != STATUS_PENDING)

1 0

Zebediah Figura : server: Separate a poll_single_socket() helper.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: c86ba5d09dc6aff244f051bca5abd43943351438 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c86ba5d09dc6aff244f051bc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:14:18 2021 -0500 server: Separate a poll_single_socket() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/server/sock.c b/server/sock.c index 2b5915c87fe..b1cf628abae 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2734,6 +2734,29 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } } +static int poll_single_socket( struct sock *sock, int mask ) +{ + struct pollfd pollfd; + + pollfd.fd = get_unix_fd( sock->fd ); + pollfd.events = poll_flags_from_afd( sock, mask ); + if (pollfd.events < 0 || poll( &pollfd, 1, 0 ) < 0) + return 0; + + if ((mask & AFD_POLL_HUP) && (pollfd.revents & POLLIN) && sock->type == WS_SOCK_STREAM) + { + char dummy; + + if (!recv( get_unix_fd( sock->fd ), &dummy, 1, MSG_PEEK )) + { + pollfd.revents &= ~POLLIN; + pollfd.revents |= POLLHUP; + } + } + + return get_poll_flags( sock, pollfd.revents ) & mask; +} + static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t timeout, unsigned int count, const struct poll_socket_input *input ) { @@ -2788,26 +2811,9 @@ static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t t for (i = 0; i < count; ++i) { struct sock *sock = req->sockets[i].sock; - struct pollfd pollfd; - int flags; - - pollfd.fd = get_unix_fd( sock->fd ); - pollfd.events = poll_flags_from_afd( sock, req->sockets[i].flags ); - if (pollfd.events < 0 || poll( &pollfd, 1, 0 ) < 0) continue; - - if ((req->sockets[i].flags & AFD_POLL_HUP) && (pollfd.revents & POLLIN) && - sock->type == WS_SOCK_STREAM) - { - char dummy; - - if (!recv( get_unix_fd( sock->fd ), &dummy, 1, MSG_PEEK )) - { - pollfd.revents &= ~POLLIN; - pollfd.revents |= POLLHUP; - } - } + int mask = req->sockets[i].flags; + int flags = poll_single_socket( sock, mask ); - flags = get_poll_flags( sock, pollfd.revents ) & req->sockets[i].flags; if (flags) { req->iosb->status = STATUS_SUCCESS;

1 0

Zebediah Figura : server: Return a Win32 error code from IOCTL_AFD_WINE_GET_SO_ERROR.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 026b192018e254c74c6a1f07d82637716ff48e8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=026b192018e254c74c6a1f07… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:14:17 2021 -0500 server: Return a Win32 error code from IOCTL_AFD_WINE_GET_SO_ERROR. Fixes: fb3956fcf94397bed53598943a9524520bc23e08 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 10 +++++----- server/sock.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1b697423e27..df5a69b4564 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3271,13 +3271,13 @@ static void test_select(void) id = 0xdeadbeef; ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char *)&id, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - todo_wine ok(id == WSAECONNREFUSED, "got error %u\n", id); + ok(id == WSAECONNREFUSED, "got error %u\n", id); len = sizeof(id); id = 0xdeadbeef; ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char *)&id, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - todo_wine ok(id == WSAECONNREFUSED, "got error %u\n", id); + ok(id == WSAECONNREFUSED, "got error %u\n", id); FD_ZERO_ALL(); FD_SET(fdWrite, &readfds); @@ -3307,7 +3307,7 @@ static void test_select(void) id = 0xdeadbeef; ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char *)&id, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - todo_wine ok(id == WSAECONNREFUSED, "got error %u\n", id); + ok(id == WSAECONNREFUSED, "got error %u\n", id); FD_ZERO_ALL(); FD_SET(fdWrite, &readfds); @@ -6515,13 +6515,13 @@ static void test_WSAPoll(void) err = 0xdeadbeef; ret = getsockopt(client, SOL_SOCKET, SO_ERROR, (char *)&err, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - todo_wine ok(err == WSAECONNREFUSED, "got error %u\n", err); + ok(err == WSAECONNREFUSED, "got error %u\n", err); len = sizeof(err); err = 0xdeadbeef; ret = getsockopt(client, SOL_SOCKET, SO_ERROR, (char *)&err, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - todo_wine ok(err == WSAECONNREFUSED, "got error %u\n", err); + ok(err == WSAECONNREFUSED, "got error %u\n", err); check_poll_todo(client, POLLWRNORM | POLLHUP | POLLERR); diff --git a/server/sock.c b/server/sock.c index befa9117c13..2b5915c87fe 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2587,7 +2587,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { if (sock->errors[i]) { - error = sock->errors[i]; + error = sock_get_error( sock->errors[i] ); break; } }

1 0

Zebediah Figura : ws2_32/tests: Add more tests for connection failure.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 91e4596b9e64369c93d0ae5c552a05bc356f7be7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91e4596b9e64369c93d0ae5c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:14:16 2021 -0500 ws2_32/tests: Add more tests for connection failure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 86 ++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 153 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 233 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=91e4596b9e64369c93d0…

1 0

Zebediah Figura : ws2_32/tests: Fix some connection timeout tests.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 65dee2d28c0198cedafae9a79aa07e07f94945ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=65dee2d28c0198cedafae9a7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:14:15 2021 -0500 ws2_32/tests: Fix some connection timeout tests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 6 ++++-- dlls/ws2_32/tests/sock.c | 30 ++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 8f7f4acf4f2..2637630ce8d 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -448,7 +448,8 @@ static void test_poll(void) addr.sin_port = 255; ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); - ok(!ret || WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); ret = WaitForSingleObject(event, 10000); ok(!ret, "got %#x\n", ret); @@ -474,6 +475,7 @@ static void test_poll(void) server = accept(listener, NULL, NULL); ok(server != -1, "got error %u\n", WSAGetLastError()); + in_params->timeout = -1000 * 10000; in_params->count = 2; in_params->sockets[0].socket = client; in_params->sockets[0].flags = AFD_POLL_READ; @@ -1310,7 +1312,7 @@ static void test_get_events(void) ok(ret == -1, "expected failure\n"); ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - ret = WaitForSingleObject(event, 2000); + ret = WaitForSingleObject(event, 10000); ok(!ret, "got %#x\n", ret); memset(&params, 0xcc, sizeof(params)); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8617a6fb7e3..1fd75dc40d8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3252,17 +3252,20 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 10; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - ok(ret == 1, "expected 1, got %d\n", ret); + todo_wine ok(ret == 1, "expected 1, got %d\n", ret); len = sizeof(id); id = 0xdeadbeef; ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); - ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + todo_wine ok(id == WSAECONNREFUSED, "got error %u\n", id); + todo_wine ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); closesocket(fdWrite); } + select_timeout.tv_sec = 1; + select_timeout.tv_usec = 250000; + /* Try select() on a closed socket after connection */ tcp_socketpair(&fdRead, &fdWrite); closesocket(fdRead); @@ -6372,22 +6375,33 @@ static void test_WSAPoll(void) * so make the test interactive-only. */ if (winetest_interactive) { - const struct sockaddr_in invalid_addr = {.sin_family = AF_INET, .sin_addr.s_addr = inet_addr("192.0.2.0")}; + const struct sockaddr_in invalid_addr = + { + .sin_family = AF_INET, + .sin_addr.s_addr = htonl(INADDR_LOOPBACK), + .sin_port = 255, + }; + SOCKET client; - client = setup_connector_socket(&invalid_addr, sizeof(invalid_addr), TRUE); + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + set_blocking(client, FALSE); + + ret = connect(client, (const struct sockaddr *)&invalid_addr, sizeof(invalid_addr)); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); fds[0].fd = client; fds[0].events = POLLRDNORM | POLLRDBAND | POLLWRNORM; fds[0].revents = 0xdead; ret = pWSAPoll(fds, 1, 10000); - ok(ret == 1, "got %d\n", ret); - ok(fds[0].revents == POLLERR, "got events %#x\n", fds[0].revents); + todo_wine ok(ret == 1, "got %d\n", ret); + todo_wine ok(fds[0].revents == (POLLWRNORM | POLLHUP | POLLERR), "got events %#x\n", fds[0].revents); len = sizeof(err); err = 0xdeadbeef; ret = getsockopt(client, SOL_SOCKET, SO_ERROR, (char *)&err, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - ok(err == WSAECONNREFUSED, "expected 10061, got %d\n", err); + todo_wine ok(err == WSAECONNREFUSED, "got error %u\n", err); closesocket(client); }

1 0

Zhiyi Zhang : user32: Draw scroll bar size box and size grip in a single function.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 780e5c83dc802d963d837af8bf0e85096355c980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=780e5c83dc802d963d837af8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 6 15:08:10 2021 +0800 user32: Draw scroll bar size box and size grip in a single function. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 62 ++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index d7a4f412785..5561509c50c 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -296,6 +296,16 @@ static void SCROLL_GetScrollBarDrawInfo( HWND hwnd, INT bar, { INT pos, max_size; + if (bar == SB_CTL && GetWindowLongW( hwnd, GWL_STYLE ) & (SBS_SIZEGRIP | SBS_SIZEBOX)) + { + GetClientRect( hwnd, rect ); + *arrow_size = 0; + *thumb_pos = 0; + *thumb_size = 0; + *vertical = FALSE; + return; + } + *vertical = SCROLL_GetScrollBarRect( hwnd, bar, rect, arrow_size, thumb_size, thumb_pos ); if (SCROLL_MovingThumb && tracking_info->win == hwnd && tracking_info->bar == bar) @@ -564,6 +574,28 @@ static void SCROLL_DoDrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HI { SCROLLBAR_INFO *infoPtr; + if (nBar == SB_CTL) + { + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + + if (style & SBS_SIZEGRIP) + { + RECT rc = *rect; + + FillRect( hdc, &rc, GetSysColorBrush( COLOR_SCROLLBAR ) ); + rc.left = max( rc.left, rc.right - GetSystemMetrics( SM_CXVSCROLL ) - 1 ); + rc.top = max( rc.top, rc.bottom - GetSystemMetrics( SM_CYHSCROLL ) - 1 ); + DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); + return; + } + + if (style & SBS_SIZEBOX) + { + FillRect( hdc, rect, GetSysColorBrush( COLOR_SCROLLBAR ) ); + return; + } + } + if (!(infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ))) return; @@ -658,23 +690,6 @@ void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, g_tracking_info.hit_test, &g_tracking_info, TRUE, TRUE ); } -/*********************************************************************** - * SCROLL_DrawSizeGrip - * - * Draw the size grip. - */ -static void SCROLL_DrawSizeGrip( HWND hwnd, HDC hdc) -{ - RECT rc; - - GetClientRect( hwnd, &rc ); - FillRect( hdc, &rc, GetSysColorBrush(COLOR_SCROLLBAR) ); - rc.left = max( rc.left, rc.right - GetSystemMetrics(SM_CXVSCROLL) - 1 ); - rc.top = max( rc.top, rc.bottom - GetSystemMetrics(SM_CYHSCROLL) - 1 ); - DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); -} - - /*********************************************************************** * SCROLL_RefreshScrollBar * @@ -1413,18 +1428,7 @@ LRESULT ScrollBarWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM { PAINTSTRUCT ps; HDC hdc = wParam ? (HDC)wParam : BeginPaint(hwnd, &ps); - if (GetWindowLongW( hwnd, GWL_STYLE ) & SBS_SIZEGRIP) - { - SCROLL_DrawSizeGrip( hwnd, hdc); - } - else if (GetWindowLongW( hwnd, GWL_STYLE ) & SBS_SIZEBOX) - { - RECT rc; - GetClientRect( hwnd, &rc ); - FillRect( hdc, &rc, GetSysColorBrush(COLOR_SCROLLBAR) ); - } - else - SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, g_tracking_info.hit_test, &g_tracking_info, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, g_tracking_info.hit_test, &g_tracking_info, TRUE, TRUE ); if (!wParam) EndPaint(hwnd, &ps); } break;

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021