December 2001 - Wine-Devel - list.winehq.org

OSS fixes
by eric pouech Dec. 10, 2001

Dec. 10, 2001

could the people who had issues with the latest OSS patch(es) test if this one fixes all their issues ? TIA A+ -- --------------- Eric Pouech (http://perso.wanadoo.fr/eric.pouech/) "The future will be better tomorrow", Vice President Dan Quayle Index: dlls/winmm/wineoss/audio.c =================================================================== RCS file: /usr/share/cvs/cvsroot/wine/wine/dlls/winmm/wineoss/audio.c,v retrieving revision 1.47 diff -u -r1.47 audio.c --- dlls/winmm/wineoss/audio.c 2001/11/19 02:10:50 1.47 +++ dlls/winmm/wineoss/audio.c 2001/12/10 20:15:30 @@ -82,6 +82,7 @@ #define WINE_WM_RESETTING (WM_USER + 3) #define WINE_WM_CLOSING (WM_USER + 4) #define WINE_WM_HEADER (WM_USER + 5) +#define WINE_WM_UPDATE (WM_USER + 6) typedef struct { int msg; /* message identifier */ @@ -89,9 +90,9 @@ HANDLE hEvent; /* if message is synchronous, handle of event for synchro */ } OSS_MSG; -/* implement a in process message ring for better performance +/* implement an in-process message ring for better performance * (compared to passing thru the server) - * this ring will be used by both the input & output plauback + * this ring will be used by the input (resp output) record (resp playback) routine */ typedef struct { #define OSS_RING_BUFFER_SIZE 30 @@ -105,39 +106,32 @@ typedef struct { int unixdev; volatile int state; /* one of the WINE_WS_ manifest constants */ + WAVEOPENDESC waveDesc; + WORD wFlags; + PCMWAVEFORMAT format; + WAVEOUTCAPSA caps; + + /* OSS information */ DWORD dwFragmentSize; /* size of OSS buffer fragment */ - DWORD dwBufferSize; /* size of whole OSS buffer in bytes - * used to compute dwPlayedTotal from dwWrittenTotal and - * ioctl GETOSPACE info - */ + DWORD dwBufferSize; /* size of whole OSS buffer in bytes */ WORD uWaitForFragments; /* The number of OSS buffer fragments we would like to be free * before trying to write to the DSP */ - DWORD dwMillisPerFragment; /* The number of milliseconds of sound in each OSS buffer - * fragment - */ - WAVEOPENDESC waveDesc; - WORD wFlags; - PCMWAVEFORMAT format; LPWAVEHDR lpQueuePtr; /* start of queued WAVEHDRs (waiting to be notified) */ LPWAVEHDR lpPlayPtr; /* start of not yet fully played buffers */ + DWORD dwPartialOffset; /* Offset of not yet written bytes in lpPlayPtr */ - /* info on current lpPlayPtr->lpWaveHdr */ - LPSTR lpPartialData; /* Data still to write on current wavehdr */ - DWORD dwPartialBytes; /* number of bytes to write to end current wavehdr */ - LPWAVEHDR lpLoopPtr; /* pointer of first buffer in loop, if any */ DWORD dwLoops; /* private copy of loop counter */ - DWORD dwPlayedTotal; /* number of bytes played since opening */ - DWORD dwWrittenTotal; /* number of bytes written since opening */ + DWORD dwPlayedTotal; /* number of bytes actually played since opening */ + DWORD dwWrittenTotal; /* number of bytes written to OSS buffer since opening */ /* synchronization stuff */ HANDLE hStartUpEvent; HANDLE hThread; DWORD dwThreadID; OSS_MSG_RING msgRing; - WAVEOUTCAPSA caps; /* DirectSound stuff */ LPBYTE mapping; @@ -174,7 +168,8 @@ "WINE_WM_RESTARTING", "WINE_WM_RESETTING", "WINE_WM_CLOSING", - "WINE_WM_HEADER" }; + "WINE_WM_HEADER", + "WINE_WM_UPDATE" }; /*======================================================================* * Low level WAVE implementation * @@ -378,56 +373,6 @@ return 0; } -/************************************************************************** - * OSS_NotifyClient [internal] - */ -static DWORD OSS_NotifyClient(UINT wDevID, WORD wMsg, DWORD dwParam1, DWORD dwParam2) -{ - TRACE("wDevID = %04X wMsg = 0x%04x dwParm1 = %04lX dwParam2 = %04lX\n",wDevID, wMsg, dwParam1, dwParam2); - - switch (wMsg) { - case WOM_OPEN: - case WOM_CLOSE: - case WOM_DONE: - if (wDevID >= MAX_WAVEOUTDRV) return MCIERR_INTERNAL; - - if (WOutDev[wDevID].wFlags != DCB_NULL && - !DriverCallback(WOutDev[wDevID].waveDesc.dwCallback, - WOutDev[wDevID].wFlags, - WOutDev[wDevID].waveDesc.hWave, - wMsg, - WOutDev[wDevID].waveDesc.dwInstance, - dwParam1, - dwParam2)) { - WARN("can't notify client !\n"); - return MMSYSERR_NOERROR; - } - break; - - case WIM_OPEN: - case WIM_CLOSE: - case WIM_DATA: - if (wDevID >= MAX_WAVEINDRV) return MCIERR_INTERNAL; - - if (WInDev[wDevID].wFlags != DCB_NULL && - !DriverCallback(WInDev[wDevID].waveDesc.dwCallback, - WInDev[wDevID].wFlags, - WInDev[wDevID].waveDesc.hWave, - wMsg, - WInDev[wDevID].waveDesc.dwInstance, - dwParam1, - dwParam2)) { - WARN("can't notify client !\n"); - return MMSYSERR_NOERROR; - } - break; - default: - FIXME("Unknown CB message %u\n", wMsg); - break; - } - return 0; -} - static int OSS_InitRingMessage(OSS_MSG_RING* omr) { omr->msg_toget = 0; @@ -497,24 +442,38 @@ *======================================================================*/ /************************************************************************** - * updatePlayedTotal [internal] - * - * Calculates wwo->dwPlayed total from wwo->dwWrittenTotal and the amount - * still remaining in the OSS buffer. + * wodNotifyClient [internal] */ -static DWORD updatePlayedTotal( WINE_WAVEOUT* wwo ) +static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2) { - audio_buf_info info; - - if (ioctl(wwo->unixdev, SNDCTL_DSP_GETOSPACE, &info) < 0) { - ERR("ioctl failed (%s)\n", strerror(errno)); - return wwo->dwPlayedTotal; + TRACE("wMsg = 0x%04x dwParm1 = %04lX dwParam2 = %04lX\n", wMsg, dwParam1, dwParam2); + + switch (wMsg) { + case WOM_OPEN: + case WOM_CLOSE: + case WOM_DONE: + if (wwo->wFlags != DCB_NULL && + !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, wwo->waveDesc.hWave, + wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2)) { + WARN("can't notify client !\n"); + return MMSYSERR_ERROR; + } + break; + default: + FIXME("Unknown CB message %u\n", wMsg); + return MMSYSERR_INVALPARAM; } - - wwo->dwPlayedTotal=wwo->dwWrittenTotal-( wwo->dwBufferSize - info.bytes ); - return wwo->dwPlayedTotal; + return MMSYSERR_NOERROR; } +/************************************************************************** + * wodUpdatePlayedTotal [internal] + * + */ +static void wodUpdatePlayedTotal(WINE_WAVEOUT* wwo, DWORD availInQ) +{ + wwo->dwPlayedTotal = wwo->dwWrittenTotal - (wwo->dwBufferSize - availInQ); +} /************************************************************************** * wodPlayer_BeginWaveHdr [internal] @@ -523,12 +482,11 @@ * If the specified wave header is a begin loop and we're not already in * a loop, setup the loop. */ -static void wodPlayer_BeginWaveHdr( WINE_WAVEOUT* wwo, - LPWAVEHDR lpWaveHdr ) +static void wodPlayer_BeginWaveHdr(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr) { - wwo->lpPlayPtr=lpWaveHdr; + wwo->lpPlayPtr = lpWaveHdr; - if( !lpWaveHdr ) return; + if (!lpWaveHdr) return; if (lpWaveHdr->dwFlags & WHDR_BEGINLOOP) { if (wwo->lpLoopPtr) { @@ -541,6 +499,7 @@ wwo->dwLoops = lpWaveHdr->dwLoops; } } + wwo->dwPartialOffset = 0; } /************************************************************************** @@ -550,8 +509,9 @@ */ static LPWAVEHDR wodPlayer_PlayPtrNext(WINE_WAVEOUT* wwo) { - LPWAVEHDR lpWaveHdr=wwo->lpPlayPtr; + LPWAVEHDR lpWaveHdr = wwo->lpPlayPtr; + wwo->dwPartialOffset = 0; if ((lpWaveHdr->dwFlags & WHDR_ENDLOOP) && wwo->lpLoopPtr) { /* We're at the end of a loop, loop if required */ if (--wwo->dwLoops > 0) { @@ -564,17 +524,17 @@ * the opening one or for both ??? * code assumes for closing loop only */ - wwo->lpLoopPtr = NULL; - wodPlayer_BeginWaveHdr( wwo, lpWaveHdr ); } else { - wwo->lpLoopPtr = NULL; - wodPlayer_BeginWaveHdr( wwo, lpWaveHdr=lpWaveHdr->lpNext ); - } + lpWaveHdr = lpWaveHdr->lpNext; + } + wwo->lpLoopPtr = NULL; + wodPlayer_BeginWaveHdr(wwo, lpWaveHdr); } } else { /* We're not in a loop. Advance to the next wave header */ - wodPlayer_BeginWaveHdr( wwo, lpWaveHdr=lpWaveHdr->lpNext ); + wodPlayer_BeginWaveHdr(wwo, lpWaveHdr = lpWaveHdr->lpNext); } + return lpWaveHdr; } @@ -584,11 +544,13 @@ * This is based on the number of fragments we want to be clear before * writing and the number of free fragments we already have. */ -static DWORD wodPlayer_DSPWait( WINE_WAVEOUT *wwo, WORD uFreeFragments ) +static DWORD wodPlayer_DSPWait(const WINE_WAVEOUT *wwo, DWORD availInQ) { - return (uFreeFragments>wwo->uWaitForFragments)?1: - wwo->dwMillisPerFragment* - (wwo->uWaitForFragments-uFreeFragments); + DWORD uFreeFragments = availInQ / wwo->dwFragmentSize; + + return (uFreeFragments >= wwo->uWaitForFragments) + ? 1 : (wwo->dwFragmentSize * 1000 / wwo->format.wf.nAvgBytesPerSec) * + (wwo->uWaitForFragments - uFreeFragments); } /************************************************************************** @@ -598,20 +560,15 @@ * This is based on the number of bytes remaining to be written in the * wave. */ -static DWORD wodPlayer_NotifyWait( WINE_WAVEOUT *wwo, LPWAVEHDR lpWaveHdr ) +static DWORD wodPlayer_NotifyWait(const WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr) { DWORD dwMillis; - if( lpWaveHdr->reserved<wwo->dwPlayedTotal ) { - dwMillis=1; + if (lpWaveHdr->reserved < wwo->dwPlayedTotal) { + dwMillis = 1; } else { - dwMillis=(lpWaveHdr->reserved-wwo->dwPlayedTotal) * - wwo->dwMillisPerFragment / wwo->dwFragmentSize; - TRACE( "wait for %lu bytes = %lu\n", - (lpWaveHdr->reserved-wwo->dwPlayedTotal), - dwMillis ); - if( dwMillis < 1 ) - dwMillis=1; + dwMillis = (lpWaveHdr->reserved - wwo->dwPlayedTotal) * 1000 / wwo->format.wf.nAvgBytesPerSec; + if (!dwMillis) dwMillis = 1; } return dwMillis; @@ -621,26 +578,28 @@ /************************************************************************** * wodPlayer_WriteMaxFrags [internal] * Writes the maximum number of bytes possible to the DSP and returns - * the number of bytes written. Also updates fragments in dspspace. + * the number of bytes written. */ -static DWORD wodPlayer_WriteMaxFrags( WINE_WAVEOUT *wwo, LPSTR lpData, - DWORD dwLength, - audio_buf_info* dspspace ) -{ - /* Only attempt to write to free fragments */ - int maxWrite=dspspace->fragments*dspspace->fragsize; - int toWrite=min(dwLength,maxWrite); - - int written=write(wwo->unixdev, lpData, toWrite); - - TRACE("wrote %d of %lu bytes\n", - written, dwLength ); - if( written > 0 ) { - /* Keep a count of the total bytes written to the DSP */ - wwo->dwWrittenTotal+=written; - /* reduce the number of free fragments */ - dspspace->fragments -= (written/dspspace->fragsize)+(written%dspspace->fragsize>0); +static int wodPlayer_WriteMaxFrags(WINE_WAVEOUT* wwo, DWORD* bytes) +{ + /* Only attempt to write to free bytes */ + DWORD dwLength = wwo->lpPlayPtr->dwBufferLength - wwo->dwPartialOffset; + int toWrite = min(dwLength, *bytes); + int written; + + TRACE("Writing wavehdr %p.%lu\n", wwo->lpPlayPtr, wwo->dwPartialOffset); + written = write(wwo->unixdev, wwo->lpPlayPtr->lpData + wwo->dwPartialOffset, toWrite); + if (written <= 0) return written; + + if (written >= dwLength) { + /* If we wrote it all, skip to the next header */ + wodPlayer_PlayPtrNext(wwo); + } else { + /* Remove the amount written */ + wwo->dwPartialOffset += written; } + *bytes -= written; + wwo->dwWrittenTotal += written; return written; } @@ -654,37 +613,30 @@ * we notify all wavehdrs and remove them all from the queue even if they * are unplayed or part of a loop. */ -static DWORD wodPlayer_NotifyCompletions( WINE_WAVEOUT* wwo, WORD uDevID, BOOL force) +static DWORD wodPlayer_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) { LPWAVEHDR lpWaveHdr; - updatePlayedTotal(wwo); /* Start from lpQueuePtr and keep notifying until: * - we hit an unwritten wavehdr * - we hit the beginning of a running loop * - we hit a wavehdr which hasn't finished playing */ - while( (lpWaveHdr=wwo->lpQueuePtr) && - (force || - (lpWaveHdr != wwo->lpPlayPtr && - lpWaveHdr != wwo->lpLoopPtr && - lpWaveHdr->reserved <= wwo->dwPlayedTotal ))) { + while ((lpWaveHdr = wwo->lpQueuePtr) && + (force || + (lpWaveHdr != wwo->lpPlayPtr && + lpWaveHdr != wwo->lpLoopPtr && + lpWaveHdr->reserved <= wwo->dwPlayedTotal))) { wwo->lpQueuePtr = lpWaveHdr->lpNext; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - TRACE("Notifying client with %p\n", lpWaveHdr); - if (OSS_NotifyClient(uDevID, WOM_DONE, (DWORD)lpWaveHdr, 0) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - } + wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); } - return ( lpWaveHdr && - lpWaveHdr != wwo->lpPlayPtr && - lpWaveHdr != wwo->lpLoopPtr ) ? - wodPlayer_NotifyWait( wwo, lpWaveHdr ) : - 0 ; + return (lpWaveHdr && lpWaveHdr != wwo->lpPlayPtr && lpWaveHdr != wwo->lpLoopPtr) ? + wodPlayer_NotifyWait(wwo, lpWaveHdr) : INFINITE; } /************************************************************************** @@ -692,10 +644,10 @@ * * wodPlayer helper. Resets current output stream. */ -static void wodPlayer_Reset(WINE_WAVEOUT* wwo, WORD uDevID, BOOL reset) +static void wodPlayer_Reset(WINE_WAVEOUT* wwo, BOOL reset) { /* updates current notify list */ - wodPlayer_NotifyCompletions(wwo, uDevID, FALSE); + wodPlayer_NotifyCompletions(wwo, FALSE); /* flush all possible output */ if (ioctl(wwo->unixdev, SNDCTL_DSP_RESET, 0) == -1) { @@ -706,17 +658,16 @@ } /* Clear partial wavehdr */ - wwo->dwPartialBytes=0; - wwo->lpPartialData=NULL; + wwo->dwPartialOffset = 0; if (reset) { /* empty notify list */ - wodPlayer_NotifyCompletions(wwo, uDevID, TRUE); + wodPlayer_NotifyCompletions(wwo, TRUE); wwo->lpPlayPtr = wwo->lpQueuePtr = wwo->lpLoopPtr = NULL; wwo->state = WINE_WS_STOPPED; wwo->dwPlayedTotal = 0; - wwo->dwWrittenTotal = 0; + wwo->dwWrittenTotal = 0; } else { /* FIXME: this is not accurate when looping, but can be do better ? */ wwo->lpPlayPtr = (wwo->lpLoopPtr) ? wwo->lpLoopPtr : wwo->lpQueuePtr; @@ -725,41 +676,9 @@ } /************************************************************************** - * wodPlayer_AwaitEvent [internal] - * Wait for a command to be sent to the wodPlayer or for time to pass - * until wodPlayer needs to do something again. - */ -static void wodPlayer_AwaitEvent( WINE_WAVEOUT* wwo, - DWORD dwNextFeedTime, - DWORD dwNextNotifyTime ) -{ - DWORD dwSleepTime; - - /** Wait for the shortest time before an action is required. If there - * are no pending actions, wait forever for a command. - */ - if( dwNextFeedTime == 0 ) { - if( dwNextNotifyTime == 0 ) - dwSleepTime=INFINITE; - else - dwSleepTime=dwNextNotifyTime; - } else { - if( dwNextNotifyTime == 0 ) - dwSleepTime=dwNextFeedTime; - else - dwSleepTime=min( dwNextFeedTime, dwNextNotifyTime ); - } - TRACE( "waiting %lu millis (%lu,%lu)\n", dwSleepTime, - dwNextFeedTime,dwNextNotifyTime ); - WaitForSingleObject(wwo->msgRing.msg_event, dwSleepTime); - TRACE( "wait returned\n"); - -} - -/************************************************************************** * wodPlayer_ProcessMessages [internal] */ -static void wodPlayer_ProcessMessages( WINE_WAVEOUT* wwo, WORD uDevID ) +static void wodPlayer_ProcessMessages(WINE_WAVEOUT* wwo) { LPWAVEHDR lpWaveHdr; int msg; @@ -767,11 +686,10 @@ HANDLE ev; while (OSS_RetrieveRingMessage(&wwo->msgRing, &msg, &param, &ev)) { - TRACE( "Received %s %lx\n", - wodPlayerCmdString[msg-WM_USER-1], param ); + TRACE("Received %s %lx\n", wodPlayerCmdString[msg - WM_USER - 1], param); switch (msg) { case WINE_WM_PAUSING: - wodPlayer_Reset(wwo, uDevID, FALSE); + wodPlayer_Reset(wwo, FALSE); wwo->state = WINE_WS_PAUSED; SetEvent(ev); break; @@ -788,12 +706,13 @@ for (wh = &(wwo->lpQueuePtr); *wh; wh = &((*wh)->lpNext)); *wh = lpWaveHdr; } - wodPlayer_BeginWaveHdr(wwo,lpWaveHdr); + if (!wwo->lpPlayPtr) + wodPlayer_BeginWaveHdr(wwo,lpWaveHdr); if (wwo->state == WINE_WS_STOPPED) wwo->state = WINE_WS_PLAYING; break; case WINE_WM_RESETTING: - wodPlayer_Reset(wwo, uDevID, TRUE); + wodPlayer_Reset(wwo, TRUE); SetEvent(ev); break; case WINE_WM_CLOSING: @@ -804,6 +723,17 @@ SetEvent(ev); ExitThread(0); /* shouldn't go here */ + case WINE_WM_UPDATE: + { + audio_buf_info info; + + if (ioctl(wwo->unixdev, SNDCTL_DSP_GETOSPACE, &info) < 0) { + ERR("ioctl failed (%s)\n", strerror(errno)); + } else { + wodUpdatePlayedTotal(wwo, info.bytes); + } + } + break; default: FIXME("unknown message %d\n", msg); break; @@ -816,77 +746,45 @@ * Feed as much sound data as we can into the DSP and return the number of * milliseconds before it will be necessary to feed the DSP again. */ -static DWORD wodPlayer_FeedDSP( WINE_WAVEOUT* wwo ) +static DWORD wodPlayer_FeedDSP(WINE_WAVEOUT* wwo) { - LPWAVEHDR lpWaveHdr=wwo->lpPlayPtr; - DWORD written=0; - DWORD bytesToWrite; audio_buf_info dspspace; + DWORD availInQ; - /* Read output space info so we know how much writing to do */ if (ioctl(wwo->unixdev, SNDCTL_DSP_GETOSPACE, &dspspace) < 0) { - ERR("IOCTL can't 'SNDCTL_DSP_GETOSPACE' !\n"); + ERR("IOCTL can't 'SNDCTL_DSP_GETOSPACE' !\n"); + return INFINITE; } + TRACE("fragments=%d/%d, fragsize=%d, bytes=%d\n", + dspspace.fragments, dspspace.fragstotal, dspspace.fragsize, dspspace.bytes); - TRACE( "fragments=%d, fragsize=%d, fragstotal=%d, bytes=%d\n", - dspspace.fragments, dspspace.fragsize, - dspspace.fragstotal, dspspace.bytes ); + availInQ = dspspace.bytes; + wodUpdatePlayedTotal(wwo, availInQ); - /* Do nothing if the DSP isn't hungry */ - if( dspspace.fragments==0 ) { - return wodPlayer_DSPWait(wwo,dspspace.fragments); - } - - /* If there's a partially written wavehdr, feed more of it - * ------------------------------------------------------- - */ - bytesToWrite=wwo->dwPartialBytes; - if( bytesToWrite > 0 ) { - TRACE("partial write %lu bytes at %p\n", - wwo->dwPartialBytes, - wwo->lpPartialData ); - written=wodPlayer_WriteMaxFrags( wwo, wwo->lpPartialData, - bytesToWrite, - &dspspace ); - if( written >= bytesToWrite ) { - /* If we wrote it all, skip to the next header */ - wwo->dwPartialBytes=0; - wwo->lpPartialData=NULL; - lpWaveHdr=wodPlayer_PlayPtrNext( wwo ); - } else { - /* Remove the amount written */ - wwo->lpPartialData+=written; - wwo->dwPartialBytes-=written; - } + /* input queue empty and output buffer with less than one fragment to play */ + if (!wwo->lpPlayPtr && wwo->dwBufferSize < availInQ + 2 * wwo->dwFragmentSize) { + TRACE("Run out of wavehdr:s... flushing\n"); + ioctl(wwo->unixdev, SNDCTL_DSP_SYNC, 0); + wodUpdatePlayedTotal(wwo, wwo->dwBufferSize); + return INFINITE; } - /* Feed wavehdrs until we run out of wavehdrs or DSP space - * ------------------------------------------------------- - */ - while( lpWaveHdr && dspspace.fragments > 0 ) { - TRACE( "Writing wavehdr %p %lu bytes\n", lpWaveHdr, - lpWaveHdr->dwBufferLength ); + /* no more room... no need to try to feed */ + if (dspspace.fragments == 0) return wodPlayer_DSPWait(wwo, 0); - /* note the value that dwPlayedTotal will be when this - * wave finishes playing - */ - lpWaveHdr->reserved=wwo->dwWrittenTotal+lpWaveHdr->dwBufferLength; + /* Feed from partial wavehdr */ + if (wwo->lpPlayPtr && wwo->dwPartialOffset != 0) { + wodPlayer_WriteMaxFrags(wwo, &availInQ); + } - written=wodPlayer_WriteMaxFrags( wwo, lpWaveHdr->lpData, - lpWaveHdr->dwBufferLength, - &dspspace ); - /* If it's all written, on to the next one, else remember the - * partial write for next FeedDSP call. - */ - if( written >= lpWaveHdr->dwBufferLength ) { - lpWaveHdr=wodPlayer_PlayPtrNext( wwo ); - } else { - wwo->dwPartialBytes=lpWaveHdr->dwBufferLength-written; - wwo->lpPartialData=lpWaveHdr->lpData+written; - } + /* Feed wavehdrs until we run out of wavehdrs or DSP space */ + if (wwo->dwPartialOffset == 0) while (wwo->lpPlayPtr && availInQ > 0) { + /* note the value that dwPlayedTotal will return when this wave finishes playing */ + wwo->lpPlayPtr->reserved = wwo->dwWrittenTotal + wwo->lpPlayPtr->dwBufferLength; + wodPlayer_WriteMaxFrags(wwo, &availInQ); } - return lpWaveHdr ? wodPlayer_DSPWait(wwo,dspspace.fragments) : 0 ; + return wodPlayer_DSPWait(wwo, availInQ); } @@ -897,20 +795,26 @@ { WORD uDevID = (DWORD)pmt; WINE_WAVEOUT* wwo = (WINE_WAVEOUT*)&WOutDev[uDevID]; - DWORD dwNextFeedTime=0; /* Time before DSP needs feeding */ - DWORD dwNextNotifyTime=0; /* Time before next wave completion */ + DWORD dwNextFeedTime = INFINITE; /* Time before DSP needs feeding */ + DWORD dwNextNotifyTime = INFINITE; /* Time before next wave completion */ + DWORD dwSleepTime; - wwo->state=WINE_WS_STOPPED; - SetEvent( wwo->hStartUpEvent ); + wwo->state = WINE_WS_STOPPED; + SetEvent(wwo->hStartUpEvent); - for(;;) { - wodPlayer_AwaitEvent(wwo,dwNextFeedTime,dwNextNotifyTime); - wodPlayer_ProcessMessages(wwo,uDevID); - if( wwo->state== WINE_WS_PLAYING ) { - dwNextFeedTime=wodPlayer_FeedDSP(wwo); - dwNextNotifyTime=wodPlayer_NotifyCompletions(wwo,uDevID,FALSE); + for (;;) { + /** Wait for the shortest time before an action is required. If there + * are no pending actions, wait forever for a command. + */ + dwSleepTime = min(dwNextFeedTime, dwNextNotifyTime); + TRACE("waiting %lums (%lu,%lu)\n", dwSleepTime, dwNextFeedTime, dwNextNotifyTime); + WaitForSingleObject(wwo->msgRing.msg_event, dwSleepTime); + wodPlayer_ProcessMessages(wwo); + if (wwo->state == WINE_WS_PLAYING) { + dwNextFeedTime = wodPlayer_FeedDSP(wwo); + dwNextNotifyTime = wodPlayer_NotifyCompletions(wwo, FALSE); } else { - dwNextFeedTime=dwNextNotifyTime=0; + dwNextFeedTime = dwNextNotifyTime = INFINITE; } } } @@ -1039,7 +943,7 @@ if (dsp_stereo != (wwo->format.wf.nChannels > 1) ? 1 : 0) ERR("Can't set stereo to %u (%d)\n", (wwo->format.wf.nChannels > 1) ? 1 : 0, dsp_stereo); - if (!NEAR_MATCH(sample_rate,wwo->format.wf.nSamplesPerSec)) + if (!NEAR_MATCH(sample_rate, wwo->format.wf.nSamplesPerSec)) ERR("Can't set sample_rate to %lu (%d)\n", wwo->format.wf.nSamplesPerSec, sample_rate); @@ -1062,11 +966,10 @@ /* Remember fragsize and total buffer size for future use */ wwo->dwFragmentSize = info.fragsize; wwo->dwBufferSize = info.fragstotal * info.fragsize; - wwo->dwMillisPerFragment = info.fragsize * 1000 / wwo->format.wf.nAvgBytesPerSec; wwo->uWaitForFragments = info.fragstotal * REFILL_BUFFER_WHEN; - TRACE( "wait for %d fragments at %lu millis/fragment\n", - wwo->uWaitForFragments, - wwo->dwMillisPerFragment ); + wwo->dwPlayedTotal = 0; + wwo->dwWrittenTotal = 0; + TRACE("wait for %d fragments\n", wwo->uWaitForFragments); OSS_InitRingMessage(&wwo->msgRing); @@ -1091,11 +994,7 @@ wwo->format.wf.nSamplesPerSec, wwo->format.wf.nChannels, wwo->format.wf.nBlockAlign); - if (OSS_NotifyClient(wDevID, WOM_OPEN, 0L, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - return MMSYSERR_INVALPARAM; - } - return MMSYSERR_NOERROR; + return wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); } /************************************************************************** @@ -1130,10 +1029,7 @@ close(wwo->unixdev); wwo->unixdev = -1; wwo->dwFragmentSize = 0; - if (OSS_NotifyClient(wDevID, WOM_CLOSE, 0L, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - ret = MMSYSERR_INVALPARAM; - } + ret = wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); } return ret; } @@ -1246,10 +1142,7 @@ /* FIXME: is NotifyClient with WOM_DONE right ? (Comet Busters 1.3.3 needs this notification) */ /* FIXME: Myst crashes with this ... hmm -MM - if (OSS_NotifyClient(wDevID, WOM_DONE, 0L, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - return MMSYSERR_INVALPARAM; - } + return wodNotifyClient(wwo, WOM_DONE, 0L, 0L); */ return MMSYSERR_NOERROR; @@ -1293,7 +1186,8 @@ if (lpTime == NULL) return MMSYSERR_INVALPARAM; wwo = &WOutDev[wDevID]; - val = updatePlayedTotal(wwo); + OSS_AddRingMessage(&wwo->msgRing, WINE_WM_UPDATE, 0, TRUE); + val = wwo->dwPlayedTotal; TRACE("wType=%04X wBitsPerSample=%u nSamplesPerSec=%lu nChannels=%u nAvgBytesPerSec=%lu\n", lpTime->wType, wwo->format.wBitsPerSample, @@ -1307,7 +1201,7 @@ TRACE("TIME_BYTES=%lu\n", lpTime->u.cb); break; case TIME_SAMPLES: - lpTime->u.sample = val * 8 / wwo->format.wBitsPerSample; + lpTime->u.sample = val * 8 / wwo->format.wBitsPerSample /wwo->format.wf.nChannels; TRACE("TIME_SAMPLES=%lu\n", lpTime->u.sample); break; case TIME_SMPTE: @@ -1498,7 +1392,7 @@ * clear it, or we get junk noise */ /* some libc implementations are buggy: their memset reads from the buffer... * to work around it, we have the 0 the block by hand and do not call: - * memset(wwo->mapping,0,wwo->maplen); + * memset(wwo->mapping,0, wwo->maplen); */ { char* p1 = wwo->mapping; @@ -1902,6 +1796,31 @@ *======================================================================*/ /************************************************************************** + * widNotifyClient [internal] + */ +static DWORD widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD dwParam1, DWORD dwParam2) +{ + TRACE("wMsg = 0x%04x dwParm1 = %04lX dwParam2 = %04lX\n", wMsg, dwParam1, dwParam2); + + switch (wMsg) { + case WIM_OPEN: + case WIM_CLOSE: + case WIM_DATA: + if (wwi->wFlags != DCB_NULL && + !DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, wwi->waveDesc.hWave, + wMsg, wwi->waveDesc.dwInstance, dwParam1, dwParam2)) { + WARN("can't notify client !\n"); + return MMSYSERR_ERROR; + } + break; + default: + FIXME("Unknown CB message %u\n", wMsg); + return MMSYSERR_INVALPARAM; + } + return MMSYSERR_NOERROR; +} + +/************************************************************************** * widGetDevCaps [internal] */ static DWORD widGetDevCaps(WORD wDevID, LPWAVEINCAPSA lpCaps, DWORD dwSize) @@ -1929,10 +1848,7 @@ WAVEHDR* lpWaveHdr; DWORD dwSleepTime; DWORD bytesRead; - LPVOID buffer = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - wwi->dwFragmentSize); - + LPVOID buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, wwi->dwFragmentSize); LPVOID pOffset = buffer; audio_buf_info info; int xs; @@ -1997,11 +1913,7 @@ lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - if (OSS_NotifyClient(uDevID, WIM_DATA, - (DWORD)lpWaveHdr, 0) != MMSYSERR_NOERROR) - { - WARN("can't notify client !\n"); - } + widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); lpWaveHdr = wwi->lpQueuePtr = lpNext; } } @@ -2041,11 +1953,7 @@ lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - if (OSS_NotifyClient(uDevID, WIM_DATA, - (DWORD)lpWaveHdr, 0) != MMSYSERR_NOERROR) - { - WARN("can't notify client !\n"); - } + widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); wwi->lpQueuePtr = lpWaveHdr = lpNext; if (!lpNext && bytesRead) { @@ -2116,10 +2024,7 @@ lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - if (OSS_NotifyClient(uDevID, WIM_DATA, - (DWORD)lpWaveHdr, 0) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - } + widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); } wwi->lpQueuePtr = NULL; SetEvent(ev); @@ -2258,11 +2163,7 @@ CloseHandle(wwi->hStartUpEvent); wwi->hStartUpEvent = INVALID_HANDLE_VALUE; - if (OSS_NotifyClient(wDevID, WIM_OPEN, 0L, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - return MMSYSERR_INVALPARAM; - } - return MMSYSERR_NOERROR; + return widNotifyClient(wwi, WIM_OPEN, 0L, 0L); } /************************************************************************** @@ -2289,11 +2190,7 @@ close(wwi->unixdev); wwi->unixdev = -1; wwi->dwFragmentSize = 0; - if (OSS_NotifyClient(wDevID, WIM_CLOSE, 0L, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - return MMSYSERR_INVALPARAM; - } - return MMSYSERR_NOERROR; + return widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); } /**************************************************************************

1 0

RE: Wine, Office, and the antitrust settlement
by Patrik Stridvall Dec. 10, 2001

Dec. 10, 2001

> I'm proposing that Wine be part of the settlement of the > Microsoft antitrust trial. See > http://www.kegel.com/remedy.html > Comments welcome. Well. I think the paragraph below is far to much to ask and I don't think anti-trust law can force Microsoft to do this. >From http://www.kegel.com/remedy.html: < Contracting with a Third Party to Enhance Wine to Support < Microsoft Office. "Within 60 days of entry of this Final Judgement, < Microsoft must contract with one or more outside firms to enhance the < Open Source Windows Emulator WINE to be able to install and run < Office 2000 under Linux. The work shall continue,with new releases < of Wine occurring every 60 days, until completed, or until the expenses < incurred by the outside firms reach 2 percent of the total development < and marketing costs of Office 2000. Furthermore, as soon as practicable, < but in no case later than 60 days prior to the date each new version of < Office becomes commercially available for use with a Windows Operating < System Product, Microsoft shall again contract with one or more outside < firms to enhance the Open Source Windows Emulator WINE to be able to < install and run the new version of Office under Linux. The work shall < continue, with new releases of Wine occurring every 60 days, until < completed, or until the expenses incurred by the outside firms < reach 2 percent of the total development and marketing costs < of the new version of Office. What is perhaps more realistic to require IMHO that Office and other Microsoft applications shouldn't crash or behave in a inconsistant way just because some odd feature in some API call is not available. Instead it should say, sorry can't do that not supported in the OS. This would prevent Microsoft from sabotaging Wine as well preventing users of say Windows 95 from needlessly having to upgrade. Yes, I'm aware of that Microsoft of course not can check every API call and have a fallback for each function, but groups of features that is potentially unneeded for basic features in Office like: 1. DirectX 2. MAPI 3. .NET 4. DAO 5. "Sound" 6. "Networking" 7. <Insert whatever favorite technology from Microsoft that you like> shouldn't be required to do normal stuff in Office. > I have a few questions for Wine developers, especially > the good folks at Codeweavers and Transgaming: > > 1. How much would it cost to achieve full support for > Office 2000 in Wine? That is an impossible question to answer. > 2. Is it true that Office uses undocumented Windows APIs? > If so, how many? Are they a significant part of the > challenge of supporting Office? Yes. But I don't rember which ones right know but there are quite a lot of undocumented API calls used by a lot of different programs. Perhaps somebody else on the list can be more specific.

2 1

Re: UNC patch
by Eric Pouech Dec. 9, 2001

Dec. 9, 2001

> Ok, I thing i got it now. You are asking for a configuration option in > e.g. ~/.wine/config to enable or disable UNC support like this: yup... 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.

6 13

Where do I start on DDX_Radio?
by Bill Medland Dec. 8, 2001

Dec. 8, 2001

Any chance of a quick pointer on this? I have a dialog containing a group of radio buttons, managed using DDX_Radio etc. On windows the DDX_Radio sets the correct button. However under WINE it always seems to set the first button of the group. Does anyone know what part of the code I should even be investigating (i.e. where is the dialog management code) Bill

2 1

Re: MIDL and COM
by Peter Samuelson Dec. 7, 2001

Dec. 7, 2001

I know this thread is a couple weeks old, I saw it on Wine Weekly News... [A. Julliard] > > If we want to use .idl files we'll have to come up with our own > > compiler, and then we can put the .idl source in the tree and > > compile it at build time. [Ove Kaaven] > Hmm. Even when using flex and bison, it sounds like a fair amount of > work... wonder who would volunteer? The FreeDCE Project has a DCE IDL compiler which I understand is mostly compatible with MIDL.EXE. See http://sf.net/projects/freedce and http://www.dcerpc.net/ (the latter seems to be malfunctioning at the moment). Peter

2 4

Re: Read/WriteProcessMemory fix
by Alexandre Julliard Dec. 7, 2001

Dec. 7, 2001

Andrew <andrew(a)transgaming.com> writes: > This fixes a bug in ReadProcessMemory and WriteProcessMemory, and > rearranges some of the code. (In particular, all the code that knows > that ptrace works in ints has been contained to server/ptrace.c.) What bug is it fixing? I'm not sure the reorganisation is a good idea; it seems less efficient, less portable, and AFAICS broken for accesses of less than an int size. -- Alexandre Julliard julliard(a)winehq.com

2 2

Re: SystemParametersInfo: DoubleClick actions
by Andriy Palamarchuk Dec. 7, 2001

Dec. 7, 2001

The last week I submitted this patch, but it is not applied yet. Are there any problems with the patch? Thanks, Andriy Palamarchuk __________________________________________________ Do You Yahoo!? Send your FREE holiday greetings online! http://greetings.yahoo.com

2 1

Re: Fix for MS debug info problems with winedbg
by Francois Gouget Dec. 6, 2001

Dec. 6, 2001

On Thu, 6 Dec 2001, Dave Hawkes wrote: > Fix for some types of C++ debug info that can cause winedbg to crash. Seems like the patch is missing :-) -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ If it stinks, it's chemistry. If it moves, it's biology. If it does not work, It's computer science.

