June 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : Release 6.11.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: 1de583a4dac7d704b2d4291ada4a1885cd8cd1c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1de583a4dac7d704b2d4291a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 18 21:44:17 2021 +0200 Release 6.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 829 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 4 files changed, 420 insertions(+), 434 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1de583a4dac7d704b2d4…

1 0

Tag wine-6.11 : Alexandre Julliard : Release 6.11
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: refs/tags/wine-6.11 Tag: 0cbd8cdb24005866cd5aaffbcf6a4aba7e60d70a URL: https://source.winehq.org/git/wine.git/?a=tag;h=0cbd8cdb24005866cd5aaffbcf6… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 18 21:44:17 2021 +0200 Release 6.11

1 0

Zebediah Figura : ws2_32: Remove some unused declarations.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: c56784199d687b96c2e87b93cdbc2a1290a0230f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c56784199d687b96c2e87b93… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 17 20:58:20 2021 -0500 ws2_32: Remove some unused declarations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a4d89e728b8..25e5294cbf1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -416,14 +416,6 @@ static void socket_list_remove(SOCKET socket) LeaveCriticalSection(&cs_socket_list); } -typedef struct /* WSAAsyncSelect() control struct */ -{ - HANDLE service, event, sock; - HWND hWnd; - UINT uMsg; - LONG lEvent; -} ws_select_info; - #define WS_MAX_SOCKETS_PER_PROCESS 128 /* reasonable guess */ #define WS_MAX_UDP_DATAGRAM 1024 static INT WINAPI WSA_DefaultBlockingHook( FARPROC x ); @@ -434,9 +426,6 @@ static FARPROC blocking_hook = (FARPROC)WSA_DefaultBlockingHook; /* function prototypes */ static int ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size); -int WSAIOCTL_GetInterfaceCount(void); -int WSAIOCTL_GetInterfaceName(int intNumber, char *intName); - #define MAP_OPTION(opt) { WS_##opt, opt } static const int ws_sock_map[][2] =

1 0

Zebediah Figura : ws2_32: Make the indentation in WSAAccept() consistent with the rest of the file.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: 095ba0244abbc7a08932dfac125dbc371a8e3800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=095ba0244abbc7a08932dfac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 17 20:58:21 2021 -0500 ws2_32: Make the indentation in WSAAccept() consistent with the rest of the file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 136 ++++++++++++++++++++++++++------------------------- 1 file changed, 69 insertions(+), 67 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 25e5294cbf1..3c3eef72f51 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4516,78 +4516,80 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, /*********************************************************************** - * WSAAccept (WS2_32.26) + * WSAAccept (ws2_32.@) */ -SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen, - LPCONDITIONPROC lpfnCondition, DWORD_PTR dwCallbackData) +SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, int *addrlen, + LPCONDITIONPROC callback, DWORD_PTR context ) { + int ret = 0, size; + WSABUF caller_id, caller_data, callee_id, callee_data; + struct WS_sockaddr src_addr, dst_addr; + GROUP group; + SOCKET cs; - int ret = 0, size; - WSABUF CallerId, CallerData, CalleeId, CalleeData; - /* QOS SQOS, GQOS; */ - GROUP g; - SOCKET cs; - SOCKADDR src_addr, dst_addr; - - TRACE("socket %04lx, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %ld\n", - s, addr, addrlen, lpfnCondition, dwCallbackData); - - cs = WS_accept(s, addr, addrlen); - if (cs == SOCKET_ERROR) return SOCKET_ERROR; - if (!lpfnCondition) return cs; - - if (addr && addrlen) - { - CallerId.buf = (char *)addr; - CallerId.len = *addrlen; - } - else - { - size = sizeof(src_addr); - WS_getpeername(cs, &src_addr, &size); - CallerId.buf = (char *)&src_addr; - CallerId.len = size; - } - CallerData.buf = NULL; - CallerData.len = 0; - - size = sizeof(dst_addr); - WS_getsockname(cs, &dst_addr, &size); - - CalleeId.buf = (char *)&dst_addr; - CalleeId.len = sizeof(dst_addr); - - ret = (*lpfnCondition)(&CallerId, &CallerData, NULL, NULL, - &CalleeId, &CalleeData, &g, dwCallbackData); - - switch (ret) - { - case CF_ACCEPT: - return cs; - case CF_DEFER: - SERVER_START_REQ( set_socket_deferred ) - { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->deferred = wine_server_obj_handle( SOCKET2HANDLE(cs) ); - if ( !wine_server_call_err ( req ) ) - { - SetLastError( WSATRY_AGAIN ); - WS_closesocket( cs ); - } - } - SERVER_END_REQ; - return SOCKET_ERROR; - case CF_REJECT: - WS_closesocket(cs); - SetLastError(WSAECONNREFUSED); - return SOCKET_ERROR; - default: - FIXME("Unknown return type from Condition function\n"); - SetLastError(WSAENOTSOCK); - return SOCKET_ERROR; - } + TRACE( "socket %#lx, addr %p, addrlen %p, callback %p, context %#lx\n", + s, addr, addrlen, callback, context ); + + cs = WS_accept(s, addr, addrlen); + if (cs == SOCKET_ERROR) return SOCKET_ERROR; + if (!callback) return cs; + + if (addr && addrlen) + { + caller_id.buf = (char *)addr; + caller_id.len = *addrlen; + } + else + { + size = sizeof(src_addr); + WS_getpeername( cs, &src_addr, &size ); + caller_id.buf = (char *)&src_addr; + caller_id.len = size; + } + caller_data.buf = NULL; + caller_data.len = 0; + + size = sizeof(dst_addr); + WS_getsockname( cs, &dst_addr, &size ); + + callee_id.buf = (char *)&dst_addr; + callee_id.len = sizeof(dst_addr); + + ret = (*callback)( &caller_id, &caller_data, NULL, NULL, + &callee_id, &callee_data, &group, context ); + + switch (ret) + { + case CF_ACCEPT: + return cs; + + case CF_DEFER: + SERVER_START_REQ( set_socket_deferred ) + { + req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); + req->deferred = wine_server_obj_handle( SOCKET2HANDLE(cs) ); + if ( !wine_server_call_err ( req ) ) + { + SetLastError( WSATRY_AGAIN ); + WS_closesocket( cs ); + } + } + SERVER_END_REQ; + return SOCKET_ERROR; + + case CF_REJECT: + WS_closesocket( cs ); + SetLastError( WSAECONNREFUSED ); + return SOCKET_ERROR; + + default: + FIXME( "Unknown return type from Condition function\n" ); + SetLastError( WSAENOTSOCK ); + return SOCKET_ERROR; + } } + /*********************************************************************** * WSADuplicateSocketA (WS2_32.32) */

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_DEFER.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: 4d30a0e15ceb65add3a3580a248c91a906dea82a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d30a0e15ceb65add3a3580a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 17 20:58:22 2021 -0500 server: Introduce IOCTL_AFD_WINE_DEFER. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index ad8e3abf5ba..6f0a78ca933 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -157,6 +157,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_KEEPALIVE_VALS CTL_CODE(FILE_DEVICE_NETWORK, 214, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_MESSAGE_SELECT CTL_CODE(FILE_DEVICE_NETWORK, 215, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GETPEERNAME CTL_CODE(FILE_DEVICE_NETWORK, 216, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_DEFER CTL_CODE(FILE_DEVICE_NETWORK, 217, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index bb0d13d9e6c..7b40b6e3f30 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2497,6 +2497,24 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) set_reply_data( &sock->addr, sock->addr_len ); return 1; + case IOCTL_AFD_WINE_DEFER: + { + const obj_handle_t *handle = get_req_data(); + struct sock *acceptsock; + + if (get_req_data_size() < sizeof(*handle)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + acceptsock = (struct sock *)get_handle_obj( current->process, *handle, 0, &sock_ops ); + if (!acceptsock) return 0; + + sock->deferred = acceptsock; + return 1; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_DEFER.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: 5a20e0878eae0327b62d2152ba33c81e0f5a085e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a20e0878eae0327b62d2152… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 17 20:58:23 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_DEFER. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3c3eef72f51..bfc4bb6c09d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4564,18 +4564,16 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, int *addrlen, return cs; case CF_DEFER: - SERVER_START_REQ( set_socket_deferred ) - { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->deferred = wine_server_obj_handle( SOCKET2HANDLE(cs) ); - if ( !wine_server_call_err ( req ) ) - { - SetLastError( WSATRY_AGAIN ); - WS_closesocket( cs ); - } - } - SERVER_END_REQ; - return SOCKET_ERROR; + { + obj_handle_t server_handle = cs; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_DEFER, + &server_handle, sizeof(server_handle), NULL, 0 ); + SetLastError( status ? RtlNtStatusToDosError( status ) : WSATRY_AGAIN ); + return -1; + } case CF_REJECT: WS_closesocket( cs );

1 0

Zebediah Figura : server: Remove the no longer used set_socket_deferred request.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: 9827081305c86b85886ff9541b50382fe7bdf16d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9827081305c86b85886ff954… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 17 20:58:24 2021 -0500 server: Remove the no longer used set_socket_deferred request. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 18 +----------------- server/protocol.def | 6 ------ server/request.h | 5 ----- server/sock.c | 18 ------------------ server/trace.c | 9 --------- 5 files changed, 1 insertion(+), 55 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1f0e25c31fa..d23603248bb 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1762,19 +1762,6 @@ struct get_socket_info_reply }; -struct set_socket_deferred_request -{ - struct request_header __header; - obj_handle_t handle; - obj_handle_t deferred; - char __pad_20[4]; -}; -struct set_socket_deferred_reply -{ - struct reply_header __header; -}; - - struct recv_socket_request { @@ -5487,7 +5474,6 @@ enum request REQ_unlock_file, REQ_get_socket_event, REQ_get_socket_info, - REQ_set_socket_deferred, REQ_recv_socket, REQ_poll_socket, REQ_send_socket, @@ -5769,7 +5755,6 @@ union generic_request struct unlock_file_request unlock_file_request; struct get_socket_event_request get_socket_event_request; struct get_socket_info_request get_socket_info_request; - struct set_socket_deferred_request set_socket_deferred_request; struct recv_socket_request recv_socket_request; struct poll_socket_request poll_socket_request; struct send_socket_request send_socket_request; @@ -6049,7 +6034,6 @@ union generic_reply struct unlock_file_reply unlock_file_reply; struct get_socket_event_reply get_socket_event_reply; struct get_socket_info_reply get_socket_info_reply; - struct set_socket_deferred_reply set_socket_deferred_reply; struct recv_socket_reply recv_socket_reply; struct poll_socket_reply poll_socket_reply; struct send_socket_reply send_socket_reply; @@ -6273,7 +6257,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 713 +#define SERVER_PROTOCOL_VERSION 714 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index d3f44482c37..72f2f2c20ae 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1445,12 +1445,6 @@ enum server_fd_type @END -(a)REQ(set_socket_deferred) - obj_handle_t handle; /* handle to the socket */ - obj_handle_t deferred; /* handle to the socket for which accept() is deferred */ -(a)END - - /* Perform a recv on a socket */ @REQ(recv_socket) int oob; /* are we receiving OOB data? */ diff --git a/server/request.h b/server/request.h index c3f77a233ab..5e95ef6e625 100644 --- a/server/request.h +++ b/server/request.h @@ -174,7 +174,6 @@ DECL_HANDLER(lock_file); DECL_HANDLER(unlock_file); DECL_HANDLER(get_socket_event); DECL_HANDLER(get_socket_info); -DECL_HANDLER(set_socket_deferred); DECL_HANDLER(recv_socket); DECL_HANDLER(poll_socket); DECL_HANDLER(send_socket); @@ -455,7 +454,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_unlock_file, (req_handler)req_get_socket_event, (req_handler)req_get_socket_info, - (req_handler)req_set_socket_deferred, (req_handler)req_recv_socket, (req_handler)req_poll_socket, (req_handler)req_send_socket, @@ -1051,9 +1049,6 @@ C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, family) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, type) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_socket_info_reply, protocol) == 16 ); C_ASSERT( sizeof(struct get_socket_info_reply) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_deferred_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_socket_deferred_request, deferred) == 16 ); -C_ASSERT( sizeof(struct set_socket_deferred_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, oob) == 12 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, status) == 56 ); diff --git a/server/sock.c b/server/sock.c index 7b40b6e3f30..547287572d5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2950,24 +2950,6 @@ DECL_HANDLER(get_socket_event) release_object( &sock->obj ); } -DECL_HANDLER(set_socket_deferred) -{ - struct sock *sock, *acceptsock; - - sock=(struct sock *)get_handle_obj( current->process, req->handle, FILE_WRITE_ATTRIBUTES, &sock_ops ); - if ( !sock ) - return; - - acceptsock = (struct sock *)get_handle_obj( current->process, req->deferred, 0, &sock_ops ); - if ( !acceptsock ) - { - release_object( sock ); - return; - } - sock->deferred = acceptsock; - release_object( sock ); -} - DECL_HANDLER(get_socket_info) { struct sock *sock; diff --git a/server/trace.c b/server/trace.c index d8800199dbf..855348fa60a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2099,12 +2099,6 @@ static void dump_get_socket_info_reply( const struct get_socket_info_reply *req fprintf( stderr, ", protocol=%d", req->protocol ); } -static void dump_set_socket_deferred_request( const struct set_socket_deferred_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", deferred=%04x", req->deferred ); -} - static void dump_recv_socket_request( const struct recv_socket_request *req ) { fprintf( stderr, " oob=%d", req->oob ); @@ -4591,7 +4585,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_unlock_file_request, (dump_func)dump_get_socket_event_request, (dump_func)dump_get_socket_info_request, - (dump_func)dump_set_socket_deferred_request, (dump_func)dump_recv_socket_request, (dump_func)dump_poll_socket_request, (dump_func)dump_send_socket_request, @@ -4869,7 +4862,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_get_socket_event_reply, (dump_func)dump_get_socket_info_reply, - NULL, (dump_func)dump_recv_socket_reply, (dump_func)dump_poll_socket_reply, (dump_func)dump_send_socket_reply, @@ -5147,7 +5139,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "unlock_file", "get_socket_event", "get_socket_info", - "set_socket_deferred", "recv_socket", "poll_socket", "send_socket",

1 0

Brendan Shanks : winecoreaudio: Remove workarounds for Mac OS X 10.4 and 10.5.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: c50dab4828fc8422a56cccee56c2cc84ae4468f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c50dab4828fc8422a56cccee… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jun 17 15:55:36 2021 -0700 winecoreaudio: Remove workarounds for Mac OS X 10.4 and 10.5. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 27 ++------------------------- configure.ac | 18 ++---------------- dlls/winecoreaudio.drv/audiounit.c | 20 -------------------- dlls/winecoreaudio.drv/mmdevdrv.c | 22 ---------------------- include/config.h.in | 12 ------------ 5 files changed, 4 insertions(+), 95 deletions(-) diff --git a/configure b/configure index 1ddc2ea65a8..48983b414db 100755 --- a/configure +++ b/configure @@ -7453,9 +7453,6 @@ done for ac_header in \ AL/al.h \ ApplicationServices/ApplicationServices.h \ - AudioToolbox/AudioConverter.h \ - AudioUnit/AudioUnit.h \ - AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ CommonCrypto/CommonCryptor.h \ @@ -8974,31 +8971,11 @@ done LIBS="$ac_save_LIBS" fi - if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" + if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" then - if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" - then - COREAUDIO_LIBS="-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI" - - else - COREAUDIO_LIBS="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI" + COREAUDIO_LIBS="-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI" - fi enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes} - ac_save_LIBS="$LIBS" - LIBS="$LIBS $COREAUDIO_LIBS" - for ac_func in AUGraphAddNode -do : - ac_fn_c_check_func "$LINENO" "AUGraphAddNode" "ac_cv_func_AUGraphAddNode" -if test "x$ac_cv_func_AUGraphAddNode" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_AUGRAPHADDNODE 1 -_ACEOF - -fi -done - - LIBS="$ac_save_LIBS" fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then diff --git a/configure.ac b/configure.ac index ade04399af0..f76dd047825 100644 --- a/configure.ac +++ b/configure.ac @@ -431,9 +431,6 @@ AC_SYS_LARGEFILE() AC_CHECK_HEADERS(\ AL/al.h \ ApplicationServices/ApplicationServices.h \ - AudioToolbox/AudioConverter.h \ - AudioUnit/AudioUnit.h \ - AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ CommonCrypto/CommonCryptor.h \ @@ -800,21 +797,10 @@ case $host_os in AC_CHECK_FUNCS(SSLCopyPeerCertificates) LIBS="$ac_save_LIBS" fi - if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" + if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" then - if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" - then - AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") - else - dnl CoreServices needed by AudioUnit - AC_SUBST(COREAUDIO_LIBS,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") - fi + AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes} - dnl Check for the AUGraphAddNode function - ac_save_LIBS="$LIBS" - LIBS="$LIBS $COREAUDIO_LIBS" - AC_CHECK_FUNCS(AUGraphAddNode) - LIBS="$ac_save_LIBS" fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index a3c190870ad..030ff4d090a 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -22,9 +22,6 @@ #define ULONG CoreFoundation_ULONG #define HRESULT CoreFoundation_HRESULT -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -#include <CoreServices/CoreServices.h> -#endif #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> #undef ULONG @@ -50,23 +47,6 @@ #include "coreaudio.h" #include "wine/debug.h" -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager types for compatibility's sake */ -typedef ComponentDescription AudioComponentDescription; -#endif - -#ifndef HAVE_AUGRAPHADDNODE -static inline OSStatus AUGraphAddNode(AUGraph graph, const AudioComponentDescription *desc, AUNode *node) -{ - return AUGraphNewNode(graph, desc, 0, NULL, node); -} - -static inline OSStatus AUGraphNodeInfo(AUGraph graph, AUNode node, AudioComponentDescription *desc, AudioUnit *au) -{ - return AUGraphGetNodeInfo(graph, node, desc, 0, NULL, au); -} -#endif - WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DECLARE_DEBUG_CHANNEL(midi); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index bc153d92511..f07f4bae5fb 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -72,28 +72,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager functions for OSX 10.5 */ -typedef Component AudioComponent; -typedef ComponentDescription AudioComponentDescription; -typedef ComponentInstance AudioComponentInstance; - -static inline AudioComponent AudioComponentFindNext(AudioComponent ac, AudioComponentDescription *desc) -{ - return FindNextComponent(ac, desc); -} - -static inline OSStatus AudioComponentInstanceNew(AudioComponent ac, AudioComponentInstance *aci) -{ - return OpenAComponent(ac, aci); -} - -static inline OSStatus AudioComponentInstanceDispose(AudioComponentInstance aci) -{ - return CloseComponent(aci); -} -#endif - #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; diff --git a/include/config.h.in b/include/config.h.in index b864a6709fa..c1a68104fb8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -31,18 +31,6 @@ /* Define to 1 if you have the <asm/user.h> header file. */ #undef HAVE_ASM_USER_H -/* Define to 1 if you have the <AudioToolbox/AudioConverter.h> header file. */ -#undef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H - -/* Define to 1 if you have the <AudioUnit/AudioComponent.h> header file. */ -#undef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H - -/* Define to 1 if you have the <AudioUnit/AudioUnit.h> header file. */ -#undef HAVE_AUDIOUNIT_AUDIOUNIT_H - -/* Define to 1 if you have the `AUGraphAddNode' function. */ -#undef HAVE_AUGRAPHADDNODE - /* Define to 1 if you have the <capi20.h> header file. */ #undef HAVE_CAPI20_H

1 0

Esme Povirk : sechost: Implement hexadecimal SID parsing.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: 66a91fe68377dc3e9c18a0c1a020a4af72fbf552 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66a91fe68377dc3e9c18a0c1… Author: Esme Povirk <esme(a)codeweavers.com> Date: Thu Jun 17 14:40:41 2021 -0500 sechost: Implement hexadecimal SID parsing. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 1 + dlls/sechost/security.c | 59 ++++++++++++++++++++++++++---------------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6037ddb2165..77748abe9ec 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -306,6 +306,7 @@ static void test_ConvertStringSidToSid(void) { "RS", "", 1 }, { "SA", "", 1 }, { "s-1-12-1", "S-1-12-1" }, + { "S-0x1-0XC-0x1a", "S-1-12-26" }, }; const char noSubAuthStr[] = "S-1-5"; diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index b4f00f5bdf5..4aee8c723d2 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -594,18 +594,42 @@ static BOOL get_computer_sid( PSID sid ) return TRUE; } +static BOOL parse_token( const WCHAR *string, const WCHAR **end, DWORD *result ) +{ + if (string[0] == '0' && (string[1] == 'X' || string[1] == 'x')) + { + /* hexadecimal */ + *result = wcstoul( string + 2, (WCHAR**)&string, 16 ); + if (*string == '-') + string++; + *end = string; + return TRUE; + } + else if (iswdigit(string[0]) || string[0] == '-') + { + *result = wcstoul( string, (WCHAR**)&string, 10 ); + if (*string == '-') + string++; + *end = string; + return TRUE; + } + + *result = 0; + *end = string; + return FALSE; +} + static DWORD get_sid_size( const WCHAR *string, const WCHAR **end ) { if ((string[0] == 'S' || string[0] == 's') && string[1] == '-') /* S-R-I(-S)+ */ { int token_count = 0; - string++; - while (*string == '-' || iswdigit(*string)) - { - if (*string == '-') - token_count++; - string++; - } + DWORD value; + + string += 2; + + while (parse_token( string, &string, &value )) + token_count++; if (end) *end = string; @@ -653,9 +677,11 @@ static BOOL parse_sid( const WCHAR *string, const WCHAR **end, SID *pisid, DWORD { DWORD i = 0, identAuth; DWORD csubauth = ((*size - GetSidLengthRequired(0)) / sizeof(DWORD)); + DWORD token; string += 2; /* Advance to Revision */ - pisid->Revision = wcstoul( string, (WCHAR**)&string, 10 ); + parse_token( string, &string, &token ); + pisid->Revision = token; if (pisid->Revision != SDDL_REVISION) { @@ -672,31 +698,20 @@ static BOOL parse_sid( const WCHAR *string, const WCHAR **end, SID *pisid, DWORD pisid->SubAuthorityCount = csubauth; - /* Advance to identifier authority */ - if (*string == '-') - string++; - /* MS' implementation can't handle values greater than 2^32 - 1, so * we don't either; assume most significant bytes are always 0 */ pisid->IdentifierAuthority.Value[0] = 0; pisid->IdentifierAuthority.Value[1] = 0; - identAuth = wcstoul( string, (WCHAR**)&string, 10 ); + parse_token( string, &string, &identAuth ); pisid->IdentifierAuthority.Value[5] = identAuth & 0xff; pisid->IdentifierAuthority.Value[4] = (identAuth & 0xff00) >> 8; pisid->IdentifierAuthority.Value[3] = (identAuth & 0xff0000) >> 16; pisid->IdentifierAuthority.Value[2] = (identAuth & 0xff000000) >> 24; - /* Advance to first sub authority */ - if (*string == '-') - string++; - - while (iswdigit(*string) || *string == '-') + while (parse_token( string, &string, &token )) { - pisid->SubAuthority[i++] = wcstoul( string, (WCHAR**)&string, 10 ); - - if (*string == '-') - string++; + pisid->SubAuthority[i++] = token; } if (i != pisid->SubAuthorityCount)

1 0

Gijs Vermeulen : secur32: Default to building with GnuTLS support on macOS, if present.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: 4940d2ada276a5c6e9f855177ef54ce23490d36e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4940d2ada276a5c6e9f85517… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Jun 17 22:46:29 2021 +0200 secur32: Default to building with GnuTLS support on macOS, if present. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 4 ++-- dlls/secur32/schannel_macosx.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 93868d10b3b..03124924644 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -47,7 +47,7 @@ #include "wine/debug.h" #include "wine/unicode.h" -#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H) +#if defined(SONAME_LIBGNUTLS) WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -1122,4 +1122,4 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p return STATUS_SUCCESS; } -#endif /* SONAME_LIBGNUTLS && !HAVE_SECURITY_SECURITY_H */ +#endif /* SONAME_LIBGNUTLS */ diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index f4f84557dfe..d7453a44816 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -47,7 +47,7 @@ #include "secur32_priv.h" #include "wine/debug.h" -#ifdef HAVE_SECURITY_SECURITY_H +#if defined(HAVE_SECURITY_SECURITY_H) && !defined(SONAME_LIBGNUTLS) WINE_DEFAULT_DEBUG_CHANNEL(secur32); @@ -1290,4 +1290,4 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p return STATUS_SUCCESS; } -#endif /* HAVE_SECURITY_SECURITY_H */ +#endif /* HAVE_SECURITY_SECURITY_H && !SONAME_LIBGNUTLS */

1 0