mirror of
https://github.com/reactos/reactos.git
synced 2024-10-02 07:26:47 +00:00
[QEDIT] Sync with Wine Staging 1.9.16. CORE-11866
svn path=/trunk/; revision=72268
This commit is contained in:
parent
d6d93b75da
commit
ab2bcbbcb7
|
@ -77,8 +77,7 @@ static ULONG WINAPI Single_IEnumMediaTypes_Release(IEnumMediaTypes *iface)
|
||||||
TRACE("(%p) new ref = %u\n", This, refCount);
|
TRACE("(%p) new ref = %u\n", This, refCount);
|
||||||
if (refCount == 0)
|
if (refCount == 0)
|
||||||
{
|
{
|
||||||
if (This->mtype.pbFormat)
|
CoTaskMemFree(This->mtype.pbFormat);
|
||||||
CoTaskMemFree(This->mtype.pbFormat);
|
|
||||||
CoTaskMemFree(This);
|
CoTaskMemFree(This);
|
||||||
}
|
}
|
||||||
return refCount;
|
return refCount;
|
||||||
|
@ -264,10 +263,8 @@ static void SampleGrabber_cleanup(SG_Impl *This)
|
||||||
IMemInputPin_Release(This->memOutput);
|
IMemInputPin_Release(This->memOutput);
|
||||||
if (This->grabberIface)
|
if (This->grabberIface)
|
||||||
ISampleGrabberCB_Release(This->grabberIface);
|
ISampleGrabberCB_Release(This->grabberIface);
|
||||||
if (This->mtype.pbFormat)
|
CoTaskMemFree(This->mtype.pbFormat);
|
||||||
CoTaskMemFree(This->mtype.pbFormat);
|
CoTaskMemFree(This->bufferData);
|
||||||
if (This->bufferData)
|
|
||||||
CoTaskMemFree(This->bufferData);
|
|
||||||
if(This->seekthru_unk)
|
if(This->seekthru_unk)
|
||||||
IUnknown_Release(This->seekthru_unk);
|
IUnknown_Release(This->seekthru_unk);
|
||||||
}
|
}
|
||||||
|
@ -372,8 +369,7 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample)
|
||||||
size = 0;
|
size = 0;
|
||||||
EnterCriticalSection(&This->filter.csFilter);
|
EnterCriticalSection(&This->filter.csFilter);
|
||||||
if (This->bufferLen != size) {
|
if (This->bufferLen != size) {
|
||||||
if (This->bufferData)
|
CoTaskMemFree(This->bufferData);
|
||||||
CoTaskMemFree(This->bufferData);
|
|
||||||
This->bufferData = size ? CoTaskMemAlloc(size) : NULL;
|
This->bufferData = size ? CoTaskMemAlloc(size) : NULL;
|
||||||
This->bufferLen = size;
|
This->bufferLen = size;
|
||||||
}
|
}
|
||||||
|
@ -574,8 +570,7 @@ SampleGrabber_ISampleGrabber_SetMediaType(ISampleGrabber *iface, const AM_MEDIA_
|
||||||
debugstr_guid(&type->majortype), debugstr_guid(&type->subtype),
|
debugstr_guid(&type->majortype), debugstr_guid(&type->subtype),
|
||||||
type->lSampleSize,
|
type->lSampleSize,
|
||||||
debugstr_guid(&type->formattype), type->cbFormat);
|
debugstr_guid(&type->formattype), type->cbFormat);
|
||||||
if (This->mtype.pbFormat)
|
CoTaskMemFree(This->mtype.pbFormat);
|
||||||
CoTaskMemFree(This->mtype.pbFormat);
|
|
||||||
This->mtype = *type;
|
This->mtype = *type;
|
||||||
This->mtype.pUnk = NULL;
|
This->mtype.pUnk = NULL;
|
||||||
if (type->cbFormat) {
|
if (type->cbFormat) {
|
||||||
|
@ -924,8 +919,7 @@ SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_M
|
||||||
!IsEqualGUID(&This->sg->mtype.formattype,&FORMAT_None) &&
|
!IsEqualGUID(&This->sg->mtype.formattype,&FORMAT_None) &&
|
||||||
!IsEqualGUID(&This->sg->mtype.formattype,&type->formattype))
|
!IsEqualGUID(&This->sg->mtype.formattype,&type->formattype))
|
||||||
return VFW_E_TYPE_NOT_ACCEPTED;
|
return VFW_E_TYPE_NOT_ACCEPTED;
|
||||||
if (This->sg->mtype.pbFormat)
|
CoTaskMemFree(This->sg->mtype.pbFormat);
|
||||||
CoTaskMemFree(This->sg->mtype.pbFormat);
|
|
||||||
This->sg->mtype = *type;
|
This->sg->mtype = *type;
|
||||||
This->sg->mtype.pUnk = NULL;
|
This->sg->mtype.pUnk = NULL;
|
||||||
if (type->cbFormat) {
|
if (type->cbFormat) {
|
||||||
|
@ -1288,7 +1282,8 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv)
|
||||||
else
|
else
|
||||||
obj->outer_unk = &obj->IUnknown_inner;
|
obj->outer_unk = &obj->IUnknown_inner;
|
||||||
|
|
||||||
hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)obj, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&obj->seekthru_unk);
|
hr = CoCreateInstance(&CLSID_SeekingPassThru, &obj->IUnknown_inner, CLSCTX_INPROC_SERVER,
|
||||||
|
&IID_IUnknown, (void**)&obj->seekthru_unk);
|
||||||
if(hr)
|
if(hr)
|
||||||
return hr;
|
return hr;
|
||||||
IUnknown_QueryInterface(obj->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru);
|
IUnknown_QueryInterface(obj->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru);
|
||||||
|
|
|
@ -38,7 +38,7 @@ reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.16
|
||||||
reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29
|
reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29
|
||||||
reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.11
|
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/msdmo # Synced to WineStaging-1.9.11
|
||||||
reactos/dll/directx/wine/qedit # 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.11
|
reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.11
|
||||||
reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4
|
reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue