ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msxml2: Add an msxml2 library that contains the v2.6 msxml typelib.

This commit is contained in:
Alexandre Julliard 2010-12-21 13:27:20 +01:00
parent cfa37214b9
commit 41d6a92349
11 changed files with 1272 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -95,6 +95,7 @@ dlls/msi/sql.tab.h
dlls/mstask/mstask_local.h
dlls/mstask/mstask_local_i.c
dlls/msxml/msxml_tlb.tlb
dlls/msxml2/msxml2_tlb.tlb
dlls/msxml3/msxml3_v1.tlb
dlls/msxml3/xslpattern.tab.c
dlls/msxml3/xslpattern.tab.h

1
configure vendored
View File

@ -15066,6 +15066,7 @@ wine_fn_config_dll msvidc32 enable_msvidc32
wine_fn_config_dll msvideo.dll16 enable_win16
wine_fn_config_dll mswsock enable_mswsock mswsock
wine_fn_config_dll msxml enable_msxml
wine_fn_config_dll msxml2 enable_msxml2
wine_fn_config_dll msxml3 enable_msxml3
wine_fn_config_test dlls/msxml3/tests msxml3_test
wine_fn_config_dll msxml4 enable_msxml4

1
configure.ac
View File

@ -2612,6 +2612,7 @@ WINE_CONFIG_DLL(msvidc32)
WINE_CONFIG_DLL(msvideo.dll16,enable_win16)
WINE_CONFIG_DLL(mswsock,,[mswsock])
WINE_CONFIG_DLL(msxml)
WINE_CONFIG_DLL(msxml2)
WINE_CONFIG_DLL(msxml3)
WINE_CONFIG_TEST(dlls/msxml3/tests)
WINE_CONFIG_DLL(msxml4)

10
dlls/msxml2/Makefile.in Normal file
View File

@ -0,0 +1,10 @@
MODULE = msxml2.dll
C_SRCS = main.c
IDL_TLB_SRCS = msxml2_tlb.idl
IDL_R_SRCS = msxml2_tlb.idl
RC_SRCS = rsrc.rc
@MAKE_DLL_RULES@

63
dlls/msxml2/main.c Normal file
View File

@ -0,0 +1,63 @@
/*
* MSXML2 implementation
*
* Copyright 2010 Alexandre Julliard
*
* 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"
#include "objbase.h"
#include "rpcproxy.h"
static HINSTANCE instance;
BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved)
{
switch (reason)
{
case DLL_PROCESS_ATTACH:
instance = hinstance;
DisableThreadLibraryCalls(hinstance);
break;
}
return TRUE;
}
/***********************************************************************
* DllCanUnloadNow (MSXML2.@)
*/
HRESULT WINAPI DllCanUnloadNow(void)
{
return S_FALSE;
}
/***********************************************************************
* DllRegisterServer (MSXML2.@)
*/
HRESULT WINAPI DllRegisterServer(void)
{
return __wine_register_resources( instance, NULL );
}
/***********************************************************************
* DllUnregisterServer (MSXML2.@)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
return __wine_unregister_resources( instance, NULL );
}

4
dlls/msxml2/msxml2.spec Normal file
View File

@ -0,0 +1,4 @@
@ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject(ptr ptr ptr) msxml3.DllGetClassObject
@ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer()

1166
dlls/msxml2/msxml2_tlb.idl Normal file
View File

File diff suppressed because it is too large Load Diff

22
dlls/msxml2/rsrc.rc Normal file
View File

@ -0,0 +1,22 @@
/*
* Resources for msxml2
*
* Copyright 2010 Alexandre Julliard
*
* 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
*/
/* @makedep: msxml2_tlb.tlb */
1 TYPELIB msxml2_tlb.tlb

3
dlls/msxml3/factory.c
View File

