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

Alexandre Julliard : ws2_32: Rewrite WSAGetOverlappedResult for the new async I/O behavior.
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: 597dac789003833097a8dc0f5d0435e4bd060b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=597dac789003833097a8dc0f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 4 23:03:20 2007 +0200 ws2_32: Rewrite WSAGetOverlappedResult for the new async I/O behavior. --- dlls/ws2_32/socket.c | 43 ++++++++++++++----------------------------- 1 files changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 542b7ae..f13ad2a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3566,7 +3566,7 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, LPDWORD lpcbTransfer, BOOL fWait, LPDWORD lpdwFlags ) { - DWORD r; + NTSTATUS status; TRACE( "socket %04lx ovl %p trans %p, wait %d flags %p\n", s, lpOverlapped, lpcbTransfer, fWait, lpdwFlags ); @@ -3578,24 +3578,19 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, return FALSE; } - if ( fWait ) + status = lpOverlapped->Internal; + if (status == STATUS_PENDING) { - if (lpOverlapped->hEvent) - while ( WaitForSingleObjectEx(lpOverlapped->hEvent, - INFINITE, TRUE) == STATUS_USER_APC ); - else /* busy loop */ - while ( ((volatile OVERLAPPED*)lpOverlapped)->Internal == STATUS_PENDING ) - Sleep( 10 ); + if (!fWait) + { + SetLastError( WSA_IO_INCOMPLETE ); + return FALSE; + } - } - else if ( lpOverlapped->Internal == STATUS_PENDING ) - { - /* Wait in order to give APCs a chance to run. */ - /* This is cheating, so we must set the event again in case of success - - it may be a non-manual reset event. */ - while ( (r = WaitForSingleObjectEx(lpOverlapped->hEvent, 0, TRUE)) == STATUS_USER_APC ); - if ( r == WAIT_OBJECT_0 && lpOverlapped->hEvent ) - NtSetEvent( lpOverlapped->hEvent, NULL ); + if (WaitForSingleObject( lpOverlapped->hEvent ? lpOverlapped->hEvent : SOCKET2HANDLE(s), + INFINITE ) == WAIT_FAILED) + return FALSE; + status = lpOverlapped->Internal; } if ( lpcbTransfer ) @@ -3604,18 +3599,8 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, if ( lpdwFlags ) *lpdwFlags = lpOverlapped->u.s.Offset; - switch ( lpOverlapped->Internal ) - { - case STATUS_SUCCESS: - return TRUE; - case STATUS_PENDING: - WSASetLastError( WSA_IO_INCOMPLETE ); - if (fWait) ERR("PENDING status after waiting!\n"); - return FALSE; - default: - WSASetLastError( NtStatusToWSAError( lpOverlapped->Internal )); - return FALSE; - } + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; }

1 0

