May 2007 - Wine-Commits - list.winehq.org

Louis Lenders : comctl32: Add stub for DrawShadowText.
by Alexandre Julliard May 31, 2007

May 31, 2007

Module: wine Branch: master Commit: b7a5985bca1f9f36cc4d0dbf4d976d8ba95b661d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a5985bca1f9f36cc4d0dbf4… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed May 30 21:19:52 2007 +0100 comctl32: Add stub for DrawShadowText. --- dlls/comctl32/comctl32.spec | 1 + dlls/comctl32/commctrl.c | 13 +++++++++++++ include/commctrl.h | 2 +- 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 7f9c06f..6b8f662 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -125,6 +125,7 @@ @ stdcall DestroyPropertySheetPage(long) @ stdcall -private DllGetVersion(ptr) @ stdcall -private DllInstall(long wstr) +@ stdcall DrawShadowText(long wstr long ptr long long long long long) @ stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA @ stdcall DrawStatusTextW(long ptr wstr long) @ stdcall FlatSB_EnableScrollBar (long long long) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index f7f7ecc..c239718 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1522,3 +1522,16 @@ LRESULT WINAPI SetPathWordBreakProc(HWND hwnd, BOOL bSet) return SendMessageW(hwnd, EM_SETWORDBREAKPROC, 0, (LPARAM)(bSet ? PathWordBreakProc : NULL)); } + +/*********************************************************************** + * DrawShadowText [COMCTL32.@] + * + * Draw text with shadow. + */ +int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, const RECT *pRect, DWORD dwFlags, + COLORREF crText, COLORREF crShadow, int ixOffset, int iyOffset) +{ + FIXME("(%p, %s, %d, %p, %d, 0x%08x, 0x%08x, %d, %d): stub\n", hdc, debugstr_w(pszText), cch, pRect, dwFlags, + crText, crShadow, ixOffset, iyOffset); + return DrawTextW(hdc, pszText, cch, (LPRECT)pRect, DT_LEFT); +} diff --git a/include/commctrl.h b/include/commctrl.h index 2a49e00..a1e82a9 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -713,7 +713,7 @@ BOOL WINAPI GetWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR*); BOOL WINAPI RemoveWindowSubclass(HWND, SUBCLASSPROC, UINT_PTR); LRESULT WINAPI DefSubclassProc(HWND, UINT, WPARAM, LPARAM); -int WINAPI DrawShadowText(HDC, LPCWSTR, UINT, RECT*, DWORD, COLORREF, COLORREF, int, int); +int WINAPI DrawShadowText(HDC, LPCWSTR, UINT, const RECT*, DWORD, COLORREF, COLORREF, int, int); /* Header control */

1 0

Rob Shearman : widl: Set current_structure when writing out structure members to
by Alexandre Julliard May 31, 2007

May 31, 2007

Module: wine Branch: master Commit: 5ca386755efca53f47cbb97c60d85b355d31e552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca386755efca53f47cbb97c6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 30 22:43:34 2007 +0100 widl: Set current_structure when writing out structure members to ensure the conformance/variance calculation function can find the necessary fields in the structures. --- tools/widl/typegen.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3af2524..dbbabbc 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1279,7 +1279,9 @@ static size_t write_struct_tfs(FILE *file, type_t *type, } /* member layout */ + current_structure = type; write_struct_members(file, type, typestring_offset); + current_structure = NULL; return start_offset; case RPC_FC_CSTRUCT: case RPC_FC_CPSTRUCT: @@ -1403,7 +1405,9 @@ static size_t write_struct_tfs(FILE *file, type_t *type, print_file(file, 2, "NdrFcShort(0x0),\t/* FIXME: pointer stuff */\n"); *typestring_offset += 8; + current_structure = type; write_struct_members(file, type, typestring_offset); + current_structure = NULL; return start_offset;

1 0

Alexandre Julliard : ws2_32: Store the local iosb in the ws2_async structure to avoid a memory allocation .
by Alexandre Julliard May 31, 2007

May 31, 2007

Module: wine Branch: master Commit: 442bd1b5fc191f4d71335ea81a326a39ca79c7e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=442bd1b5fc191f4d71335ea81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 31 12:07:14 2007 +0200 ws2_32: Store the local iosb in the ws2_async structure to avoid a memory allocation. --- dlls/ws2_32/socket.c | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 85a2269..d9cc023 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -188,6 +188,7 @@ typedef struct ws2_async enum ws2_mode {ws2m_read, ws2m_write, ws2m_sd_read, ws2m_sd_write} mode; LPWSAOVERLAPPED user_overlapped; LPWSAOVERLAPPED_COMPLETION_ROUTINE completion_func; + IO_STATUS_BLOCK local_iosb; struct iovec *iovec; int n_iovecs; struct WS_sockaddr *addr; @@ -1031,15 +1032,6 @@ static void ws2_async_terminate(ws2_async* as, IO_STATUS_BLOCK* iosb, NTSTATUS s if (as->completion_func) as->completion_func( NtStatusToWSAError(status), count, as->user_overlapped, as->flags ); - if ( !as->user_overlapped ) - { -#if 0 - /* FIXME: I don't think this is really used */ - if ( as->overlapped->hEvent != INVALID_HANDLE_VALUE ) - WSACloseEvent( as->overlapped->hEvent ); -#endif - HeapFree( GetProcessHeap(), 0, iosb ); - } HeapFree( GetProcessHeap(), 0, as->iovec ); HeapFree( GetProcessHeap(), 0, as ); @@ -1097,19 +1089,14 @@ WS2_make_async(SOCKET s, enum ws2_mode mode, struct iovec *iovec, DWORD dwBuffer if (!lpCompletionRoutine) wsa->event = lpOverlapped->hEvent; } - else if (!(*piosb = HeapAlloc( GetProcessHeap(), 0, sizeof(IO_STATUS_BLOCK)))) - goto error; + else + *piosb = &wsa->local_iosb; TRACE( "wsa %p, h %p, ev %p, iosb %p, uov %p, cfunc %p\n", wsa, wsa->hSocket, wsa->event, *piosb, wsa->user_overlapped, wsa->completion_func ); return wsa; - -error: - TRACE("Error\n"); - HeapFree( GetProcessHeap(), 0, wsa ); - return NULL; } static ULONG ws2_queue_async(struct ws2_async* wsa, IO_STATUS_BLOCK* iosb) @@ -2759,8 +2746,6 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { err = NtStatusToWSAError( ret ); - if ( !lpOverlapped ) - HeapFree( GetProcessHeap(), 0, iosb ); HeapFree( GetProcessHeap(), 0, wsa ); goto err_free; }

1 0

Alexandre Julliard : ws2_32: Avoid memory allocations for sockaddr conversion.
by Alexandre Julliard May 31, 2007

May 31, 2007

Module: wine Branch: master Commit: 42e560d001e171e29f5ae5a9ab30de008bcbc7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e560d001e171e29f5ae5a9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 30 20:11:58 2007 +0200 ws2_32: Avoid memory allocations for sockaddr conversion. --- dlls/ws2_32/socket.c | 178 ++++++++++++++++++-------------------------------- 1 files changed, 65 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42e560d001e171e29f5ae…

1 0

Alexandre Julliard : ws2_32: Allocate iovec buffers statically using MSG_MAXIOVLEN.
by Alexandre Julliard May 31, 2007

May 31, 2007

Module: wine Branch: master Commit: 9db85745409f8363481e32698fba234cf2163040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db85745409f8363481e32698… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 31 12:15:08 2007 +0200 ws2_32: Allocate iovec buffers statically using MSG_MAXIOVLEN. --- dlls/ws2_32/socket.c | 60 ++++++++++++++++++++------------------------------ 1 files changed, 24 insertions(+), 36 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d9cc023..decbf22 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -189,7 +189,7 @@ typedef struct ws2_async LPWSAOVERLAPPED user_overlapped; LPWSAOVERLAPPED_COMPLETION_ROUTINE completion_func; IO_STATUS_BLOCK local_iosb; - struct iovec *iovec; + struct iovec iovec[WS_MSG_MAXIOVLEN]; int n_iovecs; struct WS_sockaddr *addr; union @@ -1033,7 +1033,6 @@ static void ws2_async_terminate(ws2_async* as, IO_STATUS_BLOCK* iosb, NTSTATUS s as->completion_func( NtStatusToWSAError(status), count, as->user_overlapped, as->flags ); - HeapFree( GetProcessHeap(), 0, as->iovec ); HeapFree( GetProcessHeap(), 0, as ); } @@ -1078,7 +1077,7 @@ WS2_make_async(SOCKET s, enum ws2_mode mode, struct iovec *iovec, DWORD dwBuffer } wsa->user_overlapped = lpOverlapped; wsa->completion_func = lpCompletionRoutine; - wsa->iovec = iovec; + memcpy( wsa->iovec, iovec, dwBufferCount * sizeof(*iovec) ); wsa->n_iovecs = dwBufferCount; wsa->addr = addr; wsa->event = 0; @@ -2697,7 +2696,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { unsigned int i, options; int n, fd, err = WSAENOTSOCK, ret; - struct iovec* iovec; + struct iovec iovec[WS_MSG_MAXIOVLEN]; struct ws2_async *wsa; IO_STATUS_BLOCK* iosb; @@ -2705,6 +2704,12 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, s, lpBuffers, dwBufferCount, dwFlags, to, tolen, lpOverlapped, lpCompletionRoutine); + if (dwBufferCount > WS_MSG_MAXIOVLEN) + { + WSASetLastError( WSAEINVAL ); + return SOCKET_ERROR; + } + fd = get_sock_fd( s, FILE_WRITE_DATA, &options ); TRACE( "fd=%d, options=%x\n", fd, options ); @@ -2713,15 +2718,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if ( !lpNumberOfBytesSent ) { err = WSAEFAULT; - goto err_close; - } - - iovec = HeapAlloc(GetProcessHeap(), 0, dwBufferCount * sizeof(struct iovec) ); - - if ( !iovec ) - { - err = WSAEFAULT; - goto err_close; + goto error; } for ( i = 0; i < dwBufferCount; i++ ) @@ -2739,7 +2736,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if ( !wsa ) { err = WSAEFAULT; - goto err_free; + goto error; } if ((ret = ws2_queue_async( wsa, iosb )) != STATUS_PENDING) @@ -2747,7 +2744,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, err = NtStatusToWSAError( ret ); HeapFree( GetProcessHeap(), 0, wsa ); - goto err_free; + goto error; } release_sock_fd( s, fd ); @@ -2759,7 +2756,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, return 0; if ( (err = WSAGetLastError()) != WSA_IO_INCOMPLETE ) - goto error; + return SOCKET_ERROR; } WSASetLastError( WSA_IO_PENDING ); @@ -2789,14 +2786,14 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, /* FIXME: exceptfds? */ if( !do_block(fd, POLLOUT, timeout)) { err = WSAETIMEDOUT; - goto err_free; /* msdn says a timeout in send is fatal */ + goto error; /* msdn says a timeout in send is fatal */ } n = WS2_send( fd, piovec, dwBufferCount, to, tolen, dwFlags ); if ( n == -1 ) { err = wsaErrno(); - goto err_free; + goto error; } *lpNumberOfBytesSent += n; @@ -2825,7 +2822,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, err = wsaErrno(); if ( err == WSAEWOULDBLOCK ) _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); - goto err_free; + goto error; } else _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); @@ -2834,17 +2831,11 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, TRACE(" -> %i bytes\n", *lpNumberOfBytesSent); - HeapFree( GetProcessHeap(), 0, iovec ); release_sock_fd( s, fd ); return 0; -err_free: - HeapFree( GetProcessHeap(), 0, iovec ); - -err_close: - release_sock_fd( s, fd ); - error: + release_sock_fd( s, fd ); WARN(" -> ERROR %d\n", err); WSASetLastError(err); return SOCKET_ERROR; @@ -4200,7 +4191,7 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, unsigned int i, options; int n, fd, err; DWORD timeout_start = GetTickCount(); - struct iovec* iovec; + struct iovec iovec[WS_MSG_MAXIOVLEN]; struct ws2_async *wsa; IO_STATUS_BLOCK* iosb; @@ -4209,18 +4200,17 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, (lpFromlen ? *lpFromlen : -1), lpOverlapped, lpCompletionRoutine); + if (dwBufferCount > WS_MSG_MAXIOVLEN) + { + WSASetLastError( WSAEINVAL ); + return SOCKET_ERROR; + } + fd = get_sock_fd( s, FILE_READ_DATA, &options ); TRACE( "fd=%d, options=%x\n", fd, options ); if (fd == -1) return SOCKET_ERROR; - iovec = HeapAlloc( GetProcessHeap(), 0, dwBufferCount * sizeof (struct iovec) ); - if ( !iovec ) - { - err = WSAEFAULT; - goto error; - } - for (i = 0; i < dwBufferCount; i++) { iovec[i].iov_base = lpBuffers[i].buf; @@ -4308,14 +4298,12 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, TRACE(" -> %i bytes\n", n); *lpNumberOfBytesRecvd = n; - HeapFree(GetProcessHeap(), 0, iovec); release_sock_fd( s, fd ); _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); return 0; error: - HeapFree(GetProcessHeap(), 0, iovec); release_sock_fd( s, fd ); WARN(" -> ERROR %d\n", err); WSASetLastError( err );

