wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Francois Gouget : testbot: When restarting a task, reset all the fields related to its previous run.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: tools Branch: master Commit: 0160d815ceca3746d5464741eefbd164543bb7fd URL: http://source.winehq.org/git/tools.git/?a=commit;h=0160d815ceca3746d5464741… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 10:55:12 2013 +0100 testbot: When restarting a task, reset all the fields related to its previous run. Some fields like the start and stop time would still be displayed and could be confusing. The 'TestFailures' field could even not get reset if the task then is canceled or fails to run and thus report incorrect results. --- testbot/lib/WineTestBot/Jobs.pm | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index cd6c427..c73dea1 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -231,6 +231,10 @@ sub Restart system("rm", "-rf", "$JobDir/" . $Step->No . "/" . $Task->No); } $Task->Status("queued"); + $Task->ChildPid(undef); + $Task->Started(undef); + $Task->Ended(undef); + $Task->TestFailures(undef); } # Subsequent steps only contain files generated by the previous steps system("rm", "-rf", "$JobDir/" . $Step->No) if (!$FirstStep);

1 0

Francois Gouget : testbot: Document a harmless race in the task startup and its consequences.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: tools Branch: master Commit: e7ea9b8e63644471762d7cf4fda4e7018f0dbe02 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e7ea9b8e63644471762d7cf4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 10:54:31 2013 +0100 testbot: Document a harmless race in the task startup and its consequences. --- testbot/lib/WineTestBot/Tasks.pm | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 56028d8..8ca9da0 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -129,6 +129,10 @@ sub Run exit(1); } + # Note that if the child process completes quickly (typically due to some + # error), it may set ChildPid to undef before we get here. So we may end up + # with non-running tasks for which ChildPid is set. That's ok because + # ChildPid should be ignored anyway if Status is not 'running'. $self->ChildPid($Pid); $self->Started(time); my ($ErrProperty, $ErrMessage) = $self->Save(); @@ -206,6 +210,7 @@ BEGIN CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), + # Note: ChildPid is only valid when Status == 'running'. CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19),

1 0

Francois Gouget : testbot/VMs: Change a couple of default values for new VM objects.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: tools Branch: master Commit: f93154263153680594e4b55d5ff6d9f32bceda2f URL: http://source.winehq.org/git/tools.git/?a=commit;h=f93154263153680594e4b55d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 10:55:37 2013 +0100 testbot/VMs: Change a couple of default values for new VM objects. --- testbot/lib/WineTestBot/VMs.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index fd064a1..fdd06cb 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -217,8 +217,8 @@ sub InitializeNew { my $self = shift; - $self->Status("Idle"); - $self->IdleSnapshot("winetest_on"); + $self->Status("idle"); + $self->IdleSnapshot("wtb"); $self->SUPER::InitializeNew(@_); }

1 0

Jacek Caban : secur32: Pass whole schan_credentials struct to schannel backend implementations.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: b7a75b468ab57d4e03304e587f1f74b3f4167ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a75b468ab57d4e03304e587… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 13:55:20 2013 +0100 secur32: Pass whole schan_credentials struct to schannel backend implementations. --- dlls/secur32/schannel.c | 14 ++++---------- dlls/secur32/schannel_gnutls.c | 15 +++++++-------- dlls/secur32/schannel_macosx.c | 13 ++++++------- dlls/secur32/secur32_priv.h | 14 +++++++++----- 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index bf64fcd..387eaad 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -50,12 +50,6 @@ struct schan_handle enum schan_handle_type type; }; -struct schan_credentials -{ - ULONG credential_use; - schan_imp_certificate_credentials credentials; -}; - struct schan_context { schan_imp_session session; @@ -316,7 +310,7 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (handle == SCHAN_INVALID_HANDLE) goto fail; creds->credential_use = SECPKG_CRED_OUTBOUND; - if (!schan_imp_allocate_certificate_credentials(&creds->credentials)) + if (!schan_imp_allocate_certificate_credentials(creds)) { schan_free_handle(handle, SCHAN_HANDLE_CRED); goto fail; @@ -424,7 +418,7 @@ static SECURITY_STATUS SEC_ENTRY schan_FreeCredentialsHandle( if (!creds) return SEC_E_INVALID_HANDLE; if (creds->credential_use == SECPKG_CRED_OUTBOUND) - schan_imp_free_certificate_credentials(creds->credentials); + schan_imp_free_certificate_credentials(creds); HeapFree(GetProcessHeap(), 0, creds); return SEC_E_OK; @@ -705,7 +699,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INTERNAL_ERROR; } - if (!schan_imp_create_session(&ctx->session, FALSE, cred->credentials)) + if (!schan_imp_create_session(&ctx->session, cred)) { schan_free_handle(handle, SCHAN_HANDLE_CTX); HeapFree(GetProcessHeap(), 0, ctx); @@ -1329,7 +1323,7 @@ void SECUR32_deinitSchannelSP(void) { struct schan_credentials *cred; cred = schan_free_handle(i, SCHAN_HANDLE_CRED); - schan_imp_free_certificate_credentials(cred->credentials); + schan_imp_free_certificate_credentials(cred); HeapFree(GetProcessHeap(), 0, cred); } } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index b273e96..8975b2d 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -106,12 +106,11 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, return buff_len; } -BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, - schan_imp_certificate_credentials cred) +BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; - int err = pgnutls_init(s, is_server ? GNUTLS_SERVER : GNUTLS_CLIENT); + int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -129,7 +128,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, } err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, - (gnutls_certificate_credentials_t)cred); + (gnutls_certificate_credentials_t)cred->credentials); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -405,17 +404,17 @@ again: return SEC_E_OK; } -BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credentials *c) +BOOL schan_imp_allocate_certificate_credentials(schan_credentials *c) { - int ret = pgnutls_certificate_allocate_credentials((gnutls_certificate_credentials*)c); + int ret = pgnutls_certificate_allocate_credentials((gnutls_certificate_credentials*)&c->credentials); if (ret != GNUTLS_E_SUCCESS) pgnutls_perror(ret); return (ret == GNUTLS_E_SUCCESS); } -void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) +void schan_imp_free_certificate_credentials(schan_credentials *c) { - pgnutls_certificate_free_credentials((gnutls_certificate_credentials_t)c); + pgnutls_certificate_free_credentials(c->credentials); } static void schan_gnutls_log(int level, const char *msg) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 05b0a5e..2acb6ca 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -631,19 +631,18 @@ static OSStatus schan_push_adapter(SSLConnectionRef transport, const void *buff, } -BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, - schan_imp_certificate_credentials cred) +BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { struct mac_session *s; OSStatus status; - TRACE("(%p, %d)\n", session, is_server); + TRACE("(%p)\n", session); s = HeapAlloc(GetProcessHeap(), 0, sizeof(*s)); if (!s) return FALSE; - status = SSLNewContext(is_server, &s->context); + status = SSLNewContext(cred->credential_use == SECPKG_CRED_INBOUND, &s->context); if (status != noErr) { ERR("Failed to create session context: %ld\n", (long)status); @@ -966,14 +965,14 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, return SEC_E_OK; } -BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credentials *c) +BOOL schan_imp_allocate_certificate_credentials(schan_credentials *c) { /* The certificate is never really used for anything. */ - *c = NULL; + c->credentials = NULL; return TRUE; } -void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) +void schan_imp_free_certificate_credentials(schan_credentials *c) { } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 164a2eb..bc4b74b 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -209,7 +209,12 @@ SecPkgInfoA *ntlm_package_infoA; /* schannel internal interface */ typedef struct schan_imp_session_opaque *schan_imp_session; -typedef struct schan_imp_certificate_credentials_opaque *schan_imp_certificate_credentials; + +typedef struct schan_credentials +{ + ULONG credential_use; + void *credentials; +} schan_credentials; struct schan_transport; @@ -237,8 +242,7 @@ extern int schan_push(struct schan_transport *t, const void *buff, size_t *buff_ extern schan_imp_session schan_session_for_transport(struct schan_transport* t) DECLSPEC_HIDDEN; /* schannel implementation interface */ -extern BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, - schan_imp_certificate_credentials cred) DECLSPEC_HIDDEN; +extern BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) DECLSPEC_HIDDEN; extern void schan_imp_dispose_session(schan_imp_session session) DECLSPEC_HIDDEN; extern void schan_imp_set_session_transport(schan_imp_session session, struct schan_transport *t) DECLSPEC_HIDDEN; @@ -253,8 +257,8 @@ extern SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buf SIZE_T *length) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, SIZE_T *length) DECLSPEC_HIDDEN; -extern BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credentials *c) DECLSPEC_HIDDEN; -extern void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) DECLSPEC_HIDDEN; +extern BOOL schan_imp_allocate_certificate_credentials(schan_credentials*) DECLSPEC_HIDDEN; +extern void schan_imp_free_certificate_credentials(schan_credentials*) DECLSPEC_HIDDEN; extern BOOL schan_imp_init(void) DECLSPEC_HIDDEN; extern void schan_imp_deinit(void) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcrt: Fixed copied buffer size in _ui64tow_s.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 737bb1bb1800e727024096f231b8777a24fa4ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=737bb1bb1800e727024096f23… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 25 13:37:29 2013 +0100 msvcrt: Fixed copied buffer size in _ui64tow_s. --- dlls/msvcrt/string.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index e4e94ff..1b2dea8 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1187,7 +1187,7 @@ int CDECL MSVCRT__ui64tow_s( unsigned __int64 value, MSVCRT_wchar_t *str, return MSVCRT_EINVAL; } - memcpy(str, pos, buffer-pos+65); + memcpy(str, pos, (buffer-pos+65)*sizeof(MSVCRT_wchar_t)); return 0; } @@ -1248,7 +1248,7 @@ int CDECL _ultoa_s(MSVCRT_ulong value, char *str, MSVCRT_size_t size, int radix) /********************************************************************* * _ultow_s (MSVCRT.@) */ -int CDECL _ultow_s(MSVCRT_ulong value, WCHAR *str, MSVCRT_size_t size, int radix) +int CDECL _ultow_s(MSVCRT_ulong value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) { MSVCRT_ulong digit; WCHAR buffer[33], *pos; @@ -1295,7 +1295,7 @@ int CDECL _ultow_s(MSVCRT_ulong value, WCHAR *str, MSVCRT_size_t size, int radix return MSVCRT_ERANGE; } - memcpy(str, pos, len * sizeof(WCHAR)); + memcpy(str, pos, len * sizeof(MSVCRT_wchar_t)); return 0; }

