From: Mohamad Al-Jaf mohamadaljaf@gmail.com
--- v2: - Fix DllGetActivationFactory stub. - Fix formatting in DllGetClassObject. - Use the same debug channel, media, for captions.c and main.c. - Rename struct captions to captions_statics. --- configure.ac | 1 + dlls/windows.media/Makefile.in | 9 ++ dlls/windows.media/captions.c | 125 ++++++++++++++++++++++++++ dlls/windows.media/classes.idl | 23 +++++ dlls/windows.media/main.c | 38 ++++++++ dlls/windows.media/private.h | 38 ++++++++ dlls/windows.media/windows.media.spec | 3 + 7 files changed, 237 insertions(+) create mode 100644 dlls/windows.media/Makefile.in create mode 100644 dlls/windows.media/captions.c create mode 100644 dlls/windows.media/classes.idl create mode 100644 dlls/windows.media/main.c create mode 100644 dlls/windows.media/private.h create mode 100644 dlls/windows.media/windows.media.spec
diff --git a/configure.ac b/configure.ac index 7725c87bd99..0aaed1b943f 100644 --- a/configure.ac +++ b/configure.ac @@ -3185,6 +3185,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.devices) WINE_CONFIG_MAKEFILE(dlls/windows.media.devices/tests) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) +WINE_CONFIG_MAKEFILE(dlls/windows.media) WINE_CONFIG_MAKEFILE(dlls/windows.networking) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests) diff --git a/dlls/windows.media/Makefile.in b/dlls/windows.media/Makefile.in new file mode 100644 index 00000000000..be5012c170f --- /dev/null +++ b/dlls/windows.media/Makefile.in @@ -0,0 +1,9 @@ +MODULE = windows.media.dll +IMPORTS = combase + +C_SRCS = \ + captions.c \ + main.c + +IDL_SRCS = \ + classes.idl diff --git a/dlls/windows.media/captions.c b/dlls/windows.media/captions.c new file mode 100644 index 00000000000..f8e6218a72d --- /dev/null +++ b/dlls/windows.media/captions.c @@ -0,0 +1,125 @@ +/* WinRT Windows.Media Closed Captions Implementation + * + * Copyright (C) 2022 Mohamad Al-Jaf + * + * 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 "private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(media); + +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 captions_statics +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct captions_statics *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct captions_statics, IActivationFactory_iface ); +} + +static HRESULT WINAPI windows_media_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct captions_statics *impl = impl_from_IActivationFactory( iface ); + + TRACE( "(iface %p, iid %s, out %p.)\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IActivationFactory )) + { + *out = &impl->IActivationFactory_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + + FIXME( "(%s not implemented, returning E_NOINTERFACE.)\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI windows_media_AddRef( IActivationFactory *iface ) +{ + struct captions_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "(iface %p increasing refcount to %lu.)\n", iface, ref ); + return ref; +} + +static ULONG WINAPI windows_media_Release( IActivationFactory *iface ) +{ + struct captions_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "(iface %p decreasing refcount to %lu.)\n", iface, ref ); + return ref; +} + +static HRESULT WINAPI windows_media_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 WINAPI windows_media_GetRuntimeClassName( IActivationFactory *iface, HSTRING *class_name ) +{ + FIXME( "(iface %p, class_name %p) - stub.\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI windows_media_GetTrustLevel( IActivationFactory *iface, TrustLevel *trust_level ) +{ + FIXME( "(iface %p, trust_level %p) - stub.\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI windows_media_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) +{ + FIXME( "(iface %p, instance %p) - stub.\n", iface, instance ); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl factory_vtbl = +{ + windows_media_QueryInterface, + windows_media_AddRef, + windows_media_Release, + /* IInspectable methods */ + windows_media_GetIids, + windows_media_GetRuntimeClassName, + windows_media_GetTrustLevel, + /* IActivationFactory methods */ + windows_media_ActivateInstance, +}; + +static struct captions_statics captions_statics = +{ + {&factory_vtbl}, + 1, +}; + +IActivationFactory *captions_factory = &captions_statics.IActivationFactory_iface; diff --git a/dlls/windows.media/classes.idl b/dlls/windows.media/classes.idl new file mode 100644 index 00000000000..12424bbc90a --- /dev/null +++ b/dlls/windows.media/classes.idl @@ -0,0 +1,23 @@ +/* + * Runtime Classes for windows.media.dll + * + * Copyright (C) 2022 Mohamad Al-Jaf + * + * 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 + */ + +#pragma makedep register + +#include "windows.media.closedcaptioning.idl" diff --git a/dlls/windows.media/main.c b/dlls/windows.media/main.c new file mode 100644 index 00000000000..2c9723749b2 --- /dev/null +++ b/dlls/windows.media/main.c @@ -0,0 +1,38 @@ +/* WinRT Windows.Media Implementation + * + * Copyright (C) 2022 Mohamad Al-Jaf + * + * 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 "initguid.h" +#include "private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(media); + +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) +{ + FIXME( "(class %s, factory %p.) - stub.\n", debugstr_hstring(classid), factory ); + *factory = NULL; + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/windows.media/private.h b/dlls/windows.media/private.h new file mode 100644 index 00000000000..e05fa6d36a9 --- /dev/null +++ b/dlls/windows.media/private.h @@ -0,0 +1,38 @@ +/* WinRT Windows.Media Implementation + * + * Copyright (C) 2022 Mohamad Al-Jaf + * + * 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 + */ + +#ifndef __WINE_WINDOWS_MEDIA_PRIVATE_H +#define __WINE_WINDOWS_MEDIA_PRIVATE_H + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" + +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" + +extern const char *debugstr_hstring( HSTRING hstr ); + +#endif diff --git a/dlls/windows.media/windows.media.spec b/dlls/windows.media/windows.media.spec new file mode 100644 index 00000000000..31a5eafe950 --- /dev/null +++ b/dlls/windows.media/windows.media.spec @@ -0,0 +1,3 @@ +@ stdcall -private DllGetActivationFactory(ptr ptr) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr)