April 2002 - Wine-Devel - list.winehq.org

[PATCH] async IO API, reworked
by Martin Wilck April 9, 2002

April 9, 2002

Hi, Here is a reworked version of the async API patch which I hope is now ready for being applied. Details see below. Regards, Martin PATCH: async-struct.diff Purpose: Modified API for asynchronous IO requests. - separate cleanly between async scheduling and file IO related issues, - make the API compatible with other types of async requests (e.g. for sockets), - remove exports of async IO related functions for DLL separation. ** This patch OBSOLETES these two patches I submitted: ** http://www.winehq.com/hypermail/wine-patches/2002/04/0020.html http://www.winehq.com/hypermail/wine-patches/2002/04/0034.html Note: the cancel_async server request that was in the previous patch (0020.html) was removed (unnecessary). Patch against: Wine CVS 2002/04/05 Test status: Compiles (no errors/warnings). Tested regular file async IO with ReadFile and ReadFileEx (ok). Added files: include : async.h (structs and inline functions for async requests) Modified files: server : protocol.def (add APC type APC_ASYNC_IO, remove func element of register_async request) async.h (remove func element in async struct) async.c (remove references to func element in async struct) thread.c (allow NULL function pointer for APC_ASYNC_IO requests) dlls/kernel : comm.c (use modified API) files : file.c (use modified API) include : file.h (move async stuff to async.h) scheduler : synchro.c (remove functions now inlined through async.h, call_apcs() calls check_async_list() for APC_ASYNC_IO APCs) diff -ruNX ignore CVS/wine/dlls/kernel/comm.c TMP/wine/dlls/kernel/comm.c --- CVS/wine/dlls/kernel/comm.c Wed Apr 3 19:32:56 2002 +++ TMP/wine/dlls/kernel/comm.c Fri Apr 5 11:19:40 2002 @@ -91,6 +91,53 @@ WINE_DEFAULT_DEBUG_CHANNEL(comm); +/*********************************************************************** + * Asynchronous I/O for asynchronous wait requests * + */ +#include "async.h" + +static DWORD commio_get_async_status (const async_private *ovp); +static DWORD commio_get_async_count (const async_private *ovp); +static void commio_set_async_status (async_private *ovp, const DWORD status); +static void CALLBACK commio_call_completion_func (ULONG_PTR data); + +static async_ops commio_async_ops = +{ + commio_get_async_status, /* get_status */ + commio_set_async_status, /* set_status */ + commio_get_async_count, /* get_count */ + commio_call_completion_func /* call_completion */ +}; + +typedef struct async_commio +{ + struct async_private async; + LPOVERLAPPED lpOverlapped; + char *buffer; +} async_commio; + +static DWORD commio_get_async_status (const struct async_private *ovp) +{ + return ((async_commio*) ovp)->lpOverlapped->Internal; +} + +static void commio_set_async_status (async_private *ovp, const DWORD status) +{ + ((async_commio*) ovp)->lpOverlapped->Internal = status; +} + +static DWORD commio_get_async_count (const struct async_private *ovp) +{ + return 0; +} + +static void CALLBACK commio_call_completion_func (ULONG_PTR data) +{ + HeapFree(GetProcessHeap(), 0, (void*) data); +} + +/***********************************************************************/ + #if !defined(TIOCINQ) && defined(FIONREAD) #define TIOCINQ FIONREAD #endif @@ -1558,12 +1605,13 @@ */ static void COMM_WaitCommEventService(async_private *ovp) { - LPOVERLAPPED lpOverlapped = ovp->lpOverlapped; + async_commio *commio = (async_commio*) ovp; + LPOVERLAPPED lpOverlapped = commio->lpOverlapped; TRACE("overlapped %p\n",lpOverlapped); /* FIXME: detect other events */ - *ovp->buffer = EV_RXCHAR; + *commio->buffer = EV_RXCHAR; lpOverlapped->Internal = STATUS_SUCCESS; } @@ -1579,8 +1627,8 @@ LPDWORD lpdwEvents, /* [out] event(s) that were detected */ LPOVERLAPPED lpOverlapped) /* [in/out] for Asynchronous waiting */ { - int fd,ret; - async_private *ovp; + int fd; + async_commio *ovp; if(!lpOverlapped) { @@ -1591,53 +1639,32 @@ if(NtResetEvent(lpOverlapped->hEvent,NULL)) return FALSE; - lpOverlapped->Internal = STATUS_PENDING; - lpOverlapped->InternalHigh = 0; - lpOverlapped->Offset = 0; - lpOverlapped->OffsetHigh = 0; - fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); if(fd<0) return FALSE; - ovp = (async_private *) HeapAlloc(GetProcessHeap(), 0, sizeof (async_private)); + ovp = (async_commio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_commio)); if(!ovp) { close(fd); return FALSE; } - ovp->event = lpOverlapped->hEvent; + + ovp->async.ops = &commio_async_ops; + ovp->async.handle = hFile; + ovp->async.fd = fd; + ovp->async.type = ASYNC_TYPE_WAIT; + ovp->async.func = COMM_WaitCommEventService; + ovp->async.event = lpOverlapped->hEvent; ovp->lpOverlapped = lpOverlapped; - ovp->func = COMM_WaitCommEventService; ovp->buffer = (char *)lpdwEvents; - ovp->fd = fd; - ovp->count = 0; /- ovp->completion_func = 0; - ovp->type = ASYNC_TYPE_WAIT; - ovp->handle = hFile; - - ovp->next = NtCurrentTeb()->pending_list; - ovp->prev = NULL; - if(ovp->next) - ovp->next->prev=ovp; - NtCurrentTeb()->pending_list = ovp; - - /* start an ASYNCHRONOUS WaitCommEvent */ - SERVER_START_REQ( register_async ) - { - req->handle = hFile; - req->overlapped = lpOverlapped; - req->type = ASYNC_TYPE_WAIT; - req->count = 0; - req->func = check_async_list; - req->status = STATUS_PENDING; - ret=wine_server_call_err(req); - } - SERVER_END_REQ; + lpOverlapped->InternalHigh = 0; + lpOverlapped->Offset = 0; + lpOverlapped->OffsetHigh = 0; - if (!ret) - SetLastError(ERROR_IO_PENDING); + if ( !register_new_async (&ovp->async) ) + SetLastError( ERROR_IO_PENDING ); return FALSE; } diff -ruNX ignore CVS/wine/files/file.c TMP/wine/files/file.c --- CVS/wine/files/file.c Wed Apr 3 19:32:56 2002 +++ TMP/wine/files/file.c Fri Apr 5 12:15:58 2002 @@ -64,6 +64,65 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); +/*********************************************************************** + * Asynchronous file I/O * + */ +#include "async.h" + +static DWORD fileio_get_async_status (const async_private *ovp); +static DWORD fileio_get_async_count (const async_private *ovp); +static void fileio_set_async_status (async_private *ovp, const DWORD status); +static void CALLBACK fileio_call_completion_func (ULONG_PTR data); + +static async_ops fileio_async_ops = +{ + fileio_get_async_status, /* get_status */ + fileio_set_async_status, /* set_status */ + fileio_get_async_count, /* get_count */ + fileio_call_completion_func /* call_completion */ +}; + +typedef struct async_fileio +{ + struct async_private async; + LPOVERLAPPED lpOverlapped; + LPOVERLAPPED_COMPLETION_ROUTINE completion_func; + char *buffer; + int count; +} async_fileio; + +static DWORD fileio_get_async_status (const struct async_private *ovp) +{ + return ((async_fileio*) ovp)->lpOverlapped->Internal; +} + +static void fileio_set_async_status (async_private *ovp, const DWORD status) +{ + ((async_fileio*) ovp)->lpOverlapped->Internal = status; +} + +static DWORD fileio_get_async_count (const struct async_private *ovp) +{ + async_fileio *fileio = (async_fileio*) ovp; + DWORD ret = fileio->count - fileio->lpOverlapped->InternalHigh; + return (ret < 0 ? 0 : ret); +} + +static void CALLBACK fileio_call_completion_func (ULONG_PTR data) +{ + async_fileio *ovp = (async_fileio*) data; + TRACE ("data: %p\n", ovp); + + if (ovp->completion_func) + ovp->completion_func(ovp->lpOverlapped->Internal, + ovp->lpOverlapped->InternalHigh, + ovp->lpOverlapped); + + HeapFree(GetProcessHeap(), 0, ovp); +} + +/***********************************************************************/ + #if defined(MAP_ANONYMOUS) && !defined(MAP_ANON) #define MAP_ANON MAP_ANONYMOUS #endif @@ -1344,30 +1403,6 @@ return (r==WAIT_OBJECT_0); } - -/*********************************************************************** - * FILE_StartAsync (INTERNAL) - * - * type==ASYNC_TYPE_NONE means cancel the indicated overlapped operation - * lpOverlapped==NULL means all overlappeds match - */ -BOOL FILE_StartAsync(HANDLE hFile, LPOVERLAPPED lpOverlapped, DWORD type, DWORD count, DWORD status) -{ - BOOL ret; w- SERVER_START_REQ(register_async) - { - req->handle = hFile; - req->overlapped = lpOverlapped; - req->type = type; - req->count = count; - req->func = check_async_list; - req->status = status; - ret = wine_server_call( req ); - } - SERVER_END_REQ; - return !ret; -} - /*********************************************************************** * CancelIo (KERNEL32.@) */ @@ -1377,16 +1412,11 @@ TRACE("handle = %x\n",handle); - ovp = NtCurrentTeb()->pending_list; - while(ovp) + for (ovp = NtCurrentTeb()->pending_list; ovp; ovp = t) { t = ovp->next; - if(FILE_StartAsync(handle, ovp->lpOverlapped, ovp->type, 0, STATUS_CANCELLED)) - { - TRACE("overlapped = %p\n",ovp->lpOverlapped); - finish_async(ovp, STATUS_CANCELLED); - } - ovp = t; + if ( ovp->handle == handle ) + cancel_async ( ovp ); } WaitForMultipleObjectsEx(0,NULL,FALSE,1,TRUE); return TRUE; @@ -1400,18 +1430,19 @@ */ static void FILE_AsyncReadService(async_private *ovp) { - LPOVERLAPPED lpOverlapped = ovp->lpOverlapped; + async_fileio *fileio = (async_fileio*) ovp; + LPOVERLAPPED lpOverlapped = fileio->lpOverlapped; int result, r; int already = lpOverlapped->InternalHigh; - TRACE("%p %p\n", lpOverlapped, ovp->buffer ); + TRACE("%p %p\n", lpOverlapped, fileio->buffer ); /* check to see if the data is ready (non-blocking) */ - result = pread (ovp->fd, &ovp->buffer[already], ovp->count - already, + result = pread (ovp->fd, &fileio->buffer[already], fileio->count - already, OVERLAPPED_OFFSET (lpOverlapped) + already); if ((result < 0) && (errno == ESPIPE)) - result = read (ovp->fd, &ovp->buffer[already], ovp->count - already); + result = read (ovp->fd, &fileio->buffer[already], fileio->count - already); if ( (result<0) && ((errno == EAGAIN) || (errno == EINTR))) { @@ -1429,9 +1460,9 @@ } lpOverlapped->InternalHigh += result; - TRACE("read %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,ovp->count); + TRACE("read %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,fileio->count); - if(lpOverlapped->InternalHigh < ovp->count) + if(lpOverlapped->InternalHigh < fileio->count) r = STATUS_PENDING; else r = STATUS_SUCCESS; @@ -1448,7 +1479,7 @@ LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, HANDLE hEvent) { - async_private *ovp; + async_fileio *ovp; int fd; TRACE("file %d to buf %p num %ld %p func %p\n", @@ -1468,7 +1499,7 @@ return FALSE; } - ovp = (async_private *) HeapAlloc(GetProcessHeap(), 0, sizeof (async_private)); + ovp = (async_fileio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_fileio)); if(!ovp) { TRACE("HeapAlloc Failed\n"); @@ -1476,31 +1507,19 @@ close(fd); return FALSE; } - ovp->event = hEvent; + + ovp->async.ops = &fileio_async_ops; + ovp->async.handle = hFile; + ovp->async.fd = fd; + ovp->async.type = ASYNC_TYPE_READ; + ovp->async.func = FILE_AsyncReadService; + ovp->async.event = hEvent; ovp->lpOverlapped = overlapped; ovp->count = bytesToRead; ovp->completion_func = lpCompletionRoutine; - ovp->func = FILE_AsyncReadService; ovp->buffer = buffer; - ovp->fd = fd; - ovp->type = ASYNC_TYPE_READ; - ovp->handle = hFile; - - /* hook this overlap into the pending async operation list */ - ovp->next = NtCurrentTeb()->pending_list; - ovp->prev = NULL; - if(ovp->next) - ovp->next->prev = ovp; - NtCurrentTeb()->pending_list = ovp; - if ( !FILE_StartAsync(hFile, overlapped, ASYNC_TYPE_READ, bytesToRead, STATUS_PENDING) ) - { - /* FIXME: remove async_private and release memory */ - ERR("FILE_StartAsync failed\n"); - return FALSE; - } - - return TRUE; + return !register_new_async (&ovp->async); } /*********************************************************************** @@ -1510,7 +1529,6 @@ LPOVERLAPPED overlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = 0; return FILE_ReadFileEx(hFile,buffer,bytesToRead,overlapped,lpCompletionRoutine, INVALID_HANDLE_VALUE); } @@ -1588,7 +1606,6 @@ } /* at last resort, do an overlapped read */ - overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = result; if(!FILE_ReadFileEx(hFile, buffer, bytesToRead, overlapped, NULL, overlapped->hEvent)) @@ -1646,18 +1663,19 @@ */ static void FILE_AsyncWriteService(struct async_private *ovp) { - LPOVERLAPPED lpOverlapped = ovp->lpOverlapped; + async_fileio *fileio = (async_fileio *) ovp; + LPOVERLAPPED lpOverlapped = fileio->lpOverlapped; int result, r; int already = lpOverlapped->InternalHigh; - TRACE("(%p %p)\n",lpOverlapped,ovp->buffer); + TRACE("(%p %p)\n",lpOverlapped,fileio->buffer); /* write some data (non-blocking) */ - result = pwrite(ovp->fd, &ovp->buffer[already], ovp->count - already, + result = pwrite(ovp->fd, &fileio->buffer[already], fileio->count - already, OVERLAPPED_OFFSET (lpOverlapped) + already); if ((result < 0) && (errno == ESPIPE)) - result = write(ovp->fd, &ovp->buffer[already], ovp->count - already); + result = write(ovp->fd, &fileio->buffer[already], fileio->count - already); if ( (result<0) && ((errno == EAGAIN) || (errno == EINTR))) { @@ -1674,9 +1692,9 @@ lpOverlapped->InternalHigh += result; - TRACE("wrote %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,ovp->count); + TRACE("wrote %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,fileio->count); - if(lpOverlapped->InternalHigh < ovp->count) + if(lpOverlapped->InternalHigh < fileio->count) r = STATUS_PENDING; else r = STATUS_SUCCESS; @@ -1693,7 +1711,8 @@ LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, HANDLE hEvent) { - async_private *ovp; + async_fileio *ovp; + int fd; TRACE("file %d to buf %p num %ld %p func %p stub\n", hFile, buffer, bytesToWrite, overlapped, lpCompletionRoutine); @@ -1704,46 +1723,34 @@ return FALSE; } - overlapped->Internal = STATUS_PENDING; - overlapped->InternalHigh = 0; - - if (!FILE_StartAsync(hFile, overlapped, ASYNC_TYPE_WRITE, bytesToWrite, STATUS_PENDING )) + fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); + if ( fd < 0 ) { - TRACE("FILE_StartAsync failed\n"); + TRACE( "Couldn't get FD\n" ); return FALSE; } - ovp = (async_private*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_private)); + ovp = (async_fileio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_fileio)); if(!ovp) { TRACE("HeapAlloc Failed\n"); SetLastError(ERROR_NOT_ENOUGH_MEMORY); + close (fd); return FALSE; } + + ovp->async.ops = &fileio_async_ops; + ovp->async.handle = hFile; + ovp->async.fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); + ovp->async.type = ASYNC_TYPE_WRITE; + ovp->async.func = FILE_AsyncWriteService; ovp->lpOverlapped = overlapped; - ovp->event = hEvent; - ovp->func = FILE_AsyncWriteService; + ovp->async.event = hEvent; ovp->buffer = (LPVOID) buffer; ovp->count = bytesToWrite; ovp->completion_func = lpCompletionRoutine; - ovp->fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); - ovp->type = ASYNC_TYPE_WRITE; - ovp->handle = hFile; - if(ovp->fd <0) - { - HeapFree(GetProcessHeap(), 0, ovp); - return FALSE; - } - - /* hook this overlap into the pending async operation list */ - ovp->next = NtCurrentTeb()->pending_list; - ovp->prev = NULL; - if(ovp->next) - ovp->next->prev = ovp; - NtCurrentTeb()->pending_list = ovp; - - return TRUE; + return !register_new_async (&ovp->async); } /*********************************************************************** @@ -1753,7 +1760,6 @@ LPOVERLAPPED overlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = 0; return FILE_WriteFileEx(hFile, buffer, bytesToWrite, overlapped, lpCompletionRoutine, INVALID_HANDLE_VALUE); diff -ruNX ignore CVS/wine/include/async.h TMP/wine/include/async.h --- CVS/wine/include/async.h Thu Jan 1 01:00:00 1970 +++ TMP/wine/include/async.h Fri Apr 5 12:24:13 2002 @@ -0,0 +1,124 @@ +/* + * Structures and static functions for handling asynchronous I/O. + * + * Copyright (C) 2002 Mike McCormack, Martin Wilck + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * This file declares static functions. + * It should only be included by those source files that implement async I/O requests. + */ + +#ifndef __WINE_ASYNC_H +#define __WINE_ASYNC_H + +struct async_private; + +typedef void (*async_handler)(struct async_private *ovp); +typedef void CALLBACK (*async_call_completion_func)(ULONG_PTR data); +typedef DWORD (*async_get_status)(const struct async_private *ovp); +typedef DWORD (*async_get_count)(const struct async_private *ovp); +typedef void (*async_set_status)(struct async_private *ovp, const DWORD status); + +typedef struct async_ops +{ + async_get_status get_status; + async_set_status set_status; + async_get_count get_count; + async_call_completion_func call_completion; +} async_ops; + +typedef struct async_private +{ + struct async_ops *ops; + HANDLE handle; + HANDLE event; + int fd; + async_handler func; + int type; + struct async_private *next; + struct async_private *prev; +} async_private; + +/* All functions declared static for Dll separation purposes */ + +inline static void finish_async( async_private *ovp ) +{ + if(ovp->prev) + ovp->prev->next = ovp->next; + else + NtCurrentTeb()->pending_list = ovp->next; + + if(ovp->next) + ovp->next->prev = ovp->prev; + + ovp->next = ovp->prev = NULL; + + close( ovp->fd ); + if( ovp->event != INVALID_HANDLE_VALUE ) + NtSetEvent( ovp->event, NULL ); + + QueueUserAPC( ovp->ops->call_completion, GetCurrentThread(), (ULONG_PTR)ovp ); +} + +inline static BOOL __register_async( async_private *ovp, const DWORD status ) +{ + BOOL ret; + + SERVER_START_REQ( register_async ) + { + req->handle = ovp->handle; + req->overlapped = ovp; + req->type = ovp->type; + req->count = ovp->ops->get_count( ovp ); + req->status = status; + ret = wine_server_call( req ); + } + SERVER_END_REQ; + + if ( ret ) ovp->ops->set_status ( ovp, GetLastError() ); + if ( ovp->ops->get_status (ovp) != STATUS_PENDING ) + finish_async (ovp); + + return ret; +} + +#define register_old_async(ovp) \ + __register_async (ovp, ovp->ops->get_status( ovp )); + +inline static BOOL register_new_async( async_private *ovp ) +{ + ovp->ops->set_status ( ovp, STATUS_PENDING ); + + ovp->next = NtCurrentTeb()->pending_list; + ovp->prev = NULL; + if ( ovp->next ) ovp->next->prev = ovp; + NtCurrentTeb()->pending_list = ovp; + + return __register_async( ovp, STATUS_PENDING ); +} + +inline static BOOL cancel_async ( async_private *ovp ) +{ + /* avoid multiple cancellations */ + if ( ovp->ops->get_status( ovp ) != STATUS_PENDING ) + return 0; + ovp->ops->set_status ( ovp, STATUS_CANCELLED ); + return __register_async ( ovp, STATUS_CANCELLED ); +} + +#endif /* __WINE_ASYNC_H */ diff -ruNX ignore CVS/wine/include/file.h TMP/wine/include/file.h --- CVS/wine/include/file.h Wed Apr 3 19:32:56 2002 +++ TMP/wine/include/file.h Fri Apr 5 11:19:40 2002 @@ -46,27 +46,6 @@ int flags; } DOS_DEVICE; -/* overlapped private structure */ -struct async_private; -typedef void (*async_handler)(struct async_private *ovp); -typedef struct async_private -{ - LPOVERLAPPED lpOverlapped; - HANDLE handle; - HANDLE event; - int fd; - char *buffer; - async_handler func; - int count; - int type; - LPOVERLAPPED_COMPLETION_ROUTINE completion_func; - struct async_private *next; - struct async_private *prev; -} async_private; - -extern void WINAPI check_async_list(LPOVERLAPPED ov, DWORD status); -extern void finish_async(struct async_private *ovp, DWORD status); - /* locale-independent case conversion */ inline static char FILE_tolower( char c ) { @@ -99,7 +78,6 @@ DWORD attributes, HANDLE template, BOOL fail_read_only, UINT drive_type ); extern HANDLE FILE_CreateDevice( int client_id, DWORD access, LPSECURITY_ATTRIBUTES sa ); -extern BOOL FILE_StartAsync(HANDLE handle, LPOVERLAPPED lpOverlapped, DWORD type, DWORD count, DWORD status); extern LONG WINAPI WIN16_hread(HFILE16,SEGPTR,LONG); diff -ruNX ignore CVS/wine/include/wine/server_protocol.h TMP/wine/include/wine/server_protocol.h --- CVS/wine/include/wine/server_protocol.h Tue Apr 2 15:39:35 2002 +++ TMP/wine/include/wine/server_protocol.h Fri Apr 5 12:21:25 2002 @@ -502,7 +502,7 @@ int type; /* VARARG(args,ptrs); */ }; -enum apc_type { APC_NONE, APC_USER, APC_TIMER, APC_ASYNC }; +enum apc_type { APC_NONE, APC_USER, APC_TIMER, APC_ASYNC, APC_ASYNC_IO }; @@ -2278,7 +2278,6 @@ { struct request_header __header; handle_t handle; - void* func; int type; void* overlapped; int count; @@ -3184,6 +3183,6 @@ struct get_window_properties_reply get_window_properties_reply; }; -#define SERVER_PROTOCOL_VERSION 77 +#define SERVER_PROTOCOL_VERSION 78 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff -ruNX ignore CVS/wine/scheduler/synchro.c TMP/wine/scheduler/synchro.c --- CVS/wine/scheduler/synchro.c Wed Apr 3 19:32:56 2002 +++ TMP/wine/scheduler/synchro.c Fri Apr 5 12:35:35 2002 @@ -30,6 +30,7 @@ #include "thread.h" #include "winerror.h" #include "wine/server.h" +#include "async.h" /*********************************************************************** @@ -50,74 +51,32 @@ } } -static void CALLBACK call_completion_routine(ULONG_PTR data) -{ - async_private* ovp = (async_private*)data; - - ovp->completion_func(ovp->lpOverlapped->Internal, - ovp->lpOverlapped->InternalHigh, - ovp->lpOverlapped); - ovp->completion_func=NULL; - HeapFree(GetProcessHeap(), 0, ovp); -} - -void finish_async(async_private *ovp, DWORD status) -{ - ovp->lpOverlapped->Internal=status; - - /* call ReadFileEx/WriteFileEx's overlapped completion function */ - if(ovp->completion_func) - { - QueueUserAPC(call_completion_routine,GetCurrentThread(),(ULONG_PTR)ovp); - } - - /* remove it from the active list */ - if(ovp->prev) - ovp->prev->next = ovp->next; - else - NtCurrentTeb()->pending_list = ovp->next; - - if(ovp->next) - ovp->next->prev = ovp->prev; - - ovp->next=NULL; - ovp->prev=NULL; - - close(ovp->fd); - if(ovp->event!=INVALID_HANDLE_VALUE) - NtSetEvent(ovp->event,NULL); - if(!ovp->completion_func) HeapFree(GetProcessHeap(), 0, ovp); -} - /*********************************************************************** * check_async_list * * Process a status event from the server. */ -void WINAPI check_async_list(LPOVERLAPPED overlapped, DWORD status) +static void WINAPI check_async_list(async_private *asp, DWORD status) { async_private *ovp; + DWORD ovp_status; - /* fprintf(stderr,"overlapped %p status %x\n",overlapped,status); */ + for( ovp = NtCurrentTeb()->pending_list; ovp && ovp != asp; ovp = ovp->next ); - for(ovp = NtCurrentTeb()->pending_list; ovp; ovp = ovp->next) - if(ovp->lpOverlapped == overlapped) - break; - - if(!ovp) + if(!ovp) return; - if(status != STATUS_ALERTED) - ovp->lpOverlapped->Internal = status; + if( status != STATUS_ALERTED ) + { + ovp_status = status; + ovp->ops->set_status (ovp, status); + } + else ovp_status = ovp->ops->get_status (ovp); - if(ovp->lpOverlapped->Internal==STATUS_PENDING) - { - ovp->func(ovp); - FILE_StartAsync(ovp->handle, ovp->lpOverlapped, ovp->type, 0, ovp->lpOverlapped->Internal); - } + if( ovp_status == STATUS_PENDING ) ovp->func( ovp ); - if(ovp->lpOverlapped->Internal!=STATUS_PENDING) - finish_async(ovp,ovp->lpOverlapped->Internal); + /* This will destroy all but PENDING requests */ + register_old_async( ovp ); } @@ -200,6 +159,9 @@ /* convert sec/usec to NT time */ DOSFS_UnixTimeToFileTime( (time_t)args[0], &ft, (DWORD)args[1] * 10 ); proc( args[2], ft.dwLowDateTime, ft.dwHighDateTime ); + break; + case APC_ASYNC_IO: + check_async_list ( args[0], (DWORD) args[1]); break; default: server_protocol_error( "get_apc_request: bad type %d\n", type ); diff -ruNX ignore CVS/wine/server/async.c TMP/wine/server/async.c --- CVS/wine/server/async.c Wed Apr 3 19:32:56 2002 +++ TMP/wine/server/async.c Fri Apr 5 12:22:32 2002 @@ -64,7 +64,7 @@ { /* fprintf(stderr,"notifying %p!\n",async->overlapped); */ async->status = status; - thread_queue_apc(async->thread, NULL, async->func, APC_ASYNC, 1, 2, async->overlapped, status); + thread_queue_apc(async->thread, NULL, NULL, APC_ASYNC_IO, 1, 2, async->overlapped, status); } void destroy_async_queue( struct async_queue *q ) @@ -116,7 +116,7 @@ destroy_async(async); } -struct async *create_async(struct object *obj, struct thread *thread, void *func, +struct async *create_async(struct object *obj, struct thread *thread, void *overlapped) { struct async *async = (struct async *) malloc(sizeof(struct async)); @@ -128,7 +128,6 @@ async->obj = obj; async->thread = thread; - async->func = func; async->overlapped = overlapped; async->next = NULL; async->prev = NULL; @@ -165,7 +164,7 @@ if(req->status==STATUS_PENDING) { if(!async) - async = create_async(obj, current, req->func, req->overlapped); + async = create_async(obj, current, req->overlapped); if(async) { diff -ruNX ignore CVS/wine/server/async.h TMP/wine/server/async.h --- CVS/wine/server/async.h Tue Apr 2 15:39:41 2002 +++ TMP/wine/server/async.h Fri Apr 5 11:19:45 2002 @@ -30,7 +30,6 @@ { struct object *obj; struct thread *thread; - void *func; void *overlapped; unsigned int status; struct timeval when; @@ -51,7 +50,7 @@ struct async *find_async(struct async_queue *q, struct thread *thread, void *overlapped); void async_insert(struct async_queue *q, struct async *async); struct async *create_async(struct object *obj, struct thread *thread, - void *func, void *overlapped); + void *overlapped); void async_add_timeout(struct async *async, int timeout); static inline void init_async_queue(struct async_queue *q) { diff -ruNX ignore CVS/wine/server/protocol.def TMP/wine/server/protocol.def --- CVS/wine/server/protocol.def Wed Apr 3 19:32:56 2002 +++ TMP/wine/server/protocol.def Fri Apr 5 12:17:37 2002 @@ -412,7 +412,7 @@ int type; /* function type */ VARARG(args,ptrs); /* function arguments */ @END -enum apc_type { APC_NONE, APC_USER, APC_TIMER, APC_ASYNC }; +enum apc_type { APC_NONE, APC_USER, APC_TIMER, APC_ASYNC, APC_ASYNC_IO }; /* Close a handle for the current process */ @@ -1615,10 +1615,9 @@ #define SERIALINFO_SET_ERROR 0x04 -/* Create/Destroy an async I/O */ +/* Create / reschedule an async I/O */ @REQ(register_async) handle_t handle; /* handle to comm port, socket or file */ - void* func; int type; void* overlapped; int count; diff -ruNX ignore CVS/wine/server/thread.c TMP/wine/server/thread.c --- CVS/wine/server/thread.c Tue Apr 2 15:39:42 2002 +++ TMP/wine/server/thread.c Fri Apr 5 11:19:45 2002 @@ -959,8 +959,9 @@ } /* Optimization: ignore APCs that have a NULL func; they are only used * to wake up a thread, but since we got here the thread woke up already. + * Exception: for APC_ASYNC_IO, func == NULL is legal. */ - if (apc->func) break; + if (apc->func || apc->type == APC_ASYNC_IO) break; free( apc ); } size = apc->nb_args * sizeof(apc->args[0]); diff -ruNX ignore CVS/wine/server/trace.c TMP/wine/server/trace.c --- CVS/wine/server/trace.c Wed Apr 3 19:32:56 2002 +++ TMP/wine/server/trace.c Fri Apr 5 12:21:25 2002 @@ -1846,7 +1846,6 @@ static void dump_register_async_request( const struct register_async_request *req ) { fprintf( stderr, " handle=%d,", req->handle ); - fprintf( stderr, " func=%p,", req->func ); fprintf( stderr, " type=%d,", req->type ); fprintf( stderr, " overlapped=%p,", req->overlapped ); fprintf( stderr, " count=%d,", req->count );

