November 2006 - Wine-commits

Alexandre Julliard : ntdll: FILE_GetDeviceInfo no longer needs to be public .
by Alexandre Julliard 04 Nov '06

04 Nov '06

Module: wine Branch: master Commit: 511e0bb671a02ddc8305ffe01587e2dd89a13532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=511e0bb671a02ddc8305ffe01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 15:20:21 2006 +0100 ntdll: FILE_GetDeviceInfo no longer needs to be public. --- dlls/ntdll/file.c | 10 +++++----- dlls/ntdll/ntdll_misc.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d91666a..7b170a8 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1617,8 +1617,8 @@ NTSTATUS WINAPI NtQueryAttributesFile( c #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__APPLE__) /* helper for FILE_GetDeviceInfo to hide some platform differences in fstatfs */ -static inline get_device_info_fstatfs( FILE_FS_DEVICE_INFORMATION *info, const char *fstypename, - size_t fstypesize, unsigned int flags ) +static inline void get_device_info_fstatfs( FILE_FS_DEVICE_INFORMATION *info, const char *fstypename, + size_t fstypesize, unsigned int flags ) { if (!strncmp("cd9660", fstypename, fstypesize) || !strncmp("udf", fstypename, fstypesize)) @@ -1652,11 +1652,11 @@ static inline get_device_info_fstatfs( F #endif /****************************************************************************** - * FILE_GetDeviceInfo + * get_device_info * * Implementation of the FileFsDeviceInformation query for NtQueryVolumeInformationFile. */ -NTSTATUS FILE_GetDeviceInfo( int fd, FILE_FS_DEVICE_INFORMATION *info ) +static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) { struct stat st; @@ -1873,7 +1873,7 @@ #endif { FILE_FS_DEVICE_INFORMATION *info = buffer; - if ((io->u.Status = FILE_GetDeviceInfo( fd, info )) == STATUS_SUCCESS) + if ((io->u.Status = get_device_info( fd, info )) == STATUS_SUCCESS) io->Information = sizeof(*info); } break; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index d18728f..1225036 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -105,7 +105,6 @@ extern NTSTATUS TAPE_DeviceIoControl(HAN /* file I/O */ extern NTSTATUS FILE_GetNtStatus(void); -extern NTSTATUS FILE_GetDeviceInfo( int fd, FILE_FS_DEVICE_INFORMATION *info ); extern BOOL DIR_is_hidden_file( const UNICODE_STRING *name ); extern NTSTATUS DIR_unmount_device( HANDLE handle ); extern NTSTATUS DIR_get_unix_cwd( char **cwd );

1 0

Alexandre Julliard : ntdll: Retrieve mailslot message info from the client side.
by Alexandre Julliard 04 Nov '06

04 Nov '06

Module: wine Branch: master Commit: 02fc8863027cd3ac995f131d784b7aeaab27694e URL: http://source.winehq.org/git/wine.git/?a=commit;h=02fc8863027cd3ac995f131d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:53:04 2006 +0100 ntdll: Retrieve mailslot message info from the client side. --- dlls/ntdll/file.c | 21 +++++++++++++++++++-- include/wine/server_protocol.h | 4 +--- server/mailslot.c | 18 ------------------ server/protocol.def | 2 -- server/trace.c | 4 +--- 5 files changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 7b170a8..5d397cc 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1350,12 +1350,29 @@ NTSTATUS WINAPI NtQueryInformationFile( { info->MaximumMessageSize = reply->max_msgsize; info->MailslotQuota = 0; - info->NextMessageSize = reply->next_msgsize; - info->MessagesAvailable = reply->msg_count; + info->NextMessageSize = 0; + info->MessagesAvailable = 0; info->ReadTimeout.QuadPart = reply->read_timeout * -10000; } } SERVER_END_REQ; + if (!io->u.Status) + { + ULONG size = info->MaximumMessageSize ? info->MaximumMessageSize : 0x10000; + char *tmpbuf = RtlAllocateHeap( GetProcessHeap(), 0, size ); + if (tmpbuf) + { + int fd, needs_close; + if (!server_get_unix_fd( hFile, FILE_READ_DATA, &fd, &needs_close, NULL )) + { + int res = recv( fd, tmpbuf, size, MSG_PEEK ); + info->MessagesAvailable = (res > 0); + info->NextMessageSize = (res >= 0) ? res : MAILSLOT_NO_MESSAGE; + if (needs_close) close( fd ); + } + RtlFreeHeap( GetProcessHeap(), 0, tmpbuf ); + } + } } break; case FilePipeLocalInformation: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 577c797..09b8906 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3666,8 +3666,6 @@ struct set_mailslot_info_reply struct reply_header __header; unsigned int max_msgsize; int read_timeout; - unsigned int msg_count; - unsigned int next_msgsize; }; #define MAILSLOT_SET_READ_TIMEOUT 1 @@ -4406,6 +4404,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 258 +#define SERVER_PROTOCOL_VERSION 259 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/mailslot.c b/server/mailslot.c index 7015f41..578f751 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -212,16 +212,6 @@ static int mailslot_message_count(struct return (poll( &pfd, 1, 0 ) == 1) ? 1 : 0; } -static int mailslot_next_msg_size( struct mailslot *mailslot ) -{ - int size, fd; - - size = 0; - fd = get_unix_fd( mailslot->fd ); - ioctl( fd, FIONREAD, &size ); - return size; -} - static int mailslot_get_info( struct fd *fd ) { struct mailslot *mailslot = get_fd_user( fd ); @@ -541,14 +531,6 @@ DECL_HANDLER(set_mailslot_info) mailslot->read_timeout = req->read_timeout; reply->max_msgsize = mailslot->max_msgsize; reply->read_timeout = mailslot->read_timeout; - reply->msg_count = mailslot_message_count(mailslot); - - /* get the size of the next message */ - if (reply->msg_count) - reply->next_msgsize = mailslot_next_msg_size(mailslot); - else - reply->next_msgsize = MAILSLOT_NO_MESSAGE; - release_object( mailslot ); } } diff --git a/server/protocol.def b/server/protocol.def index a4a2376..192b8a3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2578,8 +2578,6 @@ #define SET_GLOBAL_TASKMAN_WINDOW 0x04 @REPLY unsigned int max_msgsize; int read_timeout; - unsigned int msg_count; - unsigned int next_msgsize; @END #define MAILSLOT_SET_READ_TIMEOUT 1 diff --git a/server/trace.c b/server/trace.c index 9931ea0..50268f9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3186,9 +3186,7 @@ static void dump_set_mailslot_info_reque static void dump_set_mailslot_info_reply( const struct set_mailslot_info_reply *req ) { fprintf( stderr, " max_msgsize=%08x,", req->max_msgsize ); - fprintf( stderr, " read_timeout=%d,", req->read_timeout ); - fprintf( stderr, " msg_count=%08x,", req->msg_count ); - fprintf( stderr, " next_msgsize=%08x", req->next_msgsize ); + fprintf( stderr, " read_timeout=%d", req->read_timeout ); } static void dump_create_directory_request( const struct create_directory_request *req )

1 0

Roderick Colenbrander : wgl: Add extension checking code / glxGetProcAddress protection.
by Alexandre Julliard 04 Nov '06

04 Nov '06

Module: wine Branch: master Commit: 2f8a05e27e3a7e613ace9e4f3e629d4ef3fbd08c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f8a05e27e3a7e613ace9e4f3… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Oct 29 22:56:27 2006 +0100 wgl: Add extension checking code / glxGetProcAddress protection. --- dlls/opengl32/make_opengl | 101 +-- dlls/opengl32/opengl_ext.c | 2208 ++++++++++++++++++++++---------------------- dlls/opengl32/opengl_ext.h | 2 +- dlls/opengl32/wgl.c | 54 ++ 4 files changed, 1196 insertions(+), 1169 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f8a05e27e3a7e613ace9…

1 0

Huw Davies : winex11.drv: If the app asks for a single buffered pixel format, then it should be happy with a double buffered one.
by Alexandre Julliard 04 Nov '06

04 Nov '06

Module: wine Branch: master Commit: 7d4163b5fa13537ae314d16e5257c5fe7ba7fc80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d4163b5fa13537ae314d16e5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 3 12:30:40 2006 +0000 winex11.drv: If the app asks for a single buffered pixel format, then it should be happy with a double buffered one. Likewise for mono vs stereo. Add some TRACEs so that we know what condition is failing. --- dlls/winex11.drv/opengl.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 962962f..feec150 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -895,21 +895,24 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV iPixelType = PFD_TYPE_COLORINDEX; if (ppfd->iPixelType != iPixelType) { + TRACE("pixel type mismatch\n"); goto choose_exit; } /* Doublebuffer */ pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_DOUBLEBUFFER, &value); if (value) dwFlags |= PFD_DOUBLEBUFFER; - if (!(ppfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE)) { - if ((ppfd->dwFlags & PFD_DOUBLEBUFFER) != (dwFlags & PFD_DOUBLEBUFFER)) { + if (!(ppfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE) && (ppfd->dwFlags & PFD_DOUBLEBUFFER)) { + if (!(dwFlags & PFD_DOUBLEBUFFER)) { + TRACE("dbl buffer mismatch\n"); goto choose_exit; } } /* Stereo */ pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_STEREO, &value); if (value) dwFlags |= PFD_STEREO; - if (!(ppfd->dwFlags & PFD_STEREO_DONTCARE)) { - if ((ppfd->dwFlags & PFD_STEREO) != (dwFlags & PFD_STEREO)) { + if (!(ppfd->dwFlags & PFD_STEREO_DONTCARE) && (ppfd->dwFlags & PFD_STEREO)) { + if (!(dwFlags & PFD_STEREO)) { + TRACE("stereo mismatch\n"); goto choose_exit; } } @@ -917,24 +920,28 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV /* Alpha bits */ pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_ALPHA_SIZE, &value); if (ppfd->iPixelType==PFD_TYPE_RGBA && ppfd->cAlphaBits && !value) { + TRACE("alpha mismatch\n"); goto choose_exit; } /* Depth bits */ pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_DEPTH_SIZE, &value); if (ppfd->cDepthBits && !value) { + TRACE("depth mismatch\n"); goto choose_exit; } /* Stencil bits */ pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_STENCIL_SIZE, &value); if (ppfd->cStencilBits && !value) { + TRACE("stencil mismatch\n"); goto choose_exit; } /* Aux buffers */ pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_AUX_BUFFERS, &value); if (ppfd->cAuxBuffers && !value) { + TRACE("aux mismatch\n"); goto choose_exit; }

