system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 08:04:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

msxml3: Don't forward put_nodeTypedValue and put_dataType calls to node IXMLDOMNode iface.

Browse source
This commit is contained in:
Jacek Caban 2010-12-30 13:07:50 +01:00 committed by Alexandre Julliard
parent 9fd7f07ed9
commit 9a16f796f2
10 changed files with 110 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dlls/msxml3/attribute.c
View file

@ -423,10 +423,11 @@ static HRESULT WINAPI domattr_get_nodeTypedValue(
static HRESULT WINAPI domattr_put_nodeTypedValue(
IXMLDOMAttribute *iface,
VARIANT var1)
VARIANT typedValue)
{
domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 );
FIXME("(%p)->(%s)\n", This, debugstr_variant(&typedValue));
return E_NOTIMPL;
}
static HRESULT WINAPI domattr_get_dataType(
@ -443,7 +444,13 @@ static HRESULT WINAPI domattr_put_dataType(
BSTR p)
{
domattr *This = impl_from_IXMLDOMAttribute( iface );
return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p );
FIXME("(%p)->(%s)\n", This, debugstr_w(p));
if(!p)
return E_INVALIDARG;
return E_FAIL;
}
static HRESULT WINAPI domattr_get_xml(

13
dlls/msxml3/cdata.c
View file

@ -434,10 +434,11 @@ static HRESULT WINAPI domcdata_get_nodeTypedValue(
static HRESULT WINAPI domcdata_put_nodeTypedValue(
IXMLDOMCDATASection *iface,
VARIANT var1)
VARIANT typedValue)
{
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 );
FIXME("(%p)->(%s)\n", This, debugstr_variant(&typedValue));
return E_NOTIMPL;
}
static HRESULT WINAPI domcdata_get_dataType(
@ -454,7 +455,13 @@ static HRESULT WINAPI domcdata_put_dataType(
BSTR p)
{
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p );
FIXME("(%p)->(%s)\n", This, debugstr_w(p));
if(!p)
return E_INVALIDARG;
return E_FAIL;
}
static HRESULT WINAPI domcdata_get_xml(

13
dlls/msxml3/comment.c
View file

@ -427,10 +427,11 @@ static HRESULT WINAPI domcomment_get_nodeTypedValue(
static HRESULT WINAPI domcomment_put_nodeTypedValue(
IXMLDOMComment *iface,
VARIANT var1)
VARIANT typedValue)
{
domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 );
FIXME("(%p)->(%s)\n", This, debugstr_variant(&typedValue));
return E_NOTIMPL;
}
static HRESULT WINAPI domcomment_get_dataType(
@ -447,7 +448,13 @@ static HRESULT WINAPI domcomment_put_dataType(
BSTR p)
{
domcomment *This = impl_from_IXMLDOMComment( iface );
return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p );
FIXME("(%p)->(%s)\n", This, debugstr_w(p));
if(!p)
return E_INVALIDARG;
return E_FAIL;
}
static HRESULT WINAPI domcomment_get_xml(

13
dlls/msxml3/docfrag.c
View file

@ -431,10 +431,11 @@ static HRESULT WINAPI domfrag_get_nodeTypedValue(
static HRESULT WINAPI domfrag_put_nodeTypedValue(
IXMLDOMDocumentFragment *iface,
VARIANT var1)
VARIANT typedValue)
{
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 );
FIXME("(%p)->(%s)\n", This, debugstr_variant(&typedValue));
return E_NOTIMPL;
}
static HRESULT WINAPI domfrag_get_dataType(
@ -451,7 +452,13 @@ static HRESULT WINAPI domfrag_put_dataType(
BSTR p)
{
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p );
FIXME("(%p)->(%s)\n", This, debugstr_w(p));
if(!p)
return E_INVALIDARG;
return E_FAIL;
}
static HRESULT WINAPI domfrag_get_xml(

11
dlls/msxml3/domdoc.c
View file

@ -1288,7 +1288,8 @@ static HRESULT WINAPI domdoc_put_nodeTypedValue(
VARIANT typedValue )
{
domdoc *This = impl_from_IXMLDOMDocument3( iface );
return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), typedValue );
FIXME("(%p)->(%s)\n", This, debugstr_variant(&typedValue));
return E_NOTIMPL;
}
@ -1307,7 +1308,13 @@ static HRESULT WINAPI domdoc_put_dataType(
BSTR dataTypeName )
{
domdoc *This = impl_from_IXMLDOMDocument3( iface );
return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), dataTypeName );
FIXME("(%p)->(%s)\n", This, debugstr_w(dataTypeName));
if(!dataTypeName)
return E_INVALIDARG;
return E_FAIL;
}
static int XMLCALL domdoc_get_xml_writecallback(void *ctx, const char *data, int len)

13
dlls/msxml3/entityref.c
View file

