17 Nov
2016
17 Nov
'16
10:03 p.m.
Author: akhaldi
Date: Thu Nov 17 22:03:51 2016
New Revision: 73256
URL: http://svn.reactos.org/svn/reactos?rev=73256&view=rev
Log:
[QUARTZ] Sync with Wine Staging 1.9.23. CORE-12409
Modified:
trunk/reactos/dll/directx/wine/quartz/avisplit.c
trunk/reactos/dll/directx/wine/quartz/dsoundrender.c
trunk/reactos/dll/directx/wine/quartz/filesource.c
trunk/reactos/dll/directx/wine/quartz/filtergraph.c
trunk/reactos/dll/directx/wine/quartz/filtermapper.c
trunk/reactos/dll/directx/wine/quartz/main.c
trunk/reactos/dll/directx/wine/quartz/mpegsplit.c
trunk/reactos/dll/directx/wine/quartz/parser.c
trunk/reactos/dll/directx/wine/quartz/videorenderer.c
trunk/reactos/dll/directx/wine/quartz/vmr9.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/directx/wine/quartz/avisplit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] Thu Nov 17 22:03:51
2016
@@ -673,7 +673,7 @@
ZeroMemory(&amt, sizeof(amt));
piOutput.dir = PINDIR_OUTPUT;
- piOutput.pFilter = (IBaseFilter *)This;
+ piOutput.pFilter = &This->Parser.filter.IBaseFilter_iface;
wsprintfW(piOutput.achName, wszStreamTemplate, This->Parser.cStreams);
This->streams = CoTaskMemRealloc(This->streams, sizeof(StreamData) *
(This->Parser.cStreams+1));
stream = This->streams + This->Parser.cStreams;
Modified: trunk/reactos/dll/directx/wine/quartz/dsoundrender.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ds…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/dsoundrender.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/dsoundrender.c [iso-8859-1] Thu Nov 17
22:03:51 2016
@@ -649,7 +649,7 @@
if (!pDSoundRender->blocked || FAILED(hr))
{
- IUnknown_Release((IUnknown *)pDSoundRender);
+
IBaseFilter_Release(&pDSoundRender->renderer.filter.IBaseFilter_iface);
return HRESULT_FROM_WIN32(GetLastError());
}
@@ -788,7 +788,7 @@
LPVOID*ppvObj) {
DSoundRenderImpl *This = impl_from_IBasicAudio(iface);
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return DSoundRender_QueryInterface(&This->renderer.filter.IBaseFilter_iface,
riid, ppvObj);
}
@@ -982,7 +982,7 @@
{
DSoundRenderImpl *This = impl_from_IReferenceClock(iface);
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return DSoundRender_QueryInterface(&This->renderer.filter.IBaseFilter_iface,
riid, ppvObj);
}
@@ -1150,7 +1150,7 @@
{
DSoundRenderImpl *This = impl_from_IAMDirectSound(iface);
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return DSoundRender_QueryInterface(&This->renderer.filter.IBaseFilter_iface,
riid, ppvObj);
}
@@ -1263,17 +1263,17 @@
static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID
riid, void **ppv) {
DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface);
- return IUnknown_QueryInterface((IUnknown*)This, riid, ppv);
+ return IBaseFilter_QueryInterface(&This->renderer.filter.IBaseFilter_iface,
riid, ppv);
}
static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) {
DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface);
- return IUnknown_AddRef((IUnknown*)This);
+ return IBaseFilter_AddRef(&This->renderer.filter.IBaseFilter_iface);
}
static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) {
DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface);
- return IUnknown_Release((IUnknown*)This);
+ return IBaseFilter_Release(&This->renderer.filter.IBaseFilter_iface);
}
static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) {
Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] Thu Nov 17 22:03:51
2016
@@ -1419,17 +1419,17 @@
static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID
riid, void **ppv) {
AsyncReader *This = impl_from_IAMFilterMiscFlags(iface);
- return IUnknown_QueryInterface((IUnknown*)This, riid, ppv);
+ return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv);
}
static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) {
AsyncReader *This = impl_from_IAMFilterMiscFlags(iface);
- return IUnknown_AddRef((IUnknown*)This);
+ return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface);
}
static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) {
AsyncReader *This = impl_from_IAMFilterMiscFlags(iface);
- return IUnknown_Release((IUnknown*)This);
+ return IBaseFilter_Release(&This->filter.IBaseFilter_iface);
}
static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) {
Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] Thu Nov 17 22:03:51
2016
@@ -192,7 +192,7 @@
static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID riid, void
**ppvObj)
{
IFilterGraphImpl *This = impl_from_IUnknown(iface);
- TRACE("(%p)->(%s (%p), %p)\n", This, debugstr_guid(riid), riid, ppvObj);
+ TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObj);
if (IsEqualGUID(&IID_IUnknown, riid)) {
*ppvObj = &This->IUnknown_inner;
@@ -320,7 +320,7 @@
{
IFilterGraphImpl *This = impl_from_IFilterGraph2(iface);
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
}
@@ -668,14 +668,14 @@
if (FAILED(hr))
return hr;
- TRACE("Filter owning first pin => %p\n", PinInfo.pFilter);
+ TRACE("Filter owning ppinIn(%p) => %p\n", ppinIn, PinInfo.pFilter);
IBaseFilter_Release(PinInfo.pFilter);
hr = IPin_QueryPinInfo(ppinOut, &PinInfo);
if (FAILED(hr))
return hr;
- TRACE("Filter owning second pin => %p\n", PinInfo.pFilter);
+ TRACE("Filter owning ppinOut(%p) => %p\n", ppinOut,
PinInfo.pFilter);
IBaseFilter_Release(PinInfo.pFilter);
}
@@ -897,14 +897,14 @@
if (FAILED(hr))
return hr;
- TRACE("Filter owning first pin => %p\n", PinInfo.pFilter);
+ TRACE("Filter owning ppinIn(%p) => %p\n", ppinIn, PinInfo.pFilter);
IBaseFilter_Release(PinInfo.pFilter);
hr = IPin_QueryPinInfo(ppinOut, &PinInfo);
if (FAILED(hr))
return hr;
- TRACE("Filter owning second pin => %p\n", PinInfo.pFilter);
+ TRACE("Filter owning ppinOut(%p) => %p\n", ppinOut,
PinInfo.pFilter);
IBaseFilter_Release(PinInfo.pFilter);
}
@@ -924,6 +924,8 @@
if (dir == PINDIR_INPUT)
{
IPin *temp;
+
+ TRACE("Directions seem backwards, swapping pins\n");
temp = ppinIn;
ppinIn = ppinOut;
@@ -1819,7 +1821,7 @@
{
IFilterGraphImpl *This = impl_from_IMediaControl(iface);
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
}
@@ -1868,7 +1870,8 @@
{
IFilterGraphImpl *This = impl_from_IMediaControl(iface);
- TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface,
debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId);
+ TRACE("(%p/%p)->(%s, %p, %d, %d, %p): stub !!!\n", This, iface,
debugstr_guid(riid), rgszNames,
+ cNames, lcid, rgDispId);
return S_OK;
}
@@ -1879,7 +1882,8 @@
{
IFilterGraphImpl *This = impl_from_IMediaControl(iface);
- TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n",
This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams,
pVarResult, pExepInfo, puArgErr);
+ TRACE("(%p/%p)->(%d, %s, %d, %04x, %p, %p, %p, %p): stub !!!\n", This,
iface, dispIdMember,
+ debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo,
puArgErr);
return S_OK;
}
@@ -2215,7 +2219,7 @@
{
IFilterGraphImpl *This = impl_from_IMediaSeeking(iface);
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
}
@@ -2663,7 +2667,7 @@
{
IFilterGraphImpl *This = impl_from_IMediaPosition( iface );
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
}
@@ -2875,7 +2879,7 @@
{
IFilterGraphImpl *This = impl_from_IObjectWithSite( iface );
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
}
@@ -2987,7 +2991,7 @@
{
IFilterGraphImpl *This = impl_from_IBasicAudio(iface);
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
}
@@ -3059,7 +3063,8 @@
IBasicAudio* pBasicAudio;
HRESULT hr;
- TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p)\n", This, iface,
debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId);
+ TRACE("(%p/%p)->(%s, %p, %d, %d, %p)\n", This, iface,
debugstr_guid(riid), rgszNames, cNames,
+ lcid, rgDispId);
EnterCriticalSection(&This->cs);
@@ -3081,7 +3086,8 @@
IBasicAudio* pBasicAudio;
HRESULT hr;
- TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p)\n", This, iface,
dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo,
puArgErr);
+ TRACE("(%p/%p)->(%d, %s, %d, %04x, %p, %p, %p, %p)\n", This, iface,
dispIdMember,
+ debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo,
puArgErr);
EnterCriticalSection(&This->cs);
@@ -3200,7 +3206,7 @@
{
IFilterGraphImpl *This = impl_from_IBasicVideo2(iface);
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
}
@@ -3272,7 +3278,8 @@
IBasicVideo *pBasicVideo;
HRESULT hr;
- TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p)\n", This, iface,
debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId);
+ TRACE("(%p/%p)->(%s, %p, %d, %d, %p)\n", This, iface,
debugstr_guid(riid), rgszNames, cNames,
+ lcid, rgDispId);
EnterCriticalSection(&This->cs);
@@ -3294,7 +3301,8 @@
IBasicVideo *pBasicVideo;
HRESULT hr;
- TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p)\n", This, iface,
dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo,
puArgErr);
+ TRACE("(%p/%p)->(%d, %s, %d, %04x, %p, %p, %p, %p)\n", This, iface,
dispIdMember,
+ debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo,
puArgErr);
EnterCriticalSection(&This->cs);
@@ -4030,7 +4038,7 @@
{
IFilterGraphImpl *This = impl_from_IVideoWindow(iface);
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
}
@@ -4102,7 +4110,8 @@
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p)\n", This, iface,
debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId);
+ TRACE("(%p/%p)->(%s, %p, %d, %d, %p)\n", This, iface,
debugstr_guid(riid), rgszNames, cNames,
+ lcid, rgDispId);
EnterCriticalSection(&This->cs);
@@ -4124,7 +4133,8 @@
IVideoWindow *pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p)\n", This, iface,
dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo,
puArgErr);
+ TRACE("(%p/%p)->(%d, %s, %d, %04x, %p, %p, %p, %p)\n", This, iface,
dispIdMember,
+ debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo,
puArgErr);
EnterCriticalSection(&This->cs);
@@ -4987,7 +4997,7 @@
{
IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
}
@@ -5035,7 +5045,8 @@
{
IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
- TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface,
debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId);
+ TRACE("(%p/%p)->(%s, %p, %d, %d, %p): stub !!!\n", This, iface,
debugstr_guid(riid), rgszNames,
+ cNames, lcid, rgDispId);
return S_OK;
}
@@ -5046,7 +5057,8 @@
{
IFilterGraphImpl *This = impl_from_IMediaEventEx(iface);
- TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n",
This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams,
pVarResult, pExepInfo, puArgErr);
+ TRACE("(%p/%p)->(%d, %s, %d, %04x, %p, %p, %p, %p): stub !!!\n", This,
iface, dispIdMember,
+ debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo,
puArgErr);
return S_OK;
}
Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] Thu Nov 17
22:03:51 2016
@@ -1139,7 +1139,7 @@
REGFILTER* regfilters;
HRESULT hr;
- TRACE("(%p/%p)->(%p, %x, %s, %s, %s, %s, %s, %s, %s) stub!\n",
+ TRACE("(%p/%p)->(%p, %x, %s, %s, %s, %s, %s, %s, %s)\n",
This,
iface,
ppEnum,
Modified: trunk/reactos/dll/directx/wine/quartz/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ma…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/main.c [iso-8859-1] Thu Nov 17 22:03:51
2016
@@ -22,6 +22,8 @@
extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *)
DECLSPEC_HIDDEN;
extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN;
extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN;
+
+static LONG server_locks = 0;
/* For the moment, do nothing here. */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
@@ -136,6 +138,10 @@
{
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
FIXME("(%p)->(%d),stub!\n",This,dolock);
+ if(dolock)
+ InterlockedIncrement(&server_locks);
+ else
+ InterlockedDecrement(&server_locks);
return S_OK;
}
@@ -198,7 +204,9 @@
*/
HRESULT WINAPI DllCanUnloadNow(void)
{
- return QUARTZ_DllCanUnloadNow();
+ if(server_locks == 0 && QUARTZ_DllCanUnloadNow() == S_OK)
+ return S_OK;
+ return S_FALSE;
}
Modified: trunk/reactos/dll/directx/wine/quartz/mpegsplit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/mp…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] Thu Nov 17 22:03:51
2016
@@ -360,7 +360,7 @@
ZeroMemory(pamt, sizeof(*pamt));
ppiOutput->dir = PINDIR_OUTPUT;
- ppiOutput->pFilter = (IBaseFilter*)This;
+ ppiOutput->pFilter = &This->Parser.filter.IBaseFilter_iface;
wsprintfW(ppiOutput->achName, wszAudioStream);
pamt->formattype = FORMAT_WaveFormatEx;
Modified: trunk/reactos/dll/directx/wine/quartz/parser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pa…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] Thu Nov 17 22:03:51
2016
@@ -445,7 +445,7 @@
CopyMediaType(pin->pmt, amt);
pin->dwSamplesProcessed = 0;
- pin->pin.pin.pinInfo.pFilter = (LPVOID)This;
+ pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface;
pin->allocProps = *props;
This->cStreams++;
BaseFilterImpl_IncrementPinVersion(&This->filter);
Modified: trunk/reactos/dll/directx/wine/quartz/videorenderer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/videorenderer.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/videorenderer.c [iso-8859-1] Thu Nov 17
22:03:51 2016
@@ -771,7 +771,7 @@
{
VideoRendererImpl *This = impl_from_IBasicVideo(iface);
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
}
@@ -843,7 +843,7 @@
{
VideoRendererImpl *This = impl_from_IVideoWindow(iface);
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj);
}
Modified: trunk/reactos/dll/directx/wine/quartz/vmr9.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vm…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] Thu Nov 17 22:03:51
2016
@@ -928,7 +928,7 @@
{
struct quartz_vmr *This = impl_from_IVideoWindow(iface);
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return VMR9_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid,
ppvObj);
}
@@ -1006,7 +1006,7 @@
{
struct quartz_vmr *This = impl_from_IBasicVideo(iface);
- TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid),
riid, ppvObj);
+ TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return VMR9_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid,
ppvObj);
}
@@ -1238,7 +1238,7 @@
{
struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface);
- TRACE("(%p/%p)->(%p) stub\n", iface, This, mode);
+ TRACE("(%p/%p)->(%p)\n", iface, This, mode);
if (!mode) return E_POINTER;
if (This->mode)
@@ -1300,7 +1300,7 @@
else
info->guid.pGUID = NULL;
- CopyRect(&info->rcMonitor, &mi.rcMonitor);
+ info->rcMonitor = mi.rcMonitor;
info->hMon = hmon;
info->dwFlags = mi.dwFlags;
@@ -1317,7 +1317,7 @@
memset(info, 0, sizeof(*info));
info->uDevID = 0; /* FIXME */
- CopyRect(&info->rcMonitor, &mi.rcMonitor);
+ info->rcMonitor = mi.rcMonitor;
info->hMon = hmon;
info->dwFlags = mi.dwFlags;
@@ -1661,7 +1661,7 @@
{
struct quartz_vmr *This = impl_from_IVMRFilterConfig9(iface);
- TRACE("(%p/%p)->(%p) stub\n", iface, This, mode);
+ TRACE("(%p/%p)->(%p)\n", iface, This, mode);
if (!mode)
return E_POINTER;
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Nov 17 22:03:51 2016
@@ -39,7 +39,7 @@
reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.11
reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.11
reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.16
-reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.16
+reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.23
reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4
reactos/dll/win32/activeds # Synced to WineStaging-1.9.11