1 0

Stefan Dösinger : wined3d: glReadPixels corrections.
by Alexandre Julliard 04 Nov '06

04 Nov '06

Module: wine Branch: master Commit: 7cae24fc36750f33e689be4df51d2e27daa69115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cae24fc36750f33e689be4df… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 3 19:12:27 2006 +0100 wined3d: glReadPixels corrections. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 481517e..59398b3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6440,8 +6440,8 @@ static HRESULT WINAPI IWineD3DDeviceIm FIXME("Reading of depthstencil not yet supported\n"); } - glReadPixels(surfaceGlDescription->target, - surfaceGlDescription->level, + glReadPixels(0, + 0, surfaceWidth, surfaceHeight, surfaceGlDescription->glFormat,

1 0

Alexandre Julliard : preloader: Setup a fake thread-local storage block pointed to by %gs.
by Alexandre Julliard 03 Nov '06

03 Nov '06

Module: wine Branch: master Commit: a68d293bae6cec6deafafb94972c9277791256b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a68d293bae6cec6deafafb949… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 13:55:41 2006 +0100 preloader: Setup a fake thread-local storage block pointed to by %gs. --- libs/wine/ldt.c | 4 ++++ loader/preloader.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 0613c83..ceb8db4 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -405,6 +405,10 @@ #ifdef __linux__ struct modify_ldt_s ldt_info; int ret; + /* the preloader may have allocated it already */ + global_fs_sel = wine_get_fs(); + if (global_fs_sel && is_gdt_sel(global_fs_sel)) return global_fs_sel; + ldt_info.entry_number = -1; fill_modify_ldt_struct( &ldt_info, &null_entry ); if ((ret = set_thread_area( &ldt_info ) < 0)) diff --git a/loader/preloader.c b/loader/preloader.c index 7140f3a..bd303da 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -163,6 +163,26 @@ void __bb_init_func(void) { return; } void *__stack_chk_guard = 0; void __stack_chk_fail(void) { return; } +/* data for setting up the glibc-style thread-local storage in %gs */ + +static int thread_data[256]; + +struct +{ + /* this is the kernel modify_ldt struct */ + unsigned int entry_number; + unsigned long base_addr; + unsigned int limit; + unsigned int seg_32bit : 1; + unsigned int contents : 2; + unsigned int read_exec_only : 1; + unsigned int limit_in_pages : 1; + unsigned int seg_not_present : 1; + unsigned int useable : 1; + unsigned int garbage : 25; +} thread_ldt = { -1, (unsigned long)thread_data, 0xfffff, 1, 0, 0, 1, 0, 1, 0 }; + + /* * The _start function is the entry and exit point of this program * @@ -172,7 +192,17 @@ void __stack_chk_fail(void) { return; } void _start(); extern char _end[]; __ASM_GLOBAL_FUNC(_start, - "\tmovl %esp,%eax\n" + "\tmovl $243,%eax\n" /* SYS_set_thread_area */ + "\tmovl $thread_ldt,%ebx\n" + "\tint $0x80\n" /* allocate gs segment */ + "\torl %eax,%eax\n" + "\tjl 1f\n" + "\tmovl thread_ldt,%eax\n" /* thread_ldt.entry_number */ + "\tshl $3,%eax\n" + "\torl $3,%eax\n" + "\tmov %ax,%gs\n" + "\tmov %ax,%fs\n" /* set %fs too so libwine can retrieve it later on */ + "1:\tmovl %esp,%eax\n" "\tleal -136(%esp),%esp\n" /* allocate some space for extra aux values */ "\tpushl %eax\n" /* orig stack pointer */ "\tpushl %esp\n" /* ptr to orig stack pointer */

1 0

Alexandre Julliard : ntdll: Added implementation of RtlDllShutdownInProgress.
by Alexandre Julliard 03 Nov '06

03 Nov '06

Module: wine Branch: master Commit: c9b5569bc26f35d22f2bf0072c15678d0d28aea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b5569bc26f35d22f2bf0072… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 13:52:02 2006 +0100 ntdll: Added implementation of RtlDllShutdownInProgress. --- dlls/ntdll/loader.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3787bc1..7e0b43a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1868,6 +1868,16 @@ NTSTATUS WINAPI LdrQueryProcessModuleInf return nts; } + +/****************************************************************** + * RtlDllShutdownInProgress (NTDLL.@) + */ +BOOLEAN WINAPI RtlDllShutdownInProgress(void) +{ + return process_detaching; +} + + /****************************************************************** * LdrShutdownProcess (NTDLL.@) * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d0c55cb..803ed53 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -530,7 +530,7 @@ # @ stub RtlDeregisterWaitEx @ stdcall RtlDestroyProcessParameters(ptr) @ stdcall RtlDestroyQueryDebugBuffer(ptr) @ stdcall RtlDetermineDosPathNameType_U(wstr) -# @ stub RtlDllShutdownInProgress +@ stdcall RtlDllShutdownInProgress() # @ stub RtlDnsHostNameToComputerName @ stdcall RtlDoesFileExists_U(wstr) # @ stub RtlDosApplyFileIsolationRedirection_Ustr diff --git a/include/winternl.h b/include/winternl.h index 193e02a..304f5af 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2015,6 +2015,7 @@ HANDLE WINAPI RtlDestroyHeap(HANDLE); void WINAPI RtlDestroyProcessParameters(RTL_USER_PROCESS_PARAMETERS*); NTSTATUS WINAPI RtlDestroyQueryDebugBuffer(PDEBUG_BUFFER); DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U(PCWSTR); +BOOLEAN WINAPI RtlDllShutdownInProgress(void); BOOLEAN WINAPI RtlDoesFileExists_U(LPCWSTR); BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR,PUNICODE_STRING,PWSTR*,CURDIR*); ULONG WINAPI RtlDosSearchPath_U(LPCWSTR, LPCWSTR, LPCWSTR, ULONG, LPWSTR, LPWSTR*);

1 0

Alexandre Julliard : ntdll: Added a server_get_unix_fd function that avoids doing a dup() of the fd when not required.
by Alexandre Julliard 03 Nov '06

03 Nov '06

Module: wine Branch: master Commit: 9ddb9294da45ef17c315b355f123bb2c635ba18b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ddb9294da45ef17c315b355f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 11:38:44 2006 +0100 ntdll: Added a server_get_unix_fd function that avoids doing a dup() of the fd when not required. --- dlls/ntdll/cdrom.c | 8 ++-- dlls/ntdll/directory.c | 18 ++++---- dlls/ntdll/file.c | 86 ++++++++++++++++++-------------------- dlls/ntdll/ntdll_misc.h | 2 + dlls/ntdll/serial.c | 19 +++----- dlls/ntdll/server.c | 105 ++++++++++++++++++++++++---------------------- dlls/ntdll/tape.c | 6 +- dlls/ntdll/virtual.c | 21 ++++----- 8 files changed, 130 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ddb9294da45ef17c315b…

1 0

Alexandre Julliard : ntdll: Don' t store the unix file descriptor in the async structure, retrieve it as needed.
by Alexandre Julliard 03 Nov '06

03 Nov '06

Module: wine Branch: master Commit: d384871bc3be5d83ae926d8f07f8fd6eaea2a7e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d384871bc3be5d83ae926d8f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 11:56:51 2006 +0100 ntdll: Don't store the unix file descriptor in the async structure, retrieve it as needed. --- dlls/ntdll/file.c | 53 ++++++++++++++++++++++++----------------------------- 1 files changed, 24 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 514a8a7..d91666a 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -286,8 +286,6 @@ typedef struct async_fileio off_t offset; int queue_apc_on_error; BOOL avail_mode; - int fd; - int needs_close; HANDLE event; } async_fileio; @@ -295,7 +293,6 @@ static void fileio_terminate(async_filei { TRACE("data: %p\n", fileio); - if (fileio->needs_close) close( fileio->fd ); if (fileio->event) NtSetEvent( fileio->event, NULL ); if (fileio->apc && @@ -382,14 +379,11 @@ #endif /*********************************************************************** * FILE_AsyncReadService (INTERNAL) - * - * This function is called while the client is waiting on the - * server, so we can't make any server calls here. */ static void WINAPI FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, ULONG status) { async_fileio *fileio = (async_fileio*)user; - int result; + int fd, needs_close, result; int already = iosb->Information; TRACE("%p %p 0x%x\n", iosb, fileio->buffer, status); @@ -399,18 +393,22 @@ static void WINAPI FILE_AsyncReadService case STATUS_ALERTED: /* got some new data */ if (iosb->u.Status != STATUS_PENDING) FIXME("unexpected status %08x\n", iosb->u.Status); /* check to see if the data is ready (non-blocking) */ + if ((iosb->u.Status = server_get_unix_fd( fileio->handle, FILE_READ_DATA, &fd, &needs_close, NULL ))) + { + fileio_terminate(fileio, iosb); + break; + } if ( fileio->avail_mode ) - result = read(fileio->fd, &fileio->buffer[already], - fileio->count - already); + result = read(fd, &fileio->buffer[already], fileio->count - already); else { - result = pread(fileio->fd, &fileio->buffer[already], + result = pread(fd, &fileio->buffer[already], fileio->count - already, fileio->offset + already); if ((result < 0) && (errno == ESPIPE)) - result = read(fileio->fd, &fileio->buffer[already], - fileio->count - already); + result = read(fd, &fileio->buffer[already], fileio->count - already); } + if (needs_close) close( fd ); if (result < 0) { @@ -545,16 +543,14 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, fileio->buffer = buffer; fileio->queue_apc_on_error = 0; fileio->avail_mode = (flags & FD_FLAG_AVAILABLE); - fileio->fd = unix_handle; /* FIXME */ - fileio->needs_close = needs_close; fileio->event = hEvent; - NtResetEvent(hEvent, NULL); + if (hEvent) NtResetEvent(hEvent, NULL); + if (needs_close) close( unix_handle ); io_status->u.Status = STATUS_PENDING; ret = fileio_queue_async(fileio, io_status, TRUE); if (ret != STATUS_SUCCESS) { - if (needs_close) close( unix_handle ); if (flags & FD_FLAG_TIMEOUT) NtClose(hEvent); return ret; } @@ -625,14 +621,11 @@ done: /*********************************************************************** * FILE_AsyncWriteService (INTERNAL) - * - * This function is called while the client is waiting on the - * server, so we can't make any server calls here. */ static void WINAPI FILE_AsyncWriteService(void *ovp, IO_STATUS_BLOCK *iosb, ULONG status) { async_fileio *fileio = (async_fileio *) ovp; - int result; + int result, fd, needs_close; int already = iosb->Information; TRACE("(%p %p 0x%x)\n",iosb, fileio->buffer, status); @@ -641,17 +634,21 @@ static void WINAPI FILE_AsyncWriteServic { case STATUS_ALERTED: /* write some data (non-blocking) */ + if ((iosb->u.Status = server_get_unix_fd( fileio->handle, FILE_WRITE_DATA, &fd, &needs_close, NULL ))) + { + fileio_terminate(fileio, iosb); + break; + } if ( fileio->avail_mode ) - result = write(fileio->fd, &fileio->buffer[already], - fileio->count - already); + result = write(fd, &fileio->buffer[already], fileio->count - already); else { - result = pwrite(fileio->fd, &fileio->buffer[already], + result = pwrite(fd, &fileio->buffer[already], fileio->count - already, fileio->offset + already); if ((result < 0) && (errno == ESPIPE)) - result = write(fileio->fd, &fileio->buffer[already], - fileio->count - already); + result = write(fd, &fileio->buffer[already], fileio->count - already); } + if (needs_close) close( fd ); if (result < 0) { @@ -767,17 +764,15 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile fileio->buffer = (void*)buffer; fileio->queue_apc_on_error = 0; fileio->avail_mode = (flags & FD_FLAG_AVAILABLE); - fileio->fd = unix_handle; /* FIXME */ - fileio->needs_close = needs_close; fileio->event = hEvent; - NtResetEvent(hEvent, NULL); + if (hEvent) NtResetEvent(hEvent, NULL); + if (needs_close) close( unix_handle ); io_status->Information = 0; io_status->u.Status = STATUS_PENDING; ret = fileio_queue_async(fileio, io_status, FALSE); if (ret != STATUS_SUCCESS) { - if (needs_close) close( unix_handle ); if (flags & FD_FLAG_TIMEOUT) NtClose(hEvent); return ret; }

1 0

Alexandre Julliard : ws2_32: Don' t store the socket file descriptor in the async structure, retrieve it as needed.
by Alexandre Julliard 03 Nov '06

03 Nov '06

Module: wine Branch: master Commit: 2765df9f235641b0cd26fd16d286bd691b731bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2765df9f235641b0cd26fd16d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 12:03:14 2006 +0100 ws2_32: Don't store the socket file descriptor in the async structure, retrieve it as needed. --- dlls/ws2_32/socket.c | 94 ++++++++++++++++++++++++-------------------------- 1 files changed, 45 insertions(+), 49 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bc9a39e..b773092 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -190,7 +190,6 @@ typedef struct ws2_async int *ptr; /* for recv operations */ } addrlen; DWORD flags; - int fd; HANDLE event; } ws2_async; @@ -1117,9 +1116,7 @@ static void CALLBACK ws2_async_terminate { TRACE( "as: %p uovl %p ovl %p\n", as, as->user_overlapped, iosb ); - wine_server_release_fd( as->hSocket, as->fd ); - if ( as->event != INVALID_HANDLE_VALUE ) - NtSetEvent( as->event, NULL ); + if (as->event) NtSetEvent( as->event, NULL ); if (as->completion_func) as->completion_func( NtStatusToWSAError (iosb->u.Status), @@ -1147,7 +1144,7 @@ static void WINAPI WS2_async_send(void*, static void WINAPI WS2_async_shutdown( void*, IO_STATUS_BLOCK*, ULONG); inline static struct ws2_async* -WS2_make_async(SOCKET s, int fd, enum ws2_mode mode, struct iovec *iovec, DWORD dwBufferCount, +WS2_make_async(SOCKET s, enum ws2_mode mode, struct iovec *iovec, DWORD dwBufferCount, LPDWORD lpFlags, struct WS_sockaddr *addr, LPINT addrlen, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, @@ -1182,8 +1179,7 @@ WS2_make_async(SOCKET s, int fd, enum ws wsa->iovec = iovec; wsa->n_iovecs = dwBufferCount; wsa->addr = addr; - wsa->fd = fd; - wsa->event = INVALID_HANDLE_VALUE; + wsa->event = 0; if ( lpOverlapped ) { @@ -1199,8 +1195,8 @@ WS2_make_async(SOCKET s, int fd, enum ws (*piosb)->Information = 0; (*piosb)->u.Status = STATUS_PENDING; - TRACE( "wsa %p, h %p, ev %p, fd %d, iosb %p, uov %p, cfunc %p\n", - wsa, wsa->hSocket, wsa->event, wsa->fd, + 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; @@ -1325,15 +1321,21 @@ out: static void WINAPI WS2_async_recv( void* ovp, IO_STATUS_BLOCK* iosb, ULONG status) { ws2_async* wsa = (ws2_async*) ovp; - int result, err; + int result, fd, err; TRACE( "(%p %p %x)\n", wsa, iosb, status ); switch (status) { case STATUS_ALERTED: - result = WS2_recv( wsa->fd, wsa->iovec, wsa->n_iovecs, + if ((iosb->u.Status = wine_server_handle_to_fd( wsa->hSocket, FILE_READ_DATA, &fd, NULL ) )) + { + ws2_async_terminate(wsa, iosb); + break; + } + result = WS2_recv( fd, wsa->iovec, wsa->n_iovecs, wsa->addr, wsa->addrlen.ptr, &wsa->flags ); + wine_server_release_fd( wsa->hSocket, fd ); if (result >= 0) { iosb->u.Status = STATUS_SUCCESS; @@ -1445,7 +1447,7 @@ out: static void WINAPI WS2_async_send(void* as, IO_STATUS_BLOCK* iosb, ULONG status) { ws2_async* wsa = (ws2_async*) as; - int result; + int result, fd; TRACE( "(%p %p %x)\n", wsa, iosb, status ); @@ -1453,9 +1455,14 @@ static void WINAPI WS2_async_send(void* { case STATUS_ALERTED: if (iosb->u.Status != STATUS_PENDING) FIXME("wrong %08x\n", iosb->u.Status); + if ((iosb->u.Status = wine_server_handle_to_fd( wsa->hSocket, FILE_WRITE_DATA, &fd, NULL ) )) + { + ws2_async_terminate(wsa, iosb); + break; + } /* check to see if the data is ready (non-blocking) */ - result = WS2_send( wsa->fd, wsa->iovec, wsa->n_iovecs, - wsa->addr, wsa->addrlen.val, wsa->flags ); + result = WS2_send( fd, wsa->iovec, wsa->n_iovecs, wsa->addr, wsa->addrlen.val, wsa->flags ); + wine_server_release_fd( wsa->hSocket, fd ); if (result >= 0) { @@ -1503,18 +1510,24 @@ static void WINAPI WS2_async_send(void* static void WINAPI WS2_async_shutdown( void* as, PIO_STATUS_BLOCK iosb, ULONG status ) { ws2_async* wsa = (ws2_async*) as; - int err = 1; + int fd, err = 1; TRACE( "async %p %d\n", wsa, wsa->mode ); switch (status) { case STATUS_ALERTED: + if ((iosb->u.Status = wine_server_handle_to_fd( wsa->hSocket, 0, &fd, NULL ) )) + { + ws2_async_terminate(wsa, iosb); + break; + } switch ( wsa->mode ) { - case ws2m_sd_read: err = shutdown( wsa->fd, 0 ); break; - case ws2m_sd_write: err = shutdown( wsa->fd, 1 ); break; + case ws2m_sd_read: err = shutdown( fd, 0 ); break; + case ws2m_sd_write: err = shutdown( fd, 1 ); break; default: ERR("invalid mode: %d\n", wsa->mode ); } + wine_server_release_fd( wsa->hSocket, fd ); iosb->u.Status = err ? wsaErrno() : STATUS_SUCCESS; if (iosb->u.Status == STATUS_PENDING) ws2_queue_async(wsa, iosb); @@ -1534,7 +1547,7 @@ static void WINAPI WS2_async_shutdown( v * * Helper function for WS_shutdown() on overlapped sockets. */ -static int WS2_register_async_shutdown( SOCKET s, int fd, enum ws2_mode mode ) +static int WS2_register_async_shutdown( SOCKET s, enum ws2_mode mode ) { struct ws2_async *wsa; int ret, err = WSAEFAULT; @@ -1543,7 +1556,7 @@ static int WS2_register_async_shutdown( LPWSAOVERLAPPED ovl = HeapAlloc(GetProcessHeap(), 0, sizeof( WSAOVERLAPPED )); IO_STATUS_BLOCK *iosb = NULL; - TRACE("s %d fd %d mode %d\n", s, fd, mode); + TRACE("s %d mode %d\n", s, mode); if (!ovl) goto out; @@ -1551,8 +1564,7 @@ static int WS2_register_async_shutdown( if ( ovl->hEvent == WSA_INVALID_EVENT ) goto out_free; - wsa = WS2_make_async( s, fd, mode, NULL, 0, - &dwflags, NULL, &len, ovl, NULL, &iosb ); + wsa = WS2_make_async( s, mode, NULL, 0, &dwflags, NULL, &len, ovl, NULL, &iosb ); if ( !wsa ) goto out_close; @@ -2572,7 +2584,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF if ( (lpOverlapped || lpCompletionRoutine) && flags & FD_FLAG_OVERLAPPED ) { - wsa = WS2_make_async( s, fd, ws2m_write, iovec, dwBufferCount, + wsa = WS2_make_async( s, ws2m_write, iovec, dwBufferCount, &dwFlags, (struct WS_sockaddr*) to, &tolen, lpOverlapped, lpCompletionRoutine, &iosb ); if ( !wsa ) @@ -2590,6 +2602,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF HeapFree( GetProcessHeap(), 0, wsa ); goto err_free; } + release_sock_fd( s, fd ); /* Try immediate completion */ if ( lpOverlapped ) @@ -2822,7 +2835,7 @@ #endif */ int WINAPI WS_shutdown(SOCKET s, int how) { - int fd, fd0 = -1, fd1 = -1, flags, err = WSAENOTSOCK; + int fd, flags, err = WSAENOTSOCK; unsigned int clear_flags = 0; fd = get_sock_fd( s, 0, &flags ); @@ -2850,53 +2863,35 @@ int WINAPI WS_shutdown(SOCKET s, int how switch ( how ) { case SD_RECEIVE: - fd0 = fd; + err = WS2_register_async_shutdown( s, ws2m_sd_read ); break; case SD_SEND: - fd1 = fd; + err = WS2_register_async_shutdown( s, ws2m_sd_write ); break; case SD_BOTH: default: - fd0 = fd; - fd1 = get_sock_fd( s, 0, NULL ); + err = WS2_register_async_shutdown( s, ws2m_sd_read ); + if (!err) err = WS2_register_async_shutdown( s, ws2m_sd_write ); break; } - - if ( fd0 != -1 ) - { - err = WS2_register_async_shutdown( s, fd0, ws2m_sd_read ); - if ( err ) - { - release_sock_fd( s, fd0 ); - goto error; - } - } - if ( fd1 != -1 ) - { - err = WS2_register_async_shutdown( s, fd1, ws2m_sd_write ); - if ( err ) - { - release_sock_fd( s, fd1 ); - goto error; - } - } + if (err) goto error; } else /* non-overlapped mode */ { if ( shutdown( fd, how ) ) { err = wsaErrno(); - release_sock_fd( s, fd ); goto error; } - release_sock_fd( s, fd ); } + release_sock_fd( s, fd ); _enable_event( SOCKET2HANDLE(s), 0, 0, clear_flags ); if ( how > 1) WSAAsyncSelect( s, 0, 0, 0 ); return 0; error: + release_sock_fd( s, fd ); _enable_event( SOCKET2HANDLE(s), 0, 0, clear_flags ); WSASetLastError( err ); return SOCKET_ERROR; @@ -3967,7 +3962,7 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSAB if ( (lpOverlapped || lpCompletionRoutine) && flags & FD_FLAG_OVERLAPPED ) { - wsa = WS2_make_async( s, fd, ws2m_read, iovec, dwBufferCount, + wsa = WS2_make_async( s, ws2m_read, iovec, dwBufferCount, lpFlags, lpFrom, lpFromlen, lpOverlapped, lpCompletionRoutine, &iosb ); @@ -3986,6 +3981,7 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSAB HeapFree( GetProcessHeap(), 0, wsa ); goto err_free; } + release_sock_fd( s, fd ); /* Try immediate completion */ if ( lpOverlapped )

1 0