@ -425,10 +425,11 @@ static HRESULT WINAPI entityref_get_nodeTypedValue(
static HRESULT WINAPI entityref_put_nodeTypedValue(
IXMLDOMEntityReference *iface,
VARIANT var1)
VARIANT typedValue)
{
entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 );
FIXME("(%p)->(%s)\n", This, debugstr_variant(&typedValue));
return E_NOTIMPL;
}
static HRESULT WINAPI entityref_get_dataType(
@ -445,7 +446,13 @@ static HRESULT WINAPI entityref_put_dataType(
BSTR p)
{
entityref *This = impl_from_IXMLDOMEntityReference( iface );
return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p );
FIXME("(%p)->(%s)\n", This, debugstr_w(p));
if(!p)
return E_INVALIDARG;
return E_FAIL;
}
static HRESULT WINAPI entityref_get_xml(

27
dlls/msxml3/main.c
View file

@ -245,6 +245,33 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
return TRUE;
}
const char *debugstr_variant(const VARIANT *v)
{
if(!v)
return "(null)";
switch(V_VT(v)) {
case VT_EMPTY:
return "{VT_EMPTY}";
case VT_NULL:
return "{VT_NULL}";
case VT_I4:
return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v));
case VT_R8:
return wine_dbg_sprintf("{VT_R8: %lf}", V_R8(v));
case VT_BSTR:
return wine_dbg_sprintf("{VT_BSTR: %s}", debugstr_w(V_BSTR(v)));
case VT_DISPATCH:
return wine_dbg_sprintf("{VT_DISPATCH: %p}", V_DISPATCH(v));
case VT_BOOL:
return wine_dbg_sprintf("{VT_BOOL: %x}", V_BOOL(v));
case VT_UINT:
return wine_dbg_sprintf("{VT_UINT: %u}", V_UINT(v));
default:
return wine_dbg_sprintf("{vt %d}", V_VT(v));
}
}
/***********************************************************************
* DllRegisterServer (MSXML3.@)
*/

2
dlls/msxml3/msxml_private.h
View file

@ -413,6 +413,8 @@ typedef struct bsc_t bsc_t;
HRESULT bind_url(LPCWSTR, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**);
void detach_bsc(bsc_t*);
const char *debugstr_variant(const VARIANT*);
/* memory allocation functions */
static inline void *heap_alloc(size_t len)

42
dlls/msxml3/node.c
View file

@ -873,31 +873,6 @@ static HRESULT WINAPI xmlnode_get_nodeTypedValue(
return hres;
}
static HRESULT WINAPI xmlnode_put_nodeTypedValue(
IXMLDOMNode *iface,
VARIANT typedValue)
{
xmlnode *This = impl_from_IXMLDOMNode( iface );
FIXME("%p\n", This);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlnode_put_dataType(
IXMLDOMNode *iface,
BSTR dtName)
{
xmlnode *This = impl_from_IXMLDOMNode( iface );
TRACE("(%p)->(%s)\n", This, debugstr_w(dtName));
if(!dtName)
return E_INVALIDARG;
FIXME("need to handle node type %i\n", This->node->type);
return E_FAIL;
}
BSTR EnsureCorrectEOL(BSTR sInput)
{
int nNum = 0;
@ -1240,9 +1215,9 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl =
NULL,
NULL,
xmlnode_get_nodeTypedValue,
xmlnode_put_nodeTypedValue,
NULL,
xmlnode_put_dataType,
NULL,
NULL,
NULL,
xmlnode_transformNode,
xmlnode_selectNodes,
@ -1667,10 +1642,11 @@ static HRESULT WINAPI unknode_get_nodeTypedValue(
static HRESULT WINAPI unknode_put_nodeTypedValue(
IXMLDOMNode *iface,
VARIANT var1)
VARIANT typedValue)
{
unknode *This = impl_from_unkIXMLDOMNode( iface );
return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 );
FIXME("(%p)->(%s)\n", This, debugstr_variant(&typedValue));
return E_NOTIMPL;
}
static HRESULT WINAPI unknode_get_dataType(
@ -1686,7 +1662,13 @@ static HRESULT WINAPI unknode_put_dataType(
BSTR p)
{
unknode *This = impl_from_unkIXMLDOMNode( iface );
return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p );
FIXME("(%p)->(%s)\n", This, debugstr_w(p));
if(!p)
return E_INVALIDARG;
return E_FAIL;
}
static HRESULT WINAPI unknode_get_xml(

13
dlls/msxml3/pi.c
View file

@ -442,10 +442,11 @@ static HRESULT WINAPI dom_pi_get_nodeTypedValue(
static HRESULT WINAPI dom_pi_put_nodeTypedValue(
IXMLDOMProcessingInstruction *iface,
VARIANT var1)
VARIANT typedValue)
{
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 );
FIXME("(%p)->(%s)\n", This, debugstr_variant(&typedValue));
return E_NOTIMPL;
}
static HRESULT WINAPI dom_pi_get_dataType(
@ -462,7 +463,13 @@ static HRESULT WINAPI dom_pi_put_dataType(
BSTR p)
{
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p );
FIXME("(%p)->(%s)\n", This, debugstr_w(p));
if(!p)
return E_INVALIDARG;
return E_FAIL;
}
static HRESULT WINAPI dom_pi_get_xml(