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

Michael Stefaniuc : devenum: COM cleanup for IParseDisplayName.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 448986f1c4f89d0bb089f8d76e2aadbbba95a1fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=448986f1c4f89d0bb089f8d76… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 3 00:22:12 2012 +0200 devenum: COM cleanup for IParseDisplayName. --- dlls/devenum/devenum_private.h | 2 +- dlls/devenum/parsedisplayname.c | 36 +++++++++++++----------------------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index fe3c5d2..45736a5 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -67,7 +67,7 @@ typedef struct typedef struct { - const IParseDisplayNameVtbl *lpVtbl; + IParseDisplayName IParseDisplayName_iface; } ParseDisplayNameImpl; typedef struct diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index b36b3ed..40850b2 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -27,31 +27,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); -static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface( - LPPARSEDISPLAYNAME iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface(IParseDisplayName *iface, + REFIID riid, void **ppv) { TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); - if (ppvObj == NULL) return E_POINTER; + if (!ppv) + return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IParseDisplayName)) { - *ppvObj = iface; - IParseDisplayName_AddRef(iface); - return S_OK; + *ppv = iface; + IParseDisplayName_AddRef(iface); + return S_OK; } FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } -/********************************************************************** - * DEVENUM_IParseDisplayName_AddRef (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(LPPARSEDISPLAYNAME iface) +static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(IParseDisplayName *iface) { TRACE("\n"); @@ -60,10 +57,7 @@ static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(LPPARSEDISPLAYNAME iface) return 2; /* non-heap based object */ } -/********************************************************************** - * DEVENUM_IParseDisplayName_Release (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IParseDisplayName_Release(LPPARSEDISPLAYNAME iface) +static ULONG WINAPI DEVENUM_IParseDisplayName_Release(IParseDisplayName *iface) { TRACE("\n"); @@ -81,12 +75,8 @@ static ULONG WINAPI DEVENUM_IParseDisplayName_Release(LPPARSEDISPLAYNAME iface) * Might not handle more complicated strings properly (ie anything * not in "@device:sw:{CLSID1}\<filter name or CLSID>" format */ -static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName( - LPPARSEDISPLAYNAME iface, - IBindCtx *pbc, - LPOLESTR pszDisplayName, - ULONG *pchEaten, - IMoniker **ppmkOut) +static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName(IParseDisplayName *iface, + IBindCtx *pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { LPOLESTR pszBetween = NULL; LPOLESTR pszClass = NULL; @@ -163,4 +153,4 @@ static const IParseDisplayNameVtbl IParseDisplayName_Vtbl = }; /* The one instance of this class */ -ParseDisplayNameImpl DEVENUM_ParseDisplayName = { &IParseDisplayName_Vtbl }; +ParseDisplayNameImpl DEVENUM_ParseDisplayName = { { &IParseDisplayName_Vtbl } };

1 0

Aric Stewart : strmbase: Implement renderer quality control into the base renderer.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 54eafc73e51666c3edf9fa78a0534ea7b1fa23c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54eafc73e51666c3edf9fa78a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 2 07:52:08 2012 -0500 strmbase: Implement renderer quality control into the base renderer. --- dlls/quartz/dsoundrender.c | 28 ++++++++++------------------ dlls/quartz/nullrenderer.c | 2 +- dlls/strmbase/renderer.c | 42 +++++++++++++++++++++++++++++++++++++++++- include/wine/strmbase.h | 4 ++++ 4 files changed, 56 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 5b4408d..4714b2b 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -49,13 +49,6 @@ static const IReferenceClockVtbl IReferenceClock_Vtbl; static const IMediaSeekingVtbl IMediaSeeking_Vtbl; static const IAMDirectSoundVtbl IAMDirectSound_Vtbl; static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; -static const IQualityControlVtbl DSoundRender_QualityControl_Vtbl = { - QualityControlImpl_QueryInterface, - QualityControlImpl_AddRef, - QualityControlImpl_Release, - QualityControlImpl_Notify, - QualityControlImpl_SetSink -}; typedef struct DSoundRenderImpl { @@ -66,8 +59,6 @@ typedef struct DSoundRenderImpl const IAMDirectSoundVtbl *IAMDirectSound_vtbl; const IAMFilterMiscFlagsVtbl *IAMFilterMiscFlags_vtbl; - QualityControlImpl qcimpl; - IDirectSound8 *dsound; LPDIRECTSOUNDBUFFER dsbuffer; DWORD buf_size; @@ -322,6 +313,13 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIM return S_OK; } +static HRESULT WINAPI DSoundRender_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample *pMediaSample, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime) +{ + /* We time ourselves do not use the base renderers timing */ + return S_OK; +} + + HRESULT WINAPI DSoundRender_PrepareReceive(BaseRenderer *iface, IMediaSample *pSample) { DSoundRenderImpl *This = impl_from_BaseRenderer(iface); @@ -409,7 +407,7 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(BaseRenderer *iface, IMediaSam q.Proportion = 1.; q.Late = jitter; q.TimeStamp = tStart; - IQualityControl_Notify((IQualityControl *)&This->qcimpl, (IBaseFilter*)This, q); + IQualityControl_Notify((IQualityControl *)&This->renderer.qcimpl, (IBaseFilter*)This, q); } return hr; } @@ -455,7 +453,6 @@ static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface) if (This->renderer.pInputPin->pin.pConnectedTo) { - QualityControlRender_Start(&This->qcimpl, This->renderer.filter.rtStreamStart); if (This->renderer.filter.state == State_Paused) { /* Unblock our thread, state changing from paused to running doesn't need a reset for state change */ @@ -604,7 +601,6 @@ static HRESULT WINAPI DSoundRender_EndFlush(BaseRenderer* iface) IDirectSoundBuffer_Unlock(This->dsbuffer, buffer, size, NULL, 0); This->writepos = This->buf_size; } - QualityControlRender_Start(&This->qcimpl, This->renderer.filter.rtStreamStart); return S_OK; } @@ -621,7 +617,7 @@ static const BaseRendererFuncTable BaseFuncTable = { NULL, NULL, NULL, - NULL, + DSoundRender_ShouldDrawSampleNow, DSoundRender_PrepareReceive, /**/ DSoundRender_CompleteConnect, @@ -687,8 +683,6 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) return HRESULT_FROM_WIN32(GetLastError()); } - QualityControlImpl_init(&pDSoundRender->qcimpl, (IPin*)pDSoundRender->renderer.pInputPin, (IBaseFilter*)pDSoundRender); - pDSoundRender->qcimpl.lpVtbl = &DSoundRender_QualityControl_Vtbl; *ppv = pDSoundRender; } else @@ -715,8 +709,6 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri *ppv = &This->IAMDirectSound_vtbl; else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) *ppv = &This->IAMFilterMiscFlags_vtbl; - else if (IsEqualIID(riid, &IID_IQualityControl)) - *ppv = &This->qcimpl; else { HRESULT hr; @@ -782,7 +774,7 @@ static const IBaseFilterVtbl DSoundRender_Vtbl = BaseRendererImpl_Pause, BaseRendererImpl_Run, BaseRendererImpl_GetState, - BaseFilterImpl_SetSyncSource, + BaseRendererImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, BaseRendererImpl_FindPin, diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index ab4dba2..5d2680f 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -239,7 +239,7 @@ static const IBaseFilterVtbl NullRenderer_Vtbl = BaseRendererImpl_Pause, BaseRendererImpl_Run, BaseRendererImpl_GetState, - BaseFilterImpl_SetSyncSource, + BaseRendererImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, BaseRendererImpl_FindPin, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 3f665f7..a4261ee 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -47,6 +47,14 @@ static inline BaseRenderer *impl_from_BaseFilter(BaseFilter *iface) return CONTAINING_RECORD(iface, BaseRenderer, filter); } +static const IQualityControlVtbl Renderer_QualityControl_Vtbl = { + QualityControlImpl_QueryInterface, + QualityControlImpl_AddRef, + QualityControlImpl_Release, + QualityControlImpl_Notify, + QualityControlImpl_SetSink +}; + static HRESULT WINAPI BaseRenderer_InputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); @@ -258,6 +266,9 @@ HRESULT WINAPI BaseRenderer_Init(BaseRenderer * This, const IBaseFilterVtbl *Vtb This->ThreadSignal = CreateEventW(NULL, TRUE, TRUE, NULL); This->RenderEvent = CreateEventW(NULL, FALSE, FALSE, NULL); This->pMediaSample = NULL; + + QualityControlImpl_init(&This->qcimpl, &This->pInputPin->pin.IPin_iface, &This->filter.IBaseFilter_iface); + This->qcimpl.lpVtbl = &Renderer_QualityControl_Vtbl; } return hr; @@ -269,6 +280,12 @@ HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter* iface, REFIID riid, if (IsEqualIID(riid, &IID_IMediaSeeking)) return IUnknown_QueryInterface(This->pPosition, riid, ppv); + else if (IsEqualIID(riid, &IID_IQualityControl)) + { + *ppv = &This->qcimpl.lpVtbl; + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } else return BaseFilterImpl_QueryInterface(iface, riid, ppv); } @@ -365,7 +382,9 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp { if (This->pFuncsTable->pfnOnWaitStart) This->pFuncsTable->pfnOnWaitStart(This); - /* TODO: Wait */ + + hr = QualityControlRender_WaitFor(&This->qcimpl, pSample, This->RenderEvent); + if (This->pFuncsTable->pfnOnWaitEnd) This->pFuncsTable->pfnOnWaitEnd(This); } @@ -378,7 +397,13 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp } if (SUCCEEDED(hr)) + { + QualityControlRender_BeginRender(&This->qcimpl); hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); + QualityControlRender_EndRender(&This->qcimpl); + } + + QualityControlRender_DoQOS(&This->qcimpl); BaseRendererImpl_ClearPendingSample(This); LeaveCriticalSection(&This->csRenderLock); @@ -457,6 +482,7 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) } if (SUCCEEDED(hr)) { + QualityControlRender_Start(&This->qcimpl, This->filter.rtStreamStart); if (This->pFuncsTable->pfnOnStartStreaming) This->pFuncsTable->pfnOnStartStreaming(This); if (This->filter.state == State_Stopped) @@ -501,6 +527,19 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) return S_OK; } +HRESULT WINAPI BaseRendererImpl_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock) +{ + BaseRenderer *This = impl_from_IBaseFilter(iface); + HRESULT hr; + + EnterCriticalSection(&This->filter.csFilter); + QualityControlRender_SetClock(&This->qcimpl, clock); + hr = BaseFilterImpl_SetSyncSource(iface, clock); + LeaveCriticalSection(&This->filter.csFilter); + return hr; +} + + HRESULT WINAPI BaseRendererImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) { HRESULT hr; @@ -553,6 +592,7 @@ HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface) HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); + QualityControlRender_Start(&iface->qcimpl, iface->filter.rtStreamStart); RendererPosPassThru_ResetMediaTime(iface->pPosition); ResetEvent(iface->ThreadSignal); ResetEvent(iface->RenderEvent); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 7e25c04..6be9b0d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -587,6 +587,9 @@ typedef struct BaseRendererTag HANDLE RenderEvent; IMediaSample *pMediaSample; + IQualityControl *pQSink; + QualityControlImpl qcimpl; + const struct BaseRendererFuncTable * pFuncsTable; } BaseRenderer; @@ -638,6 +641,7 @@ HRESULT WINAPI BaseRendererImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin ** HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface); HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart); HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface); +HRESULT WINAPI BaseRendererImpl_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock); HRESULT WINAPI BaseRendererImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState); HRESULT WINAPI BaseRendererImpl_EndOfStream(BaseRenderer* iface); HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface);