Alexandre Julliard : server: Run async I/O APCs from the SIGUSR1 handler.
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: 4c5b55a0f82e83793814a21eadec8b50d48751f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c5b55a0f82e83793814a21ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 4 18:16:48 2007 +0200 server: Run async I/O APCs from the SIGUSR1 handler. --- server/thread.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/server/thread.c b/server/thread.c index c3a2535..c11175b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -704,6 +704,13 @@ static inline struct list *get_apc_queue( struct thread *thread, enum apc_type t } } +/* check if thread is currently waiting for a (system) apc */ +static inline int is_in_apc_wait( struct thread *thread ) +{ + return (thread->process->suspend || thread->suspend || + (thread->wait && (thread->wait->flags & SELECT_INTERRUPTIBLE))); +} + /* queue an existing APC to a given thread */ static int queue_apc( struct process *process, struct thread *thread, struct thread_apc *apc ) { @@ -717,8 +724,7 @@ static int queue_apc( struct process *process, struct thread *thread, struct thr LIST_FOR_EACH_ENTRY( candidate, &process->thread_list, struct thread, proc_entry ) { if (candidate->state == TERMINATED) continue; - if (process->suspend || candidate->suspend || - (candidate->wait && (candidate->wait->flags & SELECT_INTERRUPTIBLE))) + if (is_in_apc_wait( candidate )) { thread = candidate; break; @@ -737,15 +743,21 @@ static int queue_apc( struct process *process, struct thread *thread, struct thr } } if (!thread) return 0; /* nothing found */ + queue = get_apc_queue( thread, apc->call.type ); } else { if (thread->state == TERMINATED) return 0; + queue = get_apc_queue( thread, apc->call.type ); + /* send signal for system APCs if needed */ + if (queue == &thread->system_apc && list_empty( queue ) && !is_in_apc_wait( thread )) + { + if (!send_thread_signal( thread, SIGUSR1 )) return 0; + } /* cancel a possible previous APC with the same owner */ if (apc->owner) thread_cancel_apc( thread, apc->owner, apc->call.type ); } - queue = get_apc_queue( thread, apc->call.type ); grab_object( apc ); list_add_tail( queue, &apc->entry ); if (!list_prev( queue, &apc->entry )) /* first one */

1 0

Alexandre Julliard : ntdll: Queue an intermediate user APC routine to free the async info.
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: f6a3a4689f2483bc383b881eab11a0a9e551adb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a3a4689f2483bc383b881ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 3 12:05:02 2007 +0200 ntdll: Queue an intermediate user APC routine to free the async info. --- dlls/ntdll/directory.c | 18 +++++++++-- dlls/ntdll/file.c | 76 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 65 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 64d5ba9..3256c59 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2168,8 +2168,18 @@ struct read_changes_info HANDLE FileHandle; PVOID Buffer; ULONG BufferSize; + PIO_APC_ROUTINE apc; + void *apc_arg; }; +/* callback for ioctl user APC */ +static void WINAPI read_changes_user_apc( void *arg, IO_STATUS_BLOCK *io, ULONG reserved ) +{ + struct read_changes_info *info = arg; + if (info->apc) info->apc( info->apc_arg, io, reserved ); + RtlFreeHeap( GetProcessHeap(), 0, info ); +} + static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS status ) { struct read_changes_info *info = user; @@ -2221,8 +2231,6 @@ static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS st iosb->u.Status = ret; iosb->Information = len; - - RtlFreeHeap( GetProcessHeap(), 0, info ); return ret; } @@ -2265,6 +2273,8 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, info->FileHandle = FileHandle; info->Buffer = Buffer; info->BufferSize = BufferSize; + info->apc = ApcRoutine; + info->apc_arg = ApcContext; SERVER_START_REQ( read_directory_changes ) { @@ -2275,8 +2285,8 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, req->async.callback = read_changes_apc; req->async.iosb = IoStatusBlock; req->async.arg = info; - req->async.apc = ApcRoutine; - req->async.apc_arg = ApcContext; + req->async.apc = read_changes_user_apc; + req->async.apc_arg = info; req->async.event = Event; status = wine_server_call( req ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index dc39735..7c166a9 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -237,9 +237,16 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIB * Asynchronous file I/O * */ -typedef struct +struct async_fileio { HANDLE handle; + PIO_APC_ROUTINE apc; + void *apc_arg; +}; + +typedef struct +{ + struct async_fileio io; char* buffer; unsigned int already; unsigned int count; @@ -248,13 +255,21 @@ typedef struct typedef struct { - HANDLE handle; + struct async_fileio io; const char *buffer; unsigned int already; unsigned int count; } async_fileio_write; +/* callback for file I/O user APC */ +static void WINAPI fileio_apc( void *arg, IO_STATUS_BLOCK *io, ULONG reserved ) +{ + struct async_fileio *async = arg; + if (async->apc) async->apc( async->apc_arg, io, reserved ); + RtlFreeHeap( GetProcessHeap(), 0, async ); +} + /*********************************************************************** * FILE_GetNtStatus(void) * @@ -315,7 +330,7 @@ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATU { case STATUS_ALERTED: /* got some new data */ /* check to see if the data is ready (non-blocking) */ - if ((status = server_get_unix_fd( fileio->handle, FILE_READ_DATA, &fd, + if ((status = server_get_unix_fd( fileio->io.handle, FILE_READ_DATA, &fd, &needs_close, NULL, NULL ))) break; @@ -365,7 +380,6 @@ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATU { iosb->u.Status = status; iosb->Information = fileio->already; - RtlFreeHeap( GetProcessHeap(), 0, fileio ); } return status; } @@ -608,7 +622,9 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, status = STATUS_NO_MEMORY; goto done; } - fileio->handle = hFile; + fileio->io.handle = hFile; + fileio->io.apc = apc; + fileio->io.apc_arg = apc_user; fileio->already = total; fileio->count = length; fileio->buffer = buffer; @@ -622,8 +638,8 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, req->async.callback = FILE_AsyncReadService; req->async.iosb = io_status; req->async.arg = fileio; - req->async.apc = apc; - req->async.apc_arg = apc_user; + req->async.apc = fileio_apc; + req->async.apc_arg = fileio; req->async.event = hEvent; status = wine_server_call( req ); } @@ -701,7 +717,7 @@ static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTAT { case STATUS_ALERTED: /* write some data (non-blocking) */ - if ((status = server_get_unix_fd( fileio->handle, FILE_WRITE_DATA, &fd, + if ((status = server_get_unix_fd( fileio->io.handle, FILE_WRITE_DATA, &fd, &needs_close, &type, NULL ))) break; @@ -734,7 +750,6 @@ static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTAT { iosb->u.Status = status; iosb->Information = fileio->already; - RtlFreeHeap( GetProcessHeap(), 0, fileio ); } return status; } @@ -842,7 +857,9 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, status = STATUS_NO_MEMORY; goto done; } - fileio->handle = hFile; + fileio->io.handle = hFile; + fileio->io.apc = apc; + fileio->io.apc_arg = apc_user; fileio->already = total; fileio->count = length; fileio->buffer = buffer; @@ -855,8 +872,8 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, req->async.callback = FILE_AsyncWriteService; req->async.iosb = io_status; req->async.arg = fileio; - req->async.apc = apc; - req->async.apc_arg = apc_user; + req->async.apc = fileio_apc; + req->async.apc_arg = fileio; req->async.event = hEvent; status = wine_server_call( req ); } @@ -920,9 +937,11 @@ done: struct async_ioctl { - HANDLE handle; /* handle to the device */ - void *buffer; /* buffer for output */ - ULONG size; /* size of buffer */ + HANDLE handle; /* handle to the device */ + void *buffer; /* buffer for output */ + ULONG size; /* size of buffer */ + PIO_APC_ROUTINE apc; /* user apc params */ + void *apc_arg; }; /* callback for ioctl async I/O completion */ @@ -942,14 +961,18 @@ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS statu } SERVER_END_REQ; } - if (status != STATUS_PENDING) - { - RtlFreeHeap( GetProcessHeap(), 0, async ); - io->u.Status = status; - } + if (status != STATUS_PENDING) io->u.Status = status; return status; } +/* callback for ioctl user APC */ +static void WINAPI ioctl_apc( void *arg, IO_STATUS_BLOCK *io, ULONG reserved ) +{ + struct async_ioctl *async = arg; + if (async->apc) async->apc( async->apc_arg, io, reserved ); + RtlFreeHeap( GetProcessHeap(), 0, async ); +} + /* do a ioctl call through the server */ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, @@ -964,9 +987,11 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, if (!(async = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*async) ))) return STATUS_NO_MEMORY; - async->handle = handle; - async->buffer = out_buffer; - async->size = out_size; + async->handle = handle; + async->buffer = out_buffer; + async->size = out_size; + async->apc = apc; + async->apc_arg = apc_context; SERVER_START_REQ( ioctl ) { @@ -975,8 +1000,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, req->async.callback = ioctl_completion; req->async.iosb = io; req->async.arg = async; - req->async.apc = apc; - req->async.apc_arg = apc_context; + req->async.apc = (apc || event) ? ioctl_apc : NULL; + req->async.apc_arg = async; req->async.event = event; wine_server_add_data( req, in_buffer, in_size ); wine_server_set_reply( req, out_buffer, out_size ); @@ -998,6 +1023,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, NtWaitForSingleObject( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), NULL ); status = io->u.Status; NtClose( wait_handle ); + RtlFreeHeap( GetProcessHeap(), 0, async ); } return status;

1 0

Alexandre Julliard : server: Remove the extra apc_arg parameter now that user APCs all require the same arg as the kernel APC .
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: 8992f89f27435b4de3c779c1704aecab80798a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8992f89f27435b4de3c779c17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 3 12:05:44 2007 +0200 server: Remove the extra apc_arg parameter now that user APCs all require the same arg as the kernel APC. --- dlls/ntdll/directory.c | 1 - dlls/ntdll/file.c | 3 --- dlls/ws2_32/socket.c | 3 --- include/wine/server_protocol.h | 3 +-- server/async.c | 2 +- server/protocol.def | 1 - server/trace.c | 4 ++-- 7 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 3256c59..5eac7f3 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2286,7 +2286,6 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, req->async.iosb = IoStatusBlock; req->async.arg = info; req->async.apc = read_changes_user_apc; - req->async.apc_arg = info; req->async.event = Event; status = wine_server_call( req ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 7c166a9..b48cc9d 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -639,7 +639,6 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, req->async.iosb = io_status; req->async.arg = fileio; req->async.apc = fileio_apc; - req->async.apc_arg = fileio; req->async.event = hEvent; status = wine_server_call( req ); } @@ -873,7 +872,6 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, req->async.iosb = io_status; req->async.arg = fileio; req->async.apc = fileio_apc; - req->async.apc_arg = fileio; req->async.event = hEvent; status = wine_server_call( req ); } @@ -1001,7 +999,6 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, req->async.iosb = io; req->async.arg = async; req->async.apc = (apc || event) ? ioctl_apc : NULL; - req->async.apc_arg = async; req->async.event = event; wine_server_add_data( req, in_buffer, in_size ); wine_server_set_reply( req, out_buffer, out_size ); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c0a387d..4c87d23 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1319,7 +1319,6 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) req->async.iosb = &wsa->local_iosb; req->async.arg = wsa; req->async.apc = ws2_async_apc; - req->async.apc_arg = wsa; status = wine_server_call( req ); } SERVER_END_REQ; @@ -2677,7 +2676,6 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, req->async.iosb = iosb; req->async.arg = wsa; req->async.apc = ws2_async_apc; - req->async.apc_arg = wsa; req->async.event = lpCompletionRoutine ? 0 : lpOverlapped->hEvent; err = wine_server_call( req ); } @@ -4185,7 +4183,6 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, req->async.iosb = iosb; req->async.arg = wsa; req->async.apc = ws2_async_apc; - req->async.apc_arg = wsa; req->async.event = lpCompletionRoutine ? 0 : lpOverlapped->hEvent; err = wine_server_call( req ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a5c5b03..6b703a1 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -161,7 +161,6 @@ typedef struct void *iosb; void *arg; void *apc; - void *apc_arg; obj_handle_t event; } async_data_t; @@ -4728,6 +4727,6 @@ union generic_reply struct get_next_device_request_reply get_next_device_request_reply; }; -#define SERVER_PROTOCOL_VERSION 304 +#define SERVER_PROTOCOL_VERSION 305 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/async.c b/server/async.c index 58b7720..24cbd2a 100644 --- a/server/async.c +++ b/server/async.c @@ -252,7 +252,7 @@ void async_set_result( struct object *obj, unsigned int status ) apc_call_t data; data.type = APC_USER; data.user.func = async->data.apc; - data.user.args[0] = (unsigned long)async->data.apc_arg; + data.user.args[0] = (unsigned long)async->data.arg; data.user.args[1] = (unsigned long)async->data.iosb; data.user.args[2] = 0; thread_queue_apc( async->thread, NULL, &data ); diff --git a/server/protocol.def b/server/protocol.def index 6d88a13..8a7e5a8 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -177,7 +177,6 @@ typedef struct void *iosb; /* I/O status block in client addr space */ void *arg; /* opaque user data to pass to callback */ void *apc; /* user apc to call */ - void *apc_arg; /* argument for user apc */ obj_handle_t event; /* event to signal when done */ } async_data_t; diff --git a/server/trace.c b/server/trace.c index 1dc83cf..a340bad 100644 --- a/server/trace.c +++ b/server/trace.c @@ -245,8 +245,8 @@ static void dump_apc_result( const apc_result_t *result ) static void dump_async_data( const async_data_t *data ) { - fprintf( stderr, "{callback=%p,iosb=%p,arg=%p,apc=%p,apc_arg=%p,event=%p}", - data->callback, data->iosb, data->arg, data->apc, data->apc_arg, data->event ); + fprintf( stderr, "{callback=%p,iosb=%p,arg=%p,apc=%p,event=%p}", + data->callback, data->iosb, data->arg, data->apc, data->event ); } static void dump_luid( const luid_t *luid )

1 0

Alexandre Julliard : ws2_32: Queue a proper user APC also on immediate success in WSARecvFrom/WSASendTo .
by Alexandre Julliard June 5, 2007

June 5, 2007

Module: wine Branch: master Commit: e32252efae7f249b611015d32199057c0914e02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32252efae7f249b611015d32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 4 17:44:24 2007 +0200 ws2_32: Queue a proper user APC also on immediate success in WSARecvFrom/WSASendTo. --- dlls/ws2_32/socket.c | 133 +++++++++++++++++++++++++++++++------------------- 1 files changed, 82 insertions(+), 51 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4c87d23..2b7efdc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2634,37 +2634,37 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, n = WS2_send( fd, iovec, dwBufferCount, to, tolen, dwFlags ); if (n != -1 || errno != EINTR) break; } - if (n == -1) + if (n == -1 && errno != EAGAIN) { - if (errno != EAGAIN) + err = wsaErrno(); + goto error; + } + + if ((lpOverlapped || lpCompletionRoutine) && + !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) + { + IO_STATUS_BLOCK *iosb; + struct ws2_async *wsa = HeapAlloc( GetProcessHeap(), 0, sizeof(*wsa) ); + + if ( !wsa ) { - err = wsaErrno(); + err = WSAEFAULT; goto error; } + release_sock_fd( s, fd ); - if ((lpOverlapped || lpCompletionRoutine) && - !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) - { - IO_STATUS_BLOCK *iosb; - struct ws2_async *wsa = HeapAlloc( GetProcessHeap(), 0, sizeof(*wsa) ); - - if ( !wsa ) - { - err = WSAEFAULT; - goto error; - } - release_sock_fd( s, fd ); - - wsa->hSocket = SOCKET2HANDLE(s); - wsa->addr = (struct WS_sockaddr *)to; - wsa->addrlen.val = tolen; - wsa->flags = 0; - wsa->user_overlapped = lpOverlapped; - wsa->completion_func = lpCompletionRoutine; - wsa->n_iovecs = dwBufferCount; - memcpy( wsa->iovec, iovec, dwBufferCount * sizeof(*iovec) ); + wsa->hSocket = SOCKET2HANDLE(s); + wsa->addr = (struct WS_sockaddr *)to; + wsa->addrlen.val = tolen; + wsa->flags = 0; + wsa->user_overlapped = lpOverlapped; + wsa->completion_func = lpCompletionRoutine; + wsa->n_iovecs = dwBufferCount; + memcpy( wsa->iovec, iovec, dwBufferCount * sizeof(*iovec) ); - iosb = lpOverlapped ? (IO_STATUS_BLOCK *)lpOverlapped : &wsa->local_iosb; + iosb = lpOverlapped ? (IO_STATUS_BLOCK *)lpOverlapped : &wsa->local_iosb; + if (n == -1) + { iosb->u.Status = STATUS_PENDING; iosb->Information = 0; @@ -2689,6 +2689,18 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, WSASetLastError( NtStatusToWSAError( err )); return SOCKET_ERROR; } + + iosb->u.Status = STATUS_SUCCESS; + iosb->Information = n; + *lpNumberOfBytesSent = n; + if (!wsa->completion_func) + { + SetEvent( lpOverlapped->hEvent ); + HeapFree( GetProcessHeap(), 0, wsa ); + } + else NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)ws2_async_apc, + (ULONG_PTR)wsa, (ULONG_PTR)iosb, 0 ); + return 0; } if ( _is_blocking(s) ) @@ -4140,14 +4152,17 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, for (;;) { n = WS2_recv( fd, iovec, dwBufferCount, lpFrom, lpFromlen, lpFlags ); - if (n != -1) break; - - if (errno == EINTR) continue; - if (errno != EAGAIN) + if (n == -1) { - err = wsaErrno(); - goto error; + if (errno == EINTR) continue; + if (errno != EAGAIN) + { + err = wsaErrno(); + goto error; + } } + else + *lpNumberOfBytesRecvd = n; if ((lpOverlapped || lpCompletionRoutine) && !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) @@ -4172,31 +4187,49 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, memcpy( wsa->iovec, iovec, dwBufferCount * sizeof(*iovec) ); iosb = lpOverlapped ? (IO_STATUS_BLOCK *)lpOverlapped : &wsa->local_iosb; - iosb->u.Status = STATUS_PENDING; - iosb->Information = 0; - SERVER_START_REQ( register_async ) + if (n == -1) { - 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.apc = ws2_async_apc; - req->async.event = lpCompletionRoutine ? 0 : lpOverlapped->hEvent; - err = wine_server_call( req ); + 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.apc = ws2_async_apc; + req->async.event = lpCompletionRoutine ? 0 : lpOverlapped->hEvent; + err = wine_server_call( req ); + } + SERVER_END_REQ; + + if (err == STATUS_PENDING) + NtCurrentTeb()->num_async_io++; + else + HeapFree( GetProcessHeap(), 0, wsa ); + + WSASetLastError( NtStatusToWSAError( err )); + return SOCKET_ERROR; } - SERVER_END_REQ; - if (err == STATUS_PENDING) - NtCurrentTeb()->num_async_io++; - else + iosb->u.Status = STATUS_SUCCESS; + iosb->Information = n; + if (!wsa->completion_func) + { + SetEvent( lpOverlapped->hEvent ); HeapFree( GetProcessHeap(), 0, wsa ); - - WSASetLastError( NtStatusToWSAError( err )); - return SOCKET_ERROR; + } + else NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)ws2_async_apc, + (ULONG_PTR)wsa, (ULONG_PTR)iosb, 0 ); + _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); + return 0; } + if (n != -1) break; + if ( _is_blocking(s) ) { struct pollfd pfd; @@ -4228,8 +4261,6 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } TRACE(" -> %i bytes\n", n); - *lpNumberOfBytesRecvd = n; - release_sock_fd( s, fd ); _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0);

