wine-devel

wine-devel@winehq.org

10 participants
84459 discussions

Re: x11ddraw fix
by Alexandre Julliard 12 Nov '01

12 Nov '01

geschrader <geschrader(a)mediaone.net> writes: > When X11DRV_XF86DGA2_CreatePalette( ) creates the palette > used by X11DRV_DDHAL_DestroyPalette( ) and > X11DRV_DDHAL_SetPalEntries( ), the display which is used is > returned by thread_display( ). This patch makes these two functions > also use thread_display( ) ( rather than gdi_display ). This bug was > causing a BadColor (i.e. invalid colormap) error in the X server > when X11DRV_DDHAL_SetPalEntries( ) was called, followed by > an application crash. I think it would be better to create the palette on the gdi_display, this way it can be manipulated by other threads too. Could you try if this works for you? Index: dlls/x11drv/dga2.c =================================================================== RCS file: /opt/cvs-commit/wine/dlls/x11drv/dga2.c,v retrieving revision 1.5 diff -u -r1.5 dga2.c --- dlls/x11drv/dga2.c 2001/09/11 00:32:33 1.5 +++ dlls/x11drv/dga2.c 2001/11/07 20:28:34 @@ -174,8 +174,8 @@ static DWORD PASCAL X11DRV_XF86DGA2_CreatePalette(LPDDHAL_CREATEPALETTEDATA data) { - Display *display = thread_display(); - data->lpDDPalette->u1.dwReserved1 = TSXDGACreateColormap(display, DefaultScreen(display), dga_dev, AllocAll); + data->lpDDPalette->u1.dwReserved1 = TSXDGACreateColormap(gdi_display, DefaultScreen(gdi_display), + dga_dev, AllocAll); if (data->lpColorTable) X11DRV_DDHAL_SetPalEntries(data->lpDDPalette->u1.dwReserved1, 0, 256, data->lpColorTable); @@ -199,10 +199,9 @@ static DWORD PASCAL X11DRV_XF86DGA2_SetPalette(LPDDHAL_SETPALETTEDATA data) { - Display *display = thread_display(); if ((data->lpDDSurface == X11DRV_DD_Primary) && data->lpDDPalette && data->lpDDPalette->u1.dwReserved1) { - TSXDGAInstallColormap(display, DefaultScreen(display), data->lpDDPalette->u1.dwReserved1); + TSXDGAInstallColormap(gdi_display, DefaultScreen(gdi_display), data->lpDDPalette->u1.dwReserved1); } data->ddRVal = DD_OK; return DDHAL_DRIVER_HANDLED; -- Alexandre Julliard julliard(a)winehq.com

3 2

[RFC]: Overlapped I/O implementation
by Martin Wilck 12 Nov '01

12 Nov '01

Hi, I'd like to summarize my thoughts about an implementation of overlapped I/O in Wine that will offer full Windows functionality. I havent't thought it through in all detail, but I have a clear enough picture to write an RFC. I regard the following points as crucial: 1 "Generic" routines like ReadFileEx() need to work with files of almost arbitrary type, i.e. normal files, pipes, sockets, comm ports, ... 2 Different file types imply different semantics for overlapped I/O. In particular: a Files that don't support positioning (i.e. FIFOs, or basically everything except regular files) need to be accessed sequentially, i.e. there may only be one reader and one writer at a time, and these must be scheduled in the same order in which they were submitted by the application. Otherwise, the data read or written will be potentially scrambled. For regular files, on the other hand, spawning several I/O requests in parallel may be beneficial. b Files on some devices (in particular, block devices on Linux) need to spawn a separate thread for the async I/O operation, because I/O on such devices is always blocking, which is undesirable. Neither the process itself nor the service thread should be blocked by a time-consuming floppy I/O operation, for example. 3 The semantics of individual asynchronous I/O requests depend on the function that was called by the application, e.g. ReadFile() or WSARecv(), which take different arguments. Such calls may be mixed by the application, although it's certainly not good programming practice to do so. Based on these arguments, I'd suggest the following: A) The generic functions need to find out what the properties of a file descriptor wrt asynch I/O are. The most general way to implement this is to have an element int (*get_async) (struct object*, struct file_async*) in the obj_ops array. For non-file objects, this element would be NULL or no_get_async(). For non-overlapped file descriptors, the function would assign NULL to the file_async* argument, and return an error, a valid pointer would be assigned to file_async* otherwise. struct file_async would contain per-file information about asynch I/O, e.g. struct file_async { struct async_private *readers; /* list of async read requests */ struct async_private *writers; /* list of async write requests */ int flags /* supports positioning? Is I/O blocking on host OS ? etc. */ int (*get_timeout) (struct object *obj, int type, int count); /* function that returns timeout for device, needed e.g. for serial comm */ } I currently see no need for other file-type dependedent functions; It should be possible to write generic routines that handle the requests correctly according to the flags variable. The Wine server API would containe a file_get_async() request that returns the file_async structure associated with the file by calling the get_async() element of obj_ops. The async_private struct would look pretty similar as it looks now, with a generic part and a part that depends on the function invoked for doing async I/O (e.g. for sockets, whether ReadFile() or WSARecv() was called on the socket fd). IMO the async_private should not contain file type-dependent information which is per-file. It should rather contain a pointer to the respective file_async struct. Most importantly, the async_private struct it carries a pointer to a function that does the actual I/O, and another function pointer that handles the termination of the request (invocation of user completion routine etc.) B) The check_async() function in synchro.c operates on file descriptors rather than async requests. Once an overlapped I/O request is issued by the application, it is queued either in the readers or writers list of the async object (which is obtained from the server). If both the readers and writers lists were NULL beforehand, the fd is inserted into the list for check_async to work on. check_async() activates the first element(s) of both the readers and writers lists (where activate means that the actual read/write call is triggered). For FIFOS, only one element would be activated; for regular files several requests up to a given limit (e.g. 4). If the file is on a device where normal I/O would be blocking, a new thread is created for each activated request to satisfy it. When the requests' I/O routine (separate thread or not) is completed, it activates an event that triggers the generic "finish" routine. The finish routine calls the finish routine of the request, cleans up, and activates a new request if there is one that was queued but not activated. If both the readers and writers queue are empty after finishing the request, the file descriptor is removed from the list of handles to check in check_async(). C) If CancelIo() is called or a file is closed, all pending IO requests are removed from the file's async readers and writers lists; potential subthreads are terminated. With this approach, the wineserver would only be needed for retreiving the file's async I/O properties. The biggest change to the wine core would be the addition of a new function to obj_ops. I am looking forward to comments. Regards, Martin PS. A minor remark: The above approach would make it unnecessary to check for the return value of xyz_get_info() to be FD_TYPE_OVERLAPPED when initiating overlapped I/O. Instead, one could simply check if the async object returned by get_async() is non-NULL. -- 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

1 0

Re: GetDlgItem16 - is id signed or not?
by Gerard Patel 12 Nov '01

12 Nov '01

At 07:07 PM 11/11/2001 -0500, you wrote: > >It hasn't gotten itself fixed in the ordinary way of progress, so I have >finally gotten around to a regression in juno-1.49. It crashes just >after getting back 0 from GetDlgItem16, so I added a little trace inside >GetDlgItem. Now I know why it crashes, but I don't know - is id really >unsigned, or is GetControl16 incorrectly failing to extend the sign? >I guess I could try it each way and see which one does least damage, but >probably several of you know which way it is meant to go. I'd cast id to unsigned in GetDlgItem16. Gerard

2 1

Re: Regression errors
by Eric Pouech 12 Nov '01

12 Nov '01

> At 11:06 AM 10/11/2001 -0500, you wrote: > > > >Thanks Gerard. I will try it Tuesday. Going out of town till then. > > Well, I have advanced a bit this weekend. I noticed that one of my > test app does indeed show this regression after the patch we are talking > about. > > As the case is a lot more simple than the one I was trying to debug > before for this problem, I have been able to understand better what > is happening. The problem shows itself in the following case : > > - invalidating a window > - hiding it > - deleting it IIRC, before the big window overhaul (when paint count was attached to each window), when a window was hidden, its paint count wasn't set to 0 (or when the window was actually shown, its paint count wasn't set to 1). This lead to some painting errors... I don't know if this is fully related (and I didn't follow closely the new window stuff), but it may be related... in case this helps... A+ --------------- 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: More overlapped I/O issues (important)
by Mike McCormack 12 Nov '01

