wine-devel

wine-devel@winehq.org

4 participants
84464 discussions

RE: update to regression testing framework
by Geoffrey Hausheer 10 Apr '02

10 Apr '02

> -----Original Message----- > From: Paul Millar paulm(a)astro.gla.ac.uk > Subject: update to regression testing framework > o The commands "named_ok", "set_name" and "unset_name" now > exist (in C > and Perl). You can use these to specify a name for tests either > individually (via named_ok) or for a region (via set_name and > unset_name) > What is the benefit of this? The current framework supports 'ok(test,printf-style string)' which seems to be fine for debugging in general, and 'trace' to just print out general purpose information about what the test is doing. Thanks, .Geoff

1 0

winebuild broken?
by Michael Cardenas 09 Apr '02

09 Apr '02

It seems that with the new dll separation changes, winebuild is broken. I've been trying to build an app with winebuild, and it tries to open kernel32.dll.so instead of libkernel32.dll.so when trying to resolve the "import kernel32.dll" line of the spec file. This works for compiling wine, but not for compiling external apps that use the installed lib directory. I'm not sure if I should fix winebuild to look for lib(name).dll.so or if I should change the dll makefiles to create the correct symlinks so that wine can compile or if we should make winebuild check for both lib(name).dll.so and (name).dll.so. For now, I'm doing the last case, which works fine, so I can submit that patch if you want it. There is also the problem of dlls in the wine directory which are not found either, which I'm still working on. -- michael cardenas lead windows compatibility engineer www.lindows.com "Be the change you want to see in the world." -Mahatma Gandhi

1 1

Failing MODULE_DllProcessAttach causes other module left uninitialized
by Uwe Bonnes 09 Apr '02

09 Apr '02

Hallo, in loader/module.c:MODULE_DllProcessAttach the recursion to attach ends as soon as _one_ initialization fails. This leaves other modules uninitialized. I had this problem with xnview and native shell (without native shfolder). The missing SHGetFolderPathA caused COMDLG32_DllEntryPoint to return FALSE and in cause WSVFW32_LibMain wasn't called. Later this caused MULTIMEDIA_GetIData to not find it's IData and cause a crash. The missing HGetFolderPathA wasn't the culprit. I think the original error was obscured to much here. Either we judge a failing InitDLL as error and abort there, or in MODULE_DllProcessAttach we should recurse without looking at the result. What about appended patch? -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ---------- Index: wine/loader/module.c =================================================================== RCS file: /home/wine/wine/loader/module.c,v retrieving revision 1.150 diff -u -r1.150 module.c --- wine/loader/module.c 2 Apr 2002 19:47:30 -0000 1.150 +++ wine/loader/module.c 9 Apr 2002 14:06:26 -0000 @@ -212,17 +212,14 @@ wm->flags |= WINE_MODREF_MARKER; /* Recursively attach all DLLs this one depends on */ - for ( i = 0; retv && i < wm->nDeps; i++ ) + for ( i = 0; i < wm->nDeps; i++ ) if ( wm->deps[i] ) - retv = MODULE_DllProcessAttach( wm->deps[i], lpReserved ); + MODULE_DllProcessAttach( wm->deps[i], lpReserved ); /* Call DLL entry point */ + retv = MODULE_InitDLL( wm, DLL_PROCESS_ATTACH, lpReserved ); if ( retv ) - { - retv = MODULE_InitDLL( wm, DLL_PROCESS_ATTACH, lpReserved ); - if ( retv ) - wm->flags |= WINE_MODREF_PROCESS_ATTACHED; - } + wm->flags |= WINE_MODREF_PROCESS_ATTACHED; /* Re-insert MODREF at head of list */ if ( retv && wm->prev )

2 1

Starting application from a directory with some kernel32.dll
by Uwe Bonnes 09 Apr '02

09 Apr '02

Hallo, when an application is run in a directory, where there is also a kernel32.dll, and this is _not_ the system directory, MODULE_GetLoadOrder doesn't strip the path and therefore crashes when native kernel32.dll is loaded. While the header of MODULE_GetLoadOrder talks about "any path is stripped", the function only strips the path for "16 bit modules or if the module resides in the system directory " Is this intended behaviour? Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

3 4

Return To Castle Wolfenstein
by Michal Seliga 09 Apr '02

09 Apr '02

Greetings I use wine from 10.3.2002 I tried to run Return To castle Wolfenstain in it. Works almost great! I found few problems I would like to tell you, maybe they are solved already 1) installation: font is wider then expected (I think) so it looks like not all texts are fully visible or they collide with buttons (screenshot on request) 2) installation: in part where i should write an installation code, there are places for 4 characters in all textfields, but when I type in 2 characters it will jump to the next one. It looks like if editfield is xx chars long, then after writing xx/2 characters it thinks it is already all filled 3) game: works in window, but thinks it runs fullscreen. but except of this it runs great (only a bit slow sometimes) 4) game: when I chnged settings a bit it crashed after some minutes, but only once and I don't know hat exactly I changed. I think I switched trueform on, so maybe this is problem (yes I have ATI). but with defaults It worked great I have Mandrake 8.1, but changed to gcc-3.0.1 as default compiler, kernel upgraded to 2.4.19-pre1 and XFree upgraded to 4.2.0 processor Duron700, gfx card ATI Radeon 7500 64MB DDR, motherboard Abit KT7 If you will have some more questions feel free to ask, I don't have the game but it should be no problem to borow from friend (I hope), he already finished it good work people, I was really surprised...

