May 2021 - Wine-Commits - list.winehq.org

Alex Henrie : kernel32: Reimplement GetActiveProcessorGroupCount on top of GetLogicalProcessorInformationEx.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 59e9a8ecf3b3ec5e81aa12fa53418ee036710ffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=59e9a8ecf3b3ec5e81aa12fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 24 02:10:41 2021 -0600 kernel32: Reimplement GetActiveProcessorGroupCount on top of GetLogicalProcessorInformationEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 9041b00d512..710dfad8b7a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -609,8 +609,24 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK */ WORD WINAPI GetActiveProcessorGroupCount(void) { - FIXME("semi-stub, always returning 1\n"); - return 1; + WORD groups; + DWORD size = 0; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; + + TRACE("()\n"); + + if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; + if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; + if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) + { + HeapFree(GetProcessHeap(), 0, info); + return 0; + } + + groups = info->Group.ActiveGroupCount; + + HeapFree(GetProcessHeap(), 0, info); + return groups; } /***********************************************************************

1 0

Alex Henrie : kernel32: Reimplement GetActiveProcessorCount on top of GetLogicalProcessorInformationEx.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 6aeb297d20c3f2d0b3a41d2c06dc483668e1fc01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aeb297d20c3f2d0b3a41d2c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 24 02:10:42 2021 -0600 kernel32: Reimplement GetActiveProcessorCount on top of GetLogicalProcessorInformationEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 710dfad8b7a..acdedd979f3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -634,9 +634,32 @@ WORD WINAPI GetActiveProcessorGroupCount(void) */ DWORD WINAPI GetActiveProcessorCount(WORD group) { - DWORD cpus = system_info.NumberOfProcessors; + DWORD cpus = 0; + DWORD size = 0; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; - FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); + TRACE("(0x%x)\n", group); + + if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; + if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0; + if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size)) + { + HeapFree(GetProcessHeap(), 0, info); + return 0; + } + + if (group == ALL_PROCESSOR_GROUPS) + { + for (group = 0; group < info->Group.ActiveGroupCount; group++) + cpus += info->Group.GroupInfo[group].ActiveProcessorCount; + } + else + { + if (group < info->Group.ActiveGroupCount) + cpus = info->Group.GroupInfo[group].ActiveProcessorCount; + } + + HeapFree(GetProcessHeap(), 0, info); return cpus; }

1 0

Rémi Bernon : dinput: Use generic WtoA wrappers when possible.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 90ef30828ee6ae958ccbd55803a758f8213be1ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=90ef30828ee6ae958ccbd558… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 18:48:54 2021 +0200 dinput: Use generic WtoA wrappers when possible. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 20 +++++------ dlls/dinput/joystick.c | 18 ---------- dlls/dinput/joystick_linux.c | 33 +++-------------- dlls/dinput/joystick_linuxinput.c | 75 +++++---------------------------------- dlls/dinput/joystick_osx.c | 61 +++---------------------------- dlls/dinput/joystick_private.h | 3 -- dlls/dinput/keyboard.c | 17 ++------- dlls/dinput/mouse.c | 33 +++-------------- 8 files changed, 35 insertions(+), 225 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90ef30828ee6ae958ccb…

1 0

Rémi Bernon : dinput: Move IDirectInputDeviceA wrappers to ansi.c.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 740f8dc6d89effa849cb9f1bd6fc59f00f116b62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=740f8dc6d89effa849cb9f1b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 18:48:55 2021 +0200 dinput: Move IDirectInputDeviceA wrappers to ansi.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/Makefile.in | 1 + dlls/dinput/ansi.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/device.c | 129 -------------------------------- dlls/dinput8/Makefile.in | 1 + 4 files changed, 190 insertions(+), 129 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=740f8dc6d89effa849cb…

1 0

