June 2019 - Wine-commits - list.winehq.org

Zebediah Figura : qcap/avimux: Store the source pin and AVI data inline in the AviMux structure.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 3c40ce0549ebdc45601ce3ad109424e1669ab653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c40ce0549ebdc45601ce3ad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 16 19:34:59 2019 -0500 qcap/avimux: Store the source pin and AVI data inline in the AviMux structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 193 +++++++++++++++++++++++++---------------------------- 1 file changed, 92 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c40ce0549ebdc45601c…

1 0

Zebediah Figura : quartz/filesource: Share pin and filter reference counts.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 5f08add0b32eb4d2386ce170f2dd3f3c98ff0ac0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f08add0b32eb4d2386ce170… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 16 19:35:00 2019 -0500 quartz/filesource: Share pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 112 ++++++++++++++++++++--------------------- dlls/quartz/tests/filesource.c | 6 --- 2 files changed, 55 insertions(+), 63 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 34601da..25bffe6 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -50,6 +50,37 @@ static const AM_MEDIA_TYPE default_mt = NULL }; +typedef struct DATAREQUEST +{ + IMediaSample *pSample; + DWORD_PTR dwUserData; + OVERLAPPED ovl; +} DATAREQUEST; + +typedef struct FileAsyncReader +{ + BaseOutputPin pin; + IAsyncReader IAsyncReader_iface; + + ALLOCATOR_PROPERTIES allocProps; + HANDLE hFile; + BOOL bFlushing; + /* Why would you need more? Every sample has its own handle */ + LONG queued_number; + LONG samples; + LONG oldest_sample; + CRITICAL_SECTION csList; + DATAREQUEST *sample_list; + + /* Have a handle for every sample, and then one more as flushing handle */ + HANDLE *handle_list; +} FileAsyncReader; + +static inline FileAsyncReader *impl_from_IPin(IPin *iface) +{ + return CONTAINING_RECORD(iface, FileAsyncReader, pin.pin.IPin_iface); +} + typedef struct AsyncReader { BaseFilter filter; @@ -407,14 +438,28 @@ static void async_reader_destroy(BaseFilter *iface) if (filter->pOutputPin) { + FileAsyncReader *pin = impl_from_IPin(filter->pOutputPin); + unsigned int i; IPin *peer; + if (SUCCEEDED(IPin_ConnectedTo(filter->pOutputPin, &peer))) { IPin_Disconnect(peer); IPin_Release(peer); } IPin_Disconnect(filter->pOutputPin); - IPin_Release(filter->pOutputPin); + + CoTaskMemFree(pin->sample_list); + if (pin->handle_list) + { + for (i = 0; i <= pin->samples; ++i) + CloseHandle(pin->handle_list[i]); + CoTaskMemFree(pin->handle_list); + } + CloseHandle(pin->hFile); + pin->csList.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&pin->csList); + BaseOutputPin_Destroy(&pin->pin); } CoTaskMemFree(filter->pszFileName); if (filter->pmt) @@ -658,39 +703,6 @@ static const IFileSourceFilterVtbl FileSource_Vtbl = FileSource_GetCurFile }; - -/* the dwUserData passed back to user */ -typedef struct DATAREQUEST -{ - IMediaSample * pSample; /* sample passed to us by user */ - DWORD_PTR dwUserData; /* user data passed to us */ - OVERLAPPED ovl; /* our overlapped structure */ -} DATAREQUEST; - -typedef struct FileAsyncReader -{ - BaseOutputPin pin; - IAsyncReader IAsyncReader_iface; - - ALLOCATOR_PROPERTIES allocProps; - HANDLE hFile; - BOOL bFlushing; - /* Why would you need more? Every sample has its own handle */ - LONG queued_number; - LONG samples; - LONG oldest_sample; - CRITICAL_SECTION csList; /* critical section to prevent concurrency issues */ - DATAREQUEST *sample_list; - - /* Have a handle for every sample, and then one more as flushing handle */ - HANDLE *handle_list; -} FileAsyncReader; - -static inline FileAsyncReader *impl_from_IPin(IPin *iface) -{ - return CONTAINING_RECORD(iface, FileAsyncReader, pin.pin.IPin_iface); -} - static inline FileAsyncReader *impl_from_BasePin(BasePin *iface) { return CONTAINING_RECORD(iface, FileAsyncReader, pin.pin); @@ -765,36 +777,22 @@ static HRESULT WINAPI FileAsyncReaderPin_QueryInterface(IPin * iface, REFIID rii return E_NOINTERFACE; } -static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) +static ULONG WINAPI FileAsyncReaderPin_AddRef(IPin *iface) { - FileAsyncReader *This = impl_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); - int x; - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); + FileAsyncReader *pin = impl_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); +} - if (!refCount) - { - CoTaskMemFree(This->sample_list); - if (This->handle_list) - { - for (x = 0; x <= This->samples; ++x) - CloseHandle(This->handle_list[x]); - CoTaskMemFree(This->handle_list); - } - CloseHandle(This->hFile); - This->csList.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->csList); - BaseOutputPin_Destroy(&This->pin); - return 0; - } - return refCount; +static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) +{ + FileAsyncReader *pin = impl_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); } static const IPinVtbl FileAsyncReaderPin_Vtbl = { FileAsyncReaderPin_QueryInterface, - BasePinImpl_AddRef, + FileAsyncReaderPin_AddRef, FileAsyncReaderPin_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 0bac51d..b1a8399 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -539,10 +539,8 @@ todo_wine hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -624,7 +622,6 @@ static void test_find_pin(void) hr = IBaseFilter_FindPin(filter, source_id, &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -662,7 +659,6 @@ static void test_pin_info(void) hr = IBaseFilter_FindPin(filter, source_id, &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -673,10 +669,8 @@ todo_wine ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); ok(!lstrcmpW(info.achName, source_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter);

1 0

Zebediah Figura : quartz/parser: Share sink pin and filter reference counts.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 5b612c3045f767a32488d7e151eca18b5bee7516 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b612c3045f767a32488d7e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 16 19:35:01 2019 -0500 quartz/parser: Share sink pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/parser.c | 13 ++---------- dlls/quartz/pin.c | 48 ++++++++++++++++++++++-------------------- dlls/quartz/pin.h | 4 +++- dlls/quartz/tests/avisplit.c | 3 --- dlls/quartz/tests/mpegsplit.c | 4 +--- dlls/quartz/tests/waveparser.c | 3 --- 6 files changed, 31 insertions(+), 44 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 2666eb7..7e705cc 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -155,7 +155,6 @@ ULONG WINAPI Parser_AddRef(IBaseFilter * iface) void Parser_Destroy(ParserImpl *This) { IPin *connected = NULL; - ULONG pinref; HRESULT hr; PullPin_WaitForStateChange(This->pInputPin, INFINITE); @@ -170,16 +169,8 @@ void Parser_Destroy(ParserImpl *This) hr = IPin_Disconnect(&This->pInputPin->pin.IPin_iface); assert(hr == S_OK); } - pinref = IPin_Release(&This->pInputPin->pin.IPin_iface); - if (pinref) - { - /* Valgrind could find this, if I kill it here */ - ERR("pinref should be null, is %u, destroying anyway\n", pinref); - assert((LONG)pinref > 0); - while (pinref) - pinref = IPin_Release(&This->pInputPin->pin.IPin_iface); - } + PullPin_destroy(This->pInputPin); CoTaskMemFree(This->ppPins); strmbase_filter_cleanup(&This->filter); @@ -734,7 +725,7 @@ static HRESULT WINAPI Parser_PullPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes static const IPinVtbl Parser_InputPin_Vtbl = { Parser_PullPin_QueryInterface, - BasePinImpl_AddRef, + PullPin_AddRef, PullPin_Release, BaseInputPinImpl_Connect, Parser_PullPin_ReceiveConnection, diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index a3674f2..5c1fcdc 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -364,32 +364,34 @@ HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) return E_NOINTERFACE; } -ULONG WINAPI PullPin_Release(IPin *iface) +void PullPin_destroy(PullPin *pin) { - PullPin *This = impl_PullPin_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.refCount); - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); + WaitForSingleObject(pin->hEventStateChanged, INFINITE); + assert(!pin->hThread); + + if (pin->prefAlloc) + IMemAllocator_Release(pin->prefAlloc); + if (pin->pAlloc) + IMemAllocator_Release(pin->pAlloc); + if (pin->pReader) + IAsyncReader_Release(pin->pReader); + CloseHandle(pin->thread_sleepy); + CloseHandle(pin->hEventStateChanged); + pin->thread_lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&pin->thread_lock); + CoTaskMemFree(pin); +} - if (!refCount) - { - WaitForSingleObject(This->hEventStateChanged, INFINITE); - assert(!This->hThread); +ULONG WINAPI PullPin_AddRef(IPin *iface) +{ + PullPin *pin = impl_PullPin_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); +} - if(This->prefAlloc) - IMemAllocator_Release(This->prefAlloc); - if(This->pAlloc) - IMemAllocator_Release(This->pAlloc); - if(This->pReader) - IAsyncReader_Release(This->pReader); - CloseHandle(This->thread_sleepy); - CloseHandle(This->hEventStateChanged); - This->thread_lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->thread_lock); - CoTaskMemFree(This); - return 0; - } - return refCount; +ULONG WINAPI PullPin_Release(IPin *iface) +{ + PullPin *pin = impl_PullPin_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pinInfo.pFilter); } static void PullPin_Flush(PullPin *This) diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index 2f29c92..b65d223 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -106,6 +106,7 @@ HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInf SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); +void PullPin_destroy(PullPin *pin) DECLSPEC_HIDDEN; /**************************/ /*** Pin Implementation ***/ @@ -114,7 +115,8 @@ HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInf HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI PullPin_Disconnect(IPin * iface); HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv); -ULONG WINAPI PullPin_Release(IPin * iface); +ULONG WINAPI PullPin_AddRef(IPin *iface) DECLSPEC_HIDDEN; +ULONG WINAPI PullPin_Release(IPin *iface) DECLSPEC_HIDDEN; HRESULT WINAPI PullPin_EndOfStream(IPin * iface); HRESULT WINAPI PullPin_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI PullPin_BeginFlush(IPin * iface); diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 59edb38..fb42783 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -296,10 +296,8 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -487,7 +485,6 @@ static void test_pin_info(void) ref = get_refcount(filter); ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); -todo_wine ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index c82c5b6..9853a19 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -293,10 +293,8 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -480,7 +478,7 @@ static void test_pin_info(void) ref = get_refcount(filter); ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); - todo_wine ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); + ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index fd65099..84288c4 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -293,10 +293,8 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -480,7 +478,6 @@ static void test_pin_info(void) ref = get_refcount(filter); ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); -todo_wine ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter);

1 0

Zebediah Figura : quartz/parser: Share source pin and filter reference counts.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 08473519e97cd18e94488d2ccf762e89b580b69e URL: https://source.winehq.org/git/wine.git/?a=commit;h=08473519e97cd18e94488d2c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 16 19:35:02 2019 -0500 quartz/parser: Share source pin and filter reference counts. Uniquely, native quartz doesn't do this. But it doesn't make much sense to follow native quartz in this case, and it leads to simpler code on our part. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/parser.c | 49 +++++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 7e705cc..5743a53 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -383,26 +383,27 @@ HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PR return hr; } -static HRESULT WINAPI break_connection(IPin *iface) +static void free_source_pin(IPin *iface) { Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(iface); - HRESULT hr; - if (!pin->pin.pin.pConnectedTo || !pin->pin.pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else + if (pin->pin.pin.pConnectedTo) { - hr = IPin_Disconnect(pin->pin.pin.pConnectedTo); + IPin_Disconnect(pin->pin.pin.pConnectedTo); IPin_Disconnect(iface); } - return hr; + FreeMediaType(pin->pmt); + CoTaskMemFree(pin->pmt); + FreeMediaType(&pin->pin.pin.mtCurrent); + if (pin->pin.pAllocator) + IMemAllocator_Release(pin->pin.pAllocator); + CoTaskMemFree(pin); } static HRESULT Parser_RemoveOutputPins(ParserImpl * This) { /* NOTE: should be in critical section when calling this function */ - HRESULT hr; ULONG i; IPin ** ppOldPins = This->ppPins; @@ -413,11 +414,7 @@ static HRESULT Parser_RemoveOutputPins(ParserImpl * This) memcpy(This->ppPins, ppOldPins, sizeof(IPin *) * 1); for (i = 0; i < This->cStreams; i++) - { - hr = break_connection(ppOldPins[i + 1]); - TRACE("Disconnect: %08x\n", hr); - IPin_Release(ppOldPins[i + 1]); - } + free_source_pin(ppOldPins[i + 1]); BaseFilterImpl_IncrementPinVersion(&This->filter); This->cStreams = 0; @@ -567,24 +564,16 @@ static HRESULT WINAPI Parser_OutputPin_QueryInterface(IPin * iface, REFIID riid, return E_NOINTERFACE; } -static ULONG WINAPI Parser_OutputPin_Release(IPin * iface) +static ULONG WINAPI Parser_OutputPin_AddRef(IPin *iface) { - Parser_OutputPin *This = unsafe_impl_Parser_OutputPin_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); - - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); + Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); +} - if (!refCount) - { - FreeMediaType(This->pmt); - CoTaskMemFree(This->pmt); - FreeMediaType(&This->pin.pin.mtCurrent); - if (This->pin.pAllocator) - IMemAllocator_Release(This->pin.pAllocator); - CoTaskMemFree(This); - return 0; - } - return refCount; +static ULONG WINAPI Parser_OutputPin_Release(IPin * iface) +{ + Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); } static HRESULT WINAPI Parser_OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) @@ -612,7 +601,7 @@ static HRESULT WINAPI Parser_OutputPin_CheckMediaType(BasePin *pin, const AM_MED static const IPinVtbl Parser_OutputPin_Vtbl = { Parser_OutputPin_QueryInterface, - BasePinImpl_AddRef, + Parser_OutputPin_AddRef, Parser_OutputPin_Release, Parser_OutputPin_Connect, BaseOutputPinImpl_ReceiveConnection,

1 0

Zebediah Figura : strmbase/transform: Share pin and filter reference counts.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 7f3d463b4578a33a983fbc693c7f429f608f0a09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f3d463b4578a33a983fbc69… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 16 19:35:03 2019 -0500 strmbase/transform: Share pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/acmwrapper.c | 10 +++------- dlls/quartz/tests/avidec.c | 10 +++------- dlls/strmbase/transform.c | 36 ++++++++++++++++++++++++++++++------ 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c index 1c41872..1f07e50 100644 --- a/dlls/quartz/tests/acmwrapper.c +++ b/dlls/quartz/tests/acmwrapper.c @@ -229,10 +229,8 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -243,10 +241,8 @@ todo_wine hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -383,7 +379,7 @@ static void test_pin_info(void) hr = IBaseFilter_FindPin(filter, sink_id, &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -394,9 +390,9 @@ static void test_pin_info(void) todo_wine ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 0183e0b..3f92876 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -254,10 +254,8 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -268,10 +266,8 @@ todo_wine hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -408,7 +404,7 @@ static void test_pin_info(void) hr = IBaseFilter_FindPin(filter, sink_id, &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -418,9 +414,9 @@ static void test_pin_info(void) ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); todo_wine ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index fe54ebe..4c32d67 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -153,9 +153,11 @@ static void transform_destroy(BaseFilter *iface) IPin_Release(peer); } IPin_Disconnect(filter->ppPins[i]); - IPin_Release(filter->ppPins[i]); } + BaseInputPin_Destroy(impl_BaseInputPin_from_IPin(filter->ppPins[0])); + BaseOutputPin_Destroy(impl_BaseOutputPin_from_IPin(filter->ppPins[1])); + CoTaskMemFree(filter->ppPins); filter->csReceive.DebugInfo->Spare[0] = 0; @@ -379,7 +381,17 @@ HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *s return QualityControlImpl_Notify((IQualityControl*)iface->qcimpl, sender, qm); } -/** IBaseFilter implementation **/ +static ULONG WINAPI TransformFilter_InputPin_AddRef(IPin *iface) +{ + BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); +} + +static ULONG WINAPI TransformFilter_InputPin_Release(IPin *iface) +{ + BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pinInfo.pFilter); +} static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { @@ -504,8 +516,8 @@ static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENC static const IPinVtbl TransformFilter_InputPin_Vtbl = { BaseInputPinImpl_QueryInterface, - BasePinImpl_AddRef, - BaseInputPinImpl_Release, + TransformFilter_InputPin_AddRef, + TransformFilter_InputPin_Release, BaseInputPinImpl_Connect, TransformFilter_InputPin_ReceiveConnection, TransformFilter_InputPin_Disconnect, @@ -543,11 +555,23 @@ static HRESULT WINAPI transform_source_QueryInterface(IPin *iface, REFIID iid, v return S_OK; } +static ULONG WINAPI transform_source_AddRef(IPin *iface) +{ + BaseOutputPin *pin = impl_BaseOutputPin_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); +} + +static ULONG WINAPI transform_source_Release(IPin *iface) +{ + BaseOutputPin *pin = impl_BaseOutputPin_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pinInfo.pFilter); +} + static const IPinVtbl TransformFilter_OutputPin_Vtbl = { transform_source_QueryInterface, - BasePinImpl_AddRef, - BaseOutputPinImpl_Release, + transform_source_AddRef, + transform_source_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect,

1 0

Alexandre Julliard : winebuild: Add a -munix option.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 5061261c5ebbfea147b418da7de97621d7c79c44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5061261c5ebbfea147b418da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:24:25 2019 +0200 winebuild: Add a -munix option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 2 ++ tools/winebuild/winebuild.man.in | 4 ++++ tools/winegcc/winegcc.c | 1 + 4 files changed, 8 insertions(+) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 241fd60..382829c 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -358,6 +358,7 @@ extern int verbose; extern int link_ext_symbols; extern int force_pointer_size; extern int unwind_tables; +extern int unix_lib; extern char *input_file_name; extern char *spec_file_name; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 831db5d..d308716 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -46,6 +46,7 @@ int verbose = 0; int link_ext_symbols = 0; int force_pointer_size = 0; int unwind_tables = 0; +int unix_lib = 0; #ifdef __i386__ enum target_cpu target_cpu = CPU_x86; @@ -411,6 +412,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "64" )) force_pointer_size = 8; else if (!strcmp( optarg, "arm" )) thumb_mode = 0; else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; + else if (!strcmp( optarg, "unix" )) unix_lib = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 461bff6..e9386f9 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -160,6 +160,10 @@ Generate respectively 16-bit, 32-bit or 64-bit code. .BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfpu= option ,\ \-mfloat-abi= option Set code generation options for the assembler. .TP +.B \-munix +Build a library that imports standard functions from the Unix C +library instead of the Windows runtime. +.TP .BI \-M,\ --main-module= module When building a 16-bit dll, set the name of its 32-bit counterpart to \fImodule\fR. This is used to enforce that the load order for the diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 242df38..32df2bf 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -845,6 +845,7 @@ static strarray *get_winebuild_args(struct options *opts) strarray_add( spec_args, "--target" ); strarray_add( spec_args, opts->target ); } + if (!opts->use_msvcrt) strarray_add( spec_args, "-munix" ); if (opts->unwind_tables) strarray_add( spec_args, "-fasynchronous-unwind-tables" ); else strarray_add( spec_args, "-fno-asynchronous-unwind-tables" ); return spec_args;

1 0

Alexandre Julliard : winebuild: Don' t import standard C functions in Unix mode.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 450f0fa6967f35a888d24c9ad37585f4e4134a1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=450f0fa6967f35a888d24c9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:24:45 2019 +0200 winebuild: Don't import standard C functions in Unix mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 ++ tools/winebuild/import.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 382829c..ad6e2a8 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -38,6 +38,8 @@ #define min(a,b) (((a) < (b)) ? (a) : (b)) #endif +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + typedef enum { TYPE_VARIABLE, /* variable */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 6c68dbd..7cf0655 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -38,6 +38,93 @@ #include "wine/list.h" #include "build.h" +/* standard C functions that are also exported from ntdll */ +static const char *stdc_names[] = +{ + "abs", + "atan", + "atoi", + "atol", + "bsearch", + "ceil", + "cos", + "fabs", + "floor", + "isalnum", + "isalpha", + "iscntrl", + "isdigit", + "isgraph", + "islower", + "isprint", + "ispunct", + "isspace", + "isupper", + "iswalpha", + "iswctype", + "iswdigit", + "iswlower", + "iswspace", + "iswxdigit", + "isxdigit", + "labs", + "log", + "mbstowcs", + "memchr", + "memcmp", + "memcpy", + "memmove", + "memset", + "pow", + "qsort", + "sin", + "sprintf", + "sqrt", + "sscanf", + "strcat", + "strchr", + "strcmp", + "strcpy", + "strcspn", + "strlen", + "strncat", + "strncmp", + "strncpy", + "strnlen", + "strpbrk", + "strrchr", + "strspn", + "strstr", + "strtol", + "strtoul", + "swprintf", + "tan", + "tolower", + "toupper", + "towlower", + "towupper", + "vsprintf", + "wcscat", + "wcschr", + "wcscmp", + "wcscpy", + "wcscspn", + "wcslen", + "wcsncat", + "wcsncmp", + "wcsncpy", + "wcspbrk", + "wcsrchr", + "wcsspn", + "wcsstr", + "wcstok", + "wcstol", + "wcstombs", + "wcstoul" +}; + +static struct strarray stdc_functions = { stdc_names, ARRAY_SIZE(stdc_names), ARRAY_SIZE(stdc_names) }; + struct import_func { const char *name; @@ -566,7 +653,8 @@ void read_undef_symbols( DLLSPEC *spec, char **argv ) add_undef_import( p + strlen( import_func_prefix ), 0 ); else if (!strncmp( p, import_ord_prefix, strlen(import_ord_prefix) )) add_undef_import( p + strlen( import_ord_prefix ), 1 ); - else strarray_add( &undef_symbols, xstrdup( p ), NULL ); + else if (!unix_lib || !find_name( p, &stdc_functions )) + strarray_add( &undef_symbols, xstrdup( p ), NULL ); } if ((err = pclose( f ))) warning( "%s failed with status %d\n", cmd, err ); free( cmd );

1 0

Alexandre Julliard : ntoskrnl: Make the standard C functions available for importing.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 7cee5e2bdce49f9daedd0cb159828f334ebe4ec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cee5e2bdce49f9daedd0cb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:25:06 2019 +0200 ntoskrnl: Make the standard C functions available for importing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 170 ++++++++++++++++++------------------ dlls/ntoskrnl.exe/tests/driver.c | 37 ++------ 2 files changed, 92 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7cee5e2bdce49f9daedd…

1 0

Alexandre Julliard : ninput: Build with msvcrt.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: aca0e819d9316218e339c072881462cd2b328c2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aca0e819d9316218e339c072… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:25:34 2019 +0200 ninput: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ninput/Makefile.in | 2 ++ dlls/ninput/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ninput/Makefile.in b/dlls/ninput/Makefile.in index 8f1039b..2afd034 100644 --- a/dlls/ninput/Makefile.in +++ b/dlls/ninput/Makefile.in @@ -1,5 +1,7 @@ MODULE = ninput.dll IMPORTLIB = ninput +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c index 5d2be62..8635ffb 100644 --- a/dlls/ninput/main.c +++ b/dlls/ninput/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : normaliz: Build with msvcrt.
by Alexandre Julliard 17 Jun '19

17 Jun '19

Module: wine Branch: master Commit: 1f13221498e7b5efbcae9bfdd0bc70944245aa02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f13221498e7b5efbcae9bfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:25:44 2019 +0200 normaliz: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/normaliz/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/normaliz/Makefile.in b/dlls/normaliz/Makefile.in index f5af896..444c168 100644 --- a/dlls/normaliz/Makefile.in +++ b/dlls/normaliz/Makefile.in @@ -1,5 +1,7 @@ MODULE = normaliz.dll IMPORTLIB = normaliz +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ normaliz.c

1 0