ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MSXML3]

Browse Source 
* 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

svn path=/trunk/; revision=61424
This commit is contained in:
Amine Khaldi
2013-12-26 12:57:01 +00:00
parent 06cf1802b7
commit 13ceeb7415
33 changed files with 68 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/msxml3/attribute.c
+1 -25
View File
@@ -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
reactos/dll/win32/msxml3/bsc.c
+1 -25
View File
@@ -16,36 +16,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include "precomp.h"
#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 <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;
reactos/dll/win32/msxml3/cdata.c
+1 -24
View File
@@ -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
reactos/dll/win32/msxml3/comment.c
+1 -24
View File
@@ -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
reactos/dll/win32/msxml3/dispex.c
+1 -29
View File
@@ -16,37 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include "precomp.h"
#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 <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 =
reactos/dll/win32/msxml3/docfrag.c
+1 -24
View File
@@ -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
reactos/dll/win32/msxml3/doctype.c
+1 -25
View File
@@ -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
reactos/dll/win32/msxml3/domdoc.c
+2 -25
View File
@@ -19,45 +19,22 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include "precomp.h"
#define COBJMACROS
#define NONAMELESSUNION
#include <config.h>
//#include <stdarg.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
/* not defined in older versions */
reactos/dll/win32/msxml3/domimpl.c
+1 -24
View File
@@ -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
reactos/dll/win32/msxml3/element.c
+1 -25
View File
@@ -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
reactos/dll/win32/msxml3/entityref.c
+1 -24
View File
@@ -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
reactos/dll/win32/msxml3/factory.c
+7 -10
View File
@@ -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
reactos/dll/win32/msxml3/httprequest.c
+1 -26
View File
@@ -19,41 +19,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include "precomp.h"
#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 <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
static const WCHAR colspaceW[] = {':',' ',0};
reactos/dll/win32/msxml3/main.c
+1 -20
View File
@@ -19,18 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include "precomp.h"
#include <config.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,22 +36,10 @@
# 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;
#ifdef HAVE_LIBXML2
reactos/dll/win32/msxml3/mxnamespace.c
+1 -25
View File
@@ -18,34 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include "precomp.h"
#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 <wine/list.h>
WINE_DEFAULT_DEBUG_CHANNEL(msxml);
struct ns
{
BSTR prefix;
reactos/dll/win32/msxml3/mxwriter.c
+1 -22
View File
@@ -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[] = {' '};
reactos/dll/win32/msxml3/node.c
+1 -23
View File
@@ -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
@@ -43,19 +34,6 @@
# 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
#ifdef SONAME_LIBXSLT
reactos/dll/win32/msxml3/nodelist.c
+1 -23
View File
@@ -18,30 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include "precomp.h"
#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 <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.
* They are different because the list returned by childNodes:
@@ -51,8 +31,6 @@
* thus the child is inaccessible by an XPath query
*/
WINE_DEFAULT_DEBUG_CHANNEL(msxml);
#ifdef HAVE_LIBXML2
typedef struct
reactos/dll/win32/msxml3/nodemap.c
+1 -24
View File
@@ -18,33 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include "precomp.h"
#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 <msxml2did.h>
#include "msxml_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(msxml);
#ifdef HAVE_LIBXML2
typedef struct
reactos/dll/win32/msxml3/parseerror.c
+1 -25
View File
@@ -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
{
reactos/dll/win32/msxml3/pi.c
+1 -24
View File
@@ -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
reactos/dll/win32/msxml3/precomp.h
+26
View File
@@ -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_ */
reactos/dll/win32/msxml3/saxreader.c
+1 -25
View File
@@ -18,39 +18,15 @@
* 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 "precomp.h"
#include <config.h>
//#include <stdarg.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
typedef enum
reactos/dll/win32/msxml3/schema.c
+2 -25
View File
@@ -19,40 +19,17 @@
* 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
* TODO: implement read-only where appropriate
reactos/dll/win32/msxml3/selection.c
+1 -21
View File
@@ -20,32 +20,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include "precomp.h"
#define COBJMACROS
#include <config.h>
//#include <stdarg.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.
* They are different because the list returned by XPath queries:
@@ -55,8 +37,6 @@
*
*/
WINE_DEFAULT_DEBUG_CHANNEL(msxml);
#ifdef HAVE_LIBXML2
int registerNamespaces(xmlXPathContextPtr ctxt);
reactos/dll/win32/msxml3/stylesheet.c
+1 -24
View File
@@ -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
{
reactos/dll/win32/msxml3/text.c
+1 -21
View File
@@ -19,32 +19,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include "precomp.h"
#define COBJMACROS
#include <config.h>
//#include <stdarg.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
typedef struct _domtext
reactos/dll/win32/msxml3/uuid.c
+2 -3
View File
@@ -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>
reactos/dll/win32/msxml3/xdr.c
+2 -5
View File
@@ -19,17 +19,14 @@
*/
#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.
*/
reactos/dll/win32/msxml3/xmldoc.c
+1 -24
View File
@@ -18,34 +18,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include "precomp.h"
#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 <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
reactos/dll/win32/msxml3/xmlelem.c
+1 -25
View File
@@ -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
reactos/dll/win32/msxml3/xmlparser.c
+1 -24
View File
@@ -17,35 +17,12 @@
* 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
{
IXMLParser IXMLParser_iface;
reactos/dll/win32/msxml3/xmlview.c
+1 -24
View File
@@ -16,35 +16,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#include "precomp.h"
#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 <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