October 2009 - Wine-Commits

Ken Thomases : winecoreaudio: Add more debug logging.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: e690d7c83baeee424fb081f7bb5715aa6b22f9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e690d7c83baeee424fb081f7b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 11 14:11:37 2009 -0500 winecoreaudio: Add more debug logging. --- dlls/winecoreaudio.drv/audio.c | 12 ++++++++++-- dlls/winecoreaudio.drv/audiounit.c | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 0521ff0..90e3baa 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -53,12 +53,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); - #if defined(HAVE_COREAUDIO_COREAUDIO_H) && defined(HAVE_AUDIOUNIT_AUDIOUNIT_H) #include <CoreAudio/CoreAudio.h> #include <CoreFoundation/CoreFoundation.h> #include <libkern/OSAtomic.h> +WINE_DECLARE_DEBUG_CHANNEL(coreaudio); + /* Due to AudioUnit headers conflict define some needed types. */ @@ -528,6 +529,9 @@ BOOL CoreAudio_GetDevCaps (void) CoreAudio_DefaultDevice.out_caps.wChannels = 2; CoreAudio_DefaultDevice.out_caps.dwFormats|= WAVE_FORMAT_4S16; + + TRACE_(coreaudio)("out dwFormats = %08x, dwSupport = %08x\n", + CoreAudio_DefaultDevice.out_caps.dwFormats, CoreAudio_DefaultDevice.out_caps.dwSupport); return TRUE; } @@ -758,6 +762,8 @@ void CoreAudio_WaveRelease(void) */ static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2) { + TRACE_(coreaudio)("wMsg = 0x%04x dwParm1 = %04x dwParam2 = %04x\n", wMsg, dwParam1, dwParam2); + switch (wMsg) { case WOM_OPEN: case WOM_CLOSE: @@ -767,10 +773,12 @@ static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2)) { + ERR("can't notify client !\n"); return MMSYSERR_ERROR; } break; default: + ERR("Unknown callback message %u\n", wMsg); return MMSYSERR_INVALPARAM; } return MMSYSERR_NOERROR; @@ -1214,7 +1222,7 @@ static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) LPWAVEHDR*wh; WINE_WAVEOUT *wwo; - TRACE("(%u, %p, %08X);\n", wDevID, lpWaveHdr, dwSize); + TRACE("(%u, %p, %lu, %08X);\n", wDevID, lpWaveHdr, (unsigned long)lpWaveHdr->dwBufferLength, dwSize); /* first, do the sanity checks... */ if (wDevID >= MAX_WAVEOUTDRV) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index 998dbe7..9314ef3 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -38,6 +38,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DECLARE_DEBUG_CHANNEL(midi); +static const char *streamDescription(const AudioStreamBasicDescription* stream) +{ + return wine_dbg_sprintf("\n mSampleRate : %f\n mFormatID : %s\n mFormatFlags : %lX\n mBytesPerPacket : %lu\n mFramesPerPacket : %lu\n mBytesPerFrame : %lu\n mChannelsPerFrame : %lu\n mBitsPerChannel : %lu\n", + stream->mSampleRate, + wine_dbgstr_fourcc(stream->mFormatID), + stream->mFormatFlags, + stream->mBytesPerPacket, + stream->mFramesPerPacket, + stream->mBytesPerFrame, + stream->mChannelsPerFrame, + stream->mBitsPerChannel); +} + extern OSStatus CoreAudio_woAudioUnitIOProc(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, @@ -58,6 +71,8 @@ int AudioUnit_CreateDefaultAudioUnit(void *wwo, AudioUnit *au) Component comp; ComponentDescription desc; AURenderCallbackStruct callbackStruct; + + TRACE("\n"); desc.componentType = kAudioUnitType_Output; desc.componentSubType = kAudioUnitSubType_DefaultOutput; @@ -95,6 +110,8 @@ int AudioUnit_InitializeWithStreamDescription(AudioUnit au, AudioStreamBasicDesc { OSStatus err = noErr; + TRACE("input format: %s\n", streamDescription(stream)); + err = AudioUnitSetProperty(au, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, stream, sizeof(*stream)); @@ -116,6 +133,7 @@ int AudioUnit_InitializeWithStreamDescription(AudioUnit au, AudioStreamBasicDesc int AudioUnit_SetVolume(AudioUnit au, float left, float right) { OSStatus err = noErr; + FIXME("independent left/right volume not implemented (%f, %f)\n", left, right); err = AudioUnitSetParameter(au, kHALOutputParam_Volume, kAudioUnitParameterFlag_Output, 0, left, 0); @@ -130,6 +148,7 @@ int AudioUnit_SetVolume(AudioUnit au, float left, float right) int AudioUnit_GetVolume(AudioUnit au, float *left, float *right) { OSStatus err = noErr; + FIXME("independent left/right volume not implemented\n"); err = AudioUnitGetParameter(au, kHALOutputParam_Volume, kAudioUnitParameterFlag_Output, 0, left); if (err != noErr)

1 0

Jacek Caban : shdocvw: Improved debug messages.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: bbfee0061dcf4822545f4016a06ee4f4dbaa5435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfee0061dcf4822545f4016a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 11 21:24:51 2009 +0200 shdocvw: Improved debug messages. --- dlls/shdocvw/shdocvw.h | 2 ++ dlls/shdocvw/shdocvw_main.c | 25 +++++++++++++++++++++++++ dlls/shdocvw/webbrowser.c | 19 +++++++++++-------- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 9a51121..8d0861f 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -252,6 +252,8 @@ HRESULT register_class_object(BOOL); HRESULT get_typeinfo(ITypeInfo**); DWORD register_iexplore(BOOL); +const char *debugstr_variant(const VARIANT*); + /* memory allocation functions */ static inline void *heap_alloc(size_t len) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 9090b7d..746753f 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -67,6 +67,31 @@ HRESULT get_typeinfo(ITypeInfo **typeinfo) return hres; } +const char *debugstr_variant(const VARIANT *v) +{ + if(!v) + return "(null)"; + + switch(V_VT(v)) { + case VT_EMPTY: + return "{VT_EMPTY}"; + case VT_NULL: + return "{VT_NULL}"; + case VT_I4: + return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); + case VT_R8: + return wine_dbg_sprintf("{VT_R8: %lf}", V_R8(v)); + case VT_BSTR: + return wine_dbg_sprintf("{VT_BSTR: %s}", debugstr_w(V_BSTR(v))); + case VT_DISPATCH: + return wine_dbg_sprintf("{VT_DISPATCH: %p}", V_DISPATCH(v)); + case VT_BOOL: + return wine_dbg_sprintf("{VT_BOOL: %x}", V_BOOL(v)); + default: + return wine_dbg_sprintf("{vt %d}", V_VT(v)); + } +} + /************************************************************************* * SHDOCVW DllMain */ diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 323e9ad..1f2e149 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -269,8 +269,9 @@ static HRESULT WINAPI WebBrowser_Navigate(IWebBrowser2 *iface, BSTR szUrl, { WebBrowser *This = WEBBROWSER_THIS(iface); - TRACE("(%p)->(%s %p %p %p %p)\n", This, debugstr_w(szUrl), Flags, TargetFrameName, - PostData, Headers); + TRACE("(%p)->(%s %s %s %s %s)\n", This, debugstr_w(szUrl), debugstr_variant(Flags), + debugstr_variant(TargetFrameName), debugstr_variant(PostData), + debugstr_variant(Headers)); return navigate_url(&This->doc_host, szUrl, Flags, TargetFrameName, PostData, Headers); } @@ -285,7 +286,7 @@ static HRESULT WINAPI WebBrowser_Refresh(IWebBrowser2 *iface) static HRESULT WINAPI WebBrowser_Refresh2(IWebBrowser2 *iface, VARIANT *Level) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, Level); + FIXME("(%p)->(%s)\n", This, debugstr_variant(Level)); return E_NOTIMPL; } @@ -516,14 +517,14 @@ static HRESULT WINAPI WebBrowser_ClientToWindow(IWebBrowser2 *iface, int *pcx, i static HRESULT WINAPI WebBrowser_PutProperty(IWebBrowser2 *iface, BSTR szProperty, VARIANT vtValue) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(szProperty)); + FIXME("(%p)->(%s %s)\n", This, debugstr_w(szProperty), debugstr_variant(&vtValue)); return E_NOTIMPL; } static HRESULT WINAPI WebBrowser_GetProperty(IWebBrowser2 *iface, BSTR szProperty, VARIANT *pvtValue) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(szProperty), pvtValue); + FIXME("(%p)->(%s %s)\n", This, debugstr_w(szProperty), debugstr_variant(pvtValue)); return E_NOTIMPL; } @@ -726,7 +727,8 @@ static HRESULT WINAPI WebBrowser_Navigate2(IWebBrowser2 *iface, VARIANT *URL, VA WebBrowser *This = WEBBROWSER_THIS(iface); LPCWSTR url; - TRACE("(%p)->(%p %p %p %p %p)\n", This, URL, Flags, TargetFrameName, PostData, Headers); + TRACE("(%p)->(%s %s %s %s %s)\n", This, debugstr_variant(URL), debugstr_variant(Flags), + debugstr_variant(TargetFrameName), debugstr_variant(PostData), debugstr_variant(Headers)); if(!This->client) return E_FAIL; @@ -761,7 +763,7 @@ static HRESULT WINAPI WebBrowser_ExecWB(IWebBrowser2 *iface, OLECMDID cmdID, OLECMDEXECOPT cmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%d %d %p %p)\n", This, cmdID, cmdexecopt, pvaIn, pvaOut); + FIXME("(%p)->(%d %d %s %p)\n", This, cmdID, cmdexecopt, debugstr_variant(pvaIn), pvaOut); return E_NOTIMPL; } @@ -769,7 +771,8 @@ static HRESULT WINAPI WebBrowser_ShowBrowserBar(IWebBrowser2 *iface, VARIANT *pv VARIANT *pvarShow, VARIANT *pvarSize) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p %p %p)\n", This, pvaClsid, pvarShow, pvarSize); + FIXME("(%p)->(%s %s %s)\n", This, debugstr_variant(pvaClsid), debugstr_variant(pvarShow), + debugstr_variant(pvarSize)); return E_NOTIMPL; }

