wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Alexandre Julliard : bluetoothapis: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 113983d23dedb6ba7415e0dea00144c619701a31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=113983d23dedb6ba7415e0de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:36:39 2019 +0200 bluetoothapis: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bluetoothapis/Makefile.in | 2 ++ dlls/bluetoothapis/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/bluetoothapis/Makefile.in b/dlls/bluetoothapis/Makefile.in index 5050cff..d73ca87 100644 --- a/dlls/bluetoothapis/Makefile.in +++ b/dlls/bluetoothapis/Makefile.in @@ -1,4 +1,6 @@ MODULE = bluetoothapis.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/bluetoothapis/main.c b/dlls/bluetoothapis/main.c index 2ff8f67..b035248 100644 --- a/dlls/bluetoothapis/main.c +++ b/dlls/bluetoothapis/main.c @@ -18,8 +18,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 : avrt: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 18b2228d0eb2225e901bda77e094e0c317491bc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18b2228d0eb2225e901bda77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:36:12 2019 +0200 avrt: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avrt/Makefile.in | 2 ++ dlls/avrt/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avrt/Makefile.in b/dlls/avrt/Makefile.in index 52873fd..49f5b29 100644 --- a/dlls/avrt/Makefile.in +++ b/dlls/avrt/Makefile.in @@ -2,5 +2,7 @@ MODULE = avrt.dll IMPORTLIB = avrt IMPORTS = user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index 7ef2824..eb5704c 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -17,8 +17,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 : avifile: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 1381cad9270a22e4fc0ef28c7da659d620970dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=1381cad9270a22e4fc0ef28c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:36:06 2019 +0200 avifile: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifile.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avifile.dll16/Makefile.in b/dlls/avifile.dll16/Makefile.in index 4152c2f..83407c9 100644 --- a/dlls/avifile.dll16/Makefile.in +++ b/dlls/avifile.dll16/Makefile.in @@ -1,6 +1,6 @@ MODULE = avifile.dll16 IMPORTS = avifil32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,avifil32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,avifil32.dll C_SRCS = \ main.c

1 0

Alexandre Julliard : avifil32: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: cdf1e763bf75efc400136d34455e8125f843da7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf1e763bf75efc400136d34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:35:57 2019 +0200 avifil32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/Makefile.in | 2 ++ dlls/avifil32/api.c | 3 +-- dlls/avifil32/avifile.c | 3 +-- dlls/avifil32/wavfile.c | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index 4030514..630aa88 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in @@ -2,6 +2,8 @@ MODULE = avifil32.dll IMPORTLIB = avifil32 IMPORTS = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ acmstream.c \ api.c \ diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 37fa941..a7f84ba 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -38,7 +38,6 @@ #include "avifile_private.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(avifile); @@ -155,7 +154,7 @@ static BOOL AVIFILE_GetFileHandlerByExtension(LPCWSTR szFile, LPCLSID lpclsid) { CHAR szRegKey[25]; CHAR szValue[100]; - LPWSTR szExt = strrchrW(szFile, '.'); + LPWSTR szExt = wcsrchr(szFile, '.'); LONG len = ARRAY_SIZE(szValue); if (szExt == NULL) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 33c28b1..f3cf484 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -46,7 +46,6 @@ #include "avifile_private.h" #include "extrachunk.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(avifile); @@ -625,7 +624,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, LPOLESTR *p if (*ppszFileName == NULL) return AVIERR_MEMORY; - strcpyW(*ppszFileName, This->szFileName); + lstrcpyW(*ppszFileName, This->szFileName); } return AVIERR_OK; diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 6294ecd..8581a51 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -33,7 +33,6 @@ #include "avifile_private.h" #include "extrachunk.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(avifile); @@ -575,7 +574,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, LPOLESTR *p if (*ppszFileName == NULL) return AVIERR_MEMORY; - strcpyW(*ppszFileName, This->szFileName); + lstrcpyW(*ppszFileName, This->szFileName); } return AVIERR_OK;

1 0

Alexandre Julliard : authz: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: bc27abc14c49957652d6629cac28d7b68f6ac527 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc27abc14c49957652d6629c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:35:45 2019 +0200 authz: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/authz/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/authz/Makefile.in b/dlls/authz/Makefile.in index 129e2a3..91a0704 100644 --- a/dlls/authz/Makefile.in +++ b/dlls/authz/Makefile.in @@ -1,4 +1,6 @@ MODULE = authz.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ authz.c

1 0

Alexandre Julliard : atmlib: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 5c5d84e02822a53527244c90f6d08191cf9a8ee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c5d84e02822a53527244c90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:35:25 2019 +0200 atmlib: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atmlib/Makefile.in | 2 ++ dlls/atmlib/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/atmlib/Makefile.in b/dlls/atmlib/Makefile.in index 904cbbb..f8bd675 100644 --- a/dlls/atmlib/Makefile.in +++ b/dlls/atmlib/Makefile.in @@ -1,4 +1,6 @@ MODULE = atmlib.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/atmlib/main.c b/dlls/atmlib/main.c index efae51f..4baeb9d 100644 --- a/dlls/atmlib/main.c +++ b/dlls/atmlib/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

Zebediah Figura : quartz/avisplit: Use BaseFilterImpl_Release().
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: af34a88673d37078ce80c48eb84e7cccb271df70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af34a88673d37078ce80c48e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 23:09:59 2019 -0500 quartz/avisplit: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index e6f7c2f..f77efa3 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1266,24 +1266,6 @@ static HRESULT AVISplitter_Disconnect(LPVOID iface) return S_OK; } -static ULONG WINAPI AVISplitter_Release(IBaseFilter *iface) -{ - AVISplitterImpl *This = impl_from_IBaseFilter(iface); - ULONG ref; - - ref = InterlockedDecrement(&This->Parser.filter.refCount); - - TRACE("(%p)->() Release from %d\n", This, ref + 1); - - if (!ref) - { - AVISplitter_Flush(This); - Parser_Destroy(&This->Parser); - } - - return ref; -} - static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface) { AVISplitterImpl *This = impl_from_IMediaSeeking(iface); @@ -1414,7 +1396,7 @@ static const IBaseFilterVtbl AVISplitterImpl_Vtbl = { Parser_QueryInterface, Parser_AddRef, - AVISplitter_Release, + BaseFilterImpl_Release, Parser_GetClassID, Parser_Stop, Parser_Pause, @@ -1429,9 +1411,17 @@ static const IBaseFilterVtbl AVISplitterImpl_Vtbl = Parser_QueryVendorInfo }; +static void avi_splitter_destroy(BaseFilter *iface) +{ + AVISplitterImpl *filter = impl_from_IBaseFilter(&iface->IBaseFilter_iface); + AVISplitter_Flush(filter); + Parser_Destroy(&filter->Parser); +} + static const BaseFilterFuncTable avi_splitter_func_table = { .filter_get_pin = parser_get_pin, + .filter_destroy = avi_splitter_destroy, }; HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv)

1 0

Zebediah Figura : quartz/parser: Pass a BaseFilterFuncTable to Parser_Create().
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: b883b69e770151cc114bda8af4f7ede1e656036b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b883b69e770151cc114bda8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 23:09:58 2019 -0500 quartz/parser: Pass a BaseFilterFuncTable to Parser_Create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 7 ++++++- dlls/quartz/mpegsplit.c | 7 ++++++- dlls/quartz/parser.c | 12 ++++-------- dlls/quartz/parser.h | 6 ++++-- dlls/quartz/waveparser.c | 7 ++++++- 5 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index a422f45..e6f7c2f 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1429,6 +1429,11 @@ static const IBaseFilterVtbl AVISplitterImpl_Vtbl = Parser_QueryVendorInfo }; +static const BaseFilterFuncTable avi_splitter_func_table = +{ + .filter_get_pin = parser_get_pin, +}; + HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -1449,7 +1454,7 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) This->oldindex = NULL; hr = Parser_Create(&This->Parser, &AVISplitterImpl_Vtbl, &CLSID_AviSplitter, - sink_name, AVISplitter_Sample, AVISplitter_QueryAccept, + &avi_splitter_func_table, sink_name, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, AVISplitter_Flush, AVISplitter_Disconnect, AVISplitter_first_request, AVISplitter_done_process, NULL, AVISplitter_seek, NULL); diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index c4cf93b..24e61fe 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -868,6 +868,11 @@ static const IAMStreamSelectVtbl AMStreamSelectVtbl = AMStreamSelect_Enable }; +static const BaseFilterFuncTable mpeg_splitter_func_table = +{ + .filter_get_pin = parser_get_pin, +}; + HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { static const WCHAR sink_name[] = {'I','n','p','u','t',0}; @@ -887,7 +892,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) ZeroMemory(This, sizeof(MPEGSplitterImpl)); hr = Parser_Create(&This->Parser, &MPEGSplitter_Vtbl, &CLSID_MPEG1Splitter, - sink_name, MPEGSplitter_process_sample, MPEGSplitter_query_accept, + &mpeg_splitter_func_table, sink_name, MPEGSplitter_process_sample, MPEGSplitter_query_accept, MPEGSplitter_pre_connect, MPEGSplitter_cleanup, MPEGSplitter_disconnect, MPEGSplitter_first_request, NULL, NULL, MPEGSplitter_seek, NULL); if (FAILED(hr)) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index fdefa3d..433502c 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -62,7 +62,7 @@ static inline ParserImpl *impl_from_BaseFilter( BaseFilter *iface ) return CONTAINING_RECORD(iface, ParserImpl, filter); } -static IPin *parser_get_pin(BaseFilter *iface, unsigned int index) +IPin *parser_get_pin(BaseFilter *iface, unsigned int index) { ParserImpl *filter = impl_from_BaseFilter(iface); @@ -73,13 +73,9 @@ static IPin *parser_get_pin(BaseFilter *iface, unsigned int index) return filter->ppPins[index]; } -static const BaseFilterFuncTable BaseFuncTable = { - .filter_get_pin = parser_get_pin, -}; - HRESULT Parser_Create(ParserImpl *pParser, const IBaseFilterVtbl *Parser_Vtbl, - const CLSID* pClsid, const WCHAR *sink_name, PFN_PROCESS_SAMPLE fnProcessSample, - PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect, + const CLSID *pClsid, const BaseFilterFuncTable *func_table, const WCHAR *sink_name, + PFN_PROCESS_SAMPLE fnProcessSample, PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect, PFN_CLEANUP fnCleanup, PFN_DISCONNECT fnDisconnect, REQUESTPROC fnRequest, STOPPROCESSPROC fnDone, SourceSeeking_ChangeStop stop, SourceSeeking_ChangeStart start, SourceSeeking_ChangeRate rate) @@ -88,7 +84,7 @@ HRESULT Parser_Create(ParserImpl *pParser, const IBaseFilterVtbl *Parser_Vtbl, PIN_INFO piInput; /* pTransformFilter is already allocated */ - BaseFilter_Init(&pParser->filter, Parser_Vtbl, pClsid, (DWORD_PTR)(__FILE__ ": ParserImpl.csFilter"), &BaseFuncTable); + BaseFilter_Init(&pParser->filter, Parser_Vtbl, pClsid, (DWORD_PTR)(__FILE__ ": ParserImpl.csFilter"), func_table); pParser->fnDisconnect = fnDisconnect; diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 3b89ed6..d221eec 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -53,8 +53,8 @@ typedef struct Parser_OutputPin extern HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt); HRESULT Parser_Create(ParserImpl *parser, const IBaseFilterVtbl *vtbl, - const CLSID *clsid, const WCHAR *sink_name, PFN_PROCESS_SAMPLE, - PFN_QUERY_ACCEPT, PFN_PRE_CONNECT, PFN_CLEANUP, PFN_DISCONNECT, + const CLSID *clsid, const BaseFilterFuncTable *func_table, const WCHAR *sink_name, + PFN_PROCESS_SAMPLE, PFN_QUERY_ACCEPT, PFN_PRE_CONNECT, PFN_CLEANUP, PFN_DISCONNECT, REQUESTPROC, STOPPROCESSPROC, SourceSeeking_ChangeStop, SourceSeeking_ChangeStart, SourceSeeking_ChangeRate) DECLSPEC_HIDDEN; @@ -76,6 +76,8 @@ extern HRESULT WINAPI Parser_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *p extern HRESULT WINAPI Parser_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName); extern HRESULT WINAPI Parser_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo); +IPin *parser_get_pin(BaseFilter *iface, unsigned int index) DECLSPEC_HIDDEN; + /* COM helpers */ static inline Parser_OutputPin *unsafe_impl_Parser_OutputPin_from_IPin( IPin *iface ) { diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index b21b2e9..6240b78 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -413,6 +413,11 @@ static const IBaseFilterVtbl WAVEParser_Vtbl = Parser_QueryVendorInfo }; +static const BaseFilterFuncTable wave_parser_func_table = +{ + .filter_get_pin = parser_get_pin, +}; + HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) { static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -430,7 +435,7 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) This = CoTaskMemAlloc(sizeof(WAVEParserImpl)); hr = Parser_Create(&This->Parser, &WAVEParser_Vtbl, &CLSID_WAVEParser, - sink_name, WAVEParser_Sample, WAVEParser_QueryAccept, + &wave_parser_func_table, sink_name, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, WAVEParser_disconnect, WAVEParser_first_request, NULL, NULL, WAVEParserImpl_seek, NULL);

1 0

Zebediah Figura : quartz/parser: Get rid of the "fnCleanup" member of ParserImpl.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 461cee2149400f66bcb093d8f134a89c5d96b23c URL: https://source.winehq.org/git/wine.git/?a=commit;h=461cee2149400f66bcb093d8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 23:09:57 2019 -0500 quartz/parser: Get rid of the "fnCleanup" member of ParserImpl. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/parser.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 8660cf2..3b89ed6 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -30,7 +30,6 @@ struct ParserImpl { BaseFilter filter; - PFN_CLEANUP fnCleanup; PFN_DISCONNECT fnDisconnect; PullPin * pInputPin;

1 0

Zebediah Figura : quartz/dsoundrender: Use BaseFilterImpl_Release().
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: d1536df330f5a206f2f64b1e3a77c2d7a9dca2a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1536df330f5a206f2f64b1e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 23:09:56 2019 -0500 quartz/dsoundrender: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 69 ++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 844085a..2b50eae 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -586,6 +586,31 @@ static HRESULT WINAPI DSoundRender_EndFlush(BaseRenderer* iface) return S_OK; } +static void dsound_render_destroy(BaseRenderer *iface) +{ + DSoundRenderImpl *filter = impl_from_BaseRenderer(iface); + + if (filter->threadid) + { + PostThreadMessageW(filter->threadid, WM_APP, 0, 0); + WaitForSingleObject(filter->advisethread, INFINITE); + CloseHandle(filter->advisethread); + } + + if (filter->dsbuffer) + IDirectSoundBuffer_Release(filter->dsbuffer); + filter->dsbuffer = NULL; + if (filter->dsound) + IDirectSound8_Release(filter->dsound); + filter->dsound = NULL; + + BasicAudio_Destroy(&filter->basicAudio); + CloseHandle(filter->blocked); + + strmbase_renderer_cleanup(&filter->renderer); + CoTaskMemFree(filter); +} + static const BaseRendererFuncTable BaseFuncTable = { DSoundRender_CheckMediaType, DSoundRender_DoRenderSample, @@ -606,6 +631,7 @@ static const BaseRendererFuncTable BaseFuncTable = { DSoundRender_EndOfStream, DSoundRender_BeginFlush, DSoundRender_EndFlush, + dsound_render_destroy, }; HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) @@ -712,41 +738,6 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri return E_NOINTERFACE; } -static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) -{ - DSoundRenderImpl *This = impl_from_IBaseFilter(iface); - ULONG refCount = InterlockedDecrement(&This->renderer.filter.refCount); - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); - - if (!refCount) - { - if (This->threadid) { - PostThreadMessageW(This->threadid, WM_APP, 0, 0); - WaitForSingleObject(This->advisethread, INFINITE); - CloseHandle(This->advisethread); - } - - if (This->dsbuffer) - IDirectSoundBuffer_Release(This->dsbuffer); - This->dsbuffer = NULL; - if (This->dsound) - IDirectSound8_Release(This->dsound); - This->dsound = NULL; - - BasicAudio_Destroy(&This->basicAudio); - CloseHandle(This->blocked); - - TRACE("Destroying Audio Renderer\n"); - strmbase_renderer_cleanup(&This->renderer); - CoTaskMemFree(This); - - return 0; - } - else - return refCount; -} - static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) { DSoundRenderImpl *This = impl_from_IBaseFilter(iface); @@ -781,7 +772,7 @@ static const IBaseFilterVtbl DSoundRender_Vtbl = { DSoundRender_QueryInterface, BaseFilterImpl_AddRef, - DSoundRender_Release, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, BaseRendererImpl_Stop, DSoundRender_Pause, @@ -820,7 +811,7 @@ static ULONG WINAPI Basicaudio_Release(IBasicAudio *iface) { TRACE("(%p/%p)->()\n", This, iface); - return DSoundRender_Release(&This->renderer.filter.IBaseFilter_iface); + return BaseFilterImpl_Release(&This->renderer.filter.IBaseFilter_iface); } /*** IBasicAudio methods ***/ @@ -1016,7 +1007,7 @@ static ULONG WINAPI ReferenceClock_Release(IReferenceClock *iface) TRACE("(%p/%p)->()\n", This, iface); - return DSoundRender_Release(&This->renderer.filter.IBaseFilter_iface); + return BaseFilterImpl_Release(&This->renderer.filter.IBaseFilter_iface); } /*** IReferenceClock methods ***/ @@ -1184,7 +1175,7 @@ static ULONG WINAPI AMDirectSound_Release(IAMDirectSound *iface) TRACE("(%p/%p)->()\n", This, iface); - return DSoundRender_Release(&This->renderer.filter.IBaseFilter_iface); + return BaseFilterImpl_Release(&This->renderer.filter.IBaseFilter_iface); } /*** IAMDirectSound methods ***/

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019