2 1

Re:UNC patch
by Eric Pouech Dec. 6, 2001

Dec. 6, 2001

I think we should need some kind of configuration for this (to provide a bit more flexibility to end users) this would means,for example, allow or not automatic UNC operations (for now only binding a UNC name to a mounted SMB share). As in Wine, we don't allow mounting, as a default, all the file hierarchy, it would be interesting to provide the same type of functionnalities (bazed on host names for example... but I fear this would be a bit too complex to do). But as a starter, the option to enable binding should be made available. A+ > Hello, > > as suggested awhile ago from Dan Kegel on cemw. > > > If Wine handled UNC paths as follows: > > Given a UNC path \\foo\bar, > > look at /etc/mtab for a matching smbfs mount. > > If one is found, look at .wine/config for a drive letter mapped to that mount. > > If one is found, convert the UNC path to be relative to that drive letter. > > ChangeLog > --------- > * files/file.c: > Stefan.Leichter(a)camLine.com > implemented UNC filenames using samba shares mounted according to > /etc/mtab --------------- 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.

3 2

Re:UNC patch
by Eric Pouech Dec. 6, 2001

Dec. 6, 2001

> Sorry, I have no idea what you are talking about. Maybe it is my bad > english or my little knowledge about windows. no, it's my French ;-) what I'm talking about binding is the operation of making the relationship between a UNC name and a (samba-) mounted SMB share. the equivalent operation for names (making the relationship between a DOS driver letter and a Unix directory) is driven by the Wine configuration. Even, if both schemes are a bit different, I thought we need the same configuration capabilities in Wine. These are several things we could do (first one is a must have IMO, the others are open to discussion) - enable / disable the UNC to mount point parsing - enable / disable the UNX to mount point parsing on a per host basis - fully configure the UNC to mount point (like we do for DOS drive letters) - ... 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.

