July 2020 - Wine-Commits - list.winehq.org

Jacek Caban : kernel32: Use IOCTL_CONDRV_GET_INPUT_INFO in CONSOLE_GetEditionMode.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: d04baa29e296599f3736ab9bd7c830451eb3335d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d04baa29e296599f3736ab9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 16:07:15 2020 +0200 kernel32: Use IOCTL_CONDRV_GET_INPUT_INFO in CONSOLE_GetEditionMode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index b1fc231c77..e919fcf3f1 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1077,15 +1077,9 @@ unsigned CONSOLE_GetNumHistoryEntries(void) */ BOOL CONSOLE_GetEditionMode(HANDLE hConIn, int* mode) { - unsigned ret = 0; - SERVER_START_REQ(get_console_input_info) - { - req->handle = console_handle_unmap(hConIn); - if ((ret = !wine_server_call_err( req ))) - *mode = reply->edition_mode; - } - SERVER_END_REQ; - return ret; + struct condrv_input_info info; + return DeviceIoControl( hConIn, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL ) + ? info.edition_mode : 0; } /******************************************************************

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_GET_INPUT_INFO in WINECON_GetServerConfig.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: eff42369e9c59f330083e25a23762df084ce6869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eff42369e9c59f330083e25a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 16:07:02 2020 +0200 wineconsole: Use IOCTL_CONDRV_GET_INPUT_INFO in WINECON_GetServerConfig. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 3 +++ programs/wineconsole/wineconsole.c | 18 ++++++++---------- server/console.c | 5 ++++- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 0107da1f2f..3dc6e9714e 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -31,6 +31,9 @@ /* IOCTL_CONDRV_GET_INPUT_INFO result */ struct condrv_input_info { + unsigned int history_mode; /* whether we duplicate lines in history */ + unsigned int history_size; /* number of lines in history */ + unsigned int edition_mode; /* index to the edition mode flavors */ unsigned int input_count; /* number of available input records */ }; diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 38a8c71163..e94af41d2b 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -27,6 +27,7 @@ #include "winecon_private.h" #include "winnls.h" #include "winuser.h" +#include "wine/condrv.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -603,19 +604,16 @@ static void WINECON_Delete(struct inner_data* data) */ static BOOL WINECON_GetServerConfig(struct inner_data* data) { + struct condrv_input_info input_info; BOOL ret; DWORD mode; - SERVER_START_REQ(get_console_input_info) - { - req->handle = wine_server_obj_handle( data->hConIn ); - ret = !wine_server_call_err( req ); - data->curcfg.history_size = reply->history_size; - data->curcfg.history_nodup = reply->history_mode; - data->curcfg.edition_mode = reply->edition_mode; - } - SERVER_END_REQ; - if (!ret) return FALSE; + if (!DeviceIoControl(data->hConIn, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, + &input_info, sizeof(input_info), NULL, NULL)) + return FALSE; + data->curcfg.history_size = input_info.history_size; + data->curcfg.history_nodup = input_info.history_mode; + data->curcfg.edition_mode = input_info.edition_mode; GetConsoleMode(data->hConIn, &mode); data->curcfg.insert_mode = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == diff --git a/server/console.c b/server/console.c index 9e3fa1d673..658ce97311 100644 --- a/server/console.c +++ b/server/console.c @@ -1554,7 +1554,10 @@ static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async set_error( STATUS_INVALID_PARAMETER ); return 0; } - info.input_count = console->recnum; + info.history_mode = console->history_mode; + info.history_size = console->history_size; + info.edition_mode = console->edition_mode; + info.input_count = console->recnum; return set_reply_data( &info, sizeof(info) ) != NULL; }

1 0

