wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Alexandre Julliard : srclient: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 6128623e7ac3f8b5165d4aeb4b3cdf9738e4d267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6128623e7ac3f8b5165d4aeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:48:46 2019 +0200 srclient: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/srclient/Makefile.in | 2 ++ dlls/srclient/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/srclient/Makefile.in b/dlls/srclient/Makefile.in index 5c11e75..48aab4d 100644 --- a/dlls/srclient/Makefile.in +++ b/dlls/srclient/Makefile.in @@ -1,4 +1,6 @@ MODULE = srclient.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/srclient/main.c b/dlls/srclient/main.c index 6c2e7b4..98832a9 100644 --- a/dlls/srclient/main.c +++ b/dlls/srclient/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 : spoolss: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: be0e5491d472325ca2023f0497b3abc8624592c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0e5491d472325ca2023f04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:48:39 2019 +0200 spoolss: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/spoolss/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in index b6bc40e..a177944 100644 --- a/dlls/spoolss/Makefile.in +++ b/dlls/spoolss/Makefile.in @@ -2,6 +2,8 @@ MODULE = spoolss.dll IMPORTLIB = spoolss IMPORTS = winspool +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ router.c \ spoolss_main.c

1 0

Alexandre Julliard : sound.drv: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: af11345710e3ec33c9e1ab296328b92ec06d4f3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=af11345710e3ec33c9e1ab29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:48:32 2019 +0200 sound.drv: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sound.drv16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sound.drv16/Makefile.in b/dlls/sound.drv16/Makefile.in index 8e9b04b..1a31640 100644 --- a/dlls/sound.drv16/Makefile.in +++ b/dlls/sound.drv16/Makefile.in @@ -1,4 +1,4 @@ MODULE = sound.drv16 -EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,winmm.dll C_SRCS = sound.c

1 0

Alexandre Julliard : snmpapi: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 48a4635390fc5e0e2ddc2df59c7ce6ce5426a0fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=48a4635390fc5e0e2ddc2df5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:48:25 2019 +0200 snmpapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/snmpapi/Makefile.in | 2 ++ dlls/snmpapi/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/snmpapi/Makefile.in b/dlls/snmpapi/Makefile.in index cf4498c..90c3901 100644 --- a/dlls/snmpapi/Makefile.in +++ b/dlls/snmpapi/Makefile.in @@ -1,5 +1,7 @@ MODULE = snmpapi.dll IMPORTLIB = snmpapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 2101ec8..3c90ca2 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdio.h> #include <stdarg.h>

1 0

Alexandre Julliard : slc: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: ad59dfb481763efc2eb8b17d691f0cf6e8ed8490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad59dfb481763efc2eb8b17d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:48:15 2019 +0200 slc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slc/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/slc/Makefile.in b/dlls/slc/Makefile.in index 7e79ffc..fac1c25 100644 --- a/dlls/slc/Makefile.in +++ b/dlls/slc/Makefile.in @@ -2,5 +2,7 @@ EXTRADEFS = -D_SLC_ MODULE = slc.dll IMPORTLIB = slc +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ slc.c

1 0

Alexandre Julliard : slbcsp: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 70d4e6dbcca9baf25ad0cc9f0ee5e869181a8299 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d4e6dbcca9baf25ad0cc9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:48:00 2019 +0200 slbcsp: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slbcsp/Makefile.in | 2 ++ dlls/slbcsp/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/slbcsp/Makefile.in b/dlls/slbcsp/Makefile.in index 91508c4..b3dd14f 100644 --- a/dlls/slbcsp/Makefile.in +++ b/dlls/slbcsp/Makefile.in @@ -1,4 +1,6 @@ MODULE = slbcsp.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/slbcsp/main.c b/dlls/slbcsp/main.c index d0e74e6..4fd23be 100644 --- a/dlls/slbcsp/main.c +++ b/dlls/slbcsp/main.c @@ -16,8 +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/filtergraph: Add tests for asynchronous state change.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 6beabb2317812b47beae0f4d8a8436d56c45d43d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6beabb2317812b47beae0f4d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 20:13:20 2019 -0500 quartz/filtergraph: Add tests for asynchronous state change. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index d89c9e2..aec9392 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1163,6 +1163,8 @@ struct testfilter struct testpin *pins; unsigned int pin_count, enum_idx; + HRESULT state_hr; + IAMFilterMiscFlags IAMFilterMiscFlags_iface; ULONG misc_flags; @@ -1344,7 +1346,7 @@ static HRESULT WINAPI testfilter_Stop(IBaseFilter *iface) check_state_transition(filter, State_Stopped); filter->state = State_Stopped; - return S_OK; + return filter->state_hr; } static HRESULT WINAPI testfilter_Pause(IBaseFilter *iface) @@ -1355,7 +1357,7 @@ static HRESULT WINAPI testfilter_Pause(IBaseFilter *iface) check_state_transition(filter, State_Paused); filter->state = State_Paused; - return S_OK; + return filter->state_hr; } static HRESULT WINAPI testfilter_Run(IBaseFilter *iface, REFERENCE_TIME start) @@ -1367,7 +1369,7 @@ static HRESULT WINAPI testfilter_Run(IBaseFilter *iface, REFERENCE_TIME start) filter->state = State_Running; filter->start_time = start; - return S_OK; + return filter->state_hr; } static HRESULT WINAPI testfilter_GetState(IBaseFilter *iface, DWORD timeout, FILTER_STATE *state) @@ -1376,7 +1378,7 @@ static HRESULT WINAPI testfilter_GetState(IBaseFilter *iface, DWORD timeout, FIL if (winetest_debug > 1) trace("%p->GetState(%u)\n", filter, timeout); *state = filter->state; - return S_OK; + return filter->state_hr; } static HRESULT WINAPI testfilter_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock) @@ -2954,6 +2956,7 @@ static void test_filter_state(void) IReferenceClock *clock; IMediaControl *control; IMediaFilter *filter; + OAFilterState state; HRESULT hr; ULONG ref; @@ -3094,6 +3097,34 @@ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped); + sink.state_hr = S_FALSE; + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + sink.state_hr = VFW_S_STATE_INTERMEDIATE; + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + sink.state_hr = VFW_S_CANT_CUE; + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + sink.state_hr = VFW_S_STATE_INTERMEDIATE; + source.state_hr = VFW_S_CANT_CUE; + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + sink.state_hr = VFW_S_CANT_CUE; + source.state_hr = VFW_S_STATE_INTERMEDIATE; + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + sink.state_hr = source.state_hr = S_OK; + /* Destroying the graph while it's running stops all filters. */ hr = IMediaFilter_Run(filter, 0);