2 1

SHLWAPI pre-submit questions
by Jon Griffiths Dec. 6, 2001

Dec. 6, 2001

Hi, I've been hacking on SHLWAPI.dll for a couple of months now while holidaying around Thailand, using a beaten up laptop. Since I just obtained free use of a real machine with a good net connection, I want to start submitting my work but I thought I'd clear up a few style issues beforehand: 1. Is it OK to give meaningful names to undocumented functions? e.g. SHLWAPI_1/2 => UrlGetInfoA/W SHLWAPI_5/6 => PathFindOnPathExA/W I want to do this where the names are no-brainers, as in the case above, and the functions are referenced by the dll internally. 2. Is it OK to sync shlwapi.h with the windows version ? e.g. Remove undocumented entries Remove its dependence on obj_base.h (windows has none) Add the function exclusion defines as per windows I assume this is fine, but doing this causes the next question - 3. How to deal with shared undocumented functions? e.g. StrRetToBufA/W is used by shell32, but should not defined in shlwapi.h. Here there are 4 Choices: 1. Define twice (Ugly) 2. Put into a new wine/undocshlwapi.h (Seems that these are depreciated?) 3. Define anyway (Im not a fan of having undoc functions in public headers) 4. Have shell32 functions #include "../shlwapi/internal.h" (A little unclean) I'd like to go for 4, any objections? I'll start feeding in the new function implementations over the next little while, once the structure is sorted. Cheers, Jon ===== "Don't wait for the seas to part, or messiahs to come; Don't you sit around and waste this chance..." - Live jon_p_griffiths(a)yahoo.com __________________________________________________ Do You Yahoo!? Buy the perfect holiday gifts at Yahoo! Shopping. http://shopping.yahoo.com

