Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/msxml3/bsc.c | 8 +------- dlls/msxml3/msxml_dispex.h | 7 +++++++ dlls/msxml3/msxml_private.h | 7 ------- 3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index 5cebe09333b..3455fd675aa 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -19,13 +19,7 @@ #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" @@ -39,7 +33,7 @@
#include "wine/debug.h"
-#include "msxml_private.h" +#include "msxml_dispex.h"
WINE_DEFAULT_DEBUG_CHANNEL(msxml);
diff --git a/dlls/msxml3/msxml_dispex.h b/dlls/msxml3/msxml_dispex.h index 2f9c53144ef..b4eb02117bb 100644 --- a/dlls/msxml3/msxml_dispex.h +++ b/dlls/msxml3/msxml_dispex.h @@ -145,6 +145,13 @@ static inline HRESULT return_bstrn(const WCHAR *value, int len, BSTR *p) }
extern HRESULT dom_document_create(MSXML_VERSION class_version, void **document) DECLSPEC_HIDDEN; + +typedef struct bsc_t bsc_t; + +HRESULT create_moniker_from_url(LPCWSTR, IMoniker**) DECLSPEC_HIDDEN; +HRESULT create_uri(IUri *base, const WCHAR *, IUri **) DECLSPEC_HIDDEN; +HRESULT bind_url(IMoniker*, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; +HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; IUri *get_base_uri(IUnknown *site) DECLSPEC_HIDDEN;
#endif /* __MSXML_DISPEX__ */ diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 12ef1dcedf8..d578d5de560 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -397,13 +397,6 @@ extern HRESULT MXNamespaceManager_create(void**) DECLSPEC_HIDDEN; extern HRESULT XMLParser_create(void**) DECLSPEC_HIDDEN; extern HRESULT XMLView_create(void**) DECLSPEC_HIDDEN;
-typedef struct bsc_t bsc_t; - -HRESULT create_moniker_from_url(LPCWSTR, IMoniker**) DECLSPEC_HIDDEN; -HRESULT create_uri(IUri *base, const WCHAR *, IUri **) DECLSPEC_HIDDEN; -HRESULT bind_url(IMoniker*, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; -HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; - /* Error Codes - not defined anywhere in the public headers */ #define E_XML_ELEMENT_UNDECLARED 0xC00CE00D #define E_XML_ELEMENT_ID_NOT_FOUND 0xC00CE00E