wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Alexandre Julliard : resutils: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: baf14b1a96aa492294ff08f3b2b381ad42f069a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf14b1a96aa492294ff08f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:29:27 2019 +0200 resutils: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/resutils/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/resutils/Makefile.in b/dlls/resutils/Makefile.in index fa5910a..f5c43f8 100644 --- a/dlls/resutils/Makefile.in +++ b/dlls/resutils/Makefile.in @@ -1,5 +1,7 @@ MODULE = resutils.dll IMPORTLIB = resutils +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ resutils.c

1 0

Alexandre Julliard : regapi: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: 2e2f862eeca6ce682b76545a1901bd8937ff9055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e2f862eeca6ce682b76545a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:29:21 2019 +0200 regapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/regapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/regapi/Makefile.in b/dlls/regapi/Makefile.in index 1dda911..4d8d773 100644 --- a/dlls/regapi/Makefile.in +++ b/dlls/regapi/Makefile.in @@ -1,4 +1,6 @@ MODULE = regapi.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : rasdlg: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: 0e28d661e76c285457d1082d0d372c297d153fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e28d661e76c285457d1082d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:29:14 2019 +0200 rasdlg: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasdlg/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/rasdlg/Makefile.in b/dlls/rasdlg/Makefile.in index 6a94843..d780513 100644 --- a/dlls/rasdlg/Makefile.in +++ b/dlls/rasdlg/Makefile.in @@ -1,5 +1,7 @@ MODULE = rasdlg.dll IMPORTLIB = rasdlg +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ rasdlg_main.c

1 0

Alexandre Julliard : rasapi32: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: 6ce8c4327ee89d798556ce384a7c4afaf8e0a73d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ce8c4327ee89d798556ce38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:29:08 2019 +0200 rasapi32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasapi32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in index ff7e710..2bb4762 100644 --- a/dlls/rasapi32/Makefile.in +++ b/dlls/rasapi32/Makefile.in @@ -1,4 +1,6 @@ MODULE = rasapi32.dll IMPORTLIB = rasapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = rasapi.c

1 0

Alexandre Julliard : qwave: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: 5658defa0623d0a0d79f89687b63fb66edd0973b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5658defa0623d0a0d79f8968… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:28:48 2019 +0200 qwave: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qwave/Makefile.in | 2 ++ dlls/qwave/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qwave/Makefile.in b/dlls/qwave/Makefile.in index 5b4015c..2a2336a 100644 --- a/dlls/qwave/Makefile.in +++ b/dlls/qwave/Makefile.in @@ -1,5 +1,7 @@ MODULE = qwave.dll IMPORTLIB = qwave +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c index 6d77b29..685fcfb 100644 --- a/dlls/qwave/main.c +++ b/dlls/qwave/main.c @@ -17,7 +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 : query: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: 0281cd038fdf1aa9ac4184e0d1d2509e2aed10cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0281cd038fdf1aa9ac4184e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:28:41 2019 +0200 query: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/query/Makefile.in | 2 ++ dlls/query/query_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in index 54132ab..075a645 100644 --- a/dlls/query/Makefile.in +++ b/dlls/query/Makefile.in @@ -1,5 +1,7 @@ MODULE = query.dll IMPORTS = uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ query_main.c diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index c6dde22..b93973a 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : qmgrprxy: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: 6c984b47a860ed0a513884bf5aa56dd4f83dc249 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c984b47a860ed0a513884bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:28:26 2019 +0200 qmgrprxy: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgrprxy/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/qmgrprxy/Makefile.in b/dlls/qmgrprxy/Makefile.in index bdbe0bc..10d257a 100644 --- a/dlls/qmgrprxy/Makefile.in +++ b/dlls/qmgrprxy/Makefile.in @@ -1,6 +1,8 @@ MODULE = qmgrprxy.dll IMPORTS = rpcrt4 +EXTRADLLFLAGS = -mno-cygwin + IDL_SRCS = qmgrprxy.idl dlldata_EXTRADEFS = -DWINE_REGISTER_DLL

1 0

Alexandre Julliard : qmgr: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: d6d38f157a459765344b7e1cf13a77960cef73ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6d38f157a459765344b7e1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:28:11 2019 +0200 qmgr: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/Makefile.in | 2 ++ dlls/qmgr/file.c | 2 +- dlls/qmgr/job.c | 4 ++-- dlls/qmgr/qmgr.h | 13 ++++++------- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index 7c23e84..fe051ad 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -1,6 +1,8 @@ MODULE = qmgr.dll IMPORTS = uuid winhttp ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ enum_files.c \ enum_jobs.c \ diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index e717dc8..6621b23 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -459,7 +459,7 @@ static BOOL transfer_file_local(BackgroundCopyFileImpl *file, const WCHAR *tmpna transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_TRANSFERRING); - if (strlenW(file->info.RemoteName) > 7 && !strncmpiW(file->info.RemoteName, fileW, 7)) + if (lstrlenW(file->info.RemoteName) > 7 && !wcsnicmp(file->info.RemoteName, fileW, 7)) ptr = file->info.RemoteName + 7; else ptr = file->info.RemoteName; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index a12e511..0eef336 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -599,7 +599,7 @@ static HRESULT WINAPI BackgroundCopyJob_SetDescription( if (!Val) return E_INVALIDARG; - len = strlenW(Val); + len = lstrlenW(Val); if (len > max_description_len) return BG_E_STRING_TOO_LONG; EnterCriticalSection(&This->cs); @@ -612,7 +612,7 @@ static HRESULT WINAPI BackgroundCopyJob_SetDescription( { HeapFree(GetProcessHeap(), 0, This->description); if ((This->description = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)))) - strcpyW(This->description, Val); + lstrcpyW(This->description, Val); else hr = E_OUTOFMEMORY; } diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 2bc5b8b..87f8307 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -31,7 +31,6 @@ #include <string.h> #include "wine/list.h" -#include "wine/unicode.h" /* Background copy job vtbl and related data */ typedef struct @@ -118,15 +117,15 @@ BOOL transitionJobState(BackgroundCopyJobImpl *job, BG_JOB_STATE from, BG_JOB_ST /* Little helper functions */ static inline WCHAR *strdupW(const WCHAR *src) { - WCHAR *dst = HeapAlloc(GetProcessHeap(), 0, (strlenW(src) + 1) * sizeof(WCHAR)); - if (dst) strcpyW(dst, src); + WCHAR *dst = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR)); + if (dst) lstrcpyW(dst, src); return dst; } static inline WCHAR *co_strdupW(const WCHAR *src) { - WCHAR *dst = CoTaskMemAlloc((strlenW(src) + 1) * sizeof(WCHAR)); - if (dst) strcpyW(dst, src); + WCHAR *dst = CoTaskMemAlloc((lstrlenW(src) + 1) * sizeof(WCHAR)); + if (dst) lstrcpyW(dst, src); return dst; } @@ -136,10 +135,10 @@ static inline HRESULT return_strval(const WCHAR *str, WCHAR **ret) if (!ret) return E_INVALIDARG; - len = strlenW(str); + len = lstrlenW(str); *ret = CoTaskMemAlloc((len+1)*sizeof(WCHAR)); if (!*ret) return E_OUTOFMEMORY; - strcpyW(*ret, str); + lstrcpyW(*ret, str); return S_OK; }

1 0

Zebediah Figura : qcap: Use strmbase pin reference counting methods.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: bd00160c25a3a36012b0e7a373c24b99cb38117e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd00160c25a3a36012b0e7a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 18 20:17:37 2019 -0500 qcap: Use strmbase pin reference counting methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 32 ++++-------------------------- dlls/qcap/avimux.c | 32 ++++-------------------------- dlls/qcap/smartteefilter.c | 49 ++++++---------------------------------------- dlls/qcap/vfwcapture.c | 17 ++-------------- 4 files changed, 16 insertions(+), 114 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 399fe09..bcfdc6b 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -323,18 +323,6 @@ static HRESULT WINAPI AVICompressorIn_QueryInterface(IPin *iface, REFIID riid, v return BaseInputPinImpl_QueryInterface(iface, riid, ppv); } -static ULONG WINAPI AVICompressorIn_AddRef(IPin *iface) -{ - AVICompressor *This = impl_from_IPin(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI AVICompressorIn_Release(IPin *iface) -{ - AVICompressor *This = impl_from_IPin(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - static HRESULT WINAPI AVICompressorIn_ReceiveConnection(IPin *iface, IPin *pConnector, const AM_MEDIA_TYPE *pmt) { @@ -372,8 +360,8 @@ static HRESULT WINAPI AVICompressorIn_Disconnect(IPin *iface) static const IPinVtbl AVICompressorInputPinVtbl = { AVICompressorIn_QueryInterface, - AVICompressorIn_AddRef, - AVICompressorIn_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseInputPinImpl_Connect, AVICompressorIn_ReceiveConnection, AVICompressorIn_Disconnect, @@ -524,22 +512,10 @@ static HRESULT WINAPI AVICompressorOut_QueryInterface(IPin *iface, REFIID riid, return BaseInputPinImpl_QueryInterface(iface, riid, ppv); } -static ULONG WINAPI AVICompressorOut_AddRef(IPin *iface) -{ - AVICompressor *This = impl_from_IPin(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI AVICompressorOut_Release(IPin *iface) -{ - AVICompressor *This = impl_from_IPin(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - static const IPinVtbl AVICompressorOutputPinVtbl = { AVICompressorOut_QueryInterface, - AVICompressorOut_AddRef, - AVICompressorOut_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect, diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 784d93a..d2475ee 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1255,18 +1255,6 @@ static HRESULT WINAPI AviMuxOut_QueryInterface(IPin *iface, REFIID riid, void ** return S_OK; } -static ULONG WINAPI AviMuxOut_AddRef(IPin *iface) -{ - AviMux *This = impl_from_out_IPin(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI AviMuxOut_Release(IPin *iface) -{ - AviMux *This = impl_from_out_IPin(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - static HRESULT WINAPI AviMuxOut_Connect(IPin *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { @@ -1408,8 +1396,8 @@ static HRESULT WINAPI AviMuxOut_NewSegment(IPin *iface, REFERENCE_TIME tStart, static const IPinVtbl AviMuxOut_PinVtbl = { AviMuxOut_QueryInterface, - AviMuxOut_AddRef, - AviMuxOut_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, AviMuxOut_Connect, AviMuxOut_ReceiveConnection, AviMuxOut_Disconnect, @@ -1655,18 +1643,6 @@ static HRESULT WINAPI AviMuxIn_QueryInterface(IPin *iface, REFIID riid, void **p return S_OK; } -static ULONG WINAPI AviMuxIn_AddRef(IPin *iface) -{ - AviMux *This = impl_from_in_IPin(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI AviMuxIn_Release(IPin *iface) -{ - AviMux *This = impl_from_in_IPin(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - static HRESULT WINAPI AviMuxIn_Connect(IPin *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { @@ -1876,8 +1852,8 @@ static HRESULT WINAPI AviMuxIn_NewSegment(IPin *iface, REFERENCE_TIME tStart, static const IPinVtbl AviMuxIn_PinVtbl = { AviMuxIn_QueryInterface, - AviMuxIn_AddRef, - AviMuxIn_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, AviMuxIn_Connect, AviMuxIn_ReceiveConnection, AviMuxIn_Disconnect, diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 51efe17..caaaaab 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -146,23 +146,10 @@ static const BaseFilterFuncTable SmartTeeFilterFuncs = { .filter_destroy = smart_tee_destroy, }; -static ULONG WINAPI SmartTeeFilterInput_AddRef(IPin *iface) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI SmartTeeFilterInput_Release(IPin *iface) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - - static const IPinVtbl SmartTeeFilterInputVtbl = { BaseInputPinImpl_QueryInterface, - SmartTeeFilterInput_AddRef, - SmartTeeFilterInput_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseInputPinImpl_Connect, BaseInputPinImpl_ReceiveConnection, BasePinImpl_Disconnect, @@ -340,18 +327,6 @@ static const BaseInputPinFuncTable SmartTeeFilterInputFuncs = { SmartTeeFilterInput_Receive }; -static ULONG WINAPI SmartTeeFilterCapture_AddRef(IPin *iface) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI SmartTeeFilterCapture_Release(IPin *iface) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - static HRESULT WINAPI SmartTeeFilterCapture_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) { SmartTeeFilter *This = impl_from_IPin(iface); @@ -368,8 +343,8 @@ static HRESULT WINAPI SmartTeeFilterCapture_EnumMediaTypes(IPin *iface, IEnumMed static const IPinVtbl SmartTeeFilterCaptureVtbl = { BaseOutputPinImpl_QueryInterface, - SmartTeeFilterCapture_AddRef, - SmartTeeFilterCapture_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect, @@ -423,18 +398,6 @@ static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = { SmartTeeFilterCapture_DecideAllocator, }; -static ULONG WINAPI SmartTeeFilterPreview_AddRef(IPin *iface) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI SmartTeeFilterPreview_Release(IPin *iface) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); -} - static HRESULT WINAPI SmartTeeFilterPreview_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) { SmartTeeFilter *This = impl_from_IPin(iface); @@ -451,8 +414,8 @@ static HRESULT WINAPI SmartTeeFilterPreview_EnumMediaTypes(IPin *iface, IEnumMed static const IPinVtbl SmartTeeFilterPreviewVtbl = { BaseOutputPinImpl_QueryInterface, - SmartTeeFilterPreview_AddRef, - SmartTeeFilterPreview_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect, diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 2cb1f7d..660f44d 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -677,19 +677,6 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * return E_NOINTERFACE; } -static ULONG WINAPI VfwPin_AddRef(IPin *iface) -{ - VfwPinImpl *pin = impl_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); -} - -static ULONG WINAPI -VfwPin_Release(IPin * iface) -{ - VfwPinImpl *pin = impl_from_IPin(iface); - return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); -} - static HRESULT WINAPI VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) { @@ -716,8 +703,8 @@ VfwPin_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) static const IPinVtbl VfwPin_Vtbl = { VfwPin_QueryInterface, - VfwPin_AddRef, - VfwPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect,

1 0

Zebediah Figura : quartz: Use strmbase pin reference counting methods.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: d021b5d2626a31a2ab75fbd112a48b2a7a47ae66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d021b5d2626a31a2ab75fbd1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 18 20:17:36 2019 -0500 quartz: Use strmbase pin reference counting methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 16 ++-------------- dlls/quartz/parser.c | 20 ++++---------------- dlls/quartz/pin.c | 12 ------------ dlls/quartz/pin.h | 2 -- 4 files changed, 6 insertions(+), 44 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 25bffe6..afac6f7 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -777,23 +777,11 @@ static HRESULT WINAPI FileAsyncReaderPin_QueryInterface(IPin * iface, REFIID rii return E_NOINTERFACE; } -static ULONG WINAPI FileAsyncReaderPin_AddRef(IPin *iface) -{ - FileAsyncReader *pin = impl_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); -} - -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, - FileAsyncReaderPin_AddRef, - FileAsyncReaderPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BasePinImpl_Disconnect, diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 5743a53..652d410 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -564,18 +564,6 @@ static HRESULT WINAPI Parser_OutputPin_QueryInterface(IPin * iface, REFIID riid, return E_NOINTERFACE; } -static ULONG WINAPI Parser_OutputPin_AddRef(IPin *iface) -{ - Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); -} - -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) { Parser_OutputPin *This = unsafe_impl_Parser_OutputPin_from_IPin(iface); @@ -601,8 +589,8 @@ static HRESULT WINAPI Parser_OutputPin_CheckMediaType(BasePin *pin, const AM_MED static const IPinVtbl Parser_OutputPin_Vtbl = { Parser_OutputPin_QueryInterface, - Parser_OutputPin_AddRef, - Parser_OutputPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, Parser_OutputPin_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect, @@ -714,8 +702,8 @@ static HRESULT WINAPI Parser_PullPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes static const IPinVtbl Parser_InputPin_Vtbl = { Parser_PullPin_QueryInterface, - PullPin_AddRef, - PullPin_Release, + BasePinImpl_AddRef, + BasePinImpl_Release, BaseInputPinImpl_Connect, Parser_PullPin_ReceiveConnection, Parser_PullPin_Disconnect, diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index e99a493..03ca4e6 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -381,18 +381,6 @@ void PullPin_destroy(PullPin *pin) CoTaskMemFree(pin); } -ULONG WINAPI PullPin_AddRef(IPin *iface) -{ - PullPin *pin = impl_PullPin_from_IPin(iface); - return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); -} - -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) { IMediaSample *pSample; diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index b65d223..efed724 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -115,8 +115,6 @@ void PullPin_destroy(PullPin *pin) DECLSPEC_HIDDEN; 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_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);

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
87
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 June 2019