1 0

appdb/include testData.php
by WineHQ June 5, 2007

June 5, 2007

ChangeSet ID: 31158 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/04 22:35:46 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add a comment to encourage test result submitters not to include crash data in their test submissions. Patch: http://cvs.winehq.org/patch.py?id=31158 Old revision New revision Changes Path 1.53 1.54 +6 -3 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.53 appdb/include/testData.php:1.54 --- appdb/include/testData.php:1.53 5 Jun 2007 3:35:46 -0000 +++ appdb/include/testData.php 5 Jun 2007 3:35:46 -0000 @@ -978,9 +978,12 @@ class testData{ { echo "This is the screen for inputing test information so that others "; echo "looking at the database will know \n"; - echo "what was working on a particular release of Wine. Although be \n"; - echo "aware that this is not the bug-tracker and that \n"; - echo "this is not where the developers check for bugs.\n"; + echo "what was working on a particular release of Wine.\n"; + echo "Please DO NOT include crash or Wine debug output.\n"; + echo " Instead report the crash as a bug in the Wine bugzilla at \n"; + echo "<a href=\"http://bugs.winehq.org\">http://bugs.winehq.org</a>.\n"; + echo "We ask that you use bugzilla because developers do not monitor the AppDB \n"; + echo "for bugs.\n"; echo "Please be as detailed as you can but do not paste large \n"; echo "chunks of output from the terminal. Type out your report \n"; echo "clearly and in proper English so that it is easily readable.\n";

1 0

lostwages/news 2007060401.xml
by WineHQ June 5, 2007

June 5, 2007

ChangeSet ID: 31157 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/06/04 19:41:49 Added files: news : 2007060401.xml Log message: news about CrossOver 6.1 release Patch: http://cvs.winehq.org/patch.py?id=31157 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2007060401.xml Index: lostwages/news/2007060401.xml diff -u -p /dev/null lostwages/news/2007060401.xml:1.1 --- /dev/null 5 Jun 2007 0:41:49 -0000 +++ lostwages/news/2007060401.xml 5 Jun 2007 0:41:49 -0000 @@ -0,0 +1,18 @@ +<news> + <date>June 4, 2007</date> + <title>CrossOver® 6.1</title> + <body> + We're a bit late in reporting this, but CodeWeavers released + version 6.1 of their CrossOver products on May 15th. You can + read the + <a href="http://www.codeweavers.com/about/general/press/?id=20070515">press + release</a> and + <a href="http://crossover.codeweavers.com/pipermail/announce/2007-May/000038.html">announcement</a> + on their website. Version 6.0 brought the addition of gaming support + this release continue that trend by including support for EVE Online + and more games playable through Steam, such as Call of Duty 2. + Outlook picked up some changes to enable better remote connectivity. + All in all, it sounds like there's a bunch of new functionality, so + it's probably worth checking out. + </body> +</news>

