winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
December 2019
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
635 discussions
Start a n
N
ew thread
João Diogo Ferreira : kernel32: Properly handle GEO_NATION and GEO_ID in GetGeoInfoW().
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: c93aa1095e1e70d9466e7c7063bd89181acb2f2a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c93aa1095e1e70d9466e7c70…
Author: João Diogo Ferreira <devilj(a)outlook.pt> Date: Mon Dec 2 21:39:44 2019 +0000 kernel32: Properly handle GEO_NATION and GEO_ID in GetGeoInfoW(). Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 31 +++++++++++++++++++++++++++++++ dlls/kernel32/tests/locale.c | 40 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 4d4b99660a..5b196be2d5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2908,6 +2908,34 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) /****************************************************************************** * GetGeoInfoW (KERNEL32.@) + * + * Retrieves information about a geographic location by its GeoID. + * + * PARAMS + * geoid [I] The GeoID of the location of interest. + * geotype [I] The type of information to be retrieved (SYSGEOTYPE enum from "winnls.h"). + * data [O] The output buffer to store the information. + * data_len [I] The length of the buffer, measured in WCHARs and including the null terminator. + * lang [I] Language identifier. Must be 0 unless geotype is GEO_RFC1766 or GEO_LCID. + * + * RETURNS + * Success: The number of WCHARs (including null) written to the buffer -or- + * if no buffer was provided, the minimum length required to hold the full data. + * Failure: Zero. Call GetLastError() to determine the cause. + * + * NOTES + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: the GeoID provided was invalid. + * - ERROR_INVALID_FLAGS: the specified geotype was invalid. + * - ERROR_INSUFFICIENT_BUFFER: the provided buffer was too small to hold the full data. + * - ERROR_CALL_NOT_IMPLEMENTED: (Wine implementation) we don't handle that geotype yet. + * + * The list of available GeoIDs can be retrieved with EnumSystemGeoID(), + * or call GetUserGeoID() to retrieve the user's current location. + * + * TODO + * Currently, we only handle the following geotypes: GEO_ID, GEO_ISO2, GEO_ISO3, + * GEO_ISO_UN_NUMBER, GEO_PARENT and GEO_NATION. */ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, LANGID lang) { @@ -2926,6 +2954,9 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, switch (geotype) { case GEO_NATION: + if (ptr->kind != LOCATION_NATION) return 0; + /* fall through */ + case GEO_ID: sprintfW(buffW, fmtW, ptr->id); break; case GEO_ISO_UN_NUMBER: diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index ee38dc36ac..de1d4fca22 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4984,11 +4984,43 @@ static void test_GetGeoInfo(void) ok(!strcmp(buffA, "RU"), "got %s\n", buffA); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d\n", GetLastError()); - /* GEO_NATION returns GEOID in a string form */ + /* GEO_NATION returns GEOID in a string form, but only for GEOCLASS_NATION-type IDs */ + ret = pGetGeoInfoA(203, GEO_NATION, buffA, 20, 0); /* GEOCLASS_NATION */ + ok(ret == 4, "GEO_NATION of nation: expected 4, got %d\n", ret); + ok(!strcmp(buffA, "203"), "GEO_NATION of nation: expected 203, got %s\n", buffA); + buffA[0] = 0; - ret = pGetGeoInfoA(203, GEO_NATION, buffA, 20, 0); - ok(ret == 4, "got %d\n", ret); - ok(!strcmp(buffA, "203"), "got %s\n", buffA); + ret = pGetGeoInfoA(39070, GEO_NATION, buffA, 20, 0); /* GEOCLASS_REGION */ + ok(ret == 0, "GEO_NATION of region: expected 0, got %d\n", ret); + ok(*buffA == 0, "GEO_NATION of region: expected empty string, got %s\n", buffA); + + buffA[0] = 0; + ret = pGetGeoInfoA(333, GEO_NATION, buffA, 20, 0); /* LOCATION_BOTH internal Wine type */ + ok(ret == 0 || + broken(ret == 4) /* Win7 and older */, + "GEO_NATION of LOCATION_BOTH: expected 0, got %d\n", ret); + ok(*buffA == 0 || + broken(!strcmp(buffA, "333")) /* Win7 and older */, + "GEO_NATION of LOCATION_BOTH: expected empty string, got %s\n", buffA); + + /* GEO_ID is like GEO_NATION but works for any ID */ + buffA[0] = 0; + ret = pGetGeoInfoA(203, GEO_ID, buffA, 20, 0); /* GEOCLASS_NATION */ + if (ret == 0) + win_skip("GEO_ID not supported.\n"); + else + { + ok(ret == 4, "GEO_ID: expected 4, got %d\n", ret); + ok(!strcmp(buffA, "203"), "GEO_ID: expected 203, got %s\n", buffA); + + ret = pGetGeoInfoA(47610, GEO_ID, buffA, 20, 0); /* GEOCLASS_REGION */ + ok(ret == 6, "got %d\n", ret); + ok(!strcmp(buffA, "47610"), "got %s\n", buffA); + + ret = pGetGeoInfoA(333, GEO_ID, buffA, 20, 0); /* LOCATION_BOTH internal Wine type */ + ok(ret == 4, "got %d\n", ret); + ok(!strcmp(buffA, "333"), "got %s\n", buffA); + } /* GEO_PARENT */ buffA[0] = 0;
1
0
0
0
Zebediah Figura : qedit/samplegrabber: Use BaseFilterImpl_JoinFilterGraph().
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: 3ee43f85b0d504286958086e3a0ed22885575845 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=3ee43f85b0d504286958086e…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 22:03:31 2019 -0600 qedit/samplegrabber: Use BaseFilterImpl_JoinFilterGraph(). Manual testing shows that adding or removing the filter does not affect whether it is in one-shot mode. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 9dd8c02b23..af05966c14 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -66,11 +66,6 @@ static inline SG_Impl *impl_from_strmbase_filter(struct strmbase_filter *iface) return CONTAINING_RECORD(iface, SG_Impl, filter); } -static inline SG_Impl *impl_from_IBaseFilter(IBaseFilter *iface) -{ - return CONTAINING_RECORD(iface, SG_Impl, filter.IBaseFilter_iface); -} - static inline SG_Impl *impl_from_ISampleGrabber(ISampleGrabber *iface) { return CONTAINING_RECORD(iface, SG_Impl, ISampleGrabber_iface); @@ -198,22 +193,6 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample) } } -/* IBaseFilter */ -static HRESULT WINAPI -SampleGrabber_IBaseFilter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *graph, LPCWSTR name) -{ - SG_Impl *This = impl_from_IBaseFilter(iface); - - TRACE("(%p)->(%p, %s)\n", This, graph, debugstr_w(name)); - - BaseFilterImpl_JoinFilterGraph(iface, graph, name); - This->oneShot = OneShot_None; - - return S_OK; -} - -/* SampleGrabber implementation of ISampleGrabber interface */ - /* IUnknown */ static HRESULT WINAPI SampleGrabber_ISampleGrabber_QueryInterface(ISampleGrabber *iface, REFIID riid, void **ppv) @@ -525,7 +504,7 @@ static const IBaseFilterVtbl IBaseFilter_VTable = BaseFilterImpl_EnumPins, BaseFilterImpl_FindPin, BaseFilterImpl_QueryFilterInfo, - SampleGrabber_IBaseFilter_JoinFilterGraph, + BaseFilterImpl_JoinFilterGraph, BaseFilterImpl_QueryVendorInfo, };
1
0
0
0
Zebediah Figura : wineqtdecoder: Don't expose IMediaSeeking from the filter.
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: ab57793f2cc42b68faa1213a278a607e386525df URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ab57793f2cc42b68faa1213a…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 22:03:30 2019 -0600 wineqtdecoder: Don't expose IMediaSeeking from the filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index c021fec8af..28ea36785a 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -381,37 +381,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) return &This->filter.IUnknown_inner; } -static HRESULT WINAPI QT_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv) -{ - QTSplitter *This = impl_from_IBaseFilter(iface); - TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IPersist)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IMediaFilter)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->sourceSeeking; - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow) && - !IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - FIXME("No interface for %s!\n", debugstr_guid(riid)); - - return E_NOINTERFACE; -} - static OSErr QT_Create_Extract_Session(QTSplitter *filter) { AudioStreamBasicDescription aDesc; @@ -753,7 +722,7 @@ audio_error: } static const IBaseFilterVtbl QT_Vtbl = { - QT_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, @@ -1220,7 +1189,7 @@ static HRESULT WINAPI QTOutPin_QueryInterface(IPin *iface, REFIID riid, void **p else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; else if (IsEqualIID(riid, &IID_IMediaSeeking)) - return IBaseFilter_QueryInterface(&This->pin.pin.filter->IBaseFilter_iface, &IID_IMediaSeeking, ppv); + *ppv = &This->sourceSeeking.IMediaSeeking_iface; else if (IsEqualIID(riid, &IID_IQualityControl)) *ppv = &This->IQualityControl_iface;
1
0
0
0
Zebediah Figura : wineqtdecoder: Don't expose IMediaSeeking from the sink pin.
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: 7843dc36b0086be00efd4a998567fc418eb12caa URL:
https://source.winehq.org/git/wine.git/?a=commit;h=7843dc36b0086be00efd4a99…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 22:03:29 2019 -0600 wineqtdecoder: Don't expose IMediaSeeking from the sink pin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index f22e014e1b..c021fec8af 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1168,34 +1168,8 @@ static HRESULT WINAPI QTInPin_NewSegment(IPin *iface, REFERENCE_TIME tStart, REF return S_OK; } -static HRESULT WINAPI QTInPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) -{ - QTInPin *This = impl_from_IPin(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - return IBaseFilter_QueryInterface(&This->pin.filter->IBaseFilter_iface, &IID_IMediaSeeking, ppv); - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - FIXME("No interface for %s!\n", debugstr_guid(riid)); - - return E_NOINTERFACE; -} - static const IPinVtbl QT_InputPin_Vtbl = { - QTInPin_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect,
1
0
0
0
Zebediah Figura : wineqtdecoder: Use strmbase filter state change methods.
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: 498179b4482026091bf7376c0d2ac9a036e7ca0e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=498179b4482026091bf7376c…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 22:03:28 2019 -0600 wineqtdecoder: Use strmbase filter state change methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 107 +++++++++++++++------------------------- 1 file changed, 40 insertions(+), 67 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 81e18d3420..f22e014e1b 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -160,7 +160,6 @@ typedef struct QTSplitter { HANDLE runEvent; DWORD outputSize; - FILTER_STATE state; CRITICAL_SECTION csReceive; SourceSeeking sourceSeeking; @@ -281,10 +280,46 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) CoTaskMemFree(filter); } +static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE_TIME time) +{ + QTSplitter *filter = impl_from_strmbase_filter(iface); + HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; + + EnterCriticalSection(&This->csReceive); + + if (filter->pVideo_Pin) + pin_hr = BaseOutputPinImpl_Active(&filter->pVideo_Pin->pin); + if (SUCCEEDED(pin_hr)) + hr = pin_hr; + if (filter->pAudio_Pin) + pin_hr = BaseOutputPinImpl_Active(&filter->pAudio_Pin->pin); + if (SUCCEEDED(pin_hr)) + hr = pin_hr; + SetEvent(filter->runEvent); + + LeaveCriticalSection(&This->csReceive); + + return hr; +} + +static HRESULT qt_splitter_cleanup_stream(struct strmbase_filter *iface) +{ + QTSplitter *filter = impl_from_strmbase_filter(iface); + + EnterCriticalSection(&This->csReceive); + IAsyncReader_BeginFlush(filter->pInputPin.pReader); + IAsyncReader_EndFlush(filter->pInputPin.pReader); + LeaveCriticalSection(&This->csReceive); + + return S_OK; +} + static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = qt_splitter_get_pin, .filter_destroy = qt_splitter_destroy, + .filter_start_stream = qt_splitter_start_stream, + .filter_cleanup_stream = qt_splitter_cleanup_stream, }; static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) @@ -329,7 +364,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) This->pVideo_Pin = NULL; This->pAudio_Pin = NULL; - This->state = State_Stopped; This->aSession = NULL; This->runEvent = CreateEventW(NULL, 0, 0, NULL); @@ -378,28 +412,6 @@ static HRESULT WINAPI QT_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID return E_NOINTERFACE; } -static HRESULT WINAPI QT_Stop(IBaseFilter *iface) -{ - QTSplitter *This = impl_from_IBaseFilter(iface); - - TRACE("()\n"); - - EnterCriticalSection(&This->csReceive); - IAsyncReader_BeginFlush(This->pInputPin.pReader); - IAsyncReader_EndFlush(This->pInputPin.pReader); - LeaveCriticalSection(&This->csReceive); - - return S_OK; -} - -static HRESULT WINAPI QT_Pause(IBaseFilter *iface) -{ - HRESULT hr = S_OK; - TRACE("()\n"); - - return hr; -} - static OSErr QT_Create_Extract_Session(QTSplitter *filter) { AudioStreamBasicDescription aDesc; @@ -534,7 +546,6 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) return 0; } - This->state = State_Running; /* Prime the pump: Needed for MPEG streams */ GetMovieNextInterestingTime(This->pQTMovie, nextTimeEdgeOK | nextTimeStep, 0, NULL, This->movie_time, 1, &next_time, NULL); @@ -733,7 +744,6 @@ audio_error: LeaveCriticalSection(&This->csReceive); } while (hr == S_OK); - This->state = State_Stopped; if (This->pAudio_Pin) OutputQueue_EOS(This->pAudio_Pin->queue); if (This->pVideo_Pin) @@ -742,52 +752,15 @@ audio_error: return hr; } -static HRESULT WINAPI QT_Run(IBaseFilter *iface, REFERENCE_TIME tStart) -{ - HRESULT hr = S_OK; - QTSplitter *This = impl_from_IBaseFilter(iface); - HRESULT hr_any = VFW_E_NOT_CONNECTED; - - TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); - - EnterCriticalSection(&This->csReceive); - - if (This->pVideo_Pin) - hr = BaseOutputPinImpl_Active(&This->pVideo_Pin->pin); - if (SUCCEEDED(hr)) - hr_any = hr; - if (This->pAudio_Pin) - hr = BaseOutputPinImpl_Active(&This->pAudio_Pin->pin); - if (SUCCEEDED(hr)) - hr_any = hr; - - hr = hr_any; - - SetEvent(This->runEvent); - LeaveCriticalSection(&This->csReceive); - - return hr; -} - -static HRESULT WINAPI QT_GetState(IBaseFilter *iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) -{ - QTSplitter *This = impl_from_IBaseFilter(iface); - TRACE("(%d, %p)\n", dwMilliSecsTimeout, pState); - - *pState = This->state; - - return S_OK; -} - static const IBaseFilterVtbl QT_Vtbl = { QT_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, - QT_Stop, - QT_Pause, - QT_Run, - QT_GetState, + BaseFilterImpl_Stop, + BaseFilterImpl_Pause, + BaseFilterImpl_Run, + BaseFilterImpl_GetState, BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins,
1
0
0
0
Zebediah Figura : winegstreamer: Fix the timeout passed to gst_element_get_state().
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: 60680651d77c7e6266e1ac76070bb7b5ee5afac9 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=60680651d77c7e6266e1ac76…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 22:03:27 2019 -0600 winegstreamer: Fix the timeout passed to gst_element_get_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 753286a718..e024d27197 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1324,7 +1324,7 @@ static HRESULT gstdemux_wait_state(struct strmbase_filter *iface, DWORD timeout) return S_OK; ret = gst_element_get_state(filter->container, NULL, NULL, - timeout == INFINITE ? GST_CLOCK_TIME_NONE : timeout * 1000); + timeout == INFINITE ? GST_CLOCK_TIME_NONE : timeout * 1000000); if (ret == GST_STATE_CHANGE_FAILURE) { ERR("Failed to get state.\n");
1
0
0
0
Michael Stefaniuc : dmime/tests: Add GetParam/SetParam tests for unsupported types.
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: badea4cae0a35171afe9eefc77f3bce8aa8063d4 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=badea4cae0a35171afe9eefc…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 23:51:26 2019 +0100 dmime/tests: Add GetParam/SetParam tests for unsupported types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index a35470b4cd..e8fa6a596d 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -712,10 +712,20 @@ static void test_track(void) else if (class[i].clsid == &CLSID_DirectMusicWaveTrack) expect_getparam(dmt, param_types[j].type, param_types[j].name, DMUS_E_GET_UNSUPPORTED); - } else + } else { ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[j].name, hr); + expect_getparam(dmt, param_types[j].type, param_types[j].name, + DMUS_E_GET_UNSUPPORTED); + if (class[i].clsid == &CLSID_DirectMusicWaveTrack) + expect_setparam(dmt, param_types[j].type, param_types[j].name, + DMUS_E_TYPE_UNSUPPORTED); + else + expect_setparam(dmt, param_types[j].type, param_types[j].name, + DMUS_E_SET_UNSUPPORTED); + } + /* GetParam / SetParam for IsParamSupported supported types */ if (class[i].clsid == &CLSID_DirectMusicTimeSigTrack) { expect_getparam(dmt, &GUID_DisableTimeSig, "GUID_DisableTimeSig",
1
0
0
0
Michael Stefaniuc : dmime: Tempo track supports only GUID_TempoParam in GetParam().
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: ca060d45e32c265ef531c8d1f40f4c8234f1dba2 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ca060d45e32c265ef531c8d1…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 23:51:25 2019 +0100 dmime: Tempo track supports only GUID_TempoParam in GetParam(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tempotrack.c | 77 +++++++++++++++++++++--------------------------- dlls/dmime/tests/dmime.c | 5 ++++ 2 files changed, 39 insertions(+), 43 deletions(-) diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 442aec37bf..94e4430b7f 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -153,52 +153,43 @@ static HRESULT WINAPI tempo_track_Play(IDirectMusicTrack8 *iface, void *pStateDa return S_OK; } -static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + MUSIC_TIME *next, void *param) { - IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - - HRESULT hr = S_OK; - struct list* pEntry = NULL; - LPDMUS_PRIVATE_TEMPO_ITEM pIt = NULL; - DMUS_TEMPO_PARAM* prm = pParam; - - FIXME("(%p, %s, %d, %p, %p): almost stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - - if (NULL == pParam) { - return E_POINTER; - } + IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); + DMUS_PRIVATE_TEMPO_ITEM *item = NULL; + DMUS_TEMPO_PARAM *prm = param; + + TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + + if (!param) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_TempoParam)) + return DMUS_E_GET_UNSUPPORTED; + + FIXME("Partial support for GUID_TempoParam\n"); + + if (next) + *next = 0; + prm->mtTime = 0; + prm->dblTempo = 0.123456; + + LIST_FOR_EACH_ENTRY(item, &This->Items, DMUS_PRIVATE_TEMPO_ITEM, entry) { + if (item->item.lTime <= time) { + MUSIC_TIME ofs = item->item.lTime - time; + if (ofs > prm->mtTime) { + prm->mtTime = ofs; + prm->dblTempo = item->item.dblTempo; + } + if (next && item->item.lTime > time && item->item.lTime < *next) + *next = item->item.lTime; + } + } - hr = IDirectMusicTrack_IsParamSupported (iface, rguidType); - if (FAILED(hr)) { - return hr; - } + if (0.123456 == prm->dblTempo) + return DMUS_E_NOT_FOUND; - if (NULL != pmtNext) *pmtNext = 0; - prm->mtTime = 0; - prm->dblTempo = 0.123456; - - LIST_FOR_EACH (pEntry, &This->Items) { - pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_TEMPO_ITEM, entry); - /*TRACE(" - %p -> 0x%lx,%p\n", pIt, pIt->item.lTime, pIt->item.dblTempo);*/ - if (pIt->item.lTime <= mtTime) { - MUSIC_TIME ofs = pIt->item.lTime - mtTime; - if (ofs > prm->mtTime) { - prm->mtTime = ofs; - prm->dblTempo = pIt->item.dblTempo; - } - if (NULL != pmtNext && pIt->item.lTime > mtTime) { - if (pIt->item.lTime < *pmtNext) { - *pmtNext = pIt->item.lTime; - } - } - } - } - - if (0.123456 == prm->dblTempo) { - return DMUS_E_NOT_FOUND; - } - return S_OK; + return S_OK; } static HRESULT WINAPI tempo_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 3e25328cd8..a35470b4cd 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -724,6 +724,11 @@ static void test_track(void) DMUS_E_GET_UNSUPPORTED); expect_setparam(dmt, &GUID_TimeSignature, "GUID_TimeSignature", DMUS_E_SET_UNSUPPORTED); + } else if (class[i].clsid == &CLSID_DirectMusicTempoTrack) { + expect_getparam(dmt, &GUID_DisableTempo, "GUID_DisableTempo", + DMUS_E_GET_UNSUPPORTED); + expect_getparam(dmt, &GUID_EnableTempo, "GUID_EnableTempo", + DMUS_E_GET_UNSUPPORTED); } } } else {
1
0
0
0
Michael Stefaniuc : dmime: Partial implementation of the Tempo track SetParam().
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: dc96d1b1557d74ff64c36f41f6f9894f65494a15 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=dc96d1b1557d74ff64c36f41…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 23:51:24 2019 +0100 dmime: Partial implementation of the Tempo track SetParam(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tempotrack.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 6038f7ce9f..442aec37bf 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -201,12 +201,33 @@ static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rg return S_OK; } -static HRESULT WINAPI tempo_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI tempo_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + void *param) { - IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (IsEqualGUID(type, &GUID_DisableTempo)) { + if (!param) + return DMUS_E_TYPE_DISABLED; + FIXME("GUID_DisableTempo not handled yet\n"); + return S_OK; + } + if (IsEqualGUID(type, &GUID_EnableTempo)) { + if (!param) + return DMUS_E_TYPE_DISABLED; + FIXME("GUID_EnableTempo not handled yet\n"); + return S_OK; + } + if (IsEqualGUID(type, &GUID_TempoParam)) { + if (!param) + return E_POINTER; + FIXME("GUID_TempoParam not handled yet\n"); + return S_OK; + } + + return DMUS_E_SET_UNSUPPORTED; } static HRESULT WINAPI tempo_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType)
1
0
0
0
Michael Stefaniuc : dmime: Partial implementation of the TimeSig track Get/SetParam.
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: 2ff339f9ad513ac37f5640b6bbf3321b4c8bb08c URL:
https://source.winehq.org/git/wine.git/?a=commit;h=2ff339f9ad513ac37f5640b6…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 23:51:23 2019 +0100 dmime: Partial implementation of the TimeSig track Get/SetParam. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 9 +++++++++ dlls/dmime/timesigtrack.c | 38 ++++++++++++++++++++++++++++---------- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index a08fc19c22..3e25328cd8 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -716,6 +716,15 @@ static void test_track(void) ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[j].name, hr); + /* GetParam / SetParam for IsParamSupported supported types */ + if (class[i].clsid == &CLSID_DirectMusicTimeSigTrack) { + expect_getparam(dmt, &GUID_DisableTimeSig, "GUID_DisableTimeSig", + DMUS_E_GET_UNSUPPORTED); + expect_getparam(dmt, &GUID_EnableTimeSig, "GUID_EnableTimeSig", + DMUS_E_GET_UNSUPPORTED); + expect_setparam(dmt, &GUID_TimeSignature, "GUID_TimeSignature", + DMUS_E_SET_UNSUPPORTED); + } } } else { hr = IDirectMusicTrack_GetParam(dmt, NULL, 0, NULL, NULL); diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 74b2c3652d..697b3e3593 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -117,20 +117,38 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void return S_OK; } -static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { - IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); + + TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + + if (IsEqualGUID(type, &GUID_TimeSignature)) { + FIXME("GUID_TimeSignature not handled yet\n"); + return DMUS_E_NOT_FOUND; + } + + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, REFGUID type, + MUSIC_TIME time, void *param) { - IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (IsEqualGUID(type, &GUID_DisableTimeSig)) { + FIXME("GUID_DisableTimeSig not handled yet\n"); + return S_OK; + } + if (IsEqualGUID(type, &GUID_EnableTimeSig)) { + FIXME("GUID_EnableTimeSig not handled yet\n"); + return S_OK; + } + + return DMUS_E_SET_UNSUPPORTED; } static HRESULT WINAPI IDirectMusicTrackImpl_IsParamSupported(IDirectMusicTrack *iface,
1
0
0
0
← Newer
1
...
52
53
54
55
56
57
58
...
64
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
Results per page:
10
25
50
100
200