1 0

Rob Shearman : widl: A structure with variance, but without conformance should be a complex struct instead of a conformant , varying struct.
by Alexandre Julliard May 31, 2007

May 31, 2007

Module: wine Branch: master Commit: f198dcf09b6cdc6a3916145054244156f11b78f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f198dcf09b6cdc6a391614505… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 30 22:42:03 2007 +0100 widl: A structure with variance, but without conformance should be a complex struct instead of a conformant, varying struct. --- tools/widl/parser.y | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 27ac1c6..80e3ff7 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1622,7 +1622,12 @@ static int get_struct_type(var_list_t *fields) } if( has_variance ) - return RPC_FC_CVSTRUCT; + { + if ( has_conformance ) + return RPC_FC_CVSTRUCT; + else + return RPC_FC_BOGUS_STRUCT; + } if( has_conformance && has_pointer ) return RPC_FC_CPSTRUCT; if( has_conformance )

1 0

Alexandre Julliard : ntdll: Report end of file instead of broken pipe on char devices.
by Alexandre Julliard May 31, 2007

May 31, 2007

Module: wine Branch: master Commit: 197bddfb8782eeadd0b866838fb400d95e5ea690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197bddfb8782eeadd0b866838… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 31 12:19:03 2007 +0200 ntdll: Report end of file instead of broken pipe on char devices. --- dlls/ntdll/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3265ed5..dc39735 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -576,7 +576,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (total) status = STATUS_SUCCESS; else - status = (type == FD_TYPE_FILE) ? STATUS_END_OF_FILE : STATUS_PIPE_BROKEN; + status = (type == FD_TYPE_FILE || type == FD_TYPE_CHAR) ? STATUS_END_OF_FILE : STATUS_PIPE_BROKEN; goto done; } }