Piotr Caban : msvcrt: Fix _control87 ambiguous return value.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: 33190b694f09a2b4d1ffb4d4a995ada64c7c2a10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33190b694f09a2b4d1ffb4d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 7 16:08:00 2020 +0200 msvcrt: Fix _control87 ambiguous return value. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 1 + dlls/ucrtbase/tests/misc.c | 28 ++++++++++++++++++++++++++++ include/msvcrt/float.h | 3 +++ 3 files changed, 32 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 5a4126ad58..2e9154795d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1250,6 +1250,7 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) __control87_2( newval, mask, &flags, &sse2_cw ); if ((flags ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) flags |= MSVCRT__EM_AMBIGUOUS; + flags |= sse2_cw; #elif defined(__x86_64__) unsigned long fpword; unsigned int old_flags; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index eb0c79be2b..cd100cf1a9 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -335,6 +335,33 @@ static void test___fpe_flt_rounds(void) ok((_controlfp(_RC_CHOP, _RC_CHOP) & _RC_CHOP) == _RC_CHOP, "_controlfp(_RC_CHOP, _RC_CHOP) failed\n"); ret = __fpe_flt_rounds(); ok(ret == 0, "__fpe_flt_rounds returned %d\n", ret); + + _controlfp(cfp, _MCW_EM | _MCW_RC | _MCW_PC); +} + +static void test__control87_2(void) +{ +#ifdef __i386__ + unsigned int x86_cw_init, sse2_cw_init, x86_cw, sse2_cw, r; + + r = __control87_2(0, 0, &x86_cw_init, &sse2_cw_init); + ok(r == 1, "__control87_2 returned %d\n", r); + + r = __control87_2(0, _EM_INVALID, &x86_cw, NULL); + ok(r == 1, "__control87_2 returned %d\n", r); + ok(x86_cw == (x86_cw_init & ~_EM_INVALID), "x86_cw = %x, x86_cw_init = %x\n", x86_cw, x86_cw_init); + + r = __control87_2(0, 0, &x86_cw, &sse2_cw); + ok(r == 1, "__control87_2 returned %d\n", r); + ok(x86_cw == (x86_cw_init & ~_EM_INVALID), "x86_cw = %x, x86_cw_init = %x\n", x86_cw, x86_cw_init); + ok(sse2_cw == sse2_cw_init, "sse2_cw = %x, sse2_cw_init = %x\n", sse2_cw, sse2_cw_init); + + r = _control87(0, 0); + ok(r == (x86_cw | sse2_cw | _EM_AMBIGUOUS), "r = %x, expected %x\n", + r, x86_cw | sse2_cw | _EM_AMBIGUOUS); + + _control87(x86_cw_init, ~0); +#endif } static void __cdecl global_invalid_parameter_handler( @@ -1347,6 +1374,7 @@ START_TEST(misc) test__register_onexit_function(); test__execute_onexit_table(); test___fpe_flt_rounds(); + test__control87_2(); test__get_narrow_winmain_command_line(arg_v[0]); test__sopen_dispatch(); test__sopen_s(); diff --git a/include/msvcrt/float.h b/include/msvcrt/float.h index 06eadec0ff..0e0ca34219 100644 --- a/include/msvcrt/float.h +++ b/include/msvcrt/float.h @@ -140,6 +140,9 @@ _ACRTIMP int __cdecl __fpe_flt_rounds(void); unsigned int __cdecl _control87(unsigned int, unsigned int); unsigned int __cdecl _controlfp(unsigned int, unsigned int); errno_t __cdecl _controlfp_s(unsigned int *, unsigned int, unsigned int); +#ifdef __i386__ +int __cdecl __control87_2(unsigned int, unsigned int, unsigned int *, unsigned int *); +#endif double __cdecl _copysign (double, double); double __cdecl _chgsign (double);

1 0

Myah Caron : msvcrt: Don't reset MXCSR status in __control87_2 if control information is not changed.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: f2a804b9ea06402f0685ac83374ff7ba0d011bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2a804b9ea06402f0685ac83… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Tue Jul 7 16:07:39 2020 +0200 msvcrt: Don't reset MXCSR status in __control87_2 if control information is not changed. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 47 ++++++++++++++++++++++-- dlls/msvcrt/math.c | 86 +++++++++++++++++++++++++------------------- include/msvcrt/float.h | 2 ++ 3 files changed, 95 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2a804b9ea06402f0685…

1 0

Nikolay Sivov : mf/evr: Add IMFVideoRenderer stub.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: 8ce49878bcf596c782ee2be3499ecc42699665bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce49878bcf596c782ee2be3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 7 14:40:14 2020 +0300 mf/evr: Add IMFVideoRenderer stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 6 ++++++ 2 files changed, 51 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index c3ee38c829..92f0ff04fa 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -33,6 +33,7 @@ struct video_renderer { IMFMediaSink IMFMediaSink_iface; IMFMediaSinkPreroll IMFMediaSinkPreroll_iface; + IMFVideoRenderer IMFVideoRenderer_iface; LONG refcount; IMFTransform *mixer; @@ -51,6 +52,11 @@ static struct video_renderer *impl_from_IMFMediaSinkPreroll(IMFMediaSinkPreroll return CONTAINING_RECORD(iface, struct video_renderer, IMFMediaSinkPreroll_iface); } +static struct video_renderer *impl_from_IMFVideoRenderer(IMFVideoRenderer *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFVideoRenderer_iface); +} + static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -66,6 +72,10 @@ static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFMediaSinkPreroll_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoRenderer)) + { + *obj = &renderer->IMFVideoRenderer_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -237,6 +247,40 @@ static const IMFMediaSinkPrerollVtbl video_renderer_preroll_vtbl = video_renderer_preroll_NotifyPreroll, }; +static HRESULT WINAPI video_renderer_QueryInterface(IMFVideoRenderer *iface, REFIID riid, void **obj) +{ + struct video_renderer *renderer = impl_from_IMFVideoRenderer(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI video_renderer_AddRef(IMFVideoRenderer *iface) +{ + struct video_renderer *renderer = impl_from_IMFVideoRenderer(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_Release(IMFVideoRenderer *iface) +{ + struct video_renderer *renderer = impl_from_IMFVideoRenderer(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, IMFTransform *mixer, + IMFVideoPresenter *presenter) +{ + FIXME("%p, %p, %p.\n", iface, mixer, presenter); + + return E_NOTIMPL; +} + +static const IMFVideoRendererVtbl video_renderer_vtbl = +{ + video_renderer_QueryInterface, + video_renderer_AddRef, + video_renderer_Release, + video_renderer_InitializeRenderer, +}; + static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out) { unsigned int flags = 0; @@ -295,6 +339,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMFMediaSink_iface.lpVtbl = &video_renderer_sink_vtbl; object->IMFMediaSinkPreroll_iface.lpVtbl = &video_renderer_preroll_vtbl; + object->IMFVideoRenderer_iface.lpVtbl = &video_renderer_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 691734aa9a..a66bdcf1ee 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -41,6 +41,7 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, #include "initguid.h" #include "mmdeviceapi.h" #include "audioclient.h" +#include "evr.h" #include "wine/test.h" @@ -3226,6 +3227,7 @@ todo_wine static void test_evr(void) { + IMFVideoRenderer *video_renderer; IMFMediaSinkPreroll *preroll; IMFMediaSink *sink, *sink2; IMFActivate *activate; @@ -3261,6 +3263,10 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFMediaSinkPreroll_Release(preroll); + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&video_renderer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFVideoRenderer_Release(video_renderer); + hr = IMFActivate_ShutdownObject(activate); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/evr: Create presenter object on activation.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: 835611ef3e685009e37bb30c576207ad0df96798 URL: https://source.winehq.org/git/wine.git/?a=commit;h=835611ef3e685009e37bb30c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 7 14:40:13 2020 +0300 mf/evr: Create presenter object on activation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 4166c1dd3e..c3ee38c829 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -20,6 +20,7 @@ #include "mf_private.h" #include "uuids.h" +#include "evr.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -35,6 +36,7 @@ struct video_renderer LONG refcount; IMFTransform *mixer; + IMFVideoPresenter *presenter; unsigned int flags; CRITICAL_SECTION cs; }; @@ -95,6 +97,8 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) { if (renderer->mixer) IMFTransform_Release(renderer->mixer); + if (renderer->presenter) + IMFVideoPresenter_Release(renderer->presenter); DeleteCriticalSection(&renderer->cs); heap_free(renderer); } @@ -256,6 +260,29 @@ static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransfo return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out); } +static HRESULT video_renderer_create_presenter(IMFAttributes *attributes, IMFVideoPresenter **out) +{ + unsigned int flags = 0; + IMFActivate *activate; + CLSID clsid; + HRESULT hr; + + if (SUCCEEDED(IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, + &IID_IMFActivate, (void **)&activate))) + { + IMFAttributes_GetUINT32(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, &flags); + hr = IMFActivate_ActivateObject(activate, &IID_IMFVideoPresenter, (void **)out); + IMFActivate_Release(activate); + if (FAILED(hr) && !(flags & MF_ACTIVATE_CUSTOM_PRESENTER_ALLOWFAIL)) + return hr; + } + + if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID, &clsid))) + memcpy(&clsid, &CLSID_MFVideoPresenter9, sizeof(clsid)); + + return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFVideoPresenter, (void **)out); +} + static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct video_renderer *object; @@ -271,10 +298,13 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->refcount = 1; InitializeCriticalSection(&object->cs); - /* Create mixer. */ + /* Create mixer and presenter. */ if (FAILED(hr = video_renderer_create_mixer(attributes, &object->mixer))) goto done; + if (FAILED(hr = video_renderer_create_presenter(attributes, &object->presenter))) + goto done; + *obj = (IUnknown *)&object->IMFMediaSink_iface; return S_OK;

1 0

Alexandre Julliard : ntdll: Use macros to define both A and W printf functions.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: 2d38551dd9012db1361cbd5ff3de6cb5fb90dc60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d38551dd9012db1361cbd5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 16:35:04 2020 +0200 ntdll: Use macros to define both A and W printf functions. This is similar to what msvcrt does. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 618 ++-------------------------------------------------- dlls/ntdll/printf.h | 509 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 523 insertions(+), 604 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d38551dd9012db1361c…

1 0

Zebediah Figura : server: Remove no longer used snapshot requests.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: 1ff8fe20bf87f0b60e2b1a185fd3f9ee383fe31c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ff8fe20bf87f0b60e2b1a18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 6 21:06:02 2020 -0500 server: Remove no longer used snapshot requests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 72 +------------ server/Makefile.in | 1 - server/process.c | 30 ------ server/process.h | 10 -- server/protocol.def | 41 -------- server/request.h | 32 ------ server/snapshot.c | 223 ----------------------------------------- server/thread.c | 24 ----- server/thread.h | 8 -- server/trace.c | 55 ---------- 10 files changed, 1 insertion(+), 495 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ff8fe20bf87f0b60e2b…

1 0

Gijs Vermeulen : amstream: Add graph to stream in IMediaStreamFilter::AddMediaStream().
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: 388c53160dff455c05e87315e6d7c986b78bad45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=388c53160dff455c05e87315… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jul 7 00:58:14 2020 +0200 amstream: Add graph to stream in IMediaStreamFilter::AddMediaStream(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 4 ++++ dlls/amstream/tests/amstream.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 0e09e492cb..0a06e78180 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -497,6 +497,10 @@ static HRESULT WINAPI filter_AddMediaStream(IMediaStreamFilter *iface, IAMMediaS if (FAILED(hr)) return hr; + hr = IAMMediaStream_JoinFilterGraph(pAMMediaStream, This->graph); + if (FAILED(hr)) + return hr; + This->streams[This->nb_streams] = pAMMediaStream; This->nb_streams++; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 608bb2267f..0e9c40d118 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -686,6 +686,7 @@ static void test_add_stream(void) IEnumFilters *enum_filters; IBaseFilter *filters[3]; IGraphBuilder *graph; + FILTER_INFO info; ULONG ref, count; CLSID clsid; HRESULT hr; @@ -755,13 +756,18 @@ static void test_add_stream(void) hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)&teststream, &IID_IUnknown, 0, &stream); ok(hr == MS_E_PURPOSEID, "Got hr %#x.\n", hr); + hr = IMediaStreamFilter_QueryFilterInfo(stream_filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)&teststream, &test_mspid, 0, &stream); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(stream == (IMediaStream *)&teststream, "Streams didn't match.\n"); - if (hr == S_OK) IMediaStream_Release(stream); + IMediaStream_Release(stream); ok(teststream.mmstream == mmstream, "IAMMultiMediaStream objects didn't match.\n"); ok(teststream.filter == stream_filter, "IMediaStreamFilter objects didn't match.\n"); - todo_wine ok(!!teststream.graph, "Expected a non-NULL graph.\n"); + ok(teststream.graph == info.pGraph, "IFilterGraph objects didn't match.\n"); + + IFilterGraph_Release(info.pGraph); check_enum_stream(mmstream, stream_filter, 0, video_stream); check_enum_stream(mmstream, stream_filter, 1, audio_stream);

1 0

Nikolay Sivov : mf: Make freeing function optional for object activator.
by Alexandre Julliard July 7, 2020

July 7, 2020

Module: wine Branch: master Commit: 3a973ca8275ac398d7df9fd27a1b777cbed1fad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a973ca8275ac398d7df9fd2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 7 14:40:11 2020 +0300 mf: Make freeing function optional for object activator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 9 ++------- dlls/mf/main.c | 3 ++- dlls/mf/sar.c | 9 ++------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 64944673d5..e0ab44f8b0 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -258,15 +258,10 @@ static void evr_shutdown_object(void *user_context, IUnknown *obj) } } -static void evr_free_private(void *user_context) -{ -} - static const struct activate_funcs evr_activate_funcs = { - evr_create_object, - evr_shutdown_object, - evr_free_private, + .create_object = evr_create_object, + .shutdown_object = evr_shutdown_object, }; /*********************************************************************** diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 8656c6cddf..62dc1813c7 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -91,7 +91,8 @@ static ULONG WINAPI activate_object_Release(IMFActivate *iface) if (!refcount) { - activate->funcs->free_private(activate->context); + if (activate->funcs->free_private) + activate->funcs->free_private(activate->context); if (activate->object) IUnknown_Release(activate->object); IMFAttributes_Release(activate->attributes); diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 8a27c0658c..6f1f1bd834 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1891,15 +1891,10 @@ static void sar_shutdown_object(void *user_context, IUnknown *obj) } } -static void sar_free_private(void *user_context) -{ -} - static const struct activate_funcs sar_activate_funcs = { - sar_create_object, - sar_shutdown_object, - sar_free_private, + .create_object = sar_create_object, + .shutdown_object = sar_shutdown_object, }; /***********************************************************************

1 0