April 2021 - Wine-commits - list.winehq.org

Zhiyi Zhang : winedump: Dump EMR_STRETCHBLT record.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 1c35d29ed5580c2c8c44f93494e96e04e6090622 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c35d29ed5580c2c8c44f934… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 14 15:26:52 2021 +0800 winedump: Dump EMR_STRETCHBLT record. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/emf.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index d5630f6812b..2f54f73153b 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -325,7 +325,30 @@ static int dump_emfrecord(void) } EMRCASE(EMR_BITBLT); - EMRCASE(EMR_STRETCHBLT); + + case EMR_STRETCHBLT: + { + const EMRSTRETCHBLT *blt = PRD(offset, sizeof(*blt)); + const BITMAPINFOHEADER *bmih = (const BITMAPINFOHEADER *)((const unsigned char *)blt + blt->offBmiSrc); + + printf("%-20s %08x\n", "EMR_STRETCHBLT", length); + printf("bounds (%d,%d - %d,%d) dst %d,%d %dx%d src %d,%d %dx%d rop %#x xform (%f, %f, %f, %f, %f, %f)\n" + "bk_color %#x usage %#x bmi_offset %#x bmi_size %#x bits_offset %#x bits_size %#x\n", + blt->rclBounds.left, blt->rclBounds.top, blt->rclBounds.right, blt->rclBounds.bottom, + blt->xDest, blt->yDest, blt->cxDest, blt->cyDest, + blt->xSrc, blt->ySrc, blt->cxSrc, blt->cySrc, blt->dwRop, + blt->xformSrc.eM11, blt->xformSrc.eM12, blt->xformSrc.eM21, + blt->xformSrc.eM22, blt->xformSrc.eDx, blt->xformSrc.eDy, + blt->crBkColorSrc, blt->iUsageSrc, blt->offBmiSrc, blt->cbBmiSrc, + blt->offBitsSrc, blt->cbBitsSrc); + printf("BITMAPINFOHEADER biSize %#x biWidth %d biHeight %d biPlanes %d biBitCount %d biCompression %#x\n" + "biSizeImage %#x biXPelsPerMeter %d biYPelsPerMeter %d biClrUsed %#x biClrImportant %#x\n", + bmih->biSize, bmih->biWidth, bmih->biHeight, bmih->biPlanes, bmih->biBitCount, + bmih->biCompression, bmih->biSizeImage, bmih->biXPelsPerMeter, bmih->biYPelsPerMeter, + bmih->biClrUsed, bmih->biClrImportant); + break; + } + EMRCASE(EMR_MASKBLT); EMRCASE(EMR_PLGBLT); EMRCASE(EMR_SETDIBITSTODEVICE);

1 0

Hans Leidekker : wldap32: Move support for add functions to a new Unix library.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 1805b3a1fc6ce23f8ac88cfacedf3b248c6a94fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1805b3a1fc6ce23f8ac88cfa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 14 09:40:25 2021 +0200 wldap32: Move support for add functions to a new Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/Makefile.in | 1 + dlls/wldap32/add.c | 274 +++---------- dlls/wldap32/init.c | 10 +- dlls/wldap32/libldap.c | 81 ++++ dlls/wldap32/libldap.h | 72 ++++ dlls/wldap32/main.c | 12 +- dlls/wldap32/winldap_private.h | 910 ++++++++++++++++++++++++++++++++++++++++- dlls/wldap32/wldap32.h | 30 +- 8 files changed, 1137 insertions(+), 253 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1805b3a1fc6ce23f8ac8…

1 0

Hans Leidekker : wldap32: Move support for ber functions to the Unix library.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 1114f2970d659def7e9b785db06d60d80eb26b58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1114f2970d659def7e9b785d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 14 09:40:26 2021 +0200 wldap32: Move support for ber functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/ber.c | 348 +++++++++++++++++------------------------ dlls/wldap32/libldap.c | 260 ++++++++++++++++++++++++++++++ dlls/wldap32/libldap.h | 28 ++++ dlls/wldap32/misc.c | 28 ++-- dlls/wldap32/winldap_private.h | 22 +++ include/winber.h | 6 + 6 files changed, 477 insertions(+), 215 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1114f2970d659def7e9b…

1 0

Hans Leidekker : wldap32: Move support for bind functions to the Unix library.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: db26894eeea5943892a872ea818471732ee66404 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db26894eeea5943892a872ea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 14 09:40:27 2021 +0200 wldap32: Move support for bind functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/bind.c | 419 ++++++++++++----------------------------- dlls/wldap32/libldap.c | 58 +++++- dlls/wldap32/libldap.h | 52 ++++- dlls/wldap32/main.c | 6 +- dlls/wldap32/option.c | 6 +- dlls/wldap32/winldap_private.h | 2 +- 6 files changed, 234 insertions(+), 309 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db26894eeea5943892a8…

1 0