Rémi Bernon : dinput: Implement IDirectInputDevice_EnumObjects WtoA conversion.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 9b834bb8bf8b399f0f4bd9323d891f74ad5228c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b834bb8bf8b399f0f4bd932… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 18:48:57 2021 +0200 dinput: Implement IDirectInputDevice_EnumObjects WtoA conversion. Instead of a separate duplicate implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/device.c | 32 -------------------------------- 2 files changed, 48 insertions(+), 32 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 99156195423..5158d326073 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -43,6 +43,27 @@ static IDirectInputDevice8W *IDirectInputDevice8W_from_impl( IDirectInputDeviceI return &impl->IDirectInputDevice8W_iface; } +static void dideviceobjectinstance_wtoa( const DIDEVICEOBJECTINSTANCEW *in, DIDEVICEOBJECTINSTANCEA *out ) +{ + out->guidType = in->guidType; + out->dwOfs = in->dwOfs; + out->dwType = in->dwType; + out->dwFlags = in->dwFlags; + WideCharToMultiByte( CP_ACP, 0, in->tszName, -1, out->tszName, sizeof(out->tszName), NULL, NULL ); + + if (out->dwSize <= FIELD_OFFSET( DIDEVICEOBJECTINSTANCEA, dwFFMaxForce )) return; + + out->dwFFMaxForce = in->dwFFMaxForce; + out->dwFFForceResolution = in->dwFFForceResolution; + out->wCollectionNumber = in->wCollectionNumber; + out->wDesignatorIndex = in->wDesignatorIndex; + out->wUsagePage = in->wUsagePage; + out->wUsage = in->wUsage; + out->dwDimension = in->dwDimension; + out->wExponent = in->wExponent; + out->wReserved = in->wReserved; +} + HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface( IDirectInputDevice8A *iface_a, REFIID iid, void **out ) { IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); @@ -64,6 +85,33 @@ ULONG WINAPI IDirectInputDevice2AImpl_Release( IDirectInputDevice8A *iface_a ) return IDirectInputDevice8_Release( iface_w ); } +struct enum_objects_wtoa_params +{ + LPDIENUMDEVICEOBJECTSCALLBACKA callback; + void *ref; +}; + +static BOOL CALLBACK enum_objects_wtoa_callback( const DIDEVICEOBJECTINSTANCEW *instance_w, void *ref ) +{ + struct enum_objects_wtoa_params *params = ref; + DIDEVICEOBJECTINSTANCEA instance_a = {sizeof(instance_a)}; + + dideviceobjectinstance_wtoa( instance_w, &instance_a ); + return params->callback( &instance_a, params->ref ); +} + +HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects( IDirectInputDevice8A *iface_a, LPDIENUMDEVICEOBJECTSCALLBACKA callback, + void *ref, DWORD flags ) +{ + struct enum_objects_wtoa_params params = {callback, ref}; + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); + IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + + if (!callback) return DIERR_INVALIDPARAM; + + return IDirectInputDevice8_EnumObjects( iface_w, enum_objects_wtoa_callback, &params, flags ); +} + HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty( IDirectInputDevice8A *iface_a, REFGUID guid, DIPROPHEADER *header ) { IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c6385e6c025..31b859801c7 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1247,38 +1247,6 @@ ULONG WINAPI IDirectInputDevice2WImpl_AddRef(LPDIRECTINPUTDEVICE8W iface) return ref; } -HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(LPDIRECTINPUTDEVICE8A iface, - LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback, LPVOID lpvRef, DWORD dwFlags) -{ - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - DIDEVICEOBJECTINSTANCEA ddoi; - int i; - - TRACE("(%p)->(%p,%p flags:%08x)\n", This, lpCallback, lpvRef, dwFlags); - TRACE(" - flags = "); - _dump_EnumObjects_flags(dwFlags); - TRACE("\n"); - - if (!lpCallback) return DIERR_INVALIDPARAM; - - /* Only the fields till dwFFMaxForce are relevant */ - memset(&ddoi, 0, sizeof(ddoi)); - ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEA, dwFFMaxForce); - - for (i = 0; i < This->data_format.wine_df->dwNumObjs; i++) - { - LPDIOBJECTDATAFORMAT odf = dataformat_to_odf(This->data_format.wine_df, i); - - if (dwFlags != DIDFT_ALL && !(dwFlags & DIDFT_GETTYPE(odf->dwType))) continue; - if (IDirectInputDevice_GetObjectInfo(iface, &ddoi, odf->dwType, DIPH_BYID) != DI_OK) - continue; - - if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) break; - } - - return DI_OK; -} - HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, LPDIENUMDEVICEOBJECTSCALLBACKW lpCallback, LPVOID lpvRef, DWORD dwFlags) {

1 0

Rémi Bernon : dinput: Use IDirectInputDevice8W interface consistently.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 5fe103107a3bc72556e7909444df936ac20970ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fe103107a3bc72556e79094… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 18:48:53 2021 +0200 dinput: Use IDirectInputDevice8W interface consistently. Instead of sometimes using IDirectInputDevice8A. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 12 +++++++----- dlls/dinput/device_private.h | 4 ++-- dlls/dinput/dinput_main.c | 14 +++++++------- dlls/dinput/dinput_private.h | 7 ++++--- dlls/dinput/joystick.c | 8 ++------ dlls/dinput/joystick_linux.c | 6 +++--- dlls/dinput/joystick_linuxinput.c | 6 +++--- dlls/dinput/joystick_osx.c | 4 ++-- dlls/dinput/joystick_private.h | 2 +- dlls/dinput/keyboard.c | 10 +++------- dlls/dinput/mouse.c | 8 ++++---- dlls/dinput/tests/device.c | 29 +++++++++++++++++++++++++++++ 12 files changed, 67 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5fe103107a3bc72556e7…

1 0

Zebediah Figura : wined3d: Fix a spelling error in a comment.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 98f7be854065b536b48db808c9a3ede5f7748d2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=98f7be854065b536b48db808… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 25 11:01:37 2021 -0500 wined3d: Fix a spelling error in a comment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index dcdd08ac9b1..c7a9b4da3e1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1297,7 +1297,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2) { - /* Conditinal non power of two textures use a different clamping + /* Conditional non power of two textures use a different clamping * default. If we're using the GL_WINE_normalized_texrect partial * driver emulation, we're dealing with a GL_TEXTURE_2D texture which * has the address mode set to repeat - something that prevents us

1 0

Anton Baskanov : quartz/tests: Test that IMediaPosition is also checked when renderers are counted.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 926a5c778e7298e434f945dbabe2b725b9af2666 URL: https://source.winehq.org/git/wine.git/?a=commit;h=926a5c778e7298e434f945db… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon May 24 14:33:06 2021 +0700 quartz/tests: Test that IMediaPosition is also checked when renderers are counted. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 165 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 161 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index c663b5d8a99..7f3372e2acf 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -848,6 +848,7 @@ struct testfilter ULONG misc_flags; IMediaSeeking IMediaSeeking_iface; + IMediaPosition IMediaPosition_iface; LONG seeking_ref; DWORD seek_caps; BOOL support_testguid, support_media_time; @@ -1315,6 +1316,10 @@ static HRESULT WINAPI testfilter_QueryInterface(IBaseFilter *iface, REFIID iid, { *out = &filter->IMediaSeeking_iface; } + else if (IsEqualGUID(iid, &IID_IMediaPosition) && filter->IMediaPosition_iface.lpVtbl) + { + *out = &filter->IMediaPosition_iface; + } else if (IsEqualGUID(iid, &IID_IReferenceClock) && filter->IReferenceClock_iface.lpVtbl) { *out = &filter->IReferenceClock_iface; @@ -1610,7 +1615,7 @@ static HRESULT WINAPI testseek_QueryPreferredFormat(IMediaSeeking *iface, GUID * static HRESULT WINAPI testseek_GetTimeFormat(IMediaSeeking *iface, GUID *format) { - ok(0, "Unexpected call.\n"); + if (winetest_debug > 1) trace("%p->GetTimeFormat()\n", iface); return E_NOTIMPL; } @@ -1733,6 +1738,141 @@ static const IMediaSeekingVtbl testseek_vtbl = testseek_GetPreroll, }; +static struct testfilter *impl_from_IMediaPosition(IMediaPosition *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, IMediaPosition_iface); +} + +static HRESULT WINAPI testpos_QueryInterface(IMediaPosition *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_IMediaPosition(iface); + return IBaseFilter_QueryInterface(&filter->IBaseFilter_iface, iid, out); +} + +static ULONG WINAPI testpos_AddRef(IMediaPosition *iface) +{ + struct testfilter *filter = impl_from_IMediaPosition(iface); + return IBaseFilter_AddRef(&filter->IBaseFilter_iface); +} + +static ULONG WINAPI testpos_Release(IMediaPosition *iface) +{ + struct testfilter *filter = impl_from_IMediaPosition(iface); + return IBaseFilter_Release(&filter->IBaseFilter_iface); +} + +static HRESULT WINAPI testpos_GetTypeInfoCount(IMediaPosition *iface, UINT *count) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_GetTypeInfo(IMediaPosition *iface, UINT index, LCID lcid, ITypeInfo **typeinfo) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_GetIDsOfNames(IMediaPosition *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *ids) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_Invoke(IMediaPosition *iface, DISPID id, REFIID iid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *error_arg) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_get_Duration(IMediaPosition *iface, REFTIME *length) +{ + if (winetest_debug > 1) trace("%p->get_Duration()\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_put_CurrentPosition(IMediaPosition *iface, REFTIME time) +{ + if (winetest_debug > 1) trace("%p->put_CurrentPosition(%f)\n", iface, time); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_get_CurrentPosition(IMediaPosition *iface, REFTIME *time) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_get_StopTime(IMediaPosition *iface, REFTIME *time) +{ + if (winetest_debug > 1) trace("%p->get_StopTime()\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_put_StopTime(IMediaPosition *iface, REFTIME time) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_get_PrerollTime(IMediaPosition *iface, REFTIME *time) +{ + if (winetest_debug > 1) trace("%p->get_PrerollTime()\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_put_PrerollTime(IMediaPosition *iface, REFTIME time) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_put_Rate(IMediaPosition *iface, double rate) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_get_Rate(IMediaPosition *iface, double *rate) +{ + if (winetest_debug > 1) trace("%p->get_Rate()\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_CanSeekForward(IMediaPosition *iface, LONG *can_seek_forward) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_CanSeekBackward(IMediaPosition *iface, LONG *can_seek_backward) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IMediaPositionVtbl testpos_vtbl = +{ + testpos_QueryInterface, + testpos_AddRef, + testpos_Release, + testpos_GetTypeInfoCount, + testpos_GetTypeInfo, + testpos_GetIDsOfNames, + testpos_Invoke, + testpos_get_Duration, + testpos_put_CurrentPosition, + testpos_get_CurrentPosition, + testpos_get_StopTime, + testpos_put_StopTime, + testpos_get_PrerollTime, + testpos_put_PrerollTime, + testpos_put_Rate, + testpos_get_Rate, + testpos_CanSeekForward, + testpos_CanSeekBackward, +}; + static struct testfilter *impl_from_IReferenceClock(IReferenceClock *iface) { return CONTAINING_RECORD(iface, struct testfilter, IReferenceClock_iface); @@ -3964,9 +4104,9 @@ static void test_ec_complete(void) ok(hr == S_OK, "Got hr %#x.\n", hr); /* A filter counts as a renderer if it (1) exposes IAMFilterMiscFlags and - * reports itself as a renderer, or (2) exposes IMediaSeeking and has no - * output pins. Despite MSDN, QueryInternalConnections() does not seem to - * be used. */ + * reports itself as a renderer, or (2) exposes IMediaSeeking or + * IMediaPosition and has no output pins. Despite MSDN, + * QueryInternalConnections() does not seem to be used. */ IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); IFilterGraph2_RemoveFilter(graph, &filter2.IBaseFilter_iface); @@ -4010,7 +4150,16 @@ static void test_ec_complete(void) ok(filter1.seeking_ref == 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + filter1.IMediaPosition_iface.lpVtbl = &testpos_vtbl; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + + hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + filter1.IMediaSeeking_iface.lpVtbl = NULL; + filter1.IMediaPosition_iface.lpVtbl = NULL; filter1_pin.dir = PINDIR_INPUT; filter1.pin_count = 1; filter1_pin.QueryInternalConnections_hr = S_OK; @@ -4019,6 +4168,14 @@ static void test_ec_complete(void) hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); ok(hr == E_ABORT, "Got hr %#x.\n", hr); + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + + filter1.IMediaPosition_iface.lpVtbl = &testpos_vtbl; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + + hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaControl_Release(control); IMediaEvent_Release(eventsrc); IMediaEventSink_Release(eventsink);

