April 2010 - Wine-commits - list.winehq.org

Maarten Lankhorst : mmdevapi: Set PKEY_AudioEngine_DeviceFormat for capture too.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 416f0156d6d3bc328f6a2192e49195a000743150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=416f0156d6d3bc328f6a2192e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 19 11:52:48 2010 +0200 mmdevapi: Set PKEY_AudioEngine_DeviceFormat for capture too. --- dlls/mmdevapi/devenum.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index a75340c..977f25a 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -840,6 +840,7 @@ static void openal_scancapture(void) WARN("Disabling blacklist because %s is blacklisted\n", defaultstr); if (devstr && *devstr) for (; *devstr; devstr += strlen(devstr)+1) { + MMDevice *mmdev; ALint freq = 44100; MultiByteToWideChar( CP_UNIXCP, 0, devstr, -1, name, sizeof(name)/sizeof(*name)-1 ); @@ -850,10 +851,11 @@ static void openal_scancapture(void) } TRACE("Adding %s\n", devstr); dev = palcCaptureOpenDevice(devstr, freq, AL_FORMAT_MONO16, 65536); - MMDevice_Create(NULL, name, NULL, eCapture, dev ? DEVICE_STATE_ACTIVE : DEVICE_STATE_NOTPRESENT, !strcmp(devstr, defaultstr)); - if (dev) + MMDevice_Create(&mmdev, name, NULL, eCapture, dev ? DEVICE_STATE_ACTIVE : DEVICE_STATE_NOTPRESENT, !strcmp(devstr, defaultstr)); + if (dev) { + openal_setformat(mmdev, freq); palcCaptureCloseDevice(dev); - else + } else WARN("Could not open device: %04x\n", palcGetError(NULL)); } LeaveCriticalSection(&openal_crst);

1 0

Maarten Lankhorst : mmdevapi: Implement some methods in audioclient.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: a94395f502aa80a14efecfc10e1862b24fb28fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a94395f502aa80a14efecfc10… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 19 11:52:49 2010 +0200 mmdevapi: Implement some methods in audioclient. --- dlls/mmdevapi/audio.c | 431 ++++++++++++++++++++++++++++++++++++++--- dlls/mmdevapi/tests/capture.c | 54 +++--- dlls/mmdevapi/tests/render.c | 52 +++--- 3 files changed, 459 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a94395f502aa80a14efec…

1 0

