wine-commits January 2020

wine-commits@winehq.org

1 participants
535 discussions

Michael Stefaniuc : dmscript: Implement the Script track GetParam/SetParam methods.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 608ac8e34a32a56931eb7c6186add86b36c85aa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=608ac8e34a32a56931eb7c61… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jan 26 21:51:37 2020 +0100 dmscript: Implement the Script track GetParam/SetParam methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/scripttrack.c | 24 ++++++++++++++---------- dlls/dmscript/tests/dmscript.c | 11 ++++++++++- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index ad5617f414..1bdf3e13c5 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -124,20 +124,24 @@ static HRESULT WINAPI script_track_Play(IDirectMusicTrack8 *iface, void *pStateD return S_OK; } -static HRESULT WINAPI script_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI script_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + DirectMusicScriptTrack *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 script_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI script_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + DirectMusicScriptTrack *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 script_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 365b006025..30b64d5788 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -207,6 +207,7 @@ static void test_scripttrack(void) IPersistStream *ps; CLSID class; ULARGE_INTEGER size; + char buf[64] = { 0 }; HRESULT hr; #define X(guid) &guid, #guid const struct { @@ -260,14 +261,22 @@ static void test_scripttrack(void) ok(hr == E_POINTER, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); hr = IDirectMusicTrack8_Play(dmt, NULL, 0, 0, 0, 0, NULL, NULL, 0); ok(hr == E_POINTER, "IDirectMusicTrack8_Play failed: %08x\n", hr); + } hr = IDirectMusicTrack8_GetParam(dmt, NULL, 0, NULL, NULL); ok(hr == DMUS_E_GET_UNSUPPORTED, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); - } for (i = 0; i < ARRAY_SIZE(unsupported); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt, unsupported[i].type); ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); + hr = IDirectMusicTrack8_GetParam(dmt, unsupported[i].type, 0, NULL, buf); + ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + unsupported[i].name, hr); + hr = IDirectMusicTrack8_SetParam(dmt, unsupported[i].type, 0, buf); + ok(hr == DMUS_E_SET_UNSUPPORTED, + "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", + unsupported[i].name, hr); } hr = IDirectMusicTrack8_AddNotificationType(dmt, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmcompos: Partially implement Chord Map track GetParam/SetParam methods.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 9bc84396dea8af2ac05e8c36cedc146bae3b4b8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc84396dea8af2ac05e8c36… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jan 26 21:51:36 2020 +0100 dmcompos: Partially implement Chord Map track GetParam/SetParam methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/chordmaptrack.c | 38 ++++++++++++++++++++++++++++---------- dlls/dmcompos/tests/dmcompos.c | 6 ++---- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index b60b06768b..cf4f825986 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -117,20 +117,38 @@ static HRESULT WINAPI chordmap_track_Play(IDirectMusicTrack8 *iface, void *pStat return S_OK; } -static HRESULT WINAPI chordmap_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI chordmap_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { - IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_IDirectMusicChordMap)) + return DMUS_E_GET_UNSUPPORTED; + + FIXME("GUID_IDirectMusicChordMap not handled yet\n"); + + return S_OK; } -static HRESULT WINAPI chordmap_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI chordmap_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) { - IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (!type) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_IDirectMusicChordMap)) + return DMUS_E_SET_UNSUPPORTED; + + FIXME("GUID_IDirectMusicChordMap not handled yet\n"); + + return S_OK; } static HRESULT WINAPI chordmap_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index f041d0ac34..d4dbd2206c 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -321,12 +321,10 @@ static void test_chordmaptrack(void) ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); ok(hr == S_OK, "IDirectMusicTrack8_Play failed: %08x\n", hr); - todo_wine { hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); - } hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); @@ -348,11 +346,11 @@ static void test_chordmaptrack(void) "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); hr = IDirectMusicTrack8_GetParam(dmt8, unsupported[i].type, 0, NULL, &chordmap); - todo_wine ok(hr == DMUS_E_GET_UNSUPPORTED, + ok(hr == DMUS_E_GET_UNSUPPORTED, "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", unsupported[i].name, hr); hr = IDirectMusicTrack8_SetParam(dmt8, unsupported[i].type, 0, chordmap); - todo_wine ok(hr == DMUS_E_SET_UNSUPPORTED, + ok(hr == DMUS_E_SET_UNSUPPORTED, "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", unsupported[i].name, hr); }

1 0

Michael Stefaniuc : dmsynth: Avoid the LPDIRECTMUSICSYNTH8 type.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: e4e507a16c3b7ec3900e40ad04e1dd5ac20a3db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e507a16c3b7ec3900e40ad… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jan 26 21:51:35 2020 +0100 dmsynth: Avoid the LPDIRECTMUSICSYNTH8 type. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synth.c | 73 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4e507a16c3b7ec3900e…