5 7

Happy Christmas wine
by Russell Howe Dec. 5, 2001

Dec. 5, 2001

I got sent a Christmas card in Windows EXE format. Since it works perfectly with wine I thought I'd share it :) The file is at http://www2.cs.man.ac.uk/~hower0/crimbo.exe.gz -- Russell Howe rhowe(a)mindless.com

1 0

dlls/winedos/module.c:632: `write_pipe' undeclared
by Gerald Pfeifer Dec. 5, 2001

Dec. 5, 2001

revision 1.10 date: 2001/12/04 19:54:45; author: julliard; state: Exp; lines: +41 -60 Moved most of the real-mode stuff to dlls/winedos. of dlls/winedos/module.c causes the following build failure on FreeBSD 4.4: /usr/bin/gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -mpreferred-stack-boundary=2 -fPIC -D__WINE__ -D_REENTRANT -I/usr/X11R6/include -o module.o module.c module.c: In function `MZ_AllocDPMITask': module.c:614: warning: `return' with a value, in function returning void module.c: In function `MZ_Current': module.c:632: `write_pipe' undeclared (first use in this function) module.c:632: (Each undeclared identifier is reported only once module.c:632: for each function it appears in.) module.c:633: warning: control reaches end of non-void function gmake[2]: *** [module.o] Error 1 gmake[2]: Leaving directory `/.amd_mnt/vexpert/files8/test/wine/dlls/winedos' gmake[1]: *** [winedos/libwinedos.so] Error 2 Gerald -- Gerald "Jerry" pfeifer(a)dbai.tuwien.ac.at http://www.dbai.tuwien.ac.at/~pfeifer/

