March 2007 - Wine-commits - list.winehq.org

Chris Robinson : quartz: Don' t redundantly set waveparser output pin data before it's created.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: ef5de5c120d0b9d3deb20324b9e9234c690fa5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5de5c120d0b9d3deb20324b… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Mar 20 10:31:14 2007 -0700 quartz: Don't redundantly set waveparser output pin data before it's created. --- dlls/quartz/waveparser.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 54ea9ad..5cd979f 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -265,13 +265,6 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) hr = IAsyncReader_SyncRead(This->pReader, pos, amt.cbFormat, amt.pbFormat); memcpy(&amt.subtype, &MEDIATYPE_Audio, sizeof(GUID)); amt.subtype.Data1 = ((WAVEFORMATEX*)amt.pbFormat)->wFormatTag; - /* CopyMediaType(&((OutputPin*)pWAVEParser->ppPins[1])->pin.mtCurrent, &amt); */ - ((Parser_OutputPin*)pWAVEParser->Parser.ppPins[1])->pmt = (AM_MEDIA_TYPE*) CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); - - CopyMediaType(((Parser_OutputPin*)pWAVEParser->Parser.ppPins[1])->pmt, &amt); - - /* Update buffer alignment of media samples in output */ - ((Parser_OutputPin*)pWAVEParser->Parser.ppPins[1])->pin.allocProps.cbAlign = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; pos += chunk.cb; hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(chunk), (BYTE *)&chunk); @@ -296,7 +289,7 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) if (hr != S_OK) return E_FAIL; - props.cbAlign = 1; + props.cbAlign = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; props.cbPrefix = 0; props.cbBuffer = 4096; props.cBuffers = 2;

1 0

Andrew Talbot : dinput: Replace inline static with static inline.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 08e1481d8ecc25062719d78567149304ba0fca94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e1481d8ecc25062719d7856… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Mar 20 17:42:27 2007 +0000 dinput: Replace inline static with static inline. --- dlls/dinput/joystick_linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 2ed761c..bc4ef5b 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -281,7 +281,7 @@ static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN * Get a config key from either the app-specific or the default config */ -inline static DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, +static inline DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, char *buffer, DWORD size ) { if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE)buffer, &size ))

1 0

