diff --git a/reactos/dll/directx/wine/quartz/filesource.c b/reactos/dll/directx/wine/quartz/filesource.c index b4ed99c8d44..3e7a473d35c 100644 --- a/reactos/dll/directx/wine/quartz/filesource.c +++ b/reactos/dll/directx/wine/quartz/filesource.c @@ -521,7 +521,7 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart { AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("(%x%08x)\n", (ULONG)(tStart >> 32), (ULONG)tStart); + TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); This->filter.state = State_Running; diff --git a/reactos/dll/directx/wine/quartz/filtergraph.c b/reactos/dll/directx/wine/quartz/filtergraph.c index 5ff7be3e393..c3b807e50f5 100644 --- a/reactos/dll/directx/wine/quartz/filtergraph.c +++ b/reactos/dll/directx/wine/quartz/filtergraph.c @@ -708,6 +708,9 @@ static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, IPin *ppin) IPin_QueryDirection(ppin, &pindir); hr = IPin_ConnectedTo(ppin, &pConnectedTo); + + TRACE("(%p/%p)->(%p) -- %p\n", This, iface, ppin, pConnectedTo); + if (FAILED(hr)) { TRACE("Querying connected to failed: %x\n", hr); return hr; @@ -721,7 +724,7 @@ static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, IPin *ppin) IPin_Release(pConnectedTo); if (FAILED(hr)) WARN("Reconnecting pins failed, pins are not connected now..\n"); - TRACE("(%p->%p) -- %p %p -> %x\n", iface, This, ppin, pConnectedTo, hr); + TRACE("-> %08x\n", hr); return hr; } @@ -744,7 +747,7 @@ static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface) HRESULT hr = S_OK; int i; - TRACE("(%p/%p)->() live sources not handled properly!\n", iface, This); + TRACE("(%p/%p)->() live sources not handled properly!\n", This, iface); EnterCriticalSection(&This->cs); @@ -2354,7 +2357,7 @@ static HRESULT WINAPI MediaSeeking_IsFormatSupported(IMediaSeeking *iface, const if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, pFormat)) { - FIXME("Unhandled time format %s\n", debugstr_guid(pFormat)); + WARN("Unhandled time format %s\n", debugstr_guid(pFormat)); return S_FALSE; } @@ -5278,8 +5281,7 @@ static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME tStart IFilterGraphImpl *This = impl_from_IMediaFilter(iface); if (tStart) - FIXME("Run called with non-null tStart: %x%08x\n", - (int)(tStart>>32), (int)tStart); + FIXME("Run called with non-null tStart: %s\n", wine_dbgstr_longlong(tStart)); return MediaControl_Run(&This->IMediaControl_iface); } @@ -5298,7 +5300,7 @@ static HRESULT WINAPI MediaFilter_SetSyncSource(IMediaFilter *iface, IReferenceC HRESULT hr = S_OK; int i; - TRACE("(%p/%p)->(%p)\n", iface, This, pClock); + TRACE("(%p/%p)->(%p)\n", This, iface, pClock); EnterCriticalSection(&This->cs); { @@ -5346,7 +5348,7 @@ static HRESULT WINAPI MediaFilter_GetSyncSource(IMediaFilter *iface, IReferenceC { IFilterGraphImpl *This = impl_from_IMediaFilter(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, ppClock); + TRACE("(%p/%p)->(%p)\n", This, iface, ppClock); if (!ppClock) return E_POINTER; diff --git a/reactos/dll/directx/wine/quartz/mpegsplit.c b/reactos/dll/directx/wine/quartz/mpegsplit.c index 53dbd0eecc0..8d108f5382a 100644 --- a/reactos/dll/directx/wine/quartz/mpegsplit.c +++ b/reactos/dll/directx/wine/quartz/mpegsplit.c @@ -353,6 +353,7 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade int freq_index; int mode_ext; int emphasis; + int padding; int lsf = 1; int mpeg1; int layer; @@ -377,6 +378,7 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade layer = 4-((header[1]>>1)&0x3); bitrate_index = ((header[2]>>4)&0xf); + padding = ((header[2]>>1)&0x1); freq_index = ((header[2]>>2)&0x3) + (mpeg1?(lsf*3):6); mode = ((header[3]>>6)&0x3); mode_ext = ((header[3]>>4)&0x3); @@ -405,12 +407,12 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade if (layer == 3) format->nBlockAlign = format->nAvgBytesPerSec * 8 * 144 / - (format->nSamplesPerSec<nSamplesPerSec<nBlockAlign = format->nAvgBytesPerSec * 8 * 144 / - format->nSamplesPerSec + 1; + format->nSamplesPerSec + padding; else - format->nBlockAlign = 4 * (format->nAvgBytesPerSec * 8 * 12 / format->nSamplesPerSec + 1); + format->nBlockAlign = 4 * (format->nAvgBytesPerSec * 8 * 12 / format->nSamplesPerSec + padding); format->wBitsPerSample = 0; diff --git a/reactos/dll/directx/wine/quartz/vmr9.c b/reactos/dll/directx/wine/quartz/vmr9.c index ca30629991b..ab2a975e6aa 100644 --- a/reactos/dll/directx/wine/quartz/vmr9.c +++ b/reactos/dll/directx/wine/quartz/vmr9.c @@ -242,9 +242,9 @@ static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo * lock.pBits = (char *)lock.pBits + (height * lock.Pitch); while (height--) { + lock.pBits = (char *)lock.pBits - lock.Pitch; memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8); data = data + width * bmiHeader->biBitCount / 8; - lock.pBits = (char *)lock.pBits - lock.Pitch; } } else if (lock.Pitch != width * bmiHeader->biBitCount / 8) @@ -3010,7 +3010,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocatorEx9 TRACE("(%p/%p)->(...)\n", iface, This); - /* No AddRef taken here or the base VMR9 filter would never be destroied */ + /* No AddRef taken here or the base VMR9 filter would never be destroyed */ This->SurfaceAllocatorNotify = allocnotify; return S_OK; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 507ff9cf1f5..d5d2b13129b 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -39,7 +39,7 @@ reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/quartz # Synced to WineStaging-2.2 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4 reactos/dll/win32/activeds # Synced to WineStaging-1.9.11