1 0

Hans Leidekker : winhttp: Remove support for MSG_PEEK.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: a55e3d4f57d5585ce0cd4f239d01794751bf45ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55e3d4f57d5585ce0cd4f239… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 13:27:15 2013 +0100 winhttp: Remove support for MSG_PEEK. --- dlls/winhttp/net.c | 22 ++-------------------- 1 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 9fca4b5..631939a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -667,17 +667,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd SIZE_T size, cread; BOOL res, eof; - if (flags & ~(MSG_PEEK | MSG_WAITALL)) - FIXME("SSL_read does not support the following flags: %08x\n", flags); - - if (flags & MSG_PEEK && conn->peek_msg) - { - if (len < conn->peek_len) FIXME("buffer isn't big enough, should we wrap?\n"); - *recvd = min( len, conn->peek_len ); - memcpy( buf, conn->peek_msg, *recvd ); - return TRUE; - } - else if (conn->peek_msg) + if (conn->peek_msg) { *recvd = min( len, conn->peek_len ); memcpy( buf, conn->peek_msg, *recvd ); @@ -691,7 +681,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd conn->peek_msg = NULL; } /* check if we have enough data from the peek buffer */ - if (!(flags & MSG_WAITALL) || (*recvd == len)) return TRUE; + if (!(flags & MSG_WAITALL) || *recvd == len) return TRUE; } size = *recvd; @@ -712,14 +702,6 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd size += cread; }while(!size || ((flags & MSG_WAITALL) && size < len)); - if(size && (flags & MSG_PEEK)) { - conn->peek_msg_mem = conn->peek_msg = heap_alloc(size); - if(!conn->peek_msg) - return FALSE; - - memcpy(conn->peek_msg, buf, size); - } - TRACE("received %ld bytes\n", size); *recvd = size; return TRUE;

1 0

Hans Leidekker : winhttp: Add a read-ahead buffer to allow WinHttpQueryDataAvailable to return the right values in chunked mode .
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: bb3097f01e532583c8c78c9daf64ff29f8eb255c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3097f01e532583c8c78c9da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 13:26:37 2013 +0100 winhttp: Add a read-ahead buffer to allow WinHttpQueryDataAvailable to return the right values in chunked mode. This is a port of wininet commit 3d02c42b39c7346a97c41974418a6d01a29f9b81. --- dlls/winhttp/request.c | 381 +++++++++++++++++++++++++--------------- dlls/winhttp/tests/winhttp.c | 78 ++++++++ dlls/winhttp/winhttp_private.h | 5 + 3 files changed, 318 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb3097f01e532583c8c78…

1 0

Hans Leidekker : rpcrt4: Use the right port for https connections.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 9967aed09db32909ce7116e7cad804bec8998dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9967aed09db32909ce7116e7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 13:26:03 2013 +0100 rpcrt4: Use the right port for https connections. --- dlls/rpcrt4/rpc_transport.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index fc81bbe..6adc289 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2066,7 +2066,7 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) LPWSTR password = NULL; LPWSTR servername = NULL; const WCHAR *option; - INTERNET_PORT port = INTERNET_INVALID_PORT_NUMBER; /* use default port */ + INTERNET_PORT port; if (httpc->common.QOS && (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP)) @@ -2163,6 +2163,11 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) MultiByteToWideChar(CP_ACP, 0, httpc->common.NetworkAddr, -1, servername, strlen(httpc->common.NetworkAddr) + 1); } + port = (httpc->common.QOS && + (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) && + (httpc->common.QOS->qos->u.HttpCredentials->Flags & RPC_C_HTTP_FLAG_USE_SSL)) ? + INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; + httpc->session = InternetConnectW(httpc->app_info, servername, port, user, password, INTERNET_SERVICE_HTTP, 0, 0);

