msxml3: Enable inline wrappers and fix warnings.

dlls/msxml3/Makefile.in

 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@
 

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;
 }
 

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;
 }
 

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;
 }
 

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;
 }
 

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);

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;
 }

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;
 }
 

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;
 }
 

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))