1 0

Ken Thomases : winecoreaudio: Minor grammar fix in comment.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 2245c9b1f1117d620ca9197963e55c0f73173728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2245c9b1f1117d620ca919796… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 11 14:14:36 2009 -0500 winecoreaudio: Minor grammar fix in comment. --- dlls/winecoreaudio.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 639c100..e1c4a41 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1971,7 +1971,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) } /* Keep a copy of the buffer list structure (but not the buffers themselves) - * in case AudioUnitRender clobbers the original, as it won't to do. */ + * in case AudioUnitRender clobbers the original, as it tends to do. */ wwi->bufferListCopy = HeapAlloc(GetProcessHeap(), 0, AUDIOBUFFERLISTSIZE(wwi->bufferList->mNumberBuffers)); if (wwi->bufferListCopy == NULL) {

1 0

Ken Thomases : winecoreaudio: Fix declaration of CoreAudio_MIDIRelease to match definition.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: c67f4cd5651b01782526b966c7088b32ac106072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c67f4cd5651b01782526b966c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 11 14:13:42 2009 -0500 winecoreaudio: Fix declaration of CoreAudio_MIDIRelease to match definition. --- dlls/winecoreaudio.drv/coreaudio.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.h b/dlls/winecoreaudio.drv/coreaudio.h index 485c653..4cf2b03 100644 --- a/dlls/winecoreaudio.drv/coreaudio.h +++ b/dlls/winecoreaudio.drv/coreaudio.h @@ -26,7 +26,7 @@ extern LONG CoreAudio_WaveInit(void); extern void CoreAudio_WaveRelease(void); extern LONG CoreAudio_MIDIInit(void); -extern void CoreAudio_MIDIRelease(void); +extern LONG CoreAudio_MIDIRelease(void); extern LONG CoreAudio_MixerInit(void); extern void CoreAudio_MixerRelease(void);

1 0

Ken Thomases : winecoreaudio: Move instance-specific fields of WINE_WAVEOUT to sub-struct.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 5d8177c23c4c123a22d9a5d3b20a4a5b8118168f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d8177c23c4c123a22d9a5d3b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 11 14:12:01 2009 -0500 winecoreaudio: Move instance-specific fields of WINE_WAVEOUT to sub-struct. --- dlls/winecoreaudio.drv/audio.c | 133 +++++++++++++++++++++------------------- 1 files changed, 69 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d8177c23c4c123a22d9a…

1 0

Ken Thomases : winecoreaudio: Allow opening multiple wave-out instances.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: ef87a050c6966d43fe1b457e80faa8b0bb31755d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef87a050c6966d43fe1b457e8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 11 14:13:23 2009 -0500 winecoreaudio: Allow opening multiple wave-out instances. --- dlls/winecoreaudio.drv/audio.c | 66 +++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 34 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index a966dfd..639c100 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -50,6 +50,7 @@ #include "wine/unicode.h" #include "wine/library.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(wave); @@ -99,7 +100,7 @@ AudioUnitRender( AudioUnit ci, * | (any) | pause() | PAUSING | PAUSED | * | PAUSED | restart() | RESTARTING | PLAYING | * | (any) | reset() | RESETTING | PLAYING | -* | (any) | close() | CLOSING | CLOSED | +* | (any) | close() | CLOSING | <deallocated> | * +---------+-------------+---------------+---------------------------------+ */ @@ -107,7 +108,7 @@ AudioUnitRender( AudioUnit ci, #define WINE_WS_PLAYING 0 /* for waveOut: lpPlayPtr == NULL -> stopped */ #define WINE_WS_PAUSED 1 #define WINE_WS_STOPPED 2 /* Not used for waveOut */ -#define WINE_WS_CLOSED 3 +#define WINE_WS_CLOSED 3 /* Not used for waveOut */ #define WINE_WS_OPENING 4 #define WINE_WS_CLOSING 5 @@ -143,6 +144,8 @@ typedef struct tagCoreAudio_Device { static CoreAudio_Device CoreAudio_DefaultDevice; typedef struct { + struct list entry; + volatile int state; /* one of the WINE_WS_ manifest constants */ WAVEOPENDESC waveDesc; WORD wFlags; @@ -172,7 +175,8 @@ typedef struct { BOOL warn_on; BOOL err_on; - WINE_WAVEOUT_INSTANCE instance; + struct list instances; + OSSpinLock lock; /* guards the instances list */ } WINE_WAVEOUT; typedef struct { @@ -578,9 +582,8 @@ LONG CoreAudio_WaveInit(void) static const WCHAR wszWaveOutFormat[] = {'C','o','r','e','A','u','d','i','o',' ','W','a','v','e','O','u','t',' ','%','d',0}; - WOutDev[i].instance.state = WINE_WS_CLOSED; + list_init(&WOutDev[i].instances); WOutDev[i].cadev = &CoreAudio_DefaultDevice; - WOutDev[i].instance.woID = i; memset(&WOutDev[i].caps, 0, sizeof(WOutDev[i].caps)); @@ -617,7 +620,7 @@ LONG CoreAudio_WaveInit(void) WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1M16; WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1S16; - WOutDev[i].instance.lock = 0; /* initialize the mutex */ + WOutDev[i].lock = 0; /* initialize the mutex */ } /* FIXME: implement sample rate conversion on input */ @@ -856,31 +859,23 @@ static DWORD wodOpen(WORD wDevID, WINE_WAVEOUT_INSTANCE** pInstance, LPWAVEOPEND } /* We proceed in three phases: - * o Reserve the device for us, marking it as unavailable (not closed) + * o Allocate the device instance, marking it as opening * o Create, configure, and start the Audio Unit. To avoid deadlock, * this has to be done without holding wwo->lock. - * o If that was successful, finish setting up our device info and - * mark the device as ready. - * Otherwise, clean up and mark the device as available. + * o If that was successful, finish setting up our instance and add it + * to the device's list. + * Otherwise, clean up and deallocate the instance. */ - wwo = &WOutDev[wDevID].instance; - if (!OSSpinLockTry(&wwo->lock)) - return MMSYSERR_ALLOCATED; - - if (wwo->state != WINE_WS_CLOSED) - { - OSSpinLockUnlock(&wwo->lock); - return MMSYSERR_ALLOCATED; - } + wwo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wwo)); + if (!wwo) + return MMSYSERR_NOMEM; + wwo->woID = wDevID; wwo->state = WINE_WS_OPENING; - wwo->audioUnit = NULL; - OSSpinLockUnlock(&wwo->lock); - if (!AudioUnit_CreateDefaultAudioUnit((void *) wwo, &audioUnit)) { - ERR("CoreAudio_CreateDefaultAudioUnit(%p) failed\n", wwo); + ERR("CoreAudio_CreateDefaultAudioUnit(0x%04x) failed\n", wDevID); ret = MMSYSERR_ERROR; goto error; } @@ -914,7 +909,8 @@ static DWORD wodOpen(WORD wDevID, WINE_WAVEOUT_INSTANCE** pInstance, LPWAVEOPEND * lock before calling it and the callback grabs wwo->lock. This would * deadlock if we were holding wwo->lock. * Also, the callback has to safely do nothing in that case, because - * wwo hasn't been completely filled out, yet. */ + * wwo hasn't been completely filled out, yet. This is assured by state + * being WINE_WS_OPENING. */ ret = AudioOutputUnitStart(audioUnit); if (ret) { @@ -936,8 +932,6 @@ static DWORD wodOpen(WORD wDevID, WINE_WAVEOUT_INSTANCE** pInstance, LPWAVEOPEND wwo->waveDesc = *lpDesc; copyFormat(lpDesc->lpFormat, &wwo->format); - - wwo->dwPlayedTotal = 0; WOutDev[wDevID].trace_on = TRACE_ON(wave); WOutDev[wDevID].warn_on = WARN_ON(wave); @@ -945,6 +939,10 @@ static DWORD wodOpen(WORD wDevID, WINE_WAVEOUT_INSTANCE** pInstance, LPWAVEOPEND OSSpinLockUnlock(&wwo->lock); + OSSpinLockLock(&WOutDev[wDevID].lock); + list_add_head(&WOutDev[wDevID].instances, &wwo->entry); + OSSpinLockUnlock(&WOutDev[wDevID].lock); + *pInstance = wwo; TRACE("opened instance %p\n", wwo); @@ -962,8 +960,8 @@ error: OSSpinLockLock(&wwo->lock); assert(wwo->state == WINE_WS_OPENING); - wwo->state = WINE_WS_CLOSED; - OSSpinLockUnlock(&wwo->lock); + /* OSSpinLockUnlock(&wwo->lock); *//* No need, about to free */ + HeapFree(GetProcessHeap(), 0, wwo); return ret; } @@ -1014,12 +1012,13 @@ static DWORD wodClose(WORD wDevID, WINE_WAVEOUT_INSTANCE* wwo) return MMSYSERR_ERROR; /* FIXME return an error based on the OSStatus */ } - OSSpinLockLock(&wwo->lock); - assert(wwo->state == WINE_WS_CLOSING); - wwo->state = WINE_WS_CLOSED; /* mark the device as closed */ - OSSpinLockUnlock(&wwo->lock); + OSSpinLockLock(&WOutDev[wDevID].lock); + list_remove(&wwo->entry); + OSSpinLockUnlock(&WOutDev[wDevID].lock); ret = wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); + + HeapFree(GetProcessHeap(), 0, wwo); } return ret; @@ -1353,8 +1352,7 @@ static DWORD wodReset(WORD wDevID, WINE_WAVEOUT_INSTANCE* wwo) OSSpinLockLock(&wwo->lock); - if (wwo->state == WINE_WS_CLOSED || wwo->state == WINE_WS_CLOSING || - wwo->state == WINE_WS_OPENING) + if (wwo->state == WINE_WS_CLOSING || wwo->state == WINE_WS_OPENING) { OSSpinLockUnlock(&wwo->lock); WARN("resetting a closed device\n");

1 0

Ken Thomases : winecoreaudio: For WODM_* messages, treat dwUser as a driver instance handle.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 31ce96ff6933b1f5d413cb05ce3bea23c3234bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ce96ff6933b1f5d413cb05c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 11 14:12:48 2009 -0500 winecoreaudio: For WODM_* messages, treat dwUser as a driver instance handle. --- dlls/winecoreaudio.drv/audio.c | 126 ++++++++++++++++++---------------------- 1 files changed, 56 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31ce96ff6933b1f5d413c…

1 0

Ken Thomases : winecoreaudio: Make wodMessage signature match WINEMM_msgFunc32 typedef.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 2435919814452b3dd772527d042dd9031c36ebcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2435919814452b3dd772527d0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 11 14:12:20 2009 -0500 winecoreaudio: Make wodMessage signature match WINEMM_msgFunc32 typedef. --- dlls/winecoreaudio.drv/audio.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index b7339d0..d293188 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1565,11 +1565,11 @@ static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) /************************************************************************** * wodMessage (WINECOREAUDIO.7) */ -DWORD WINAPI CoreAudio_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI CoreAudio_wodMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%u, %s, %08x, %08x, %08x);\n", - wDevID, getMessage(wMsg), dwUser, dwParam1, dwParam2); + TRACE("(%u, %s, %p, %p, %p);\n", + wDevID, getMessage(wMsg), (void*)dwUser, (void*)dwParam1, (void*)dwParam2); switch (wMsg) { case DRVM_INIT:

1 0

Ken Thomases : winecoreaudio: Remove some unused structure fields.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: b3ea0441c5ac1a571a9068cb4792b9a8a9068d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ea0441c5ac1a571a9068cb4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 11 14:11:49 2009 -0500 winecoreaudio: Remove some unused structure fields. --- dlls/winecoreaudio.drv/audio.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 90e3baa..ad156ed 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -162,9 +162,6 @@ typedef struct { DWORD dwLoops; /* private copy of loop counter */ DWORD dwPlayedTotal; /* number of bytes actually played since opening */ - DWORD dwWrittenTotal; /* number of bytes written to OSS buffer since opening */ - - DWORD tickCountMS; /* time in MS of last AudioUnit callback */ OSSpinLock lock; /* synchronization stuff */ @@ -940,7 +937,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) copyFormat(lpDesc->lpFormat, &wwo->format); wwo->dwPlayedTotal = 0; - wwo->dwWrittenTotal = 0; wwo->trace_on = TRACE_ON(wave); wwo->warn_on = WARN_ON(wave); @@ -1372,7 +1368,7 @@ static DWORD wodReset(WORD wDevID) lpSavedQueuePtr = wwo->lpQueuePtr; wwo->lpPlayPtr = wwo->lpQueuePtr = wwo->lpLoopPtr = NULL; wwo->state = WINE_WS_PLAYING; - wwo->dwPlayedTotal = wwo->dwWrittenTotal = 0; + wwo->dwPlayedTotal = 0; wwo->dwPartialOffset = 0; /* Clear partial wavehdr */

1 0

Ken Thomases : winecoreaudio: Consolidate formatting of FOURCC values in a function.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 1b5ca01aeb8aa437951bda9b7b17f5a3ff67e59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5ca01aeb8aa437951bda9b7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 11 14:11:19 2009 -0500 winecoreaudio: Consolidate formatting of FOURCC values in a function. --- dlls/winecoreaudio.drv/audio.c | 48 ++++++++--------------------------- dlls/winecoreaudio.drv/audiounit.c | 29 +++++++++++---------- dlls/winecoreaudio.drv/coreaudio.h | 10 +++++++ dlls/winecoreaudio.drv/midi.c | 5 ++- dlls/winecoreaudio.drv/mixer.c | 35 +++++--------------------- 5 files changed, 46 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b5ca01aeb8aa437951bd…

1 0