1 0

Re: [RFC] Async I/O patch: server code + ReadFileEx()
by Mike McCormack Dec. 5, 2001

Dec. 5, 2001

Hi Martin, i hadn't heard from you in a while, so i though you might have given up after nobody said anything about the last patch, but i see you've been busy :-) i also had a go at fixing the problems you pointed out. i've attached the patch i've been working on... don't use it, it _will_ crash your wineserver! i need to create a requeue async request like yours, and activate my queues properly. The code is written to support async on serial port objects, not file objects. Some thoughts: * Shouldn't each wineserver object should manage it's own queues? Many different types of requests can be overlapped ... for example WaitNamedPipe can be overlapped. Should every object keep a queue for waiting on named pipes? * wineserver should manage the timeouts and activation of requests (i see we agree there) * Wouldn't it be better to pass an status code back to the client rather than the poll events? That way we can have STATUS_TIMEOUT, STATUS_PENDING, STATUS_CANCELLED, etc. STATUS_PENDING can be the signal to start reading/writing/etc. Mike Original message from: Martin Wilck <Martin.Wilck(a)fujitsu-siemens.com> > > >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. ------------------------------------------ mailto:Mike_McCormack(a)start.com.au ph +82 16 430 0425 __________________________________________________________________ Get your free Australian email account at http://www.Looksmart.com.au

