wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Zebediah Figura : quartz: Use strmbase filter methods directly.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: 97cf9ab43a2ab064c15e4d70a3c26f98c86bf88f URL: https://source.winehq.org/git/wine.git/?a=commit;h=97cf9ab43a2ab064c15e4d70… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 28 23:10:18 2019 -0500 quartz: Use strmbase filter methods directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 16 ++++++++-------- dlls/quartz/mpegsplit.c | 14 +++++++------- dlls/quartz/parser.c | 40 ---------------------------------------- dlls/quartz/parser.h | 8 -------- dlls/quartz/waveparser.c | 16 ++++++++-------- 5 files changed, 23 insertions(+), 71 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index f77efa3..d5b716c 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1394,21 +1394,21 @@ static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface) static const IBaseFilterVtbl AVISplitterImpl_Vtbl = { - Parser_QueryInterface, - Parser_AddRef, + BaseFilterImpl_QueryInterface, + BaseFilterImpl_AddRef, BaseFilterImpl_Release, - Parser_GetClassID, + BaseFilterImpl_GetClassID, Parser_Stop, Parser_Pause, Parser_Run, Parser_GetState, Parser_SetSyncSource, - Parser_GetSyncSource, - Parser_EnumPins, + BaseFilterImpl_GetSyncSource, + BaseFilterImpl_EnumPins, BaseFilterImpl_FindPin, - Parser_QueryFilterInfo, - Parser_JoinFilterGraph, - Parser_QueryVendorInfo + BaseFilterImpl_QueryFilterInfo, + BaseFilterImpl_JoinFilterGraph, + BaseFilterImpl_QueryVendorInfo, }; static void avi_splitter_destroy(BaseFilter *iface) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index b64385b..0afdcbd 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -794,20 +794,20 @@ static HRESULT WINAPI MPEGSplitter_QueryInterface(IBaseFilter *iface, REFIID rii static const IBaseFilterVtbl MPEGSplitter_Vtbl = { MPEGSplitter_QueryInterface, - Parser_AddRef, + BaseFilterImpl_AddRef, BaseFilterImpl_Release, - Parser_GetClassID, + BaseFilterImpl_GetClassID, Parser_Stop, Parser_Pause, Parser_Run, Parser_GetState, Parser_SetSyncSource, - Parser_GetSyncSource, - Parser_EnumPins, + BaseFilterImpl_GetSyncSource, + BaseFilterImpl_EnumPins, BaseFilterImpl_FindPin, - Parser_QueryFilterInfo, - Parser_JoinFilterGraph, - Parser_QueryVendorInfo + BaseFilterImpl_QueryFilterInfo, + BaseFilterImpl_JoinFilterGraph, + BaseFilterImpl_QueryVendorInfo, }; static HRESULT WINAPI AMStreamSelect_QueryInterface(IAMStreamSelect *iface, REFIID riid, void **ppv) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 095ec5e..4a3bc2e 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -191,19 +191,6 @@ void Parser_Destroy(ParserImpl *This) CoTaskMemFree(This); } -/** IPersist methods **/ - -HRESULT WINAPI Parser_GetClassID(IBaseFilter * iface, CLSID * pClsid) -{ - ParserImpl *This = impl_from_IBaseFilter(iface); - - TRACE("%p->(%p)\n", This, pClsid); - - *pClsid = This->filter.clsid; - - return S_OK; -} - /** IMediaFilter methods **/ HRESULT WINAPI Parser_Stop(IBaseFilter * iface) @@ -362,33 +349,6 @@ HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock return S_OK; } -HRESULT WINAPI Parser_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock) -{ - return BaseFilterImpl_GetSyncSource(iface, ppClock); -} - -/** IBaseFilter implementation **/ - -HRESULT WINAPI Parser_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) -{ - return BaseFilterImpl_EnumPins(iface,ppEnum); -} - -HRESULT WINAPI Parser_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) -{ - return BaseFilterImpl_QueryFilterInfo(iface, pInfo); -} - -HRESULT WINAPI Parser_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName) -{ - return BaseFilterImpl_JoinFilterGraph(iface, pGraph, pName); -} - -HRESULT WINAPI Parser_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo) -{ - return BaseFilterImpl_QueryVendorInfo(iface, pVendorInfo); -} - static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { { Parser_OutputPin_CheckMediaType, diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 4d51e3a..aeeb55a 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -61,19 +61,11 @@ HRESULT Parser_Create(ParserImpl *parser, const IBaseFilterVtbl *vtbl, /* Override the _Release function and call this when releasing */ extern void Parser_Destroy(ParserImpl *This); -extern HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); -extern ULONG WINAPI Parser_AddRef(IBaseFilter * iface); -extern HRESULT WINAPI Parser_GetClassID(IBaseFilter * iface, CLSID * pClsid); extern HRESULT WINAPI Parser_Stop(IBaseFilter * iface); extern HRESULT WINAPI Parser_Pause(IBaseFilter * iface); extern HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart); extern HRESULT WINAPI Parser_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState); extern HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock); -extern HRESULT WINAPI Parser_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock); -extern HRESULT WINAPI Parser_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum); -extern HRESULT WINAPI Parser_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo); -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; diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 1b18f69..7cc01af 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -396,21 +396,21 @@ static HRESULT WAVEParser_disconnect(LPVOID iface) static const IBaseFilterVtbl WAVEParser_Vtbl = { - Parser_QueryInterface, - Parser_AddRef, + BaseFilterImpl_QueryInterface, + BaseFilterImpl_AddRef, BaseFilterImpl_Release, - Parser_GetClassID, + BaseFilterImpl_GetClassID, Parser_Stop, Parser_Pause, Parser_Run, Parser_GetState, Parser_SetSyncSource, - Parser_GetSyncSource, - Parser_EnumPins, + BaseFilterImpl_GetSyncSource, + BaseFilterImpl_EnumPins, BaseFilterImpl_FindPin, - Parser_QueryFilterInfo, - Parser_JoinFilterGraph, - Parser_QueryVendorInfo + BaseFilterImpl_QueryFilterInfo, + BaseFilterImpl_JoinFilterGraph, + BaseFilterImpl_QueryVendorInfo, }; static void wave_parser_destroy(BaseFilter *iface)