1 0

Andrey Turkin : pdh: Stub implementation of pdh.dll.
by Alexandre Julliard June 4, 2007

June 4, 2007

Module: wine Branch: master Commit: 41f15a769fe745515af166c7f0b9bd07b5252efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f15a769fe745515af166c7f… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Jun 2 02:28:45 2007 +0400 pdh: Stub implementation of pdh.dll. --- Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/pdh/Makefile.in | 13 ++++ dlls/pdh/pdh.spec | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/pdh/pdh_main.c | 41 +++++++++++++ 7 files changed, 219 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index afec44b..36d950d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -326,6 +326,7 @@ ALL_MAKEFILES = \ dlls/olepro32/Makefile \ dlls/olesvr32/Makefile \ dlls/opengl32/Makefile \ + dlls/pdh/Makefile \ dlls/powrprof/Makefile \ dlls/psapi/Makefile \ dlls/psapi/tests/Makefile \ @@ -677,6 +678,7 @@ dlls/oledlg/Makefile: dlls/oledlg/Makefile.in dlls/Makedll.rules dlls/olepro32/Makefile: dlls/olepro32/Makefile.in dlls/Makedll.rules dlls/olesvr32/Makefile: dlls/olesvr32/Makefile.in dlls/Makedll.rules dlls/opengl32/Makefile: dlls/opengl32/Makefile.in dlls/Makedll.rules +dlls/pdh/Makefile: dlls/pdh/Makefile.in dlls/Makedll.rules dlls/powrprof/Makefile: dlls/powrprof/Makefile.in dlls/Makedll.rules dlls/psapi/Makefile: dlls/psapi/Makefile.in dlls/Makedll.rules dlls/psapi/tests/Makefile: dlls/psapi/tests/Makefile.in dlls/Maketest.rules diff --git a/configure b/configure index 9c5f8f0..6e3da55 100755 --- a/configure +++ b/configure @@ -20721,6 +20721,8 @@ ac_config_files="$ac_config_files dlls/olesvr32/Makefile" ac_config_files="$ac_config_files dlls/opengl32/Makefile" +ac_config_files="$ac_config_files dlls/pdh/Makefile" + ac_config_files="$ac_config_files dlls/powrprof/Makefile" ac_config_files="$ac_config_files dlls/psapi/Makefile" @@ -21791,6 +21793,7 @@ do "dlls/olepro32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olepro32/Makefile" ;; "dlls/olesvr32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olesvr32/Makefile" ;; "dlls/opengl32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/opengl32/Makefile" ;; + "dlls/pdh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pdh/Makefile" ;; "dlls/powrprof/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/powrprof/Makefile" ;; "dlls/psapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/psapi/Makefile" ;; "dlls/psapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/psapi/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index e06b2bc..9cbbaf0 100644 --- a/configure.ac +++ b/configure.ac @@ -1656,6 +1656,7 @@ AC_CONFIG_FILES([dlls/oledlg/Makefile]) AC_CONFIG_FILES([dlls/olepro32/Makefile]) AC_CONFIG_FILES([dlls/olesvr32/Makefile]) AC_CONFIG_FILES([dlls/opengl32/Makefile]) +AC_CONFIG_FILES([dlls/pdh/Makefile]) AC_CONFIG_FILES([dlls/powrprof/Makefile]) AC_CONFIG_FILES([dlls/psapi/Makefile]) AC_CONFIG_FILES([dlls/psapi/tests/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 67a2976..c1b7058 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -141,6 +141,7 @@ BASEDIRS = \ oledlg \ olepro32 \ olesvr32 \ + pdh \ powrprof \ psapi \ pstorec \ diff --git a/dlls/pdh/Makefile.in b/dlls/pdh/Makefile.in new file mode 100644 index 0000000..38155aa --- /dev/null +++ b/dlls/pdh/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = pdh.dll +IMPORTS = kernel32 + +C_SRCS = \ + pdh_main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec new file mode 100644 index 0000000..3bea949 --- /dev/null +++ b/dlls/pdh/pdh.spec @@ -0,0 +1,158 @@ +1 stub PdhPlaGetLogFileNameA +@ stub PdhAdd009CounterA +@ stub PdhAdd009CounterW +@ stub PdhAddCounterA +@ stub PdhAddCounterW +@ stub PdhBindInputDataSourceA +@ stub PdhBindInputDataSourceW +@ stub PdhBrowseCountersA +@ stub PdhBrowseCountersHA +@ stub PdhBrowseCountersHW +@ stub PdhBrowseCountersW +@ stub PdhCalculateCounterFromRawValue +@ stub PdhCloseLog +@ stub PdhCloseQuery +@ stub PdhCollectQueryData +@ stub PdhCollectQueryDataEx +@ stub PdhComputeCounterStatistics +@ stub PdhConnectMachineA +@ stub PdhConnectMachineW +@ stub PdhCreateSQLTablesA +@ stub PdhCreateSQLTablesW +@ stub PdhEnumLogSetNamesA +@ stub PdhEnumLogSetNamesW +@ stub PdhEnumMachinesA +@ stub PdhEnumMachinesHA +@ stub PdhEnumMachinesHW +@ stub PdhEnumMachinesW +@ stub PdhEnumObjectItemsA +@ stub PdhEnumObjectItemsHA +@ stub PdhEnumObjectItemsHW +@ stub PdhEnumObjectItemsW +@ stub PdhEnumObjectsA +@ stub PdhEnumObjectsHA +@ stub PdhEnumObjectsHW +@ stub PdhEnumObjectsW +@ stub PdhExpandCounterPathA +@ stub PdhExpandCounterPathW +@ stub PdhExpandWildCardPathA +@ stub PdhExpandWildCardPathHA +@ stub PdhExpandWildCardPathHW +@ stub PdhExpandWildCardPathW +@ stub PdhFormatFromRawValue +@ stub PdhGetCounterInfoA +@ stub PdhGetCounterInfoW +@ stub PdhGetCounterTimeBase +@ stub PdhGetDataSourceTimeRangeA +@ stub PdhGetDataSourceTimeRangeH +@ stub PdhGetDataSourceTimeRangeW +@ stub PdhGetDefaultPerfCounterA +@ stub PdhGetDefaultPerfCounterHA +@ stub PdhGetDefaultPerfCounterHW +@ stub PdhGetDefaultPerfCounterW +@ stub PdhGetDefaultPerfObjectA +@ stub PdhGetDefaultPerfObjectHA +@ stub PdhGetDefaultPerfObjectHW +@ stub PdhGetDefaultPerfObjectW +@ stub PdhGetDllVersion +@ stub PdhGetFormattedCounterArrayA +@ stub PdhGetFormattedCounterArrayW +@ stub PdhGetFormattedCounterValue +@ stub PdhGetLogFileSize +@ stub PdhGetLogFileTypeA +@ stub PdhGetLogFileTypeW +@ stub PdhGetLogSetGUID +@ stub PdhGetRawCounterArrayA +@ stub PdhGetRawCounterArrayW +@ stub PdhGetRawCounterValue +@ stub PdhIsRealTimeQuery +@ stub PdhListLogFileHeaderA +@ stub PdhListLogFileHeaderW +@ stub PdhLogServiceCommandA +@ stub PdhLogServiceCommandW +@ stub PdhLogServiceControlA +@ stub PdhLogServiceControlW +@ stub PdhLookupPerfIndexByNameA +@ stub PdhLookupPerfIndexByNameW +@ stub PdhLookupPerfNameByIndexA +@ stub PdhLookupPerfNameByIndexW +@ stub PdhMakeCounterPathA +@ stub PdhMakeCounterPathW +@ stub PdhOpenLogA +@ stub PdhOpenLogW +@ stub PdhOpenQuery +@ stub PdhOpenQueryA +@ stub PdhOpenQueryH +@ stub PdhOpenQueryW +@ stub PdhParseCounterPathA +@ stub PdhParseCounterPathW +@ stub PdhParseInstanceNameA +@ stub PdhParseInstanceNameW +@ stub PdhPlaAddItemA +@ stub PdhPlaAddItemW +@ stub PdhPlaCreateA +@ stub PdhPlaCreateW +@ stub PdhPlaDeleteA +@ stub PdhPlaDeleteW +@ stub PdhPlaEnumCollectionsA +@ stub PdhPlaEnumCollectionsW +@ stub PdhPlaGetInfoA +@ stub PdhPlaGetInfoW +@ stub PdhPlaGetLogFileNameW +@ stub PdhPlaGetScheduleA +@ stub PdhPlaGetScheduleW +@ stub PdhPlaRemoveAllItemsA +@ stub PdhPlaRemoveAllItemsW +@ stub PdhPlaScheduleA +@ stub PdhPlaScheduleW +@ stub PdhPlaSetInfoA +@ stub PdhPlaSetInfoW +@ stub PdhPlaSetItemListA +@ stub PdhPlaSetItemListW +@ stub PdhPlaSetRunAsA +@ stub PdhPlaSetRunAsW +@ stub PdhPlaStartA +@ stub PdhPlaStartW +@ stub PdhPlaStopA +@ stub PdhPlaStopW +@ stub PdhPlaValidateInfoA +@ stub PdhPlaValidateInfoW +@ stub PdhReadRawLogRecord +@ stub PdhRelogA +@ stub PdhRelogW +@ stub PdhRemoveCounter +@ stub PdhSelectDataSourceA +@ stub PdhSelectDataSourceW +@ stub PdhSetCounterScaleFactor +@ stub PdhSetDefaultRealTimeDataSource +@ stub PdhSetLogSetRunID +@ stub PdhSetQueryTimeRange +@ stub PdhTranslate009CounterA +@ stub PdhTranslate009CounterW +@ stub PdhTranslateLocaleCounterA +@ stub PdhTranslateLocaleCounterW +@ stub PdhUpdateLogA +@ stub PdhUpdateLogFileCatalog +@ stub PdhUpdateLogW +@ stub PdhValidatePathA +@ stub PdhValidatePathW +@ stub PdhVbAddCounter +@ stub PdhVbCreateCounterPathList +@ stub PdhVbGetCounterPathElements +@ stub PdhVbGetCounterPathFromList +@ stub PdhVbGetDoubleCounterValue +@ stub PdhVbGetLogFileSize +@ stub PdhVbGetOneCounterPath +@ stub PdhVbIsGoodStatus +@ stub PdhVbOpenLog +@ stub PdhVbOpenQuery +@ stub PdhVbUpdateLog +@ stub PdhVerifySQLDBA +@ stub PdhVerifySQLDBW +@ stub PdhiPla2003SP1Installed +@ stub PdhiPlaFormatBlanksA +@ stub PdhiPlaFormatBlanksW +@ stub PdhiPlaGetVersion +@ stub PdhiPlaRunAs +@ stub PdhiPlaSetRunAs +@ stub PlaTimeInfoToMilliSeconds diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c new file mode 100644 index 0000000..cbc1991 --- /dev/null +++ b/dlls/pdh/pdh_main.c @@ -0,0 +1,41 @@ +/* + * Performance Data Helper (pdh.dll) + * + * Copyright 2007 Andrey Turkin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(pdh); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ + + if (fdwReason == DLL_PROCESS_ATTACH) + { + DisableThreadLibraryCalls( hinstDLL ); + } + + return TRUE; +}