Andrew Talbot : setupapi: Replace inline static with static inline.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: a89d5de5dfc885a5b875866a4f6058cf9547ce9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a89d5de5dfc885a5b875866a4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Mar 19 19:48:48 2007 +0000 setupapi: Replace inline static with static inline. --- dlls/setupapi/parser.c | 12 ++++++------ dlls/setupapi/queue.c | 6 +++--- dlls/setupapi/setupapi_private.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 3c2c7ad..3ebb86a 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -256,7 +256,7 @@ static struct line *add_line( struct inf_file *file, int section_index ) /* retrieve a given line from section/line index */ -inline static struct line *get_line( struct inf_file *file, unsigned int section_index, +static inline struct line *get_line( struct inf_file *file, unsigned int section_index, unsigned int line_index ) { struct section *section; @@ -444,7 +444,7 @@ static WCHAR *push_string( struct inf_file *file, const WCHAR *string ) /* push the current state on the parser stack */ -inline static void push_state( struct parser *parser, enum parser_state state ) +static inline void push_state( struct parser *parser, enum parser_state state ) { assert( parser->stack_pos < sizeof(parser->stack)/sizeof(parser->stack[0]) ); parser->stack[parser->stack_pos++] = state; @@ -452,7 +452,7 @@ inline static void push_state( struct parser *parser, enum parser_state state ) /* pop the current state */ -inline static void pop_state( struct parser *parser ) +static inline void pop_state( struct parser *parser ) { assert( parser->stack_pos ); parser->state = parser->stack[--parser->stack_pos]; @@ -460,7 +460,7 @@ inline static void pop_state( struct parser *parser ) /* set the parser state and return the previous one */ -inline static enum parser_state set_state( struct parser *parser, enum parser_state state ) +static inline enum parser_state set_state( struct parser *parser, enum parser_state state ) { enum parser_state ret = parser->state; parser->state = state; @@ -469,14 +469,14 @@ inline static enum parser_state set_state( struct parser *parser, enum parser_st /* check if the pointer points to an end of file */ -inline static int is_eof( struct parser *parser, const WCHAR *ptr ) +static inline int is_eof( struct parser *parser, const WCHAR *ptr ) { return (ptr >= parser->end || *ptr == CONTROL_Z); } /* check if the pointer points to an end of line */ -inline static int is_eol( struct parser *parser, const WCHAR *ptr ) +static inline int is_eol( struct parser *parser, const WCHAR *ptr ) { return (ptr >= parser->end || *ptr == CONTROL_Z || *ptr == '\n'); } diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 26522e6..063e8c0 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -73,7 +73,7 @@ struct file_queue }; -inline static WCHAR *strdupW( const WCHAR *str ) +static inline WCHAR *strdupW( const WCHAR *str ) { WCHAR *ret = NULL; if (str) @@ -84,7 +84,7 @@ inline static WCHAR *strdupW( const WCHAR *str ) return ret; } -inline static char *strdupWtoA( const WCHAR *str ) +static inline char *strdupWtoA( const WCHAR *str ) { char *ret = NULL; if (str) @@ -97,7 +97,7 @@ inline static char *strdupWtoA( const WCHAR *str ) } /* append a file operation to a queue */ -inline static void queue_file_op( struct file_op_queue *queue, struct file_op *op ) +static inline void queue_file_op( struct file_op_queue *queue, struct file_op *op ) { op->next = NULL; if (queue->tail) queue->tail->next = op; diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index ed9a7bf..32f1661 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -29,7 +29,7 @@ #define REGPART_RENAME "\\Rename" #define REG_VERSIONCONFLICT "Software\\Microsoft\\VersionConflictManager" -inline static WCHAR *strdupAtoW( const char *str ) +static inline WCHAR *strdupAtoW( const char *str ) { WCHAR *ret = NULL; if (str)

1 0

Alexandre Julliard : server: Add an async_data_t structure to store parameters for async I/O requests.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 111610c45e9d99dfbf7ec59e7fcbdc1b2dfc2cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=111610c45e9d99dfbf7ec59e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 20 20:21:12 2007 +0100 server: Add an async_data_t structure to store parameters for async I/O requests. --- dlls/ntdll/directory.c | 6 +++--- dlls/ntdll/file.c | 18 +++++++++--------- dlls/ws2_32/socket.c | 6 +++--- include/wine/server_protocol.h | 26 +++++++++++++------------- server/async.c | 16 ++++++---------- server/change.c | 4 +--- server/fd.c | 15 ++++++--------- server/file.h | 10 +++++----- server/mailslot.c | 9 ++++----- server/named_pipe.c | 13 ++++++------- server/protocol.def | 24 ++++++++++++------------ server/serial.c | 7 +++---- server/sock.c | 8 +++----- server/trace.c | 28 +++++++++++++++------------- tools/make_requests | 1 + 15 files changed, 90 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=111610c45e9d99dfbf7ec…

1 0

Paul Vriens : kernel32/tests: Use skip.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 5b5d737111c11c103f7c8577b1edb8dd4d3590b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5d737111c11c103f7c8577b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 20 17:11:54 2007 +0100 kernel32/tests: Use skip. --- dlls/kernel32/tests/environ.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index ec686ab..dab57f7 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -130,6 +130,7 @@ static void test_GetSetEnvironmentVariableW(void) if (ret == FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { /* Must be Win9x which doesn't support the Unicode functions */ + skip("SetEnvironmentVariableW is not implemented\n"); return; } ok(ret == TRUE,

1 0

Paul Vriens : wininet/ftp: Simplify FTP_FtpGetFileW a bit.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 9a7fb5f1e7822a9e3a010c3a962dbc44102d7b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7fb5f1e7822a9e3a010c3a9… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 20 18:30:35 2007 +0100 wininet/ftp: Simplify FTP_FtpGetFileW a bit. --- dlls/wininet/ftp.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 7cb49e1..05f6b36 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1317,7 +1317,7 @@ BOOL WINAPI FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, hFile = CreateFileW(lpszNewFile, GENERIC_WRITE, 0, 0, fFailIfExists ? CREATE_NEW : CREATE_ALWAYS, dwLocalFlagsAttribute, 0); if (INVALID_HANDLE_VALUE == hFile) - goto lend; + return FALSE; /* Set up socket to retrieve data */ nBytes = FTP_SendRetrieve(lpwfs, lpszRemoteFile, dwInternetFlags); @@ -1345,12 +1345,10 @@ BOOL WINAPI FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, } } -lend: if (lpwfs->lstnSocket != -1) closesocket(lpwfs->lstnSocket); - if (INVALID_HANDLE_VALUE != hFile) - CloseHandle(hFile); + CloseHandle(hFile); hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC)

1 0

Paul Vriens : wininet/ftp: Move a definition in FTP_FtpFindFirstFileW ( Coverity).
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: b6f92f10c6942d51bc149e6603dc8e75bc1c2d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f92f10c6942d51bc149e660… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 20 18:40:25 2007 +0100 wininet/ftp: Move a definition in FTP_FtpFindFirstFileW (Coverity). --- dlls/wininet/ftp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 05f6b36..526c65e 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -737,7 +737,6 @@ HINTERNET WINAPI FTP_FtpFindFirstFileW(LPWININETFTPSESSIONW lpwfs, if (!FTP_SendPortOrPasv(lpwfs)) goto lend; - hIC = lpwfs->lpAppInfo; if (!FTP_SendCommand(lpwfs->sndSocket, FTP_CMD_LIST, NULL, lpwfs->hdr.lpfnStatusCB, &lpwfs->hdr, lpwfs->hdr.dwContext)) goto lend; @@ -767,6 +766,7 @@ lend: if (lpwfs->lstnSocket != -1) closesocket(lpwfs->lstnSocket); + hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { INTERNET_ASYNC_RESULT iar;

1 0

Alexandre Julliard : server: Use the common pattern for async I/ O parameters in named pipe requests.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: eb3728d34e87730db10bb4043e7e3b9f8b0fdfdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3728d34e87730db10bb4043… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 20 19:21:15 2007 +0100 server: Use the common pattern for async I/O parameters in named pipe requests. --- dlls/ntdll/file.c | 12 +++++++----- include/wine/server_protocol.h | 12 +++++++----- server/named_pipe.c | 13 ++++++------- server/protocol.def | 10 ++++++---- server/trace.c | 10 ++++++---- 5 files changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3d7c3eb..65b4783 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -982,9 +982,10 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc } SERVER_START_REQ(connect_named_pipe) { - req->handle = handle; - req->event = event ? event : internal_event; - req->func = pipe_completion_wait; + req->handle = handle; + req->io_apc = pipe_completion_wait; + req->io_sb = io; + req->io_user = event ? event : internal_event; io->u.Status = wine_server_call(req); } SERVER_END_REQ; @@ -1018,8 +1019,9 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc req->handle = handle; req->timeout = buff->TimeoutSpecified ? buff->Timeout.QuadPart / -10000L : NMPWAIT_USE_DEFAULT_WAIT; - req->event = event ? event : internal_event; - req->func = pipe_completion_wait; + req->io_apc = pipe_completion_wait; + req->io_sb = io; + req->io_user = event ? event : internal_event; wine_server_add_data( req, buff->Name, buff->NameLength ); io->u.Status = wine_server_call( req ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index db9309a..93087cf 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2709,8 +2709,9 @@ struct connect_named_pipe_request { struct request_header __header; obj_handle_t handle; - obj_handle_t event; - void* func; + void* io_apc; + void* io_sb; + void* io_user; }; struct connect_named_pipe_reply { @@ -2724,8 +2725,9 @@ struct wait_named_pipe_request struct request_header __header; obj_handle_t handle; unsigned int timeout; - obj_handle_t event; - void* func; + void* io_apc; + void* io_sb; + void* io_user; /* VARARG(name,unicode_str); */ }; struct wait_named_pipe_reply @@ -4692,6 +4694,6 @@ union generic_reply struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; }; -#define SERVER_PROTOCOL_VERSION 280 +#define SERVER_PROTOCOL_VERSION 281 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/named_pipe.c b/server/named_pipe.c index 173290f..5eba500 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -824,8 +824,7 @@ DECL_HANDLER(connect_named_pipe) case ps_wait_connect: assert( !server->fd ); server->state = ps_wait_open; - create_async( current, NULL, &server->wait_q, - req->func, req->event, NULL ); + create_async( current, NULL, &server->wait_q, req->io_apc, req->io_user, req->io_sb ); async_terminate_queue( &server->pipe->waiters, STATUS_SUCCESS ); break; case ps_connected_server: @@ -873,9 +872,9 @@ DECL_HANDLER(wait_named_pipe) /* there's already a server waiting for a client to connect */ memset( &data, 0, sizeof(data) ); data.type = APC_ASYNC_IO; - data.async_io.func = req->func; - data.async_io.user = req->event; - data.async_io.sb = NULL; + data.async_io.func = req->io_apc; + data.async_io.user = req->io_user; + data.async_io.sb = req->io_sb; data.async_io.status = STATUS_SUCCESS; thread_queue_apc( current, NULL, &data ); release_object( server ); @@ -884,13 +883,13 @@ DECL_HANDLER(wait_named_pipe) { if (req->timeout == NMPWAIT_WAIT_FOREVER) create_async( current, NULL, &pipe->waiters, - req->func, req->event, NULL ); + req->io_apc, req->io_user, req->io_sb ); else { struct timeval when = current_time; if (req->timeout == NMPWAIT_USE_DEFAULT_WAIT) add_timeout( &when, pipe->timeout ); else add_timeout( &when, req->timeout ); - create_async( current, &when, &pipe->waiters, req->func, req->event, NULL ); + create_async( current, &when, &pipe->waiters, req->io_apc, req->io_user, req->io_sb ); } } diff --git a/server/protocol.def b/server/protocol.def index f3175a3..d335d0a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1997,8 +1997,9 @@ enum message_type /* Connect to a named pipe */ @REQ(connect_named_pipe) obj_handle_t handle; - obj_handle_t event; - void* func; + void* io_apc; /* APC routine to queue upon end of async */ + void* io_sb; /* I/O status block */ + void* io_user; /* data to pass back to caller */ @END @@ -2006,8 +2007,9 @@ enum message_type @REQ(wait_named_pipe) obj_handle_t handle; unsigned int timeout; - obj_handle_t event; - void* func; + void* io_apc; /* APC routine to queue upon end of async */ + void* io_sb; /* I/O status block */ + void* io_user; /* data to pass back to caller */ VARARG(name,unicode_str); /* pipe name */ @END diff --git a/server/trace.c b/server/trace.c index 8475466..b5aab1a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2425,16 +2425,18 @@ static void dump_open_named_pipe_reply( const struct open_named_pipe_reply *req static void dump_connect_named_pipe_request( const struct connect_named_pipe_request *req ) { fprintf( stderr, " handle=%p,", req->handle ); - fprintf( stderr, " event=%p,", req->event ); - fprintf( stderr, " func=%p", req->func ); + fprintf( stderr, " io_apc=%p,", req->io_apc ); + fprintf( stderr, " io_sb=%p,", req->io_sb ); + fprintf( stderr, " io_user=%p", req->io_user ); } static void dump_wait_named_pipe_request( const struct wait_named_pipe_request *req ) { fprintf( stderr, " handle=%p,", req->handle ); fprintf( stderr, " timeout=%08x,", req->timeout ); - fprintf( stderr, " event=%p,", req->event ); - fprintf( stderr, " func=%p,", req->func ); + fprintf( stderr, " io_apc=%p,", req->io_apc ); + fprintf( stderr, " io_sb=%p,", req->io_sb ); + fprintf( stderr, " io_user=%p,", req->io_user ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); }

1 0

Alexandre Julliard : server: Grab the owner object of an APC while the APC is executing.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 52a9af7ecb34bebb67048a84a4a1682f4b570943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a9af7ecb34bebb67048a84a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 20 19:22:39 2007 +0100 server: Grab the owner object of an APC while the APC is executing. --- server/thread.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/server/thread.c b/server/thread.c index 7010a4d..6323110 100644 --- a/server/thread.c +++ b/server/thread.c @@ -318,6 +318,7 @@ static void thread_apc_destroy( struct object *obj ) { struct thread_apc *apc = (struct thread_apc *)obj; if (apc->caller) release_object( apc->caller ); + if (apc->owner) release_object( apc->owner ); } /* queue an async procedure call */ @@ -332,6 +333,7 @@ static struct thread_apc *create_apc( struct object *owner, const apc_call_t *ca apc->owner = owner; apc->executed = 0; apc->result.type = APC_NONE; + if (owner) grab_object( owner ); } return apc; }

1 0

Alexandre Julliard : server: Make struct async into a real object, to keep it around while the APC is running.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 06db705238c8741e2de35016ea08af3ab454bd8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06db705238c8741e2de35016e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 20 19:23:59 2007 +0100 server: Make struct async into a real object, to keep it around while the APC is running. --- server/Makefile.in | 1 + server/async.c | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++ server/fd.c | 72 ------------------------- server/file.h | 8 +-- 4 files changed, 151 insertions(+), 78 deletions(-) diff --git a/server/Makefile.in b/server/Makefile.in index bfd5c31..5e31826 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -7,6 +7,7 @@ MODULE = none EXTRALIBS = @LIBPOLL@ C_SRCS = \ + async.c \ atom.c \ change.c \ class.c \ diff --git a/server/async.c b/server/async.c new file mode 100644 index 0000000..cb4675c --- /dev/null +++ b/server/async.c @@ -0,0 +1,148 @@ +/* + * Server-side async I/O support + * + * Copyright (C) 2007 Alexandre Julliard + * + * 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 <assert.h> +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" + +#include "object.h" +#include "file.h" +#include "request.h" + +struct async +{ + struct object obj; /* object header */ + struct thread *thread; /* owning thread */ + struct list queue_entry; /* entry in file descriptor queue */ + struct timeout_user *timeout; + void *apc; /* apc function to call when alerted */ + void *user; /* user-private argument for apc */ + void *sb; /* pointer to I/O status block in client addr space */ +}; + +static void async_dump( struct object *obj, int verbose ); +static void async_destroy( struct object *obj ); + +static const struct object_ops async_ops = +{ + sizeof(struct async), /* size */ + async_dump, /* dump */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + no_map_access, /* map_access */ + no_lookup_name, /* lookup_name */ + no_close_handle, /* close_handle */ + async_destroy /* destroy */ +}; + +static void async_dump( struct object *obj, int verbose ) +{ + struct async *async = (struct async *)obj; + assert( obj->ops == &async_ops ); + fprintf( stderr, "Async thread=%p\n", async->thread ); +} + +static void async_destroy( struct object *obj ) +{ + struct async *async = (struct async *)obj; + assert( obj->ops == &async_ops ); + + if (async->timeout) remove_timeout_user( async->timeout ); + release_object( async->thread ); +} + +/* notifies client thread of new status of its async request */ +/* destroys the server side of it */ +static void async_terminate( struct async *async, unsigned int status ) +{ + apc_call_t data; + + memset( &data, 0, sizeof(data) ); + data.type = APC_ASYNC_IO; + data.async_io.func = async->apc; + data.async_io.user = async->user; + data.async_io.sb = async->sb; + data.async_io.status = status; + thread_queue_apc( async->thread, &async->obj, &data ); + + if (async->timeout) remove_timeout_user( async->timeout ); + async->timeout = NULL; + list_remove( &async->queue_entry ); + release_object( async ); +} + +/* callback for timeout on an async request */ +static void async_timeout( void *private ) +{ + struct async *async = private; + + async->timeout = NULL; + async_terminate( async, STATUS_TIMEOUT ); +} + +/* create an async on a given queue of a fd */ +struct async *create_async( struct thread *thread, const struct timeval *timeout, + struct list *queue, void *io_apc, void *io_user, void *io_sb ) +{ + struct async *async = alloc_object( &async_ops ); + + if (!async) return NULL; + + async->thread = (struct thread *)grab_object( thread ); + async->apc = io_apc; + async->user = io_user; + async->sb = io_sb; + + list_add_tail( queue, &async->queue_entry ); + + if (timeout) async->timeout = add_timeout_user( timeout, async_timeout, async ); + else async->timeout = NULL; + + return async; +} + +/* terminate the async operation at the head of the queue */ +void async_terminate_head( struct list *queue, unsigned int status ) +{ + struct list *ptr = list_head( queue ); + if (ptr) async_terminate( LIST_ENTRY( ptr, struct async, queue_entry ), status ); +} + +/* terminate all async operations on the queue */ +void async_terminate_queue( struct list *queue, unsigned int status ) +{ + struct list *ptr, *next; + + LIST_FOR_EACH_SAFE( ptr, next, queue ) + { + struct async *async = LIST_ENTRY( ptr, struct async, queue_entry ); + async_terminate( async, status ); + } +} diff --git a/server/fd.c b/server/fd.c index f2f8e9b..5e03c7b 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1267,78 +1267,6 @@ void unlock_fd( struct fd *fd, file_pos_t start, file_pos_t count ) /****************************************************************/ -/* asynchronous operations support */ - -struct async -{ - struct thread *thread; - void *apc; - void *user; - void *sb; - struct timeout_user *timeout; - struct list entry; -}; - -/* notifies client thread of new status of its async request */ -/* destroys the server side of it */ -static void async_terminate( struct async *async, int status ) -{ - apc_call_t data; - - memset( &data, 0, sizeof(data) ); - data.type = APC_ASYNC_IO; - data.async_io.func = async->apc; - data.async_io.user = async->user; - data.async_io.sb = async->sb; - data.async_io.status = status; - thread_queue_apc( async->thread, NULL, &data ); - - if (async->timeout) remove_timeout_user( async->timeout ); - async->timeout = NULL; - list_remove( &async->entry ); - release_object( async->thread ); - free( async ); -} - -/* cb for timeout on an async request */ -static void async_callback(void *private) -{ - struct async *async = (struct async *)private; - - /* fprintf(stderr, "async timeout out %p\n", async); */ - async->timeout = NULL; - async_terminate( async, STATUS_TIMEOUT ); -} - -/* create an async on a given queue of a fd */ -struct async *create_async( struct thread *thread, const struct timeval *timeout, - struct list *queue, void *io_apc, void *io_user, void* io_sb ) -{ - struct async *async = mem_alloc( sizeof(struct async) ); - - if (!async) return NULL; - - async->thread = (struct thread *)grab_object(thread); - async->apc = io_apc; - async->user = io_user; - async->sb = io_sb; - - list_add_tail( queue, &async->entry ); - - if (timeout) async->timeout = add_timeout_user( timeout, async_callback, async ); - else async->timeout = NULL; - - return async; -} - -/* terminate the async operation at the head of the queue */ -void async_terminate_head( struct list *queue, int status ) -{ - struct list *ptr = list_head( queue ); - if (ptr) async_terminate( LIST_ENTRY( ptr, struct async, entry ), status ); -} - -/****************************************************************/ /* file descriptor functions */ static void fd_dump( struct object *obj, int verbose ) diff --git a/server/file.h b/server/file.h index 85af894..6402d61 100644 --- a/server/file.h +++ b/server/file.h @@ -124,12 +124,8 @@ extern struct object *create_serial( struct fd *fd, unsigned int options ); /* async I/O functions */ extern struct async *create_async( struct thread *thread, const struct timeval *timeout, struct list *queue, void *, void *, void *); -extern void async_terminate_head( struct list *queue, int status ); - -static inline void async_terminate_queue( struct list *queue, int status ) -{ - while (!list_empty( queue )) async_terminate_head( queue, status ); -} +extern void async_terminate_head( struct list *queue, unsigned int status ); +extern void async_terminate_queue( struct list *queue, unsigned int status ); /* access rights that require Unix read permission */ #define FILE_UNIX_READ_ACCESS (FILE_READ_DATA|FILE_READ_ATTRIBUTES|FILE_READ_EA)

1 0