3 4

ChangeSet ID: 10178643640749867230924828 - oops.
by lawson_whitney＠juno.com April 8, 2002

April 8, 2002

Log message: Huw D M Davies <hdavies(a)codeweavers.com> The horizontal dialog base unit is calculated as the straight average of a-z,A-Z (tmAveCharWidth is supposed to be a weighted average according to character usage, so we shouldn't use this). Good day! I don't pay much attention to GUI, or care much about it, but I noticed this patch causes my app to display a progress bar (?) with the title folded down into the progress bar, so it looks kind of lame. % xx transferred: Without the patch, it looks more like: % transferred: xx I have no idea what this app looks like in Windows. I have never run it with Windows, and I have no intention to buy Windows just to see, but I think we might not want this bit of code to stay exactly as it is. I will gladly make any kind of traces you would like to see, or I can live with it. The app is in fact obsolete win9x, but it is the most recent version that can work a modem without requiring DUN or RAS or some dam' thing. Hmmm, I wonder if a more recent version has the same problem? Let me check... Regards, Lawson ---oof---

2 2

[PATCH] winemaker + DLL paths
by Martin Wilck April 8, 2002

April 8, 2002

I found that winemaker-generated configure scripts bail out with recent CVS versions of wine. The appended patch fixes this. It may be not exactly what the winemaker authors intended, but at least it generates working configure scripts for me. Martin -- Martin Wilck Phone: +49 5251 8 15113 Fujitsu Siemens Computers Fax: +49 5251 8 20409 Heinz-Nixdorf-Ring 1 mailto:Martin.Wilck(a)Fujitsu-Siemens.com D-33106 Paderborn http://www.fujitsu-siemens.com/primergy --- tools/winemaker.OLD Tue Apr 2 16:51:51 2002 +++ tools/winemaker Mon Apr 8 16:45:17 2002 @@ -2732,14 +2732,14 @@ WINE_DLL_ROOT="/lib:/lib/dlls:/usr/lib:/usr/lib/dlls:/usr/local/lib:/usr/local/lib/dlls" fi fi -AC_PATH_FILE(WINE_DLL_ROOT,[libntdll.so],[ - AC_MSG_ERROR([Could not find the Wine dlls (libntdll.so)]) +AC_PATH_FILE(WINE_DLL_ROOT,[libntdll.dll.so],[ + AC_MSG_ERROR([Could not find the Wine dlls (libntdll.dll.so)]) ],[$WINE_DLL_ROOT]) -AC_PATH_LIBRARY(WINE_DLL_ROOT,[-lntdll],[$WINE_LIBRARY_PATH -lwine -lwine_unicode],[ - AC_MSG_ERROR([Could not link with the Wine dlls (libntdll.so)]) +AC_PATH_LIBRARY(WINE_DLL_ROOT,[-lntdll.dll],[$WINE_LIBRARY_PATH -lwine -lwine_unicode],[ + AC_MSG_ERROR([Could not link with the Wine dlls (libntdll.dll.so)]) ],[$WINE_DLL_ROOT]) -WINE_DLL_PATH="-L$WINE_DLL_ROOT" +WINE_DLL_PATH="-L$WINE_DLL_ROOT/wine" if test -n "$LD_PATH" then

1 0

Running tests on windows
by Geoffrey Hausheer April 8, 2002

April 8, 2002

Last week I submitted a perl script that makes a Makefile (and archive bundle) for building tests on Windows boxes under cygwin. Well, it works fine with mingw too (when using msys at least), but there is a snag. In order to compile tests under Windows, I seem to need to include windows.h before any other .h files. I did this using the '-include' directive in gcc, but it requires knowledge of the absolute path to the windows.h file. This means I need to specify the path in the Makefile, which is completely non-portable (especialy with mingw which doesn't really have a default setup like cygwin does). 1) So it seems I have three options. I can append '#include <windows.h>' to each .c file (either wrapped in #define, or through the perl script) 2) I can include the entire wine /include directory in the archive, and use that 'windows.h' to build against. 3) I can just force the user to edit the Makefile to point to the correct include directory. I don't really like any of these options (though 3 is the the easiest to implement, as this is how it works now) So is there a better solution than the three I've listed? And why won't wine let me include 'windows.h', but under windows it is required? Thanks, .Geoff

5 6

posting wineconf info to slashdot?
by Michael Cardenas April 8, 2002

April 8, 2002

Now that we have the video feeds, some of the presentations, and some pictures, does anyone think we should post links to slashdot so everyone who couldn't attend can see what went on?

3 3

mIRC fails to start (Wine CVS 20020407)
by mdew April 8, 2002

April 8, 2002

heres a debug report.... [01:40pm 08-Apr-02]$ /usr/bin/wine --winver=nt2k -debugmsg +relay ./mirc32.exe 0806fcf8:Call kernel32.__wine_register_dll_16(40615c7c) ret=406131b4 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=40615c7c ret=406131b4 0806fcf8:Call kernel32.__wine_register_dll_16(4033c854) ret=40337460 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=4033c854 ret=40337460 Warning: loading builtin kernel32.dll, but native version already present. Expect trouble. 0806fcf8:Call kernel32.__wine_register_dll_16(4063a648) ret=4062e8a0 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=4063a648 ret=4062e8a0 0806fcf8:Call kernel32.__wine_register_dll_16(409edc20) ret=409b40ec 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409edc20 ret=409b40ec 0806fcf8:Call kernel32.__wine_register_dll_16(409edf28) ret=409b439c 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409edf28 ret=409b439c 0806fcf8:Call kernel32.__wine_register_dll_16(409ee0e0) ret=409b4504 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409ee0e0 ret=409b4504 0806fcf8:Call kernel32.__wine_register_dll_16(409ee1f0) ret=409b45bc 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409ee1f0 ret=409b45bc 0806fcf8:Call kernel32.__wine_register_dll_16(409ee3d4) ret=409b4724 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409ee3d4 ret=409b4724 0806fcf8:Call kernel32.__wine_register_dll_16(409eebe4) ret=409b4ee8 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409eebe4 ret=409b4ee8 0806fcf8:Call kernel32.__wine_register_dll_16(409f1214) ret=409b6918 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409f1214 ret=409b6918 0806fcf8:Call kernel32.__wine_register_dll_16(409949d0) ret=4094e774 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409949d0 ret=4094e774 0806fcf8:Call kernel32.__wine_register_dll_16(4092d46c) ret=408df1f8 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=4092d46c ret=408df1f8 0806fcf8:Call kernel32.__wine_register_dll_16(40ab6ec8) ret=40a72a6c 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=40ab6ec8 ret=40a72a6c 0806fcf8:Call kernel32.__wine_register_dll_16(40ab7290) ret=40a72c7c 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=40ab7290 ret=40a72c7c 0806fcf8:Call kernel32.__wine_register_dll_16(40b00ba0) ret=40ad409c 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=40b00ba0 ret=40ad409c 0806fcf8:Call kernel32.__wine_register_dll_16(40b00e54) ret=40ad42ec 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=40b00e54 ret=40ad42ec 0806fcf8:Call PE DLL (proc=0x405d01ec,module=405c0000,type=1,res=0x1) 0806fcf8:Call PE DLL (proc=0x4080f1ec,module=407ff000,type=1,res=(nil)) 0806fcf8:Ret PE DLL (proc=0x4080f1ec,module=407ff000,type=1,res=(nil)) retval=1 0806fcf8:Ret PE DLL (proc=0x405d01ec,module=405c0000,type=1,res=0x1) retval=1 0806fcf8:Call PE DLL (proc=0x4078dd30,module=40780000,type=1,res=0x1) 0806fcf8:Ret PE DLL (proc=0x4078dd30,module=40780000,type=1,res=0x1) retval=1 0806fcf8:Call PE DLL (proc=0x40684eb8,module=40667000,type=1,res=0x1) Warning: loading builtin user32.dll, but native version already present. Expect trouble. 0806fcf8:Call PE DLL (proc=0x40c0aea8,module=40bed000,type=1,res=(nil)) 0806fcf8:Call x11drv.CreateDC(40362fc0,40566930 "DISPLAY",00000000,00000000,00000000) ret=4079fa81 wine: Unhandled exception, starting debugger... err:seh:start_debugger Couldn't start debugger ((null)) (127) Read the Wine Developers Guide on how to set up winedbg or another debugger Wine failed with return code 5 aswell as my previous report on Usenet.. http://groups.google.co.nz/groups?q=mirc+group:comp.emulators.ms-windows.wi…

1 1

winver
by Rizsanyi Zsolt April 8, 2002

April 8, 2002

Hi! I have tried to run my program with --winver nt40. And it was ok But when I started the program by the means of setup.exe (its the autorun program on a cd which detects if the program is already installed, and automatically starts it), then the program was not running like it had got the winver argument. It was looking for VxD only used in win9x mode (the output is same as if I run it without --winver). Interestingly I have also noticed that when I start the program through setup.exe it is not managed, although I have managed mode set in ~/.wine/config I think that the processes created by other executables get the hardcoded options, and not from the configuration. Also winver option in the config file would be useful. Best regards Zsolt Rizsanyi

1 0

How to debug an exception handler ?
by Laurent Pinchart April 7, 2002

April 7, 2002

Hi everybody, I have a windows program which raises an exception as part of its normal execution (it tries to call int 0x01). The program setups an exception handler, catches the exception, and resumes it execution after the call to int 0x01. This works fine when run in wine. However, when I try to run the program in winedbg, the debugger catches the exeception, interrupts the program execution, prints a register dump, stack dump & backtrace, and waits. If I continue the execution using 'cont' (after incrementing $eip by 2 to skip int 0x01), the program continues but the exception handler installed bu the user program is not called. I was wondering if it was a bug or a normal behaviour, and if it is normal behaviour, is there a workaround ? Thanks in advance for your help. Laurent Pinchart

4 6

MAC WINE Project?
by Lonnie Cumberland April 7, 2002

April 7, 2002

Hello All, Could someone please tell me if there is a MAC WINE type project that would use native libraries to run MAC applications on Linux without having to install the MAC OS? I was just courious if one existed, thanks, Lonnie -- Lonnie Cumberland OutStep Technologies Incorporated EMAIL: Lonnie(a)OutStep.com : Lonnie_Cumberland(a)yahoo.com The Basis Express Virtual Office & Data Backup and Recovery Services URL: http://www.basis-express.com "The Virtual Office without boundaries!!!"

3 2

Re: ChangeSet ID: 10178643640749867230924828 - oops.
by lawson_whitney＠juno.com April 7, 2002

April 7, 2002

On Sat, 6 Apr 2002 whit(a)giftie.alien.org wrote: > Hmmm, I wonder if a more recent version has the same > problem? Let me check... As it happens, Juno version 4 puts the title under the progress bar, Transferred xx% and the patch doesn't cause it to fold. Maybe it isn't important, but if you would like to debug Juno version 2 I will be glad to help. Regards, Lawson | We apologize if this message has reached you in error. | Save the Planet, Save the Trees! Advertise via E mail.

1 0

Windows NT, int 0x01 & EXCEPTION_ACCESS_VIOLATION
by Laurent Pinchart April 6, 2002

April 6, 2002

Hi everybody, It seems that calling int 0x01 on windows NT should raise an EXCEPTION_ACCESS_VIOLATION instead of EXCEPTION_PRIV_INSTRUCTION. Could anyone confirm ? (I don't know how to test it. Calling the interruption is trivial, but how does a user program test the exception type ?) Laurent Pinchart

1 0

Re: wine/objects text.c
by Dimitrie O. Paun April 6, 2002

April 6, 2002

On April 5, 2002 07:37 pm, Alexandre Julliard wrote: > Log message: > Huw D M Davies <hdavies(a)codeweavers.com> > Spout a FIXME if we try to call ExtTextOut on an open path. FIXME what? Is there some unimplemented functionality, or is it just illegal to call ExtTextOut on an open path? -- Dimi.

3 3

[PATCH] HOMAM III fix
by Martin Lexa April 6, 2002

April 6, 2002

Hello! Function CreateFileA get this file path (just for example): C:\\Program Files\\3DO\\Heroes3\\DATAh3bitmap.lod As you can see the correct path should be: C:\\Program Files\\3DO\\Heroes3\\DATA\\h3bitmap.lod This lead to error message "Can't initialize resources.Possible disk problem." I see the problem in the function DOSFS_DoGetFullPathName(), which in the end removes the ending backslash from the path. The attached patch fixes it. Bye, Martin

7 11

Newbie developer looking for pointers (re printing)
by Carl Sopchak April 5, 2002

April 5, 2002

I've decided to try to fix a problem myself that I'm having printing from QuickBooks (partial page checks need to be landscape). I've downloaded the source, updated it via CVS, and now I'm trying to figure out where the problem is. I know where the problem is at the moment: ME! :-) That is, I could use some pointers on where to look... I have no knowledge of the Win API, and I can't say that I'm a strong C programmer (although I've played with it for a while a few years ago). However, being a consultant for over 15 years, I've jumped into more difficult situations and got results in a reasonable period of time. With a few helpful pointers, I don't think this should be any different. :-) I've looked around MSDN for a while, searching for printing API info with no luck (perhaps it's a lack of patients, perhaps its a poor search enging on top of a huge mass of information). I've looked at the Wine source, have successfully watched my program trace through wineps.c (et al), and even made a slight mod to it to make sure that I would know that I was running modified code (which worked). I've also looked around winehq and codeweavers, in the wine developer's sections... Here's where my head's at: It seems to me that I'm "too low" looking at wineps.c, but I can't figure out where else to look. Using the cross reference on winehq, and looking at the "where used" for wineps.c, the trail "goes cold" after a level or two (still "too low"). I know the app is making the proper calls to the Win Printing API to set landscape mode when needed since the program works fine on an NT box. I just don't know WHAT gets called to do this! If I started there, I could trace down to whatever levels I need to to figure out what is currently going on, so I can figure out what needs to be changed... So here are my questions: - What APIs are called by programs to talk to the printing subsystem? Is there a MS URL that gives an overview of this API? - What --debugmsg options can I use to trace programs through these API calls? (+psdrv works for the routines in wineps/*.c; +gdi [am I on the right track?] seems to give a whole bunch of traces, none of which [well, maybe a few] seem relavent.) - What calls the PSDRV_ functions? What's the --debugmsg option for it? - Is anyone willing to Mentor me?? (VERY big grin; flash the long eyelashes; etc.) I'd love to get this to work, and I'd be more than happy to supply the patch once it is working. I'm also be willing to continue working on the printing in wine, and perhaps fix other bugs that I run across. But in order for this to become reality, I sure could use some help up the learning curve!! Humble thanks, Carl

1 0

Re: Removed sorting of registry key values
by Eric Pouech April 5, 2002

April 5, 2002

Andriy Palamarchuk a écrit : > > Working on regedit replacement I noticed that Windows > regedit does not sort registry key values, while Wine > does. > I tested this on NT 4.0, SP2. You can check this by > importing a registry file with not alphabetic values > order and exporting it again. I fail to see the benefits of the patch: - key are sorted to allow O(log(n)) searching (registry is loaded only once, and then searched lots of time) so using enhanced searching techniques (<< O(n)) is really needed - saying that NT doesn't export the keys in an alphabetical order doesn't mean the keys are not sorted. So far, you can only tell that they are not sorted, in the export mechanism, by an alphabetical order. They could be sorted, for example, by a hash code value (look at misc/registry.c for some more details on registry internals) A+

5 5

Re: SetCooperativeLevel
by Tels April 5, 2002

April 5, 2002

-----BEGIN PGP SIGNED MESSAGE----- Moin, On 05-Apr-02 Jason Phillips carved into stone: > > > Well first are you confusing Transmeta with Transgaming? Transmeta is the Yes. Sorry, s/transmeta/transgaming/g; And transgaming has their own mailing list, and their own CVS, which I already synced and build (I don't know if it contains all source code parts, though, but I suppose yes - AFAIU transgaming gives you anything, you just redistribute it commercially - or something along these lines) [snip the rest] Cheers, Tels - -- "Why do you go so slowly? Do you think this is some kind of game?" PGP key available on http://bloodgate.com/tels.asc or via email. perl -MDev::Bollocks -e'print Dev::Bollocks->rand(),"\n"' greatly extend B2B architectures -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (GNU/Linux) Comment: When cryptography is outlawed, bayl bhgynjf jvyy unir cevinpl. iQEVAwUBPK2/IXcLPEOTuEwVAQGsgQf+I97ziYy4ZbYODW7dkSNjXPp0nAg/jKlj q4rCBhcvV1adFbNZ7JBGZJrkHVKZjiLLq99kK244iE+SQXKBG6kr9zIWbd9iCYSB gXwdqc4lf8mmVKiZz+EEtV5hCT1Dyst+hY9fxAYBYso1ZjXD/wz59Ds8YE9oLEOe y5sHzbzzXFsyLfRb7EWDwgXLB3TTRx0LPsHKLrzyn4k+7NMTimx8F2zFY5bhWqOW huvcDZ0vF3ldh1XuGl13t/fN8kqRpQfdHe/8RgXEXM1g/j9490zPVpFFZ67LY8ZE RkxVd6IWOFaVlGDmuCz04hPoeBQqg51hzTSga0aNw6R/GDFI9tdMnQ== =F3SZ -----END PGP SIGNATURE-----

1 0

Crossover/WINE Test In Large Rollout
by Dave Richards April 5, 2002

April 5, 2002

All- I am not on this list, so if you would like to respond to me you will have to reply to me directly. This is a real world situation where WINE could be used for a massive sever rollout (hundreds of users) and is having some problems in our environment. The City of Largo, Florida is a large Linux and thin client shop that has deployed a PC-less network for running out software. We are currently doing some R&D into options for running Lotus Notes in our environment. Our first choice obviously would be a native client running on Linux---it doesn't exist. We haven't looked at WINE in about 2 years and today the kind folks at CodeWeavers allowed us to test their new release with the Lotus Client. Here are the problems--> 1) Endian Bug. WINE is not able to detect that the runtime Endian order might be different than the server. Our Xterminals are RISC based and obviously WINE is running on Intel. All of the colors display incorrectly because of this. 2) Performance. On remote displays WINE is *much* slower than it is on the console. The Lotus Notes client took over 5 minutes to run remotely whereas on the console it comes up in about 20 seconds. I am assuming that it is making use of some of the XFree extensions for performance and that perhaps they have to timeout and drop through code in order to run on our Xservers. Once it is running, performance is much better, but the initial startup make it undeployable. We are thankful for everyone that has gotten WINE this far and that it works as well as it does considering the complexity of this task. If these areas are ever addressed, we would be happy to explore the product again! Dave Richards City of Largo, FL Systems Administrator

2 1

Re: [PATCH] async IO APCs call check_async_list() directly
by Mike McCormack April 5, 2002

April 5, 2002

Hi Martin, I think this is a better way to do things, but it might be better to submit this patch against the current CVS rather than against CVS+previous patch. Mike Original message from: Martin Wilck <Martin.Wilck(a)fujitsu-siemens.com> > > >PATCH: async-func.diff > >This is an improvement over my previous patch (async-struct.diff) >in that it does not need the static function check_async_lists >in several source files anymore and still achieves DLL separation. > >The idea is that all async I/O requests use check_async_list as callback function >anyway, so that there is no need to pass a function pointer. >I discussed the idea with Mike, and he seemed to like it. > >Patch against: Wine CVS 2002/04/04, with my async-struct patch applied. >Test status: Compiles warnings. > Tested regular file async IO (ok). > Serial port async IO: a test would be desirable. > ------------------------------------------ mailto:Mike_McCormack(a)start.com.au ph +82 16 430 0425 __________________________________________________________________ Get your free Australian email account at http://www.Looksmart.com.au

2 1

ReadFile and WriteFile in overlapped mode
by Jacques Gelinas April 5, 2002

April 5, 2002

I have been looking at those two functions and some specs. My understanding is that those function do not work at all in overlapped (async mode). Currently (latest stuff in CVS), both function handle overlap mode like this a) Give it a try in synchronous mode using a combination of pread/read and pwrite/write. b) If not enough bytes were read or written, a request is sent to wineserver to perform and asynchronous operation. This request always fail. (don't know why yet). There is two problem here. If step a succeed, no event will ever be generated since step be is not performed. Application doing the following sequence ReadFile .. WaitOnSingleObject will wait forever. Some borland Builder classes do this My understanding is that step a should never be done and only step b. Is that correct ? Now, why step b is failing is another story. Comments ? --------------------------------------------------------- Jacques Gelinas <jack(a)solucorp.qc.ca> vserver: run general purpose virtual servers on one box, full speed! http://www.solucorp.qc.ca/miscprj/s_context.hc

3 3

DeviceIoControl
by Laurent Pinchart April 5, 2002

April 5, 2002

Hi everybody, I need to add support for a currently unsupported VxD, and I'm quite puzzled by the way that DeviceIoControl currently processes the device control requests. DeviceIoControl starts by checking the high word of dwIoControlCode, which is the device type. If the device type is 0, it gets a client ID by sending a get_file_info request to the server, and uses the client ID as the device type. It then looks in the VxD table for a handler for the device type, and calls it if it exists. No problem with that. If the high word of dwIoControlCode is not 0, it checks if the device is a CDROM (by calling GetDriveTypeA). If so, it calls CDROM_DeviceIoControl, and if not is just fails. I was wondering why the same VxD table as for (HIWORD(dwIoControlCode) == 0) wasn't used when the device type in dwIoControlCode is not 0. It seems to be a mistake to me. I was thinking about implementing the following algorithm: - check HIWORD(dwIoControlCode) - if 0, deviceType = GetCliendID( Device ) - if ! 0, deviceType = HIWORD(dwIoControlCode) - look for a VxD handler in the VxD table using the deviceType. - call the handler if it exists, fails otherwise This leaves out the special case for CDROM_DeviceIoControl. Could anyone explain to me why that special check is needed, if it is ? Thanks in advance. Laurent Pinchart

2 5

Review - Winnt.h warning patch for mingw32
by Steven Edwards April 5, 2002

April 5, 2002

This shuts up some compiler warnings on mingw but I don't know if my syntax is right. I know the rules about ifdef and ifndef but you guys said there was exceptions for the compilers so I figured I would check. Like I said I am still learning here so if this isnt right please flame away. Mingw32 currently lacks a good ./configure system as Msys wont see dlltool/wrap so I don't really have another option other then using my own makefiles for now. There is only about 4 or 5 other places I have found where mingw differs from normal GCC. Changelog: Fixes mingw32 warning about stdcall and fastcall being redefined. cvs diff winnt.h Index: winnt.h =================================================================== RCS file: /home/wine/wine/include/winnt.h,v retrieving revision 1.104 diff -u -r1.104 winnt.h --- winnt.h 2 Apr 2002 19:37:15 -0000 1.104 +++ winnt.h 4 Apr 2002 08:15:55 -0000 @@ -80,9 +80,11 @@ #ifndef __WINE__ #define pascal __stdcall #define _pascal __stdcall +#if ! defined(__WINE__) && !defined(__MINGW__) #define _stdcall __stdcall #define _fastcall __stdcall #define __fastcall __stdcall +#endif #define __export __stdcall #define cdecl __cdecl #define _cdecl __cdecl _________________________________________________________ Do You Yahoo!? Get your free @yahoo.com address at http://mail.yahoo.com

3 3

SetCooperativeLevel
by Tels April 5, 2002

April 5, 2002

-----BEGIN PGP SIGNED MESSAGE----- Moin, [crosspost to both wine lists] I am preparing a patch for DirectDraw::SetCooperativeLevel and friends: Some questions from a newbie, so please bear with me: ddraw/user.c has comments like these: /* GetDisplayMode: generic */ /* GetFourCCCodes: generic */ /* GetGDISurface: ??? */ /* GetMonitorFrequency: generic */ /* GetScanLine: generic */ /* GetSurfaceFromDC: generic */ /* GetVerticalBlankStatus: generic */ /* Initialize: generic */ /* RestoreAllSurfaces: generic */ /* RestoreDisplayMode: generic */ /* SetCooperativeLevel: ??? */ * What does the "generic" stand for? Return value? Function class? * It seems that SetCooperativeLevel associates a "value" (or more than one) with the givenwindow handle and TestCooperativeLevel let's you later check this status. Where would I store such a "global" value? * If I understand it correctly, the directx stuff is done by transgaming. Their licence differs from the "normal" wine. (I am really unsure how all these things play together even after readin codeweavers.com, winehq.com and transgaming.com) So, if I send in a patch for that, should I send it to wine-devel-patches? wine-devel? winex-devel? Under what license would it fall? Or does that not matter? I have no idea what hidden snatches are in the transmeta licence, so I would like to use the LGPL. ;) Is there a problem with that for the transmeta guys or for you wine guys? Or would it fall automatically under the transmeta licence, since I am patching their source anyway? (You can tell I am confused ;) * Also, since I am a bit CVS challanged (newbie, I told you ;), is it okay to add my files directly in the CVS source tree with vi(m) and then send you a diff -u patch? Or do I need some CVS magic to do locally? Or just keep the file outside the CVS and then send a patch? Thanx in advance, Te"Wine, I am coooominng!"ls - -- "Why do you go so slowly? Do you think this is some kind of game?" PGP key available on http://bloodgate.com/tels.asc or via email. perl -MDev::Bollocks -e'print Dev::Bollocks->rand(),"\n"' conveniently consolidate out-of-the-box ROI -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (GNU/Linux) Comment: When cryptography is outlawed, bayl bhgynjf jvyy unir cevinpl. iQEVAwUBPKyTS3cLPEOTuEwVAQElUgf/Sjq2aXSUmuXz7W1FDBaAZQvNjEHovAB0 uZty72+LFRToxiGGvwU85X02Ug7Yc3zdT4R1cqtpGjjuGsXnBoE2h33Nz9rtDPhq wvZEIdxqv+MU3yVXWo5yRjSZZKpsDP78hiHoIZ+pCwtapqsZWdAOMIPwgVwNFwNv gJaG2OEtk9arlDNcN0uibzbq0lONh08BbqT+i1DvYYDRHJw6pNnUNKslV6b4sZdG bGjH0td8coj2vSM0RdRHaTYdjlY9BpJclqJI/7YGtS9cn3HCrWgAhCHwXLoLOL76 GcSfx/35eFrvmZM8LuJlXpK+abo2J4/+24CpuDEwwaI6Tqyuu+PS6A== =8o1v -----END PGP SIGNATURE-----

3 3

cool font viewer... might make good test case
by Dan Kegel April 5, 2002

April 5, 2002

FYI... My wife is a Windows user who loves fonts. She never found good free font viewing utilities until today; now she's raving about 'font xplorer lite'. Since it's a free download, it might make a good testcase for Wine's font support. It's at http://www.moonsoftware.com/freeware.asp but I haven't tried it yet. - Dan

1 0

Re: ReadFile and WriteFile in overlapped mode
by Mike McCormack April 4, 2002

April 4, 2002

Hi, > I have been looking at those two functions and some specs. > My understanding is that those function do not work at all I haven't tested the current CVS lately, but i can assure you that ReadFile and WriteFile did work at some fairly recent time :-) You may be correct that they do not work in *exactly* the right way, but for most cases they do work. > ever be generated since step be is not performed. Application > doing the following sequence > ReadFile > .. > WaitOnSingleObject > > will wait forever. Some borland Builder classes do this No, it won't because asynchronous reads can be processed during on-alertable waits. The application must call WaitForSingleObject eventually to see f the overlapped operation has finished. > My understanding is that step a should never be done and only > step b. Is that correct ? We need to check if data is pending before returning RROR_IO_PENDING because some applications do this: WaitCommEvent(hComm,&ev,&ov); WaitForSingleObject(ov.hEvent); ClearCommError(hComm,NULL,&cs) len = cs.cbInQue; if(!ReadFile(hComm,buf,len,&count,&ov)) FATAL() You're right that the way wine currently handles this is not erfect, but it will only fail if multiple overlapped operations re done at the same time. Martin Wilck is currently fixing this. > Now, why step b is failing is another story. > > Comments ? It's not perfect, and you're welcome to fix it if you want. Mike ------------------------------------------ mailto:Mike_McCormack(a)start.com.au ph +82 16 430 0425 __________________________________________________________________ Get your free Australian email account at http://www.Looksmart.com.au

1 0

Re: [PATCH] async IO APCs call check_async_list() directly
by Mike McCormack April 4, 2002

April 4, 2002

Hi Martin, I think this is a better way to do things, but it might be better to submit this patch against the current CVS rather than against CVS+previous patch. Mike Original message from: Martin Wilck <Martin.Wilck(a)fujitsu-siemens.com> > > >PATCH: async-func.diff > >This is an improvement over my previous patch (async-struct.diff) >in that it does not need the static function check_async_lists >in several source files anymore and still achieves DLL separation. > >The idea is that all async I/O requests use check_async_list as callback function >anyway, so that there is no need to pass a function pointer. >I discussed the idea with Mike, and he seemed to like it. > >Patch against: Wine CVS 2002/04/04, with my async-struct patch applied. >Test status: Compiles warnings. > Tested regular file async IO (ok). > Serial port async IO: a test would be desirable. > ------------------------------------------ mailto:Mike_McCormack(a)start.com.au ph +82 16 430 0425 __________________________________________________________________ Get your free Australian email account at http://www.Looksmart.com.au

1 0

Re: Startup fix for scanbin 6.0
by Dimitrie O. Paun April 4, 2002

April 4, 2002

On April 4, 2002 01:48 pm, Stefan Leichter wrote: > i thought the NULL - pointer is the result of a missing feature or a bug in > wine. For me i does not make sense to call the functions DrawText* without > a text. Nevertheless here is the patch without the ERR. While it is true that some Wine code call DrawText, so does a lot of user programs... -- Dimi.

1 0

[PATCH] async IO APCs call check_async_list() directly
by Martin Wilck April 4, 2002

April 4, 2002

PATCH: async-func.diff This is an improvement over my previous patch (async-struct.diff) in that it does not need the static function check_async_lists in several source files anymore and still achieves DLL separation. The idea is that all async I/O requests use check_async_list as callback function anyway, so that there is no need to pass a function pointer. I discussed the idea with Mike, and he seemed to like it. Patch against: Wine CVS 2002/04/04, with my async-struct patch applied. Test status: Compiles warnings. Tested regular file async IO (ok). Serial port async IO: a test would be desirable. Modified files: include : async.h (remove check_async_list) server : protocol.def (add APC_ASYNC_IO APC type, remove func field for create_async) async.h (remove func field in async struct) async.c (remove references to func field) thread.c (allow NULL function pointer for APC_ASYNC_IO) scheduler : synchro.c (add check_async_list; call from call_apcs for APC_ASYNC_IO) -- Martin diff -ruNX ignore MW/wine/include/async.h TMP/wine/include/async.h --- MW/wine/include/async.h Thu Apr 4 18:07:36 2002 +++ TMP/wine/include/async.h Thu Apr 4 18:08:56 2002 @@ -56,8 +56,6 @@ /* All functions declared static for Dll separation purposes */ -static void WINAPI check_async_list(async_private *asp, DWORD status); - inline static void finish_async( async_private *ovp ) { if(ovp->prev) @@ -87,7 +85,6 @@ req->overlapped = ovp; req->type = ovp->type; req->count = ovp->ops->get_count( ovp ); - req->func = check_async_list; req->status = status; ret = wine_server_call( req ); } @@ -115,29 +112,6 @@ NtCurrentTeb()->pending_list = ovp; return __register_async( ovp, status ); -} - -static void WINAPI check_async_list(async_private *asp, DWORD status) -{ - async_private *ovp; - DWORD ovp_status; - - for( ovp = NtCurrentTeb()->pending_list; ovp && ovp != asp; ovp = ovp->next ); - - if(!ovp) - return; - - if( status != STATUS_ALERTED ) - { - ovp_status = status; - ovp->ops->set_status (ovp, status); - } - else ovp_status = ovp->ops->get_status (ovp); - - if( ovp_status == STATUS_PENDING ) ovp->func( ovp ); /* ovp->func may change status */ - - /* This will destroy all but PENDING requests */ - register_old_async( ovp ); } #endif /* __WINE_ASYNC_H */ diff -ruNX ignore MW/wine/include/wine/server_protocol.h TMP/wine/include/wine/server_protocol.h --- MW/wine/include/wine/server_protocol.h Thu Apr 4 18:07:36 2002 +++ TMP/wine/include/wine/server_protocol.h Thu Apr 4 17:49:50 2002 @@ -502,7 +502,7 @@ int type; /* VARARG(args,ptrs); */ }; -enum apc_type { APC_NONE, APC_USER, APC_TIMER, APC_ASYNC }; +enum apc_type { APC_NONE, APC_USER, APC_TIMER, APC_ASYNC, APC_ASYNC_IO }; @@ -2278,7 +2278,6 @@ { struct request_header __header; handle_t handle; - void* func; int type; void* overlapped; int count; @@ -3200,6 +3199,6 @@ struct get_window_properties_reply get_window_properties_reply; }; -#define SERVER_PROTOCOL_VERSION 78 +#define SERVER_PROTOCOL_VERSION 81 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff -ruNX ignore MW/wine/scheduler/synchro.c TMP/wine/scheduler/synchro.c --- MW/wine/scheduler/synchro.c Thu Apr 4 18:07:36 2002 +++ TMP/wine/scheduler/synchro.c Thu Apr 4 17:54:20 2002 @@ -30,7 +30,7 @@ #include "thread.h" #include "winerror.h" #include "wine/server.h" - +#include "async.h" /*********************************************************************** * get_timeout @@ -90,6 +90,34 @@ /*********************************************************************** + * check_async_list + * + * Handle async I/O requests. + */ +static void WINAPI check_async_list(async_private *asp, DWORD status) +{ + async_private *ovp; + DWORD ovp_status; + + for( ovp = NtCurrentTeb()->pending_list; ovp && ovp != asp; ovp = ovp->next ); + + if(!ovp) + return; + + if( status != STATUS_ALERTED ) + { + ovp_status = status; + ovp->ops->set_status (ovp, status); + } + else ovp_status = ovp->ops->get_status (ovp); + + if( ovp_status == STATUS_PENDING ) ovp->func( ovp ); + + /* This will destroy all but PENDING requests */ + register_old_async( ovp ); +} + +/*********************************************************************** * call_apcs * * Call outstanding APCs. @@ -129,6 +157,9 @@ /* convert sec/usec to NT time */ DOSFS_UnixTimeToFileTime( (time_t)args[0], &ft, (DWORD)args[1] * 10 ); proc( args[2], ft.dwLowDateTime, ft.dwHighDateTime ); + break; + case APC_ASYNC_IO: + check_async_list ( args[0], (DWORD) args[1]); break; default: server_protocol_error( "get_apc_request: bad type %d\n", type ); diff -ruNX ignore MW/wine/server/async.c TMP/wine/server/async.c --- MW/wine/server/async.c Thu Apr 4 18:07:36 2002 +++ TMP/wine/server/async.c Thu Apr 4 17:50:45 2002 @@ -64,7 +64,7 @@ { /* fprintf(stderr,"notifying %p!\n",async->overlapped); */ async->status = status; - thread_queue_apc(async->thread, NULL, async->func, APC_ASYNC, 1, 2, async->overlapped, status); + thread_queue_apc(async->thread, NULL, NULL, APC_ASYNC_IO, 1, 2, async->overlapped, status); } void destroy_async_queue( struct async_queue *q ) @@ -116,7 +116,7 @@ destroy_async(async); } -struct async *create_async(struct object *obj, struct thread *thread, void *func, +struct async *create_async(struct object *obj, struct thread *thread, void *overlapped) { struct async *async = (struct async *) malloc(sizeof(struct async)); @@ -128,7 +128,6 @@ async->obj = obj; async->thread = thread; - async->func = func; async->overlapped = overlapped; async->next = NULL; async->prev = NULL; @@ -165,7 +164,7 @@ if(req->status==STATUS_PENDING) { if(!async) - async = create_async(obj, current, req->func, req->overlapped); + async = create_async(obj, current, req->overlapped); if(async) { diff -ruNX ignore MW/wine/server/async.h TMP/wine/server/async.h --- MW/wine/server/async.h Tue Apr 2 16:51:50 2002 +++ TMP/wine/server/async.h Thu Apr 4 17:50:57 2002 @@ -30,7 +30,6 @@ { struct object *obj; struct thread *thread; - void *func; void *overlapped; unsigned int status; struct timeval when; @@ -51,7 +50,7 @@ struct async *find_async(struct async_queue *q, struct thread *thread, void *overlapped); void async_insert(struct async_queue *q, struct async *async); struct async *create_async(struct object *obj, struct thread *thread, - void *func, void *overlapped); + void *overlapped); void async_add_timeout(struct async *async, int timeout); static inline void init_async_queue(struct async_queue *q) { diff -ruNX ignore MW/wine/server/protocol.def TMP/wine/server/protocol.def --- MW/wine/server/protocol.def Thu Apr 4 18:07:36 2002 +++ TMP/wine/server/protocol.def Thu Apr 4 17:49:45 2002 @@ -412,7 +412,7 @@ int type; /* function type */ VARARG(args,ptrs); /* function arguments */ @END -enum apc_type { APC_NONE, APC_USER, APC_TIMER, APC_ASYNC }; +enum apc_type { APC_NONE, APC_USER, APC_TIMER, APC_ASYNC, APC_ASYNC_IO }; /* Close a handle for the current process */ @@ -1618,7 +1618,6 @@ /* Create / reschedule an async I/O */ @REQ(register_async) handle_t handle; /* handle to comm port, socket or file */ - void* func; int type; void* overlapped; int count; diff -ruNX ignore MW/wine/server/thread.c TMP/wine/server/thread.c --- MW/wine/server/thread.c Tue Apr 2 16:51:51 2002 +++ TMP/wine/server/thread.c Thu Apr 4 17:37:22 2002 @@ -959,8 +959,9 @@ } /* Optimization: ignore APCs that have a NULL func; they are only used * to wake up a thread, but since we got here the thread woke up already. + * Exception: for APC_ASYNC_IO, func == NULL is legal. */ - if (apc->func) break; + if (apc->func || apc->type == APC_ASYNC_IO) break; free( apc ); } size = apc->nb_args * sizeof(apc->args[0]); diff -ruNX ignore MW/wine/server/trace.c TMP/wine/server/trace.c --- MW/wine/server/trace.c Thu Apr 4 18:07:36 2002 +++ TMP/wine/server/trace.c Thu Apr 4 17:49:50 2002 @@ -1846,7 +1846,6 @@ static void dump_register_async_request( const struct register_async_request *req ) { fprintf( stderr, " handle=%d,", req->handle ); - fprintf( stderr, " func=%p,", req->func ); fprintf( stderr, " type=%d,", req->type ); fprintf( stderr, " overlapped=%p,", req->overlapped ); fprintf( stderr, " count=%d,", req->count );

1 0

freetype.c:1852: conflicting types for `WineEngGetTextExtentPointI'
by Andriy Palamarchuk April 4, 2002

April 4, 2002

After refreshing today morning from CVS I got the compilation error. The complete error text: freetype.c:1852: conflicting types for `WineEngGetTextExtentPointI' ../../include/font.h:102: previous declaration of `WineEngGetTextExtentPointI' make[2]: *** [freetype.o] Error 1 make[2]: Leaving directory `/mnt/buf/prj/wine/dlls/gdi' make[1]: *** [gdi/gdi32.dll.so] Error 2 make[1]: Leaving directory `/mnt/buf/prj/wine/dlls' make: *** [dlls] Error 2 Huw, can it be because of your yesterday's patch? Other relevant patch is Alexandre's change to configure. Let me know if you need additional information. Andriy Palamarchuk __________________________________________________ Do You Yahoo!? Yahoo! Tax Center - online filing with TurboTax http://taxes.yahoo.com/

3 2

[PATCH] Move send() functionality to WS2_32 code
by Martin Wilck April 4, 2002

April 4, 2002

PATCH: Move send() functionality to WS2_32 code In short, does the same to send() that the previous patch did to recv(). For the send() family of functions, WSASendTo() becomes the work horse. All other functions (WSASend(), send(), sendto(), ...) are only wrappers around WSASendTo(). To provide the scatter/gather functionality of WSASendTo(), the Unix system call used as backend is sendmsg() rather than sendto(). Patch against: Wine CVS 2002-04-03, with my previous patch (recv) applied. Test status: Compiles, no warnings. Tested with 16 bit apps: FreeAgent (newsreader), Solstice mail, nslookup, teraterm (telnet) (16 bit apps now call WS2_32 code!) Modified files: dlls/winsock : socket.c, ws2_32.spec diff -ruNX diffignore TMP/wine/dlls/winsock/socket.c MW/wine/dlls/winsock/socket.c --- TMP/wine/dlls/winsock/socket.c Thu Apr 4 10:58:53 2002 +++ MW/wine/dlls/winsock/socket.c Thu Apr 4 11:01:03 2002 @@ -1944,34 +1944,13 @@ */ int WINAPI WS_send(SOCKET s, const char *buf, int len, int flags) { - int fd = _get_sock_fd(s); + DWORD n; + WSABUF wsabuf = { len, (char*) buf }; - TRACE("socket %04x, ptr %p, length %d, flags %d\n", s, buf, len, flags); - if (fd != -1) - { - int length; - - if (_is_blocking(s)) - { - /* block here */ - /* FIXME: exceptfds */ - do_block(fd, 2); - } - if ((length = send(fd, buf, len, flags)) < 0 ) - { - SetLastError(wsaErrno()); - if( GetLastError() == WSAEWOULDBLOCK ) - _enable_event(s, FD_WRITE, 0, 0); - } - else - { - close(fd); - return length; - } - close(fd); - } - else SetLastError(WSAENOTSOCK); - return SOCKET_ERROR; + if ( WSASendTo ( s, &wsabuf, 1, &n, flags, NULL, 0, NULL, NULL) == SOCKET_ERROR ) + return SOCKET_ERROR; + else + return n; } /*********************************************************************** @@ -1982,43 +1961,106 @@ LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { - INT iFlags = 0; - INT rc = 0; - DWORD dwCount; - - /* Overlapped is not supported or checked for */ - FIXME( "(%u,%p,0x%lx,%p,0x%lx,%p,%p): semi stub\n", - s, lpBuffers, dwBufferCount, lpNumberOfBytesSent, - dwFlags, lpOverlapped, lpCompletionRoutine ); - - /* Convert setup flags */ - if( dwFlags & MSG_DONTROUTE ) - { - iFlags |= MSG_DONTROUTE; - } - - if( dwFlags & MSG_OOB ) - { - iFlags |= MSG_OOB; - } - - /* Indicate nothing yet sent */ - *lpNumberOfBytesSent = 0; - - /* Send all buffers with the same flags */ - for(dwCount = 0; dwCount < dwBufferCount; dwCount++ ) - { - if( ( rc = WS_send( s, lpBuffers[ dwCount ].buf, - lpBuffers[ dwCount ].len, iFlags ) ) != 0 ) + return WSASendTo ( s, lpBuffers, dwBufferCount, lpNumberOfBytesSent, dwFlags, + NULL, 0, lpOverlapped, lpCompletionRoutine ); +} + +/*********************************************************************** + * WSASendTo (WS2_32.74) + */ +INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD lpNumberOfBytesSent, DWORD dwFlags, + const struct WS_sockaddr *to, int tolen, + LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) +{ + int i, n, fd, err = WSAENOTSOCK; + struct iovec* iovec; + struct msghdr msghdr; + + TRACE ("socket %04x, wsabuf %p, nbufs %ld, flags %ld, to %p, tolen %d, ovl %p, func %p\n", + s, lpBuffers, dwBufferCount, dwFlags, + to, tolen, lpOverlapped, lpCompletionRoutine); + + fd = _get_sock_fd(s); + + if ( fd == -1 ) + goto error; + + iovec = WS_ALLOC ( dwBufferCount * sizeof (struct iovec) ); + + if ( !iovec ) + { + err = WSAENOBUFS; + goto err_close; + } + + for ( i = 0; i < dwBufferCount; i++ ) + { + iovec[i].iov_base = lpBuffers[i].buf; + iovec[i].iov_len = lpBuffers[i].len; + } + + msghdr.msg_name = NULL; + + if (to) + { +#if DEBUG_SOCKADDR + dump_sockaddr (to); +#endif + msghdr.msg_name = (void*) ws_sockaddr_ws2u (to, tolen, &msghdr.msg_namelen); + if ( !msghdr.msg_name ) + { + err = WSAEFAULT; + goto err_free; + } + } + else + msghdr.msg_namelen = 0; + + msghdr.msg_iov = iovec; + msghdr.msg_iovlen = dwBufferCount; + msghdr.msg_control = NULL; + msghdr.msg_controllen = 0; + msghdr.msg_flags = 0; + + /* FIXME: Treat overlapped IO here */ + + if (_is_blocking(s)) + { + /* FIXME: exceptfds? */ + do_block(fd, 2); + } + + /* FIXME: can we support MSG_PARTIAL ? How does it relate to sendmsg()'s msg_flags ? */ + + if ((n = sendmsg (fd, &msghdr, dwFlags)) == -1) { - break; + err = wsaErrno(); + if ( err == WSAEWOULDBLOCK ) + _enable_event (s, FD_WRITE, 0, 0); + goto err_free; } - /* Indicate that we've sent something */ - *lpNumberOfBytesSent += lpBuffers[ dwCount ].len; - } + *lpNumberOfBytesSent = n; - return rc; + ws_sockaddr_free ( msghdr.msg_name, to ); + WS_FREE ( iovec ); + close ( fd ); + + return 0; + +err_free: + ws_sockaddr_free ( msghdr.msg_name, to ); + WS_FREE ( iovec ); + +err_close: + close ( fd ); + +error: + WARN (" -> ERROR %d\n", err); + SetLastError (err); + return SOCKET_ERROR; } /*********************************************************************** @@ -2035,46 +2077,13 @@ int WINAPI WS_sendto(SOCKET s, const char *buf, int len, int flags, const struct WS_sockaddr *to, int tolen) { - int fd = _get_sock_fd(s); - int res; - - TRACE("socket %04x, ptr %p, length %d, flags %d\n", s, buf, len, flags); - - res=SOCKET_ERROR; - if (fd != -1) - { - const struct sockaddr* uaddr; - int uaddrlen; + DWORD n; + WSABUF wsabuf = { len, (char*) buf }; - uaddr=ws_sockaddr_ws2u(to,tolen,&uaddrlen); - if (uaddr == NULL) - { - SetLastError(WSAEFAULT); - } - else - { - if (_is_blocking(s)) - { - /* block here */ - /* FIXME: exceptfds */ - do_block(fd, 2); - } - res=sendto(fd, buf, len, flags, uaddr, uaddrlen); - if (res < 0 ) - { - SetLastError(wsaErrno()); - if( GetLastError() == WSAEWOULDBLOCK ) - _enable_event(s, FD_WRITE, 0, 0); - } - ws_sockaddr_free(uaddr,to); - } - close(fd); - } + if ( WSASendTo (s, &wsabuf, 1, &n, flags, to, tolen, NULL, NULL) == SOCKET_ERROR ) + return SOCKET_ERROR; else - { - SetLastError(WSAENOTSOCK); - } - return res; + return n; } /*********************************************************************** diff -ruNX diffignore TMP/wine/dlls/winsock/ws2_32.spec MW/wine/dlls/winsock/ws2_32.spec --- TMP/wine/dlls/winsock/ws2_32.spec Thu Apr 4 10:58:53 2002 +++ MW/wine/dlls/winsock/ws2_32.spec Thu Apr 4 11:01:03 2002 @@ -86,7 +86,7 @@ 71 forward WSAResetEvent KERNEL32.ResetEvent 72 stdcall WSASend(long ptr long ptr long ptr ptr) WSASend 73 stub WSASendDisconnect -74 stub WSASendTo +74 stdcall WSASendTo(long ptr long ptr long ptr long ptr ptr) WSASendTo 75 stub WSASetEvent 76 stub WSASetServiceA 77 stub WSASetServiceW

1 0

[PATCH] Move recv() functionality to WS2_32 code
by Martin Wilck April 4, 2002

April 4, 2002

PATCH: Move recv() functionality to WS2_32 code For the recv() family of functions, WSARecvFrom() becomes the work horse. All other functions (WSARecv(), recv(), recvfrom(), ...) are only wrappers around WSARecvFrom(). To provide the scatter/gather functionality of WSARecvFrom(), the Unix system call used as backend is recvmsg() rather than recvfrom(). Patch against: Wine CVS 2002-04-04. Test status: Compiles, no warnings. Tested with 16 bit apps: FreeAgent (newsreader), Solstice mail, nslookup, teraterm (telnet) (16 bit apps now call WS2_32 code!) Modified files: dlls/winsock : socket.c, ws2_32.spec diff -ruNX diffignore MW/wine/dlls/winsock/socket.c TMP/wine/dlls/winsock/socket.c --- MW/wine/dlls/winsock/socket.c Thu Apr 4 09:37:38 2002 +++ TMP/wine/dlls/winsock/socket.c Thu Apr 4 10:58:53 2002 @@ -1797,34 +1797,13 @@ */ int WINAPI WS_recv(SOCKET s, char *buf, int len, int flags) { - int fd = _get_sock_fd(s); - - TRACE("socket %04x, buf %8x, len %d, flags %d\n", s, (unsigned)buf, len, flags); - - if (fd != -1) - { - INT length; - - if (_is_blocking(s)) - { - /* block here */ - /* FIXME: OOB and exceptfds? */ - do_block(fd, 1); - } - if ((length = recv(fd, buf, len, flags)) >= 0) - { - TRACE(" -> %i bytes\n", length); + DWORD n, dwFlags = flags; + WSABUF wsabuf = { len, buf }; - close(fd); - _enable_event(s, FD_READ, 0, 0); - return length; - } - SetLastError(wsaErrno()); - close(fd); - } - else SetLastError(WSAENOTSOCK); - WARN(" -> ERROR\n"); - return SOCKET_ERROR; + if ( WSARecvFrom (s, &wsabuf, 1, &n, &dwFlags, NULL, NULL, NULL, NULL) == SOCKET_ERROR ) + return SOCKET_ERROR; + else + return n; } /*********************************************************************** @@ -1842,60 +1821,13 @@ int WINAPI WS_recvfrom(SOCKET s, char *buf, INT len, int flags, struct WS_sockaddr *from, int *fromlen) { - int fd = _get_sock_fd(s); - int res; + DWORD n, dwFlags = flags; + WSABUF wsabuf = { len, buf }; - TRACE("socket %04x, ptr %08x, len %d, flags %d\n", s, (unsigned)buf, len, flags); -#if DEBUG_SOCKADDR - if (from) - dump_sockaddr(from); + if ( WSARecvFrom (s, &wsabuf, 1, &n, &dwFlags, from, fromlen, NULL, NULL) == SOCKET_ERROR ) + return SOCKET_ERROR; else - DPRINTF("from = NULL\n"); -#endif - - res=SOCKET_ERROR; - if (fd != -1) - { - struct sockaddr* uaddr; - int uaddrlen; - int length; - - if (_is_blocking(s)) - { - /* block here */ - /* FIXME: OOB and exceptfds */ - do_block(fd, 1); - } - - uaddr=ws_sockaddr_alloc(from,fromlen,&uaddrlen); - length=recvfrom(fd, buf, len, flags, uaddr, &uaddrlen); - if (length < 0) - { - SetLastError(wsaErrno()); - WARN(" -> ERROR\n"); - } - else if (ws_sockaddr_u2ws(uaddr,uaddrlen,from,fromlen) != 0) - { - /* The from buffer was too small, but we read the data - * anyway. Is that really bad? - */ - SetLastError(WSAEFAULT); - WARN(" -> WSAEFAULT\n"); - } - else - { - TRACE(" -> %i bytes\n", length); - _enable_event(s, FD_READ, 0, 0); - res=length; - } - close(fd); - } - else - { - SetLastError(WSAENOTSOCK); - WARN(" -> WSAENOTSOCK\n"); - } - return res; + return n; } /*********************************************************************** @@ -3302,34 +3234,129 @@ /*********************************************************************** + * WSARecv (WS2_32.67) + */ +int WINAPI WSARecv (SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD NumberOfBytesReceived, LPDWORD lpFlags, + LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) +{ + return WSARecvFrom (s, lpBuffers, dwBufferCount, NumberOfBytesReceived, lpFlags, + NULL, NULL, lpOverlapped, lpCompletionRoutine); +} + +/*********************************************************************** * WSARecvFrom (WS2_32.69) */ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, struct WS_sockaddr *lpFrom, LPINT lpFromlen, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) + { - DWORD dwCount; - INT rc; + /* Uses recvmsg() in order to provide scatter-gather I/O */ + + struct iovec* iovec; + struct msghdr msghdr; + int fd, i, length, err = WSAENOTSOCK; + + TRACE("socket %04x, wsabuf %p, nbufs %ld, flags %ld, from %p, fromlen %ld, ovl %p, func %p\n", + s, lpBuffers, dwBufferCount, *lpFlags, lpFrom, + (lpFromlen ? *lpFromlen : -1L), + lpOverlapped, lpCompletionRoutine); + + fd = _get_sock_fd(s); - FIXME( "(%i,%p,%lu,%p,%p,%p,%p,%p,%p: stub\n", - s, lpBuffers, dwBufferCount, lpNumberOfBytesRecvd, lpFlags, - lpFrom, lpFromlen, lpOverlapped, lpCompletionRoutine ); + if (fd == -1) + { + err = WSAENOTSOCK; + goto error; + } - for( dwCount = 0, rc = 0; dwCount < dwBufferCount; dwCount++ ) - { + /* FIXME: should this be HeapAlloc() or WS_ALLOC ? */ + iovec = WS_ALLOC ( dwBufferCount * sizeof (struct iovec) ); + if ( !iovec ) + { + err = WSAENOBUFS; + goto err_close; + } - if( ( rc = WS_recvfrom(s, lpBuffers[ dwCount ].buf, (INT)lpBuffers[ dwCount ].len, - (INT)*lpFlags, lpFrom, lpFromlen ) ) != 0 ) + for (i = 0; i < dwBufferCount; i++) { - break; + iovec[i].iov_base = lpBuffers[i].buf; + iovec[i].iov_len = lpBuffers[i].len; } - } + msghdr.msg_name = NULL; - return rc; -} + if ( lpFrom ) + { +#if DEBUG_SOCKADDR + dump_sockaddr (lpFrom); +#endif + + msghdr.msg_namelen = *lpFromlen; + msghdr.msg_name = ws_sockaddr_alloc (lpFrom, lpFromlen, &msghdr.msg_namelen); + } + else + msghdr.msg_namelen = 0; + + msghdr.msg_iov = iovec; + msghdr.msg_iovlen = dwBufferCount; + msghdr.msg_control = NULL; + msghdr.msg_controllen = 0; + msghdr.msg_flags = 0; + + /* FIXME: Treat overlapped IO here */ + + if (_is_blocking(s)) + { + /* block here */ + /* FIXME: OOB and exceptfds? */ + do_block(fd, 1); + } + + /* FIXME: can we support MSG_PARTIAL ? + How does it relate to recvmsg()'s msg_flags ? */ + + if ((length = recvmsg (fd, &msghdr, *lpFlags)) == -1) + { + err = wsaErrno(); + goto err_free; + } + + TRACE(" -> %i bytes\n", length); + + if ( lpFrom && ws_sockaddr_u2ws (msghdr.msg_name, msghdr.msg_namelen, lpFrom, lpFromlen) != 0 ) + { + /* The from buffer was too small, but we read the data + * anyway. Is that really bad? + */ + SetLastError ( WSAEFAULT ); + WARN ( " -> Address buffer too small\n" ); + } + + *lpNumberOfBytesRecvd = length; + WS_FREE (iovec); + ws_sockaddr_free ( msghdr.msg_name, lpFrom ); + close(fd); + _enable_event(s, FD_READ, 0, 0); + + return 0; + +err_free: + WS_FREE (iovec); + ws_sockaddr_free ( msghdr.msg_name, lpFrom ); + +err_close: + close (fd); + +error: + WARN(" -> ERROR %d\n", err); + SetLastError ( err ); + return SOCKET_ERROR; +} /*********************************************************************** * WSCInstallProvider (WS2_32.88) diff -ruNX diffignore MW/wine/dlls/winsock/ws2_32.spec TMP/wine/dlls/winsock/ws2_32.spec --- MW/wine/dlls/winsock/ws2_32.spec Thu Apr 4 09:37:38 2002 +++ TMP/wine/dlls/winsock/ws2_32.spec Thu Apr 4 10:58:53 2002 @@ -79,7 +79,7 @@ 64 stub WSANtohl 65 stub WSANtohs 66 stub WSAProviderConfigChange -67 stub WSARecv +67 stdcall WSARecv(long ptr long ptr ptr ptr ptr) WSARecv 68 stub WSARecvDisconnect 69 stdcall WSARecvFrom(long ptr long ptr ptr ptr ptr ptr ptr ) WSARecvFrom 70 stub WSARemoveServiceClass

1 0

freetype : wine doesn't compile(Implement GetTextExtentPointI)
by Sylvain Petreolle April 4, 2002

April 4, 2002

The following patch breaks compilation because there is a previous definition : Log message: Huw D M Davies <hdavies(a)codeweavers.com> Implement GetTextExtentPointI and add support for ETO_GLYPH_INDEX. Patch: http://cvs.winehq.com/patch.py?id=1017871707710937189943255 Compile errors : gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -mpreferred-stack-boundary=2 -fPIC -D__WINE__ -D_GDI32_ -D_REENTRANT -I/usr/X11R6/include -o freetype.o freetype.c freetype.c:1852: conflicting types for `WineEngGetTextExtentPointI' ../../include/font.h:102: previous declaration of `WineEngGetTextExtentPointI' ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

1 0

VirtualAlloc bug ?
by Laurent Pinchart April 4, 2002

April 4, 2002

Hi, I tried to use VirtualAlloc with MEM_COMMIT to map a page at address 0x7ffe0000. The call to VirtualAlloc failed with ERROR_INVALID_ADDRESS. I then tried to reserve the pages first, using VirtualAlloc with MEM_RESERVE, and the call to VirtualAlloc/MEM_COMMIT worked fined after that. The MSDN state that "(MEM_COMMIT) If a memory page is not yet reserved, setting this value causes the function to both reserve and commit the memory page.". Is that a wine bug ? I can try to fix it, but I'm scared to break something in VirtualAlloc, as I'm new to wine internals. Laurent Pinchart

2 1

FreeBSD/Solaris and -lc
by Francois Gouget April 4, 2002

April 4, 2002

When I compile Wine on FreeBSD and Solaris I keep getting 'undefined sybol' errors for all the C library symbols. So I usually add the following to 'configure.ac'. Index: configure.ac =================================================================== RCS file: /home/wine/wine/configure.ac,v retrieving revision 1.14 diff -u -r1.14 configure.ac --- configure.ac 31 Mar 2002 19:23:41 -0000 1.14 +++ configure.ac 31 Mar 2002 20:45:37 -0000 @@ -77,6 +77,8 @@ dnl **** Check for some libraries **** +dnl Check for -lc for FreeBSD and Solaris +AC_CHECK_LIB(c,getpid) dnl Check for -lm AC_CHECK_LIB(m,sqrt) dnl Check for -li386 for NetBSD and OpenBSD But is it the right eay to do things? What worries me is that I found some messages related to libtool that claim that -lc should not be explicitly linked in on FreeBSD (and OpenBSD): http://mail.gnu.org/pipermail/libtool/2001-November/005782.html But maybe things are different if you use -symbolic. -- François Gouget fgouget(a)codeweavers.com

2 2

DirectX API information - where?
by Tels April 3, 2002

April 3, 2002

-----BEGIN PGP SIGNED MESSAGE----- Moin, I want to learn more about the directx and general windows APIs. Now I looked at some books, but was very unsure as to buy what and where, if ever. First, it seems that good books about these topics come from Microsoft Press. Naturally I don't want to support them ;) Second, it seems that you need for the examples and SDK Visual C++ - again from MS. Eeek! And of course, you have to run and use it under Windows *sigh* I am also worried about the different EULAs, licence and all that other stuff "tainting" me - even though I do believe that all of this stuff isn't legal binding for me anyway. But you never know. So, my question: Where can I obtain *free* information about the API's, their working etc. What do you use? Books you can advise? Thank you in advance, Tels - -- "Why do you go so slowly? Do you think this is some kind of game?" PGP key available on http://bloodgate.com/tels.asc or via email. perl -MDev::Bollocks -e'print Dev::Bollocks->rand(),"\n"' appropriately cultivate error-free convergence -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (GNU/Linux) Comment: When cryptography is outlawed, bayl bhgynjf jvyy unir cevinpl. iQEVAwUBPKs2zXcLPEOTuEwVAQGhjQf+KlvVhQQwEOpoReUTiukkohRolyyR8Z+f I/G4sx/ER8+RxtnwrWjBl/gadtnmUdjcf5x0Maca0cxRESjUwSvLgFXNA/VqGtiu SDsDpGVgXUr3iGDu2vXPMFCP0EqrwIUsFSoCpk9me6lWoPlWIOG/EZknA+JY+2zp axFcdrcu7QXq5KF2imPu+ACTA4dC9Af7HGhRflL0ERSe8a4+yhFqC8R2HV++TLPU +H5BQzLPiOANdrfj63bdaCoMWB+qj9bRW+PhPGkzq/QL4p/wsnz70AuW60pSRW5R dOokojLj9gjTY4QEQ/UEt8kyGIxFnSCF21oz9Ltjn1MXC6L8cwJ0Fg== =c8ZH -----END PGP SIGNATURE-----

5 4

Re: Startup fix for scanbin 6.0
by Dimitrie O. Paun April 3, 2002

April 3, 2002

On April 3, 2002 03:58 pm, Stefan Leichter wrote: > + if (!str) { > + ERR("called without text\n"); ^^^ This is not an ERR (which signals an internal Wine error), maybe a WARN, but I would suggest instead just: + if (!str) return 0; -- Dimi.

1 0

Read of memory location 0x7ffe0000 in windows NT
by Laurent Pinchart April 3, 2002

April 3, 2002

Hi everybody, I've stumbled accross some code which reads a dword at memory location 0x7ffe000, which causes the program to crash and the wine debugger to start. After some investigation, it seems that reading the memory location 0x7ffe0000 should return KeTickCount.LowPart to the user process. Has anyone ever heard about that ? I was wondering if it was a native windows NT behaviour, or if it was done by a special kernel-space exception handler installed by the program. The assembly code which does the trick is pusha mov $0x7ffe0000,%edx mov (%edx),%eax mov %eax,0xfffffffc(%ebp) popa mov 0xfffffffc(%ebp),%eax Any idea anyone ? Thanks for your help. Laurent Pinchart

3 6

dynamic .fon conversion
by David Chow April 3, 2002

April 3, 2002

Hi, I am new to Wine develop, I wish to investigate and join, the following is the topic I am interested in. Does Wine develpers planning to implement .fon files support? I mean loading it dynamically? Since Xfree86 4 supports true type fonts, and most of the Linux distribution are now using XFree86-4 . We can actually load these fonts into the Xsever dynamically at run time providing we have some dynamic conversion between the font files. David

4 4

Regression: Wine won't compile with latest cvs shlwapi
by Tony Lambregts April 3, 2002

April 3, 2002

I can't get recent cvs versions to compile. After running cvs update -PAd and ./tools/installwine I get these messages gcc: Internal compiler error: program cc1 got fatal signal 11 make[2]: *** [ordinal.o] Error 1 make[2]: Leaving directory `/usr/local/src/wine/dlls/shlwapi' make[1]: *** [shlwapi/shlwapi.dll.so] Error 2 make[1]: Leaving directory `/usr/local/src/wine/dlls' make: *** [dlls] Error 2 Compilation failed, aborting install. At first I thought it might be something wrong with my system so I backed out cvs to March 1st 2002 and everything worked. I talked to Lawson on wine-users and he says I should look at http://www.bitwizard.nl/sig11/ (This link is about mostly about compiling a kernal but it applies to compiling wine as well) I have looked at it and tried most of the things suggested in it. I still stop in exactly the same place. Things i have tried I ran dd if=/dev/hda7 of=/dev/null bs=1024k count=96 and re-ran make I lowered my clock speed from 200mhz to 133mhz I have 4 72 pin simms, 2-16's and 2-32's I have tried compiling with each set individualy I have increased my swap space None of this helped. In the mean time I have done some regression testing using CVS cvs update -D "2002-03-19 19:31:04 CST" ./configure make depend && make compiles with no errors cvs update -D "2002-03-19 19:33:40 CST" ./configure make depend && make results with this gcc: Internal compiler error: program cc1 got fatal signal 11 make[2]: *** [ordinal.o] Error 1 make[2]: Leaving directory `/usr/local/src/wine/dlls/shlwapi' make[1]: *** [shlwapi/shlwapi.dll.so] Error 2 make[1]: Leaving directory `/usr/local/src/wine/dlls' make: *** [dlls] Error 2 Compilation failed, aborting install. This is the patch that was commited at 19:33:39 CST http://www.winehq.com/hypermail/wine-cvs/2002/03/0072.html Now I'm not the shapest knife in the drawer in fact I can be quite dull but this is a very strong indication that this patch is the one that is causing the problem. What do I need to do now? Tony Lambregts

5 7

apologies to all
by Lonnie Cumberland April 3, 2002

April 3, 2002

Hello All, I am VERY VERY sorry for sending the entire list such a large attachment. I hope that you all will forgive me and it will not happen again. I have no excuse except to say that I was getting too excited about the implementation and did not look at the size of the files. Sorry again, Lonnie -- Lonnie Cumberland OutStep Technologies Incorporated EMAIL: Lonnie(a)OutStep.com : Lonnie_Cumberland(a)yahoo.com The Basis Express Virtual Office & Data Backup and Recovery Services URL: http://www.basis-express.com "The Virtual Office without boundaries!!!"

1 0

Re: warn:wave:OSS_OpenDevice Another thread ...
by Duane Clark April 3, 2002

April 3, 2002

Eric wrote: > This patch would be the correct way of fixing the issue. Would you mind > trying it? This patch causes hangs for me. The audio and app ran for awhile, but then everything, including the app, suddenly froze up.

1 0

SharedUserData
by Laurent Pinchart April 3, 2002

April 3, 2002

Hi everybody, I need to implement the SharedUserData, which is a page of memory located at (KERNEL_BASE - 0x10000) shared between user space (read-only access) and kernel space. Some information in that page are very accurate (system time in 100ns units for instance), so I don't think that it would be possible to create a shared page at (KERNEL_BASE - 0x10000) and refresh it fast enough. Please correct me if I'm wrong, but I think that the way to go would be to create a copy of that page in memory and initialize it when Wine starts (some information never change, like the system root or version number). When a user space program would try to access that page, the page fault exception handler would return the appropriate data. I'm not very familiar with Wine internals, so I might be wrong, or forget some important issues. Comments are more than welcome :-) I'd also appreciate if someone could give me some hints about the implementation (where I should look for the page fault exception handler, where I should initialize that shared data, where I can find the needed information to initialize those data, ...). Thanks in advance. Laurent Pinchart

2 2

process detach in user
by David Hammerton April 3, 2002

April 3, 2002

Hi, If you take a look at the bottom of dlls/user/user_main.c you will notice that in UserClientDllInitialize we have a switch for 'reason': switch(reason) { case DLL_PROCESS_ATTACH: ret = process_attach(); break; case DLL_THREAD_DETACH: thread_detach(); break; } Should we not also be accounting for the DLL_PROCESS_DETACH case in this switch? The reason I noticed this is because some windows (on the user side) are not being cleaned up when a when a process detaches, although they are being clean up on the x11drv side. Is this just a silly bug or is there a reason DLL_PROCESS_DETACH is not worried about? Cheers David -- David Hammerton programmer and support TransGaming Technologies Inc. http://www.transgaming.com david(a)transgaming.com

1 0

Generalization of async IO structures - New attempt
by Martin Wilck April 3, 2002

April 3, 2002

PATCH: async-struct.diff This patch introduces a new API for asynchronous requests, which 1) separates cleanly between async scheduling and file IO related issues, 2) thereby makes the API compatible with other types of async requests, 3) makes all async IO handling functions static for better DLL separation. This a a reworked version of my patch as of 2002/01/15, with modifications to achieve 3). Patch against: Wine CVS 2002/04/03 Test status: Compiles (no errors/warnings), tested regular file async IO (ok). Added files: include : async.h Modified files: server : protocol.def async.c dlls/kernel : comm.c files : file.c include : file.h scheduler : synchro.c Log message: Martin Wilck <Martin.Wilck(a)Fujitsu-Siemens.com> - new server call: cancel_async - move async IO API from include/file.h, scheduler/synchro.c to new header file include/async.h - differentiate generic async API from IO-type specific fields diff -ruNX diffignore CVS/wine/dlls/kernel/comm.c MW/wine/dlls/kernel/comm.c --- CVS/wine/dlls/kernel/comm.c Tue Apr 2 15:39:18 2002 +++ MW/wine/dlls/kernel/comm.c Wed Apr 3 14:48:39 2002 @@ -91,6 +91,53 @@ WINE_DEFAULT_DEBUG_CHANNEL(comm); +/*********************************************************************** + * Asynchronous I/O for asynchronous wait requests * + */ +#include "async.h" + +static DWORD commio_get_async_status (const async_private *ovp); +static DWORD commio_get_async_count (const async_private *ovp); +static void commio_set_async_status (async_private *ovp, const DWORD status); +static void CALLBACK commio_call_completion_func (ULONG_PTR data); + +static async_ops commio_async_ops = +{ + commio_get_async_status, /* get_status */ + commio_set_async_status, /* set_status */ + commio_get_async_count, /* get_count */ + commio_call_completion_func /* call_completion */ +}; + +typedef struct async_commio +{ + struct async_private async; + LPOVERLAPPED lpOverlapped; + char *buffer; +} async_commio; + +static DWORD commio_get_async_status (const struct async_private *ovp) +{ + return ((async_commio*) ovp)->lpOverlapped->Internal; +} + +static void commio_set_async_status (async_private *ovp, const DWORD status) +{ + ((async_commio*) ovp)->lpOverlapped->Internal = status; +} + +static DWORD commio_get_async_count (const struct async_private *ovp) +{ + return 0; +} + +static void CALLBACK commio_call_completion_func (ULONG_PTR data) +{ + HeapFree(GetProcessHeap(), 0, (void*) data); +} + +/***********************************************************************/ + #if !defined(TIOCINQ) && defined(FIONREAD) #define TIOCINQ FIONREAD #endif @@ -1558,12 +1605,13 @@ */ static void COMM_WaitCommEventService(async_private *ovp) { - LPOVERLAPPED lpOverlapped = ovp->lpOverlapped; + async_commio *commio = (async_commio*) ovp; + LPOVERLAPPED lpOverlapped = commio->lpOverlapped; TRACE("overlapped %p\n",lpOverlapped); /* FIXME: detect other events */ - *ovp->buffer = EV_RXCHAR; + *commio->buffer = EV_RXCHAR; lpOverlapped->Internal = STATUS_SUCCESS; } @@ -1579,8 +1627,8 @@ LPDWORD lpdwEvents, /* [out] event(s) that were detected */ LPOVERLAPPED lpOverlapped) /* [in/out] for Asynchronous waiting */ { - int fd,ret; - async_private *ovp; + int fd; + async_commio *ovp; if(!lpOverlapped) { @@ -1591,53 +1639,32 @@ if(NtResetEvent(lpOverlapped->hEvent,NULL)) return FALSE; - lpOverlapped->Internal = STATUS_PENDING; - lpOverlapped->InternalHigh = 0; - lpOverlapped->Offset = 0; - lpOverlapped->OffsetHigh = 0; - fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); if(fd<0) return FALSE; - ovp = (async_private *) HeapAlloc(GetProcessHeap(), 0, sizeof (async_private)); + ovp = (async_commio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_commio)); if(!ovp) { close(fd); return FALSE; } - ovp->event = lpOverlapped->hEvent; + + ovp->async.ops = &commio_async_ops; + ovp->async.handle = hFile; + ovp->async.fd = fd; + ovp->async.type = ASYNC_TYPE_WAIT; + ovp->async.func = COMM_WaitCommEventService; + ovp->async.event = lpOverlapped->hEvent; ovp->lpOverlapped = lpOverlapped; - ovp->func = COMM_WaitCommEventService; ovp->buffer = (char *)lpdwEvents; - ovp->fd = fd; - ovp->count = 0; - ovp->completion_func = 0; - ovp->type = ASYNC_TYPE_WAIT; - ovp->handle = hFile; - - ovp->next = NtCurrentTeb()->pending_list; - ovp->prev = NULL; - if(ovp->next) - ovp->next->prev=ovp; - NtCurrentTeb()->pending_list = ovp; - - /* start an ASYNCHRONOUS WaitCommEvent */ - SERVER_START_REQ( register_async ) - { - req->handle = hFile; - req->overlapped = lpOverlapped; - req->type = ASYNC_TYPE_WAIT; - req->count = 0; - req->func = check_async_list; - req->status = STATUS_PENDING; - ret=wine_server_call_err(req); - } - SERVER_END_REQ; + lpOverlapped->InternalHigh = 0; + lpOverlapped->Offset = 0; + lpOverlapped->OffsetHigh = 0; - if (!ret) - SetLastError(ERROR_IO_PENDING); + if ( !register_new_async (&ovp->async) ) + SetLastError( ERROR_IO_PENDING ); return FALSE; } diff -ruNX diffignore CVS/wine/files/file.c MW/wine/files/file.c --- CVS/wine/files/file.c Tue Apr 2 15:39:31 2002 +++ MW/wine/files/file.c Wed Apr 3 16:00:38 2002 @@ -64,6 +64,65 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); +/*********************************************************************** + * Asynchronous file I/O * + */ +#include "async.h" + +static DWORD fileio_get_async_status (const async_private *ovp); +static DWORD fileio_get_async_count (const async_private *ovp); +static void fileio_set_async_status (async_private *ovp, const DWORD status); +static void CALLBACK fileio_call_completion_func (ULONG_PTR data); + +static async_ops fileio_async_ops = +{ + fileio_get_async_status, /* get_status */ + fileio_set_async_status, /* set_status */ + fileio_get_async_count, /* get_count */ + fileio_call_completion_func /* call_completion */ +}; + +typedef struct async_fileio +{ + struct async_private async; + LPOVERLAPPED lpOverlapped; + LPOVERLAPPED_COMPLETION_ROUTINE completion_func; + char *buffer; + int count; +} async_fileio; + +static DWORD fileio_get_async_status (const struct async_private *ovp) +{ + return ((async_fileio*) ovp)->lpOverlapped->Internal; +} + +static void fileio_set_async_status (async_private *ovp, const DWORD status) +{ + ((async_fileio*) ovp)->lpOverlapped->Internal = status; +} + +static DWORD fileio_get_async_count (const struct async_private *ovp) +{ + async_fileio *fileio = (async_fileio*) ovp; + DWORD ret = fileio->count - fileio->lpOverlapped->InternalHigh; + return (ret < 0 ? 0 : ret); +} + +static void CALLBACK fileio_call_completion_func (ULONG_PTR data) +{ + async_fileio *ovp = (async_fileio*) data; + TRACE ("data: %p\n", ovp); + + if (ovp->completion_func) + ovp->completion_func(ovp->lpOverlapped->Internal, + ovp->lpOverlapped->InternalHigh, + ovp->lpOverlapped); + + HeapFree(GetProcessHeap(), 0, ovp); +} + +/***********************************************************************/ + #if defined(MAP_ANONYMOUS) && !defined(MAP_ANON) #define MAP_ANON MAP_ANONYMOUS #endif @@ -1344,30 +1403,6 @@ return (r==WAIT_OBJECT_0); } - -/*********************************************************************** - * FILE_StartAsync (INTERNAL) - * - * type==ASYNC_TYPE_NONE means cancel the indicated overlapped operation - * lpOverlapped==NULL means all overlappeds match - */ -BOOL FILE_StartAsync(HANDLE hFile, LPOVERLAPPED lpOverlapped, DWORD type, DWORD count, DWORD status) -{ - BOOL ret; - SERVER_START_REQ(register_async) - { - req->handle = hFile; - req->overlapped = lpOverlapped; - req->type = type; - req->count = count; - req->func = check_async_list; - req->status = status; - ret = wine_server_call( req ); - } - SERVER_END_REQ; - return !ret; -} - /*********************************************************************** * CancelIo (KERNEL32.@) */ @@ -1377,16 +1412,25 @@ TRACE("handle = %x\n",handle); - ovp = NtCurrentTeb()->pending_list; - while(ovp) + for (ovp = NtCurrentTeb()->pending_list; ovp; ovp = t) { t = ovp->next; - if(FILE_StartAsync(handle, ovp->lpOverlapped, ovp->type, 0, STATUS_CANCELLED)) + if (ovp->handle != handle) continue; + + SERVER_START_REQ ( cancel_async ) { - TRACE("overlapped = %p\n",ovp->lpOverlapped); - finish_async(ovp, STATUS_CANCELLED); + req->handle = handle; + req->type = ovp->type; + req->overlapped = ovp; + wine_server_call ( req ); + if (reply->cancelled) + { + TRACE ("cancelling request: %p\n", ovp); + ovp->ops->set_status ( ovp, STATUS_CANCELLED ); + finish_async (ovp); + } } - ovp = t; + SERVER_END_REQ; } WaitForMultipleObjectsEx(0,NULL,FALSE,1,TRUE); return TRUE; @@ -1400,18 +1444,19 @@ */ static void FILE_AsyncReadService(async_private *ovp) { - LPOVERLAPPED lpOverlapped = ovp->lpOverlapped; + async_fileio *fileio = (async_fileio*) ovp; + LPOVERLAPPED lpOverlapped = fileio->lpOverlapped; int result, r; int already = lpOverlapped->InternalHigh; - TRACE("%p %p\n", lpOverlapped, ovp->buffer ); + TRACE("%p %p\n", lpOverlapped, fileio->buffer ); /* check to see if the data is ready (non-blocking) */ - result = pread (ovp->fd, &ovp->buffer[already], ovp->count - already, + result = pread (ovp->fd, &fileio->buffer[already], fileio->count - already, OVERLAPPED_OFFSET (lpOverlapped) + already); if ((result < 0) && (errno == ESPIPE)) - result = read (ovp->fd, &ovp->buffer[already], ovp->count - already); + result = read (ovp->fd, &fileio->buffer[already], fileio->count - already); if ( (result<0) && ((errno == EAGAIN) || (errno == EINTR))) { @@ -1429,9 +1474,9 @@ } lpOverlapped->InternalHigh += result; - TRACE("read %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,ovp->count); + TRACE("read %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,fileio->count); - if(lpOverlapped->InternalHigh < ovp->count) + if(lpOverlapped->InternalHigh < fileio->count) r = STATUS_PENDING; else r = STATUS_SUCCESS; @@ -1448,7 +1493,7 @@ LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, HANDLE hEvent) { - async_private *ovp; + async_fileio *ovp; int fd; TRACE("file %d to buf %p num %ld %p func %p\n", @@ -1468,7 +1513,7 @@ return FALSE; } - ovp = (async_private *) HeapAlloc(GetProcessHeap(), 0, sizeof (async_private)); + ovp = (async_fileio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_fileio)); if(!ovp) { TRACE("HeapAlloc Failed\n"); @@ -1476,31 +1521,19 @@ close(fd); return FALSE; } - ovp->event = hEvent; + + ovp->async.ops = &fileio_async_ops; + ovp->async.handle = hFile; + ovp->async.fd = fd; + ovp->async.type = ASYNC_TYPE_READ; + ovp->async.func = FILE_AsyncReadService; + ovp->async.event = hEvent; ovp->lpOverlapped = overlapped; ovp->count = bytesToRead; ovp->completion_func = lpCompletionRoutine; - ovp->func = FILE_AsyncReadService; ovp->buffer = buffer; - ovp->fd = fd; - ovp->type = ASYNC_TYPE_READ; - ovp->handle = hFile; - - /* hook this overlap into the pending async operation list */ - ovp->next = NtCurrentTeb()->pending_list; - ovp->prev = NULL; - if(ovp->next) - ovp->next->prev = ovp; - NtCurrentTeb()->pending_list = ovp; - - if ( !FILE_StartAsync(hFile, overlapped, ASYNC_TYPE_READ, bytesToRead, STATUS_PENDING) ) - { - /* FIXME: remove async_private and release memory */ - ERR("FILE_StartAsync failed\n"); - return FALSE; - } - return TRUE; + return !register_new_async (&ovp->async); } /*********************************************************************** @@ -1510,7 +1543,6 @@ LPOVERLAPPED overlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = 0; return FILE_ReadFileEx(hFile,buffer,bytesToRead,overlapped,lpCompletionRoutine, INVALID_HANDLE_VALUE); } @@ -1588,7 +1620,6 @@ } /* at last resort, do an overlapped read */ - overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = result; if(!FILE_ReadFileEx(hFile, buffer, bytesToRead, overlapped, NULL, overlapped->hEvent)) @@ -1646,18 +1677,19 @@ */ static void FILE_AsyncWriteService(struct async_private *ovp) { - LPOVERLAPPED lpOverlapped = ovp->lpOverlapped; + async_fileio *fileio = (async_fileio *) ovp; + LPOVERLAPPED lpOverlapped = fileio->lpOverlapped; int result, r; int already = lpOverlapped->InternalHigh; - TRACE("(%p %p)\n",lpOverlapped,ovp->buffer); + TRACE("(%p %p)\n",lpOverlapped,fileio->buffer); /* write some data (non-blocking) */ - result = pwrite(ovp->fd, &ovp->buffer[already], ovp->count - already, + result = pwrite(ovp->fd, &fileio->buffer[already], fileio->count - already, OVERLAPPED_OFFSET (lpOverlapped) + already); if ((result < 0) && (errno == ESPIPE)) - result = write(ovp->fd, &ovp->buffer[already], ovp->count - already); + result = write(ovp->fd, &fileio->buffer[already], fileio->count - already); if ( (result<0) && ((errno == EAGAIN) || (errno == EINTR))) { @@ -1674,9 +1706,9 @@ lpOverlapped->InternalHigh += result; - TRACE("wrote %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,ovp->count); + TRACE("wrote %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,fileio->count); - if(lpOverlapped->InternalHigh < ovp->count) + if(lpOverlapped->InternalHigh < fileio->count) r = STATUS_PENDING; else r = STATUS_SUCCESS; @@ -1693,7 +1725,8 @@ LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, HANDLE hEvent) { - async_private *ovp; + async_fileio *ovp; + int fd; TRACE("file %d to buf %p num %ld %p func %p stub\n", hFile, buffer, bytesToWrite, overlapped, lpCompletionRoutine); @@ -1704,46 +1737,34 @@ return FALSE; } - overlapped->Internal = STATUS_PENDING; - overlapped->InternalHigh = 0; - - if (!FILE_StartAsync(hFile, overlapped, ASYNC_TYPE_WRITE, bytesToWrite, STATUS_PENDING )) + fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); + if ( fd < 0 ) { - TRACE("FILE_StartAsync failed\n"); + TRACE( "Couldn't get FD\n" ); return FALSE; } - ovp = (async_private*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_private)); + ovp = (async_fileio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_fileio)); if(!ovp) { TRACE("HeapAlloc Failed\n"); SetLastError(ERROR_NOT_ENOUGH_MEMORY); + close (fd); return FALSE; } + + ovp->async.ops = &fileio_async_ops; + ovp->async.handle = hFile; + ovp->async.fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); + ovp->async.type = ASYNC_TYPE_WRITE; + ovp->async.func = FILE_AsyncWriteService; ovp->lpOverlapped = overlapped; - ovp->event = hEvent; - ovp->func = FILE_AsyncWriteService; + ovp->async.event = hEvent; ovp->buffer = (LPVOID) buffer; ovp->count = bytesToWrite; ovp->completion_func = lpCompletionRoutine; - ovp->fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); - ovp->type = ASYNC_TYPE_WRITE; - ovp->handle = hFile; - if(ovp->fd <0) - { - HeapFree(GetProcessHeap(), 0, ovp); - return FALSE; - } - - /* hook this overlap into the pending async operation list */ - ovp->next = NtCurrentTeb()->pending_list; - ovp->prev = NULL; - if(ovp->next) - ovp->next->prev = ovp; - NtCurrentTeb()->pending_list = ovp; - - return TRUE; + return !register_new_async (&ovp->async); } /*********************************************************************** @@ -1753,7 +1774,6 @@ LPOVERLAPPED overlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = 0; return FILE_WriteFileEx(hFile, buffer, bytesToWrite, overlapped, lpCompletionRoutine, INVALID_HANDLE_VALUE); diff -ruNX diffignore CVS/wine/include/async.h MW/wine/include/async.h --- CVS/wine/include/async.h Thu Jan 1 01:00:00 1970 +++ MW/wine/include/async.h Wed Apr 3 15:41:18 2002 @@ -0,0 +1,143 @@ +/* + * Structures and static functions for handling asynchronous I/O. + * + * Copyright (C) 2002 Mike McCormack, Martin Wilck + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * This file declares static functions. + * It should only be included by those source files that implement async I/O requests. + */ + +#ifndef __WINE_ASYNC_H +#define __WINE_ASYNC_H + +struct async_private; + +typedef void (*async_handler)(struct async_private *ovp); +typedef void CALLBACK (*async_call_completion_func)(ULONG_PTR data); +typedef DWORD (*async_get_status)(const struct async_private *ovp); +typedef DWORD (*async_get_count)(const struct async_private *ovp); +typedef void (*async_set_status)(struct async_private *ovp, const DWORD status); + +typedef struct async_ops +{ + async_get_status get_status; + async_set_status set_status; + async_get_count get_count; + async_call_completion_func call_completion; +} async_ops; + +typedef struct async_private +{ + struct async_ops *ops; + HANDLE handle; + HANDLE event; + int fd; + async_handler func; + int type; + struct async_private *next; + struct async_private *prev; +} async_private; + +/* All functions declared static for Dll separation purposes */ + +static void WINAPI check_async_list(async_private *asp, DWORD status); + +inline static void finish_async( async_private *ovp ) +{ + if(ovp->prev) + ovp->prev->next = ovp->next; + else + NtCurrentTeb()->pending_list = ovp->next; + + if(ovp->next) + ovp->next->prev = ovp->prev; + + ovp->next = ovp->prev = NULL; + + close( ovp->fd ); + if( ovp->event!=INVALID_HANDLE_VALUE ) + NtSetEvent( ovp->event, NULL ); + + QueueUserAPC( ovp->ops->call_completion, GetCurrentThread(), (ULONG_PTR)ovp ); +} + +inline static BOOL __register_async( async_private *ovp, const DWORD status ) +{ + BOOL ret; + + SERVER_START_REQ( register_async ) + { + req->handle = ovp->handle; + req->overlapped = ovp; + req->type = ovp->type; + req->count = ovp->ops->get_count( ovp ); + req->func = check_async_list; + req->status = status; + ret = wine_server_call( req ); + } + SERVER_END_REQ; + + if ( ret ) ovp->ops->set_status ( ovp, GetLastError() ); + if ( ovp->ops->get_status (ovp) != STATUS_PENDING ) + finish_async (ovp); + + return ret; +} + +#define register_old_async(ovp) \ + __register_async (ovp, ovp->ops->get_status( ovp )); + +inline static BOOL register_new_async( async_private *ovp ) +{ + const DWORD status = STATUS_PENDING; + + ovp->ops->set_status (ovp, status); + + ovp->next = NtCurrentTeb()->pending_list; + ovp->prev = NULL; + if (ovp->next) ovp->next->prev = ovp; + NtCurrentTeb()->pending_list = ovp; + + return __register_async( ovp, status ); +} + +static void WINAPI check_async_list(async_private *asp, DWORD status) +{ + async_private *ovp; + DWORD ovp_status; + + for( ovp = NtCurrentTeb()->pending_list; ovp && ovp != asp; ovp = ovp->next ); + + if(!ovp) + return; + + if( status != STATUS_ALERTED ) + { + ovp_status = status; + ovp->ops->set_status (ovp, status); + } + else ovp_status = ovp->ops->get_status (ovp); + + if( ovp_status == STATUS_PENDING ) ovp->func( ovp ); /* ovp->func may change status */ + + /* This will destroy all but PENDING requests */ + register_old_async( ovp ); +} + +#endif /* __WINE_ASYNC_H */ diff -ruNX diffignore CVS/wine/include/file.h MW/wine/include/file.h --- CVS/wine/include/file.h Tue Apr 2 15:39:33 2002 +++ MW/wine/include/file.h Wed Apr 3 13:07:35 2002 @@ -46,27 +46,6 @@ int flags; } DOS_DEVICE; -/* overlapped private structure */ -struct async_private; -typedef void (*async_handler)(struct async_private *ovp); -typedef struct async_private -{ - LPOVERLAPPED lpOverlapped; - HANDLE handle; - HANDLE event; - int fd; - char *buffer; - async_handler func; - int count; - int type; - LPOVERLAPPED_COMPLETION_ROUTINE completion_func; - struct async_private *next; - struct async_private *prev; -} async_private; - -extern void WINAPI check_async_list(LPOVERLAPPED ov, DWORD status); -extern void finish_async(struct async_private *ovp, DWORD status); - /* locale-independent case conversion */ inline static char FILE_tolower( char c ) { @@ -99,7 +78,6 @@ DWORD attributes, HANDLE template, BOOL fail_read_only, UINT drive_type ); extern HANDLE FILE_CreateDevice( int client_id, DWORD access, LPSECURITY_ATTRIBUTES sa ); -extern BOOL FILE_StartAsync(HANDLE handle, LPOVERLAPPED lpOverlapped, DWORD type, DWORD count, DWORD status); extern LONG WINAPI WIN16_hread(HFILE16,SEGPTR,LONG); diff -ruNX diffignore CVS/wine/scheduler/synchro.c MW/wine/scheduler/synchro.c --- CVS/wine/scheduler/synchro.c Tue Apr 2 15:39:41 2002 +++ MW/wine/scheduler/synchro.c Wed Apr 3 16:01:36 2002 @@ -50,77 +50,6 @@ } } -static void CALLBACK call_completion_routine(ULONG_PTR data) -{ - async_private* ovp = (async_private*)data; - - ovp->completion_func(ovp->lpOverlapped->Internal, - ovp->lpOverlapped->InternalHigh, - ovp->lpOverlapped); - ovp->completion_func=NULL; - HeapFree(GetProcessHeap(), 0, ovp); -} - -void finish_async(async_private *ovp, DWORD status) -{ - ovp->lpOverlapped->Internal=status; - - /* call ReadFileEx/WriteFileEx's overlapped completion function */ - if(ovp->completion_func) - { - QueueUserAPC(call_completion_routine,GetCurrentThread(),(ULONG_PTR)ovp); - } - - /* remove it from the active list */ - if(ovp->prev) - ovp->prev->next = ovp->next; - else - NtCurrentTeb()->pending_list = ovp->next; - - if(ovp->next) - ovp->next->prev = ovp->prev; - - ovp->next=NULL; - ovp->prev=NULL; - - close(ovp->fd); - if(ovp->event!=INVALID_HANDLE_VALUE) - NtSetEvent(ovp->event,NULL); - if(!ovp->completion_func) HeapFree(GetProcessHeap(), 0, ovp); -} - -/*********************************************************************** - * check_async_list - * - * Process a status event from the server. - */ -void WINAPI check_async_list(LPOVERLAPPED overlapped, DWORD status) -{ - async_private *ovp; - - /* fprintf(stderr,"overlapped %p status %x\n",overlapped,status); */ - - for(ovp = NtCurrentTeb()->pending_list; ovp; ovp = ovp->next) - if(ovp->lpOverlapped == overlapped) - break; - - if(!ovp) - return; - - if(status != STATUS_ALERTED) - ovp->lpOverlapped->Internal = status; - - if(ovp->lpOverlapped->Internal==STATUS_PENDING) - { - ovp->func(ovp); - FILE_StartAsync(ovp->handle, ovp->lpOverlapped, ovp->type, 0, ovp->lpOverlapped->Internal); - } - - if(ovp->lpOverlapped->Internal!=STATUS_PENDING) - finish_async(ovp,ovp->lpOverlapped->Internal); -} - - /*********************************************************************** * wait_reply * diff -ruNX diffignore CVS/wine/server/async.c MW/wine/server/async.c --- CVS/wine/server/async.c Tue Apr 2 15:39:41 2002 +++ MW/wine/server/async.c Tue Apr 2 17:17:00 2002 @@ -190,3 +190,28 @@ release_object(obj); } +DECL_HANDLER(cancel_async) +{ + struct object *obj; + + if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL)) ) + return; + + if(obj->ops->queue_async) + { + struct async_queue *q = obj->ops->queue_async(obj, NULL, req->type, 0); + struct async *async; + + async = find_async(q, current, req->overlapped); + if (async) + { + destroy_async(async); + reply->cancelled = 1; + set_select_events(obj,obj->ops->get_poll_events(obj)); + } + else reply->cancelled = 0; + } + + release_object(obj); +} + diff -ruNX diffignore CVS/wine/server/protocol.def MW/wine/server/protocol.def --- CVS/wine/server/protocol.def Tue Apr 2 15:39:41 2002 +++ MW/wine/server/protocol.def Tue Apr 2 17:17:00 2002 @@ -1615,7 +1615,7 @@ #define SERIALINFO_SET_ERROR 0x04 -/* Create/Destroy an async I/O */ +/* Create / reschedule an async I/O */ @REQ(register_async) handle_t handle; /* handle to comm port, socket or file */ void* func; @@ -1629,6 +1629,14 @@ #define ASYNC_TYPE_WRITE 0x02 #define ASYNC_TYPE_WAIT 0x03 +/* Cancel an async I/O */ +(a)REQ(cancel_async) + handle_t handle; + int type; + void* overlapped; +(a)REPLY + int cancelled; +(a)END /* Create a named pipe */ @REQ(create_named_pipe) diff -ruNX diffignore CVS/wine/server/request.h MW/wine/server/request.h --- CVS/wine/server/request.h Tue Apr 2 15:39:41 2002 +++ MW/wine/server/request.h Wed Apr 3 13:06:02 2002 @@ -228,6 +228,7 @@ DECL_HANDLER(get_serial_info); DECL_HANDLER(set_serial_info); DECL_HANDLER(register_async); +DECL_HANDLER(cancel_async); DECL_HANDLER(create_named_pipe); DECL_HANDLER(open_named_pipe); DECL_HANDLER(connect_named_pipe); @@ -388,6 +389,7 @@ (req_handler)req_get_serial_info, (req_handler)req_set_serial_info, (req_handler)req_register_async, + (req_handler)req_cancel_async, (req_handler)req_create_named_pipe, (req_handler)req_open_named_pipe, (req_handler)req_connect_named_pipe, diff -ruNX diffignore CVS/wine/server/trace.c MW/wine/server/trace.c --- CVS/wine/server/trace.c Tue Apr 2 15:39:42 2002 +++ MW/wine/server/trace.c Wed Apr 3 13:06:02 2002 @@ -1853,6 +1853,18 @@ fprintf( stderr, " status=%08x", req->status ); } +static void dump_cancel_async_request( const struct cancel_async_request *req ) +{ + fprintf( stderr, " handle=%d,", req->handle ); + fprintf( stderr, " type=%d,", req->type ); + fprintf( stderr, " overlapped=%p", req->overlapped ); +} + +static void dump_cancel_async_reply( const struct cancel_async_reply *req ) +{ + fprintf( stderr, " cancelled=%d", req->cancelled ); +} + static void dump_create_named_pipe_request( const struct create_named_pipe_request *req ) { fprintf( stderr, " openmode=%08x,", req->openmode ); @@ -2292,6 +2304,7 @@ (dump_func)dump_get_serial_info_request, (dump_func)dump_set_serial_info_request, (dump_func)dump_register_async_request, + (dump_func)dump_cancel_async_request, (dump_func)dump_create_named_pipe_request, (dump_func)dump_open_named_pipe_request, (dump_func)dump_connect_named_pipe_request, @@ -2449,6 +2462,7 @@ (dump_func)dump_get_serial_info_reply, (dump_func)0, (dump_func)0, + (dump_func)dump_cancel_async_reply, (dump_func)dump_create_named_pipe_reply, (dump_func)dump_open_named_pipe_reply, (dump_func)0, @@ -2606,6 +2620,7 @@ "get_serial_info", "set_serial_info", "register_async", + "cancel_async", "create_named_pipe", "open_named_pipe", "connect_named_pipe",