1 0

Jason Edmeades : xcopy.exe: Convert from main to wmain.
by Alexandre Julliard June 4, 2007

June 4, 2007

Module: wine Branch: master Commit: ea34c87cc3f9002ad2d87a339ffddcc61cbdfe49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea34c87cc3f9002ad2d87a339… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Jun 3 22:07:46 2007 +0100 xcopy.exe: Convert from main to wmain. --- programs/xcopy/Makefile.in | 2 +- programs/xcopy/xcopy.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index 15079f0..f1fe31b 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = xcopy.exe -APPMODE = -mconsole +APPMODE = -mconsole -municode IMPORTS = shell32 user32 msvcrt kernel32 EXTRADEFS = -DUNICODE EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 8dd20d9..a88a0ad 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -93,7 +93,7 @@ static WCHAR copyTo[MAX_PATH]; Processes the args, and drives the actual copying ========================================================================= */ -int main (int argc, char *argv[]) +int wmain (int argc, WCHAR *argvW[]) { int rc = 0; WCHAR suppliedsource[MAX_PATH] = {0}; /* As supplied on the cmd line */ @@ -104,7 +104,6 @@ int main (int argc, char *argv[]) WCHAR destinationspec[MAX_PATH] = {0}; /* Filespec of destination */ WCHAR copyCmd[MAXSTRING]; /* COPYCMD env var */ DWORD flags = 0; /* Option flags */ - LPWSTR *argvW = NULL; const WCHAR PROMPTSTR1[] = {'/', 'Y', 0}; const WCHAR PROMPTSTR2[] = {'/', 'y', 0}; const WCHAR COPYCMD[] = {'C', 'O', 'P', 'Y', 'C', 'M', 'D', 0}; @@ -114,9 +113,6 @@ int main (int argc, char *argv[]) * Parse the command line */ - /* overwrite the command line */ - argvW = CommandLineToArgvW( GetCommandLineW(), &argc ); - /* Confirm at least one parameter */ if (argc < 2) { XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARMS));

