wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Dmitry Timoshkov : winex11.drv: Avoid copying invalid window bits.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: ab8b8356164743d9e4a5981a5e87a610507be193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8b8356164743d9e4a5981a5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 14 14:24:11 2010 +0900 winex11.drv: Avoid copying invalid window bits. (cherry picked from commit 7864ade5a8306c0078e16ae6d7e40bdece29395b) --- dlls/winex11.drv/window.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index e288b82..5e8b88e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1619,6 +1619,8 @@ static void move_window_bits( struct x11drv_win_data *data, const RECT *old_rect hdc_src = hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE ); } + ExcludeUpdateRgn( hdc_dst, data->hwnd ); + code = X11DRV_START_EXPOSURES; ExtEscape( hdc_dst, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL );

1 0

Dmitry Timoshkov : winex11.drv: Avoid copying window bits if the window didn't move.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: bc62acea046886e8cf82a7dcf6ce46e4e21abe06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc62acea046886e8cf82a7dcf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 14 14:22:56 2010 +0900 winex11.drv: Avoid copying window bits if the window didn't move. (cherry picked from commit c912af04deed53a0d1c06f03e4515ac838a896b1) --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5050609..e288b82 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2342,7 +2342,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags !memcmp( &valid_rects[0], &data->client_rect, sizeof(RECT) )) { /* if we have an X window the bits will be moved by the X server */ - if (!data->whole_window) + if (!data->whole_window && (x_offset != 0 || y_offset != 0)) move_window_bits( data, &old_whole_rect, &data->whole_rect, &old_client_rect ); } else

1 0

Hans Leidekker : dnsapi: Remove the critical section around res_query.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 81e58cb70ae2072441d477dac77a14e3bdd7cf45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e58cb70ae2072441d477dac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 8 19:26:43 2010 +0200 dnsapi: Remove the critical section around res_query. (cherry picked from commit 18cd143086ef040f9322b0b9b017cb47a0a6946f) --- dlls/dnsapi/query.c | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 6014465..8de33e6 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -52,19 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); #ifdef HAVE_RESOLV -static CRITICAL_SECTION resolver_cs; -static CRITICAL_SECTION_DEBUG resolver_cs_debug = -{ - 0, 0, &resolver_cs, - { &resolver_cs_debug.ProcessLocksList, - &resolver_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": resolver_cs") } -}; -static CRITICAL_SECTION resolver_cs = { &resolver_cs_debug, -1, 0, 0, 0, 0 }; - -#define LOCK_RESOLVER() do { EnterCriticalSection( &resolver_cs ); } while (0) -#define UNLOCK_RESOLVER() do { LeaveCriticalSection( &resolver_cs ); } while (0) - /* call res_init() just once because of a bug in Mac OS X 10.4 */ /* call once per thread on systems that have per-thread _res */ static void initialise_resolver( void ) @@ -552,8 +539,7 @@ exit: return status; } -/* The resolver lock must be held and res_init() must have been - * called before calling these three functions. +/* res_init() must have been called before calling these three functions. */ static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs ) { @@ -704,16 +690,11 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser if (!name || !result) return ERROR_INVALID_PARAMETER; - LOCK_RESOLVER(); - initialise_resolver(); _res.options |= dns_map_options( options ); if (servers && (ret = dns_set_serverlist( servers ))) - { - UNLOCK_RESOLVER(); return ret; - } ret = dns_do_query( name, type, options, result ); @@ -724,8 +705,6 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser ret = dns_do_query_netbios( name, result ); } - UNLOCK_RESOLVER(); - #endif return ret; } @@ -822,12 +801,8 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada case DnsConfigDnsServerList: { #ifdef HAVE_RESOLV - LOCK_RESOLVER(); - initialise_resolver(); ret = dns_get_serverlist( buffer, len ); - - UNLOCK_RESOLVER(); break; #else WARN( "compiled without resolver support\n" );

1 0