Hans Leidekker : wldap32: Move support for compare functions to the Unix library.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: e32a6026a34bc418058bf5df6d918bc6bef6bff1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32a6026a34bc418058bf5df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 14 09:40:28 2021 +0200 wldap32: Move support for compare functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/compare.c | 355 ++++++++++++------------------------------------- dlls/wldap32/libldap.c | 17 +++ dlls/wldap32/libldap.h | 8 ++ 3 files changed, 108 insertions(+), 272 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e32a6026a34bc418058b…

1 0

Andrew Eikum : windows.media.devices: Stub DLL.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: 4e86287a2e9a4cf252cdbf982e1926373d4d11fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e86287a2e9a4cf252cdbf98… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 13 10:50:52 2021 -0500 windows.media.devices: Stub DLL. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/windows.media.devices/Makefile.in | 7 + dlls/windows.media.devices/main.c | 158 +++++++++++++++++++++ .../windows.media.devices.spec | 3 + 5 files changed, 171 insertions(+) diff --git a/configure b/configure index 9add96280dd..a9e1efc38fe 100755 --- a/configure +++ b/configure @@ -1664,6 +1664,7 @@ enable_wiaservc enable_wimgapi enable_windows_gaming_input enable_windows_globalization +enable_windows_media_devices enable_windows_media_speech enable_windowscodecs enable_windowscodecsext @@ -21128,6 +21129,7 @@ wine_fn_config_makefile dlls/windows.gaming.input enable_windows_gaming_input wine_fn_config_makefile dlls/windows.gaming.input/tests enable_tests wine_fn_config_makefile dlls/windows.globalization enable_windows_globalization wine_fn_config_makefile dlls/windows.globalization/tests enable_tests +wine_fn_config_makefile dlls/windows.media.devices enable_windows_media_devices wine_fn_config_makefile dlls/windows.media.speech enable_windows_media_speech wine_fn_config_makefile dlls/windows.media.speech/tests enable_tests wine_fn_config_makefile dlls/windowscodecs enable_windowscodecs diff --git a/configure.ac b/configure.ac index 5c364bef0d9..408612324b8 100644 --- a/configure.ac +++ b/configure.ac @@ -3801,6 +3801,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input/tests) WINE_CONFIG_MAKEFILE(dlls/windows.globalization) WINE_CONFIG_MAKEFILE(dlls/windows.globalization/tests) +WINE_CONFIG_MAKEFILE(dlls/windows.media.devices) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) diff --git a/dlls/windows.media.devices/Makefile.in b/dlls/windows.media.devices/Makefile.in new file mode 100644 index 00000000000..b5a3482277c --- /dev/null +++ b/dlls/windows.media.devices/Makefile.in @@ -0,0 +1,7 @@ +MODULE = windows.media.devices.dll +IMPORTS = combase + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/windows.media.devices/main.c b/dlls/windows.media.devices/main.c new file mode 100644 index 00000000000..8e83c4e4061 --- /dev/null +++ b/dlls/windows.media.devices/main.c @@ -0,0 +1,158 @@ +/* + * Copyright 2021 Andrew Eikum for CodeWeavers + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#include "initguid.h" +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "activation.h" + +#include "windows.foundation.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct windows_media_devices +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct windows_media_devices *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct windows_media_devices, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_QueryInterface( + IActivationFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE windows_media_devices_AddRef( + IActivationFactory *iface) +{ + struct windows_media_devices *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE windows_media_devices_Release( + IActivationFactory *iface) +{ + struct windows_media_devices *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_GetIids( + IActivationFactory *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_GetRuntimeClassName( + IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_GetTrustLevel( + IActivationFactory *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_ActivateInstance( + IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + windows_media_devices_QueryInterface, + windows_media_devices_AddRef, + windows_media_devices_Release, + /* IInspectable methods */ + windows_media_devices_GetIids, + windows_media_devices_GetRuntimeClassName, + windows_media_devices_GetTrustLevel, + /* IActivationFactory methods */ + windows_media_devices_ActivateInstance, +}; + +static struct windows_media_devices windows_media_devices = +{ + {&activation_factory_vtbl}, + 1 +}; + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &windows_media_devices.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/dlls/windows.media.devices/windows.media.devices.spec b/dlls/windows.media.devices/windows.media.devices.spec new file mode 100644 index 00000000000..721493229c2 --- /dev/null +++ b/dlls/windows.media.devices/windows.media.devices.spec @@ -0,0 +1,3 @@ +1 stdcall -private DllCanUnloadNow() +2 stdcall -private DllGetActivationFactory(ptr ptr) +3 stdcall -private DllGetClassObject(ptr ptr ptr)

1 0

