wine-devel

wine-devel@winehq.org

10 participants
84459 discussions

Linear and segmented memory drifting apart
by Uwe Bonnes 04 Dec '01

04 Dec '01

Hallo, the installer of MS Encarta 99 is a mixture of 16 and 32 bit code. Soemthing seems wrong here: Some 16 bit memory if filled with a string 89497 08483bf8:Call KERNEL.88: LSTRCPY(0x03f7781a,0x03177044 "%CMDLINE%") ret=030f:0687 ds=031f 89498 08483bf8:Ret KERNEL.88: LSTRCPY() retval=0x03f7781a ret=030f:0687 ds=031f A 32 bit handle to that memory is aquired: 89503 08483bf8:Call KERNEL.516: GETVDMPOINTER32W(0x03f7781a,0x0001) ret=030f:ae4a ds=031f 89504 08483bf8:Ret KERNEL.516: GETVDMPOINTER32W() retval=0x40498d2e ret=030f:ae4a ds=031f Access to the 32 bit view of that memory goes astray 113220 08483bf8:Call kernel32.lstrcmpA(40498d2e "\021\021\021\021\021\021\021\021...1 113221 08483bf8:Ret kernel32.lstrcmpA() retval=ffffffff ret=10001464 But the 16 bit view still gives the right result: 113785 08483bf8:Call KERNEL.90: LSTRLEN(0x03f7781a "%CMDLINE%") ret=030f:a525 ds=031f 113786 08483bf8:Ret KERNEL.90: LSTRLEN() retval=0x0009 ret=030f:a525 ds=031f Trying to debug a little, I looked at the 32 bit view and it's content is right right after the GETVDMPOINTER32W call. If I debugged right, the content of *0x40498d2e seemed to change inside the application code and not in a wine function. But why at all gives the lstrlen call in line 113785 still the right result? Bye Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Free Software: If you contribute nothing, expect nothing --

1 0

[RFC] Async I/O patch: server code + ReadFileEx()
by Martin Wilck 04 Dec '01

04 Dec '01

Hi, here is a patch that fixes some of the issues with the async IO implementation in Wine that we discussed previously. My work on this was delayed by other duties, sorry. To make matters worse, I'll be out of office for the next 4 weeks (vacation :-) THIS PATCH IS NOT FOR PRODUCTION USE. I am submitting it as a RFC to show the basic concepts I am aiming at. Most important is the server-side code (server/async.h, server/async.c) that demonstrates the basic mechanism I am suggesting. As an example, I recoded ReadFileEx() to use the new approach. Basic testing with disk file I/O works as expected. The code no longer messes up the order of requests. Please have a look at this code and tell me if you consider it a reasonable basis for further development. The patch is against today's (04/12/2001) CVS version. Regards, Martin -- Martin Wilck Phone: +49 5251 8 15113 Fujitsu Siemens Computers Fax: +49 5251 8 20409 Heinz-Nixdorf-Ring 1 mailto:Martin.Wilck@Fujitsu-Siemens.com D-33106 Paderborn http://www.fujitsu-siemens.com/primergy diff -ruN -X diffignore CVS/wine/files/file.c MW/wine/files/file.c --- CVS/wine/files/file.c Mon Dec 3 13:08:10 2001 +++ MW/wine/files/file.c Tue Dec 4 22:10:16 2001 @@ -57,6 +57,19 @@ static HANDLE dos_handles[DOS_TABLE_SIZE]; +typedef struct file_async_request { + int fd; + HANDLE request_handle; + LPOVERLAPPED ovl; + LPOVERLAPPED_COMPLETION_ROUTINE completion_func; + LPVOID buffer; + unsigned int count; + mode_t flags; +} file_async_request; + +/* A trick to avoid clash with S_IFMT */ +#define _FILE_ASYNC_CANSEEK S_IXOTH +#define FILE_ASYNC_CANSEEK(as_req) ((as_req)->flags & _FILE_ASYNC_CANSEEK) /*********************************************************************** * FILE_ConvertOFMode @@ -1256,6 +1269,231 @@ return FALSE; } +static void FILE_AsyncIoFinish (struct file_async_request* as) +{ + LPOVERLAPPED ovl = as->ovl; + + NtSetEvent (ovl->hEvent, NULL); + + /* This will dequeue the request in the server */ + CloseHandle (as->request_handle); + close (as->fd); + + HeapFree (GetProcessHeap(), 0, as); + SetLastError (ovl->Internal); /* FIXME: correct ?? */ +} + +/*********************************************************************** + * FILE_AsyncIoFinish (INTERNAL) + * + */ +static void CALLBACK FILE_AsyncIoCallCompletion (ULONG_PTR data) +{ + struct file_async_request *as = (struct file_async_request*) data; + LPOVERLAPPED ovl = as->ovl; + + TRACE ("as %p, ovl %p, func %p, status %lx, transferred %ld\n", + as, ovl, as->completion_func, ovl->Internal, ovl->InternalHigh); + + as->completion_func (ovl->Internal, ovl->InternalHigh, ovl); + + FILE_AsyncIoFinish (as); + +} + +/*********************************************************************** + * FILE_ReadFile_APC (INTERNAL) + * + */ +static void FILE_ReadFile_APC (struct file_async_request *as, int events) +{ + int r; + int already; + LPOVERLAPPED ovl = as->ovl; + + TRACE ("events: %x, request: %p\n", events, as); + + if (ovl->Internal != STATUS_PENDING) + { + ERR ("status is %lx, should be %x\n", ovl->Internal, STATUS_PENDING); + r = STATUS_UNSUCCESSFUL; + goto apc_end; + } + + if (events & (POLLHUP | POLLERR | POLLNVAL)) + { + TRACE ("poll error condition for fd %d in async request %p\n", as->fd, as); + r = STATUS_UNSUCCESSFUL; + goto apc_end; + } + + if (!events) + { + TRACE ("read timed out\n"); + r = STATUS_TIMEOUT; + goto apc_end; + } + + already = ovl->InternalHigh; + + if (FILE_ASYNC_CANSEEK (as)) + { + off_t ofs = already + ovl->Offset + ((off_t) ovl->OffsetHigh << 32); + r = pread (as->fd, as->buffer + already, as->count - already, ofs); + } + else + r = read (as->fd, as->buffer + already, as->count - already); + + if (r < 0) + { + int err = errno; + TRACE ("read returned errno %d\n", err); + r = (err == EAGAIN || err == EINTR ? STATUS_PENDING : STATUS_UNSUCCESSFUL); + goto apc_end; + } + + else if (!r) + { + r = STATUS_END_OF_FILE; + goto apc_end; + } + + TRACE ("read %d bytes, cumul: %d, requested: %d\n", r, already + r, as->count); + ovl->InternalHigh += r; + + /* FIXME: is this correct behaviour ? */ + /* If less then count (but > 0) bytes were read, we return success for FIFOs */ + /* For regular files, this should only happen at EOF */ + + if (ovl->InternalHigh >= as->count || !S_ISREG (as->flags)) + r = STATUS_SUCCESS; + else + r = STATUS_END_OF_FILE; + +apc_end: + + ovl->Internal = r; + + if (r == STATUS_PENDING) + { + + TRACE ("rescheduling request\n"); + SERVER_START_REQ (requeue_async_request) + { + req->handle = as->request_handle; + r = wine_server_call_err (req); + } + SERVER_END_REQ; + + if (r) + ovl->Internal = RtlNtStatusToDosError (r); + else + return; + } + + TRACE ("request finished, status: %x\n", r); + + if (as->completion_func) + QueueUserAPC (FILE_AsyncIoCallCompletion, GetCurrentThread(), (ULONG_PTR) as); + else + FILE_AsyncIoFinish (as); +} + +/*********************************************************************** + * FILE_ReadFileEx (INTERNAL) + */ +static BOOL FILE_ReadFileEx (HANDLE hFile, LPVOID buffer, DWORD bytesToRead, + LPOVERLAPPED overlapped, + LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) +{ + struct file_async_request *as; + int fd, r, err; + struct stat st; + + TRACE ("file %d to buf %p num %ld %p func %p\n", + hFile, buffer, bytesToRead, overlapped, lpCompletionRoutine); + + /* check that there is an overlapped struct with an event flag */ + if ( (overlapped==NULL) || NtResetEvent( overlapped->hEvent, NULL ) ) + { + TRACE ("Overlapped not specified or invalid event flag\n"); + err = ERROR_INVALID_PARAMETER; + goto out_err; + } + + fd = FILE_GetUnixHandle( hFile, GENERIC_READ ); + if(fd < 0) + { + TRACE ("Cannot get fd\n"); + err = ERROR_INVALID_HANDLE; + goto out_err; + } + + as = (struct file_async_request*) + HeapAlloc (GetProcessHeap(), 0, sizeof (struct file_async_request)); + + if(!as) + { + TRACE ("HeapAlloc Failed\n"); + err = ERROR_NOT_ENOUGH_MEMORY; + goto out_close; + } + + overlapped->InternalHigh = 0; + overlapped->Internal = STATUS_PENDING; + + as->fd = fd; + as->ovl = overlapped; + as->completion_func = lpCompletionRoutine; + as->buffer = buffer; + + if (fstat (fd, &st) == -1) + { + TRACE ("cannot fstat fd %d\n", fd); + err = ERROR_FILE_INVALID; + goto out_free; + } + + as->flags = st.st_mode & S_IFMT; + if (lseek (fd, 0, SEEK_CUR) != -1) + as->flags |= _FILE_ASYNC_CANSEEK; + + SERVER_START_REQ (create_async_request) + { + req->type = ASYNC_TYPE_READ; + req->io_handle = hFile; + req->count = as->count = bytesToRead; + req->func = FILE_ReadFile_APC; + req->data = as; + r = wine_server_call_err (req); + if (!r) + as->request_handle = reply->handle; + } + SERVER_END_REQ; + + if (r) + { + TRACE ("Couldn't create request: %lx\n", GetLastError()); + err = RtlNtStatusToDosError (r); + goto out_free; + } + + TRACE ("success\n"); + return TRUE; + +out_free: + HeapFree (GetProcessHeap(), 0, as); + +out_close: + close (fd); + +out_err: + SetLastError (err); + return FALSE; + +} + + /*********************************************************************** * FILE_AsyncReadService (INTERNAL) * @@ -1354,7 +1592,7 @@ /*********************************************************************** * FILE_ReadFileEx (INTERNAL) */ -static BOOL FILE_ReadFileEx(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, +static BOOL FILE_ReadFileExOLD(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPOVERLAPPED overlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { @@ -1456,27 +1694,32 @@ } /* see if we can read some data already (this shouldn't block) */ - result = read( unix_handle, buffer, bytesToRead ); - close(unix_handle); - if(result<0) - { - FILE_SetDosError(); - return FALSE; - } +/* !! MW: commented out immediate reading for testing purposes (test overlapped IO) !! */ + + result = 0; + +/* result = read( unix_handle, buffer, bytesToRead ); */ +/* close(unix_handle); */ + +/* if(result<0) */ +/* { */ +/* FILE_SetDosError(); */ +/* return FALSE; */ +/* } */ /* if we read enough to keep the app happy, then return now */ - if(result>=bytesToRead) - { - *bytesRead = result; - return TRUE; - } +/* if(result>=bytesToRead) */ +/* { */ +/* *bytesRead = result; */ +/* return TRUE; */ +/* } */ /* at last resort, do an overlapped read */ overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = result; - if(!FILE_ReadFileEx(hFile, buffer, bytesToRead, overlapped, NULL)) + if(!FILE_ReadFileEx (hFile, buffer, bytesToRead, overlapped, NULL)) return FALSE; /* fail on return, with ERROR_IO_PENDING */ diff -ruN -X diffignore CVS/wine/server/async.c MW/wine/server/async.c --- CVS/wine/server/async.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/async.c Tue Dec 4 22:05:19 2001 @@ -3,20 +3,477 @@ * * Copyright (C) 1998 Alexandre Julliard * Copyright (C) 2000 Mike McCormack + * Copyright (C) 2001 Martin Wilck * */ #include "config.h" #include <assert.h> +#include <stdio.h> #include <string.h> #include <stdlib.h> #include <unistd.h> +#include <sys/poll.h> #include "handle.h" #include "thread.h" #include "request.h" +#include "async.h" +/* This is a wine server object only because we need a client handle for later reference */ +struct async_request +{ + struct object obj; + struct async_request *next; /* Linked list of requests */ + struct async_request *prev; + struct thread *thread; /* Thread or process that issued this request */ + struct object *io_obj; /* The object that represents the IO in the server */ + unsigned int events; /* Events this request is interested in */ + unsigned int flags; /* Request type, misc flags */ + struct timeout_user *timeout; /* For timeout requests */ + struct timeval tv; /* Time at which request times out */ + int count; /* Number of bytes to transfer, needed for setup */ + int result; /* Async IO result - FIXME: do we need this ? */ + async_io_handler_t func; /* Client handler function */ + void *data; /* Client handler data */ +}; + +static void async_request_dump (struct object *, int); +static void async_request_destroy (struct object *obj ); +static const struct object_ops async_request_ops = +{ + sizeof (struct async_request), /* size */ + async_request_dump, /* dump */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ + NULL, /* get_poll_events */ + NULL, /* poll_event */ + no_get_fd, /* get_fd */ + no_flush, /* flush */ + no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ + async_request_destroy /* destroy */ +}; + +static void +async_request_dump (struct object *obj, int verbose) +{ + struct async_request *r = (struct async_request*) obj; + + assert (obj->ops == &async_request_ops); + + fprintf (stderr, "async_request: io_obj: %p events: %x, flags: %x\n", + r->io_obj, r->events, r->flags); + if (!verbose) + return; + fprintf (stderr, " %s" + " func: %p, data: %p\n", + (r->timeout ? "with timeout\n" : ""), + r->func, r->data); +} + +struct async* +alloc_async (struct object *obj) +{ + struct async *async = NULL; + async = mem_alloc (sizeof (struct async)); + if (async) { + async->readers = async->writers = async->others = NULL; + async->flags = 0U; + async->wait.obj = obj; + async->poll_event = async_poll_event_1; + async->get_poll_events = async_get_poll_events_1; + async->setup_request = async_setup_request; + } + return async; +} + +static inline struct async_request** +get_async_queue (struct async* async, struct async_request* request) +{ + switch (ASYNC_REQUEST_TYPE (request)) + { + case ASYNC_TYPE_READ: + return &async->readers; + case ASYNC_TYPE_WRITE: + return &async->writers; + default: + return &async->others; + } +} + +static void +queue_async_request (struct object *obj, struct async* async, struct async_request* req) +{ + struct async_request **queue = get_async_queue (async, req); + int must_add = (! (async->readers || async->writers || async->others)); + + if (!(*queue)) + *queue = req->prev = req->next = req; + else + { + struct async_request *last = (*queue)->prev; + last->next = req; + req->next = *queue; + req->prev = last; + (*queue)->prev = req; + } + + if (must_add) + obj->ops->add_queue (obj, &async->wait); +} + +static void +dequeue_async_request (struct object* obj, struct async_request* req) +{ + struct async *async; + struct async_request **queue; + + obj->ops->get_async (obj, &async); + + if (!async) + { + fprintf (stderr, "dequeue_async_request: invalid IO object\n"); + goto do_req; + } + + queue = get_async_queue (async, req); + + if (!(*queue)) + { + fprintf (stderr, "dequeue_async_request: no queue\n"); + goto do_req; + } + + if (!(req->next && req->prev)) + { + fprintf (stderr, "dequeue_async_request: request isn't queued\n"); + goto do_req; + } + + if (req->next == req) /* One-element-list */ + { + if (*queue == req) + { + *queue = NULL; + + /* remove the IO object from poll wait queue if all request queues are empty */ + if (! (async->readers || async->writers || async->others)) + obj->ops->remove_queue (obj, &async->wait); + } + else /* One element lists must be queue heads */ + { + fprintf (stderr, "dequeue_async_request: invalid request\n"); + goto do_req; + } + } + else + { + req->next->prev = req->prev; + req->prev->next = req->next; + if (*queue == req) + *queue = req->next; + } + + /* The event set may have changed after we removed this request */ + set_select_events (obj, obj->ops->get_poll_events (obj)); + +do_req: + /* After handling the queues, carry out the necessary steps for this request */ + + if (req->timeout) + { + remove_timeout_user (req->timeout); + req->timeout = NULL; + } + + req->next = req->prev = NULL; + return; +} + +static void +async_request_destroy (struct object *obj ) +{ + struct async_request *r = (struct async_request*) obj; + struct object *io; + + assert (obj->ops == &async_request_ops); + + io = r->io_obj; + grab_object (io); + dequeue_async_request (io, r); + release_object (io); +} + +static inline int +queue_async_apc (struct async_request *request, int event) +{ + if (ASYNC_REQUEST_APC_QUEUED (request)) + return 0; + + request->flags |= _ASYNC_REQUEST_APC_QUEUED; + + if (request->timeout) /* Not a timeout */ + { + remove_timeout_user (request->timeout); + request->timeout = NULL; + } + + thread_queue_apc (request->thread, + NULL, /* no owner - don't dequeue other APCs */ + request->func, + APC_ASYNC, + 1, /* use system queue */ + 2, /* number of arguments */ + request->data, /* client data */ + event); + return 1; +} + +static void +async_timeout (void* private) +{ + struct async_request *r = (struct async_request*) private; + r->timeout = NULL; + queue_async_apc (r, 0); +} + +static void +async_queue_all (struct async_request* queue, int event) +{ + struct async_request* r; + + if (!queue) + return; + + r = queue; + + queue_async_apc (r, event); + for (r = r->next; r != queue; r = r->next) + queue_async_apc (r, event); +} + +static void +async_queue_all_matching (struct async_request* queue, int event) +{ + struct async_request* r; + + if (!queue) + return; + + r = queue; + if (r->events & event) + queue_async_apc (r, event); + for (r = r->next; r != queue; r = r->next) + if (r->events & event) + queue_async_apc (r, event); +} + +/* This function never dequeues anything. Requests are only + taken off the queue(s) if the client side signals they have finished. */ +/* This variant queues only the first reader / writer. */ +/* Other variations may follow that queue more than a single request at a time + for objects that support it. */ +/* Note that objects that implement async IO may use their own function instead, + which should provide similar functionality . */ +void +async_poll_event_1 (struct object* obj, int event) +{ + struct async *async; + struct async_request *request; + obj->ops->get_async (obj, &async); + + if (!async) + { + fprintf (stderr, "aync_poll_event: invalid object\n"); + return; + } + + if ((request = async->readers) && (event & POLLIN) && queue_async_apc (request, event)) + event &= ~POLLIN; /* FIXME: is this correct ? */ + + if ((request = async->writers) && (event & POLLOUT) && queue_async_apc (request, event)) + event &= ~POLLOUT; /* FIXME: is this correct ? */ + + async_queue_all_matching (async->others, event); + + /* Queue everything unconditionally if we got errors - client side must cancel the requests */ + if (event & (POLLHUP | POLLERR | POLLNVAL)) + { + async_queue_all (async->readers, event); + async_queue_all (async->writers, event); + async_queue_all (async->others, event); + } + + /* re-check the event list we listen to */ + set_select_events (obj, obj->ops->get_poll_events (obj)); + return; +} + +/* Requests that are already queued do not take part in polling anymore */ +/* This variant assumes only one reader / writer can receive events */ +/* Note that objects that implement async IO may use their own function instead, + which should provide similar functionality . */ +int +async_get_poll_events_1 (struct object* obj) +{ + struct async *as = NULL; + int ret = POLLHUP | POLLERR | POLLNVAL; /* catch errors */ + + obj->ops->get_async (obj, &as); + + if (!as) + return -1; + + if (as->readers && !ASYNC_REQUEST_APC_QUEUED(as->readers)) + ret |= POLLIN; + + if (as->writers && !ASYNC_REQUEST_APC_QUEUED(as->writers)) + ret |= POLLOUT; + + if (as->others) + { + struct async_request *r = as->others; + if (!ASYNC_REQUEST_APC_QUEUED(r)) + ret |= r->events; + for (r = r->next; r != as->others; r = r->next) + if (!ASYNC_REQUEST_APC_QUEUED(r)) + ret |= r->events; + } + + return ret; +} + +/* Default (dummy) setup function. Supports only read and write, and disables timeouts. */ +/* This will be overwritten e.g. by the serial port implementation. */ +int +async_setup_request (struct async* async, struct async_request* request) +{ + request->tv.tv_usec = request->tv.tv_sec = 0; + + request->events = 0; + switch (ASYNC_REQUEST_TYPE (request)) + { + case ASYNC_TYPE_READ: + request->events |= POLLIN; + break; + case ASYNC_TYPE_WRITE: + request->events |= POLLOUT; + break; + default: + fprintf (stderr, "async_setup_request: unsupported request type\n"); + return -1; + }; + return 0; +} + +static struct async_request* +alloc_async_request (struct object *obj) +{ + struct async_request* r = NULL; + r = alloc_object (&async_request_ops, -1); + if (r) + { + r->io_obj = obj; + r->thread = current; + r->prev = r->next = NULL; + r->timeout = NULL; + r->result = 0; + } + return r; +} + +DECL_HANDLER (create_async_request) +{ + struct object *obj; + struct async *async; + struct async_request *request; + int err = STATUS_INVALID_HANDLE; + + if (!(obj = get_handle_obj( current->process, req->io_handle, 0, NULL ))) + goto out; + + if ((err = obj->ops->get_async (obj, &async)) != STATUS_SUCCESS) + goto error; + + request = alloc_async_request (obj); + + if (!request) + { + err = STATUS_NO_MEMORY; + goto error; + } + + /* FIXME: flags other than type ? */ + request->flags = req->type & (~_ASYNC_REQUEST_APC_QUEUED & ASYNC_REQUEST_TYPE_MASK); + request->count = req->count; + request->func = req->func; + request->data = req->data; + + if (async->setup_request (async, request) < 0) + { + err = STATUS_UNSUCCESSFUL; + goto free; + } + + if (ASYNC_USES_TIMEOUT (async)) + request->timeout = add_timeout_user (&request->tv, async_timeout, request); + + queue_async_request (obj, async, request); + + reply->handle = alloc_handle (current->process, request, GENERIC_READ|GENERIC_WRITE, 0); + set_error (STATUS_SUCCESS); /* FIXME - is that necessary ?? */ + + release_object (request); + release_object (obj); /* FIXME: should we skip this release_object to prevent + the io-object to be freed while there are async requests around, + or should the destroy routine of the object handle that ?? */ + + return; + +free: + release_object (request); + +error: + release_object (obj); + +out: + reply->handle = 0; + set_error (err); + return; +} + +/* This is called when an APC does not finish */ +DECL_HANDLER(requeue_async_request) +{ + struct async_request *request; + int err = STATUS_INVALID_HANDLE; + struct object *io; + + if (!(request = (struct async_request*) get_handle_obj (current->process, req->handle, 0, NULL)) + || request->obj.ops != &async_request_ops + || !ASYNC_REQUEST_APC_QUEUED (request)) + goto out; + + io = request->io_obj; + grab_object (io); + + request->flags &= ~_ASYNC_REQUEST_APC_QUEUED; + set_select_events (io, io->ops->get_poll_events (io)); + + release_object (io); + err = STATUS_SUCCESS; + +out: + set_error (err); + return; +} + + +/* The current CVS code, in order not to break Wine */ DECL_HANDLER(create_async) { @@ -32,3 +489,4 @@ release_object(obj); } + diff -ruN -X diffignore CVS/wine/server/async.h MW/wine/server/async.h --- CVS/wine/server/async.h Thu Jan 1 01:00:00 1970 +++ MW/wine/server/async.h Tue Dec 4 16:19:54 2001 @@ -0,0 +1,48 @@ +/* + * Wine server async I/O support + * + * Copyright (C) 2001 Martin Wilck + */ + +#ifndef __WINE_SERVER_ASYNC_H +#define __WINE_SERVER_ASYNC_H + +#include "object.h" + +#define _ASYNC_USES_TIMEOUT 0x01U +#define ASYNC_USES_TIMEOUT(async) ((async)->flags & _ASYNC_USES_TIMEOUT) + +#define ASYNC_REQUEST_TYPE_MASK 0xffU +#define ASYNC_REQUEST_TYPE(req) ((req)->flags & ASYNC_REQUEST_TYPE_MASK) +#define _ASYNC_REQUEST_APC_QUEUED 0x100U +#define ASYNC_REQUEST_APC_QUEUED(req) ((req)->flags & _ASYNC_REQUEST_APC_QUEUED) + +struct async_request; +typedef int (*async_get_poll_events_t) (struct object*); +typedef void (*async_poll_event_t) (struct object*, int); +typedef int (*async_setup_request_t) (struct async*, struct async_request*); +typedef void (*async_io_handler_t) (void*, int); + +/* This struct contains information about async IO features + of a given I/O object (file, comm port, socket ...) */ +struct async +{ + struct async_request *readers; /* List of read requests */ + struct async_request *writers; /* List of write requests */ + struct async_request *others; /* List of requests that dont't read or write */ + unsigned int flags; /* Misc flags */ + struct wait_queue_entry wait; /* wait queue entry */ + async_poll_event_t poll_event; /* Function: react on poll event */ + async_get_poll_events_t get_poll_events; /* Function: get events to react on */ + async_setup_request_t setup_request; /* Function: Setup an event (timeout, events) at queue time */ +}; + +/* Default handlers, can be overwritten */ +int async_get_poll_events_1 (struct object*); +void async_poll_event_1 (struct object*, int); +int async_setup_request (struct async*, struct async_request*); + +/* Utility functions */ +struct async* alloc_async (struct object*); + +#endif /* #ifndef __WINE_SERVER_ASYNC_H */ diff -ruN -X diffignore CVS/wine/server/atom.c MW/wine/server/atom.c --- CVS/wine/server/atom.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/atom.c Mon Dec 3 13:09:03 2001 @@ -59,6 +59,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ atom_table_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/change.c MW/wine/server/change.c --- CVS/wine/server/change.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/change.c Mon Dec 3 13:09:03 2001 @@ -37,6 +37,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ no_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/console.c MW/wine/server/console.c --- CVS/wine/server/console.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/console.c Mon Dec 3 13:43:50 2001 @@ -40,6 +40,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ console_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ console_input_destroy /* destroy */ }; @@ -68,6 +69,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ console_input_events_destroy /* destroy */ }; @@ -108,6 +110,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ console_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ screen_buffer_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/debugger.c MW/wine/server/debugger.c --- CVS/wine/server/debugger.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/debugger.c Mon Dec 3 13:09:04 2001 @@ -58,6 +58,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ debug_event_destroy /* destroy */ }; @@ -78,6 +79,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ debug_ctx_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/device.c MW/wine/server/device.c --- CVS/wine/server/device.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/device.c Mon Dec 3 13:09:04 2001 @@ -44,6 +44,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ device_get_info, /* get_file_info */ + no_get_async, /* get_async */ no_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/event.c MW/wine/server/event.c --- CVS/wine/server/event.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/event.c Mon Dec 3 13:09:04 2001 @@ -38,6 +38,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ no_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/file.c MW/wine/server/file.c --- CVS/wine/server/file.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/file.c Tue Dec 4 17:57:22 2001 @@ -29,6 +29,7 @@ #include "handle.h" #include "thread.h" #include "request.h" +#include "async.h" struct file { @@ -39,6 +40,7 @@ unsigned int flags; /* flags (FILE_FLAG_*) */ unsigned int sharing; /* file sharing mode */ int drive_type; /* type of drive the file is on */ + struct async *async; /* Control structure for async IO */ }; #define NAME_HASH_SIZE 37 @@ -47,10 +49,12 @@ static void file_dump( struct object *obj, int verbose ); static int file_get_poll_events( struct object *obj ); +static void file_poll_event(struct object *,int); static int file_get_fd( struct object *obj ); static int file_flush( struct object *obj ); static int file_get_info( struct object *obj, struct get_file_info_reply *reply ); static void file_destroy( struct object *obj ); +static int file_get_async(struct object *,struct async **); static const struct object_ops file_ops = { @@ -61,10 +65,11 @@ default_poll_signaled, /* signaled */ no_satisfied, /* satisfied */ file_get_poll_events, /* get_poll_events */ - default_poll_event, /* poll_event */ + file_poll_event, /* poll_event */ file_get_fd, /* get_fd */ file_flush, /* flush */ file_get_info, /* get_file_info */ + file_get_async, /* get_async */ file_destroy /* destroy */ }; @@ -115,6 +120,7 @@ file->flags = attrs; file->sharing = sharing; file->drive_type = drive_type; + file->async = NULL; } return file; } @@ -247,11 +253,27 @@ struct file *file = (struct file *)obj; int events = 0; assert( obj->ops == &file_ops ); + + if (file->flags & FILE_FLAG_OVERLAPPED && file->async) + return async_get_poll_events_1 (obj); + if (file->access & GENERIC_READ) events |= POLLIN; if (file->access & GENERIC_WRITE) events |= POLLOUT; return events; } +static void file_poll_event(struct object *obj, int events) +{ + struct file *file = (struct file *)obj; + assert( obj->ops == &file_ops ); + + if (file->flags & FILE_FLAG_OVERLAPPED && file->async) + /* FIXME: Could we have non-async requests waiting for input also ? */ + async_poll_event_1 (obj, events); + else + default_poll_event (obj, events); +} + static int file_get_fd( struct object *obj ) { struct file *file = (struct file *)obj; @@ -307,7 +329,23 @@ reply->index_low = st.st_ino; reply->serial = 0; /* FIXME */ } + + if (file->flags & FILE_FLAG_OVERLAPPED) + return FD_TYPE_OVERLAPPED; + return FD_TYPE_DEFAULT; +} + +static int file_get_async(struct object *obj,struct async **pasync) +{ + struct file *file = (struct file *)obj; + assert (obj->ops == &file_ops); + if (!file->async) + { + file->async = alloc_async (obj); + } + *pasync = file->async; + return (file->async ? 0 : STATUS_NO_MEMORY); } static void file_destroy( struct object *obj ) diff -ruN -X diffignore CVS/wine/server/handle.c MW/wine/server/handle.c --- CVS/wine/server/handle.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/handle.c Mon Dec 3 13:09:04 2001 @@ -92,6 +92,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ handle_table_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/mapping.c MW/wine/server/mapping.c --- CVS/wine/server/mapping.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/mapping.c Mon Dec 3 13:09:04 2001 @@ -51,6 +51,7 @@ mapping_get_fd, /* get_fd */ no_flush, /* flush */ mapping_get_info, /* get_file_info */ + no_get_async, /* get_async */ mapping_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/mutex.c MW/wine/server/mutex.c --- CVS/wine/server/mutex.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/mutex.c Mon Dec 3 13:09:04 2001 @@ -42,6 +42,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ mutex_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/named_pipe.c MW/wine/server/named_pipe.c --- CVS/wine/server/named_pipe.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/named_pipe.c Mon Dec 3 13:09:04 2001 @@ -80,6 +80,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ named_pipe_destroy /* destroy */ }; @@ -101,6 +102,7 @@ pipe_user_get_fd, /* get_fd */ no_flush, /* flush */ pipe_user_get_info, /* get_file_info */ + no_get_async, /* get_async */ pipe_user_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/object.c MW/wine/server/object.c --- CVS/wine/server/object.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/object.c Mon Dec 3 13:09:04 2001 @@ -269,6 +269,13 @@ return FD_TYPE_INVALID; } +int no_get_async(struct object *obj,struct async **as) +{ + if (as) + *as = NULL; + return STATUS_OBJECT_TYPE_MISMATCH; +} + void no_destroy( struct object *obj ) { } diff -ruN -X diffignore CVS/wine/server/object.h MW/wine/server/object.h --- CVS/wine/server/object.h Mon Dec 3 13:08:11 2001 +++ MW/wine/server/object.h Mon Dec 3 13:16:09 2001 @@ -48,6 +48,8 @@ int (*flush)(struct object *); /* get file information */ int (*get_file_info)(struct object *,struct get_file_info_reply *); + /* fill in object-type specific async information */ + int (*get_async)(struct object *,struct async **); /* destroy on refcount == 0 */ void (*destroy)(struct object *); }; @@ -90,6 +92,7 @@ extern int no_get_fd( struct object *obj ); extern int no_flush( struct object *obj ); extern int no_get_file_info( struct object *obj, struct get_file_info_reply *info ); +extern int no_get_async(struct object *,struct async **); extern void no_destroy( struct object *obj ); extern int default_poll_add_queue( struct object *obj, struct wait_queue_entry *entry ); extern void default_poll_remove_queue( struct object *obj, struct wait_queue_entry *entry ); diff -ruN -X diffignore CVS/wine/server/pipe.c MW/wine/server/pipe.c --- CVS/wine/server/pipe.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/pipe.c Mon Dec 3 13:09:04 2001 @@ -53,6 +53,7 @@ pipe_get_fd, /* get_fd */ no_flush, /* flush */ pipe_get_info, /* get_file_info */ + no_get_async, /* get_async */ pipe_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/process.c MW/wine/server/process.c --- CVS/wine/server/process.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/process.c Mon Dec 3 13:09:06 2001 @@ -53,6 +53,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ process_destroy /* destroy */ }; @@ -92,6 +93,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ startup_info_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/protocol.def MW/wine/server/protocol.def --- CVS/wine/server/protocol.def Mon Dec 3 13:08:11 2001 +++ MW/wine/server/protocol.def Tue Dec 4 13:54:13 2001 @@ -1541,6 +1541,21 @@ #define ASYNC_TYPE_WRITE 0x02 #define ASYNC_TYPE_WAIT 0x03 +/* Schedule an ansync I/O request */ +@REQ(create_async_request) + handle_t io_handle; /* Handle to IO object that is capable of async IO */ + unsigned int type; /* READ / WRITE / WAIT */ + int count; /* Number of bytes to transfer, -1 if unknown */ + void* func; /* IO handler function */ + void* data; /* pointer to arbitrary data object, handled by func */ +@REPLY + handle_t handle; /* handle to request object for later use */ +@END + +/* Reschedule an unfinished async I/O request */ +@REQ(requeue_async_request) + handle_t handle; /* handle to the request object to be rescheduled */ +@END /* Create a named pipe */ @REQ(create_named_pipe) diff -ruN -X diffignore CVS/wine/server/queue.c MW/wine/server/queue.c --- CVS/wine/server/queue.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/queue.c Mon Dec 3 13:09:08 2001 @@ -112,6 +112,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ msg_queue_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/registry.c MW/wine/server/registry.c --- CVS/wine/server/registry.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/registry.c Mon Dec 3 13:09:09 2001 @@ -142,6 +142,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ key_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/request.c MW/wine/server/request.c --- CVS/wine/server/request.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/request.c Mon Dec 3 13:09:09 2001 @@ -66,6 +66,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ master_socket_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/request.h MW/wine/server/request.h --- CVS/wine/server/request.h Mon Dec 3 13:08:11 2001 +++ MW/wine/server/request.h Tue Dec 4 16:20:02 2001 @@ -210,6 +210,8 @@ DECL_HANDLER(get_serial_info); DECL_HANDLER(set_serial_info); DECL_HANDLER(create_async); +DECL_HANDLER(create_async_request); +DECL_HANDLER(requeue_async_request); DECL_HANDLER(create_named_pipe); DECL_HANDLER(open_named_pipe); DECL_HANDLER(connect_named_pipe); @@ -364,6 +366,8 @@ (req_handler)req_get_serial_info, (req_handler)req_set_serial_info, (req_handler)req_create_async, + (req_handler)req_create_async_request, + (req_handler)req_requeue_async_request, (req_handler)req_create_named_pipe, (req_handler)req_open_named_pipe, (req_handler)req_connect_named_pipe, diff -ruN -X diffignore CVS/wine/server/semaphore.c MW/wine/server/semaphore.c --- CVS/wine/server/semaphore.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/semaphore.c Mon Dec 3 13:09:09 2001 @@ -38,6 +38,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ no_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/serial.c MW/wine/server/serial.c --- CVS/wine/server/serial.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/serial.c Mon Dec 3 13:09:09 2001 @@ -74,6 +74,7 @@ serial_get_fd, /* get_fd */ no_flush, /* flush */ serial_get_info, /* get_file_info */ + no_get_async, /* get_async */ no_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/snapshot.c MW/wine/server/snapshot.c --- CVS/wine/server/snapshot.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/snapshot.c Mon Dec 3 13:09:09 2001 @@ -50,6 +50,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ snapshot_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/sock.c MW/wine/server/sock.c --- CVS/wine/server/sock.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/sock.c Mon Dec 3 13:09:09 2001 @@ -77,6 +77,7 @@ sock_get_fd, /* get_fd */ no_flush, /* flush */ sock_get_info, /* get_file_info */ + no_get_async, /* get_async */ sock_destroy /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/thread.c MW/wine/server/thread.c --- CVS/wine/server/thread.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/thread.c Mon Dec 3 13:09:09 2001 @@ -76,6 +76,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ destroy_thread /* destroy */ }; diff -ruN -X diffignore CVS/wine/server/timer.c MW/wine/server/timer.c --- CVS/wine/server/timer.c Mon Dec 3 13:08:11 2001 +++ MW/wine/server/timer.c Mon Dec 3 13:09:09 2001 @@ -45,6 +45,7 @@ no_get_fd, /* get_fd */ no_flush, /* flush */ no_get_file_info, /* get_file_info */ + no_get_async, /* get_async */ timer_destroy /* destroy */ };

1 0

thread safing dlls
by Michael Zayats 04 Dec '01

04 Dec '01

this might be off topic, but let's try: I have a dll that is not thread safe (i.e. has many global variables, about 500). I have the sources for the dll. The target is to make it thread safe. Moving all the variables to thread specific storage is very complicated. Making it thread safe on ansi C level is very, very complicated too. I guess that you thoroughly deal with PE format. Is there a way to play with executable sections, such that every thread will use it's own copy of the data? I know one guy, that claimed that he has achieved this with 20 lines of code by directly modifying smth in executable, he doesn't want to tell me what he has done :( I also heard of __attribute((section... in gcc that should do the work (I am generally talking about windoze platform only), can you explain me what does it do in gcc? thank you in advance, Michael Zayats

2 1

Re:[PATCH] Horrid wineoss hack
by Eric Pouech 03 Dec '01

03 Dec '01

this is not the correct fix. there are several problems in the OSS driver (at least I know 3 of them, but didn't have time to fix them all yet in a proper way) this is not correct either (it's just a workaround) A+ > I have found that since a few weeks my Eudora was hanging > with current Cvs when I tried to get a new message off the server. > This occurred exactly when it was trying to play a sound to > warn about the new message. > > I have found that playing any sound using PlaySound is > triggering the new problem. On my older computer, the problem > just does not exist. After investigation, the older computer has a > true sound card (a sound blaster) while the new has just a Via > chip on the mother board (via82cxx_audio) > > This is the reason : the Via wineoss driver seems to be buggy, > when a sound is finished, the available space never goes back > to the total available. > > This problem did not happen with versions of audio.c < 1.45, > where the Wine code has been made to rely on this feature. > > ChangeLog: > > * dlls/winmm/wineoss/audio.c > Works around a bug in Via wineoss driver > > --------------- Eric Pouech (http://perso.wanadoo.fr/eric.pouech/) The future will be better tomorrow, Vice President Dan Quayle ____________________________________________________________ Faites un voeu et puis Voila ! www.voila.fr Avec Voila Mail, consultez vos e-mails sur votre mobile Wap.

1 0

Re: Win XP installation support?
by Hetz Ben-Hamo 03 Dec '01

03 Dec '01

Yes, that helps, could you commit it to the CVS please? Thanks, Hetz On Monday 03 December 2001 19:27 pm, you wrote: > At 05:57 PM 03/12/2001 +0200, you wrote: > >It doesn't patches currectly, got rejection (which is enclosed). > > Try with -l option > > Gerard

1 0

Re: Proposed solution for mouse capture problems
by Alexandre Julliard 03 Dec '01

03 Dec '01

Jukka Heinonen <jhei(a)iki.fi> writes: > 1. Function process_raw_mouse_message should only determine which > window was under mouse and resend message to that window as > a cooked message. Everything else (especially separating normal > messages from nonclient messages and handling mouse captures) > should be moved to process_cooked_mouse_message. Actually, > I fail to see why raw messages are needed at all, since function > SendInput could do this as well. No, processing raw messages requires sending messages to the app (mainly WM_NCHITTEST) and you cannot do this from anywhere. Also if you separate the window determination from the rest you'll have to send two WM_NCHITTEST for every message which is clearly wrong. Maybe what we should do is when the cooked message is rejected by the message filter it should be queued back as a raw message and processed again next time around. > 3. Supporting multi-threaded capture is actually the easiest part, > although it might be quite useless (Does any application really > require it?). When mouse button is pressed in capturing window, > process_cooked_mouse_message sets process-wide flag that states > that global capture is in effect. After that, either > process_raw_mouse_message or SendInput sees that this flag is > set and resends all mouse messages to capturing window until > button release message is received, which clears the flag. I'm not sure what you are trying to fix here. This should already work fine, X takes care of sending messages to the right thread when mouse is captured. -- Alexandre Julliard julliard(a)winehq.com

2 1

Re: Win XP installation support?
by Gerard Patel 03 Dec '01

03 Dec '01

At 04:47 AM 03/12/2001 +0200, you wrote: >I thought about that too, but it's not - here is the line from my /etc/fstab > >/dev/hda5 /mnt/win vfat defaults 0 0 >/dev/hda3 /mnt/dosc vfat defaults 0 0 > Try to apply the following patch to wineconf : --- wineconf.orig Thu Jun 7 22:25:06 2001 +++ wineconf Mon Dec 3 08:40:42 2001 @@ -146,6 +146,7 @@ my(@FATD)=@::FatDrives; my(@wininis) = (); my ($winini); + my ($ThisDrive); if (!$::opt_windir && !$::opt_fast && !$::opt_thorough) { $::opt_thorough++; @@ -161,8 +162,7 @@ } elsif ($::opt_thorough) { if ($::opt_debug) { print STDERR "DEBUG: Num FATD = ", $#FATD+1, "\n"; } - foreach(@FATD) { - my $ThisDrive = shift(@FATD); + foreach $ThisDrive (@FATD) { my $MntPoint = $ThisDrive->[1]; push(@wininis, `find $MntPoint -iname win.ini -print`); }¨\ Gerard

1 0

Win XP installation support?
by Hetz Ben-Hamo 03 Dec '01

03 Dec '01

Hi, I have installed wine cvs and I have here on this machine Windows XP pro installed.. now - the partition is fat32 and I can access it with /mnt/win without any problem. However, the tools/wineinstall script simply doesn't recognize my windows partition: windows]$ ls -l win* -rwxrwxrwx 1 root root 256192 Aug 23 13:00 winhelp.exe -rwxrwxrwx 1 root root 266752 Aug 23 13:00 winhlp32.exe -rwxrwxrwx 1 root root 504 Dec 1 22:25 win.ini -rwxrwxrwx 1 root root 48680 Aug 23 15:00 winnt256.bmp -rwxrwxrwx 1 root root 48680 Aug 23 15:00 winnt.bmp [hetz@witch windows]$ pwd /mnt/win/windows Now - running tools/wineinstall gives me this: wine]$ tools/wineinstall WINE Installer v0.7 Warning !! wine binary (still) found, which may indicate a (conflicting) previous installation. You might want to abort and uninstall Wine first. I see that WINE has already been configured, so I'll skip that. Hmm, looks like WINE is already compiled. I'll skip that too, I guess. You aren't root, so I'll skip the make install. NOTE! To run Wine without installing, you must set the environment variable LD_LIBRARY_PATH to /home/hetz/wine:/home/hetz/wine/dlls in your logon scripts. Create local config file ~/.wine/config? (yes/no) yes Found existing /home/hetz/.wine/config, if you continue this file will be overwritten. Continue running wineinstall? (yes/no) yes Searching for an existing Windows installation... not found. (no matching /etc/fstab mount entry found) Windows was not found on your system, so I assume you want a Wine-only installation. Am I correct? (yes/no) No, it's not correct. Any suggestions? (sorry if the email doesn't belong to this list) Thanks, -- Hetz Ben Hamo

2 3

Re: Include only needed headers in programs/winhelp
by Francois Gouget 03 Dec '01

03 Dec '01

On Sun, 2 Dec 2001, James Juran wrote: > James Juran <jamesjuran(a)alumni.psu.edu> > Only include the necessary files to avoid conflicts in gethostname > prototypes between winsock.h and unistd.h 'unistd.h' does not exist on Windows. Since this is a Winelib application it would be good to try to make it compile on Windows too. So I would rather be in favor of removing the 'unistd.h' #include directive unless something prevents that. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Any sufficiently advanced bug is indistinguishable from a feature. -- from some indian guy

2 4

gethostname prototypes [was: Re: wine's winhelp doesn't compile]
by James Juran 02 Dec '01

02 Dec '01

[taken to wine-devel, thread originally started in newsgroup] gerard patel wrote: > > >james[1]%rpm -qf /usr/include/unistd.h > >glibc-devel-2.2.4-19 > > glibc-devel-2.2.2-4mdk > > >james[2]%grep gethostname /usr/include/unistd.h > >extern int gethostname (char *__name, size_t __len) __THROW; > > extern int gethostname (char *__name, socklen_t __len) __THROW; > > ./include/bits/types.h:typedef unsigned int __socklen_t; This could be a problem. According to the glibc CVS, http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/include/unistd.h.diff?r1=…, the type of the 2nd argument changed from int to size_t on 2001/3/21. According to the CVS tags, this change was first released in glibc-2.2.3. We were able to work around this problem in programs/winhelp by not including winsock.h, but could this problem crop up anyplace else? It seems that it is currently impossible to include unistd.h and winsock.h on a machine with glibc >= 2.2.3. -- James Juran jamesjuran(a)alumni.psu.edu

2 1

Re: compatible DC/Bitmap fixes
by Ove Kaaven 02 Dec '01

02 Dec '01

On Sat, 1 Dec 2001, eric pouech wrote: > as Marcus reported, the console was only working in black & white > the cause of the error comes from the following flow > > 1/ GetDC (physical and/or display) > 2/ CreateCompatibleDC (on DC gotten from 1/) > 3/ CreateCompatibleBitmap (on DC gotten from 2/) What you *should* do is to call CreateCompatibleBitmap on the DC you got from GetDC. That's what all the Windows code I know of does. > the trouble is as follows : > - when a mem DC is created, its bits per pixel is always set to 1 Yes, that's documented Windows behaviour. You need to select a bitmap into it to change it. No Windows code expects otherwise.

1 0

DOS issue
by Johan Gill 01 Dec '01

01 Dec '01

Trying Monkey Island 1 & 2 with wine, I get very slow animation and a lot of err:module:DOSVM_Wait dosvm wait error=5. It seems to be wineserver related, so I'd rather not dig too deep without some feedback. There is a brief trace without any special flags at http://www.lysator.liu.se/~johane/monkey2_brief.txt. I ended the execution with Ctrl-C. A trace with +server,+module,+relay is available as http://www.lysator.liu.se/~johane/monkey2_zoom.txt. I've cut everything after the second occurence of the error. /Johan Gill, johane(a)lysator.liu.se

1 0

Re: Access Control Functions
by Mike McCormack 01 Dec '01

01 Dec '01

Hi Karl, > Everything works okay until we get to the access control functions. > advapi32.OpenProcessToken calls ntdll.OpenProcessToken, which is just a > stub. Did you try different -winver flags? it OpenProcessToken shouldn't be used in Win98.... That being said, it would be a very good thing to have a better security framework. Maybe we can even use it to integrate with samba-tng one day. i think you'd be looking to make a "token" object in the server. > I also am having trouble finding documentation on the make_requests tool. Well, run it after modifying server/protocol.def to propagate you changes to server/trace.c and include/wine/server.h. The format of the protocol.def file should be self explanatory... if i remember correctly, there are some small quirks like "void* xxx" works, but "void *xxx" doesn't. Mike ------------------------------------------ mailto:Mike_McCormack@start.com.au ph +82 16 430 0425 __________________________________________________________________ Get your free Australian email account at http://www.Looksmart.com.au

1 0

Access Control Functions
by Karl Bielefeldt 01 Dec '01

01 Dec '01

I am new to open source development and to the wine project so please forgive me for sounding like a newbie. I think wine is great and the key to the growth of Linux in the desktop market. I decided to begin my efforts by debugging the installation of MS Money 2001 (my wife's must-have MS program) on a completely non-windows box. This led to needing to install the msiexec installer (instmsia.exe, available from MS website). Everything works okay until we get to the access control functions. advapi32.OpenProcessToken calls ntdll.OpenProcessToken, which is just a stub. Now, as far as I can tell, the stubs default to the least restrictive set of permissions, which I believe is fine for our purposes. The problem comes when the program calls kernel32.CloseHandle on the non-existent handle that was returned by the OpenProcessToken stub. Somebody please stop me if there is an easier way of solving this problem. It looks like we at least need to create some sort of dummy handle that can be removed by kernel32.CloseHandle without causing an error. To do this we would need to add an open_process_token request handler to the wineserver (perhaps in a new file server/access.c). Another alternative would be to create an open_dummy_handle request handler in server/handle.c that could be used for any generic dummy handle. The advantage of the first method is that if someone decides to implement all the access control functions properly, the framework is already in place. Probably some combination of the two is best. I am willing to do the coding myself, but I'm unsure of the procedures for open source development. How do you decide what changes are to be made, how do you submit your changes, how do you make sure you don't undo what someone else did, and things like that? I also am having trouble finding documentation on the make_requests tool. Thanks for tolerating my newbieness. I'm looking forward to being able to start contributing to this great project. --Karl Bielefeldt kbielefe(a)hotmail.com _________________________________________________________________ Get your FREE download of MSN Explorer at http://explorer.msn.com/intl.asp

3 2

Re: Is there a good reason why we ...
by Alexandre Julliard 30 Nov '01

30 Nov '01

"Bill Medland" <medbi01_1(a)accpac.com> writes: > Is there a good reason why we have to specify the full correct path to a dll > in the dll overrides section if it isn't in the windows system? Because you can have multiple versions of the same dll in different directories, and we need a way of distinguishing them. For instance an app may include its own version of shell32 in its private directory, and you want to be able to switch this one to builtin without impacting other apps using the standard shell32. There may be better ways to provide this feature though, suggestions are welcome. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: [PROBLEM REPORT] Focus problem for mdi children
by Gerard Patel 30 Nov '01

30 Nov '01

At 09:35 PM 29/11/2001 -0800, you wrote: >*Doesn't this fix the problem in Word where if you have multiple >documents open and you switch between them, you can't use the menu bar >any longer?* Sorry, I don't know. I doubt it, since in mdi code it is stated that Word does not use MDI. Of course the comment has been here for a long time and could be obsolete, but I doubt that Ms could have switched Word to use MDI since they have obsoleted MDI since a long time. Gerard

1 0

Re: [PROBLEM REPORT] Focus problem for mdi children
by Michael Cardenas 30 Nov '01

30 Nov '01

*Doesn't this fix the problem in Word where if you have multiple documents open and you switch between them, you can't use the menu bar any longer?* ------------------------------------------------------------------------------- * From:* Alexandre Julliard (/ julliard(a)winehq.com/ <mailto:julliard@winehq.com?Subject=Re:%20%5BPROBLEM%20REPORT%5D%20Focus%20problem%20for%20mdi%20children&In-Reply-To=%3C87wv129jiq.fsf@mail.wine.dyndns.org%3E> ) *Date:* Wed Nov 07 2001 - 19:46:37 EST * ** Gerard Patel <gerard.patel(a)nerim.net <mailto:gerard.patel@nerim.net?Subject=Re:%20%5BPROBLEM%20REPORT%5D%20Focus%20problem%20for%20mdi%20children&In-Reply-To=%3C87wv129jiq.fsf@mail.wine.dyndns.org%3E>> writes: > Using this patch : > --- winpos.c.orig Wed Nov 7 10:41:32 2001 > +++ winpos.c Thu Nov 8 00:44:29 2001 > @@ -955,7 +955,20 @@ > ShowCaret(winpos->hwnd); > } > > - if (!(winpos->flags & SWP_NOACTIVATE)) SetActiveWindow( winpos->hwnd ); > + if (!(winpos->flags & SWP_NOACTIVATE)) > + { > + SetActiveWindow( winpos->hwnd ); > + if (!(wndPtr = WIN_FindWndPtr(winpos->hwnd))) return FALSE; > + > + /* child windows get WM_CHILDACTIVATE message */ > + if( (wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD ) > + { > + WIN_ReleaseWndPtr(wndPtr); > + SendMessageA(winpos->hwnd, WM_CHILDACTIVATE, 0, 0L); > + } > + else > + WIN_ReleaseWndPtr(wndPtr); > + } > > /* And last, send the WM_WINDOWPOSCHANGED message */ > > > seems to fix the problem. It may be too simple though :-) No actually it's pretty much the right thing. I have applied a slightly simplified version of your patch, thanks for the report. -- Alexandre Julliard julliard(a)winehq.com <mailto:julliard@winehq.com?Subject=Re:%20%5BPROBLEM%20REPORT%5D%20Focus%20problem%20for%20mdi%20children&In-Reply-To=%3C87wv129jiq.fsf@mail.wine.dyndns.org%3E> -- //------------------------------------------ Michael Cardenas Software Engineer Lindows.com, Inc. http://www.lindows.com 858-410-5950 619-972-8153 //------------------------------------------- --

1 0

Is there a good reason why we ...
by Bill Medland 29 Nov '01

29 Nov '01

I've just tripped over this again which reminded me to ask why we do it. Is there a good reason why we have to specify the full correct path to a dll in the dll overrides section if it isn't in the windows system? A program runs at some location on the path. It uses a dll which is in the same directory. I want explicitly to use a winelib builtin "dll" instead of it. I can't simply say "a4wwine"="builtin"; I have to use the full path. That would cause problems if the exe and dll moved. Is there a good reason for this behaviour? (i.e. would it be a waste of my time changing the dll override stuff?) Bill

1 0

FoxPro 5 Applications
by Rick Romero 29 Nov '01

29 Nov '01

Hello, I've been attempting to get Foxpro 5 applications running for a while now. Actually, I just download from cvs randomly, and see what happens. It's been a while, but I decided to try again in October. At that time, there was an OLE error, but the only other strange occurance was a 'locking' of the screen on a print preview. Since then, this 'locking' is the only issue (though I havn't yet attempted to print). The apps I'm trying are my own, basically just a form is called, the user puts in a date range, and a report is run. You can view the report in the print preview window, close the window, use the scroll button on the mouse to change pages, etc. BUT, if you click on the preview itself, and attempt to scroll down to the bottom of the page, a 'lockup' appears to happen. I've just been waiting around hoping for it to be fixed. Today, for giggles, I decided to run the whole Visual Foxpro development environment. It ran! (BTW, I'm trying to do this all with fake windows, and all I've added is the VFP 5 runtime) BUT, anytime I click in an edit Window, MDI interface, the program acts as if I'm holding the shift key down, and as I move my mouse, all the text gets highlighted. I can't 'turn it off', so if there wasn't any text there, it surely would appear locked. I've changed the config from the fake_windows, to point to my Win2k install, but the behavior is the same. I'm actually getting kind of excited now, because we're a small company, and all we run is Fox5 apps (SBT / Skyline -- well, and a couple Fox2.6 win), and Office 2k. If I can run the development environment in Linux, I can take a real look at using linux desktops, either directly, or via LTSP. I don't get any debug info when the 'shift' occurs, and I'm not sure how to dump enough information to see the 'shift keypress' happen (assuming I could fix the problem myself in a way that doesn't interfere with the programming standards..), can someone point me in the right direction? Thanks for your time. Rick Romero

1 0

Proposed solution for mouse capture problems
by Jukka Heinonen 29 Nov '01

29 Nov '01

Okay, here is my proposal about how to fix broken message handling when mouse capturing is in effect. I would like to get some comments so that I can see that I haven't missed anything essential and because I would like to know whether someone is already working on this... Proposal has three parts, but part number one is the most important one, other two parts just show what would need to be done to make capturing work like described in MSDN documentation. 1. Function process_raw_mouse_message should only determine which window was under mouse and resend message to that window as a cooked message. Everything else (especially separating normal messages from nonclient messages and handling mouse captures) should be moved to process_cooked_mouse_message. Actually, I fail to see why raw messages are needed at all, since function SendInput could do this as well. 2. When requesting queued messages from wineserver, the request should also include the window that is capturing mouse input in the current thread - or this could be stored in the wineserver. If there are queued cooked mouse messages, wineserver considers them as if all child windows of capturing window had the handle of the capturing window. This should prevent problems if application requests messages about a single window. 3. Supporting multi-threaded capture is actually the easiest part, although it might be quite useless (Does any application really require it?). When mouse button is pressed in capturing window, process_cooked_mouse_message sets process-wide flag that states that global capture is in effect. After that, either process_raw_mouse_message or SendInput sees that this flag is set and resends all mouse messages to capturing window until button release message is received, which clears the flag. Function process_cooked_mouse_message needs to eat these messages if target window was not capturing window anymore. Proper locking should make sure that no important messages are lost (mouse move events are not important; we might lose button release event, but only if capture has been stopped manually before that and in that case not delivering button release is likely the best thing to do). -- Jukka Heinonen <http://www.iki.fi/jhei/>

1 0

Re: [patch] Winsock fixes
by Ove Kaaven 29 Nov '01

29 Nov '01

On Wed, 28 Nov 2001, Paul Rupe wrote: > I have found two bugs in dlls/winsock/socket.c. One I posted about a > few days ago in wine.devel. WS_accept calls WS_getpeername but passes > it the Unix file descriptor rather than the Windows socket handle. A > simple one-line change takes care of that. That's Francois's fault, when he split out the sockaddr_xxx conversions. > The second problem is more subtle, and I'm not sure if my solution is > enough. In WINSOCK_DoAsyncEvent there is a loop that dispatches all > events currently available on the socket. The problem is the order, it > simply calls them in increasing order by FD_xxx values. Since FD_READ > is numerically smaller than FD_CONNECT, a socket that has both events > will fire the read event before the connect. When that happens, the app > gets a read event before it thinks it's connected and ignores it. > Ideally, the loop should post them in the order in which they occurred, > but does wine keep track of that? Instead, I changed the loop so that > it checks FD_CONNECT and FD_CLOSE before FD_READ and FD_WRITE. I'm not > sure if the order I chose is the optimal one, but the app I was testing > (Xnews) works every time now. It'd seem to me that FD_CLOSE should be dispatched last, not first... Anyway, now that Alexandre moved the window message queues away from the wine clients and into the wineserver, these event message dispatches could also be done in the wineserver (where the winsock events are generated), instead of using the service thread callback WINSOCK_DoAsyncEvent. Alexandre wants to phase out the service thread anyway, so he probably won't oppose this. Any volunteers for that?

1 0

New Idea
by Matt Q 29 Nov '01

29 Nov '01

I don't know if this is the right news group for this but what the heck... This is a new idea I had. It strikes me that it would be better if wine some how customised it's self to a single users software/configuration... I'd heard that sometimes when one thing is fixed it sometimes breaks another... This wouldn't be a problem if the thing that would hypothetically get broken wasn't installed on the end users machine... so theoretically if you had some way of sending a patch to an end user which corrected the problem at hand it would be good... so what if every time wine crashed it popped up a window and if the user wished it it would send it's very verbose out put to some kind of a bug reporting system (repository)... and in return search the repository for a patch for this particular problem... (using the verbose output).... there is a chance that the patch might break something else but in that case there is a chance that it might find another patch to fix the whole situation... they have a system like this under M$ Win and netscape except that they rely on periodic updates to take care of the problem... but who is to say that every computer is built the Same and has the Same sofware so that the Same super patch will fix every one's computer... Note 1... If M$ screws anyone on rights to this idea they can claim next logical step kind of like one step shopping... Note 2... Basically the only two weakness of the system would be One the inablility to match the output with a patch... but with a decent database program should that be problem? and Two having enough programers to right mini patches..... I'm writing from memory but I think there are 300 developers.... wouldn't that be enough..... just a thought though so take it with a grain of salt... p.s. what brought this to mind back when I was following the wine project much more closely, 2-3 years ago, when it was almost the only way to run windows programs under linux, I'd heard that many of the problems could be fixed by just a tweak here or there and mabey a few lines of code changed... still don't know much C so I doubt I'll be much help as a developer if you want to get back with me over this : ) ICQ# 135184436 turtleislow

1 0

Re: x11ddraw fix
by Glenn Schrader 28 Nov '01

28 Nov '01

Ove Kaaven wrote: > On Mon, 12 Nov 2001, geschrader wrote: > > Your reasoning makes sense but with your patch I get the following error: > > > > X Error of failed request: XF86DGADirectNotActivated > > Major opcode of failed request: 138 (XFree86-DGA) > > Minor opcode of failed request: 26 (XDGACreateColormap) > > Serial number of failed request: 3691 > > Current serial number in output stream: 3951 > > > > I'm not sure how to interpret this. Documentation for DGA seems to be > > pretty non-existant. Is this complaining that the CreateColormap failed > > because DGA wasn't activated or that DGA wasn't activated because > > of the colormap failure? > It's probably the former. I'm guessing that you need to create the > colormap on the same display that XDGAOpenFrameBuffer and XDGASetMode was > done on (those are currently done on thread_display(), you'll probably > have to change them too, then?) The two attached patches seem to do the job. Thanks for the hints. --- Glenn Schrader ------------------------------------------------------------------------ Index: dga2.c =================================================================== RCS file: /home/wine/wine/dlls/x11drv/dga2.c,v retrieving revision 1.5 diff -u -r1.5 dga2.c --- dga2.c 2001/09/11 00:32:33 1.5 +++ dga2.c 2001/11/20 22:13:32 @@ -102,7 +102,7 @@ { LPDDRAWI_DIRECTDRAW_LCL ddlocal = data->lpDD->lpExclusiveOwner; DWORD vram; - Display *display = thread_display(); + Display *display = gdi_display; data->ddRVal = DD_OK; if (data->dwModeIndex) { @@ -174,7 +174,7 @@ static DWORD PASCAL X11DRV_XF86DGA2_CreatePalette(LPDDHAL_CREATEPALETTEDATA data) { - Display *display = thread_display(); + Display *display = gdi_display; data->lpDDPalette->u1.dwReserved1 = TSXDGACreateColormap(display, DefaultScreen(display), dga_dev, AllocAll); if (data->lpColorTable) X11DRV_DDHAL_SetPalEntries(data->lpDDPalette->u1.dwReserved1, 0, 256, @@ -185,7 +185,7 @@ static DWORD PASCAL X11DRV_XF86DGA2_Flip(LPDDHAL_FLIPDATA data) { - Display *display = thread_display(); + Display *display = gdi_display; if (data->lpSurfCurr == X11DRV_DD_Primary) { DWORD ofs = data->lpSurfCurr->lpGbl->fpVidMem - dga_mem.fpStart; TSXDGASetViewport(display, DefaultScreen(display), @@ -199,7 +199,7 @@ static DWORD PASCAL X11DRV_XF86DGA2_SetPalette(LPDDHAL_SETPALETTEDATA data) { - Display *display = thread_display(); + Display *display = gdi_display; if ((data->lpDDSurface == X11DRV_DD_Primary) && data->lpDDPalette && data->lpDDPalette->u1.dwReserved1) { TSXDGAInstallColormap(display, DefaultScreen(display), data->lpDDPalette->u1.dwReserved1); Index: x11ddraw.c =================================================================== RCS file: /home/wine/wine/dlls/x11drv/x11ddraw.c,v retrieving revision 1.12 diff -u -r1.12 x11ddraw.c --- x11ddraw.c 2001/08/27 19:04:18 1.12 +++ x11ddraw.c 2001/11/20 22:13:42 @@ -49,7 +49,7 @@ static LRESULT WINAPI GrabWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - Display *display = thread_display(); + Display *display = gdi_display; if(message != X11DRV_DD_GrabMessage) return CallWindowProcA(X11DRV_DD_GrabOldProcedure, hWnd, message, wParam, lParam); @@ -81,7 +81,7 @@ if(grab) { Window window = X11DRV_get_whole_window(GetFocus()); if(window) - XSetInputFocus(thread_display(), window, RevertToParent, CurrentTime); + XSetInputFocus(gdi_display, window, RevertToParent, CurrentTime); } if(!X11DRV_DD_GrabMessage)

2 4

Re: PATCH: xterm support for wineconsole
by eric pouech 28 Nov '01

28 Nov '01

Marcus Meissner wrote: > > Hi, > > This patch adds a XTERM backend to wineconsole. > > Some problems: > - In full screen text applications (like IDA), the cursor shows sometimes > up in the wrong spot. > - Scrolling does not work yet (so winedbg doesn't really work). > - Uses config.h. I still have some questions... from a technical point of view, what didn't you use an ncurse (for example) lib to handle the TERM issues ? the old code you grabbed doesn't work correctly for all TERM configurations... rewriting everythind isn't the solution IMO from a more usage point of view, it seemed that TERM support for wineconsole was more intended for supporting an existing UNIX console (like when starting a command line tool and use the current TERM for interacting with it), which would mean in wineconsole case passing to wineconsole the handles of current TERM. furthermore, how to you plan to choose, when starting wineconsole, from the Win32 and the xterm backend ? in other words, I'm more in favor of : - Win32 backend for normal usage - reusing current UNIX console when run in TERM mode (and not xterm), and with the support of text mode lib (like ncurses) A+

2 2

(no subject)
by Ryan C. Stallings 28 Nov '01

28 Nov '01

Hello all, I am new to the wine scene and would like to try my hand at a little wine hacking. Are there any bugs out there that would be easy for a newbie to fix while letting me learn a bit about the inner workings of wine? I have read all the material about getting started developing, but I am just lacking a bit of direction on what to work on :) Thanks for your help, ryan

4 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel