Module: wine Branch: master Commit: 25ccc90b4207299a3e9b04feb3f3e1c2370913c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ccc90b4207299a3e9b04feb3...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Dec 21 12:03:14 2010 +0100
msxml: Add an msxml library that contains the v2.0 msxml typelib.
---
.gitignore | 1 + configure | 1 + configure.ac | 1 + dlls/msxml/Makefile.in | 10 +++++++ dlls/msxml/main.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml/msxml.spec | 4 +++ dlls/msxml/msxml_tlb.idl | 19 ++++++++++++++ dlls/msxml/rsrc.rc | 22 ++++++++++++++++ 8 files changed, 121 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore index 31b5dcb..75e33da 100644 --- a/.gitignore +++ b/.gitignore @@ -94,6 +94,7 @@ dlls/msi/sql.tab.c dlls/msi/sql.tab.h dlls/mstask/mstask_local.h dlls/mstask/mstask_local_i.c +dlls/msxml/msxml_tlb.tlb dlls/msxml3/msxml3_v1.tlb dlls/msxml3/xslpattern.tab.c dlls/msxml3/xslpattern.tab.h diff --git a/configure b/configure index a83e6b7..00fbb6f 100755 --- a/configure +++ b/configure @@ -15065,6 +15065,7 @@ wine_fn_config_test dlls/msvfw32/tests msvfw32_test 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 msxml3 enable_msxml3 wine_fn_config_test dlls/msxml3/tests msxml3_test wine_fn_config_dll msxml4 enable_msxml4 diff --git a/configure.ac b/configure.ac index 0706192..1250730 100644 --- a/configure.ac +++ b/configure.ac @@ -2611,6 +2611,7 @@ WINE_CONFIG_TEST(dlls/msvfw32/tests) WINE_CONFIG_DLL(msvidc32) WINE_CONFIG_DLL(msvideo.dll16,enable_win16) WINE_CONFIG_DLL(mswsock,,[mswsock]) +WINE_CONFIG_DLL(msxml) WINE_CONFIG_DLL(msxml3) WINE_CONFIG_TEST(dlls/msxml3/tests) WINE_CONFIG_DLL(msxml4) diff --git a/dlls/msxml/Makefile.in b/dlls/msxml/Makefile.in new file mode 100644 index 0000000..25c45bc --- /dev/null +++ b/dlls/msxml/Makefile.in @@ -0,0 +1,10 @@ +MODULE = msxml.dll + +C_SRCS = main.c + +IDL_TLB_SRCS = msxml_tlb.idl +IDL_R_SRCS = msxml_tlb.idl + +RC_SRCS = rsrc.rc + +@MAKE_DLL_RULES@ diff --git a/dlls/msxml/main.c b/dlls/msxml/main.c new file mode 100644 index 0000000..008c0a9 --- /dev/null +++ b/dlls/msxml/main.c @@ -0,0 +1,63 @@ +/* + * MSXML 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 (MSXML.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (MSXML.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( instance, NULL ); +} + +/*********************************************************************** + * DllUnregisterServer (MSXML.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( instance, NULL ); +} diff --git a/dlls/msxml/msxml.spec b/dlls/msxml/msxml.spec new file mode 100644 index 0000000..5fd4c28 --- /dev/null +++ b/dlls/msxml/msxml.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/msxml/msxml_tlb.idl b/dlls/msxml/msxml_tlb.idl new file mode 100644 index 0000000..8ad22a2 --- /dev/null +++ b/dlls/msxml/msxml_tlb.idl @@ -0,0 +1,19 @@ +/* + * 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 "msxml.idl" diff --git a/dlls/msxml/rsrc.rc b/dlls/msxml/rsrc.rc new file mode 100644 index 0000000..9537637 --- /dev/null +++ b/dlls/msxml/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Resources for msxml + * + * 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: msxml_tlb.tlb */ +1 TYPELIB msxml_tlb.tlb