Andrew Eikum : windows.media.devices: Stub implement IMediaDeviceStatics.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: 089b9d9029131b1fa3a36cb84b697030eefc0ccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=089b9d9029131b1fa3a36cb8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 13 10:50:57 2021 -0500 windows.media.devices: Stub implement IMediaDeviceStatics. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/windows.media.devices/Makefile.in | 2 + dlls/windows.media.devices/classes.idl | 24 +++++ dlls/windows.media.devices/main.c | 149 ++++++++++++++++++++++++++- dlls/windows.media.devices/tests/Makefile.in | 5 + dlls/windows.media.devices/tests/devices.c | 123 ++++++++++++++++++++++ include/Makefile.in | 1 + include/windows.media.devices.idl | 126 ++++++++++++++++++++++ 9 files changed, 431 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=089b9d9029131b1fa3a3…

1 0

Connor McAdams : mfplat: Add corresponding 'IYUV' type alongside 'I420'.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: 55228c2b2ca068a4197072a0b36da9a09a63566a URL: https://source.winehq.org/git/wine.git/?a=commit;h=55228c2b2ca068a4197072a0… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Apr 13 12:40:51 2021 -0400 mfplat: Add corresponding 'IYUV' type alongside 'I420'. Add references the 'IYUV' mediatype wherever 'I420' is referenced, as they are identical. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 3 +++ dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 85219c74dd5..c8028b2a46f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2634,6 +2634,7 @@ static const struct uncompressed_video_format video_formats[] = { &MFVideoFormat_IMC2, 1, 0, 0, 1 }, { &MFVideoFormat_IMC3, 2, 3, 0, 1 }, { &MFVideoFormat_IMC4, 1, 0, 0, 1 }, + { &MFVideoFormat_IYUV, 1, 0, 0, 1 }, { &MFVideoFormat_NV12, 1, 0, 0, 1 }, { &MFVideoFormat_D16, 2, 3, 0, 0 }, { &MFVideoFormat_L16, 2, 3, 0, 0 }, @@ -2716,6 +2717,7 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): /* 2 x 2 block, interleaving UV for half the height */ *size = ((width + 1) & ~1) * height * 3 / 2; break; @@ -2758,6 +2760,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): *size = stride * height * 3 / 2; break; default: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c33d540ba4b..603dbbe22ff 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3979,6 +3979,12 @@ static void test_MFCalculateImageSize(void) { &MFVideoFormat_I420, 4, 3, 18 }, { &MFVideoFormat_I420, 320, 240, 115200 }, + { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, + { &MFVideoFormat_IYUV, 2, 1, 3 }, + { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, + { &MFVideoFormat_IYUV, 4, 3, 18 }, + { &MFVideoFormat_IYUV, 320, 240, 115200 }, + { &MFVideoFormat_YUY2, 2, 1, 4 }, { &MFVideoFormat_YUY2, 4, 3, 24 }, { &MFVideoFormat_YUY2, 128, 128, 32768 }, @@ -5307,6 +5313,10 @@ static void test_MFGetStrideForBitmapInfoHeader(void) { &MFVideoFormat_I420, 2, 2 }, { &MFVideoFormat_I420, 3, 3 }, { &MFVideoFormat_I420, 320, 320 }, + { &MFVideoFormat_IYUV, 1, 1 }, + { &MFVideoFormat_IYUV, 2, 2 }, + { &MFVideoFormat_IYUV, 3, 3 }, + { &MFVideoFormat_IYUV, 320, 320 }, }; unsigned int i; LONG stride;

1 0

Alexandre Julliard : include: Update PROCESS_BASIC_INFORMATION definition.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: c6393968754d64189f111e9277fb9060ec415fae URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6393968754d64189f111e92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 19:38:14 2021 +0200 include: Update PROCESS_BASIC_INFORMATION definition. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 7632cfcb999..dd2bdbbebbe 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2040,10 +2040,10 @@ typedef struct _OBJECT_TYPES_INFORMATION typedef struct _PROCESS_BASIC_INFORMATION { #ifdef __WINESRC__ - DWORD_PTR ExitStatus; - PPEB PebBaseAddress; - DWORD_PTR AffinityMask; - DWORD_PTR BasePriority; + NTSTATUS ExitStatus; + PEB *PebBaseAddress; + ULONG_PTR AffinityMask; + LONG BasePriority; ULONG_PTR UniqueProcessId; ULONG_PTR InheritedFromUniqueProcessId; #else

1 0

Nikolay Sivov : mfplay: Set media item pointer for state change events.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: 85e91d19bce337d29ec0e691e24e136087efdd5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=85e91d19bce337d29ec0e691… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 13 09:03:29 2021 +0300 mfplay: Set media item pointer for state change events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 7360042ee54..2f868ce3b61 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1415,8 +1415,9 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba media_player_set_state(player, state); media_event_create(player, event_type, event_status, &event); LeaveCriticalSection(&player->cs); - - /* FIXME: set pMediaItem */ + event->u.generic.item = item; + if (event->u.generic.item) + IMFPMediaItem_AddRef(event->u.generic.item); media_player_queue_event(player, event); break;

1 0