[MSXML3] Sync with wine-10.0

Author: tkreuzer

dll/win32/msxml3/CMakeLists.txt

@@ -32,6 +32,7 @@ list(APPEND SOURCE
     nodemap.c
     parseerror.c
     pi.c
+    reactos.c
     saxreader.c
     schema.c
     selection.c
@@ -70,20 +71,25 @@ add_library(msxml3 MODULE
 
 add_idl_headers(xmlparser_idlheader xmlparser.idl)
 set_module_type(msxml3 win32dll)
-target_link_libraries(msxml3 libxml2 iconv-static uuid wine zlib)
+target_link_libraries(msxml3 libxml2 iconv-static uuid wine wine_dll_register zlib)
 
 if(MSVC)
     target_compile_options(msxml3 PRIVATE /FIwine/typeof.h /FImsvc.h)
 
     # Disable warning C4090: 'function': different 'const' qualifiers
     target_compile_options(msxml3 PRIVATE /wd4090)
+
+    if(ARCH STREQUAL "amd64" OR ARCH STREQUAL "arm64")
+        # Disable warning C4267: 'function': conversion from 'size_t' to 'UINT', possible loss of data
+        target_compile_options(msxml3 PRIVATE "/wd4267")
+    endif()
 endif()
 
 if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
     target_compile_options(msxml3 PRIVATE -Wno-incompatible-function-pointer-types)
 endif()
 
-add_importlibs(msxml3 urlmon ws2_32 shlwapi oleaut32 ole32 user32 msvcrt kernel32 ntdll)
+add_importlibs(msxml3 libxslt urlmon ws2_32 shlwapi oleaut32 ole32 user32 msvcrt kernel32 ntdll)
 add_dependencies(msxml3 xmlparser_idlheader stdole2) # msxml3_v1.tlb needs stdole2.tlb
 add_pch(msxml3 precomp.h "${PCH_SKIP_SOURCE}")
 add_cd_file(TARGET msxml3 DESTINATION reactos/system32 FOR all)

dll/win32/msxml3/attribute.c

@@ -20,14 +20,10 @@
 
 #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 <libxml/parser.h>
+#include <libxml/xmlerror.h>
+#include <libxml/HTMLtree.h>
 
 #include "windef.h"
 #include "winbase.h"
@@ -39,8 +35,6 @@
 
 #include "wine/debug.h"
 
-#ifdef HAVE_LIBXML2
-
 WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 
 static const xmlChar xmlns[] = "xmlns";
@@ -101,9 +95,9 @@ static HRESULT WINAPI domattr_QueryInterface(
 static ULONG WINAPI domattr_AddRef(
     IXMLDOMAttribute *iface )
 {
-    domattr *This = impl_from_IXMLDOMAttribute( iface );
-    ULONG ref = InterlockedIncrement( &This->ref );
-    TRACE("(%p)->(%d)\n", This, ref);
+    domattr *attr = impl_from_IXMLDOMAttribute( iface );
+    ULONG ref = InterlockedIncrement( &attr->ref );
+    TRACE("%p, refcount %lu.\n", iface, ref);
     return ref;
 }
 
@@ -113,7 +107,7 @@ static ULONG WINAPI domattr_Release(
     domattr *This = impl_from_IXMLDOMAttribute( iface );
     ULONG ref = InterlockedDecrement( &This->ref );
 
-    TRACE("(%p)->(%d)\n", This, ref);
+    TRACE("%p, refcount %lu.\n", iface, ref);
     if ( ref == 0 )
     {
         destroy_xmlnode(&This->node);
@@ -122,7 +116,7 @@ static ULONG WINAPI domattr_Release(
             xmlFreeNs( This->node.node->ns );
             xmlFreeNode( This->node.node );
         }
-        heap_free( This );
+        free( This );
     }
 
     return ref;
@@ -549,33 +543,47 @@ static HRESULT WINAPI domattr_get_namespaceURI(
     IXMLDOMAttribute *iface,
     BSTR* p)
 {
-    static const WCHAR w3xmlns[] = { 'h','t','t','p',':','/','/', 'w','w','w','.','w','3','.',
-        'o','r','g','/','2','0','0','0','/','x','m','l','n','s','/',0 };
     domattr *This = impl_from_IXMLDOMAttribute( iface );
     xmlNsPtr ns = This->node.node->ns;
+    BSTR nodename, pfx;
+    BOOL is6, isdefault;
+    HRESULT hr;
 
     TRACE("(%p)->(%p)\n", This, p);
 
     if (!p)
         return E_INVALIDARG;
 
     *p = NULL;
+    nodename = NULL;
+    hr = IXMLDOMAttribute_get_nodeName(iface, &nodename);
+    if (FAILED(hr))
+        return hr;
+
+    pfx = NULL;
+    hr = IXMLDOMAttribute_get_prefix(iface, &pfx);
+    if (FAILED(hr))
+    {
+        SysFreeString(nodename);
+        return hr;
+    }
 
-    if (ns)
+    is6 = xmldoc_version(This->node.node->doc) == MSXML6;
+    isdefault = !wcscmp(nodename, L"xmlns");
+    if (isdefault || (pfx && !wcscmp(L"xmlns", pfx)))
     {
-        /* special case for default namespace definition */
-        if (xmlStrEqual(This->node.node->name, xmlns))
-            *p = bstr_from_xmlChar(xmlns);
-        else if (xmlStrEqual(ns->prefix, xmlns))
-        {
-            if (xmldoc_version(This->node.node->doc) == MSXML6)
-                *p = SysAllocString(w3xmlns);
-            else
-                *p = SysAllocStringLen(NULL, 0);
-        }
-        else if (ns->href)
-            *p = bstr_from_xmlChar(ns->href);
+        if (is6)
+            *p = SysAllocString(L"http://www.w3.org/2000/xmlns/");
+        else if (!ns || !isdefault)
+            *p = SysAllocStringLen(NULL, 0);
+        else
+            *p = SysAllocString(L"xmlns");
     }
+    else if (ns && ns->href)
+        *p = bstr_from_xmlChar(ns->href);
+
+    SysFreeString(nodename);
+    SysFreeString(pfx);
 
     TRACE("uri: %s\n", debugstr_w(*p));
 
@@ -595,14 +603,11 @@ static HRESULT WINAPI domattr_get_prefix(
 
     *prefix = NULL;
 
-    if (ns)
-    {
-        /* special case for default namespace definition */
-        if (xmlStrEqual(This->node.node->name, xmlns))
-            *prefix = bstr_from_xmlChar(xmlns);
-        else if (ns->prefix)
-            *prefix = bstr_from_xmlChar(ns->prefix);
-    }
+    if (xmldoc_version(This->node.node->doc) != MSXML6 &&
+        xmlStrEqual(This->node.node->name, xmlns))
+        *prefix = bstr_from_xmlChar(xmlns);
+    else if (ns && ns->prefix)
+        *prefix = bstr_from_xmlChar(ns->prefix);
 
     TRACE("prefix: %s\n", debugstr_w(*prefix));
 
@@ -726,7 +731,7 @@ IUnknown* create_attribute( xmlNodePtr attribute, BOOL floating )
 {
     domattr *This;
 
-    This = heap_alloc( sizeof *This );
+    This = malloc(sizeof(*This));
     if ( !This )
         return NULL;
 
@@ -738,5 +743,3 @@ IUnknown* create_attribute( xmlNodePtr attribute, BOOL floating )
 
     return (IUnknown*)&This->IXMLDOMAttribute_iface;
 }
-
-#endif

dll/win32/msxml3/bsc.c

@@ -17,15 +17,8 @@
  */
 
 #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 +32,7 @@
 
 #include "wine/debug.h"
 
-#include "msxml_private.h"
+#include "msxml_dispex.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 
@@ -82,26 +75,29 @@ static HRESULT WINAPI bsc_QueryInterface(
 static ULONG WINAPI bsc_AddRef(
     IBindStatusCallback *iface )
 {
-    bsc_t *This = impl_from_IBindStatusCallback(iface);
-    LONG ref = InterlockedIncrement(&This->ref);
+    bsc_t *bsc = impl_from_IBindStatusCallback(iface);
+    LONG ref = InterlockedIncrement(&bsc->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("%p, refcount %ld.\n", iface, ref);
 
     return ref;
 }
 
 static ULONG WINAPI bsc_Release(
     IBindStatusCallback *iface )
 {
-    bsc_t *This = impl_from_IBindStatusCallback(iface);
-    LONG ref = InterlockedDecrement(&This->ref);
+    bsc_t *bsc = impl_from_IBindStatusCallback(iface);
+    LONG ref = InterlockedDecrement(&bsc->ref);
 
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("%p, refcount %ld.\n", iface, ref);
 
-    if(!ref) {
-        if (This->binding)   IBinding_Release(This->binding);
-        if (This->memstream) IStream_Release(This->memstream);
-        heap_free(This);
+    if (!ref)
+    {
+        if (bsc->binding)
+            IBinding_Release(bsc->binding);
+        if (bsc->memstream)
+            IStream_Release(bsc->memstream);
+        free(bsc);
     }
 
     return ref;
@@ -115,7 +111,7 @@ static HRESULT WINAPI bsc_OnStartBinding(
     bsc_t *This = impl_from_IBindStatusCallback(iface);
     HRESULT hr;
 
-    TRACE("(%p)->(%x %p)\n", This, dwReserved, pib);
+    TRACE("%p, %lx, %p.\n", iface, dwReserved, pib);
 
     This->binding = pib;
     IBinding_AddRef(pib);
@@ -159,7 +155,7 @@ static HRESULT WINAPI bsc_OnStopBinding(
     bsc_t *This = impl_from_IBindStatusCallback(iface);
     HRESULT hr = S_OK;
 
-    TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError));
+    TRACE("%p, %#lx, %s.\n", iface, hresult, debugstr_w(szError));
 
     if(This->binding) {
         IBinding_Release(This->binding);
@@ -200,20 +196,20 @@ static HRESULT WINAPI bsc_OnDataAvailable(
         FORMATETC* pformatetc,
         STGMEDIUM* pstgmed)
 {
-    bsc_t *This = impl_from_IBindStatusCallback(iface);
+    bsc_t *bsc = impl_from_IBindStatusCallback(iface);
     BYTE buf[4096];
     DWORD read, written;
     HRESULT hr;
 
-    TRACE("(%p)->(%x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
+    TRACE("%p, %lx, %lu, %p, %p.\n", iface, grfBSCF, dwSize, pformatetc, pstgmed);
 
     do
     {
-        hr = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &read);
+        hr = IStream_Read(pstgmed->pstm, buf, sizeof(buf), &read);
         if(FAILED(hr))
             break;
 
-        hr = IStream_Write(This->memstream, buf, read, &written);
+        hr = IStream_Write(bsc->memstream, buf, read, &written);
     } while(SUCCEEDED(hr) && written != 0 && read != 0);
 
     return S_OK;
@@ -242,9 +238,10 @@ static const struct IBindStatusCallbackVtbl bsc_vtbl =
     bsc_OnObjectAvailable
 };
 
-HRESULT create_uri(const WCHAR *url, IUri **uri)
+HRESULT create_uri(IUri *base, const WCHAR *url, IUri **uri)
 {
     WCHAR fileUrl[INTERNET_MAX_URL_LENGTH];
+    HRESULT hr;
 
     TRACE("%s\n", debugstr_w(url));
 
@@ -253,21 +250,35 @@ HRESULT create_uri(const WCHAR *url, IUri **uri)
         WCHAR fullpath[MAX_PATH];
         DWORD needed = ARRAY_SIZE(fileUrl);
 
-        if (!PathSearchAndQualifyW(url, fullpath, ARRAY_SIZE(fullpath)))
+        lstrcpynW(fileUrl, url, ARRAY_SIZE(fileUrl));
+        UrlUnescapeW(fileUrl, NULL, NULL, URL_UNESCAPE_INPLACE);
+
+        if (!PathSearchAndQualifyW(fileUrl, fullpath, ARRAY_SIZE(fullpath)))
         {
             WARN("can't find path\n");
             return E_FAIL;
         }
 
-        if (FAILED(UrlCreateFromPathW(fullpath, fileUrl, &needed, 0)))
+        if (FAILED(UrlApplySchemeW(fullpath, fileUrl, &needed, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE |
+                URL_APPLY_DEFAULT)))
         {
-            ERR("can't create url from path\n");
+            ERR("Failed to apply url scheme.\n");
             return E_FAIL;
         }
         url = fileUrl;
     }
 
-    return CreateUri(url, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, uri);
+    hr = CreateUri(url, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, uri);
+    if (hr == S_OK && base)
+    {
+        IUri *rebased_uri;
+
+        hr = CoInternetCombineIUri(base, *uri, 0, &rebased_uri, 0);
+        IUri_Release(*uri);
+        *uri = rebased_uri;
+    }
+
+    return hr;
 }
 
 HRESULT create_moniker_from_url(LPCWSTR url, IMoniker **mon)
@@ -277,7 +288,7 @@ HRESULT create_moniker_from_url(LPCWSTR url, IMoniker **mon)
 
     TRACE("%s\n", debugstr_w(url));
 
-    if (FAILED(hr = create_uri(url, &uri)))
+    if (FAILED(hr = create_uri(NULL, url, &uri)))
         return hr;
 
     hr = CreateURLMonikerEx2(NULL, uri, mon, 0);
@@ -298,7 +309,7 @@ HRESULT bind_url(IMoniker *mon, HRESULT (*onDataAvailable)(void*,char*,DWORD),
     if(FAILED(hr))
         return hr;
 
-    bsc = heap_alloc(sizeof(bsc_t));
+    bsc = malloc(sizeof(bsc_t));
 
     bsc->IBindStatusCallback_iface.lpVtbl = &bsc_vtbl;
     bsc->ref = 1;