Maarten Lankhorst : mmdevapi: Implement audio formats.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: bcaa470607b771ca4eb9b232dc8f944497a0c8b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcaa470607b771ca4eb9b232d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 19 11:52:50 2010 +0200 mmdevapi: Implement audio formats. --- dlls/mmdevapi/audio.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 145 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index baaa943..fcefc5a 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -78,10 +78,153 @@ typedef struct ACImpl { static const IAudioClientVtbl ACImpl_Vtbl; +static int get_format_PCM(WAVEFORMATEX *format) +{ + if (format->nChannels > 2) { + FIXME("nChannels > 2 not documented for WAVE_FORMAT_PCM!\n"); + return 0; + } + + format->cbSize = 0; + + if (format->nBlockAlign != format->wBitsPerSample/8*format->nChannels) { + WARN("Invalid nBlockAlign %u, from %u %u\n", + format->nBlockAlign, format->wBitsPerSample, format->nChannels); + return 0; + } + + switch (format->wBitsPerSample) { + case 8: { + switch (format->nChannels) { + case 1: return AL_FORMAT_MONO8; + case 2: return AL_FORMAT_STEREO8; + } + } + case 16: { + switch (format->nChannels) { + case 1: return AL_FORMAT_MONO16; + case 2: return AL_FORMAT_STEREO16; + } + } + } + + if (!(format->wBitsPerSample % 8)) + WARN("Could not get OpenAL format (%d-bit, %d channels)\n", + format->wBitsPerSample, format->nChannels); + return 0; +} + +/* Speaker configs */ +#define MONO SPEAKER_FRONT_CENTER +#define STEREO (SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT) +#define REAR (SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT) +#define QUAD (SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT) +#define X5DOT1 (SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_FRONT_CENTER|SPEAKER_LOW_FREQUENCY|SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT) +#define X6DOT1 (SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_FRONT_CENTER|SPEAKER_LOW_FREQUENCY|SPEAKER_BACK_CENTER|SPEAKER_SIDE_LEFT|SPEAKER_SIDE_RIGHT) +#define X7DOT1 (SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_FRONT_CENTER|SPEAKER_LOW_FREQUENCY|SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT|SPEAKER_SIDE_LEFT|SPEAKER_SIDE_RIGHT) + +static int get_format_EXT(WAVEFORMATEX *format) +{ + WAVEFORMATEXTENSIBLE *wfe; + + if(format->cbSize < sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX)) { + WARN("Invalid cbSize specified for WAVE_FORMAT_EXTENSIBLE (%d)\n", format->cbSize); + return 0; + } + + wfe = (WAVEFORMATEXTENSIBLE*)format; + wfe->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX); + if (wfe->Samples.wValidBitsPerSample && + wfe->Samples.wValidBitsPerSample != format->wBitsPerSample) { + FIXME("wValidBitsPerSample(%u) != wBitsPerSample(%u) unsupported\n", + wfe->Samples.wValidBitsPerSample, format->wBitsPerSample); + return 0; + } + + TRACE("Extensible values:\n" + " Samples = %d\n" + " ChannelMask = 0x%08x\n" + " SubFormat = %s\n", + wfe->Samples.wReserved, wfe->dwChannelMask, + debugstr_guid(&wfe->SubFormat)); + + if (wfe->dwChannelMask != MONO + && wfe->dwChannelMask != STEREO + && !palIsExtensionPresent("AL_EXT_MCFORMATS")) { + /* QUAD PCM might still work, special case */ + if (palIsExtensionPresent("AL_LOKI_quadriphonic") + && IsEqualGUID(&wfe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM) + && wfe->dwChannelMask == QUAD) { + if (format->wBitsPerSample == 16) + return AL_FORMAT_QUAD16_LOKI; + else if (format->wBitsPerSample == 8) + return AL_FORMAT_QUAD8_LOKI; + } + WARN("Not all formats available\n"); + return 0; + } + + if(IsEqualGUID(&wfe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) { + if (format->wBitsPerSample == 8) { + switch (wfe->dwChannelMask) { + case MONO: return AL_FORMAT_MONO8; + case STEREO: return AL_FORMAT_STEREO8; + case REAR: return AL_FORMAT_REAR8; + case QUAD: return AL_FORMAT_QUAD8; + case X5DOT1: return AL_FORMAT_51CHN8; + case X6DOT1: return AL_FORMAT_61CHN8; + case X7DOT1: return AL_FORMAT_71CHN8; + default: break; + } + } else if (format->wBitsPerSample == 16) { + switch (wfe->dwChannelMask) { + case MONO: return AL_FORMAT_MONO16; + case STEREO: return AL_FORMAT_STEREO16; + case REAR: return AL_FORMAT_REAR16; + case QUAD: return AL_FORMAT_QUAD16; + case X5DOT1: return AL_FORMAT_51CHN16; + case X6DOT1: return AL_FORMAT_61CHN16; + case X7DOT1: return AL_FORMAT_71CHN16; + default: break; + } + } + else if (!(format->wBitsPerSample % 8)) + ERR("Could not get OpenAL PCM format (%d-bit, mask 0x%08x)\n", + format->wBitsPerSample, wfe->dwChannelMask); + return 0; + } + else if(IsEqualGUID(&wfe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) { + if (format->wBitsPerSample != 32) { + WARN("Invalid valid bits %u/32\n", format->wBitsPerSample); + return 0; + } + switch (wfe->dwChannelMask) { + case MONO: return AL_FORMAT_MONO_FLOAT32; + case STEREO: return AL_FORMAT_STEREO_FLOAT32; + case REAR: return AL_FORMAT_REAR32; + case QUAD: return AL_FORMAT_QUAD32; + case X5DOT1: return AL_FORMAT_51CHN32; + case X6DOT1: return AL_FORMAT_61CHN32; + case X7DOT1: return AL_FORMAT_71CHN32; + default: + ERR("Could not get OpenAL float format (%d-bit, mask 0x%08x)\n", + format->wBitsPerSample, wfe->dwChannelMask); + return 0; + } + } + else if (!IsEqualGUID(&wfe->SubFormat, &GUID_NULL)) + ERR("Unhandled extensible format: %s\n", debugstr_guid(&wfe->SubFormat)); + return 0; +} + static ALint get_format(WAVEFORMATEX *in) { - FIXME("stub\n"); - return AL_FORMAT_STEREO_FLOAT32; + int ret = 0; + if (in->wFormatTag == WAVE_FORMAT_PCM) + ret = get_format_PCM(in); + else if (in->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + ret = get_format_EXT(in); + return ret; } static REFERENCE_TIME gettime(void) {

1 0

Maarten Lankhorst : mmdevapi: Add support for IAudioRenderClient.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: cffb95fdb835140cd3b167835f3e445a8ed5974b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cffb95fdb835140cd3b167835… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 19 11:52:51 2010 +0200 mmdevapi: Add support for IAudioRenderClient. --- dlls/mmdevapi/audio.c | 224 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 224 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index fcefc5a..b2ee3f0 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -74,9 +74,21 @@ typedef struct ACImpl { HANDLE timer_id; ALCdevice *capdev; ALint format; + + ACRender *render; } ACImpl; +struct ACRender { + const IAudioRenderClientVtbl *lpVtbl; + LONG ref; + ACImpl *parent; +}; + static const IAudioClientVtbl ACImpl_Vtbl; +static const IAudioRenderClientVtbl ACRender_Vtbl; + +static HRESULT AudioRenderClient_Create(ACImpl *parent, ACRender **ppv); +static void AudioRenderClient_Destroy(ACRender *This); static int get_format_PCM(WAVEFORMATEX *format) { @@ -251,6 +263,8 @@ static void AudioClient_Destroy(ACImpl *This) { if (This->timer_id) DeleteTimerQueueTimer(NULL, This->timer_id, INVALID_HANDLE_VALUE); + if (This->render) + AudioRenderClient_Destroy(This->render); if (This->parent->flow == eRender && This->init) { setALContext(This->parent->ctx); IAudioClient_Stop((IAudioClient*)This); @@ -808,6 +822,14 @@ static HRESULT WINAPI AC_GetService(IAudioClient *iface, REFIID riid, void **ppv return E_POINTER; *ppv = NULL; + if (IsEqualIID(riid, &IID_IAudioRenderClient)) { + if (This->parent->flow != eRender) + return AUDCLNT_E_WRONG_ENDPOINT_TYPE; + if (!This->render) + hr = AudioRenderClient_Create(This, &This->render); + *ppv = This->render; + } + if (FAILED(hr)) return hr; @@ -839,4 +861,206 @@ static const IAudioClientVtbl ACImpl_Vtbl = AC_GetService }; +static HRESULT AudioRenderClient_Create(ACImpl *parent, ACRender **ppv) +{ + ACRender *This; + + This = *ppv = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + This->lpVtbl = &ACRender_Vtbl; + This->ref = 0; + This->parent = parent; + return S_OK; +} + +static void AudioRenderClient_Destroy(ACRender *This) +{ + This->parent->render = NULL; + HeapFree(GetProcessHeap(), 0, This); +} + +static HRESULT WINAPI ACR_QueryInterface(IAudioRenderClient *iface, REFIID riid, void **ppv) +{ + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) + || IsEqualIID(riid, &IID_IAudioRenderClient)) + *ppv = iface; + if (*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ACR_AddRef(IAudioRenderClient *iface) +{ + ACRender *This = (ACRender*)iface; + ULONG ref; + ref = InterlockedIncrement(&This->ref); + TRACE("Refcount now %i\n", ref); + return ref; +} + +static ULONG WINAPI ACR_Release(IAudioRenderClient *iface) +{ + ACRender *This = (ACRender*)iface; + ULONG ref; + ref = InterlockedDecrement(&This->ref); + TRACE("Refcount now %i\n", ref); + if (!ref) + AudioRenderClient_Destroy(This); + return ref; +} + +static HRESULT WINAPI ACR_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) +{ + ACRender *This = (ACRender*)iface; + DWORD free, framesize; + TRACE("(%p)->(%u,%p)\n", This, frames, data); + + if (!data) + return E_POINTER; + if (!frames) + return S_OK; + *data = NULL; + if (This->parent->locked) { + ERR("Locked\n"); + return AUDCLNT_E_OUT_OF_ORDER; + } + AC_GetCurrentPadding((IAudioClient*)This->parent, &free); + if (This->parent->bufsize-free < frames) { + ERR("Too large: %u %u %u\n", This->parent->bufsize, free, frames); + return AUDCLNT_E_BUFFER_TOO_LARGE; + } + EnterCriticalSection(This->parent->crst); + This->parent->locked = frames; + framesize = This->parent->pwfx->nBlockAlign; + + /* Exact offset doesn't matter, offset could be 0 forever + * but increasing it is easier to debug */ + if (This->parent->ofs + frames > This->parent->bufsize) + This->parent->ofs = 0; + *data = This->parent->buffer + This->parent->ofs * framesize; + + LeaveCriticalSection(This->parent->crst); + return S_OK; +} + +static HRESULT WINAPI ACR_ReleaseBuffer(IAudioRenderClient *iface, UINT32 written, DWORD flags) +{ + ACRender *This = (ACRender*)iface; + BYTE *buf = This->parent->buffer; + DWORD framesize = This->parent->pwfx->nBlockAlign; + DWORD ofs = This->parent->ofs; + DWORD bufsize = This->parent->bufsize; + DWORD locked = This->parent->locked; + DWORD freq = This->parent->pwfx->nSamplesPerSec; + DWORD bpp = This->parent->pwfx->wBitsPerSample; + ALuint albuf; + + TRACE("(%p)->(%u,%x)\n", This, written, flags); + + if (locked < written) + return AUDCLNT_E_INVALID_SIZE; + + if (flags & ~AUDCLNT_BUFFERFLAGS_SILENT) + return E_INVALIDARG; + + if (!written) { + FIXME("Handled right?\n"); + This->parent->locked = 0; + return S_OK; + } + + if (!This->parent->locked) + return AUDCLNT_E_OUT_OF_ORDER; + + EnterCriticalSection(This->parent->crst); + setALContext(This->parent->parent->ctx); + + This->parent->ofs += written; + This->parent->ofs %= bufsize; + This->parent->pad += written; + This->parent->frameswritten += written; + + ofs *= framesize; + written *= framesize; + bufsize *= framesize; + locked *= framesize; + + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) + memset(buf+ofs, bpp != 8 ? 0 : 128, written); + TRACE("buf: %p, ofs: %x, written %u, freq %u\n", buf, ofs, written, freq); + + palGenBuffers(1, &albuf); + palBufferData(albuf, This->parent->format, buf+ofs, written, freq); + palSourceQueueBuffers(This->parent->source, 1, &albuf); + TRACE("Queued %u\n", albuf); + + if (This->parent->running) { + ALint state = AL_PLAYING, done = 0, padpart = 0; + + palGetSourcei(This->parent->source, AL_BUFFERS_PROCESSED, &done); + palGetSourcei(This->parent->source, AL_BYTE_OFFSET, &padpart); + palGetSourcei(This->parent->source, AL_SOURCE_STATE, &state); + padpart /= framesize; + + if (state == AL_STOPPED) { + padpart = This->parent->pad; + /* Buffer might have been processed in the small window + * between first and third call */ + palGetSourcei(This->parent->source, AL_BUFFERS_PROCESSED, &done); + } + if (done || This->parent->padpartial != padpart) + This->parent->laststamp = gettime(); + This->parent->padpartial = padpart; + + while (done--) { + ALint size, bits, chan; + ALuint which; + + palSourceUnqueueBuffers(This->parent->source, 1, &which); + palGetBufferi(which, AL_SIZE, &size); + palGetBufferi(which, AL_BITS, &bits); + palGetBufferi(which, AL_CHANNELS, &chan); + size /= bits * chan / 8; + if (size > This->parent->pad) { + ERR("Overflow!\n"); + size = This->parent->pad; + } + This->parent->pad -= size; + This->parent->padpartial -= size; + TRACE("Unqueued %u\n", which); + palDeleteBuffers(1, &which); + } + + if (state != AL_PLAYING) { + ERR("Starting from %x\n", state); + palSourcePlay(This->parent->source); + } + getALError(); + } + This->parent->locked = 0; + + getALError(); + popALContext(); + LeaveCriticalSection(This->parent->crst); + + return S_OK; +} + +static const IAudioRenderClientVtbl ACRender_Vtbl = { + ACR_QueryInterface, + ACR_AddRef, + ACR_Release, + ACR_GetBuffer, + ACR_ReleaseBuffer +}; + #endif

1 0

Maarten Lankhorst : mmdevapi: Add audio capture code.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: f062e1b127aac4d5a075c40e8d9d90cc687d5d6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f062e1b127aac4d5a075c40e8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 19 11:52:52 2010 +0200 mmdevapi: Add audio capture code. --- dlls/mmdevapi/audio.c | 149 +++++++++++++++++++++++++++++++++++++++++ dlls/mmdevapi/tests/capture.c | 4 +- 2 files changed, 152 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index b2ee3f0..997e037 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -76,6 +76,7 @@ typedef struct ACImpl { ALint format; ACRender *render; + ACCapture *capture; } ACImpl; struct ACRender { @@ -84,11 +85,20 @@ struct ACRender { ACImpl *parent; }; +struct ACCapture { + const IAudioCaptureClientVtbl *lpVtbl; + LONG ref; + ACImpl *parent; +}; + static const IAudioClientVtbl ACImpl_Vtbl; static const IAudioRenderClientVtbl ACRender_Vtbl; +static const IAudioCaptureClientVtbl ACCapture_Vtbl; static HRESULT AudioRenderClient_Create(ACImpl *parent, ACRender **ppv); static void AudioRenderClient_Destroy(ACRender *This); +static HRESULT AudioCaptureClient_Create(ACImpl *parent, ACCapture **ppv); +static void AudioCaptureClient_Destroy(ACCapture *This); static int get_format_PCM(WAVEFORMATEX *format) { @@ -265,6 +275,8 @@ static void AudioClient_Destroy(ACImpl *This) DeleteTimerQueueTimer(NULL, This->timer_id, INVALID_HANDLE_VALUE); if (This->render) AudioRenderClient_Destroy(This->render); + if (This->capture) + AudioCaptureClient_Destroy(This->capture); if (This->parent->flow == eRender && This->init) { setALContext(This->parent->ctx); IAudioClient_Stop((IAudioClient*)This); @@ -828,6 +840,12 @@ static HRESULT WINAPI AC_GetService(IAudioClient *iface, REFIID riid, void **ppv if (!This->render) hr = AudioRenderClient_Create(This, &This->render); *ppv = This->render; + } else if (IsEqualIID(riid, &IID_IAudioCaptureClient)) { + if (This->parent->flow != eCapture) + return AUDCLNT_E_WRONG_ENDPOINT_TYPE; + if (!This->capture) + hr = AudioCaptureClient_Create(This, &This->capture); + *ppv = This->capture; } if (FAILED(hr)) @@ -1063,4 +1081,135 @@ static const IAudioRenderClientVtbl ACRender_Vtbl = { ACR_ReleaseBuffer }; +static HRESULT AudioCaptureClient_Create(ACImpl *parent, ACCapture **ppv) +{ + ACCapture *This; + This = *ppv = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + This->lpVtbl = &ACCapture_Vtbl; + This->ref = 0; + This->parent = parent; + return S_OK; +} + +static void AudioCaptureClient_Destroy(ACCapture *This) +{ + This->parent->capture = NULL; + HeapFree(GetProcessHeap(), 0, This); +} + +static HRESULT WINAPI ACC_QueryInterface(IAudioCaptureClient *iface, REFIID riid, void **ppv) +{ + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) + || IsEqualIID(riid, &IID_IAudioCaptureClient)) + *ppv = iface; + if (*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ACC_AddRef(IAudioCaptureClient *iface) +{ + ACCapture *This = (ACCapture*)iface; + ULONG ref; + ref = InterlockedIncrement(&This->ref); + TRACE("Refcount now %i\n", ref); + return ref; +} + +static ULONG WINAPI ACC_Release(IAudioCaptureClient *iface) +{ + ACCapture *This = (ACCapture*)iface; + ULONG ref; + ref = InterlockedDecrement(&This->ref); + TRACE("Refcount now %i\n", ref); + if (!ref) + AudioCaptureClient_Destroy(This); + return ref; +} + +static HRESULT WINAPI ACC_GetBuffer(IAudioCaptureClient *iface, BYTE **data, UINT32 *frames, DWORD *flags, UINT64 *devpos, UINT64 *qpcpos) +{ + ACCapture *This = (ACCapture*)iface; + HRESULT hr; + DWORD block = This->parent->pwfx->nBlockAlign; + DWORD ofs, bufsize; + TRACE("(%p)->(%p,%p,%p,%p,%p)\n", This, data, frames, flags, devpos, qpcpos); + + if (!data) + return E_POINTER; + if (!frames) + return E_POINTER; + if (!flags) { + FIXME("Flags can be null?\n"); + return E_POINTER; + } + EnterCriticalSection(This->parent->crst); + hr = AUDCLNT_E_OUT_OF_ORDER; + if (This->parent->locked) + goto out; + IAudioCaptureClient_GetNextPacketSize(iface, frames); + ofs = This->parent->ofs; + bufsize = This->parent->bufsize; + if ( (ofs*block) % This->parent->psize) + ERR("Unaligned offset %u with %u\n", ofs*block, This->parent->psize); + *data = This->parent->buffer + ofs * block; + This->parent->locked = *frames; + if (devpos) + *devpos = This->parent->frameswritten - This->parent->pad; + if (qpcpos) + *qpcpos = This->parent->laststamp; + if (*frames) + hr = S_OK; + else + hr = AUDCLNT_S_BUFFER_EMPTY; +out: + LeaveCriticalSection(This->parent->crst); + return hr; +} + +static HRESULT WINAPI ACC_ReleaseBuffer(IAudioCaptureClient *iface, UINT32 written) +{ + ACCapture *This = (ACCapture*)iface; + HRESULT hr = S_OK; + EnterCriticalSection(This->parent->crst); + if (!written || written == This->parent->locked) + This->parent->locked = 0; + else if (!This->parent->locked) + hr = AUDCLNT_E_OUT_OF_ORDER; + else + hr = AUDCLNT_E_INVALID_SIZE; + This->parent->ofs += written; + This->parent->ofs %= This->parent->bufsize; + This->parent->pad -= written; + LeaveCriticalSection(This->parent->crst); + return hr; +} + +static HRESULT WINAPI ACC_GetNextPacketSize(IAudioCaptureClient *iface, UINT32 *frames) +{ + ACCapture *This = (ACCapture*)iface; + + return AC_GetCurrentPadding((IAudioClient*)This->parent, frames); +} + +static const IAudioCaptureClientVtbl ACCapture_Vtbl = +{ + ACC_QueryInterface, + ACC_AddRef, + ACC_Release, + ACC_GetBuffer, + ACC_ReleaseBuffer, + ACC_GetNextPacketSize +}; + #endif diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index d88a19d..b5c4883 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -81,7 +81,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) UINT64 devpos, qpcpos; hr = IAudioClient_GetService(ac, &IID_IAudioCaptureClient, (void**)&acc); - todo_wine ok(hr == S_OK, "IAudioClient_GetService(IID_IAudioCaptureClient) returns %08x\n", hr); + ok(hr == S_OK, "IAudioClient_GetService(IID_IAudioCaptureClient) returns %08x\n", hr); if (hr != S_OK) return; @@ -118,6 +118,8 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(frames, "Amount of frames locked is 0!\n"); else if (hr == AUDCLNT_S_BUFFER_EMPTY) ok(!frames, "Amount of frames locked with empty buffer is %u!\n", frames); + else + ok(0, "GetBuffer returned %08x\n", hr); trace("Device position is at %u, amount of frames locked: %u\n", (DWORD)devpos, frames); if (frames) {

1 0

Paul Vriens : shell32: Update Dutch translation.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 8cb645ab2313e1cb4402dad5e57126c1f8fb12e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb645ab2313e1cb4402dad5e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Apr 20 11:37:54 2010 +0200 shell32: Update Dutch translation. --- dlls/shell32/shell32_Nl.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index e3038a1..4dd6632 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -209,6 +209,10 @@ STRINGTABLE IDS_SHV_COLUMN11 "Groep" IDS_SHV_COLUMN_DELFROM "Originele locatie" IDS_SHV_COLUMN_DELDATE "Datum verwijderd" + IDS_SHV_COL_DOCS "Documenten" + IDS_SHV_COL_STATUS "Status" + IDS_SHV_COL_LOCATION "Locatie" + IDS_SHV_COL_MODEL "Model" /* special folders */ IDS_DESKTOP "Bureaublad"

1 0

Roderick Colenbrander : wgl: Ignore fbconfigs which are window drawable but which lack a visual.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 26862c5ece31d9e297d87e82b47dfa4e31247ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26862c5ece31d9e297d87e82b… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Apr 20 12:13:25 2010 +0200 wgl: Ignore fbconfigs which are window drawable but which lack a visual. --- dlls/winex11.drv/opengl.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 94fbb1e..a3c4f6b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -992,6 +992,21 @@ static WineGLPixelFormat *get_formats(Display *display, int *size_ret, int *onsc onscreen_size++; } } else if(run && !visinfo) { + int window_drawable=0; + pglXGetFBConfigAttrib(gdi_display, cfgs[i], GLX_DRAWABLE_TYPE, &window_drawable); + + /* Recent Nvidia drivers and DRI drivers offer window drawable formats without a visual. + * This are formats like 16-bit rgb on a 24-bit desktop. In order to support these formats + * onscreen we would have to use glXCreateWindow instead of XCreateWindow. Further it will + * likely make our child window opengl rendering more complicated since likely you can't use + * XCopyArea on a GLX Window. + * For now ignore fbconfigs which are window drawable but lack a visual. */ + if(window_drawable & GLX_WINDOW_BIT) + { + TRACE("Skipping FBCONFIG_ID 0x%x as an offscreen format because it is window_drawable\n", fmt_id); + continue; + } + TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); list[size].iPixelFormat = size+1; /* The index starts at 1 */ list[size].fbconfig = cfgs[i];

1 0

Roderick Colenbrander : wgl: Print the fbconfig fmt_id in ConvertPixelFormatWGLtoGLX instead of the meaningless pointer .
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 9eaab2cec11239c1bce2ae8dac03993684cf8020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eaab2cec11239c1bce2ae8da… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Apr 20 12:13:26 2010 +0200 wgl: Print the fbconfig fmt_id in ConvertPixelFormatWGLtoGLX instead of the meaningless pointer. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a3c4f6b..cf22f95 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1049,7 +1049,7 @@ static WineGLPixelFormat* ConvertPixelFormatWGLtoGLX(Display *display, int iPixe if((iPixelFormat > 0) && (iPixelFormat <= size) && (!list[iPixelFormat-1].offscreenOnly || AllowOffscreen)) { res = &list[iPixelFormat-1]; - TRACE("Returning FBConfig=%p for iPixelFormat=%d\n", res->fbconfig, iPixelFormat); + TRACE("Returning fmt_id=%#x for iPixelFormat=%d\n", res->fmt_id, iPixelFormat); } if(AllowOffscreen)

1 0

Alistair Leslie-Hughes : urlmon: Strip forward and back slashes when using the file: protocol.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: c79c84947955deb56b6b73f2c54002364a9b6ed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79c84947955deb56b6b73f2c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 20 21:31:29 2010 +1000 urlmon: Strip forward and back slashes when using the file: protocol. --- dlls/urlmon/file.c | 5 ++++- dlls/urlmon/tests/protocol.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index ed4802b..a517d94 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -141,7 +141,10 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); file_name = url+sizeof(wszFile)/sizeof(WCHAR); - if(file_name[0] == '/' && file_name[1] == '/') + + /* Strip both forward and back slashes */ + if( (file_name[0] == '/' && file_name[1] == '/') || + (file_name[0] == '\\' && file_name[1] == '\\')) file_name += 2; if(*file_name == '/') file_name++; diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index d54d00d..ba0c32c 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -2241,6 +2241,7 @@ static void test_file_protocol(void) { static const WCHAR wszFile[] = {'f','i','l','e',':',0}; static const WCHAR wszFile2[] = {'f','i','l','e',':','/','/',0}; static const WCHAR wszFile3[] = {'f','i','l','e',':','/','/','/',0}; + static const WCHAR wszFile4[] = {'f','i','l','e',':','\\','\\',0}; static const char html_doc[] = "<HTML></HTML>"; trace("Testing file protocol...\n"); @@ -2306,6 +2307,20 @@ static void test_file_protocol(void) { bindf = BINDF_FROMURLMON; test_file_protocol_url(buf); + memcpy(buf, wszFile4, sizeof(wszFile4)); + len = GetCurrentDirectoryW(sizeof(file_name_buf)/sizeof(WCHAR), file_name_buf); + file_name_buf[len++] = '\\'; + memcpy(file_name_buf+len, wszIndexHtml, sizeof(wszIndexHtml)); + lstrcpyW(buf+sizeof(wszFile4)/sizeof(WCHAR)-1, file_name_buf); + file_name = file_name_buf; + bindf = 0; + test_file_protocol_url(buf); + bindf = BINDF_FROMURLMON; + test_file_protocol_url(buf); + + buf[sizeof(wszFile4)/sizeof(WCHAR)] = '|'; + test_file_protocol_url(buf); + DeleteFileW(wszIndexHtml); bindf = 0;

1 0

Maarten Lankhorst : mmdevapi: Improve EndpointNotificationCallback stubs.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: f9293dc9772e976abde7987997aa5ce7d7c836d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9293dc9772e976abde798799… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 19 11:52:46 2010 +0200 mmdevapi: Improve EndpointNotificationCallback stubs. --- dlls/mmdevapi/devenum.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index e778ab0..867cc28 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1042,7 +1042,7 @@ static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEn MMDevEnumImpl *This = (MMDevEnumImpl*)iface; TRACE("(%p)->(%p)\n", This, client); FIXME("stub\n"); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI MMDevEnum_UnregisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) @@ -1050,7 +1050,7 @@ static HRESULT WINAPI MMDevEnum_UnregisterEndpointNotificationCallback(IMMDevice MMDevEnumImpl *This = (MMDevEnumImpl*)iface; TRACE("(%p)->(%p)\n", This, client); FIXME("stub\n"); - return E_NOTIMPL; + return S_OK; } static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl =

1 0