12 Nov '01

Hi Martin, You're right, i never considered multiple overlapped requests at the same time... To fix the problem correctly, you will need to move (some of) the overlapped code back to the wineserver, so that requests from different processes can be handled correctly. (i moved it out of the wineserver about a year ago for efficiency reasons.) Have a look at rev 1.7 of server/async.c to see how this worked. http://cvs.winehq.com/cvsweb/wine/server/async.c?rev=1.7&content-type= text/x-cvsweb-markup The current overlapped code (with the above exception) is similar to what win 9x supports, so it does not support overlapped on normal files, and file offsets in OVERLAPPED structures. If that could be implemented too, it would be good. i guess there is choice now... implement overlapped sockets with the existing structure, or make a rather large change to the wine architecture, which might take a while. Maybe a good first step is to back out my change which put overlapped operations into the client side code... Alexandre thought this could be done using POLLIO instead... Mike Original message from: Martin Wilck <Martin.Wilck(a)fujitsu-siemens.com> > > >Hi Mike, all, > >I see a severe problem with the current overlapped I/O implementation, >especially wrt extending it to Winsock2 overlapped I/O. > >The problem I see is with buffer ordering. > >For normal files, the file position from which to read is on the >OVERLAPPED struct. This was not in the Wine implementation, the patch in >my last email fixes it. > >For sockets and other FIFOs, this makes no sense. In this case Windows >specifies that buffers are read / written **in the same order they were >submitted**. This matters only if users spawn several asynchronous I/O >requests at the same time, but this is allowed and actually beneficial >for application performance (at least on Windows). > >Unless I oversee something essential, the current wine implementation >does not guarantee such behaviour. Actually, since new requests are >inserted at the head of the NtCurrentTeb() list, they will be considered >first in subsequent asynchronous reads - i.e. the order will be reversed. >If I/O requests don't complete in a single read() or write() call, the >ordering will be basically random. > >IMO this implies that for sockets, asynchronous reads and writes must >be scheduled such that only one request for a given socket is actually >reading at a time, and all others are blocked until this request is >finished. Again, this holds only for FIFO-type files. > >With the current structure, it seems to be very complex to sort this out. >One could recheck the fd list in check_async and remove duplicate fds. >One could also try to "lock" the fd somehow. Still it would be necessary >to ascertain that the correct request gets the lock first. > >With this min mind, it seems more natural for me to organize the >asynchronous requests in the "file" data structure itself. One would >have a reader's and a writers's list there, and make sure that for FIFOS >only the first list element can actually issue a read(), write(), send(), >or recv() system call. For normal files all elements in the lists could be >doing IO at the same time, question is if that makes sense or not. > >As I see it, this would mean both the readers and writers lists must >be stored in the file data structure in the wine server. >This would of course strongly affect the current implementation. > >Note that with Winsock2 overlapped I/O in place, it must >be possible to use also ReadFile(), ReadFileEx() etc. on >overlapped sockets, and get correct behaviour. >Thus the ReadFile() etc. code must be able to deal with both sockets >and ordinary files, and it makes no sense to intriduce a different >approach for sockets only. > >Please give me your opinion on these issues ASAP. > >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 ------------------------------------------ mailto:Mike_McCormack@start.com.au ph +82 16 430 0425 __________________________________________________________________ Get your free Australian email account at http://www.Looksmart.com.au

2 1

Loop (and other) problem in audio.c 1.45 located
by Simon Britnell 12 Nov '01

12 Nov '01

The problem is that I advance to the next wavehdr automatically in FeedDSP, which skips the first wavehdr sent to the wodPlayer. Doh! A patch will follow to fix this (which will be built on top of the race condition fix patch). __________________________________________________ Do You Yahoo!? Find a job, post your resume. http://careers.yahoo.com

1 0

Re: Winsock2 & overlapped IO
by Mike McCormack 12 Nov '01

12 Nov '01

Hi Martin, Original message from: Martin Wilck <Martin.Wilck(a)fujitsu-siemens.com> >I have taken a closer look at this code. I believe a very similar approach >is possible for Winsock. However, there are a few problems: Good to see you are a man of action, not just words! >typedef struct async_private .. >What do you think about this? > >It would be cleaner to define a "general" async structure >containing either a type-specific union or a pointer to >type-specific data, and using void* for pointers. However, that would >require even more changes in the async file I/O code, which I'd like to >avoid at the moment. i agree with you it would be better to use a union... i'll have a go at making a patch to do this. i'll probably understand the mess i've created in files/file.c more easily ;-) >Another difference is that the overlapped Winsock routines cause >asynchronous success notification (i.e. calling the completion routine or >signalling the lpOverlapped->hEvent) even if they are immediately >successful, which seems not to be the case for asynchronous file I/O. > >That would require a minor change in the check_async_list() routine. Cool, go for it. >Please tell me your opinion! > >Regards, >Martin i wrote a longer reply with a union definition in it, but accidently resized my Netscape window an lost it when the page reloaded :-( Could be about time to give up on this web-based email thing. Mike btw. in the patch in your other mail, you have: -typedef struct _OVERLAPPED * LPWSAOVERLAPPED; typedef HANDLE WSAEVENT; + +typedef struct _WSAOVERLAPPED { + DWORD Internal; + DWORD InternalHigh; + DWORD Offset; + DWORD OffsetHigh; + WSAEVENT hEvent; +} WSAOVERLAPPED, *LPWSAOVERLAPPED; + can you just use the following? typedef OVERLAPPED WSAOVERLAPPED; typedef LPOVERLAPPED LPWSAOVERLAPPED; typedef HANDLE WSAEVENT; or even #define... ------------------------------------------ mailto:Mike_McCormack@start.com.au ph +82 16 430 0425 __________________________________________________________________ Get your free Australian email account at http://www.Looksmart.com.au

3 3

GetDlgItem16 - is id signed or not?
by lawson_whitney＠juno.com 12 Nov '01

12 Nov '01

Good day! It hasn't gotten itself fixed in the ordinary way of progress, so I have finally gotten around to a regression in juno-1.49. It crashes just after getting back 0 from GetDlgItem16, so I added a little trace inside GetDlgItem. Now I know why it crashes, but I don't know - is id really unsigned, or is GetControl16 incorrectly failing to extend the sign? I guess I could try it each way and see which one does least damage, but probably several of you know which way it is meant to go. trace:dialog:DIALOG_CreateControls BEGIN trace:dialog:DIALOG_GetControl16 STATIC '' 1164, 12, 4, 232, 45, 50020000, 00000000 trace:dialog:DIALOG_GetControl16 BUTTON '&Get and Send Mail' 1162, 10, 55, 56, 28, 5003000b, 00000000 trace:dialog:DIALOG_GetControl16 BUTTON '&Just Get Mail' 1163, 70, 55, 56, 28, 5001000b, 00000000 trace:dialog:DIALOG_GetControl16 BUTTON 'Cancel' 1161, 130, 55, 56, 28, 5001000b, 00000000 trace:dialog:DIALOG_GetControl16 BUTTON '&Help' 57669, 190, 55, 56, 28, 5001000b, 00000000 trace:dialog:DIALOG_CreateControls END trace:dialog:GetDlgItem GWL_ID 48c id 48a trace:dialog:GetDlgItem GWL_ID 48a id 48a trace:dialog:GetDlgItem GWL_ID 48c id 48b trace:dialog:GetDlgItem GWL_ID 48a id 48b trace:dialog:GetDlgItem GWL_ID 48b id 48b trace:dialog:GetDlgItem GWL_ID 48c id 489 trace:dialog:GetDlgItem GWL_ID 48a id 489 trace:dialog:GetDlgItem GWL_ID 48b id 489 trace:dialog:GetDlgItem GWL_ID 489 id 489 trace:dialog:GetDlgItem GWL_ID 48c id ffffe145 trace:dialog:GetDlgItem GWL_ID 48a id ffffe145 trace:dialog:GetDlgItem GWL_ID 48b id ffffe145 trace:dialog:GetDlgItem GWL_ID 489 id ffffe145 trace:dialog:GetDlgItem GWL_ID e145 id ffffe145 wine: Unhandled exception, starting debugger... Regards, Lawson The Devil finds work for idle minds.

1 0

Latest CVS Wine winmm
by Ori Pessach 10 Nov '01

10 Nov '01

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, I tried running Pajama Sam today (a Humongous Entertainment game), which used to run, with some sound problems, a while ago. Now, I get a dialog box on startup, saying that "No sound card was detected". 'wine -debugmsg +wave,+msys' shows multiple instances of the message: trace:mmsys:DriverCallback Null ! - From a quick look at mmsystem.c, it's not immediately clear whether this is a problem or not. At some point later on, I get: err:msacm:wodCallback Bad data But, this only happens after I close the dialog box, so that can't be the cause of the failure. Again, this used to work before. I first tried it with Simon's recent patch, and then checked out current the CVS version of mmsystem.c, and I don't see a difference. Any ideas? I have a complete dump the trace messages, but I'd rather not post it here, since it's fairly big. Ori Pessach -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (GNU/Linux) Comment: http://www.oripessach.com iD8DBQE77KsXzA/uWWyw6uQRApmPAKDOJ5LmmUzwWczXJ/So263BrFR26ACfeLkr SbhwMyhft7A5pmgIO1azzfA= =VyBD -----END PGP SIGNATURE----- _________________________________________________________ Do You Yahoo!? Get your free @yahoo.com address at http://mail.yahoo.com

3 2

Re: Regression errors
by Gerard Patel 10 Nov '01

10 Nov '01

At 12:38 AM 10/11/2001 -0500, you wrote: >1. SetTimer call is not always generating WM_TIMER messages as it should. I >see: > >0806bb20:Call user32.SetTimer(00020057,00001003,00000000,6003a04c) >ret=6001e9e4 >0806bb20:Ret user32.SetTimer() retval=00001003 ret=6001e9e4 > >in the trace, but never is the callback routine invoked. Without the above >patch, the callback is invoked and does the painting. I am not sure if it's related, but I have seen something like that. I have seen it since much longer than this patch, though. It's about the paint count in the server. When there is a paint count > 0 in the server and the number of windows found to need a repaint (at the client level) is less than the paint count, the client can never get a timer event again. Try this patch to dlls/user/message.c to see if your problem is related : --- message.c.orig Sat Nov 10 07:03:29 2001 +++ message.c Sat Nov 10 07:08:27 2001 @@ -1861,6 +1861,7 @@ USER_Driver.pMsgWaitForMultipleObjectsEx( 0, NULL, 0, 0, 0 ); hwnd = WIN_GetFullHandle( hwnd ); +yetanothergoto: locks = WIN_SuspendWndsLock(); if (!MSG_peek_message( &msg, hwnd, first, last, @@ -1884,8 +1885,19 @@ /* need to fill the window handle for WM_PAINT message */ if (msg.message == WM_PAINT) { - if (!(msg.hwnd = WIN_FindWinToRepaint( hwnd ))) return FALSE; - + if (!(msg.hwnd = WIN_FindWinToRepaint( hwnd ))) + { + TRACE("FIXME : server paint count > 0 but no window needs painting\n"); + SERVER_START_REQ( inc_queue_paint_count ) + { + req->id = (void *)GetWindowThreadProcessId( hwnd, NULL ); + if (!req->id) req->id = (void *)GetCurrentThreadId(); + req->incr = -100000; /* reset paint count */ + SERVER_CALL(); + } + SERVER_END_REQ; + goto yetanothergoto; + } if (IsIconic( msg.hwnd ) && GetClassLongA( msg.hwnd, GCL_HICON )) { msg.message = WM_PAINTICON; I have no idea about your second problem. Gerard

2 1

Help with Revelant demo
by Paul Millar 10 Nov '01

10 Nov '01

Hi, [I'm prefacing this by saying know next to nothing about Windows] I've had a quick go at getting the (newer) demo of Eidos' Revenant game to run. The install works ok, but when I try to run the demo, I get a msgbox saying: "FATAL ERROR", "Unable to initialize Network" and the following appearing on stderr: > fixme:ole:CoCreateInstance no classfactory created for > {2fe8f810-b2a5-11d0-a787-0000f803abfc}, hres is 0x80040154 Rerunning with the "-debugmsg +ole" option, I get some (not terribly useful) extra info: > trace:ole:OLE32_DllEntryPoint 0x4087b000 0x1 0x1 > trace:ole:CoInitializeEx ((nil), 2) > trace:ole:CoInitializeEx () - Initializing the COM libraries > trace:ole:RunningObjectTableImpl_Initialize () > trace:ole:WINE_StringFromCLSID > 0x5a27f8->{2FE8F810-B2A5-11D0-A787-0000F803ABFC} > trace:ole:CoGetClassObject > CLSID: {2fe8f810-b2a5-11d0-a787-0000f803abfc}, > IID: {00000001-0000-0000-c000-000000000046} > fixme:ole:CoCreateInstance no classfactory created for > {2fe8f810-b2a5-11d0-a787-0000f803abfc}, hres is 0x80040154 > trace:ole:OLE32_DllEntryPoint 0x4087b000 0x0 0x1 I did a Google search and "2fe8f810-b2a5-11d0-a787-0000f803abfc" seems to be the CLSID of DirectPlayLobby. On a seperate note, I can't figure out which bit (or lack) of WINE is causing the "network error". From what I can see, there doesn't seem to be any network activity as rerunning with "-debugmsg +wnet,+winsock" doesn't produce any extra output. FWIW, there is an .INI file with the following: > [Network] > ConnectType=none > SessionName=none > Provider=IPX > ConnectTime=5 So my questions are: 1. How easy would it be to fix/add CLSID_DirectPlayLobby? (where do I start)? 2. Any suggestions how to go about debugging the apparently fatal "No Network" msgbox? Cheers, Paul. ------------------------------------------------------------------------------ Paul Millar yo-yo, n. : Particle Physics Theory Group Something that is occasionally Department of Physics and Astronomy up but normally down. University of Glasgow, (see also Computer) Glasgow G12 8QQ, paulm(a)physics.gla.ac.uk Scotland +44 (0)141 330 4717 ------------------------------------------------------------------------------

1 0

Regression errors
by Guy L. Albertelli 10 Nov '01

10 Nov '01

I have noticed two other regression issues with the patch to "Store in the server all the window info... " (01/10/22 15:08:34). Both of these occur in Outlook Express 4. 1. SetTimer call is not always generating WM_TIMER messages as it should. I see: 0806bb20:Call user32.SetTimer(00020057,00001003,00000000,6003a04c) ret=6001e9e4 0806bb20:Ret user32.SetTimer() retval=00001003 ret=6001e9e4 in the trace, but never is the callback routine invoked. Without the above patch, the callback is invoked and does the painting. 2. A WM_KEYUP (wparam is VK_CNTL) message is generated and processed even though no key is touched on the keyboard. If "-debugmsg +key" is specified the message never appears, nor does any trace:key: entry. Has anybody else seen or trapped these bugs? Guy Albertelli <<galberte(a)neo.lrun.com>>

1 0

Re: fix for ugly things...
by Francois Gouget 09 Nov '01

09 Nov '01

On Fri, 9 Nov 2001, Andreas Mohr wrote: > [ok, mailed for the *3rd* time now, since WineHQ has been out of space *again*] > > Hi all, > > - fix potentially problematic stuff (see Apple installer desaster, e.g. on /.) [...] That's good but while you're at it I think you should fix the other things like: Index: documentation/db2html-winehq [...] cat $TMPDIR/* Index: documentation/make_winehq [...] mv $WWWDIR $WWWDIR.old [...] mkdir $WWWDIR Otherwise the scripts will still not work and make a mess (even if data loss is less likely, unless we also have 'cmd... >$xxx'). -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ RFC 2549: ftp://ftp.isi.edu/in-notes/rfc2549.txt IP over Avian Carriers with Quality of Service

1 0

Re: OSS audio race fix
by eric pouech 09 Nov '01

09 Nov '01

eric pouech wrote: > > as reported by Simon Brunnel oops... I meant Britnell (sorry for the misspell Simon) A+ -- --------------- Eric Pouech (http://perso.wanadoo.fr/eric.pouech/) "The future will be better tomorrow", Vice President Dan Quayle

1 0

More overlapped I/O issues (important)
by Martin Wilck 09 Nov '01

09 Nov '01

Hi Mike, all, I see a severe problem with the current overlapped I/O implementation, especially wrt extending it to Winsock2 overlapped I/O. The problem I see is with buffer ordering. For normal files, the file position from which to read is on the OVERLAPPED struct. This was not in the Wine implementation, the patch in my last email fixes it. For sockets and other FIFOs, this makes no sense. In this case Windows specifies that buffers are read / written **in the same order they were submitted**. This matters only if users spawn several asynchronous I/O requests at the same time, but this is allowed and actually beneficial for application performance (at least on Windows). Unless I oversee something essential, the current wine implementation does not guarantee such behaviour. Actually, since new requests are inserted at the head of the NtCurrentTeb() list, they will be considered first in subsequent asynchronous reads - i.e. the order will be reversed. If I/O requests don't complete in a single read() or write() call, the ordering will be basically random. IMO this implies that for sockets, asynchronous reads and writes must be scheduled such that only one request for a given socket is actually reading at a time, and all others are blocked until this request is finished. Again, this holds only for FIFO-type files. With the current structure, it seems to be very complex to sort this out. One could recheck the fd list in check_async and remove duplicate fds. One could also try to "lock" the fd somehow. Still it would be necessary to ascertain that the correct request gets the lock first. With this min mind, it seems more natural for me to organize the asynchronous requests in the "file" data structure itself. One would have a reader's and a writers's list there, and make sure that for FIFOS only the first list element can actually issue a read(), write(), send(), or recv() system call. For normal files all elements in the lists could be doing IO at the same time, question is if that makes sense or not. As I see it, this would mean both the readers and writers lists must be stored in the file data structure in the wine server. This would of course strongly affect the current implementation. Note that with Winsock2 overlapped I/O in place, it must be possible to use also ReadFile(), ReadFileEx() etc. on overlapped sockets, and get correct behaviour. Thus the ReadFile() etc. code must be able to deal with both sockets and ordinary files, and it makes no sense to intriduce a different approach for sockets only. Please give me your opinion on these issues ASAP. 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

1 0

[PATCH:] fix overlapped I/O problems
by Martin Wilck 09 Nov '01

09 Nov '01

Hi, The included patch (against CVS 2001-11-08) fixes two problems with overlapped I/O: 1) Overlapped ReadFile() didn't work on normal files because file_get_info() never returned FD_TYPE_OVERLAPPED. 2) According to the MS docs, the lpOverlapped argument's Offset and OffsetHigh fields contain the offset from which to read. This was not honoured by the current implementation which only did sequential reads. 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 Index: files/file.c =================================================================== RCS file: /home/wine/wine/files/file.c,v retrieving revision 1.119 diff -u -r1.119 file.c --- files/file.c 2001/10/24 00:23:25 1.119 +++ files/file.c 2001/11/09 17:35:29 @@ -1275,6 +1275,7 @@ { LPOVERLAPPED lpOverlapped = ovp->lpOverlapped; int result, r; + off_t ofs; TRACE("%p %p %08x\n", lpOverlapped, ovp->buffer, events ); @@ -1294,9 +1295,18 @@ goto async_end; } + ofs = lpOverlapped->Offset + ((off_t)lpOverlapped->OffsetHigh << 32) + + lpOverlapped->InternalHigh; + /* check to see if the data is ready (non-blocking) */ - result = read(ovp->fd, &ovp->buffer[lpOverlapped->InternalHigh], - ovp->count - lpOverlapped->InternalHigh); + /* Use the offset as given in the Overlapped structure */ + result = pread (ovp->fd, &ovp->buffer[lpOverlapped->InternalHigh], + ovp->count - lpOverlapped->InternalHigh, ofs); + + /* If pread fails, try a normal read */ + if (result == -1 && errno == ESPIPE) + result = read (ovp->fd, &ovp->buffer[lpOverlapped->InternalHigh], + ovp->count - lpOverlapped->InternalHigh); if ( (result<0) && ((errno == EAGAIN) || (errno == EINTR))) { @@ -1444,6 +1454,7 @@ { int unix_handle, result; DWORD type; + off_t ofs; TRACE("%d %p %ld %p %p\n", hFile, buffer, bytesToRead, bytesRead, overlapped ); @@ -1466,7 +1477,11 @@ } /* see if we can read some data already (this shouldn't block) */ - result = read( unix_handle, buffer, bytesToRead ); + ofs = overlapped->Offset + ((off_t)overlapped->OffsetHigh << 32); + /* Try using the user-given offset first, fall back to read otherwise */ + result = pread( unix_handle, buffer, bytesToRead, ofs); + if (result == -1 && errno == ESPIPE) + result = read( unix_handle, buffer, bytesToRead ); close(unix_handle); if(result<0) Index: server/file.c =================================================================== RCS file: /home/wine/wine/server/file.c,v retrieving revision 1.48 diff -u -r1.48 file.c --- server/file.c 2001/10/24 00:23:26 1.48 +++ server/file.c 2001/11/09 17:35:29 @@ -307,6 +307,10 @@ req->index_low = st.st_ino; req->serial = 0; /* FIXME */ } + + if (file->flags & FILE_FLAG_OVERLAPPED) + return FD_TYPE_OVERLAPPED; + return FD_TYPE_DEFAULT; }

1 0

queries on internals...
by Roger Fujii 09 Nov '01

09 Nov '01

ok... getting reasonable output, but now I have some questions. First, it seems like wine can't find the audio codecs, though it seems to find the video ones. Is this a to-be-implemented or a bug and any clues on where to look? The next are portability / solaris questions... 1) For some unknown reason, the solaris version segfaults when it tries to load win87em.dll, but the linux one doesn't. I presume that this is trying to load the fpu emulator, but I'm not certain. In any case, what controls the loading of this in the first place? 2) regapi uses strsep, which solaris doesn't have. Is its usage in wine compatible with strtok, or should I cut/paste strsep into library/ports.c? 3) In win32/console.c, it seems that master/slave is reversed through the fork. This is only going off the docs, but if it is, how is this working under linux? That's all for now.... -r -- Roger Fujii <rmf(a)lookhere.com> Underemployed, and trying to keep it that way....

4 8

Need suggestions for audio patch testing.
by Simon Britnell 09 Nov '01

09 Nov '01

I've posted my patch against wine cvs audio.c 1.44 to wine patches, but I've not yet been able to give it a thorough test. Anyone using freeware/shareware/opensource programs with sound under wine (not winex) please send me URLs for the programs you use (specially if they break) so I can use them for testing my patch. Thanks. __________________________________________________ Do You Yahoo!? Find a job, post your resume. http://careers.yahoo.com

1 0

Re: Two answers/questions from yesterdays and todays digests
by Roger Fujii 08 Nov '01

08 Nov '01

Robert Lunnon <bob(a)yarrabee.net.au> wrote: > >First, it seems like wine can't find the audio codecs, > >though it seems to find the video ones. Is this a > >to-be-implemented or a bug and any clues on where to look? > > Is this in Solaris ?, yes. > if so you wiould have to have OSS installed and even > then I am not sure it would work properly. I do have OSS installed (like Sun gives you a choice as far as audio drivers go), and it doesn't. > Investigating audio on Solaris I found that ACM was not happy unless > the audio driver was available and installed properly otherwise it > returns Device Busy. I know there is a problem with 4front's devaudio emulation such that it will return an EBUSY if you open the device for READ and then WRITE (but it doesn't fail for WRITE, then READ) - they're too busy to fix the problem. > I do have a working > Waveout Solution for native Solaris based on my libaudioio project. I've not > tackled Direct Sound or Wavein yet. As yet this solution is not integrated > with Wines Build environment so you can't set it up with configure. If you > are prepared to grub through the relevant mods I can send you a patch kit. > actually, my main interest is to get the compressor(s) to work - don't care too much currently to get the audio working (mainly due to the fact that the audio drivers in solx86 is in such a sorry state). I'll be interested once I get the current CVS to work again. -r -- Roger Fujii <rmf(a)lookhere.com> Underemployed, and trying to keep it that way....

1 0

Re: Winsock2 & overlapped IO
by Mike McCormack 08 Nov '01

08 Nov '01

Hi Martin, i don't know much about Winsock, but i can tell you how overlapped I/O is supposed to work in Wine. The bulk of the implementation is in files/file.c and scheduler/synchro.c. When ReadFile is called on a handle, the following happens: 1. check that the handle is valid and was opened with FILE_FLAG_OVERLAPPED. 2. attempt to read any data that is available immediately, and perhaps return if we read enough already. 3. queue the operation onto CurrentTeb()->pending_list When the thread waits upon any server object, all (unix) fds with pending overlapped operations are polled on. This is a minor problem in the design; if the thread never waits upon an object the overlapped can never complete, however the thread must wait upon the overlapped's hEvent to check whether it has completed... The only part of the serial comms overlapped implementation the lives in the wineserver is the calculation of overlapped timeouts. So to get winsock to do overlapped, you may have to modify the winsock code to work like that... but the winsock code uses the service thread to wait upon sockets. The task is definitely not impossible, but it might take a bit of work :-) Maybe Ove K. can give you some advice? Mike > In particular, it uses the Winsock 2 feature of "Overlapped IO" > on sockets, with user-supplied callbacks that are called when > data is received on a socket etc. > > Browsing through the Wine Winsock code, I saw that this part of > Winsock2 is obviously unimplemented. ------------------------------------------ mailto:Mike_McCormack@start.com.au ph +82 16 430 0425 __________________________________________________________________ Get your free Australian email account at http://www.Looksmart.com.au

3 2

Re: audio.c cleanup
by Alexandre Julliard 08 Nov '01

08 Nov '01

Simon Britnell <ughbash(a)yahoo.com> writes: > This patch is based on winex cvs 1.14 and tidys up the > wodPlayer functionality to make it easier to follow. The WineX tree is not under the Wine license, so you cannot grab stuff from there. While I guess the Transgaming folks wouldn't object in this case, I'd prefer that you leave it to them to submit their patches back to the main tree, so that the license situation is clear. -- Alexandre Julliard julliard(a)winehq.com

2 1

wineshelllink
by Johan Gill 08 Nov '01

08 Nov '01

Are there any known issues with wineshelllink and KDE1 at the moment? It seems quite a few of my install programs hang when the shortcuts are about to be put in place. /Johan Gill, johane(a)lysator.liu.se

1 0

Re: Extra info in scrollbar can be an handle.
by Alexandre Julliard 08 Nov '01

08 Nov '01

Marco Bizzarri <m.bizzarri(a)icube.it> writes: > The included patch solves the problem by making an explicit GlobalLock, > and returning that value. I'm not sure this is the correct solution, so > comments are welcome. If you want to GlobalLock it, it should be allocated by GlobalAlloc. Plus the block layout will have to be compatible with what the app expects. Could you check what the app does with the memory block? Also what kind of brain-damaged app is this? -- Alexandre Julliard julliard(a)winehq.com

2 1

Two answers/questions from yesterdays and todays digests
by Robert Lunnon 08 Nov '01

08 Nov '01

Answers Now... >Message: 1 >Date: Tue, 06 Nov 2001 12:53:56 -0500 >From: Roger Fujii <rmf(a)lookhere.com> >To: wine-devel(a)winehq.com >Subject: queries on internals.... > >ok... getting reasonable output, but now I have some >questions. > >First, it seems like wine can't find the audio codecs, >though it seems to find the video ones. Is this a >to-be-implemented or a bug and any clues on where to look? Is this in Solaris ?, if so you wiould have to have OSS installed and even then I am not sure it would work properly. Investigating audio on Solaris I found that ACM was not happy unless the audio driver was available and installed properly otherwise it returns Device Busy. I do have a working Waveout Solution for native Solaris based on my libaudioio project. I've not tackled Direct Sound or Wavein yet. As yet this solution is not integrated with Wines Build environment so you can't set it up with configure. If you are prepared to grub through the relevant mods I can send you a patch kit. > Message: 1 > Date: Wed, 7 Nov 2001 20:50:11 +0100 > From: Andreas Mohr <andi(a)rhlx01.fht-esslingen.de> > To: Francois Gouget <fgouget(a)free.fr> > Cc: Martin Wilck <Martin.Wilck(a)fujitsu-siemens.com>, > wine-devel mailing list <wine-devel(a)winehq.com> > Subject: Re: [EXPERIMENTAL PATCH]: Winsock2 > Reply-To: andi(a)rhlx01.fht-esslingen.de > > On Wed, Nov 07, 2001 at 10:54:02AM -0800, Francois Gouget wrote: > > * To answer your question: > > /* Code copied largely from WSOCK32_accept() */ > > /* FIXME: Can we simply call WSOCK32_accept() instead ? */ > > /* I wasn't sure because of the AsyncSelect stuff at the end, > > which presumably should only be called if the connection is > > accepted */ > > > > Winsock2 should not call the wsock32 library. It should be the > > opposite. One of the things on my todo list (but whether I will have > > time to actually do it is another matter) is to reorganize the winsock > > libraries so that wsock32 and winsock are together in dlls/wsock32. The > > reason is that they both implement the winsock1 API except one is 16bit > > and the other 32bits. Then in dlls/winsock we would be left with just > > ws2_32 which implements the winsock2 API. So having ws2_32 call to > > wsock32 is not going in the right direction :-) > > Hmm ? > Sorry, but this directory stuff sounds rather dainbread to me. > IMHO winsock/wsock32 should be in winsock/, and ws2_32 should be in > winsock2/ Or, maybe even better, use winsock1/ instead of winsock/. > > WTH would you want to do it in a different way ? Whoever is playing with Winsock can you please ensure that the solutions you come up with are not linux centric. There is a lot of code in there that does not run on solaris because it grubs around in PROC getting TCP structures. I have made a bit of a start in cleaning this up, Here it is, absolutely untested non working code, but a start nevertheless, I put this into a separate file and link it with winsock and wsock32 from a common source, these functions replace the helper functions of similar name in the two dll subdirectories.

1 0

Re: File record locking (exclusive, nowait)
by eric pouech 08 Nov '01

08 Nov '01

"Medland, Bill" wrote: > > <<diff29.txt>> didn't you forget to add the server/fd.c file ? A+ -- --------------- Eric Pouech (http://perso.wanadoo.fr/eric.pouech/) "The future will be better tomorrow", Vice President Dan Quayle

1 0

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