1 0

Alexandre Julliard : ws2_32: Reimplement WSARecvFrom along the lines of NtReadFile.
by Alexandre Julliard May 31, 2007

May 31, 2007

Module: wine Branch: master Commit: 6759e1c286823a8ea6b004ca256481d16d1852fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6759e1c286823a8ea6b004ca2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 31 11:55:38 2007 +0200 ws2_32: Reimplement WSARecvFrom along the lines of NtReadFile. --- dlls/ws2_32/socket.c | 116 ++++++++++++++++++++++++++++--------------------- 1 files changed, 66 insertions(+), 50 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1eed70a..85a2269 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4213,7 +4213,8 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { unsigned int i, options; - int n, fd, err = WSAENOTSOCK, ret; + int n, fd, err; + DWORD timeout_start = GetTickCount(); struct iovec* iovec; struct ws2_async *wsa; IO_STATUS_BLOCK* iosb; @@ -4232,7 +4233,7 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if ( !iovec ) { err = WSAEFAULT; - goto err_close; + goto error; } for (i = 0; i < dwBufferCount; i++) @@ -4241,65 +4242,84 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, iovec[i].iov_len = lpBuffers[i].len; } - if ( (lpOverlapped || lpCompletionRoutine) && - !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) + for (;;) { - wsa = WS2_make_async( s, ws2m_read, iovec, dwBufferCount, - lpFlags, lpFrom, lpFromlen, - lpOverlapped, lpCompletionRoutine, &iosb ); + n = WS2_recv( fd, iovec, dwBufferCount, lpFrom, lpFromlen, lpFlags ); + if (n != -1) break; - if ( !wsa ) + if (errno == EINTR) continue; + if (errno != EAGAIN) { - err = WSAEFAULT; - goto err_free; + err = wsaErrno(); + goto error; } - if ((ret = ws2_queue_async( wsa, iosb )) != STATUS_PENDING) + if ((lpOverlapped || lpCompletionRoutine) && + !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) { - err = NtStatusToWSAError( ret ); + wsa = WS2_make_async( s, ws2m_read, iovec, dwBufferCount, + lpFlags, lpFrom, lpFromlen, + lpOverlapped, lpCompletionRoutine, &iosb ); + if ( !wsa ) + { + err = WSAEFAULT; + goto error; + } + release_sock_fd( s, fd ); - if ( !lpOverlapped ) - HeapFree( GetProcessHeap(), 0, iosb ); - HeapFree( GetProcessHeap(), 0, wsa ); - goto err_free; + iosb->u.Status = STATUS_PENDING; + iosb->Information = 0; + + SERVER_START_REQ( register_async ) + { + req->handle = wsa->hSocket; + req->type = ASYNC_TYPE_READ; + req->async.callback = WS2_async_recv; + req->async.iosb = iosb; + req->async.arg = wsa; + req->async.event = lpCompletionRoutine ? 0 : lpOverlapped->hEvent; + err = wine_server_call( req ); + } + SERVER_END_REQ; + + if (err == STATUS_PENDING) + NtCurrentTeb()->num_async_io++; + else + ws2_async_terminate(wsa, iosb, err, 0); + + WSASetLastError( NtStatusToWSAError( err )); + return SOCKET_ERROR; } - release_sock_fd( s, fd ); - /* Try immediate completion */ - if ( lpOverlapped ) + if ( _is_blocking(s) ) { - if ( WSAGetOverlappedResult( s, lpOverlapped, - lpNumberOfBytesRecvd, FALSE, lpFlags) ) - return 0; + struct pollfd pfd; + int timeout = GET_RCVTIMEO(fd); + if (timeout != -1) + { + timeout -= GetTickCount() - timeout_start; + if (timeout < 0) timeout = 0; + } - if ( (err = WSAGetLastError()) != WSA_IO_INCOMPLETE ) + pfd.fd = fd; + pfd.events = POLLIN; + if (*lpFlags & WS_MSG_OOB) pfd.events |= POLLPRI; + + if (!timeout || !poll( &pfd, 1, timeout )) + { + err = WSAETIMEDOUT; + /* a timeout is not fatal */ + _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); goto error; + } } - - WSASetLastError( WSA_IO_PENDING ); - return SOCKET_ERROR; - } - - if ( _is_blocking(s) ) - { - /* block here */ - /* FIXME: OOB and exceptfds? */ - int timeout = GET_RCVTIMEO(fd); - if( !do_block(fd, POLLIN, timeout)) { - err = WSAETIMEDOUT; - /* a timeout is not fatal */ - _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); - goto err_free; + else + { + err = WSAEWOULDBLOCK; + goto error; } } - n = WS2_recv( fd, iovec, dwBufferCount, lpFrom, lpFromlen, lpFlags ); - if ( n == -1 ) - { - err = wsaErrno(); - goto err_free; - } - TRACE(" -> %i bytes\n", n); *lpNumberOfBytesRecvd = n; @@ -4309,13 +4329,9 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, return 0; -err_free: +error: HeapFree(GetProcessHeap(), 0, iovec); - -err_close: release_sock_fd( s, fd ); - -error: WARN(" -> ERROR %d\n", err); WSASetLastError( err ); return SOCKET_ERROR;