1 0

__p___argc, MSVCRT,__wine_get_main_args and ParseOptions
by Uwe Bonnes Dec. 4, 2001

Dec. 4, 2001

Hallo, running with builtin msvcrt like > wine --dll msvcrt=b a.exe for the following source: #include <stdio.h> #include <stdlib.h> #define _stat stat int main( void ) { printf("%d\n",__p___argc()); printf("%d\n",*(__p___argc())); return 0; } still counts _two_ arguments, as it sees "wine a.exe". OPTIONS_ParseOptions,__wine_get_main_args and __wine_get_wmain_args are very delicate stocked on each other, so I don't know which one to change. For a short test I did hertz:/spare/bon/wine-clean> cvs -d $CVSROOT diff -u wine/misc/options.c Index: wine/misc/options.c =================================================================== RCS file: /home/wine/wine/misc/options.c,v retrieving revision 1.29 diff -u -r1.29 options.c --- wine/misc/options.c 2001/11/06 00:49:48 1.29 +++ wine/misc/options.c 2001/11/20 20:18:44 @@ -356,8 +356,8 @@ */ int __wine_get_main_args( char ***argv ) { - *argv = app_argv; - return app_argc; + *argv = &app_argv[1]; + return app_argc-1; } (leaving aside __wine_get_wmain_args for the moment) and was able to run some programm that didn't run before. Can anybody help with the right fix? 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

Linear and segmented memory drifting apart
by Uwe Bonnes Dec. 4, 2001

Dec. 4, 2001

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 Dec. 4, 2001

Dec. 4, 2001

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(a)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 */ +(a)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 */ +(a)REPLY + handle_t handle; /* handle to request object for later use */ +(a)END + +/* Reschedule an unfinished async I/O request */ +(a)REQ(requeue_async_request) + handle_t handle; /* handle to the request object to be rescheduled */ +(a)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 Dec. 4, 2001

Dec. 4, 2001

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 Dec. 3, 2001

Dec. 3, 2001

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 Dec. 3, 2001

Dec. 3, 2001

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 Dec. 3, 2001

Dec. 3, 2001

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 Dec. 3, 2001

Dec. 3, 2001

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 Dec. 3, 2001

Dec. 3, 2001

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(a)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 Dec. 3, 2001

Dec. 3, 2001

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 Dec. 2, 2001

Dec. 2, 2001

[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 Dec. 2, 2001

Dec. 2, 2001

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 Dec. 1, 2001

Dec. 1, 2001

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 Dec. 1, 2001

Dec. 1, 2001

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(a)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 Dec. 1, 2001

Dec. 1, 2001

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