1 0

Michael Stefaniuc : dmsynth: Avoid the LPDIRECTMUSICSYNTHSINK type.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: d0887f554c2a73ba6612cbbcec08f5f364b0c64c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0887f554c2a73ba6612cbbc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jan 26 21:51:34 2020 +0100 dmsynth: Avoid the LPDIRECTMUSICSYNTHSINK type. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synthsink.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 7d148b0e9f..46011eae27 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -33,7 +33,8 @@ static inline IDirectMusicSynthSinkImpl *impl_from_IDirectMusicSynthSink(IDirect } /* IDirectMusicSynthSinkImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(LPDIRECTMUSICSYNTHSINK iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(IDirectMusicSynthSink *iface, + REFIID riid, void **ret_iface) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -60,7 +61,7 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(LPDIRECTMUSICSYNT return E_NOINTERFACE; } -static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(LPDIRECTMUSICSYNTHSINK iface) +static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(IDirectMusicSynthSink *iface) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); ULONG ref = InterlockedIncrement(&This->ref); @@ -70,7 +71,7 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(LPDIRECTMUSICSYNTHSINK ifac return ref; } -static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(LPDIRECTMUSICSYNTHSINK iface) +static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(IDirectMusicSynthSink *iface) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -88,7 +89,8 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(LPDIRECTMUSICSYNTHSINK ifa } /* IDirectMusicSynthSinkImpl IDirectMusicSynthSink part: */ -static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(LPDIRECTMUSICSYNTHSINK iface, IDirectMusicSynth* synth) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(IDirectMusicSynthSink *iface, + IDirectMusicSynth *synth) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -97,7 +99,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(LPDIRECTMUSICSYNTHSINK ifac return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(LPDIRECTMUSICSYNTHSINK iface, IReferenceClock* clock) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(IDirectMusicSynthSink *iface, + IReferenceClock *clock) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -106,7 +109,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(LPDIRECTMUSICSYNT return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock(LPDIRECTMUSICSYNTHSINK iface, IReferenceClock** clock) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock(IDirectMusicSynthSink *iface, + IReferenceClock **clock) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -121,7 +125,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock(LPDIRECTMUSICSYN return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate(LPDIRECTMUSICSYNTHSINK iface, BOOL enable) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate(IDirectMusicSynthSink *iface, + BOOL enable) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -130,7 +135,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate(LPDIRECTMUSICSYNTHSINK return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime(LPDIRECTMUSICSYNTHSINK iface, LONGLONG sample_time, REFERENCE_TIME* ref_time) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime(IDirectMusicSynthSink *iface, + LONGLONG sample_time, REFERENCE_TIME *ref_time) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -139,7 +145,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime(LPDIRECTMUSICSYN return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample(LPDIRECTMUSICSYNTHSINK iface, REFERENCE_TIME ref_time, LONGLONG* sample_time) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample(IDirectMusicSynthSink *iface, + REFERENCE_TIME ref_time, LONGLONG *sample_time) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -148,7 +155,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample(LPDIRECTMUSICSYN return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound(LPDIRECTMUSICSYNTHSINK iface, LPDIRECTSOUND dsound, LPDIRECTSOUNDBUFFER dsound_buffer) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound(IDirectMusicSynthSink *iface, + IDirectSound *dsound, IDirectSoundBuffer *dsound_buffer) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -157,7 +165,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound(LPDIRECTMUSICSYNT return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize(LPDIRECTMUSICSYNTHSINK iface, LPDWORD buffer_size_in_samples) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize(IDirectMusicSynthSink *iface, + DWORD *buffer_size_in_samples) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);

1 0

Jacek Caban : winegcc: Use Wine crt when linking to msvcrt.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 1867a411b0a874d2a9cadb391485fb29a3b99074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1867a411b0a874d2a9cadb39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 24 11:09:47 2020 +0100 winegcc: Use Wine crt when linking to msvcrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 21853d6fb3..a335332225 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -437,8 +437,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) else strarray_add( flags, opts->gui_app ? "-mwindows" : "-mconsole" ); if (opts->unicode_app) strarray_add( flags, "-municode" ); - if (opts->nodefaultlibs || opts->wine_builtin) strarray_add( flags, "-nodefaultlibs" ); - if (opts->nostartfiles || opts->wine_builtin) strarray_add( flags, "-nostartfiles" ); + if (opts->nodefaultlibs || opts->use_msvcrt) strarray_add( flags, "-nodefaultlibs" ); + if (opts->nostartfiles || opts->use_msvcrt) strarray_add( flags, "-nostartfiles" ); if (opts->subsystem) strarray_add( flags, strmake("-Wl,--subsystem,%s", opts->subsystem )); strarray_add( flags, "-Wl,--nxcompat" ); @@ -1096,7 +1096,7 @@ static void build(struct options* opts) { if (opts->subsystem && !strcmp( opts->subsystem, "native" )) entry_point = opts->target_cpu == CPU_x86 ? "_DriverEntry@8" : "DriverEntry"; - else if(opts->wine_builtin && !opts->shared && !opts->win16_app) + else if(opts->use_msvcrt && !opts->shared && !opts->win16_app) { if (opts->unicode_app) entry_point = opts->target_cpu == CPU_x86 ? "_wmainCRTStartup" : "wmainCRTStartup"; @@ -1196,7 +1196,7 @@ static void build(struct options* opts) /* link everything together now */ link_args = get_link_args( opts, output_name ); - if ((opts->nodefaultlibs || opts->wine_builtin) && is_pe) + if ((opts->nodefaultlibs || opts->use_msvcrt) && is_pe) { libgcc = find_libgcc(opts->prefix, link_args); if (!libgcc) libgcc = "-lgcc";

1 0

Jacek Caban : msvcrt: Provide exp2f in importlib.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: df5b1f8350cd574da1234937ba6d0e41853e9b29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df5b1f8350cd574da1234937… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 24 11:08:15 2020 +0100 msvcrt: Provide exp2f in importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mathf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/mathf.c b/dlls/msvcrt/mathf.c index 4aff6d7008..c2db0c54c3 100644 --- a/dlls/msvcrt/mathf.c +++ b/dlls/msvcrt/mathf.c @@ -40,4 +40,5 @@ float ceilf(float x) { return ceil(x); } #if _MSVCR_VER < 120 double exp2(double x) { return pow(2.0, x); } +float exp2f(float x) { return powf(2.0f, x); } #endif

1 0

Zebediah Figura : winegstreamer: Get rid of the YUV-to-(A)RGB converters.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 841502993f6f9b133dbf4a17e58f243fb878708d URL: https://source.winehq.org/git/wine.git/?a=commit;h=841502993f6f9b133dbf4a17… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 19:55:10 2020 -0600 winegstreamer: Get rid of the YUV-to-(A)RGB converters. This is handled by the splitter filter now. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_guids.h | 2 - dlls/winegstreamer/gst_private.h | 2 - dlls/winegstreamer/gsttffilter.c | 217 --------------------------------------- dlls/winegstreamer/main.c | 52 ---------- 4 files changed, 273 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=841502993f6f9b133dbf…

1 0

Zebediah Figura : winegstreamer: Support converting color spaces within the splitter filter.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: f5a1e2bd87754a2822f2eb0e84291d787936d115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5a1e2bd87754a2822f2eb0e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 19:55:09 2020 -0600 winegstreamer: Support converting color spaces within the splitter filter. The idea being firstly that it's more efficient to handle this all within one GStreamer pipeline, especially since we may need to be converting color spaces anyway (for videoflip), and secondly that this renders obsolete the color space converter transform filters in gsttffilter.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 238 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 219 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5a1e2bd87754a2822f2…

1 0

Zebediah Figura : winegstreamer: Split the implementation of source_get_media_type().
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 847d8970fe56b89679d0943bfe278871e7a72735 URL: https://source.winehq.org/git/wine.git/?a=commit;h=847d8970fe56b89679d0943b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 19:55:08 2020 -0600 winegstreamer: Split the implementation of source_get_media_type(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 54 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 47eb30383b..625d9f31cd 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -76,6 +76,7 @@ struct gstdemux BOOL (*init_gst)(struct gstdemux *filter); HRESULT (*source_query_accept)(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt); + HRESULT (*source_get_media_type)(struct gstdemux_source *pin, unsigned int index, AM_MEDIA_TYPE *mt); }; struct gstdemux_source @@ -1537,6 +1538,15 @@ static HRESULT gstdecoder_source_query_accept(struct gstdemux_source *pin, const return S_OK; } +static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, + unsigned int index, AM_MEDIA_TYPE *mt) +{ + if (index > 0) + return VFW_S_NO_MORE_ITEMS; + CopyMediaType(mt, &pin->mt); + return S_OK; +} + IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) { struct gstdemux *object; @@ -1562,6 +1572,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = gstdecoder_init_gst; object->source_query_accept = gstdecoder_source_query_accept; + object->source_get_media_type = gstdecoder_source_get_media_type; *phr = S_OK; TRACE("Created GStreamer demuxer %p.\n", object); @@ -1873,16 +1884,11 @@ static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TY return filter->source_query_accept(pin, mt); } -static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int iPosition, AM_MEDIA_TYPE *pmt) +static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { - struct gstdemux_source *This = impl_source_from_IPin(&iface->IPin_iface); - - if (iPosition > 0) - return VFW_S_NO_MORE_ITEMS; - - CopyMediaType(pmt, &This->mt); - - return S_OK; + struct gstdemux_source *pin = impl_source_from_IPin(&iface->IPin_iface); + struct gstdemux *filter = impl_from_strmbase_filter(iface->filter); + return filter->source_get_media_type(pin, index, mt); } static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, @@ -2268,6 +2274,15 @@ static HRESULT wave_parser_source_query_accept(struct gstdemux_source *pin, cons return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; } +static HRESULT wave_parser_source_get_media_type(struct gstdemux_source *pin, + unsigned int index, AM_MEDIA_TYPE *mt) +{ + if (index > 0) + return VFW_S_NO_MORE_ITEMS; + CopyMediaType(mt, &pin->mt); + return S_OK; +} + IUnknown * CALLBACK wave_parser_create(IUnknown *outer, HRESULT *phr) { static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -2292,6 +2307,7 @@ IUnknown * CALLBACK wave_parser_create(IUnknown *outer, HRESULT *phr) object->init_gst = wave_parser_init_gst; object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->source_query_accept = wave_parser_source_query_accept; + object->source_get_media_type = wave_parser_source_get_media_type; *phr = S_OK; TRACE("Created WAVE parser %p.\n", object); @@ -2380,6 +2396,15 @@ static HRESULT avi_splitter_source_query_accept(struct gstdemux_source *pin, con return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; } +static HRESULT avi_splitter_source_get_media_type(struct gstdemux_source *pin, + unsigned int index, AM_MEDIA_TYPE *mt) +{ + if (index > 0) + return VFW_S_NO_MORE_ITEMS; + CopyMediaType(mt, &pin->mt); + return S_OK; +} + IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) { static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -2405,6 +2430,7 @@ IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = avi_splitter_init_gst; object->source_query_accept = avi_splitter_source_query_accept; + object->source_get_media_type = avi_splitter_source_get_media_type; *phr = S_OK; TRACE("Created AVI splitter %p.\n", object); @@ -2503,6 +2529,15 @@ static HRESULT mpeg_splitter_source_query_accept(struct gstdemux_source *pin, co return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; } +static HRESULT mpeg_splitter_source_get_media_type(struct gstdemux_source *pin, + unsigned int index, AM_MEDIA_TYPE *mt) +{ + if (index > 0) + return VFW_S_NO_MORE_ITEMS; + CopyMediaType(mt, &pin->mt); + return S_OK; +} + static HRESULT mpeg_splitter_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) { struct gstdemux *filter = impl_from_strmbase_filter(iface); @@ -2556,6 +2591,7 @@ IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr) object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = mpeg_splitter_init_gst; object->source_query_accept = mpeg_splitter_source_query_accept; + object->source_get_media_type = mpeg_splitter_source_get_media_type; object->enum_sink_first = TRUE; *phr = S_OK;

1 0

Zebediah Figura : winegstreamer: Implement IPin::QueryAccept() for the MPEG splitter source.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 87e02cb5fc0a62e026c694daaa09204400793c21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87e02cb5fc0a62e026c694da… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 19:55:07 2020 -0600 winegstreamer: Implement IPin::QueryAccept() for the MPEG splitter source. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegsplit.c | 18 +++++++++--------- dlls/winegstreamer/gstdemux.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 627f4f21ef..c45f982a02 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -695,41 +695,41 @@ static void test_media_types(void) pmt->majortype = MEDIATYPE_Video; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->majortype = GUID_NULL; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->majortype = MEDIATYPE_Audio; pmt->subtype = MEDIASUBTYPE_MPEG1Audio; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->subtype = MEDIASUBTYPE_MPEG1Packet; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->subtype = MEDIASUBTYPE_MPEG1Video; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->subtype = MEDIASUBTYPE_MPEG1AudioPayload; pmt->formattype = FORMAT_None; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->formattype = GUID_NULL; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->formattype = FORMAT_WaveFormatEx; wfx = (MPEG1WAVEFORMAT *)pmt->pbFormat; wfx->fwHeadLayer = ACM_MPEG_LAYER2; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); wfx->fwHeadLayer = ACM_MPEG_LAYER3; wfx->wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); wfx->wfx.wFormatTag = WAVE_FORMAT_MPEG; CoTaskMemFree(pmt->pbFormat); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 81a0617e56..47eb30383b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2500,7 +2500,7 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) static HRESULT mpeg_splitter_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) { - return S_OK; + return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; } static HRESULT mpeg_splitter_query_interface(struct strmbase_filter *iface, REFIID iid, void **out)

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2020