@ -218,6 +218,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv )
if( IsEqualCLSID( rclsid, &CLSID_DOMDocument ) || /* Version indep. v 2.x */
IsEqualCLSID( rclsid, &CLSID_DOMDocument2 ) || /* Version indep. v 3.0 */
IsEqualCLSID( rclsid, &CLSID_DOMDocument26 )|| /* Version dep. v 2.6 */
IsEqualCLSID( rclsid, &CLSID_DOMDocument30 )|| /* Version dep. v 3.0 */
IsEqualCLSID( rclsid, &CLSID_DOMDocument40 )|| /* Version dep. v 4.0 */
IsEqualCLSID( rclsid, &CLSID_DOMDocument60 )) /* Version dep. v 6.0 */
@ -225,6 +226,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv )
return DOMClassFactory_Create(rclsid, riid, ppv, DOMDocument_create);
}
else if( IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache ) ||
IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache26 ) ||
IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache30 ) ||
IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache40 ) ||
IsEqualCLSID( rclsid, &CLSID_XMLSchemaCache60 ))
@ -237,6 +239,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv )
}
else if( IsEqualCLSID( rclsid, &CLSID_DOMFreeThreadedDocument ) || /* Version indep. v 2.x */
IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument ) ||
IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument26 ) ||
IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument30 ) ||
IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument40 ) ||
IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument60 ))

39
dlls/msxml3/regsvr.c
View File

@ -490,14 +490,6 @@ static struct regsvr_coclass const coclass_list[] = {
"Microsoft.FreeThreadedXMLDOM.1.0",
"1.0"
},
{ &CLSID_FreeThreadedDOMDocument26,
"Free Threaded XML DOM Document 2.6",
NULL,
"msxml3.dll",
"Both",
"Microsoft.FreeThreadedXMLDOM.1.0",
"1.0"
},
{ &CLSID_FreeThreadedDOMDocument30,
"Free Threaded XML DOM Document 3.0",
NULL,
@ -506,14 +498,6 @@ static struct regsvr_coclass const coclass_list[] = {
"Microsoft.FreeThreadedDOMDocument.1.0",
"1.0"
},
{ &CLSID_XMLHTTP26,
"XML HTTP 2.6",
NULL,
"msxml3.dll",
"Apartment",
"Msxml2.XMLHTTP.2.6",
"2.6"
},
{ &CLSID_XMLHTTP30,
"XML HTTP 3.0",
NULL,
@ -537,14 +521,6 @@ static struct regsvr_coclass const coclass_list[] = {
"Msxml2.XMLSchemaCache",
"3.0"
},
{ &CLSID_XMLSchemaCache26,
"XML Schema Cache 2.6",
NULL,
"msxml3.dll",
"Both",
"Msxml2.XMLSchemaCache",
"2.6"
},
{ &CLSID_XMLSchemaCache30,
"XML Schema Cache 3.0",
NULL,
@ -625,21 +601,11 @@ static struct progid const progid_list[] = {
&CLSID_DOMDocument30,
NULL
},
{ "MSXML.FreeThreadedDOMDocument26",
"Free threaded XML DOM Document 2.6",
&CLSID_FreeThreadedDOMDocument26,
NULL
},
{ "MSXML.FreeThreadedDOMDocument30",
"Free threaded XML DOM Document 3.0",
&CLSID_FreeThreadedDOMDocument30,
NULL
},
{ "Msxml2.XMLHTTP.2.6",
"XML HTTP 2.6",
&CLSID_XMLHTTP26,
NULL
},
{ "Msxml2.XMLHTTP.3.0",
"XML HTTP 3.0",
&CLSID_XMLHTTP30,
@ -655,11 +621,6 @@ static struct progid const progid_list[] = {
&CLSID_XMLSchemaCache,
"Msxml2.XMLSchemaCache.3.0"
},
{ "Msxml2.XMLSchemaCache.2.6",
"XML Schema Cache 2.6",
&CLSID_XMLSchemaCache26,
"Msxml2.XMLSchemaCache.2.6"
},
{ "Msxml2.XMLSchemaCache.3.0",
"XML Schema Cache 3.0",
&CLSID_XMLSchemaCache30,

1
tools/wine.inf.in
View File

@ -2528,6 +2528,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,msisip.dll,1
11,,mstask.dll,1
11,,msxml.dll,1
11,,msxml2.dll,1
11,,msxml3.dll,1
11,,msxml4.dll,1
11,,msxml6.dll,1