diff --git a/configure b/configure index b74fa727a169b5e3209012d4a699f442cfd54c3e..b2481f49add01fea66b9889decc4f82695f70f38 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.ac b/configure.ac index dba7565c9fc264090e9ad4ffba237b1a1074478b..9133f5d64750b7a966b4e289ba5fe614bec1ccb0 100644 --- a/configure.ac +++ b/configure.ac @@ -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) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 3fd229cee63e91bcbe497755c96328878dc4ce3d..969773ec38b3987bbc8b6e25888022b55b251ae6 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -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. */ @@ -145,10 +146,11 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv ); - if( IsEqualCLSID( rclsid, &CLSID_DOMDocument ) || /* Version indep. v 2.x */ + 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; } @@ -161,9 +163,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = (IClassFactory*) &xmldoccf.lpVtbl; } - else if( IsEqualCLSID( rclsid, &CLSID_DOMFreeThreadedDocument ) || /* Version indep. v 2.x */ - IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument ) || - IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument30 )) + else if( IsEqualCLSID( rclsid, &CLSID_DOMFreeThreadedDocument ) || /* Version indep. v 2.x */ + IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument ) || + IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument30 ) || + IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument60 )) { cf = (IClassFactory*) &domdoccf.lpVtbl; } diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c index a3c7965690e1ecb115c37a06a166a8a9cd91fbb0..14606a04cbe274ea0444f9a0d3577e827148b0b9 100644 --- a/dlls/msxml3/uuid.c +++ b/dlls/msxml3/uuid.c @@ -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 diff --git a/dlls/msxml6/Makefile.in b/dlls/msxml6/Makefile.in new file mode 100644 index 0000000000000000000000000000000000000000..0b59fa327533f9cf4954b3891ff19c043c1b1a6b --- /dev/null +++ b/dlls/msxml6/Makefile.in @@ -0,0 +1,13 @@ +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@ diff --git a/dlls/msxml6/main.c b/dlls/msxml6/main.c new file mode 100644 index 0000000000000000000000000000000000000000..a8ddd34f42582981ab0599f003fc066ff7ae93dc --- /dev/null +++ b/dlls/msxml6/main.c @@ -0,0 +1,39 @@ +/* + * 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; +} diff --git a/dlls/msxml6/msxml6.spec b/dlls/msxml6/msxml6.spec new file mode 100644 index 0000000000000000000000000000000000000000..5fd4c2841f95320e62f45cdbebca32af9e06d222 --- /dev/null +++ b/dlls/msxml6/msxml6.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) msxml3.DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/msxml6/regsvr.c b/dlls/msxml6/regsvr.c new file mode 100644 index 0000000000000000000000000000000000000000..04f07c9ec7b5b78d4f3bdcb6c4ad438b451e2c6e --- /dev/null +++ b/dlls/msxml6/regsvr.c @@ -0,0 +1,407 @@ +/* + * MSXML6 self-registerable dll functions + * + * Copyright (C) 2003 John K. Hohm + * Copyright (C) 2006 Robert Shearman + * Copyright (C) 2008 Alistair Leslie-Hughes + * Copyright (C) 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 "config.h" + +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "winerror.h" +#include "ole2.h" + +#include "initguid.h" +#include "msxml2.h" +#include "msxml6.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msxml6); + +/* + * Near the bottom of this file are the exported DllRegisterServer and + * DllUnregisterServer, which make all this worthwhile. + */ + +struct regsvr_coclass +{ + CLSID const *clsid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + LPCSTR ips; /* can be NULL to omit */ + LPCSTR ips32; /* can be NULL to omit */ + LPCSTR ips32_tmodel; /* can be NULL to omit */ + LPCSTR progid; /* can be NULL to omit */ + LPCSTR version; /* can be NULL to omit */ +}; + +static HRESULT register_coclasses(struct regsvr_coclass const *list); +static HRESULT unregister_coclasses(struct regsvr_coclass const *list); + +struct progid +{ + LPCSTR name; /* NULL for end of list */ + LPCSTR description; /* can be NULL to omit */ + CLSID const *clsid; + LPCSTR curver; /* can be NULL to omit */ +}; + +static HRESULT register_progids(struct progid const *list); +static HRESULT unregister_progids(struct progid const *list); + +/*********************************************************************** + * static string constants + */ +static WCHAR const interface_keyname[10] = { + 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; +static WCHAR const base_ifa_keyname[14] = { + 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', + 'e', 0 }; +static WCHAR const num_methods_keyname[11] = { + 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; +static WCHAR const ps_clsid_keyname[15] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', 0 }; +static WCHAR const ps_clsid32_keyname[17] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', '3', '2', 0 }; +static WCHAR const clsid_keyname[6] = { + 'C', 'L', 'S', 'I', 'D', 0 }; +static WCHAR const ips_keyname[13] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + 0 }; +static WCHAR const ips32_keyname[15] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + '3', '2', 0 }; +static WCHAR const progid_keyname[7] = { + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const versionindependentprogid_keyname[] = { + 'V', 'e', 'r', 's', 'i', 'o', 'n', + 'I', 'n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 't', + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const version_keyname[] = { + 'V', 'e', 'r', 's', 'i', 'o', 'n', 0 }; +static WCHAR const curver_keyname[] = { + 'C', 'u', 'r', 'V', 'e', 'r', 0 }; +static char const tmodel_valuename[] = "ThreadingModel"; + +/*********************************************************************** + * static helper functions + */ +static LONG register_key_defvalueW(HKEY base, WCHAR const *name, + WCHAR const *value); +static LONG register_key_defvalueA(HKEY base, WCHAR const *name, + char const *value); + +/*********************************************************************** + * register_coclasses + */ +static HRESULT register_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + HKEY clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->name) { + res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips) { + res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips32) { + HKEY ips32_key; + + res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &ips32_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->ips32, + lstrlenA(list->ips32) + 1); + if (res == ERROR_SUCCESS && list->ips32_tmodel) + res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, + (CONST BYTE*)list->ips32_tmodel, + strlen(list->ips32_tmodel) + 1); + RegCloseKey(ips32_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->progid) { + char *buffer = NULL; + LPCSTR progid; + + if (list->version) { + buffer = HeapAlloc(GetProcessHeap(), 0, strlen(list->progid) + strlen(list->version) + 2); + if (!buffer) { + res = ERROR_OUTOFMEMORY; + goto error_close_clsid_key; + } + strcpy(buffer, list->progid); + strcat(buffer, "."); + strcat(buffer, list->version); + progid = buffer; + } else + progid = list->progid; + res = register_key_defvalueA(clsid_key, progid_keyname, + progid); + HeapFree(GetProcessHeap(), 0, buffer); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + if (list->version) { + res = register_key_defvalueA(clsid_key, versionindependentprogid_keyname, + list->progid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + } + + if (list->version) { + res = register_key_defvalueA(clsid_key, version_keyname, + list->version); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + error_close_clsid_key: + RegCloseKey(clsid_key); + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_coclasses + */ +static HRESULT unregister_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, + KEY_READ | KEY_WRITE, &coclass_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->clsid, buf, 39); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * register_progids + */ +static HRESULT register_progids(struct progid const *list) +{ + LONG res = ERROR_SUCCESS; + + for (; res == ERROR_SUCCESS && list->name; ++list) { + WCHAR buf[39]; + HKEY progid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->name, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->description, + strlen(list->description) + 1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + + res = register_key_defvalueW(progid_key, clsid_keyname, buf); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + if (list->curver) { + res = register_key_defvalueA(progid_key, curver_keyname, list->curver); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + error_close_clsid_key: + RegCloseKey(progid_key); + } + + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_progids + */ +static HRESULT unregister_progids(struct progid const *list) +{ + LONG res = ERROR_SUCCESS; + + for (; res == ERROR_SUCCESS && list->name; ++list) { + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->name); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + } + + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * regsvr_key_defvalueW + */ +static LONG register_key_defvalueW( + HKEY base, + WCHAR const *name, + WCHAR const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + (lstrlenW(value) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_key_defvalueA + */ +static LONG register_key_defvalueA( + HKEY base, + WCHAR const *name, + char const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + lstrlenA(value) + 1); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * coclass list + */ +static struct regsvr_coclass const coclass_list[] = { + { &CLSID_DOMDocument60, + "XML DOM Document 6.0", + NULL, + "msxml6.dll", + "Both", + "Msxml2.DOMDocument", + "6.0" + }, + { &CLSID_FreeThreadedDOMDocument60, + "Free Threaded XML DOM Document 6.0", + NULL, + "msxml6.dll", + "Both", + "Microsoft.FreeThreadedDOMDocument6.0", + "6.0" + }, + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * progid list + */ +static struct progid const progid_list[] = { + { "Msxml2.DOMDocument.6.0", + "XML DOM Document 6.0", + &CLSID_DOMDocument60, + NULL + }, + { "MSXML.FreeThreadedDOMDocument60", + "Free threaded XML DOM Document 6.0", + &CLSID_FreeThreadedDOMDocument60, + NULL + }, + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * DllRegisterServer (MSXML4.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = register_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = register_progids(progid_list); + + return hr; +} + +/*********************************************************************** + * DllUnregisterServer (MSXML4.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = unregister_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = unregister_progids(progid_list); + + return hr; +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index df344022b512cd1fe07fce4d419f760a529bbf31..06230479c1674fb3bd34a4a589671dc620aea08b 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -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