1 0

Unicode, i18n support
by Francois Gouget April 3, 2002

April 3, 2002

Bug 98 - Unicode, i18n support is quite vague. How could I flesh it out? For instance I am thinking that we could convert this into a metabug and have one sub bug for each control that still needs to be unicodified. So: * which are the common controls that still need to be unicodified? * are there other controls that need to be unicodified * do common dialogs need work? As usual the goal is to make the individual tasks more visible so as to give inspiration to potential contributors, and so that we have a better idea of our progress and what remains to be done. Another issue, which would fall more in the i18n part is BiDi support. What is the scope of this? Does it require modifications of all the controls like unicode? http://www.winehq.com/hypermail/wine-devel/2002/03/0236.html Shachar, it sounds like you started working on this, should I say so when I create a bugzilla task for this? Even better, can I assign the task to you? (it can always be reassigned later, it's just a more flexible way of doing things). -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Broadcast message : fin du monde dans cinq minutes, repentez vous !

5 15

RE: IE6ALL.zip
by Richard Vout April 3, 2002

April 3, 2002

I could use this also. Is it likely I will be able to get it to work with the windows integrated security? I use a proxy server here which is integrated into a Windows NT Domain. I have managed to get smbclient to map to drives but I can't join the two. Personally I'd rather avoid the native DLL's if possible. Thanks, Richard. -----Original Message----- From: Sylvain Petreolle [mailto:spetreolle(a)yahoo.fr] Sent: 02 April 2002 22:55 To: Lonnie Cumberland; wine-devel(a)winehq.com Subject: Re: IE6ALL.zip For me I installed IE6 with a few native DLLs. But sometimes Web sites are opening into a loop. They just appear as entirely loaded, but continue to download things and end with unknown error as said by IE. Even problems appear in 'About' box... What do you need IE6 for ? --- Lonnie Cumberland <lonnie(a)outstep.com> a écrit : > Hello All, > > I have been trying to get the ie6 setup to run but > keep running into > many functions that do not seem to be implemented > yet. > > Has anyone gotten IE6 installed under wine? If so > then is there some > where that I can just download the installed > directories and unpack > them in my wine-c structure? > > Thanks, > Lonnie > > -- > Lonnie Cumberland > OutStep Technologies Incorporated > EMAIL: Lonnie(a)OutStep.com > : Lonnie_Cumberland(a)yahoo.com > > The Basis Express Virtual Office > & > Data Backup and Recovery Services > > URL: http://www.basis-express.com > > "The Virtual Office without boundaries!!!" > > > > > ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

