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
Michael Stefaniuc : dmime: Partial implementation of the Wave track Get/SetParam.
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: d4233399607b33fd114a92275ee8c8dc10e3205f URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d4233399607b33fd114a9227…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 23:51:22 2019 +0100 dmime: Partial implementation of the Wave 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 | 3 +++ dlls/dmime/wavetrack.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 723dc88399..a08fc19c22 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -709,6 +709,9 @@ static void test_track(void) } else if (class[i].clsid == &CLSID_DirectMusicMarkerTrack) expect_setparam(dmt, param_types[j].type, param_types[j].name, DMUS_E_SET_UNSUPPORTED); + else if (class[i].clsid == &CLSID_DirectMusicWaveTrack) + expect_getparam(dmt, param_types[j].type, param_types[j].name, + DMUS_E_GET_UNSUPPORTED); } else ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 34adca6065..1c6b08b523 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -120,20 +120,48 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *pStateDat return S_OK; } -static HRESULT WINAPI wave_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI wave_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + MUSIC_TIME *next, void *param) { - IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + void *param) { - IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (IsEqualGUID(type, &GUID_Disable_Auto_Download)) { + FIXME("GUID_Disable_Auto_Download not handled yet\n"); + return S_OK; + } + if (IsEqualGUID(type, &GUID_Download)) { + FIXME("GUID_Download not handled yet\n"); + return S_OK; + } + if (IsEqualGUID(type, &GUID_DownloadToAudioPath)) { + FIXME("GUID_DownloadToAudioPath not handled yet\n"); + return S_OK; + } + if (IsEqualGUID(type, &GUID_Enable_Auto_Download)) { + FIXME("GUID_Enable_Auto_Download not handled yet\n"); + return S_OK; + } + if (IsEqualGUID(type, &GUID_Unload)) { + FIXME("GUID_Unload not handled yet\n"); + return S_OK; + } + if (IsEqualGUID(type, &GUID_UnloadFromAudioPath)) { + FIXME("GUID_UnloadFromAudioPath not handled yet\n"); + return S_OK; + } + + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type)
1
0
0
0
Michael Stefaniuc : dmime: Partial implementation of the Marker track Get/SetParam.
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: d827b65204571198f8e2e9deb2eb53f600315644 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d827b65204571198f8e2e9de…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 23:51:21 2019 +0100 dmime: Partial implementation of the Marker track Get/SetParam. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/markertrack.c | 35 +++++++++++++++++++++++++---------- dlls/dmime/tests/dmime.c | 4 +++- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index 32dd025ed4..f41bed668a 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -117,20 +117,35 @@ 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) { - IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); + + TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + + if (!param) + return E_POINTER; + + if (IsEqualGUID(type, &GUID_Play_Marker)) { + FIXME("GUID_Play_Marker not handled yet\n"); + return S_FALSE; + } + if (IsEqualGUID(type, &GUID_Valid_Start_Time)) { + FIXME("GUID_Valid_Start_Time 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) { - IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); + + TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + return DMUS_E_SET_UNSUPPORTED; } static HRESULT WINAPI IDirectMusicTrackImpl_IsParamSupported(IDirectMusicTrack *iface, diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 0f4c43700c..723dc88399 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -706,7 +706,9 @@ static void test_track(void) expect_getparam(dmt, param_types[j].type, param_types[j].name, DMUS_E_GET_UNSUPPORTED); expect_setparam(dmt, param_types[j].type, param_types[j].name, S_OK); - } + } else if (class[i].clsid == &CLSID_DirectMusicMarkerTrack) + expect_setparam(dmt, param_types[j].type, param_types[j].name, + DMUS_E_SET_UNSUPPORTED); } else ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n",
1
0
0
0
Michael Stefaniuc : dmime: Implement the SegTrigger track Get/SetParam.
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: d08bce15bcb6cd9d04a8f77170252b9f735aff42 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d08bce15bcb6cd9d04a8f771…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 23:51:20 2019 +0100 dmime: Implement the SegTrigger track Get/SetParam. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segtriggertrack.c | 23 ++++++++++++----------- dlls/dmime/tests/dmime.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 7e1d75aa05..d36412cfc3 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -134,20 +134,22 @@ static HRESULT WINAPI segment_track_Play(IDirectMusicTrack8 *iface, void *pState return S_OK; } -static HRESULT WINAPI segment_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI segment_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { - IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI segment_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI segment_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) { - IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + return S_OK; } static HRESULT WINAPI segment_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) @@ -155,7 +157,6 @@ static HRESULT WINAPI segment_track_IsParamSupported(IDirectMusicTrack8 *iface, IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); - return S_OK; } diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index f561eb391e..0f4c43700c 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -604,6 +604,26 @@ static void test_track_identify(void) IDirectMusicSegment8_Release(seg); } +static void expect_getparam(IDirectMusicTrack *track, REFGUID type, const char *name, + HRESULT expect) +{ + HRESULT hr; + char buf[64] = { 0 }; + + hr = IDirectMusicTrack8_GetParam(track, type, 0, NULL, buf); + ok(hr == expect, "GetParam(%s) failed: %08x, expected %08x\n", name, hr, expect); +} + +static void expect_setparam(IDirectMusicTrack *track, REFGUID type, const char *name, + HRESULT expect) +{ + HRESULT hr; + char buf[64] = { 0 }; + + hr = IDirectMusicTrack8_SetParam(track, type, 0, buf); + ok(hr == expect, "SetParam(%s) failed: %08x, expected %08x\n", name, hr, expect); +} + static void test_track(void) { IDirectMusicTrack *dmt; @@ -679,10 +699,15 @@ static void test_track(void) if (class[i].has_params != ~0) { for (j = 0; j < ARRAY_SIZE(param_types); j++) { hr = IDirectMusicTrack8_IsParamSupported(dmt, param_types[j].type); - if (class[i].has_params & (1 << j)) + if (class[i].has_params & (1 << j)) { ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", param_types[j].name, hr); - else + if (class[i].clsid == &CLSID_DirectMusicSegmentTriggerTrack) { + expect_getparam(dmt, param_types[j].type, param_types[j].name, + DMUS_E_GET_UNSUPPORTED); + expect_setparam(dmt, param_types[j].type, param_types[j].name, S_OK); + } + } else ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[j].name, hr);
1
0
0
0
Michael Stefaniuc : dmime: Implement the ParamControl track param methods.
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: c88fd286f3af0ee33afd69671dd4b6413601653d URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c88fd286f3af0ee33afd6967…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 23:51:19 2019 +0100 dmime: Implement the ParamControl track param methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/paramcontroltrack.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index 03d69d056c..8fb3d40332 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -118,31 +118,30 @@ static HRESULT WINAPI paramcontrol_track_Play(IDirectMusicTrack8 *iface, void *p return S_OK; } -static HRESULT WINAPI paramcontrol_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI paramcontrol_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { - IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI paramcontrol_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI paramcontrol_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) { - IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + return DMUS_E_SET_UNSUPPORTED; } -static HRESULT WINAPI paramcontrol_track_IsParamSupported(IDirectMusicTrack8 *iface, - REFGUID rguidType) +static HRESULT WINAPI paramcontrol_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); + IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + TRACE("(%p, %s): param type not supported\n", This, debugstr_dmguid(type)); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI paramcontrol_track_AddNotificationType(IDirectMusicTrack8 *iface,
1
0
0
0
Michael Stefaniuc : dmime: Implement the Lyrics track param methods.
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: 85b966250a6f6a371c5737f532b0d6b951a5cb5d URL:
https://source.winehq.org/git/wine.git/?a=commit;h=85b966250a6f6a371c5737f5…
Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 23:51:18 2019 +0100 dmime: Implement the Lyrics track param methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/lyricstrack.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index 7554356ba4..49f44f52a3 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -117,30 +117,30 @@ static HRESULT WINAPI lyrics_track_Play(IDirectMusicTrack8 *iface, void *pStateD return S_OK; } -static HRESULT WINAPI lyrics_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI lyrics_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { - IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI lyrics_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI lyrics_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) { - IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + return DMUS_E_SET_UNSUPPORTED; } -static HRESULT WINAPI lyrics_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI lyrics_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); + IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + TRACE("(%p, %s): param type not supported\n", This, debugstr_dmguid(type)); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI lyrics_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype)
1
0
0
0
Zhiyi Zhang : user32/tests: Use a higher resolution in test_ChangeDisplaySettingsEx().
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: 11065839f5ec521e2711098797ec0c23efffb760 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=11065839f5ec521e27110987…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 3 22:40:00 2019 +0800 user32/tests: Use a higher resolution in test_ChangeDisplaySettingsEx(). 640x480 is not supported on some Windows 10 versions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 4268dba9c5..567870e3d1 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -234,20 +234,20 @@ struct vid_mode }; static const struct vid_mode vid_modes_test[] = { - {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY, 0}, - {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, - {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL , 0}, - {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT , 1}, - {640, 480, 0, 0, DM_BITSPERPEL , 0}, - {640, 480, 0, 0, DM_DISPLAYFREQUENCY, 0}, + {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY, 0}, + {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, + {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL , 0}, + {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT , 1}, + {1024, 768, 0, 0, DM_BITSPERPEL , 0}, + {1024, 768, 0, 0, DM_DISPLAYFREQUENCY, 0}, {0, 0, 0, 0, DM_PELSWIDTH, 0}, {0, 0, 0, 0, DM_PELSHEIGHT, 0}, - {640, 480, 0, 0, DM_PELSWIDTH, 0}, - {640, 480, 0, 0, DM_PELSHEIGHT, 0}, - { 0, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, 0}, - {640, 0, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, 0}, + {1024, 768, 0, 0, DM_PELSWIDTH, 0}, + {1024, 768, 0, 0, DM_PELSHEIGHT, 0}, + { 0, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, 0}, + {1024, 0, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, 0}, /* the following test succeeds under XP SP3 {0, 0, 0, 0, DM_DISPLAYFREQUENCY, 0}
1
0
0
0
Zhiyi Zhang : user32/tests: Test cursor clip rectangles in per-monitor aware context.
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: dbab697da850cbb3b3f3030e674307c2b93391ca URL:
https://source.winehq.org/git/wine.git/?a=commit;h=dbab697da850cbb3b3f3030e…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 3 22:38:15 2019 +0800 user32/tests: Test cursor clip rectangles in per-monitor aware context. So the tests don't fail in HiDPI environment. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ca87a89deb..4268dba9c5 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -28,6 +28,7 @@ static HMODULE hdll; static LONG (WINAPI *pGetDisplayConfigBufferSizes)(UINT32,UINT32*,UINT32*); +static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static void init_function_pointers(void) { @@ -39,6 +40,7 @@ static void init_function_pointers(void) trace("GetProcAddress(%s) failed\n", #func); GET_PROC(GetDisplayConfigBufferSizes) + GET_PROC(SetThreadDpiAwarenessContext) #undef GET_PROC } @@ -254,6 +256,7 @@ static const struct vid_mode vid_modes_test[] = { static void test_ChangeDisplaySettingsEx(void) { + DPI_AWARENESS_CONTEXT context = NULL; DEVMODEA dm; DEVMODEW dmW; DWORD width; @@ -328,6 +331,11 @@ static void test_ChangeDisplaySettingsEx(void) res == DISP_CHANGE_BADMODE /* XP SP3 */, "ChangeDisplaySettingsExW returned %d\n", res); + /* Test clip rectangle after resolution changes */ + /* GetClipCursor always returns result in physical pixels but GetSystemMetrics(SM_CX/CYVIRTUALSCREEN) are not. + * Set per-monitor aware context so that virtual screen rectangles are in physical pixels */ + if (pSetThreadDpiAwarenessContext) + context = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE); memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); @@ -384,6 +392,8 @@ static void test_ChangeDisplaySettingsEx(void) ClipCursor(&virt); } } + if (pSetThreadDpiAwarenessContext && context) + pSetThreadDpiAwarenessContext(context); res = ChangeDisplaySettingsExA(NULL, NULL, NULL, CDS_RESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "Failed to reset default resolution: %d\n", res); }
1
0
0
0
Zhiyi Zhang : user32/tests: Import functions if possible.
by Alexandre Julliard
04 Dec '19
04 Dec '19
Module: wine Branch: master Commit: 4fc651db925dcc257cab57e477658a641f87985e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=4fc651db925dcc257cab57e4…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 3 22:37:50 2019 +0800 user32/tests: Import functions if possible. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 126 +++++++++++++------------------------------- 1 file changed, 36 insertions(+), 90 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=4fc651db925dcc257cab…
1
0
0
0
Chip Davis : winemac.drv: Also stop dragging if we receive a mouse up event.
by Alexandre Julliard
03 Dec '19
03 Dec '19
Module: wine Branch: master Commit: 5cf64084fb6f277c3453099a65a78817d5c9f1db URL:
https://source.winehq.org/git/wine.git/?a=commit;h=5cf64084fb6f277c3453099a…
Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Nov 24 20:14:51 2019 -0600 winemac.drv: Also stop dragging if we receive a mouse up event. We rely on AppKit-internal events to know when a window is being dragged. In Catalina, AppKit stopped sending the "drag ended" event when no drag actually took place, though it still sends "drag started" events when the title bar is clicked. Ironically, this caused us to think the window was still being dragged. In that case, waiting for the mouse button to come back up should allow us to determine when the drag should end. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 58 ++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index efbd657384..b5658eab08 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1577,6 +1577,34 @@ static NSString* WineLocalizedString(unsigned int stringID) } } + - (void) handleWindowDrag:(NSEvent*)anEvent begin:(BOOL)begin + { + WineWindow* window = (WineWindow*)[anEvent window]; + if ([window isKindOfClass:[WineWindow class]]) + { + macdrv_event* event; + int eventType; + + if (begin) + { + [windowsBeingDragged addObject:window]; + eventType = WINDOW_DRAG_BEGIN; + } + else + { + [windowsBeingDragged removeObject:window]; + eventType = WINDOW_DRAG_END; + } + [self updateCursorClippingState]; + + event = macdrv_create_event(eventType, window); + if (eventType == WINDOW_DRAG_BEGIN) + event->window_drag_begin.no_activate = [NSEvent wine_commandKeyDown]; + [window.queue postEvent:event]; + macdrv_release_event(event); + } + } + - (void) handleMouseMove:(NSEvent*)anEvent { WineWindow* targetWindow; @@ -1731,6 +1759,9 @@ static NSString* WineLocalizedString(unsigned int stringID) WineWindow* windowBroughtForward = nil; BOOL process = FALSE; + if (type == NSLeftMouseUp && [windowsBeingDragged count]) + [self handleWindowDrag:theEvent begin:NO]; + if ([window isKindOfClass:[WineWindow class]] && type == NSLeftMouseDown && ![theEvent wine_commandKeyDown]) @@ -2083,32 +2114,7 @@ static NSString* WineLocalizedString(unsigned int stringID) // "a window is being dragged" and "a window is no longer being // dragged", respectively. if (subtype == 20 || subtype == 21) - { - WineWindow* window = (WineWindow*)[anEvent window]; - if ([window isKindOfClass:[WineWindow class]]) - { - macdrv_event* event; - int eventType; - - if (subtype == 20) - { - [windowsBeingDragged addObject:window]; - eventType = WINDOW_DRAG_BEGIN; - } - else - { - [windowsBeingDragged removeObject:window]; - eventType = WINDOW_DRAG_END; - } - [self updateCursorClippingState]; - - event = macdrv_create_event(eventType, window); - if (eventType == WINDOW_DRAG_BEGIN) - event->window_drag_begin.no_activate = [NSEvent wine_commandKeyDown]; - [window.queue postEvent:event]; - macdrv_release_event(event); - } - } + [self handleWindowDrag:anEvent begin:(subtype == 20)]; } return ret;
1
0
0
0
Henri Verbeet : wined3d: Do not download textures to WINED3D_LOCATION_BUFFER in wined3d_texture_gl_unload().
by Alexandre Julliard
03 Dec '19
03 Dec '19
Module: wine Branch: master Commit: 153db6a7579b9256e73b7313426c0797b242671a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=153db6a7579b9256e73b7313…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 3 20:24:00 2019 +0330 wined3d: Do not download textures to WINED3D_LOCATION_BUFFER in wined3d_texture_gl_unload(). Since we remove any potential PBO a few lines later. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a3bbf2585d..1c315a1dd7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2942,6 +2942,7 @@ static void wined3d_texture_gl_unload(struct wined3d_resource *resource) UINT sub_count = texture_gl->t.level_count * texture_gl->t.layer_count; struct wined3d_renderbuffer_entry *entry, *entry2; struct wined3d_device *device = resource->device; + unsigned int location = resource->map_binding; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; UINT i; @@ -2951,14 +2952,17 @@ static void wined3d_texture_gl_unload(struct wined3d_resource *resource) context = context_acquire(device, NULL, 0); gl_info = wined3d_context_gl(context)->gl_info; + if (location == WINED3D_LOCATION_BUFFER) + location = WINED3D_LOCATION_SYSMEM; + for (i = 0; i < sub_count; ++i) { struct wined3d_texture_sub_resource *sub_resource = &texture_gl->t.sub_resources[i]; if (resource->access & WINED3D_RESOURCE_ACCESS_CPU - && wined3d_texture_load_location(&texture_gl->t, i, context, resource->map_binding)) + && wined3d_texture_load_location(&texture_gl->t, i, context, location)) { - wined3d_texture_invalidate_location(&texture_gl->t, i, ~resource->map_binding); + wined3d_texture_invalidate_location(&texture_gl->t, i, ~location); } else {
1
0
0
0
← Newer
1
...
53
54
55
56
57
58
59
...
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