1 0

Jason Edmeades : cmd.exe: Fix dir /w.
by Alexandre Julliard June 4, 2007

June 4, 2007

Module: wine Branch: master Commit: a1639ebfc6bee6b357104d9f46a96ef50dd303ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1639ebfc6bee6b357104d9f4… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Jun 3 22:07:47 2007 +0100 cmd.exe: Fix dir /w. Use of %* fails when using wvsprintf, so just pad manually, but maintain only a single output call. --- programs/cmd/directory.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index e9c413a..4940140 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -72,6 +72,7 @@ static const WCHAR dotdotW[] = {'.','.','\0'}; static const WCHAR starW[] = {'*','\0'}; static const WCHAR slashW[] = {'\\','\0'}; static const WCHAR emptyW[] = {'\0'}; +static const WCHAR spaceW[] = {' ','\0'}; /***************************************************************************** * WCMD_directory @@ -618,8 +619,24 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if ((cur_width + widest) > max_width) { cur_width = 0; } else { - static const WCHAR fmt[] = {'%','*','.','s','\0'}; - WCMD_output (fmt, (tmp_width - cur_width), emptyW); + int padding = cur_width - tmp_width; + int toWrite = 0; + WCHAR temp[101]; + + /* Note: WCMD_output uses wvsprintf which does not allow %* + so manually pad with spaces to appropriate width */ + strcpyW(temp, emptyW); + while (padding > 0) { + strcatW(&temp[toWrite], spaceW); + toWrite++; + if (toWrite > 99) { + WCMD_output(temp); + toWrite = 0; + strcpyW(temp, emptyW); + } + padding--; + } + WCMD_output(temp); } } else if ((fd+i)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {

1 0