1 0

Anton Baskanov : quartz: Check for IMediaPosition when counting renderers.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 2ad44002da683634de768dbe49a0ba09c5f26f08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ad44002da683634de768dbe… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon May 24 14:33:07 2021 +0700 quartz: Check for IMediaPosition when counting renderers. The new test failures are expected since the renderers are now actually considered renderers by the filter graph. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 7 +++++++ dlls/quartz/tests/dsoundrender.c | 8 ++++---- dlls/quartz/tests/filtergraph.c | 4 ++-- dlls/quartz/tests/videorenderer.c | 8 ++++---- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 825bef9e12e..f509bdad332 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -565,6 +565,7 @@ static void update_seeking(struct filter *filter) static BOOL is_renderer(struct filter *filter) { + IMediaPosition *media_position; IAMFilterMiscFlags *flags; BOOL ret = FALSE; @@ -574,6 +575,12 @@ static BOOL is_renderer(struct filter *filter) ret = TRUE; IAMFilterMiscFlags_Release(flags); } + else if (SUCCEEDED(IBaseFilter_QueryInterface(filter->filter, &IID_IMediaPosition, (void **)&media_position))) + { + if (!has_output_pins(filter->filter)) + ret = TRUE; + IMediaPosition_Release(media_position); + } else { update_seeking(filter); diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index e591e1832d5..87c3706b145 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -920,7 +920,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - ok(!ret, "Got unexpected EC_COMPLETE.\n"); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); hr = send_frame(input); todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); @@ -952,7 +952,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IPin_EndOfStream(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - ok(!ret, "Got unexpected EC_COMPLETE.\n"); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); ret = check_ec_complete(eventsrc, 2000); todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); @@ -978,7 +978,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - ok(!ret, "Got unexpected EC_COMPLETE.\n"); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); /* Test sending EOS and then flushing or stopping. */ @@ -996,7 +996,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IPin_EndOfStream(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - ok(!ret, "Got unexpected EC_COMPLETE.\n"); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); hr = IPin_BeginFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 7f3372e2acf..fdcfcead0be 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4154,7 +4154,7 @@ static void test_ec_complete(void) IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); @@ -4174,7 +4174,7 @@ static void test_ec_complete(void) IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); IMediaControl_Release(control); IMediaEvent_Release(eventsrc); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 22cc703a539..470652543ad 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1143,7 +1143,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - ok(!ret, "Got unexpected EC_COMPLETE.\n"); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); hr = join_thread(send_frame(input)); todo_wine ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); @@ -1173,7 +1173,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IPin_EndOfStream(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - ok(!ret, "Got unexpected EC_COMPLETE.\n"); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); ret = check_ec_complete(eventsrc, 1600); todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); @@ -1199,7 +1199,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - ok(!ret, "Got unexpected EC_COMPLETE.\n"); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); /* Test sending EOS and then flushing or stopping. */ @@ -1213,7 +1213,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) hr = IPin_EndOfStream(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ret = check_ec_complete(eventsrc, 0); - ok(!ret, "Got unexpected EC_COMPLETE.\n"); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); hr = IPin_BeginFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Rémi Bernon : msvcrt: Set next_token when str is empty in wcstok_s.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 32bbef5d3e6a5b174bdc1343d2d43b161f45fa1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=32bbef5d3e6a5b174bdc1343… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 15:59:46 2021 +0200 msvcrt: Set next_token when str is empty in wcstok_s. Otherwise, when str is empty, an invalid parameter exception is raised. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 11 +++++++---- dlls/ucrtbase/tests/string.c | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 343dec70477..615b4f36a33 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1910,10 +1910,13 @@ wchar_t * CDECL wcstok_s( wchar_t *str, const wchar_t *delim, if (!str) str = *next_token; while (*str && wcschr( delim, *str )) str++; - if (!*str) return NULL; - ret = str++; - while (*str && !wcschr( delim, *str )) str++; - if (*str) *str++ = 0; + if (!*str) ret = NULL; + else + { + ret = str++; + while (*str && !wcschr( delim, *str )) str++; + if (*str) *str++ = 0; + } *next_token = str; return ret; } diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 1a4fbbd76f0..9b1d21b801c 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -418,6 +418,24 @@ static void test_wcstok(void) ok(!wcscmp(L"words", token), "expected \"words\", got \"%ls\"\n", token); token = wcstok(NULL, L" ", NULL); ok(!token, "expected NULL, got %p\n", token); + + next = NULL; + wcscpy(buffer, input); + token = wcstok(buffer, L"=", &next); + ok(!wcscmp(token, input), "expected \"%ls\", got \"%ls\"\n", input, token); + ok(next == buffer + wcslen(input), "expected %p, got %p\n", buffer + wcslen(input), next); + token = wcstok(NULL, L"=", &next); + ok(!token, "expected NULL, got \"%ls\"\n", token); + ok(next == buffer + wcslen(input), "expected %p, got %p\n", buffer + wcslen(input), next); + + next = NULL; + wcscpy(buffer, L""); + token = wcstok(buffer, L"=", &next); + ok(token == NULL, "expected NULL, got \"%ls\"\n", token); + ok(next == buffer, "expected %p, got %p\n", buffer, next); + token = wcstok(NULL, L"=", &next); + ok(!token, "expected NULL, got \"%ls\"\n", token); + ok(next == buffer, "expected %p, got %p\n", buffer, next); } static void test__strnicmp(void)

1 0