From: Olivia Ryan <olivia.r.dev@gmail.com> --- dlls/msxml6/Makefile.in | 5 +- dlls/msxml6/classes.idl | 26 +++++++++ dlls/msxml6/load_settings.c | 113 ++++++++++++++++++++++++++++++++++++ dlls/msxml6/main.c | 38 ++++++++++++ dlls/msxml6/msxml6.spec | 1 + dlls/msxml6/private.h | 34 +++++++++++ 6 files changed, 216 insertions(+), 1 deletion(-) create mode 100644 dlls/msxml6/classes.idl create mode 100644 dlls/msxml6/load_settings.c create mode 100644 dlls/msxml6/main.c create mode 100644 dlls/msxml6/private.h diff --git a/dlls/msxml6/Makefile.in b/dlls/msxml6/Makefile.in index 04ff7131cf6..76e9e614ed1 100644 --- a/dlls/msxml6/Makefile.in +++ b/dlls/msxml6/Makefile.in @@ -1,10 +1,13 @@ MODULE = msxml6.dll -IMPORTS = oleaut32 ole32 advapi32 +IMPORTS = oleaut32 ole32 advapi32 combase VER_FILEDESCRIPTION_STR = "Wine MSXML 6.0" VER_PRODUCTVERSION = 6,30,7601,24498 VER_OLESELFREGISTER = 1 SOURCES = \ + classes.idl \ + load_settings.c \ + main.c \ msxml6_tlb.idl \ rsrc.rc diff --git a/dlls/msxml6/classes.idl b/dlls/msxml6/classes.idl new file mode 100644 index 00000000000..4b1b57aa5b7 --- /dev/null +++ b/dlls/msxml6/classes.idl @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2026 Olivia Ryan + * + * 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 +#pragma winrt ns_prefix + +import "windows.data.xml.dom.idl"; + +namespace Windows.Data.Xml.Dom { + runtimeclass XmlLoadSettings; +} diff --git a/dlls/msxml6/load_settings.c b/dlls/msxml6/load_settings.c new file mode 100644 index 00000000000..0b4b579bc3c --- /dev/null +++ b/dlls/msxml6/load_settings.c @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2026 Olivia Ryan + * + * 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" + +WINE_DEFAULT_DEBUG_CHANNEL(msxml6); + +struct factory +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct factory *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct factory, IActivationFactory_iface ); +} + +static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct factory *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_IAgileObject ) || + IsEqualGUID( iid, &IID_IActivationFactory )) + { + IInspectable_AddRef( *out = &impl->IActivationFactory_iface ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef( IActivationFactory *iface ) +{ + struct factory *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI factory_Release( IActivationFactory *iface ) +{ + struct factory *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static HRESULT WINAPI factory_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 factory_GetRuntimeClassName( IActivationFactory *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + /* IInspectable methods */ + factory_GetIids, + factory_GetRuntimeClassName, + factory_GetTrustLevel, + /* IActivationFactory methods */ + factory_ActivateInstance, +}; + +static struct factory factory = +{ + {&factory_vtbl}, + 1, +}; + +IActivationFactory *xml_load_settings_factory = &factory.IActivationFactory_iface; diff --git a/dlls/msxml6/main.c b/dlls/msxml6/main.c new file mode 100644 index 00000000000..b8704b1f50e --- /dev/null +++ b/dlls/msxml6/main.c @@ -0,0 +1,38 @@ +/* + * Copyright 2026 Olivia Ryan + * + * 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" + +WINE_DEFAULT_DEBUG_CHANNEL(msxml6); + +HRESULT WINAPI DllGetActivationFactory( HSTRING classid, IActivationFactory **factory ) +{ + const WCHAR *buffer = WindowsGetStringRawBuffer( classid, NULL ); + + TRACE( "class %s, factory %p.\n", debugstr_hstring( classid ), factory ); + + *factory = NULL; + + if (!wcscmp( buffer, RuntimeClass_Windows_Data_Xml_Dom_XmlLoadSettings )) + IActivationFactory_QueryInterface( xml_load_settings_factory, &IID_IActivationFactory, (void **)factory ); + + if (*factory) return S_OK; + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/msxml6/msxml6.spec b/dlls/msxml6/msxml6.spec index 5fd4c2841f9..9c2fa0c8a83 100644 --- a/dlls/msxml6/msxml6.spec +++ b/dlls/msxml6/msxml6.spec @@ -1,4 +1,5 @@ @ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetActivationFactory(ptr ptr) @ stdcall -private DllGetClassObject(ptr ptr ptr) msxml3.DllGetClassObject @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/msxml6/private.h b/dlls/msxml6/private.h new file mode 100644 index 00000000000..d1ef7031f4c --- /dev/null +++ b/dlls/msxml6/private.h @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2026 Olivia Ryan + * + * 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_MSXML6_PRIVATE +#define __WINE_MSXML6_PRIVATE + +#include "winstring.h" +#include "wine/debug.h" + +#define COBJMACROS +#include "activation.h" + +#define WIDL_using_Windows_Data_Xml_Dom +#include "windows.data.xml.dom.h" + +extern IActivationFactory *xml_load_settings_factory; + + +#endif /* __WINE_MSXML6_PRIVATE */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10622