Howell Tam : ws2_32: Wrapped WSASendTo/ WSARecvFrom with a different function name.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: f067d9eea5bfae36147629a159f30839649a10ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f067d9eea5bfae36147629a15… Author: Howell Tam <pigeon(a)pigeond.net> Date: Sun Jul 18 10:53:06 2010 +1000 ws2_32: Wrapped WSASendTo/WSARecvFrom with a different function name. (cherry picked from commit 8b7ec05bd20359662f4feb7ef68a283b464bd03a) --- dlls/ws2_32/socket.c | 84 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 63 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0233af1..4c8a2db 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -169,6 +169,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); WINE_DECLARE_DEBUG_CHANNEL(winediag); + +/* + * The actual definition of WSASendTo/WSARecvFrom, wrapped in a different + * function name, so that internal calls from ws2_32 itself will not trigger + * programs like Garena, which hooks WSASendTo/WSARecvFrom calls. + */ +static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD lpNumberOfBytesSent, DWORD dwFlags, + const struct WS_sockaddr *to, int tolen, + LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ); + +static int WS2_recvfrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, + struct WS_sockaddr *lpFrom, + LPINT lpFromlen, LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ); + /* critical section to protect some non-reentrant net function */ static CRITICAL_SECTION csWSgetXXXbyYYY; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -2922,7 +2940,7 @@ int WINAPI WS_recv(SOCKET s, char *buf, int len, int flags) wsabuf.len = len; wsabuf.buf = buf; - if ( WSARecvFrom(s, &wsabuf, 1, &n, &dwFlags, NULL, NULL, NULL, NULL) == SOCKET_ERROR ) + if ( WS2_recvfrom(s, &wsabuf, 1, &n, &dwFlags, NULL, NULL, NULL, NULL) == SOCKET_ERROR ) return SOCKET_ERROR; else return n; @@ -2940,7 +2958,7 @@ int WINAPI WS_recvfrom(SOCKET s, char *buf, INT len, int flags, wsabuf.len = len; wsabuf.buf = buf; - if ( WSARecvFrom(s, &wsabuf, 1, &n, &dwFlags, from, fromlen, NULL, NULL) == SOCKET_ERROR ) + if ( WS2_recvfrom(s, &wsabuf, 1, &n, &dwFlags, from, fromlen, NULL, NULL) == SOCKET_ERROR ) return SOCKET_ERROR; else return n; @@ -3146,7 +3164,7 @@ int WINAPI WS_send(SOCKET s, const char *buf, int len, int flags) wsabuf.len = len; wsabuf.buf = (char*) buf; - if ( WSASendTo( s, &wsabuf, 1, &n, flags, NULL, 0, NULL, NULL) == SOCKET_ERROR ) + if ( WS2_sendto( s, &wsabuf, 1, &n, flags, NULL, 0, NULL, NULL) == SOCKET_ERROR ) return SOCKET_ERROR; else return n; @@ -3160,7 +3178,7 @@ INT WINAPI WSASend( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { - return WSASendTo( s, lpBuffers, dwBufferCount, lpNumberOfBytesSent, dwFlags, + return WS2_sendto( s, lpBuffers, dwBufferCount, lpNumberOfBytesSent, dwFlags, NULL, 0, lpOverlapped, lpCompletionRoutine ); } @@ -3173,14 +3191,11 @@ INT WINAPI WSASendDisconnect( SOCKET s, LPWSABUF lpBuffers ) } -/*********************************************************************** - * WSASendTo (WS2_32.74) - */ -INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, - LPDWORD lpNumberOfBytesSent, DWORD dwFlags, - const struct WS_sockaddr *to, int tolen, - LPWSAOVERLAPPED lpOverlapped, - LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) +static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD lpNumberOfBytesSent, DWORD dwFlags, + const struct WS_sockaddr *to, int tolen, + LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { unsigned int i, options; int n, fd, err; @@ -3356,6 +3371,21 @@ error: } /*********************************************************************** + * WSASendTo (WS2_32.74) + */ +INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD lpNumberOfBytesSent, DWORD dwFlags, + const struct WS_sockaddr *to, int tolen, + LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) +{ + return WS2_sendto( s, lpBuffers, dwBufferCount, + lpNumberOfBytesSent, dwFlags, + to, tolen, + lpOverlapped, lpCompletionRoutine ); +} + +/*********************************************************************** * sendto (WS2_32.20) */ int WINAPI WS_sendto(SOCKET s, const char *buf, int len, int flags, @@ -3367,7 +3397,7 @@ int WINAPI WS_sendto(SOCKET s, const char *buf, int len, int flags, wsabuf.len = len; wsabuf.buf = (char*) buf; - if ( WSASendTo(s, &wsabuf, 1, &n, flags, to, tolen, NULL, NULL) == SOCKET_ERROR ) + if ( WS2_sendto(s, &wsabuf, 1, &n, flags, to, tolen, NULL, NULL) == SOCKET_ERROR ) return SOCKET_ERROR; else return n; @@ -4951,17 +4981,14 @@ int WINAPI WSARecv(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - return WSARecvFrom(s, lpBuffers, dwBufferCount, NumberOfBytesReceived, lpFlags, + return WS2_recvfrom(s, lpBuffers, dwBufferCount, NumberOfBytesReceived, lpFlags, NULL, NULL, lpOverlapped, lpCompletionRoutine); } -/*********************************************************************** - * WSARecvFrom (WS2_32.69) - */ -INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, - LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, struct WS_sockaddr *lpFrom, - LPINT lpFromlen, LPWSAOVERLAPPED lpOverlapped, - LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) +static int WS2_recvfrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, struct WS_sockaddr *lpFrom, + LPINT lpFromlen, LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { unsigned int i, options; @@ -5115,6 +5142,21 @@ error: } /*********************************************************************** + * WSARecvFrom (WS2_32.69) + */ +INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, struct WS_sockaddr *lpFrom, + LPINT lpFromlen, LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) + +{ + return WS2_recvfrom( s, lpBuffers, dwBufferCount, + lpNumberOfBytesRecvd, lpFlags, + lpFrom, lpFromlen, + lpOverlapped, lpCompletionRoutine ); +} + +/*********************************************************************** * WSCInstallProvider (WS2_32.88) */ INT WINAPI WSCInstallProvider( const LPGUID lpProviderId,

1 0

Alexandre Julliard : winex11: Force setting the cursor again on the first mouse event in case the initial setting failed .
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: b4af4b1a16094658461312e335a3a126fa3315b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4af4b1a16094658461312e33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 17:07:24 2010 +0200 winex11: Force setting the cursor again on the first mouse event in case the initial setting failed. (cherry picked from commit 536fc57091a80135ac1d6a3fceda3e7a87389897) --- dlls/winex11.drv/window.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 8957a44..5050609 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -430,6 +430,10 @@ static void sync_window_cursor( struct x11drv_win_data *data ) SERVER_END_REQ; set_window_cursor( data->hwnd, cursor ); + + /* setting the cursor can fail if the window isn't created yet */ + /* so make sure that we try again once we receive a mouse event */ + data->cursor = (HANDLE)~0u; }

1 0

Dmitry Timoshkov : user32: Properly pack the WM_WINE_SETWINDOWPOS internal message.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 1a0e165d77f049418ae60e86ca621ceb6cc80218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0e165d77f049418ae60e86c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Aug 9 15:56:12 2010 +0900 user32: Properly pack the WM_WINE_SETWINDOWPOS internal message. (cherry picked from commit ea7020480bbc975c5ca6994b178a1ffce835906c) --- dlls/user32/message.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index b93c703..312d54c 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -835,6 +835,7 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara push_data( data, &data->ps.cis, sizeof(data->ps.cis) ); return 0; } + case WM_WINE_SETWINDOWPOS: case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGED: { @@ -1015,9 +1016,6 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara push_data( data, header, header->dbch_size ); return 0; } - case WM_WINE_SETWINDOWPOS: - push_data( data, (WINDOWPOS *)lparam, sizeof(WINDOWPOS) ); - return 0; case WM_WINE_KEYBOARD_LL_HOOK: { struct hook_extra_info *h_extra = (struct hook_extra_info *)lparam;

1 0

Alexandre Julliard : ntdll: Add a workaround for Ubuntu' s stupid ptrace breakage.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 90d0dcf9090ccbbc1c9a9dc14ff6a323da99ed25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d0dcf9090ccbbc1c9a9dc14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 17:05:35 2010 +0200 ntdll: Add a workaround for Ubuntu's stupid ptrace breakage. (cherry picked from commit 9227eb2c9d6f0cecbabcb54cc25b5691f544b0f4) --- dlls/ntdll/server.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index ee066e9..79e1f8e 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -45,6 +45,9 @@ #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif +#ifdef HAVE_SYS_PRCTL_H +# include <sys/prctl.h> +#endif #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif @@ -1011,6 +1014,10 @@ void server_init_process(void) #ifdef __APPLE__ send_server_task_port(); #endif +#if defined(__linux__) && defined(HAVE_PRCTL) + /* work around Ubuntu's ptrace breakage */ + if (server_pid != -1) prctl( 0x59616d61 /* PR_SET_PTRACER */, server_pid ); +#endif }

1 0

Alexandre Julliard : ntdll: Add support for retrieving the server pid from the socket credentials.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 99716dcf58cc0330791b0d9b0470428314cec3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99716dcf58cc0330791b0d9b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 17:05:13 2010 +0200 ntdll: Add support for retrieving the server pid from the socket credentials. (cherry picked from commit dec7effac0fb22b735d626edc86671148a6f0cb8) --- dlls/ntdll/server.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index bc150ea..ee066e9 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -101,6 +101,7 @@ timeout_t server_start_time = 0; /* time of server startup */ sigset_t server_block_set; /* signals to block during server calls */ static int fd_socket = -1; /* socket to exchange file descriptors with the server */ +static pid_t server_pid; static RTL_CRITICAL_SECTION fd_cache_section; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = @@ -400,6 +401,13 @@ static int receive_fd( obj_handle_t *handle ) { if (cmsg->cmsg_level != SOL_SOCKET) continue; if (cmsg->cmsg_type == SCM_RIGHTS) fd = *(int *)CMSG_DATA(cmsg); +#ifdef SCM_CREDENTIALS + else if (cmsg->cmsg_type == SCM_CREDENTIALS) + { + struct ucred *ucred = (struct ucred *)CMSG_DATA(cmsg); + server_pid = ucred->pid; + } +#endif } #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ if (fd != -1) fcntl( fd, F_SETFD, FD_CLOEXEC ); /* in case MSG_CMSG_CLOEXEC is not supported */ @@ -958,6 +966,7 @@ void server_init_process(void) obj_handle_t version; const char *env_socket = getenv( "WINESERVERSOCKET" ); + server_pid = -1; if (env_socket) { fd_socket = atoi( env_socket ); @@ -979,6 +988,17 @@ void server_init_process(void) pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); /* receive the first thread request fd on the main socket */ +#ifdef SO_PASSCRED + if (server_pid == -1) + { + int enable = 1; + setsockopt( fd_socket, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable) ); + ntdll_get_thread_data()->request_fd = receive_fd( &version ); + enable = 0; + setsockopt( fd_socket, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable) ); + } + else +#endif ntdll_get_thread_data()->request_fd = receive_fd( &version ); if (version != SERVER_PROTOCOL_VERSION)

1 0

Alexandre Julliard : server: Make the fd passing code slightly more portable.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: bd0a91a48f81528495d3e8bf2370feafc3d13d7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd0a91a48f81528495d3e8bf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 11:53:07 2010 +0200 server: Make the fd passing code slightly more portable. (cherry picked from commit 179715251dbb399768ae0ef423ae094c4438face) --- dlls/ntdll/server.c | 76 +++++++++++++++++-------------------------- server/request.c | 88 ++++++++++++++++++++++++++++----------------------- 2 files changed, 78 insertions(+), 86 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 8564c0a..bc150ea 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -97,20 +97,6 @@ static const enum cpu_type client_cpu = CPU_SPARC; unsigned int server_cpus = 0; int is_wow64 = FALSE; -#ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS -/* data structure used to pass an fd with sendmsg/recvmsg */ -struct cmsg_fd -{ - struct - { - size_t len; /* size of structure */ - int level; /* SOL_SOCKET */ - int type; /* SCM_RIGHTS */ - } header; - int fd; /* fd to pass */ -}; -#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - timeout_t server_start_time = 0; /* time of server startup */ sigset_t server_block_set; /* signals to block during server calls */ @@ -332,35 +318,36 @@ void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sig */ void CDECL wine_server_send_fd( int fd ) { -#ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS - struct cmsg_fd cmsg; -#endif struct send_fd data; struct msghdr msghdr; struct iovec vec; int ret; - vec.iov_base = (void *)&data; - vec.iov_len = sizeof(data); - - msghdr.msg_name = NULL; - msghdr.msg_namelen = 0; - msghdr.msg_iov = &vec; - msghdr.msg_iovlen = 1; - #ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS msghdr.msg_accrights = (void *)&fd; msghdr.msg_accrightslen = sizeof(fd); #else /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - cmsg.header.len = sizeof(cmsg.header) + sizeof(fd); - cmsg.header.level = SOL_SOCKET; - cmsg.header.type = SCM_RIGHTS; - cmsg.fd = fd; - msghdr.msg_control = &cmsg; - msghdr.msg_controllen = sizeof(cmsg.header) + sizeof(fd); + char cmsg_buffer[256]; + struct cmsghdr *cmsg; + msghdr.msg_control = cmsg_buffer; + msghdr.msg_controllen = sizeof(cmsg_buffer); msghdr.msg_flags = 0; + cmsg = CMSG_FIRSTHDR( &msghdr ); + cmsg->cmsg_len = CMSG_LEN( sizeof(fd) ); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + *(int *)CMSG_DATA(cmsg) = fd; + msghdr.msg_controllen = cmsg->cmsg_len; #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ + msghdr.msg_name = NULL; + msghdr.msg_namelen = 0; + msghdr.msg_iov = &vec; + msghdr.msg_iovlen = 1; + + vec.iov_base = (void *)&data; + vec.iov_len = sizeof(data); + data.tid = GetCurrentThreadId(); data.fd = fd; @@ -383,24 +370,16 @@ void CDECL wine_server_send_fd( int fd ) static int receive_fd( obj_handle_t *handle ) { struct iovec vec; - int ret, fd; - -#ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS struct msghdr msghdr; + int ret, fd = -1; - fd = -1; +#ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS msghdr.msg_accrights = (void *)&fd; msghdr.msg_accrightslen = sizeof(fd); #else /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - struct msghdr msghdr; - struct cmsg_fd cmsg; - - cmsg.header.len = sizeof(cmsg.header) + sizeof(fd); - cmsg.header.level = SOL_SOCKET; - cmsg.header.type = SCM_RIGHTS; - cmsg.fd = -1; - msghdr.msg_control = &cmsg; - msghdr.msg_controllen = sizeof(cmsg.header) + sizeof(fd); + char cmsg_buffer[256]; + msghdr.msg_control = cmsg_buffer; + msghdr.msg_controllen = sizeof(cmsg_buffer); msghdr.msg_flags = 0; #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ @@ -416,8 +395,13 @@ static int receive_fd( obj_handle_t *handle ) if ((ret = recvmsg( fd_socket, &msghdr, MSG_CMSG_CLOEXEC )) > 0) { #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS - fd = cmsg.fd; -#endif + struct cmsghdr *cmsg; + for (cmsg = CMSG_FIRSTHDR( &msghdr ); cmsg; cmsg = CMSG_NXTHDR( &msghdr, cmsg )) + { + if (cmsg->cmsg_level != SOL_SOCKET) continue; + if (cmsg->cmsg_type == SCM_RIGHTS) fd = *(int *)CMSG_DATA(cmsg); + } +#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ if (fd != -1) fcntl( fd, F_SETFD, FD_CLOEXEC ); /* in case MSG_CMSG_CLOEXEC is not supported */ return fd; } diff --git a/server/request.c b/server/request.c index d2aebb3..cea23ef 100644 --- a/server/request.c +++ b/server/request.c @@ -126,23 +126,6 @@ int config_dir_fd = -1; /* file descriptor for the config dir */ static struct master_socket *master_socket; /* the master socket object */ static struct timeout_user *master_timeout; -/* socket communication static structures */ -static struct iovec myiovec; -static struct msghdr msghdr; -#ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS -struct cmsg_fd -{ - struct - { - size_t len; /* size of structure */ - int level; /* SOL_SOCKET */ - int type; /* SCM_RIGHTS */ - } header; - int fd; /* fd to pass */ -}; -static struct cmsg_fd cmsg = { { sizeof(cmsg.header) + sizeof(cmsg.fd), SOL_SOCKET, SCM_RIGHTS }, -1 }; -#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - /* complain about a protocol error and terminate the client connection */ void fatal_protocol_error( struct thread *thread, const char *err, ... ) { @@ -359,25 +342,41 @@ error: /* receive a file descriptor on the process socket */ int receive_fd( struct process *process ) { + struct iovec vec; struct send_fd data; - int fd, ret; + struct msghdr msghdr; + int fd = -1, ret; #ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS msghdr.msg_accrightslen = sizeof(int); msghdr.msg_accrights = (void *)&fd; #else /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - msghdr.msg_control = &cmsg; - msghdr.msg_controllen = sizeof(cmsg.header) + sizeof(fd); - cmsg.fd = -1; + char cmsg_buffer[256]; + msghdr.msg_control = cmsg_buffer; + msghdr.msg_controllen = sizeof(cmsg_buffer); + msghdr.msg_flags = 0; #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - myiovec.iov_base = (void *)&data; - myiovec.iov_len = sizeof(data); + msghdr.msg_name = NULL; + msghdr.msg_namelen = 0; + msghdr.msg_iov = &vec; + msghdr.msg_iovlen = 1; + vec.iov_base = (void *)&data; + vec.iov_len = sizeof(data); ret = recvmsg( get_unix_fd( process->msg_fd ), &msghdr, 0 ); + #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS - fd = cmsg.fd; -#endif + if (ret > 0) + { + struct cmsghdr *cmsg; + for (cmsg = CMSG_FIRSTHDR( &msghdr ); cmsg; cmsg = CMSG_NXTHDR( &msghdr, cmsg )) + { + if (cmsg->cmsg_level != SOL_SOCKET) continue; + if (cmsg->cmsg_type == SCM_RIGHTS) fd = *(int *)CMSG_DATA(cmsg); + } + } +#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ if (ret == sizeof(data)) { @@ -412,6 +411,7 @@ int receive_fd( struct process *process ) { fprintf( stderr, "Protocol error: process %04x: partial recvmsg %d for fd\n", process->id, ret ); + if (fd != -1) close( fd ); kill_process( process, 1 ); } else @@ -429,23 +429,37 @@ int receive_fd( struct process *process ) /* send an fd to a client */ int send_client_fd( struct process *process, int fd, obj_handle_t handle ) { + struct iovec vec; + struct msghdr msghdr; int ret; - if (debug_level) - fprintf( stderr, "%04x: *fd* %04x -> %d\n", - current ? current->id : process->id, handle, fd ); - #ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS msghdr.msg_accrightslen = sizeof(fd); msghdr.msg_accrights = (void *)&fd; #else /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - msghdr.msg_control = &cmsg; - msghdr.msg_controllen = sizeof(cmsg.header) + sizeof(fd); - cmsg.fd = fd; + char cmsg_buffer[256]; + struct cmsghdr *cmsg; + msghdr.msg_control = cmsg_buffer; + msghdr.msg_controllen = sizeof(cmsg_buffer); + msghdr.msg_flags = 0; + cmsg = CMSG_FIRSTHDR( &msghdr ); + cmsg->cmsg_len = CMSG_LEN( sizeof(fd) ); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + *(int *)CMSG_DATA(cmsg) = fd; + msghdr.msg_controllen = cmsg->cmsg_len; #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ - myiovec.iov_base = (void *)&handle; - myiovec.iov_len = sizeof(handle); + msghdr.msg_name = NULL; + msghdr.msg_namelen = 0; + msghdr.msg_iov = &vec; + msghdr.msg_iovlen = 1; + + vec.iov_base = (void *)&handle; + vec.iov_len = sizeof(handle); + + if (debug_level) + fprintf( stderr, "%04x: *fd* %04x -> %d\n", current ? current->id : process->id, handle, fd ); ret = sendmsg( get_unix_fd( process->msg_fd ), &msghdr, 0 ); @@ -797,12 +811,6 @@ void open_master_socket(void) acquire_lock(); } - /* setup msghdr structure constant fields */ - msghdr.msg_name = NULL; - msghdr.msg_namelen = 0; - msghdr.msg_iov = &myiovec; - msghdr.msg_iovlen = 1; - /* init the process tracing mechanism */ init_tracing_mechanism(); }

1 0

Wolfram Sang : hhctrl: Add check for no filename.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: d40f6132d574e076bedcdb2b665d829806a6c68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d40f6132d574e076bedcdb2b6… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Wed Sep 8 16:23:47 2010 +0200 hhctrl: Add check for no filename. (cherry picked from commit 9e1d9ef972f65e292e7b00e1da9293271bc60486) --- dlls/hhctrl.ocx/hhctrl.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 9ab66de..2101e05 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -295,6 +295,9 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) ptr += strlen("mapid")+1; space = strchr(ptr, ' '); + /* command line ends without number */ + if (!space) + return 0; memcpy(idtxt, ptr, space-ptr); idtxt[space-ptr] = '\0'; mapid = atoi(idtxt); @@ -315,6 +318,11 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) len = endq - szCmdLine; else len = strlen(szCmdLine); + + /* no filename given */ + if (!len) + return 0; + buflen = MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, NULL, 0) + 1; filename = heap_alloc(buflen * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, filename, buflen);

1 0

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 October 2010