- Wine-Devel - list.winehq.org

[PATCH] ucrtbase: Copy fenv tests from msvcr120.
by Piotr Caban May 18, 2021

May 18, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 167 +++++++++++++++++++++++++++++++++++++ include/msvcrt/fenv.h | 1 + 2 files changed, 168 insertions(+)

1 0

[PATCH] msvcrt: Add sincos to importlib.
by Jacek Caban May 18, 2021

May 18, 2021

Fixes cross compilation with GCC 11, which may optimize a pair of sin(), cos() calls to a single sincos() call, which is not exported by any msvcrt version. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcr100/Makefile.in | 1 + dlls/msvcr110/Makefile.in | 1 + dlls/msvcr120/Makefile.in | 1 + dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcr80/Makefile.in | 1 + dlls/msvcr90/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/sincos.c | 40 +++++++++++++++++++++++++++++++++++++++ dlls/ucrtbase/Makefile.in | 1 + 10 files changed, 49 insertions(+) create mode 100644 dlls/msvcrt/sincos.c

2 1

[PATCH v3] ws2_32: Check if waiting asyncs exist in WSARecv/WSASend
by Dongwan Kim May 18, 2021

May 18, 2021

WSARecv call should not intercept message for the waiting overlapped WSARecv. To do that, We should know if waiting asyncs exist before trying ws2_recv/ws2_send. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/ws2_32/socket.c | 31 +++++++++++++++++++++++++++++-- include/wine/server_protocol.h | 20 +++++++++++++++++++- server/protocol.def | 8 ++++++++ server/request.h | 8 ++++++++ server/sock.c | 26 ++++++++++++++++++++++++++ server/trace.c | 12 ++++++++++++ 6 files changed, 102 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3a8bfa0ce41..cf76d96894c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2016,6 +2016,23 @@ static void WINAPI ws2_async_apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserv release_async_io( &wsa->io ); } +/* query if the socket has pending asyncs */ +static int WS_QueryAsyncWaiting( SOCKET sock, int type ) +{ + int result=0; + + SERVER_START_REQ( query_async_waiting ) + { + req->handle = wine_server_obj_handle( SOCKET2HANDLE(sock) ); + req->type = type; + wine_server_call(req); + result = reply->state; + } + SERVER_END_REQ; + return result; + +} + /*********************************************************************** * WS2_recv (INTERNAL) * @@ -5049,7 +5066,12 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } flags = convert_flags(dwFlags); - n = WS2_send( fd, wsa, flags ); + if(WS_QueryAsyncWaiting(s , ASYNC_TYPE_WRITE)) + { + n = -1; errno = EAGAIN; + } + else + n = WS2_send( fd, wsa, flags ); if (n == -1 && errno != EAGAIN) { err = wsaErrno(); @@ -6129,7 +6151,12 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, flags = convert_flags(wsa->flags); for (;;) { - n = WS2_recv( fd, wsa, flags ); + if(WS_QueryAsyncWaiting(s, ASYNC_TYPE_READ)) + { + n = -1; errno = EAGAIN; + } + else + n = WS2_recv( fd, wsa, flags ); if (n == -1) { /* Unix-like systems return EINVAL when attempting to read OOB data from diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9fe826918fa..8bdae3c386e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5403,6 +5403,21 @@ struct get_next_thread_reply char __pad_12[4]; }; +struct query_async_waiting_request +{ + struct request_header __header; + obj_handle_t handle; + int type; + char __pad_20[4]; + +}; +struct query_async_waiting_reply +{ + struct reply_header __header; + int state; + char __pad_12[4]; +}; + enum request { @@ -5680,6 +5695,7 @@ enum request REQ_suspend_process, REQ_resume_process, REQ_get_next_thread, + REQ_query_async_waiting, REQ_NB_REQUESTS }; @@ -5961,6 +5977,7 @@ union generic_request struct suspend_process_request suspend_process_request; struct resume_process_request resume_process_request; struct get_next_thread_request get_next_thread_request; + struct query_async_waiting_request query_async_waiting_request; }; union generic_reply { @@ -6240,11 +6257,12 @@ union generic_reply struct suspend_process_reply suspend_process_reply; struct resume_process_reply resume_process_reply; struct get_next_thread_reply get_next_thread_reply; + struct query_async_waiting_reply query_async_waiting_reply; }; /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 700 +#define SERVER_PROTOCOL_VERSION 701 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index eaffa886f21..72a05a0cd58 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3711,3 +3711,11 @@ struct handle_info @REPLY obj_handle_t handle; /* next thread handle */ @END + +/* Query if there are waiting asyncs of the socket */ +(a)REQ(query_async_waiting) + obj_handle_t handle; /* socket handle */ + int type; /* async type */ +(a)REPLY + int state; /* waiting async exists */ +(a)END diff --git a/server/request.h b/server/request.h index ec5595bedf2..450667e9cf3 100644 --- a/server/request.h +++ b/server/request.h @@ -393,6 +393,7 @@ DECL_HANDLER(terminate_job); DECL_HANDLER(suspend_process); DECL_HANDLER(resume_process); DECL_HANDLER(get_next_thread); +DECL_HANDLER(query_async_waiting); #ifdef WANT_REQUEST_HANDLERS @@ -673,6 +674,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_suspend_process, (req_handler)req_resume_process, (req_handler)req_get_next_thread, + (req_handler)req_query_async_waiting, }; C_ASSERT( sizeof(abstime_t) == 8 ); @@ -2236,6 +2238,12 @@ C_ASSERT( FIELD_OFFSET(struct get_next_thread_request, flags) == 28 ); C_ASSERT( sizeof(struct get_next_thread_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_next_thread_reply, handle) == 8 ); C_ASSERT( sizeof(struct get_next_thread_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_request, type) == 16 ); +C_ASSERT( sizeof(struct query_async_waiting_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_reply, state) == 8 ); +C_ASSERT( sizeof(struct query_async_waiting_reply) == 16 ); + #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/sock.c b/server/sock.c index 6891b5cbc57..147cb106bb0 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1890,3 +1890,29 @@ DECL_HANDLER(get_socket_info) release_object( &sock->obj ); } + +DECL_HANDLER( query_async_waiting ) +{ + struct sock *sock; + struct async *async; + reply->state = 0; + + if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle, + FILE_READ_ATTRIBUTES, &sock_ops))) return; + if (get_unix_fd( sock->fd ) == -1) return; + + if (is_fd_overlapped( sock->fd )) + { + if(req->type == ASYNC_TYPE_READ && ( async = find_pending_async(&sock->read_q) )) { + reply->state = 1; + release_object(async); + } + if(req->type == ASYNC_TYPE_WRITE && ( async = find_pending_async(&sock->write_q )) ) + { + reply->state = 1; + release_object(async); + } + } + release_object( &sock->obj ); + +} diff --git a/server/trace.c b/server/trace.c index e40f0769a35..f522980c6da 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4478,6 +4478,15 @@ static void dump_get_next_thread_reply( const struct get_next_thread_reply *req { fprintf( stderr, " handle=%04x", req->handle ); } +static void dump_query_async_waiting_request( const struct query_async_waiting_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", type=%d", req->type ); +} +static void dump_query_async_waiting_reply( const struct query_async_waiting_reply *req ) +{ + fprintf( stderr, " state=%d", req->state ); +} static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, @@ -4754,6 +4763,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_suspend_process_request, (dump_func)dump_resume_process_request, (dump_func)dump_get_next_thread_request, + (dump_func)dump_query_async_waiting_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -5031,6 +5041,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, (dump_func)dump_get_next_thread_reply, + (dump_func)dump_query_async_waiting_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -5308,6 +5319,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "suspend_process", "resume_process", "get_next_thread", + "query_async_waiting", }; static const struct -- 2.30.2