1 0

Dmitry Timoshkov : ws2_32: Make _is_blocking() return server error code, so that callers can act appropriately.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: c09c82b25a3c95e79f23f22571fe9a63b38b824c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09c82b25a3c95e79f23f2257… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 22 14:59:50 2013 +0900 ws2_32: Make _is_blocking() return server error code, so that callers can act appropriately. --- dlls/ws2_32/socket.c | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f9e8a6c..a6a1b4c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -803,19 +803,19 @@ static void _enable_event( HANDLE s, unsigned int event, SERVER_END_REQ; } -static int _is_blocking(SOCKET s) +static NTSTATUS _is_blocking(SOCKET s, BOOL *ret) { - int ret; + NTSTATUS status; SERVER_START_REQ( get_socket_event ) { req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); req->service = FALSE; req->c_event = 0; - wine_server_call( req ); - ret = (reply->state & FD_WINE_NONBLOCKING) == 0; + status = wine_server_call( req ); + *ret = (reply->state & FD_WINE_NONBLOCKING) == 0; } SERVER_END_REQ; - return ret; + return status; } static unsigned int _get_sock_mask(SOCKET s) @@ -835,9 +835,10 @@ static unsigned int _get_sock_mask(SOCKET s) static void _sync_sock_state(SOCKET s) { + BOOL dummy; /* do a dummy wineserver request in order to let the wineserver run through its select loop once */ - (void)_is_blocking(s); + (void)_is_blocking(s, &dummy); } static int _get_sock_error(SOCKET s, unsigned int bit) @@ -1950,7 +1951,12 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, BOOL is_blocking; TRACE("socket %04lx\n", s ); - is_blocking = _is_blocking(s); + status = _is_blocking(s, &is_blocking); + if (status) + { + set_error(status); + return INVALID_SOCKET; + } do { /* try accepting first (if there is a deferred connection) */ @@ -2341,6 +2347,8 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) if (fd != -1) { + NTSTATUS status; + BOOL is_blocking; int ret = do_connect(fd, name, namelen); if (ret == 0) goto connect_success; @@ -2351,7 +2359,14 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, FD_CONNECT, FD_WINE_CONNECTED|FD_WINE_LISTENING); - if (_is_blocking(s)) + status = _is_blocking( s, &is_blocking ); + if (status) + { + release_sock_fd( s, fd ); + set_error( status ); + return SOCKET_ERROR; + } + if (is_blocking) { int result; /* block here */ @@ -3965,6 +3980,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, int totalLength = 0; ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; DWORD bytes_sent; + BOOL is_blocking; TRACE("socket %04lx, wsabuf %p, nbufs %d, flags %d, to %p, tolen %d, ovl %p, func %p\n", s, lpBuffers, dwBufferCount, dwFlags, @@ -4063,7 +4079,13 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, return 0; } - if ( _is_blocking(s) ) + if ((err = _is_blocking( s, &is_blocking ))) + { + err = NtStatusToWSAError( err ); + goto error; + } + + if ( is_blocking ) { /* On a blocking non-overlapped stream socket, * sending blocks until the entire buffer is sent. */ @@ -5858,6 +5880,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, unsigned int i, options; int n, fd, err; struct ws2_async *wsa; + BOOL is_blocking; DWORD timeout_start = GetTickCount(); ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; @@ -5961,7 +5984,13 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (n != -1) break; - if ( _is_blocking(s) ) + if ((err = _is_blocking( s, &is_blocking ))) + { + err = NtStatusToWSAError( err ); + goto error; + } + + if ( is_blocking ) { struct pollfd pfd; int timeout = GET_RCVTIMEO(fd);

1 0

Austin English : msvcp90/tests: Remove thiscall_thunk_retptr struct definitions.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: f3c154197edbf9a347b7a96a5ca105b568571b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c154197edbf9a347b7a96a5… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 20 20:24:13 2013 -0700 msvcp90/tests: Remove thiscall_thunk_retptr struct definitions. --- dlls/msvcp90/tests/ios.c | 2 -- dlls/msvcp90/tests/misc.c | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 0ae34d3..9c78318 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -544,8 +544,6 @@ static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void static void * (WINAPI *call_thiscall_func2_ptr_dbl)( void *func, void *this, double a ); static void * (WINAPI *call_thiscall_func2_ptr_fpos)( void *func, void *this, fpos_int a ); -struct thiscall_thunk_retptr *thunk_retptr; - static void init_thiscall_thunk(void) { struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index dc099d3..f8eee4e 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -149,7 +149,6 @@ static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, const void *b ); static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void *a, const void *b, const void *c, const void *d ); -struct thiscall_thunk_retptr *thunk_retptr; static void init_thiscall_thunk(void) {

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2013