1 0

Aric Stewart : quartz: Have the VideoRenderer use strmbase BaseWindow.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 8830470a8c248546075ee32bf00e6ba9d096b5be URL: http://source.winehq.org/git/wine.git/?a=commit;h=8830470a8c248546075ee32bf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:08:45 2012 -0500 quartz: Have the VideoRenderer use strmbase BaseWindow. --- dlls/quartz/main.c | 2 - dlls/quartz/videorenderer.c | 295 ++++++++++++++++++------------------------- 2 files changed, 126 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8830470a8c248546075ee…

1 0

Aric Stewart : quartz: Convert VideoRenderer to use strmbase BaseRenderer.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 896be1355b6c7eca0ad5cebea796ee1bca655d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896be1355b6c7eca0ad5cebea… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:08:55 2012 -0500 quartz: Convert VideoRenderer to use strmbase BaseRenderer. --- dlls/quartz/videorenderer.c | 520 ++++++++++++------------------------------- 1 files changed, 142 insertions(+), 378 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=896be1355b6c7eca0ad5c…

1 0

Aric Stewart : strmbase: Remove QualityControlImpl from the general strmbase.h.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 56477075c257426575e870a231b23ff582ff6d4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=56477075c257426575e870a23… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 2 07:52:15 2012 -0500 strmbase: Remove QualityControlImpl from the general strmbase.h. Quality Control things are not part of the standard strmbase library set. --- dlls/quartz/dsoundrender.c | 2 +- dlls/strmbase/qualitycontrol.c | 14 ++++++++++- dlls/strmbase/renderer.c | 22 +++++++++------- dlls/strmbase/strmbase_private.h | 50 ++++++++++++++++++++++++++++++++++++++ dlls/strmbase/transform.c | 14 +++++++--- dlls/winegstreamer/gstdemux.c | 47 ++++++++++++++++++++++++++++------- dlls/winegstreamer/gsttffilter.c | 2 +- include/wine/strmbase.h | 35 ++------------------------ 8 files changed, 127 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56477075c257426575e87…

