July 2021 - Wine-Commits - list.winehq.org

Francois Gouget : mlang/tests: Fix the check for non-English locales in test_GetCodePageInfo().
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: 237befbe4d69fb275ad77e1907d2f06821c7850e URL: https://source.winehq.org/git/wine.git/?a=commit;h=237befbe4d69fb275ad77e19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 6 16:56:23 2021 +0200 mlang/tests: Fix the check for non-English locales in test_GetCodePageInfo(). The strings returned by GetCodePageInfo() depend on the thread's UI language, not the system locale or the thread's standards and formats settings. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index d3a71e935d6..1486a643604 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2511,6 +2511,29 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) todo_wine ok(detected[2] == 1200, "got %u\n", detected[2]); } +/* Returns true if the user interface is in English. Note that this does not + * presume of the formatting of dates, numbers, etc. + */ +static BOOL is_lang_english(void) +{ + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + static void test_GetCodePageInfo(IMultiLanguage2 *iML2) { static const DWORD VALID_MASK = (DWORD)(~(MIMECONTF_VALID_NLS | MIMECONTF_VALID)); @@ -2560,10 +2583,9 @@ static void test_GetCodePageInfo(IMultiLanguage2 *iML2) "%d: got wrong wszBodyCharset expected %s return %s.\n", i, wine_dbgstr_w(cpinfo_cmp.wszBodyCharset), wine_dbgstr_w(cpinfo.wszBodyCharset)); - if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) || - (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)) + if (!is_lang_english()) { - /* FIXME: Windows returns description and font name in system's language */ + /* FIXME: Cannot test non-English descriptions and font names */ skip("Non-English locale\n"); } else

1 0

Zebediah Figura : wined3d: Set an array of shader resource views as a single CS operation.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: 7698b9e25a1f039a0ad6c70cfe43c16aed51029e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7698b9e25a1f039a0ad6c70c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 21:40:53 2021 -0500 wined3d: Set an array of shader resource views as a single CS operation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 169 +++++++++++++++-------------------------- dlls/wined3d/cs.c | 53 +++++++------ dlls/wined3d/device.c | 71 ++++++++++------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 6 +- include/wine/wined3d.h | 5 +- 6 files changed, 141 insertions(+), 165 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7698b9e25a1f039a0ad6…

1 0

Zebediah Figura : wined3d: Pass a wined3d_cs pointer to wined3d_not_from_cs().
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: a68cdf4a41a19fc52311250356c4e8db8cf87d1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a68cdf4a41a19fc523112503… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:32:13 2021 -0500 wined3d: Pass a wined3d_cs pointer to wined3d_not_from_cs(). This partially reverts 6a9752bf5e3cff3ceb4249d5a5e59b4d548008d1. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d7e1d1383a8..b7c48d2d0a9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2457,7 +2457,7 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, /* Mapping resources from the worker thread isn't an issue by itself, but * increasing the map count would be visible to applications. */ - wined3d_not_from_cs(context->device); + wined3d_not_from_cs(context->device->cs); wined3d_resource_wait_idle(resource); @@ -2502,7 +2502,7 @@ HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context return WINED3D_OK; } - wined3d_not_from_cs(context->device); + wined3d_not_from_cs(context->device->cs); op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UNMAP; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6e600a59b72..b97d565c42d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5536,7 +5536,7 @@ void device_resource_add(struct wined3d_device *device, struct wined3d_resource { TRACE("device %p, resource %p.\n", device, resource); - wined3d_not_from_cs(device); + wined3d_not_from_cs(device->cs); list_add_head(&device->resources, &resource->resource_list_entry); } @@ -5545,7 +5545,7 @@ static void device_resource_remove(struct wined3d_device *device, struct wined3d { TRACE("device %p, resource %p.\n", device, resource); - wined3d_not_from_cs(device); + wined3d_not_from_cs(device->cs); list_remove(&resource->resource_list_entry); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 935fdb5cb4e..5f0c2bb6732 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6041,9 +6041,9 @@ static inline void wined3d_from_cs(const struct wined3d_cs *cs) assert(cs->thread_id == GetCurrentThreadId()); } -static inline void wined3d_not_from_cs(const struct wined3d_device *device) +static inline void wined3d_not_from_cs(const struct wined3d_cs *cs) { - assert(device->cs->thread_id != GetCurrentThreadId()); + assert(cs->thread_id != GetCurrentThreadId()); } static inline enum wined3d_material_color_source validate_material_colour_source(WORD use_map,

1 0

Zebediah Figura : server: Separate a poll_single_socket() helper.
by Alexandre Julliard July 6, 2021

July 6, 2021

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

Alexandre Julliard : ntdll: Store the pthread TEB value on thread init.
by Alexandre Julliard July 6, 2021

July 6, 2021

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 : winebuild: Add a specific platform id for Linux.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: 5e12256ec41189579cc3d2471d1ddf37ca9181ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e12256ec41189579cc3d247… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 12:50:30 2021 +0200 winebuild: Add a specific platform id for Linux. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 84938aabf4f..1918932ad1f 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -152,6 +152,7 @@ enum target_platform { PLATFORM_UNSPECIFIED, PLATFORM_APPLE, + PLATFORM_LINUX, PLATFORM_FREEBSD, PLATFORM_MINGW, PLATFORM_SOLARIS, diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 72e13b7992b..8c0e77030b6 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -67,6 +67,8 @@ enum target_cpu target_cpu = CPU_ARM64; #ifdef __APPLE__ enum target_platform target_platform = PLATFORM_APPLE; +#elif defined(__linux__) +enum target_platform target_platform = PLATFORM_LINUX; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) enum target_platform target_platform = PLATFORM_FREEBSD; #elif defined(__sun) @@ -132,6 +134,7 @@ static const struct { { "macos", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE }, + { "linux", PLATFORM_LINUX }, { "freebsd", PLATFORM_FREEBSD }, { "solaris", PLATFORM_SOLARIS }, { "mingw32", PLATFORM_MINGW },

1 0

Zebediah Figura : wined3d: Set an array of constant buffers as a single CS operation.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: e6bbf6ee9151c632bfc9e73b785e51dcb001d0ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6bbf6ee9151c632bfc9e73b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 21:40:52 2021 -0500 wined3d: Set an array of constant buffers as a single CS operation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 38 ++++++++++++++++++++++-------- dlls/wined3d/cs.c | 53 ++++++++++++++++++++++++------------------ dlls/wined3d/device.c | 37 ++++++++++++++++------------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 5 ++-- include/wine/wined3d.h | 5 ++-- 6 files changed, 87 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6bbf6ee9151c632bfc9…

1 0

Alexandre Julliard : wow64win: Add stub dll.
by Alexandre Julliard July 6, 2021

July 6, 2021

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

Zebediah Figura : server: Return a Win32 error code from IOCTL_AFD_WINE_GET_SO_ERROR.
by Alexandre Julliard July 6, 2021

July 6, 2021

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

Alexandre Julliard : wow64: Add stub dll.
by Alexandre Julliard July 6, 2021

July 6, 2021

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