From f14c2f712f0e8b2dd924f52dd960ab8add791da9 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Fri, 27 Jul 2012 07:53:58 +0400
Subject: [PATCH] msxml3: Enable inline wrappers and fix warnings.

---
 dlls/msxml3/Makefile.in | 1 +
 dlls/msxml3/attribute.c | 2 +-
 dlls/msxml3/cdata.c     | 2 +-
 dlls/msxml3/comment.c   | 2 +-
 dlls/msxml3/docfrag.c   | 2 +-
 dlls/msxml3/domdoc.c    | 2 +-
 dlls/msxml3/nodemap.c   | 2 +-
 dlls/msxml3/text.c      | 2 +-
 dlls/msxml3/xmlparser.c | 2 +-
 dlls/msxml3/xmlview.c   | 2 +-
 10 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index acd571fdb74..fcf78b5a3d3 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -1,6 +1,7 @@
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 MODULE    = msxml3.dll
 IMPORTS   = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
+EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS
 EXTRALIBS = @XML2LIBS@
 EXTRAINCL = @XML2INCL@ @XSLTINCL@
 
diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
index 0fa00ec5d16..d461ce14c8f 100644
--- a/dlls/msxml3/attribute.c
+++ b/dlls/msxml3/attribute.c
@@ -91,7 +91,7 @@ static HRESULT WINAPI domattr_QueryInterface(
         return E_NOINTERFACE;
     }
 
-    IXMLDOMText_AddRef((IUnknown*)*ppvObject);
+    IXMLDOMAttribute_AddRef(iface);
     return S_OK;
 }
 
diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
index 1cf3d29b397..6b3c06529f7 100644
--- a/dlls/msxml3/cdata.c
+++ b/dlls/msxml3/cdata.c
@@ -91,7 +91,7 @@ static HRESULT WINAPI domcdata_QueryInterface(
         return E_NOINTERFACE;
     }
 
-    IXMLDOMText_AddRef((IUnknown*)*ppvObject);
+    IXMLDOMCDATASection_AddRef(iface);
     return S_OK;
 }
 
diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
index 172a1e68235..be49e717f11 100644
--- a/dlls/msxml3/comment.c
+++ b/dlls/msxml3/comment.c
@@ -91,7 +91,7 @@ static HRESULT WINAPI domcomment_QueryInterface(
         return E_NOINTERFACE;
     }
 
-    IXMLDOMText_AddRef((IUnknown*)*ppvObject);
+    IXMLDOMComment_AddRef(iface);
     return S_OK;
 }
 
diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c
index 46b81b08082..f0662906112 100644
--- a/dlls/msxml3/docfrag.c
+++ b/dlls/msxml3/docfrag.c
@@ -90,7 +90,7 @@ static HRESULT WINAPI domfrag_QueryInterface(
         return E_NOINTERFACE;
     }
 
-    IXMLDOMText_AddRef((IUnknown*)*ppvObject);
+    IXMLDOMDocumentFragment_AddRef(iface);
     return S_OK;
 }
 
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index c2dbe03e5d3..54c601eebcd 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -2115,7 +2115,7 @@ static HRESULT WINAPI domdoc_load(
         if(hr == S_OK)
         {
             IPersistStream *pDocStream;
-            hr = IUnknown_QueryInterface(iface, &IID_IPersistStream, (void**)&pDocStream);
+            hr = IXMLDOMDocument3_QueryInterface(iface, &IID_IPersistStream, (void**)&pDocStream);
             if(hr == S_OK)
             {
                 hr = IPersistStream_Load(pDocStream, pStream);
diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
index c6be169c33b..94faf9faf81 100644
--- a/dlls/msxml3/nodemap.c
+++ b/dlls/msxml3/nodemap.c
@@ -117,7 +117,7 @@ static HRESULT WINAPI xmlnodemap_QueryInterface(
         return E_NOINTERFACE;
     }
 
-    IXMLDOMElement_AddRef( iface );
+    IXMLDOMNamedNodeMap_AddRef( iface );
 
     return S_OK;
 }
diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
index 865c1d4f3d0..6fb29f9e3f9 100644
--- a/dlls/msxml3/text.c
+++ b/dlls/msxml3/text.c
@@ -82,7 +82,7 @@ static HRESULT WINAPI domtext_QueryInterface(
         return E_NOINTERFACE;
     }
 
-    IXMLDOMText_AddRef((IUnknown*)*ppvObject);
+    IXMLDOMText_AddRef(iface);
     return S_OK;
 }
 
diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c
index c51b6748763..f18f454aedb 100644
--- a/dlls/msxml3/xmlparser.c
+++ b/dlls/msxml3/xmlparser.c
@@ -75,7 +75,7 @@ static HRESULT WINAPI xmlparser_QueryInterface(IXMLParser* iface, REFIID riid, v
         return E_NOINTERFACE;
     }
 
-    IXMLParser_AddRef((IUnknown*)*ppvObject);
+    IXMLParser_AddRef(iface);
     return S_OK;
 }
 
diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c
index f3e7f89fea5..cd7389a0aa7 100644
--- a/dlls/msxml3/xmlview.c
+++ b/dlls/msxml3/xmlview.c
@@ -491,7 +491,7 @@ static inline HRESULT handle_xml_load(BindStatusCallback *This)
         return display_error_page(This);
     }
 
-    hres = IXMLDOMDocument_transformNode(xml, (IXMLDOMNode*)xsl, &bstr);
+    hres = IXMLDOMDocument3_transformNode(xml, (IXMLDOMNode*)xsl, &bstr);
     IXMLDOMDocument3_Release(xsl);
     IXMLDOMDocument3_Release(xml);
     if(FAILED(hres))
-- 
2.11.4.GIT