1 0

Alexandre Julliard : include: Fix the definition of MSG_MAXIOVLEN.
by Alexandre Julliard May 31, 2007

May 31, 2007

Module: wine Branch: master Commit: 14fceb2cb654f48d1ef6e3ec9fb51383fa7c83c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14fceb2cb654f48d1ef6e3ec9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 31 12:08:19 2007 +0200 include: Fix the definition of MSG_MAXIOVLEN. --- include/winsock.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index 80266f2..c096d13 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -791,16 +791,16 @@ typedef struct WS(WSAData) #define MSG_OOB 0x0001 #define MSG_PEEK 0x0002 #define MSG_DONTROUTE 0x0004 -#define MSG_MAXIOVLEN 0x000a #define MSG_PARTIAL 0x8000 +#define MSG_MAXIOVLEN 16 #else /* USE_WS_PREFIX */ #define WS_SOMAXCONN 5 #define WS_MSG_OOB 0x0001 #define WS_MSG_PEEK 0x0002 #define WS_MSG_DONTROUTE 0x0004 -#define WS_MSG_MAXIOVLEN 0x000a #define WS_MSG_PARTIAL 0x8000 +#define WS_MSG_MAXIOVLEN 16 #endif /* USE_WS_PREFIX */ /*

1 0

appdb/include appData.php
by WineHQ May 30, 2007

May 30, 2007

ChangeSet ID: 31151 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/05/30 21:44:51 Modified files: include : appData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Avoid some warnings in the appData class Patch: http://cvs.winehq.org/patch.py?id=31151 Old revision New revision Changes Path 1.20 1.21 +6 -0 appdb/include/appData.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.20 appdb/include/appData.php:1.21 --- appdb/include/appData.php:1.20 31 May 2007 2:44:51 -0000 +++ appdb/include/appData.php 31 May 2007 2:44:51 -0000 @@ -154,6 +154,9 @@ class appData if($sQueued === false) $sQueued = "false"; + $sSelectType = ""; + $sLimit = ""; + if(($sQueued == "true" || $sQueued == "all") && !$_SESSION['current']->hasPriv("admin")) { @@ -271,6 +274,9 @@ class appData if($bRejected) return FALSE; + $sSelectType = ""; + $sLimit = ""; + if($bQueued && !$_SESSION['current']->hasPriv("admin")) { $sQuery = "SELECT DISTINCT appData.* FROM appData, appMaintainers,

1 0