From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Subject: [PATCH] msxml2: Share source with msxml3
Message-Id: <SG2PR02MB1150A0C1FAAE12A418EBCFB5930E0@SG2PR02MB1150.apcprd02.prod.outlook.com>
Date: Tue, 26 Jul 2016 08:04:21 +0000

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
---
 dlls/msxml2/Makefile.in | 49 ++++++++++++++++++++++++++++++++++++--
 dlls/msxml2/main.c      | 63 -------------------------------------------------
 dlls/msxml2/msxml2.spec |  2 +-
 3 files changed, 48 insertions(+), 66 deletions(-)
 delete mode 100644 dlls/msxml2/main.c

diff --git a/dlls/msxml2/Makefile.in b/dlls/msxml2/Makefile.in
index 225d8df..12cc812 100644
--- a/dlls/msxml2/Makefile.in
+++ b/dlls/msxml2/Makefile.in
@@ -1,5 +1,50 @@
 MODULE = msxml2.dll
+IMPORTS   = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
+EXTRALIBS = $(XML2_LIBS)
+EXTRAINCL = $(XML2_CFLAGS) $(XSLT_CFLAGS)
+PARENTSRC = ../msxml3
 
-C_SRCS = main.c
+C_SRCS = \
+	attribute.c \
+	bsc.c \
+	cdata.c \
+	comment.c \
+	dispex.c \
+	docfrag.c \
+	doctype.c \
+	domdoc.c \
+	domimpl.c \
+	element.c \
+	entityref.c \
+	factory.c \
+	httprequest.c \
+	main.c \
+	mxnamespace.c \
+	mxwriter.c \
+	node.c \
+	nodelist.c \
+	nodemap.c \
+	parseerror.c \
+	pi.c \
+	saxreader.c \
+	schema.c \
+	selection.c \
+	stylesheet.c \
+	text.c \
+	uuid.c \
+	xdr.c \
+	xmldoc.c \
+	xmlelem.c \
+	xmlparser.c \
+	xmlview.c
+
+LEX_SRCS = xslpattern.l
+
+BISON_SRCS = xslpattern.y
+
+RC_SRCS = schemas.rc
+
+IDL_SRCS = \
+	msxml2_tlb.idl \
+	xmlparser.idl
 
-IDL_SRCS = msxml2_tlb.idl
diff --git a/dlls/msxml2/main.c b/dlls/msxml2/main.c
deleted file mode 100644
index 096ddc2..0000000
--- a/dlls/msxml2/main.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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 );
-}
-
-/***********************************************************************
- *		DllUnregisterServer (MSXML2.@)
- */
-HRESULT WINAPI DllUnregisterServer(void)
-{
-    return __wine_unregister_resources( instance );
-}
diff --git a/dlls/msxml2/msxml2.spec b/dlls/msxml2/msxml2.spec
index 5fd4c28..b16365d 100644
--- a/dlls/msxml2/msxml2.spec
+++ b/dlls/msxml2/msxml2.spec
@@ -1,4 +1,4 @@
 @ stdcall -private DllCanUnloadNow()
-@ stdcall -private DllGetClassObject(ptr ptr ptr) msxml3.DllGetClassObject
+@ stdcall -private DllGetClassObject(ptr ptr ptr)
 @ stdcall -private DllRegisterServer()
 @ stdcall -private DllUnregisterServer()

-- 
1.9.1