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

Alexandre Julliard : msvcp120: Use the standard -mno-cygwin build flag.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 8dc868a054c932aa0aff2d857e7673a9e5b5b498 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dc868a054c932aa0aff2d85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:52:22 2019 +0200 msvcp120: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp120/Makefile.in b/dlls/msvcp120/Makefile.in index 6002175..2a77859 100644 --- a/dlls/msvcp120/Makefile.in +++ b/dlls/msvcp120/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = msvcr120 EXTRADEFS = -D_MSVCP_VER=120 PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \

1 0

Alexandre Julliard : msvcp140: Use the standard -mno-cygwin build flag.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: ba788f74f95990a9b1745772f0c09ad3b46d9fe3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba788f74f95990a9b1745772… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:53:26 2019 +0200 msvcp140: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp140/Makefile.in b/dlls/msvcp140/Makefile.in index 616ac79..ff67090 100644 --- a/dlls/msvcp140/Makefile.in +++ b/dlls/msvcp140/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = ucrtbase EXTRADEFS = -D_MSVCP_VER=140 PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \

1 0

Alexandre Julliard : vcruntime140: Use the standard -mno-cygwin build flag.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 62bce89cbacd0cfd0cc55c34f748da7ba74372a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62bce89cbacd0cfd0cc55c34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:54:11 2019 +0200 vcruntime140: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vcruntime140/Makefile.in b/dlls/vcruntime140/Makefile.in index 828330a..e319edb 100644 --- a/dlls/vcruntime140/Makefile.in +++ b/dlls/vcruntime140/Makefile.in @@ -1,5 +1,7 @@ MODULE = vcruntime140.dll IMPORTS = ucrtbase +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ misc.c

1 0

Alexandre Julliard : msvcp60: Use the standard -mno-cygwin build flag.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: a5077ec49ae7b24afa87ba7385d285ce23b37b9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5077ec49ae7b24afa87ba73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:52:38 2019 +0200 msvcp60: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/Makefile.in | 3 ++- dlls/msvcp60/ios.c | 1 - dlls/msvcp60/main.c | 1 - dlls/msvcp60/string.c | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/Makefile.in b/dlls/msvcp60/Makefile.in index fcd149b..bb73e7b 100644 --- a/dlls/msvcp60/Makefile.in +++ b/dlls/msvcp60/Makefile.in @@ -1,8 +1,9 @@ MODULE = msvcp60.dll -IMPORTS = msvcrt EXTRADEFS = -D_MSVCP_VER=60 PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \ diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index f439339..ed1be5b 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index a30f13c..fbfd38c 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 09f9854..6e5e5da 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : msvcp70: Use the standard -mno-cygwin build flag.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: eaff3d9da650a11ef1e288c78a777ad4da6bd6b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaff3d9da650a11ef1e288c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:52:44 2019 +0200 msvcp70: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp70/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp70/Makefile.in b/dlls/msvcp70/Makefile.in index 36ba70b..a023d1b 100644 --- a/dlls/msvcp70/Makefile.in +++ b/dlls/msvcp70/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = msvcr70 EXTRADEFS = -D_MSVCP_VER=70 PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \

1 0

Alexandre Julliard : msvcp71: Use the standard -mno-cygwin build flag.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 1af6790fced0ba6415a5eee7d80d031aeb37f9f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1af6790fced0ba6415a5eee7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:52:51 2019 +0200 msvcp71: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp71/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp71/Makefile.in b/dlls/msvcp71/Makefile.in index dfa0a2b..6713ab4 100644 --- a/dlls/msvcp71/Makefile.in +++ b/dlls/msvcp71/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = msvcr71 EXTRADEFS = -D_MSVCP_VER=71 PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \

1 0

Alexandre Julliard : msvcp80: Use the standard -mno-cygwin build flag.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: d8769caee01a123eed03e5adbba9b0ca61b04466 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8769caee01a123eed03e5ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:52:56 2019 +0200 msvcp80: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp80/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp80/Makefile.in b/dlls/msvcp80/Makefile.in index c541c1b..22a18fc 100644 --- a/dlls/msvcp80/Makefile.in +++ b/dlls/msvcp80/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = msvcr80 EXTRADEFS = -D_MSVCP_VER=80 PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \

1 0

Alexandre Julliard : msvcirt: Use the standard -mno-cygwin build flag.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 0598c706082893b8e05e002ce9fda1a36736f76e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0598c706082893b8e05e002c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:54:25 2019 +0200 msvcirt: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/Makefile.in | 3 ++- dlls/msvcirt/msvcirt.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/Makefile.in b/dlls/msvcirt/Makefile.in index acaf495..65be072 100644 --- a/dlls/msvcirt/Makefile.in +++ b/dlls/msvcirt/Makefile.in @@ -1,8 +1,9 @@ MODULE = msvcirt.dll -IMPORTS = msvcrt EXTRADEFS = -D_MSVCIRT PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ msvcirt.c diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index fa0bbb5..797b0b1 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <errno.h> #include <fcntl.h>