1 0

warn:wave:OSS_OpenDevice Another thread is trying to access audio...
by Jan Dvorak April 3, 2002

April 3, 2002

Hi, attached patch fixes counter-strike/multiplayer halflife for latest wine snapshots & CVS. It's probably not the Right Way (TM) but it works for me, and it seems that it doesn't broke anything. Jan Dvorak

2 2

wine/debugger/stabs.c patch breaks FreeBSD
by Gerald Pfeifer April 3, 2002

April 3, 2002

The following patch to wine/debugger/stabs.c breaks FreeBSD: revision 1.45 date: 2002/04/02 02:38:37; author: julliard; state: Exp; lines: +2 -0 Check ELF signature before processing file. stabs.c: In function `DEBUG_ProcessElfFile': stabs.c:1232: `ELFMAG' undeclared (first use in this function) stabs.c:1232: (Each undeclared identifier is reported only once stabs.c:1232: for each function it appears in.) stabs.c:1232: `SELFMAG' undeclared (first use in this function) In /usr/include/sys/elf_common FreeBSD has /* Values for the magic number bytes. */ #define ELFMAG0 0x7f #define ELFMAG1 'E' #define ELFMAG2 'L' #define ELFMAG3 'F' but not ELFMAG and nothing similiar to SELFMAG. Gerald -- Gerald "Jerry" pfeifer(a)dbai.tuwien.ac.at http://www.dbai.tuwien.ac.at/~pfeifer/