2 1

CVS won't compile with wine/dlls/winsock socket.c ws2_32.spec patch applied
by Tony Lambregts 09 Apr '02

09 Apr '02

wine compiles fine with my system until this patch is applied http://www.winehq.com/hypermail/wine-cvs/2002/04/0087.html after it is applied it stops with the following errors > > socket.c: In function `WSASendTo': > socket.c:1990: sizeof applied to an incomplete type > socket.c:2000: arithmetic on pointer to an incomplete type > socket.c:2000: dereferencing pointer to incomplete type > socket.c:2001: arithmetic on pointer to an incomplete type > socket.c:2001: dereferencing pointer to incomplete type > socket.c: In function `WSARecvFrom': > socket.c:3286: sizeof applied to an incomplete type > socket.c:3295: arithmetic on pointer to an incomplete type > socket.c:3295: dereferencing pointer to incomplete type > socket.c:3296: arithmetic on pointer to an incomplete type > socket.c:3296: dereferencing pointer to incomplete type > make: *** [socket.o] Error 1 I changed directory to dlls/winsock and did make clean make depend make I have attached a log of the session if that will help it seems it doesn't like this code and I (moron user ) can't see anything wrong with it . > 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) ); I welcome your advice, fixes or flames Tony Lambregts Script started on Mon Apr 8 11:29:24 2002 [tony@tony winsock]$ make clean rm -f *.o *.a *.so *.ln \#*\# *~ *% .\#* *.bak *.orig *.rej *.flc *.spec.c *.spec.def *.glue.c y.tab.c y.tab.h lex.yy.c core tests/testlist.c [tony@tony winsock]$ make depend ../../tools/makedep -I. -I. -I../../include -I../../include -C. async.c socket.c -C. [tony@tony winsock]$ make LD_LIBRARY_PATH="../../unicode:$LD_LIBRARY_PATH" ../../tools/winebuild/winebuild -fPIC -L../../dlls -o winsock.spec.c -spec winsock.spec gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -fPIC -D__WINE__ -DUSE_WS_PREFIX -D_REENTRANT -I/usr/X11R6/include -o winsock.spec.o winsock.spec.c gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -fPIC -D__WINE__ -DUSE_WS_PREFIX -D_REENTRANT -I/usr/X11R6/include -o async.o async.c gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -fPIC -D__WINE__ -DUSE_WS_PREFIX -D_REENTRANT -I/usr/X11R6/include -o socket.o socket.c socket.c: In function `WSASendTo': socket.c:1990: sizeof applied to an incomplete type socket.c:2000: arithmetic on pointer to an incomplete type socket.c:2000: dereferencing pointer to incomplete type socket.c:2001: arithmetic on pointer to an incomplete type socket.c:2001: dereferencing pointer to incomplete type socket.c: In function `WSARecvFrom': socket.c:3286: sizeof applied to an incomplete type socket.c:3295: arithmetic on pointer to an incomplete type socket.c:3295: dereferencing pointer to incomplete type socket.c:3296: arithmetic on pointer to an incomplete type socket.c:3296: dereferencing pointer to incomplete type make: *** [socket.o] Error 1 [tony@tony winsock]$ exit exit Script done on Mon Apr 8 11:30:32 2002

2 2

Bitblt::Maskblt code ready for CVS
by Lonnie Cumberland 09 Apr '02

09 Apr '02

Hello All, I have worked out the modifications and implementation for the maskblt() functin in the graphics/bitble.c sources and have been able to run it in my version of wine 20020310 release. How can I get the source for the new bitble.c, or the new Maskblt() routine added to the CVS tree? cheers, 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!!!"

2 1

Invalidation problems
by Dimitrie O. Paun 09 Apr '02

09 Apr '02

People, I think I can reproduce one of those ugly redraw problems. The problem manifests itself in the Microsoft Control Spy. This program looks like in figure http://www.dssd.ca/wine/mscs1.png. If I click on the Styles menu, I get a dialog like this: http://www.dssd.ca/wine/mscs2.png The two list boxes on the right display messages sent to the control on the left. As you can see, when the Styles dialog pops up, it hides part of the listboxes which keep scrolling in the background. Now, what happens is that sometimes, they scroll off with a bit of dialog caption in them as shown here: http://www.dssd.ca/wine/mscs3.png !!! Hope this is helpful to someone more knowledgeable in this area. -- Dimi.

1 1

Re: wine/controls edit.c
by Dimitrie O. Paun 09 Apr '02

09 Apr '02

On April 8, 2002 07:46 pm, Alexandre Julliard wrote: > ChangeSet ID: 1018309592593147649736242 > CVSROOT: /opt/cvs-commit > Module name: wine > Changes by: julliard(a)wine.codeweavers.com 02/04/08 18:46:32 > > Modified files: > controls : edit.c > > Log message: > Dmitry Timoshkov <dmitry(a)codeweavers.com> > Added CS_PARENTDC style. We can see that from the patch :-) Why did you do it though? -- Dimi.

2 1

[PATCH] async IO API, reworked
by Martin Wilck 09 Apr '02

09 Apr '02

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

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