reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-24 04:10:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

quartz: Create and hold onto a preferred allocator for IAsyncReader::RequestAllocator.

Browse Source
This commit is contained in:
Erich Hoover 2011-05-14 11:44:59 -06:00 committed by Alexandre Julliard
parent 493a3a0f9d
commit 068593b238
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/quartz/pin.c
View File

@ -283,6 +283,7 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const
This->pReader = NULL; This->pReader = NULL;
This->pAlloc = NULL; This->pAlloc = NULL;
This->prefAlloc = NULL;
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
hr = IPin_QueryInterface(pReceivePin, &IID_IAsyncReader, (LPVOID *)&This->pReader); hr = IPin_QueryInterface(pReceivePin, &IID_IAsyncReader, (LPVOID *)&This->pReader);
@ -293,9 +294,19 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const
hr = This->fnPreConnect(iface, pReceivePin, &props); hr = This->fnPreConnect(iface, pReceivePin, &props);
} }
/*
* Some custom filters (such as the one used by Fallout 3
* and Fallout: New Vegas) expect to be passed a non-NULL
* preferred allocator.
*/
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
hr = IAsyncReader_RequestAllocator(This->pReader, NULL, &props, &This->pAlloc); hr = StdMemAllocator_create(NULL, (LPVOID *) &This->prefAlloc);
}
if (SUCCEEDED(hr))
{
hr = IAsyncReader_RequestAllocator(This->pReader, This->prefAlloc, &props, &This->pAlloc);
} }
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
@ -314,6 +325,9 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const
if (This->pReader) if (This->pReader)
IAsyncReader_Release(This->pReader); IAsyncReader_Release(This->pReader);
This->pReader = NULL; This->pReader = NULL;
if (This->prefAlloc)
IMemAllocator_Release(This->prefAlloc);
This->prefAlloc = NULL;
if (This->pAlloc) if (This->pAlloc)
IMemAllocator_Release(This->pAlloc); IMemAllocator_Release(This->pAlloc);
This->pAlloc = NULL; This->pAlloc = NULL;
@ -366,6 +380,8 @@ ULONG WINAPI PullPin_Release(IPin *iface)
WaitForSingleObject(This->hEventStateChanged, INFINITE); WaitForSingleObject(This->hEventStateChanged, INFINITE);
assert(!This->hThread); assert(!This->hThread);
if(This->prefAlloc)
IMemAllocator_Release(This->prefAlloc);
if(This->pAlloc) if(This->pAlloc)
IMemAllocator_Release(This->pAlloc); IMemAllocator_Release(This->pAlloc);
if(This->pReader) if(This->pReader)

1
dlls/quartz/pin.h
View File

@ -73,6 +73,7 @@ typedef struct PullPin
REFERENCE_TIME rtStart, rtCurrent, rtNext, rtStop; REFERENCE_TIME rtStart, rtCurrent, rtNext, rtStop;
IAsyncReader * pReader; IAsyncReader * pReader;
IMemAllocator * prefAlloc;
IMemAllocator * pAlloc; IMemAllocator * pAlloc;
QUERYACCEPTPROC fnQueryAccept; QUERYACCEPTPROC fnQueryAccept;
SAMPLEPROC_PULL fnSampleProc; SAMPLEPROC_PULL fnSampleProc;