2 3

[PATCH] NtQueryInformationProcess & ProcessDebugPort
by Laurent Pinchart April 3, 2002

April 3, 2002

Hi, Here's a small patch which implements NtQueryInformationProcess properly for ProcessInformationClass set to ProcessDebugPort. It fixes cases when ProcessInformationLength != 4, but doesn't check if a debugger is present or not. Should it ? I don't expect that anyone would like to run Visual Studio on Wine to debug a Win32 program :-) Laurent Pinchart

3 4

ExitProcess crashes apps
by 520007368975-0001＠t-online.de April 3, 2002

April 3, 2002

Hi After just compiling and installing current cvs wine I get an unhandled exception every time an app closes. The culprit seems to be somewhere in kernel32.ExitProcess: Here is the relay output of the uninstaller that comes with wine (last 50 lines) Enrico farmboy1(a)subdimension.com 08070840:Ret x11drv.SelectPen() retval=000000e6 ret=4070c3e1 08070840:Call x11drv.SelectBrush(403b44b0,0000075a) ret=4070c3b2 08070840:Ret x11drv.SelectBrush() retval=0000075a ret=4070c3b2 08070840:Call x11drv.SelectPen(403b44b0,0000008a) ret=4070c3e1 08070840:Ret x11drv.SelectPen() retval=0000008a ret=4070c3e1 08070840:Call x11drv.SelectBrush(403b44b0,0000006e) ret=4070c3b2 08070840:Ret x11drv.SelectBrush() retval=0000006e ret=4070c3b2 08070840:Call x11drv.SetDeviceClipping(403b44b0) ret=406fecee 08070840:Ret x11drv.SetDeviceClipping() retval=00000000 ret=406fecee 08070840:Call x11drv.SelectBrush(403b44b0,0000006e) ret=4070c3b2 08070840:Ret x11drv.SelectBrush() retval=0000006e ret=4070c3b2 08070840:Call x11drv.GetDeviceCaps(403b44b0,00000022) ret=407019ed 08070840:Ret x11drv.GetDeviceCaps() retval=000079f7 ret=407019ed 08070840:Call x11drv.SelectFont(403b44b0,000000a2) ret=4070c24c 08070840:Ret x11drv.SelectFont() retval=00000001 ret=4070c24c 08070840:Call x11drv.SelectPen(403b44b0,0000008a) ret=4070c3e1 08070840:Ret x11drv.SelectPen() retval=0000008a ret=4070c3e1 08070840:Call x11drv.SetBkColor(403b44b0,00ffffff) ret=40701a8a 08070840:Ret x11drv.SetBkColor() retval=00ffffff ret=40701a8a 08070840:Call x11drv.SetTextColor(403b44b0,00000000) ret=40701b3a 08070840:Ret x11drv.SetTextColor() retval=00000000 ret=40701b3a 08070840:Ret window proc 0x405e96f4 (hwnd=00010025,msg=BM_SETSTATE,wp=00000000,lp=00000000) retval=00000000 08070840:Call window proc 0x405e96f4 (hwnd=00010025,msg=WM_CAPTURECHANGED,wp=00000000,lp=00000000) 08070840:Ret window proc 0x405e96f4 (hwnd=00010025,msg=WM_CAPTURECHANGED,wp=00000000,lp=00000000) retval=00000000 08070840:Call window proc 0x4001c7f8 (hwnd=00010021,msg=WM_COMMAND,wp=00000002,lp=00010025) 08070840:Call user32.PostQuitMessage(00000000) ret=4001ce19 08070840:Ret user32.PostQuitMessage() retval=00000001 ret=4001ce19 08070840:Ret window proc 0x4001c7f8 (hwnd=00010021,msg=WM_COMMAND,wp=00000002,lp=00010025) retval=00000000 08070840:Ret window proc 0x405e96f4 (hwnd=00010025,msg=WM_LBUTTONUP,wp=00000000,lp=000a0057) retval=00000000 08070840:Ret user32.DispatchMessageA() retval=00000000 ret=4001c311 08070840:Call user32.GetMessageA(40586e18,00000000,00000000,00000000) ret=4001c31d 08070840:Call x11drv.MsgWaitForMultipleObjectsEx(00000000,00000000,00000000,00000000,00000000) ret=405deb9a 08070840:Ret x11drv.MsgWaitForMultipleObjectsEx() retval=00000102 ret=405deb9a 08070840:Ret user32.GetMessageA() retval=00000000 ret=4001c31d 08070840:Call kernel32.ExitProcess(00000000) ret=4001b07c 08070840:Call PE DLL (proc=0x405e5140,module=405c5000,type=0,res=0x1) 08070840:Ret PE DLL (proc=0x405e5140,module=405c5000,type=0,res=0x1) retval=1 08070840:Call PE DLL (proc=0x40829860,module=4081e000,type=0,res=0x1) 080a9e40:Ret x11drv.MsgWaitForMultipleObjectsEx() retval=00000001 ret=405deec9 080a9e40:Call x11drv.MsgWaitForMultipleObjectsEx(00000000,00000000,00000000,00000000,00000000) ret=405deb9a 080a9e40:Ret x11drv.MsgWaitForMultipleObjectsEx() retval=00000102 ret=405deb9a 080a9e40:Call x11drv.MsgWaitForMultipleObjectsEx(00000001,403b3070,ffffffff,00000000,00000000) ret=405deec9 08070840:Ret PE DLL (proc=0x40829860,module=4081e000,type=0,res=0x1) retval=1 08070840:Call PE DLL (proc=0x406ee894,module=406e1000,type=0,res=0x1) 08070840:Ret PE DLL (proc=0x406ee894,module=406e1000,type=0,res=0x1) retval=1 08070840:Call PE DLL (proc=0x407749e0,module=40764000,type=0,res=0x1) 08070840:Ret PE DLL (proc=0x407749e0,module=40764000,type=0,res=0x1) retval=1 wine: Unhandled exception, starting debugger... err:win:WIN_FindWndPtr window 10021 belongs to other process err:win:WIN_FindWndPtr window 10021 belongs to other process

2 1

Re: error: no implementation for WININET.dll.102(InternetGetConnectedState)
by Jason M Bell April 3, 2002

April 3, 2002

okay - Alexandre's solution did it. After turning on --debugmsg +loaddll, I noticed that wininet.dll was being loaded from "c:\windows\system". I'm running wine from a UNIX partition. adding "wininet" = "builtin, native" to config fixed the problem. thanks, Jason

4 5