3 4

[PATCH 6/6 v2] msvcrt: Import remquof implementation from musl.
by Piotr Caban May 18, 2021

May 18, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 80 +++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 14 -------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 77 insertions(+), 19 deletions(-)

1 0

[PATCH 5/6 v2] msvcrt: Import remquo implementation from musl.
by Piotr Caban May 18, 2021

May 18, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 81 +++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 14 -------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 78 insertions(+), 19 deletions(-)

1 0

[PATCH 4/6 v2] msvcrt: Import modff implementation from musl.
by Piotr Caban May 18, 2021

May 18, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 32 +++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 31 insertions(+), 11 deletions(-)

1 0

[PATCH 3/6 v2] msvcrt: Import modf implementation from musl.
by Piotr Caban May 18, 2021

May 18, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 32 +++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 31 insertions(+), 11 deletions(-)

1 0

[PATCH 2/6 v2] msvcrt: Import fmodf implementation from musl.
by Piotr Caban May 18, 2021

May 18, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 70 +++++++++++++++++++++++++++++++++++++++---- dlls/msvcrt/unixlib.c | 9 ------ dlls/msvcrt/unixlib.h | 1 - 3 files changed, 64 insertions(+), 16 deletions(-)

1 0

[PATCH 1/6 v2] msvcrt: Import fmod implementation from musl.
by Piotr Caban May 18, 2021

May 18, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - don't call matherr in remquo (only patches 5 and 6 were changed) dlls/msvcrt/math.c | 64 +++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 9 ------ dlls/msvcrt/unixlib.h | 1 - 3 files changed, 61 insertions(+), 13 deletions(-)

1 0

[PATCH] wine.inf: Don't use DDE for winebrowser by default.
by Shawn M. Chapla May 18, 2021

May 18, 2021

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- Recent versions of Windows (Windows 7 and newer) no longer use DDE by default when ShellExec* APIs are used to open the types of files and addresses that Wine ultimately handles using winebrowser. In 2007, fe07efb3 changed wine.inf to reflect the default values on Windows XP and earlier since some programs happened to rely on these exact values (see Wine Bug 7953). Now, these are no longer the default values on native and there are several programs (including the popular games like Darksburg and Cyberpunk 2077) that rely on ShellExec* APIs *not* attempting to start a DDE session when opening a URL, as doing so will cause those programs to hang. While this patch may cause older versions of certain programs to stop working correctly with Wine, those versions of those programs would also no longer work correctly with native Windows 7 or newer. loader/wine.inf.in | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a20efbcce3e..c909f58f53c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -260,11 +260,7 @@ HKCR,folder\shell\open\ddeexec\application,,2,"Folders" HKCR,folder\shellex\ContextMenuHandlers,,16 HKCR,hlpfile,,2,"Help File" HKCR,hlpfile\shell\open\command,,2,"%11%\winhlp32.exe %1" -HKCR,htmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,htmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,htmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,htmlfile\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,htmlfile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,htmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" HKCR,inffile,,2,"Setup Information" HKCR,inffile\shell\install\command,,2,"%11%\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" HKCR,inifile,,2,"Configuration Settings" @@ -286,11 +282,7 @@ HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1""" HKCR,pdffile,,2,"PDF Document" -HKCR,pdffile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,pdffile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,pdffile\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,pdffile\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,pdffile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,pdffile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" HKCR,rtffile,,2,"Rich Text Document" HKCR,rtffile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" HKCR,rtffile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1" @@ -300,26 +292,10 @@ HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" HKCR,wrifile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" HKCR,wrifile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1" HKCR,xmlfile,,2,"XML Document" -HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,xmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,xmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,xmlfile\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,xmlfile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" -HKCR,ftp\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,ftp\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,ftp\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,ftp\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,ftp\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" -HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,http\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,http\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,http\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,http\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" -HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,https\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,https\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,https\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,https\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" +HKCR,ftp\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" +HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" +HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" HKCR,mailto\shell\open\command,,2,"%11%\winebrowser %1" HKCR,MIME\Database\Charset\_iso-2022-jp$ESC,"Codepage",0x10003,932 -- 2.28.0

1 0