December 2006 - Wine-commits

Ken Thomases : winecoreaudio: Specialize wodHelper_BeginWaveHdr for its two callers and simplify.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: be4a17876de6637c073a96a77e7a8f80f25242fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=be4a17876de6637c073a96a77… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 21 03:48:38 2006 -0600 winecoreaudio: Specialize wodHelper_BeginWaveHdr for its two callers and simplify. wodHelper_PlayPtrNext is only called when state == WINE_WS_PLAYING. Also, it clears dwPartialOffset itself. wodWrite only calls wodHelper_BeginWaveHdr[Write] with a non-NULL lpWaveHdr parameter. wodWrite is not called from the Audio Unit render callback, so it can use Wine debug channels. --- dlls/winmm/winecoreaudio/audio.c | 54 +++++++++++++++++++++---------------- 1 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 9e26c31..8b416bb 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -883,39 +883,47 @@ static void wodHelper_CheckForLoopBegin( /************************************************************************** -* wodHelper_BeginWaveHdr [internal] +* wodHelper_BeginWaveHdrPlay [internal] * * Makes the specified lpWaveHdr the currently playing wave header. * If the specified wave header is a begin loop and we're not already in * a loop, setup the loop. * Call from AudioUnit IO thread can't use Wine debug channels. */ -static void wodHelper_BeginWaveHdr(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr) +static void wodHelper_BeginWaveHdrPlay(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr) { - OSStatus status; - wwo->lpPlayPtr = lpWaveHdr; - + if (!lpWaveHdr) { - if (wwo->state == WINE_WS_PLAYING) - { - wwo->state = WINE_WS_STOPPED; - status = AudioOutputUnitStop(wwo->audioUnit); - if (status && wwo->err_on) - fprintf(stderr, "err:winecoreaudio:wodHelper_BeginWaveHdr AudioOutputUnitStop return %c%c%c%c\n", - (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); - } - return; + OSStatus status; + wwo->state = WINE_WS_STOPPED; + status = AudioOutputUnitStop(wwo->audioUnit); + if (status && wwo->err_on) + fprintf(stderr, "err:winecoreaudio:wodHelper_BeginWaveHdrPlay AudioOutputUnitStop return %c%c%c%c\n", + (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); } + else + wodHelper_CheckForLoopBegin(wwo); +} + + +/************************************************************************** +* wodHelper_BeginWaveHdrWrite [internal] +* +* Makes the specified lpWaveHdr the currently playing wave header. +* If the specified wave header is a begin loop and we're not already in +* a loop, setup the loop. +*/ +static void wodHelper_BeginWaveHdrWrite(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr) +{ + wwo->lpPlayPtr = lpWaveHdr; if (wwo->state == WINE_WS_STOPPED) { - status = AudioOutputUnitStart(wwo->audioUnit); + OSStatus status = AudioOutputUnitStart(wwo->audioUnit); if (status) { - if (wwo->err_on) - fprintf(stderr, "err:winecoreaudio:AudioOutputUnitStart return %c%c%c%c\n", - (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); + ERR("AudioOutputUnitStart return %c%c%c%c\n", (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); } else wwo->state = WINE_WS_PLAYING; } @@ -965,9 +973,9 @@ static LPWAVEHDR wodHelper_PlayPtrNext(W if (!didLoopBack) { /* We didn't loop back. Advance to the next wave header */ - wodHelper_BeginWaveHdr(wwo, lpWaveHdr = lpWaveHdr->lpNext); + wodHelper_BeginWaveHdrPlay(wwo, lpWaveHdr = lpWaveHdr->lpNext); } - + pthread_mutex_unlock(&wwo->lock); return lpWaveHdr; @@ -1120,11 +1128,11 @@ static DWORD wodWrite(WORD wDevID, LPWAV for (wh = &(wwo->lpQueuePtr); *wh; wh = &((*wh)->lpNext)) /* Do nothing */; *wh = lpWaveHdr; - + if (!wwo->lpPlayPtr) - wodHelper_BeginWaveHdr(wwo,lpWaveHdr); + wodHelper_BeginWaveHdrWrite(wwo,lpWaveHdr); pthread_mutex_unlock(&wwo->lock); - + return MMSYSERR_NOERROR; }

1 0

Ken Thomases : winecoreaudio: Extract wodHelper_CheckForLoopBegin() from wodHelper_BeginWaveHdr().
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: 91c5ec961660c13de1d8fbd6cef233ad3aadcdbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c5ec961660c13de1d8fbd6c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 21 03:47:19 2006 -0600 winecoreaudio: Extract wodHelper_CheckForLoopBegin() from wodHelper_BeginWaveHdr(). This refactoring prepares the ground for subsequent refactoring of wodHelper_BeginWaveHdr. --- dlls/winmm/winecoreaudio/audio.c | 53 +++++++++++++++++++++++++------------ 1 files changed, 36 insertions(+), 17 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 255f7ab..d28759b 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -848,6 +848,40 @@ static DWORD wodUnprepare(WORD wDevID, L return MMSYSERR_NOERROR; } + +/************************************************************************** +* wodHelper_CheckForLoopBegin [internal] +* +* Check if the new waveheader is the beginning of a loop, and set up +* state if so. +* This is called with the WAVEOUT lock held. +* Call from AudioUnit IO thread can't use Wine debug channels. +*/ +static void wodHelper_CheckForLoopBegin(WINE_WAVEOUT* wwo) +{ + LPWAVEHDR lpWaveHdr = wwo->lpPlayPtr; + + if (lpWaveHdr->dwFlags & WHDR_BEGINLOOP) + { + if (wwo->lpLoopPtr) + { + if (wwo->warn_on) + fprintf(stderr, "warn:winecoreaudio:wodHelper_CheckForLoopBegin Already in a loop. Discarding loop on this header (%p)\n", lpWaveHdr); + } + else + { + if (wwo->trace_on) + fprintf(stderr, "trace:winecoreaudio:wodHelper_CheckForLoopBegin Starting loop (%dx) with %p\n", lpWaveHdr->dwLoops, lpWaveHdr); + + wwo->lpLoopPtr = lpWaveHdr; + /* Windows does not touch WAVEHDR.dwLoops, + * so we need to make an internal copy */ + wwo->dwLoops = lpWaveHdr->dwLoops; + } + } +} + + /************************************************************************** * wodHelper_BeginWaveHdr [internal] * @@ -885,24 +919,9 @@ static void wodHelper_BeginWaveHdr(WINE_ } else wwo->state = WINE_WS_PLAYING; } - - if (lpWaveHdr->dwFlags & WHDR_BEGINLOOP) - { - if (wwo->lpLoopPtr) - { - if (wwo->warn_on) - fprintf(stderr, "warn:winecoreaudio:wodHelper_BeginWaveHdr Already in a loop. Discarding loop on this header (%p)\n", lpWaveHdr); - } else - { - if (wwo->trace_on) - fprintf(stderr, "trace:winecoreaudio:wodHelper_BeginWaveHdr Starting loop (%dx) with %p\n", lpWaveHdr->dwLoops, lpWaveHdr); - wwo->lpLoopPtr = lpWaveHdr; - /* Windows does not touch WAVEHDR.dwLoops, - * so we need to make an internal copy */ - wwo->dwLoops = lpWaveHdr->dwLoops; - } - } + wodHelper_CheckForLoopBegin(wwo); + wwo->dwPartialOffset = 0; }

1 0

Ken Thomases : winecoreaudio: Create port for sending messages to the callback thread only once.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: a6da8f212d26d462dc4767ca5ecaf273d43301ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6da8f212d26d462dc4767ca5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 21 03:47:05 2006 -0600 winecoreaudio: Create port for sending messages to the callback thread only once. --- dlls/winmm/winecoreaudio/audio.c | 62 +++++++++++++++++++++++-------------- 1 files changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index b971efe..255f7ab 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -177,7 +177,7 @@ typedef struct { static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV]; -static CFStringRef MessageThreadPortName; +static CFMessagePortRef Port_SendToMessageThread; static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo); static DWORD wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force); @@ -255,7 +255,7 @@ static const char * getMessage(UINT msg) #define kWaveInCallbackMessage 2 /* Mach Message Handling */ -static CFDataRef wodMessageHandler(CFMessagePortRef local, SInt32 msgid, CFDataRef data, void *info) +static CFDataRef wodMessageHandler(CFMessagePortRef port_ReceiveInMessageThread, SInt32 msgid, CFDataRef data, void *info) { UInt32 *buffer = NULL; WINE_WAVEOUT* wwo = NULL; @@ -283,23 +283,17 @@ static CFDataRef wodMessageHandler(CFMes static DWORD WINAPI messageThread(LPVOID p) { - CFMessagePortRef local; + CFMessagePortRef port_ReceiveInMessageThread = (CFMessagePortRef) p; CFRunLoopSourceRef source; - Boolean info; - local = CFMessagePortCreateLocal(kCFAllocatorDefault, MessageThreadPortName, - &wodMessageHandler, NULL, &info); - - source = CFMessagePortCreateRunLoopSource(kCFAllocatorDefault, local, (CFIndex)0); + source = CFMessagePortCreateRunLoopSource(kCFAllocatorDefault, port_ReceiveInMessageThread, (CFIndex)0); CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopDefaultMode); CFRunLoopRun(); CFRunLoopSourceInvalidate(source); CFRelease(source); - CFRelease(local); - CFRelease(MessageThreadPortName); - MessageThreadPortName = NULL; + CFRelease(port_ReceiveInMessageThread); return 0; } @@ -310,9 +304,6 @@ static DWORD wodSendDriverCallbackMessag UInt32 buffer[4]; SInt32 ret; - CFMessagePortRef messagePort; - messagePort = CFMessagePortCreateRemote(kCFAllocatorDefault, MessageThreadPortName); - buffer[0] = (UInt32) wwo->woID; buffer[1] = (UInt32) wMsg; buffer[2] = (UInt32) dwParam1; @@ -322,9 +313,8 @@ static DWORD wodSendDriverCallbackMessag if (!data) return 0; - ret = CFMessagePortSendRequest(messagePort, kWaveOutCallbackMessage, data, 0.0, 0.0, NULL, NULL); + ret = CFMessagePortSendRequest(Port_SendToMessageThread, kWaveOutCallbackMessage, data, 0.0, 0.0, NULL, NULL); CFRelease(data); - CFRelease(messagePort); return (ret == kCFMessagePortSuccess)?1:0; } @@ -455,6 +445,8 @@ LONG CoreAudio_WaveInit(void) pthread_mutexattr_t mutexattr; int i; HANDLE hThread; + CFStringRef messageThreadPortName; + CFMessagePortRef port_ReceiveInMessageThread; TRACE("()\n"); @@ -528,35 +520,57 @@ LONG CoreAudio_WaveInit(void) /* create mach messages handler */ srandomdev(); - MessageThreadPortName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, + messageThreadPortName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("WaveMessagePort.%d.%lu"), getpid(), (unsigned long)random()); - if (!MessageThreadPortName) + if (!messageThreadPortName) { ERR("Can't create message thread port name\n"); return 1; } - hThread = CreateThread(NULL, 0, messageThread, NULL, 0, NULL); + port_ReceiveInMessageThread = CFMessagePortCreateLocal(kCFAllocatorDefault, messageThreadPortName, + &wodMessageHandler, NULL, NULL); + if (!port_ReceiveInMessageThread) + { + ERR("Can't create message thread local port\n"); + CFRelease(messageThreadPortName); + return 1; + } + + Port_SendToMessageThread = CFMessagePortCreateRemote(kCFAllocatorDefault, messageThreadPortName); + CFRelease(messageThreadPortName); + if (!Port_SendToMessageThread) + { + ERR("Can't create port for sending to message thread\n"); + CFRelease(port_ReceiveInMessageThread); + return 1; + } + + hThread = CreateThread(NULL, 0, messageThread, (LPVOID)port_ReceiveInMessageThread, 0, NULL); if ( !hThread ) { ERR("Can't create message thread\n"); + CFRelease(port_ReceiveInMessageThread); + CFRelease(Port_SendToMessageThread); + Port_SendToMessageThread = NULL; return 1; } - + + /* The message thread is responsible for releasing port_ReceiveInMessageThread. */ + return 0; } void CoreAudio_WaveRelease(void) { /* Stop CFRunLoop in messageThread */ - CFMessagePortRef messagePort; int i; TRACE("()\n"); - messagePort = CFMessagePortCreateRemote(kCFAllocatorDefault, MessageThreadPortName); - CFMessagePortSendRequest(messagePort, kStopLoopMessage, NULL, 0.0, 0.0, NULL, NULL); - CFRelease(messagePort); + CFMessagePortSendRequest(Port_SendToMessageThread, kStopLoopMessage, NULL, 0.0, 0.0, NULL, NULL); + CFRelease(Port_SendToMessageThread); + Port_SendToMessageThread = NULL; for (i = 0; i < MAX_WAVEOUTDRV; ++i) {

1 0

Alex Villacís Lasso : oleaut32: VarBstrFromCy - Remove use of sprintfW by converting a CY
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: 4a4effe3f7124e62f223dd20adfc38246950756d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4effe3f7124e62f223dd20a… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Dec 20 13:53:41 2006 -0500 oleaut32: VarBstrFromCy - Remove use of sprintfW by converting a CY into a DECIMAL instead of a double as an intermediate step. --- dlls/oleaut32/vartype.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 66f863d..2cccbec 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6499,13 +6499,26 @@ HRESULT WINAPI VarBstrFromR8(double dblI HRESULT WINAPI VarBstrFromCy(CY cyIn, LCID lcid, ULONG dwFlags, BSTR *pbstrOut) { WCHAR buff[256]; - double dblVal; + VARIANT_DI decVal; if (!pbstrOut) return E_INVALIDARG; - VarR8FromCy(cyIn, &dblVal); - sprintfW(buff, szDoubleFormatW, dblVal); + decVal.scale = 4; + decVal.sign = 0; + decVal.bitsnum[0] = cyIn.s.Lo; + decVal.bitsnum[1] = cyIn.s.Hi; + if (cyIn.s.Hi & 0x80000000UL) { + DWORD one = 1; + + /* Negative number! */ + decVal.sign = 1; + decVal.bitsnum[0] = ~decVal.bitsnum[0]; + decVal.bitsnum[1] = ~decVal.bitsnum[1]; + VARIANT_int_add(decVal.bitsnum, 3, &one, 1); + } + decVal.bitsnum[2] = 0; + VARIANT_DI_tostringW(&decVal, buff, sizeof(buff)); if (dwFlags & LOCALE_USE_NLS) {

1 0

Juan Lang : kernel32: Suppress an unneeded warning.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: c2da099e290b49e05acecd9552d0cc921d5c94b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2da099e290b49e05acecd955… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Dec 20 11:30:25 2006 -0800 kernel32: Suppress an unneeded warning. --- dlls/kernel32/profile.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 6c30c9e..339b852 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1280,8 +1280,6 @@ UINT WINAPI GetPrivateProfileIntW( LPCWS filename ))) return def_val; - if (len+1 == sizeof(buffer)/sizeof(WCHAR)) FIXME("result may be wrong!\n"); - /* FIXME: if entry can be found but it's empty, then Win16 is * supposed to return 0 instead of def_val ! Difficult/problematic * to implement (every other failure also returns zero buffer),

1 0

Huw Davies : gdi32: Actually create the Wine fonts key if it doesn't exist.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: 42d372eb4a4dc5b8d41eecff9fb95b17b539ddc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d372eb4a4dc5b8d41eecff9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 20 22:33:28 2006 +0000 gdi32: Actually create the Wine fonts key if it doesn't exist. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 86d3455..84daf4f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1575,7 +1575,7 @@ static void update_font_info(void) HKEY hkey = 0; UINT i, ansi_cp = 0, oem_cp = 0; - if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts", &hkey) != ERROR_SUCCESS) + if (RegCreateKeyExA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL) != ERROR_SUCCESS) return; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER|LOCALE_NOUSEROVERRIDE,

1 0

Günther Brammer : ddraw: Add a test for IDirectDrawSurface_SetColorKey.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: 8485eb02dc8f7386caab4ad68433ab601c352872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8485eb02dc8f7386caab4ad68… Author: Günther Brammer <GBrammer(a)gmx.de> Date: Thu Dec 21 00:06:03 2006 +0100 ddraw: Add a test for IDirectDrawSurface_SetColorKey. --- dlls/ddraw/tests/dsurface.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 3d70f82..792a014 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -167,6 +167,7 @@ static void SrcColorKey32BlitTest(void) LPDIRECTDRAWSURFACE lpDst; DDSURFACEDESC ddsd; DDSURFACEDESC ddsd2; + DDCOLORKEY DDColorKey; LPDWORD lpData; HRESULT rc; @@ -223,6 +224,27 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Unlock(lpDst, NULL); ok(rc==DD_OK,"Unlock returned: %x\n",rc); + /* Also test SetColorKey */ + IDirectDrawSurface_GetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + ok(DDColorKey.dwColorSpaceLowValue == 0xFF00FF && DDColorKey.dwColorSpaceHighValue == 0xFF00FF, + "GetColorKey does not return the colorkey used at surface creation\n"); + + DDColorKey.dwColorSpaceLowValue = 0x00FF00; + DDColorKey.dwColorSpaceHighValue = 0x00FF00; + IDirectDrawSurface_SetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + + DDColorKey.dwColorSpaceLowValue = 0; + DDColorKey.dwColorSpaceHighValue = 0; + IDirectDrawSurface_GetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); + ok(DDColorKey.dwColorSpaceLowValue == 0x00FF00 && DDColorKey.dwColorSpaceHighValue == 0x00FF00, + "GetColorKey does not return the colorkey set with SetColorKey\n"); + + ddsd.ddckCKSrcBlt.dwColorSpaceLowValue = 0; + ddsd.ddckCKSrcBlt.dwColorSpaceHighValue = 0; + IDirectDrawSurface_GetSurfaceDesc(lpSrc, &ddsd); + ok(ddsd.ddckCKSrcBlt.dwColorSpaceLowValue == 0x00FF00 && ddsd.ddckCKSrcBlt.dwColorSpaceHighValue == 0x00FF00, + "GetSurfaceDesc does not return the colorkey set with SetColorKey\n"); + IDirectDrawSurface_Release(lpSrc); IDirectDrawSurface_Release(lpDst); }

1 0

Ken Thomases : winecoreaudio: Control the fprintf' s by the Wine debug channel on/off settings.
by Alexandre Julliard 21 Dec '06

21 Dec '06

Module: wine Branch: master Commit: 23bb112b10cc788eb7fbb9c433b89531641764ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=23bb112b10cc788eb7fbb9c43… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 21 03:46:55 2006 -0600 winecoreaudio: Control the fprintf's by the Wine debug channel on/off settings. --- dlls/winmm/winecoreaudio/audio.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 181e502..b971efe 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -148,6 +148,10 @@ typedef struct { DWORD tickCountMS; /* time in MS of last AudioUnit callback */ pthread_mutex_t lock; /* synchronization stuff */ + + BOOL trace_on; + BOOL warn_on; + BOOL err_on; } WINE_WAVEOUT; typedef struct { @@ -721,7 +725,11 @@ static DWORD wodOpen(WORD wDevID, LPWAVE wwo->dwPlayedTotal = 0; wwo->dwWrittenTotal = 0; - + + wwo->trace_on = TRACE_ON(wave); + wwo->warn_on = WARN_ON(wave); + wwo->err_on = ERR_ON(wave); + pthread_mutex_unlock(&wwo->lock); retval = wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); @@ -846,7 +854,7 @@ static void wodHelper_BeginWaveHdr(WINE_ { wwo->state = WINE_WS_STOPPED; status = AudioOutputUnitStop(wwo->audioUnit); - if (status) + if (status && wwo->err_on) fprintf(stderr, "err:winecoreaudio:wodHelper_BeginWaveHdr AudioOutputUnitStop return %c%c%c%c\n", (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); } @@ -857,8 +865,9 @@ static void wodHelper_BeginWaveHdr(WINE_ { status = AudioOutputUnitStart(wwo->audioUnit); if (status) { - fprintf(stderr, "err:winecoreaudio:AudioOutputUnitStart return %c%c%c%c\n", - (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); + if (wwo->err_on) + fprintf(stderr, "err:winecoreaudio:AudioOutputUnitStart return %c%c%c%c\n", + (char) (status >> 24), (char) (status >> 16), (char) (status >> 8), (char) status); } else wwo->state = WINE_WS_PLAYING; } @@ -867,10 +876,12 @@ static void wodHelper_BeginWaveHdr(WINE_ { if (wwo->lpLoopPtr) { - fprintf(stderr, "trace:winecoreaudio:wodHelper_BeginWaveHdr Already in a loop. Discarding loop on this header (%p)\n", lpWaveHdr); + if (wwo->warn_on) + fprintf(stderr, "warn:winecoreaudio:wodHelper_BeginWaveHdr Already in a loop. Discarding loop on this header (%p)\n", lpWaveHdr); } else { - fprintf(stderr, "trace:winecoreaudio:wodHelper_BeginWaveHdr Starting loop (%dx) with %p\n", lpWaveHdr->dwLoops, lpWaveHdr); + if (wwo->trace_on) + fprintf(stderr, "trace:winecoreaudio:wodHelper_BeginWaveHdr Starting loop (%dx) with %p\n", lpWaveHdr->dwLoops, lpWaveHdr); wwo->lpLoopPtr = lpWaveHdr; /* Windows does not touch WAVEHDR.dwLoops,

1 0

Chris Robinson : d3d: Fix adapter mode enumeration and filtering.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: ed21935479c9bede76395162b2f947d257b01473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed21935479c9bede76395162b… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Dec 20 04:44:08 2006 -0800 d3d: Fix adapter mode enumeration and filtering. --- dlls/d3d8/tests/device.c | 31 +++++++++++ dlls/d3d9/directx.c | 4 ++ dlls/d3d9/tests/device.c | 92 +++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 126 +++++++++++++++++++-------------------------- 4 files changed, 180 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed21935479c9bede76395…

1 0

Stefan Dösinger : wined3d: Reinstall the nvrc texture unit mapping.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: df97fd3e46b5c042eea5319ef7c0b4055a205158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df97fd3e46b5c042eea5319ef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:33:34 2006 +0100 wined3d: Reinstall the nvrc texture unit mapping. --- dlls/wined3d/device.c | 92 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 15 ++++--- dlls/wined3d/wined3d_private.h | 4 ++ 3 files changed, 104 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dd42bf7..1c1abab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2079,6 +2079,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl /* TODO: Test if OpenGL is compiled in and loaded */ + /* Initialize the texture unit mapping to a 1:1 mapping */ + for(state = 0; state < MAX_SAMPLERS; state++) { + This->texUnitMap[state] = state; + } + This->oneToOneTexUnitMap = TRUE; + /* Setup the implicit swapchain */ TRACE("Creating implicit swapchain\n"); if (D3D_OK != D3DCB_CreateAdditionalSwapChain((IUnknown *) This->parent, pPresentationParameters, (IWineD3DSwapChain **)&swapchain) || swapchain == NULL) { @@ -3676,6 +3682,72 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3D_OK; } +static inline void markTextureStagesDirty(IWineD3DDeviceImpl *This, DWORD stage) { + DWORD i; + for(i = 0; i < WINED3D_HIGHEST_TEXTURE_STATE; i++) { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(stage, i)); + } +} + +static void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { + DWORD i, tex; + /* This code can assume that GL_NV_register_combiners are supported, otherwise + * it is never called. + * + * Rules are: + * -> Pixel shaders need a 1:1 map. In theory the shader input could be mapped too, but + * that would be really messy and require shader recompilation + * -> When the mapping of a stage is changed, sampler and ALL texture stage states have + * to be reset. Because of that try to work with a 1:1 mapping as much as possible + * -> Whith a 1:1 mapping oneToOneTexUnitMap is set to avoid checking MAX_SAMPLERS array + * entries to make pixel shaders cheaper. MAX_SAMPLERS will be 128 in dx10 + */ + if(This->stateBlock->pixelShader || This->stateBlock->lowest_disabled_stage <= GL_LIMITS(textures)) { + if(This->oneToOneTexUnitMap) { + TRACE("Not touching 1:1 map\n"); + return; + } + TRACE("Restoring 1:1 texture unit mapping\n"); + /* Restore a 1:1 mapping */ + for(i = 0; i < MAX_SAMPLERS; i++) { + if(This->texUnitMap[i] != i) { + This->texUnitMap[i] = i; + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); + markTextureStagesDirty(This, i); + } + } + This->oneToOneTexUnitMap = TRUE; + return; + } else { + /* No pixel shader, and we do not have enought texture units available. Try to skip NULL textures + * First, see if we can succeed at all + */ + tex = 0; + for(i = 0; i < This->stateBlock->lowest_disabled_stage; i++) { + if(This->stateBlock->textures[i] == NULL) tex++; + } + + if(GL_LIMITS(textures) + tex < This->stateBlock->lowest_disabled_stage) { + FIXME("Too many bound textures to support the combiner settings\n"); + return; + } + + /* Now work out the mapping */ + tex = 0; + This->oneToOneTexUnitMap = FALSE; + FIXME("Non 1:1 mapping UNTESTED!\n"); + for(i = 0; i < This->stateBlock->lowest_disabled_stage; i++) { + if(This->stateBlock->textures[i] == NULL) tex++; + TRACE("Mapping texture stage %d to unit %d\n", i, tex); + if(This->texUnitMap[i] != tex) { + This->texUnitMap[i] = tex; + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); + markTextureStagesDirty(This, i); + } + } + } +} + static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShader(IWineD3DDevice *iface, IWineD3DPixelShader *pShader) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DPixelShader *oldShader = This->updateStateBlock->pixelShader; @@ -3707,6 +3779,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl TRACE("(%p) : setting pShader(%p)\n", This, pShader); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADER); + + /* Rebuild the texture unit mapping if nvrc's are supported */ + if(GL_SUPPORT(NV_REGISTER_COMBINERS)) { + IWineD3DDeviceImpl_FindTexUnitMap(This); + } + return WINED3D_OK; } @@ -4436,6 +4514,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(Stage, Type)); + /* Rebuild the stage -> gl texture unit mapping if register combiners are supported + * If there is a pixel shader there will be a 1:1 mapping, no need to touch it. SetPixelShader + * will call FindTexUnitMap too. + */ + if(GL_SUPPORT(NV_REGISTER_COMBINERS) && !This->stateBlock->pixelShader) { + IWineD3DDeviceImpl_FindTexUnitMap(This); + } return WINED3D_OK; } @@ -4549,6 +4634,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(Stage)); + /* Verify the texture unit mapping(and rebuild it if needed) if we use nvrcs and no + * pixel shader is used + */ + if(GL_SUPPORT(NV_REGISTER_COMBINERS) && !This->stateBlock->pixelShader) { + IWineD3DDeviceImpl_FindTexUnitMap(This); + } + return WINED3D_OK; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 16057c4..6bf101c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1362,14 +1362,15 @@ static void tex_colorop(DWORD state, IWi if (GL_SUPPORT(ARB_MULTITEXTURE)) { /* TODO: register combiners! */ - if(stage >= GL_LIMITS(sampler_stages)) { + if(stage != stateblock->wineD3DDevice->texUnitMap[stage]) ERR("Foo: %d is %d!\n", stage, stateblock->wineD3DDevice->texUnitMap[stage]); + if(stateblock->wineD3DDevice->texUnitMap[stage] >= GL_LIMITS(sampler_stages)) { if(stateblock->textureState[stage][WINED3DTSS_COLOROP] != WINED3DTOP_DISABLE && stateblock->textureState[stage][WINED3DTSS_COLOROP] != 0) { FIXME("Attempt to enable unsupported stage!\n"); } return; } - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stage)); + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stateblock->wineD3DDevice->texUnitMap[stage])); checkGLcall("glActiveTextureARB"); } else if (stage > 0) { WARN("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); @@ -1408,7 +1409,7 @@ static void tex_colorop(DWORD state, IWi stateblock->textureState[stage][WINED3DTSS_COLORARG1], stateblock->textureState[stage][WINED3DTSS_COLORARG2], stateblock->textureState[stage][WINED3DTSS_COLORARG0], - stage); + stateblock->wineD3DDevice->texUnitMap[stage]); } else { set_tex_op((IWineD3DDevice *)stateblock->wineD3DDevice, FALSE, stage, stateblock->textureState[stage][WINED3DTSS_COLOROP], @@ -1432,7 +1433,7 @@ static void tex_alphaop(DWORD state, IWi } return; } - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stage)); + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stateblock->wineD3DDevice->texUnitMap[stage])); checkGLcall("glActiveTextureARB"); } else if (stage > 0) { /* We can't do anything here */ @@ -1447,7 +1448,7 @@ static void tex_alphaop(DWORD state, IWi stateblock->textureState[stage][WINED3DTSS_ALPHAARG1], stateblock->textureState[stage][WINED3DTSS_ALPHAARG2], stateblock->textureState[stage][WINED3DTSS_ALPHAARG0], - stage); + stateblock->wineD3DDevice->texUnitMap[stage]); } else { set_tex_op((IWineD3DDevice *)stateblock->wineD3DDevice, TRUE, stage, stateblock->textureState[stage][WINED3DTSS_ALPHAOP], stateblock->textureState[stage][WINED3DTSS_ALPHAARG1], @@ -1464,7 +1465,7 @@ static void tex_coordindex(DWORD state, if(stage >= GL_LIMITS(sampler_stages)) { return; } - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stage)); + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stateblock->wineD3DDevice->texUnitMap[stage])); checkGLcall("glActiveTextureARB"); } else if (stage > 0) { /* We can't do anything here */ @@ -1661,7 +1662,7 @@ static void sampler(DWORD state, IWineD3 if(sampler >= GL_LIMITS(sampler_stages)) { return; } - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + sampler)); + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stateblock->wineD3DDevice->texUnitMap[sampler])); checkGLcall("glActiveTextureARB"); } else if (sampler > 0) { /* We can't do anything here */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1df81bb..6f569e8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -652,6 +652,10 @@ typedef struct IWineD3DDeviceImpl DWORD numDirtyEntries; DWORD isStateDirty[STATE_HIGHEST/32 + 1]; /* Bitmap to find out quickly if a state is dirty */ + /* With register combiners we can skip junk texture stages */ + DWORD texUnitMap[MAX_SAMPLERS]; + BOOL oneToOneTexUnitMap; + } IWineD3DDeviceImpl; extern const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl;

1 0