1 0

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

29 May '19

Module: wine Branch: master Commit: e707bb49fbbb00df0b063892e104f9a1cd17f8ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e707bb49fbbb00df0b063892… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 28 23:10:17 2019 -0500 quartz/waveparser: Use BaseFilterImpl_Release(). 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/parser.h | 1 - dlls/quartz/waveparser.c | 9 ++++++++- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 433502c..095ec5e 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -191,19 +191,6 @@ void Parser_Destroy(ParserImpl *This) CoTaskMemFree(This); } -ULONG WINAPI Parser_Release(IBaseFilter * iface) -{ - ParserImpl *This = impl_from_IBaseFilter(iface); - ULONG refCount = InterlockedDecrement(&This->filter.refCount); - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); - - if (!refCount) - Parser_Destroy(This); - - return refCount; -} - /** IPersist methods **/ HRESULT WINAPI Parser_GetClassID(IBaseFilter * iface, CLSID * pClsid) diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index d221eec..4d51e3a 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -63,7 +63,6 @@ extern void Parser_Destroy(ParserImpl *This); extern HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); extern ULONG WINAPI Parser_AddRef(IBaseFilter * iface); -extern ULONG WINAPI Parser_Release(IBaseFilter * iface); extern HRESULT WINAPI Parser_GetClassID(IBaseFilter * iface, CLSID * pClsid); extern HRESULT WINAPI Parser_Stop(IBaseFilter * iface); extern HRESULT WINAPI Parser_Pause(IBaseFilter * iface); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 6240b78..1b18f69 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -398,7 +398,7 @@ static const IBaseFilterVtbl WAVEParser_Vtbl = { Parser_QueryInterface, Parser_AddRef, - Parser_Release, + BaseFilterImpl_Release, Parser_GetClassID, Parser_Stop, Parser_Pause, @@ -413,9 +413,16 @@ static const IBaseFilterVtbl WAVEParser_Vtbl = Parser_QueryVendorInfo }; +static void wave_parser_destroy(BaseFilter *iface) +{ + WAVEParserImpl *filter = impl_from_IBaseFilter(&iface->IBaseFilter_iface); + Parser_Destroy(&filter->Parser); +} + static const BaseFilterFuncTable wave_parser_func_table = { .filter_get_pin = parser_get_pin, + .filter_destroy = wave_parser_destroy, }; HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv)

1 0

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

29 May '19

Module: wine Branch: master Commit: 23daccb0dac9e7fdd9ba02bfd7376492e1ea0b3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=23daccb0dac9e7fdd9ba02bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 28 23:10:16 2019 -0500 quartz/mpegsplit: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/mpegsplit.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 24e61fe..b64385b 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -795,7 +795,7 @@ static const IBaseFilterVtbl MPEGSplitter_Vtbl = { MPEGSplitter_QueryInterface, Parser_AddRef, - Parser_Release, + BaseFilterImpl_Release, Parser_GetClassID, Parser_Stop, Parser_Pause, @@ -868,9 +868,16 @@ static const IAMStreamSelectVtbl AMStreamSelectVtbl = AMStreamSelect_Enable }; +static void mpeg_splitter_destroy(BaseFilter *iface) +{ + MPEGSplitterImpl *filter = impl_from_IBaseFilter(&iface->IBaseFilter_iface); + Parser_Destroy(&filter->Parser); +} + static const BaseFilterFuncTable mpeg_splitter_func_table = { .filter_get_pin = parser_get_pin, + .filter_destroy = mpeg_splitter_destroy, }; HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv)

1 0

Alexandre Julliard : ctl3dv2: Build with msvcrt.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: 6d8365deebb341fd4da552b65ae17cc46f0abb0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d8365deebb341fd4da552b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 08:55:44 2019 +0200 ctl3dv2: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ctl3dv2.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ctl3dv2.dll16/Makefile.in b/dlls/ctl3dv2.dll16/Makefile.in index 6bd224f..56c0984 100644 --- a/dlls/ctl3dv2.dll16/Makefile.in +++ b/dlls/ctl3dv2.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = ctl3dv2.dll16 IMPORTS = user32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,ctl3d32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ctl3d32.dll C_SRCS = ctl3d.c

1 0

Alexandre Julliard : ctl3d32: Build with msvcrt.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: 6ca742ff1031ce793ef857b0c8700f958b6971f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ca742ff1031ce793ef857b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 08:55:33 2019 +0200 ctl3d32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ctl3d32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ctl3d32/Makefile.in b/dlls/ctl3d32/Makefile.in index eb4b2ba..5c7c0f8 100644 --- a/dlls/ctl3d32/Makefile.in +++ b/dlls/ctl3d32/Makefile.in @@ -1,4 +1,6 @@ MODULE = ctl3d32.dll IMPORTS = user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = ctl3d32.c

1 0

Alexandre Julliard : ctl3d: Build with msvcrt.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: 0842be971c949618ae5bf0cb82bbba4eef740a90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0842be971c949618ae5bf0cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 08:55:22 2019 +0200 ctl3d: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ctl3d.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ctl3d.dll16/Makefile.in b/dlls/ctl3d.dll16/Makefile.in index e8e0b40..303005b 100644 --- a/dlls/ctl3d.dll16/Makefile.in +++ b/dlls/ctl3d.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = ctl3d.dll16 IMPORTS = user32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,ctl3d32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ctl3d32.dll C_SRCS = ctl3d.c

1 0

Alexandre Julliard : cryptui: Build with msvcrt.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: 57bff6f3df216a4b5adb210c6de1f125974a6b01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57bff6f3df216a4b5adb210c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 08:55:14 2019 +0200 cryptui: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/Makefile.in | 2 + dlls/cryptui/main.c | 100 +++++++++++++++++++++++------------------------ 2 files changed, 51 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57bff6f3df216a4b5adb…

1 0

Alexandre Julliard : cryptnet: Build with msvcrt.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: 7ca2c13ea9f62c050ed20540b9aaadb37592cfd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ca2c13ea9f62c050ed20540… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 08:53:47 2019 +0200 cryptnet: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/Makefile.in | 2 ++ dlls/cryptnet/cryptnet_main.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/cryptnet/Makefile.in b/dlls/cryptnet/Makefile.in index e6849e5..8482882 100644 --- a/dlls/cryptnet/Makefile.in +++ b/dlls/cryptnet/Makefile.in @@ -3,5 +3,7 @@ IMPORTLIB = cryptnet IMPORTS = crypt32 DELAYIMPORTS = wininet +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ cryptnet_main.c diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 9d05a91..2e0ab21 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -18,9 +18,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #define NONAMELESSUNION #define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS

1 0

Alexandre Julliard : cryptext: Build with msvcrt.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: 043da4f869eba10ce8e4fda70e250eb848b7fe36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=043da4f869eba10ce8e4fda7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 08:53:30 2019 +0200 cryptext: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptext/Makefile.in | 2 ++ dlls/cryptext/cryptext_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptext/Makefile.in b/dlls/cryptext/Makefile.in index e1a46ba..9c9f84c 100644 --- a/dlls/cryptext/Makefile.in +++ b/dlls/cryptext/Makefile.in @@ -1,4 +1,6 @@ MODULE = cryptext.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ cryptext_main.c diff --git a/dlls/cryptext/cryptext_main.c b/dlls/cryptext/cryptext_main.c index 473c326..f7c7bd1 100644 --- a/dlls/cryptext/cryptext_main.c +++ b/dlls/cryptext/cryptext_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 : cryptdll: Build with msvcrt.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: 1659ee89f32437656182e3aca121df46133bd95e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1659ee89f32437656182e3ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 08:53:21 2019 +0200 cryptdll: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptdll/Makefile.in | 2 ++ dlls/cryptdll/cryptdll.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/cryptdll/Makefile.in b/dlls/cryptdll/Makefile.in index 70487cf..7fd574e 100644 --- a/dlls/cryptdll/Makefile.in +++ b/dlls/cryptdll/Makefile.in @@ -2,5 +2,7 @@ MODULE = cryptdll.dll IMPORTLIB = cryptdll IMPORTS = advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ cryptdll.c diff --git a/dlls/cryptdll/cryptdll.c b/dlls/cryptdll/cryptdll.c index 1146a6d..963a268 100644 --- a/dlls/cryptdll/cryptdll.c +++ b/dlls/cryptdll/cryptdll.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdlib.h> #include "windef.h"

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
102
Older →

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