1 0

Lucas Fialho Zawacki : Add Portuguese translation for release 1.5.1
by Jeremy Newman 02 Apr '12

02 Apr '12

Module: website Branch: master Commit: 37bd11551fd7364d52a37f17907636b15d7faad2 URL: http://source.winehq.org/git/website.git/?a=commit;h=37bd11551fd7364d52a37f… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Mon Apr 2 16:38:13 2012 -0300 Add Portuguese translation for release 1.5.1 --- news/pt/2012033001.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pt/2012033001.xml b/news/pt/2012033001.xml new file mode 100644 index 0000000..7e091a2 --- /dev/null +++ b/news/pt/2012033001.xml @@ -0,0 +1,16 @@ +<news> +<date>30 de Março de 2012</date> +<title>Wine 1.5.1 lançado</title> +<body> + A versão de desenvolvimento 1.5.1 já está disponível. + <a href="{$root}/announce/1.5.1">Novidades</a> nesta versão: +<ul> + <li>Javascript built-in agora tem preferência ao Gecko na maioria dos casos.</li> + <li>Suporte a fontes redimensionáveis em recursos.</li> + <li>Correções na reprodução de vídeo e áudio.</li> + <li>Suporte a decodificação de scripts em JScript.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.1.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Andrew Eikum : dsound: Validate and correct wValidBitsPerSample in primary buffer SetFormat.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 552433cf9e195109bbd520bf4eea47ad9afa6d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=552433cf9e195109bbd520bf4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 2 09:41:06 2012 -0500 dsound: Validate and correct wValidBitsPerSample in primary buffer SetFormat. --- dlls/dsound/primary.c | 28 +++++++++++++++++++++++++++- dlls/dsound/tests/dsound.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 5c74353..4851ac2 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -353,7 +353,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe HRESULT err = DSERR_BUFFERLOST; int i; WAVEFORMATEX *old_fmt; - WAVEFORMATEXTENSIBLE *fmtex; + WAVEFORMATEXTENSIBLE *fmtex, *passed_fmtex = (WAVEFORMATEXTENSIBLE*)passed_fmt; BOOL forced = (device->priolevel == DSSCL_WRITEPRIMARY); TRACE("(%p,%p)\n", device, passed_fmt); @@ -380,6 +380,11 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe passed_fmt->nBlockAlign != passed_fmt->nChannels * passed_fmt->wBitsPerSample / 8) return DSERR_INVALIDPARAM; + if(passed_fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(passed_fmtex->Samples.wValidBitsPerSample > passed_fmtex->Format.wBitsPerSample) + return DSERR_INVALIDPARAM; + } + /* **** */ RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); EnterCriticalSection(&(device->mixlock)); @@ -394,6 +399,13 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe goto done; } + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(fmtex->Samples.wValidBitsPerSample == 0){ + TRACE("Correcting 0 valid bits per sample\n"); + fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; + } + } + DSOUND_PrimaryClose(device); err = DSOUND_ReopenDevice(device, FALSE); @@ -427,6 +439,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 32; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -434,6 +448,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 16; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -441,6 +457,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 8; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -449,6 +467,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = passed_fmt->wBitsPerSample; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -456,6 +476,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 32; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -463,6 +485,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 16; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; @@ -470,6 +494,8 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe device->pwfx->wBitsPerSample = 8; device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); + if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; err = DSOUND_ReopenDevice(device, FALSE); if(SUCCEEDED(err)) goto opened; diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 45dd00a..c68a5de 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1253,6 +1253,7 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) if (rc==DS_OK && primary!=NULL) { WAVEFORMATEX wfx; + WAVEFORMATEXTENSIBLE fmtex; wfx.wFormatTag = WAVE_FORMAT_PCM; wfx.nChannels = 0; @@ -1351,6 +1352,45 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) rc = IDirectSoundBuffer_SetFormat(primary, &wfx); ok(rc == S_OK, "SetFormat: %08x\n", rc); + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + fmtex.Format.nChannels = 2; + fmtex.Format.nSamplesPerSec = 44100; + fmtex.Format.wBitsPerSample = 16; + fmtex.Format.nBlockAlign = fmtex.Format.nChannels * fmtex.Format.wBitsPerSample / 8; + fmtex.Format.nAvgBytesPerSec = fmtex.Format.nSamplesPerSec * fmtex.Format.nBlockAlign; + fmtex.Samples.wValidBitsPerSample = 0; + fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + rc = IDirectSoundBuffer_SetFormat(primary, (WAVEFORMATEX*)&fmtex); + ok(rc == S_OK, "SetFormat: %08x\n", rc); + + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + fmtex.Format.nChannels = 2; + fmtex.Format.nSamplesPerSec = 44100; + fmtex.Format.wBitsPerSample = 24; + fmtex.Format.nBlockAlign = fmtex.Format.nChannels * fmtex.Format.wBitsPerSample / 8; + fmtex.Format.nAvgBytesPerSec = fmtex.Format.nSamplesPerSec * fmtex.Format.nBlockAlign; + fmtex.Samples.wValidBitsPerSample = 20; + fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + rc = IDirectSoundBuffer_SetFormat(primary, (WAVEFORMATEX*)&fmtex); + ok(rc == S_OK, "SetFormat: %08x\n", rc); + + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + fmtex.Format.nChannels = 2; + fmtex.Format.nSamplesPerSec = 44100; + fmtex.Format.wBitsPerSample = 24; + fmtex.Format.nBlockAlign = fmtex.Format.nChannels * fmtex.Format.wBitsPerSample / 8; + fmtex.Format.nAvgBytesPerSec = fmtex.Format.nSamplesPerSec * fmtex.Format.nBlockAlign; + fmtex.Samples.wValidBitsPerSample = 32; + fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; + fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + rc = IDirectSoundBuffer_SetFormat(primary, (WAVEFORMATEX*)&fmtex); + ok(rc == E_INVALIDARG, "SetFormat: %08x\n", rc); + IDirectSoundBuffer_Release(primary); }