1 0

Zebediah Figura : strmbase: Factor out strmbase_renderer_cleanup().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 9ff3db5247717e1d8d8d90cbbea8ccec17ee7040 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ff3db5247717e1d8d8d90cb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 18:16:55 2019 -0500 strmbase: Factor out strmbase_renderer_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 50 ++++++++++++++++++++++++++---------------------- include/wine/strmbase.h | 1 + 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index c357102..fd6cf52 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -275,36 +275,40 @@ HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter* iface, REFIID riid, return BaseFilterImpl_QueryInterface(iface, riid, ppv); } -ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface) +void strmbase_renderer_cleanup(BaseRenderer *filter) { - BaseRenderer *This = impl_from_IBaseFilter(iface); - ULONG refCount = InterlockedDecrement(&This->filter.refCount); + IPin *peer; - if (!refCount) + if (SUCCEEDED(IPin_ConnectedTo(&filter->pInputPin->pin.IPin_iface, &peer))) { - IPin *pConnectedTo; + IPin_Disconnect(peer); + IPin_Release(peer); + } + IPin_Disconnect(&filter->pInputPin->pin.IPin_iface); + IPin_Release(&filter->pInputPin->pin.IPin_iface); - if (SUCCEEDED(IPin_ConnectedTo(&This->pInputPin->pin.IPin_iface, &pConnectedTo))) - { - IPin_Disconnect(pConnectedTo); - IPin_Release(pConnectedTo); - } - IPin_Disconnect(&This->pInputPin->pin.IPin_iface); - IPin_Release(&This->pInputPin->pin.IPin_iface); + if (filter->pPosition) + IUnknown_Release(filter->pPosition); + + filter->csRenderLock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->csRenderLock); - if (This->pPosition) - IUnknown_Release(This->pPosition); + BaseRendererImpl_ClearPendingSample(filter); + CloseHandle(filter->evComplete); + CloseHandle(filter->ThreadSignal); + CloseHandle(filter->RenderEvent); + QualityControlImpl_Destroy(filter->qcimpl); + BaseFilter_Destroy(&filter->filter); +} + +ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface) +{ + BaseRenderer *This = impl_from_IBaseFilter(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); - This->csRenderLock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->csRenderLock); + if (!refCount) + strmbase_renderer_cleanup(This); - BaseRendererImpl_ClearPendingSample(This); - CloseHandle(This->evComplete); - CloseHandle(This->ThreadSignal); - CloseHandle(This->RenderEvent); - QualityControlImpl_Destroy(This->qcimpl); - BaseFilter_Destroy(&This->filter); - } return refCount; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 1cd0028..b561c76 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -623,6 +623,7 @@ HRESULT WINAPI BaseRendererImpl_ClearPendingSample(BaseRenderer *iface); HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtbl *vtbl, IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, DWORD_PTR debug_info, const BaseRendererFuncTable *func_table); +void strmbase_renderer_cleanup(BaseRenderer *filter); #ifdef __IBasicAudio_FWD_DEFINED__ typedef struct tagBasicAudio

1 0

Zebediah Figura : quartz/videorenderer: Use strmbase_renderer_cleanup().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: dea50a98e8c03403d9c38b19713f18c8afddabcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=dea50a98e8c03403d9c38b19… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 18:16:56 2019 -0500 quartz/videorenderer: Use strmbase_renderer_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 1646e3f..f3d817b 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -694,7 +694,7 @@ static ULONG WINAPI VideoRendererInner_AddRef(IUnknown *iface) static ULONG WINAPI VideoRendererInner_Release(IUnknown *iface) { VideoRendererImpl *This = impl_from_IUnknown(iface); - ULONG refCount = BaseRendererImpl_Release(&This->renderer.filter.IBaseFilter_iface); + ULONG refCount = InterlockedDecrement(&This->renderer.filter.refCount); TRACE("(%p)->(): new ref = %d\n", This, refCount); @@ -708,6 +708,7 @@ static ULONG WINAPI VideoRendererInner_Release(IUnknown *iface) CloseHandle(This->hEvent); TRACE("Destroying Video Renderer\n"); + strmbase_renderer_cleanup(&This->renderer); CoTaskMemFree(This); return 0; @@ -1068,7 +1069,7 @@ HRESULT VideoRenderer_create(IUnknown *pUnkOuter, void **ppv) return S_OK; fail: - BaseRendererImpl_Release(&pVideoRenderer->renderer.filter.IBaseFilter_iface); + strmbase_renderer_cleanup(&pVideoRenderer->renderer); CoTaskMemFree(pVideoRenderer); return hr; }

1 0