December 2019 - Wine-commits

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

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

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

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

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

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

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

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

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

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