1 0

Christian Costa : d3drm: Make IDirect3DRMMeshBuilderX stub return D3DRM_OK.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 5763eb16414798c912c500adc12c1455286e6df8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5763eb16414798c912c500adc… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 23:56:46 2012 +0200 d3drm: Make IDirect3DRMMeshBuilderX stub return D3DRM_OK. --- dlls/d3drm/meshbuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 398ce2c..db64917 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -460,7 +460,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Scale(IDirect3DRMMeshBuilder2* FIXME("(%p)->(%f,%f,%f): stub\n", This, sx, sy, sz); - return E_NOTIMPL; + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Translate(IDirect3DRMMeshBuilder2* iface,

1 0

Christian Costa : d3drm: Add support for frame with fake data in IDirect3DRMX:Load methods + tests.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: 4d53115cb99f7b5ab678068572770fc52d5e5e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d53115cb99f7b5ab67806857… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 23:56:54 2012 +0200 d3drm: Add support for frame with fake data in IDirect3DRMX:Load methods + tests. --- dlls/d3drm/d3drm.c | 15 ++++++++++++++- dlls/d3drm/tests/d3drm.c | 14 ++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index afd794e..c067c27 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1389,6 +1389,8 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc else if (IsEqualGUID(pGuid, &TID_D3DRMFrame)) { BOOL requested = FALSE; + HRESULT hr; + LPDIRECT3DRMFRAME3 frame; TRACE("Found TID_D3DRMFrame\n"); @@ -1400,7 +1402,18 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc if (requested) { - FIXME("Processing frame not supported yet\n"); + FIXME("Fake frame data and notify application\n"); + + hr = IDirect3DRM3_CreateFrame(iface, NULL, &frame); + if (SUCCEEDED(hr)) + { + LoadProc((LPDIRECT3DRMOBJECT)frame, &IID_IDirect3DRMFrame, ArgLP); + IDirect3DRMFrame3_Release(frame); + } + + if (FAILED(hr)) + ERR("Cannot process mesh\n"); + } } else if (IsEqualGUID(pGuid, &TID_D3DRMMaterial)) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8d18d3b..0a05dcd 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -153,6 +153,11 @@ static char data_d3drm_load[] = " 0.1; 0.2; 0.3;,\n" " 1;\n" " 3; 0, 1, 2;;\n" +"}\n" +"Frame Scene\n" +"{\n" +" {Object1}\n" +" {Object2}\n" "}\n"; static void test_MeshBuilder(void) @@ -604,7 +609,8 @@ static int nb_objects = 0; static const GUID* refiids[] = { &IID_IDirect3DRMMeshBuilder, - &IID_IDirect3DRMMeshBuilder + &IID_IDirect3DRMMeshBuilder, + &IID_IDirect3DRMFrame }; void __cdecl object_load_callback(LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg) @@ -620,16 +626,16 @@ static void test_d3drm_load(void) HRESULT hr; LPDIRECT3DRM pD3DRM; D3DRMLOADMEMORY info; - const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder }; + const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame }; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); info.lpMemory = data_d3drm_load; info.dSize = strlen(data_d3drm_load); - hr = IDirect3DRM_Load(pD3DRM, &info, NULL, (GUID**)req_refiids, 1, D3DRMLOAD_FROMMEMORY, object_load_callback, (LPVOID)0xdeadbeef, NULL, NULL, NULL); + hr = IDirect3DRM_Load(pD3DRM, &info, NULL, (GUID**)req_refiids, 2, D3DRMLOAD_FROMMEMORY, object_load_callback, (LPVOID)0xdeadbeef, NULL, NULL, NULL); ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr); - ok(nb_objects == 2, "Should have loaded 2 objects (got %d)\n", nb_objects); + ok(nb_objects == 3, "Should have loaded 3 objects (got %d)\n", nb_objects); IDirect3DRM_Release(pD3DRM); }

1 0

Christian Costa : d3drm: Implement CreateMesh method and stubbed IDirect3DRMMesh interface.
by Alexandre Julliard 02 Apr '12

02 Apr '12

Module: wine Branch: master Commit: bd484dca069f0ed997ed142f638194d003a975ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd484dca069f0ed997ed142f6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 30 00:50:33 2012 +0200 d3drm: Implement CreateMesh method and stubbed IDirect3DRMMesh interface. --- dlls/d3drm/meshbuilder.c | 398 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 394 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd484dca069f0ed997ed1…

1 0