Author: akhaldi Date: Thu Dec 26 12:57:01 2013 New Revision: 61424
URL: http://svn.reactos.org/svn/reactos?rev=61424&view=rev Log: [MSXML3] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716
Added: trunk/reactos/dll/win32/msxml3/precomp.h (with props) Modified: trunk/reactos/dll/win32/msxml3/attribute.c trunk/reactos/dll/win32/msxml3/bsc.c trunk/reactos/dll/win32/msxml3/cdata.c trunk/reactos/dll/win32/msxml3/comment.c trunk/reactos/dll/win32/msxml3/dispex.c trunk/reactos/dll/win32/msxml3/docfrag.c trunk/reactos/dll/win32/msxml3/doctype.c trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/domimpl.c trunk/reactos/dll/win32/msxml3/element.c trunk/reactos/dll/win32/msxml3/entityref.c trunk/reactos/dll/win32/msxml3/factory.c trunk/reactos/dll/win32/msxml3/httprequest.c trunk/reactos/dll/win32/msxml3/main.c trunk/reactos/dll/win32/msxml3/mxnamespace.c trunk/reactos/dll/win32/msxml3/mxwriter.c trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/nodelist.c trunk/reactos/dll/win32/msxml3/nodemap.c trunk/reactos/dll/win32/msxml3/parseerror.c trunk/reactos/dll/win32/msxml3/pi.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/schema.c trunk/reactos/dll/win32/msxml3/selection.c trunk/reactos/dll/win32/msxml3/stylesheet.c trunk/reactos/dll/win32/msxml3/text.c trunk/reactos/dll/win32/msxml3/uuid.c trunk/reactos/dll/win32/msxml3/xdr.c trunk/reactos/dll/win32/msxml3/xmldoc.c trunk/reactos/dll/win32/msxml3/xmlelem.c trunk/reactos/dll/win32/msxml3/xmlparser.c trunk/reactos/dll/win32/msxml3/xmlview.c
Modified: trunk/reactos/dll/win32/msxml3/attribute.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/attribute.... ============================================================================== --- trunk/reactos/dll/win32/msxml3/attribute.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/attribute.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -//# include <libxml/HTMLtree.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h"
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/bsc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/bsc.c?rev=... ============================================================================== --- trunk/reactos/dll/win32/msxml3/bsc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/bsc.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -16,35 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS -#define NONAMELESSUNION - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> +#include "precomp.h" + #include <wininet.h> -//#include "urlmon.h" #include <winreg.h> #include <shlwapi.h> - -#include <wine/debug.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
struct bsc_t { IBindStatusCallback IBindStatusCallback_iface;
Modified: trunk/reactos/dll/win32/msxml3/cdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/cdata.c?re... ============================================================================== --- trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h"
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/comment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/comment.c?... ============================================================================== --- trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h"
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/dispex.c?r... ============================================================================== --- trunk/reactos/dll/win32/msxml3/dispex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/dispex.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -16,37 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <ole2.h> -#include <msxml6.h> -//#include "wininet.h" -//#include "urlmon.h" -//#include "winreg.h" -//#include "shlwapi.h" - -#include <wine/debug.h> +#include "precomp.h" + #include <wine/list.h> -//#include "wine/unicode.h" - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
static CRITICAL_SECTION cs_dispex_static_data; static CRITICAL_SECTION_DEBUG cs_dispex_static_data_dbg =
Modified: trunk/reactos/dll/win32/msxml3/docfrag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/docfrag.c?... ============================================================================== --- trunk/reactos/dll/win32/msxml3/docfrag.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/docfrag.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h"
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/doctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/doctype.c?... ============================================================================== --- trunk/reactos/dll/win32/msxml3/doctype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/doctype.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h"
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?r... ============================================================================== --- trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,44 +19,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS -#define NONAMELESSUNION - -#include <config.h> - -//#include <stdarg.h> +#include "precomp.h" + #include <assert.h> + #ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> # include <libxml/xpathInternals.h> # include <libxml/xmlsave.h> # include <libxml/SAX2.h> # include <libxml/parserInternals.h> #endif
-#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <ole2.h> #include <olectl.h> -#include <msxml6.h> -//#include "wininet.h" -//#include "winreg.h" -//#include "shlwapi.h" -//#include "ocidl.h" #include <objsafe.h>
-#include <wine/debug.h> #include <wine/list.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/domimpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domimpl.c?... ============================================================================== --- trunk/reactos/dll/win32/msxml3/domimpl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domimpl.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h"
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/element.c?... ============================================================================== --- trunk/reactos/dll/win32/msxml3/element.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/element.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h"
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/entityref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/entityref.... ============================================================================== --- trunk/reactos/dll/win32/msxml3/entityref.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/entityref.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h"
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/factory.c?... ============================================================================== --- trunk/reactos/dll/win32/msxml3/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/factory.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,25 +19,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#include <config.h> + +#ifdef HAVE_LIBXML2 +# include <libxml/parser.h> +#endif + #define WIN32_NO_STATUS #define _INC_WINDOWS
#define COBJMACROS
-#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - #include <windef.h> #include <winbase.h> -//#include "winuser.h" #include <ole2.h> -//#include "msxml.h" #include <msxml2.h> + #include "xmlparser.h"
/* undef the #define in msxml2 so that we can access the v.2 version
Modified: trunk/reactos/dll/win32/msxml3/httprequest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/httpreques... ============================================================================== --- trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,40 +19,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS -#define NONAMELESSUNION - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -//# include <libxml/encoding.h> -#endif - -#include <windef.h> -#include <winbase.h> +#include "precomp.h" + #include <wingdi.h> #include <wininet.h> -#include <winreg.h> -//#include "winuser.h" -#include <ole2.h> #include <mshtml.h> -#include <msxml6.h> #include <objsafe.h> #include <docobj.h> -#include <shlwapi.h> - -#include "msxml_private.h" - -#include <wine/debug.h> + #include <wine/list.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/main.c?rev... ============================================================================== --- trunk/reactos/dll/win32/msxml3/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/main.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,18 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> +#include "precomp.h" + #include <wine/port.h>
-#define COBJMACROS - -//#include <stdarg.h> #ifdef HAVE_LIBXML2 -//# include <libxml/parser.h> -//# include <libxml/xmlerror.h> # ifdef SONAME_LIBXSLT # ifdef HAVE_LIBXSLT_PATTERN_H # include <libxslt/pattern.h> @@ -43,21 +36,9 @@ # endif #endif
-#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> #include <rpcproxy.h> -//#include "msxml.h" -#include <msxml6.h> - -//#include "wine/unicode.h" -#include <wine/debug.h> + #include <wine/library.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
HINSTANCE MSXML_hInstance = NULL;
Modified: trunk/reactos/dll/win32/msxml3/mxnamespace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/mxnamespac... ============================================================================== --- trunk/reactos/dll/win32/msxml3/mxnamespace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/mxnamespace.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,33 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS -#define NONAMELESSUNION - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -//# include <libxml/encoding.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> +#include "precomp.h" + #include <wine/list.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
struct ns {
Modified: trunk/reactos/dll/win32/msxml3/mxwriter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/mxwriter.c... ============================================================================== --- trunk/reactos/dll/win32/msxml3/mxwriter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/mxwriter.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,28 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -#endif - -#include <windef.h> -#include <winbase.h> -#include <ole2.h> - -#include <msxml6.h> - -#include <wine/debug.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h"
static const WCHAR emptyW[] = {0}; static const WCHAR spaceW[] = {' '};
Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?rev... ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,18 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#define COBJMACROS - -//#include <stdarg.h> +#include "precomp.h"
#ifdef HAVE_LIBXML2 -//# include <libxml/parser.h> -//# include <libxml/xmlerror.h> # include <libxml/HTMLtree.h> # ifdef SONAME_LIBXSLT # ifdef HAVE_LIBXSLT_PATTERN_H @@ -42,19 +33,6 @@ # include <libxslt/xsltInternals.h> # endif #endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/nodelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodelist.c... ============================================================================== --- trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,29 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> +#include "precomp.h" + #include <msxml2did.h> - -#include "msxml_private.h" - -#include <wine/debug.h>
/* This file implements the object returned by childNodes property. Note that this is * not the IXMLDOMNodeList returned by XPath queries - it's implemented in selection.c. @@ -50,8 +30,6 @@ * - note that an attribute node have a text child in DOM but not in the XPath data model * thus the child is inaccessible by an XPath query */ - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/nodemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodemap.c?... ============================================================================== --- trunk/reactos/dll/win32/msxml3/nodemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/nodemap.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,32 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#define COBJMACROS - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <ole2.h> -#include <msxml6.h> +#include "precomp.h" + #include <msxml2did.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/parseerror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/parseerror... ============================================================================== --- trunk/reactos/dll/win32/msxml3/parseerror.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/parseerror.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h"
typedef struct {
Modified: trunk/reactos/dll/win32/msxml3/pi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/pi.c?rev=6... ============================================================================== --- trunk/reactos/dll/win32/msxml3/pi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/pi.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h"
#ifdef HAVE_LIBXML2
Added: trunk/reactos/dll/win32/msxml3/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/precomp.h?... ============================================================================== --- trunk/reactos/dll/win32/msxml3/precomp.h (added) +++ trunk/reactos/dll/win32/msxml3/precomp.h [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -0,0 +1,26 @@ +#ifndef _MSXML3_PCH_ +#define _MSXML3_PCH_ + +#include <config.h> + +#ifdef HAVE_LIBXML2 +# include <libxml/parser.h> +#endif + +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#define COBJMACROS +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <ole2.h> +#include <msxml6.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + +#include "msxml_private.h" + +#endif /* _MSXML3_PCH_ */
Propchange: trunk/reactos/dll/win32/msxml3/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader.... ============================================================================== --- trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,38 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> + +#include "precomp.h" + #ifdef HAVE_LIBXML2 -//# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -//# include <libxml/SAX2.h> # include <libxml/parserInternals.h> #endif
-#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <ole2.h> -#include <msxml6.h> -//#include "wininet.h" -//#include "urlmon.h" -//#include "winreg.h" -//#include "shlwapi.h" - -#include <wine/debug.h> #include <wine/list.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/schema.c?r... ============================================================================== --- trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,39 +19,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> +#include "precomp.h"
#include <assert.h> -//#include <stdarg.h> + #ifdef HAVE_LIBXML2 -//# include <libxml/xmlerror.h> -//# include <libxml/tree.h> # include <libxml/xmlschemas.h> # include <libxml/schemasInternals.h> -//# include <libxml/hash.h> -//# include <libxml/parser.h> # include <libxml/parserInternals.h> -//# include <libxml/xmlIO.h> -//# include <libxml/xmlversion.h> # include <libxml/xpath.h> #endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include <wine/debug.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
/* We use a chained hashtable, which can hold any number of schemas * TODO: grow/shrink hashtable depending on load factor
Modified: trunk/reactos/dll/win32/msxml3/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/selection.... ============================================================================== --- trunk/reactos/dll/win32/msxml3/selection.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/selection.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -20,31 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> +#include "precomp.h" + #ifdef HAVE_LIBXML2 -//# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -//# include <libxml/xpath.h> # include <libxml/xpathInternals.h> #endif
-#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> #include <msxml2did.h> - -#include "msxml_private.h" - -#include <wine/debug.h>
/* This file implements the object returned by a XPath query. Note that this is * not the IXMLDOMNodeList returned by childNodes - it's implemented in nodelist.c. @@ -54,8 +36,6 @@ * - supports IXMLDOMSelection * */ - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/stylesheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/stylesheet... ============================================================================== --- trunk/reactos/dll/win32/msxml3/stylesheet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/stylesheet.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h"
typedef struct {
Modified: trunk/reactos/dll/win32/msxml3/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/text.c?rev... ============================================================================== --- trunk/reactos/dll/win32/msxml3/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/text.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,31 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> +#include "precomp.h" + #ifdef HAVE_LIBXML2 -# include <libxml/parser.h> # include <libxml/parserInternals.h> -//# include <libxml/xmlerror.h> #endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/uuid.c?rev... ============================================================================== --- trunk/reactos/dll/win32/msxml3/uuid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/uuid.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -31,14 +31,13 @@
#include <windef.h> #include <winbase.h> -//#include "winuser.h" -#include <ole2.h> +#include <objbase.h>
/* * First include the version 2 headers so that we don't redefine their * uuids - they're already in libuuid */ -//#include "msxml.h" +#include <msxml.h>
/* Now we can initialize the rest of the uuids */ #include <initguid.h>
Modified: trunk/reactos/dll/win32/msxml3/xdr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xdr.c?rev=... ============================================================================== --- trunk/reactos/dll/win32/msxml3/xdr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xdr.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,16 +19,13 @@ */
-#include <config.h> +#include "precomp.h"
#include <assert.h> + #ifdef HAVE_LIBXML2 # include <libxml/tree.h> #endif - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
/* Both XDR and XSD are valid XML * We just convert the doc tree, no need for a parser.
Modified: trunk/reactos/dll/win32/msxml3/xmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmldoc.c?r... ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmldoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmldoc.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,34 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> +#include "precomp.h" + #include <wininet.h> #include <winreg.h> #include <shlwapi.h> -//#include "ocidl.h" - -#include <wine/debug.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/xmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlelem.c?... ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmlelem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmlelem.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> -//#include "ocidl.h" - -#include <wine/debug.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h"
#ifdef HAVE_LIBXML2
Modified: trunk/reactos/dll/win32/msxml3/xmlparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlparser.... ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmlparser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmlparser.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -17,34 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -//# include <libxml/HTMLtree.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" + +#include "precomp.h"
#include <initguid.h> #include "xmlparser.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
typedef struct _xmlparser {
Modified: trunk/reactos/dll/win32/msxml3/xmlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlview.c?... ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmlview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmlview.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -16,35 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -//#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#ifdef HAVE_LIBXML2 -#include <libxml/parser.h> -#endif - -#include <windef.h> -#include <winbase.h> +#include "precomp.h" + #include <wingdi.h> -#include <ole2.h> -#include <msxml6.h> #include <mshtml.h> #include <mshtmhst.h> #include <perhist.h> -//#include "docobj.h" - -#include <wine/debug.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml);
#ifdef HAVE_LIBXML2