1 0

Zebediah Figura : strmbase/renderer: Store the sink pin inline in the BaseRenderer structure.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: b583452af37158db2c343c78bfaa73113dee24b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b583452af37158db2c343c78… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 20:13:19 2019 -0500 strmbase/renderer: Store the sink pin inline in the BaseRenderer structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 28 ++++----- dlls/quartz/videorenderer.c | 15 ++--- dlls/quartz/vmr9.c | 18 +++--- dlls/strmbase/renderer.c | 144 +++++++++++++++++++++----------------------- include/wine/strmbase.h | 2 +- 5 files changed, 98 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b583452af37158db2c34…

1 0

Zebediah Figura : strmbase/renderer: Remove some duplicated locks.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 2dafbe079e069e45abf94de3632e344aa1921983 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dafbe079e069e45abf94de3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 20:13:18 2019 -0500 strmbase/renderer: Remove some duplicated locks. The pin and filter locks are always equal. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 2 -- dlls/strmbase/renderer.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e4b50e2..21e56b4 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -363,13 +363,11 @@ static HRESULT WINAPI VideoRenderer_EndFlush(BaseRenderer* iface) if (This->renderer.pMediaSample) { ResetEvent(This->hEvent); - LeaveCriticalSection(iface->pInputPin->pin.pCritSec); LeaveCriticalSection(&iface->filter.csFilter); LeaveCriticalSection(&iface->csRenderLock); WaitForSingleObject(This->hEvent, INFINITE); EnterCriticalSection(&iface->csRenderLock); EnterCriticalSection(&iface->filter.csFilter); - EnterCriticalSection(iface->pInputPin->pin.pCritSec); } if (This->renderer.filter.state == State_Paused) { ResetEvent(This->hEvent); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b216166..38e1b6c 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -97,7 +97,6 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); hr = BaseInputPinImpl_EndOfStream(iface); - EnterCriticalSection(This->pin.pCritSec); if (SUCCEEDED(hr)) { if (pFilter->pFuncsTable->pfnEndOfStream) @@ -105,7 +104,6 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) else hr = BaseRendererImpl_EndOfStream(pFilter); } - LeaveCriticalSection(This->pin.pCritSec); LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr; @@ -121,7 +119,6 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); - EnterCriticalSection(This->pin.pCritSec); hr = BaseInputPinImpl_BeginFlush(iface); if (SUCCEEDED(hr)) { @@ -130,7 +127,6 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) else hr = BaseRendererImpl_BeginFlush(pFilter); } - LeaveCriticalSection(This->pin.pCritSec); LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr; @@ -146,7 +142,6 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); - EnterCriticalSection(This->pin.pCritSec); hr = BaseInputPinImpl_EndFlush(iface); if (SUCCEEDED(hr)) { @@ -155,7 +150,6 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) else hr = BaseRendererImpl_EndFlush(pFilter); } - LeaveCriticalSection(This->pin.pCritSec); LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr;

1 0

Zebediah Figura : strmbase/transform: Store the pins inline in the TransformFilter structure.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 2d5c9d0666e7b007af4535e34c72040e161a5d22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d5c9d0666e7b007af4535e3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 20:13:17 2019 -0500 strmbase/transform: Store the pins inline in the TransformFilter structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 13 +-- dlls/quartz/avidec.c | 11 +-- dlls/strmbase/transform.c | 172 ++++++++++++++------------------------- dlls/winegstreamer/gsttffilter.c | 4 +- dlls/wineqtdecoder/qtvdecoder.c | 4 +- include/wine/strmbase.h | 17 ++-- 6 files changed, 78 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d5c9d0666e7b007af45…

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
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