Commit 25bce451 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

msxml6: Add stub msxml6, forward DOMDocument60 creation to msxml3.

parent 3780b082
......@@ -14761,6 +14761,7 @@ wine_fn_config_dll mswsock enable_mswsock mswsock
wine_fn_config_dll msxml3 enable_msxml3
wine_fn_config_test dlls/msxml3/tests msxml3_test
wine_fn_config_dll msxml4 enable_msxml4
wine_fn_config_dll msxml6 enable_msxml6
wine_fn_config_dll nddeapi enable_nddeapi nddeapi
wine_fn_config_dll netapi32 enable_netapi32 netapi32
wine_fn_config_test dlls/netapi32/tests netapi32_test
......
......@@ -2540,6 +2540,7 @@ WINE_CONFIG_DLL(mswsock,,[mswsock])
WINE_CONFIG_DLL(msxml3)
WINE_CONFIG_TEST(dlls/msxml3/tests)
WINE_CONFIG_DLL(msxml4)
WINE_CONFIG_DLL(msxml6)
WINE_CONFIG_DLL(nddeapi,,[nddeapi])
WINE_CONFIG_DLL(netapi32,,[netapi32])
WINE_CONFIG_TEST(dlls/netapi32/tests)
......
......@@ -31,6 +31,7 @@
#include "msxml.h"
#include "xmldom.h"
#include "msxml2.h"
#include "msxml6.h"
/* undef the #define in msxml2 so that we can access the v.2 version
independent CLSID as well as the v.3 one. */
......@@ -148,7 +149,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv )
if( IsEqualCLSID( rclsid, &CLSID_DOMDocument ) || /* Version indep. v 2.x */
IsEqualCLSID( rclsid, &CLSID_DOMDocument2 ) || /* Version indep. v 3.0 */
IsEqualCLSID( rclsid, &CLSID_DOMDocument30 )|| /* Version dep. v 3.0 */
IsEqualCLSID( rclsid, &CLSID_DOMDocument40 )) /* Version dep. v 4.0 */
IsEqualCLSID( rclsid, &CLSID_DOMDocument40 )|| /* Version dep. v 4.0 */
IsEqualCLSID( rclsid, &CLSID_DOMDocument60 )) /* Version dep. v 6.0 */
{
cf = (IClassFactory*) &domdoccf.lpVtbl;
}
......@@ -163,7 +165,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv )
}
else if( IsEqualCLSID( rclsid, &CLSID_DOMFreeThreadedDocument ) || /* Version indep. v 2.x */
IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument ) ||
IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument30 ))
IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument30 ) ||
IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument60 ))
{
cf = (IClassFactory*) &domdoccf.lpVtbl;
}
......
......@@ -42,6 +42,7 @@
/* Now we can initialize the rest of the uuids */
#include "initguid.h"
#include "msxml2.h"
#include "msxml6.h"
/*
* Note that because of a #define in msxml2.h, we end up initializing
......
EXTRADEFS = -DCOM_NO_WINDOWS_H
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msxml6.dll
IMPORTS = ole32 advapi32
C_SRCS = \
main.c \
regsvr.c
@MAKE_DLL_RULES@
/*
* MSXML6 entry point
*
* Copyright 2010 Nikolay Sivov 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>
#include "windef.h"
#include "winbase.h"
HRESULT WINAPI DllCanUnloadNow(void)
{
return S_FALSE;
}
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
{
switch (reason)
{
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(instance);
break;
}
return TRUE;
}
@ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject(ptr ptr ptr) msxml3.DllGetClassObject
@ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer()
......@@ -2530,6 +2530,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,mstask.dll,1
11,,msxml3.dll,1
11,,msxml4.dll,1
11,,msxml6.dll,1
11,,objsel.dll,1
11,,oledb32.dll,1
11,,qcap.dll,1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment