wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Francois Gouget : include: Move macros to winuser. rh and include it from winuser.h to avoid duplication.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 4180054c2fcd9b0fca0f3ef32c75af50d527d06d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4180054c2fcd9b0fca0f3ef32… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 21 09:42:30 2011 +0100 include: Move macros to winuser.rh and include it from winuser.h to avoid duplication. --- include/winuser.h | 1219 +-------------------------------------- include/winuser.rh | 1630 ++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 1267 insertions(+), 1582 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4180054c2fcd9b0fca0f3…

1 0

Frédéric Delanoy : shlwapi: Avoid harcoding array lengths.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: ce3dd89b5411edfdf448bd80ac8dd2b71a972e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce3dd89b5411edfdf448bd80a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 21 09:34:54 2011 +0100 shlwapi: Avoid harcoding array lengths. --- dlls/shlwapi/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 43c3225..92a830b 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -1074,7 +1074,7 @@ int WINAPI PathParseIconLocationW(LPWSTR lpszPath) */ BOOL WINAPI PathFileExistsDefExtW(LPWSTR lpszPath,DWORD dwWhich) { - static const WCHAR pszExts[7][5] = { { '.', 'p', 'i', 'f', 0}, + static const WCHAR pszExts[][5] = { { '.', 'p', 'i', 'f', 0}, { '.', 'c', 'o', 'm', 0}, { '.', 'e', 'x', 'e', 0}, { '.', 'b', 'a', 't', 0},

1 0

Frédéric Delanoy : shell32: Avoid harcoding array lengths.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: a46790b32d2c271464f0aeea0fd61889a6b07ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46790b32d2c271464f0aeea0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 21 09:34:53 2011 +0100 shell32: Avoid harcoding array lengths. --- dlls/shell32/shellole.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 2fac864..49491a0 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -112,10 +112,10 @@ HRESULT WINAPI SHCoCreateInstance( IID iid; const CLSID * myclsid = clsid; WCHAR sKeyName[MAX_PATH]; - const WCHAR sCLSID[7] = {'C','L','S','I','D','\\','\0'}; + static const WCHAR sCLSID[] = {'C','L','S','I','D','\\','\0'}; WCHAR sClassID[60]; - const WCHAR sInProcServer32[16] ={'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2','\0'}; - const WCHAR sLoadWithoutCOM[15] ={'L','o','a','d','W','i','t','h','o','u','t','C','O','M','\0'}; + static const WCHAR sInProcServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2','\0'}; + static const WCHAR sLoadWithoutCOM[] = {'L','o','a','d','W','i','t','h','o','u','t','C','O','M','\0'}; WCHAR sDllPath[MAX_PATH]; HKEY hKey = 0; DWORD dwSize;

1 0

Frédéric Delanoy : oleaut32: Avoid harcoding array lengths.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: a7cb73d39e742a638a096efafafeb028046c873f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7cb73d39e742a638a096efaf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 21 09:21:06 2011 +0100 oleaut32: Avoid harcoding array lengths. --- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/usrmarshal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 95c4b6a..0586e15 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -447,7 +447,7 @@ void WINAPI SetOaNoCache(void) BSTR_bCache = FALSE; } -static const WCHAR _delimiter[2] = {'!',0}; /* default delimiter apparently */ +static const WCHAR _delimiter[] = {'!',0}; /* default delimiter apparently */ static const WCHAR *pdelimiter = &_delimiter[0]; /*********************************************************************** diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index c67f384..2414a9e 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -2191,7 +2191,7 @@ HRESULT __RPC_STUB IPropertyBag_Read_Stub( DWORD varType, IUnknown *pUnkObj) { - static const WCHAR emptyWstr[1] = {0}; + static const WCHAR emptyWstr[] = {0}; IDispatch *disp; HRESULT hr; TRACE("(%p, %s, %p, %p, %x, %p)\n", This, debugstr_w(pszPropName), pVar,

1 0

Frédéric Delanoy : ntdll/tests: Avoid harcoding array lengths.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: ea67d804f3a3d39647714051c3b6cb7cafdde3a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea67d804f3a3d39647714051c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 21 09:17:06 2011 +0100 ntdll/tests: Avoid harcoding array lengths. --- dlls/ntdll/tests/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 802a165..a4d0b8a 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1146,8 +1146,8 @@ static void test_wcsrchr(void) static void test_wcslwrupr(void) { static WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; - static WCHAR emptyW[1] = {0}; - static const WCHAR constemptyW[1] = {0}; + static WCHAR emptyW[] = {0}; + static const WCHAR constemptyW[] = {0}; if (0) /* crashes on native */ {

1 0

Nikolay Sivov : shell32: Avoid null pointer dereference in traces.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 9d6204b297a756f7823bc75d1ec88c968fab96c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6204b297a756f7823bc75d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 21 10:58:58 2011 +0300 shell32: Avoid null pointer dereference in traces. --- dlls/shell32/shellpath.c | 32 +++++++++++--------------------- 1 files changed, 11 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 25ba4be..9612687 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -669,37 +669,27 @@ BOOL WINAPI PathQualifyAW(LPCVOID pszPath) return PathQualifyA(pszPath); } -static BOOL PathResolveA( - LPSTR lpszPath, - LPCSTR *alpszPaths, - DWORD dwFlags) +static BOOL PathResolveA(LPSTR path, LPCSTR *paths, DWORD flags) { - FIXME("(%s,%p,0x%08x),stub!\n", - lpszPath, *alpszPaths, dwFlags); - return 0; + FIXME("(%s,%p,0x%08x),stub!\n", debugstr_a(path), paths, flags); + return FALSE; } -static BOOL PathResolveW( - LPWSTR lpszPath, - LPCWSTR *alpszPaths, - DWORD dwFlags) +static BOOL PathResolveW(LPWSTR path, LPCWSTR *paths, DWORD flags) { - FIXME("(%s,%p,0x%08x),stub!\n", - debugstr_w(lpszPath), debugstr_w(*alpszPaths), dwFlags); - return 0; + FIXME("(%s,%p,0x%08x),stub!\n", debugstr_w(path), paths, flags); + return FALSE; } /************************************************************************* * PathResolve [SHELL32.51] */ -BOOL WINAPI PathResolveAW( - LPVOID lpszPath, - LPCVOID *alpszPaths, - DWORD dwFlags) +BOOL WINAPI PathResolveAW(LPVOID path, LPCVOID *paths, DWORD flags) { - if (SHELL_OsIsUnicode()) - return PathResolveW(lpszPath, (LPCWSTR*)alpszPaths, dwFlags); - return PathResolveA(lpszPath, (LPCSTR*)alpszPaths, dwFlags); + if (SHELL_OsIsUnicode()) + return PathResolveW(path, (LPCWSTR*)paths, flags); + else + return PathResolveA(path, (LPCSTR*)paths, flags); } /*************************************************************************

1 0

Nikolay Sivov : msxml3: Support IDispatchEx for IXMLDOMNodeList too.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 85ce39ddca6744bfa364058f7e25270b42288823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85ce39ddca6744bfa364058f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 19 20:55:30 2011 +0300 msxml3: Support IDispatchEx for IXMLDOMNodeList too. --- dlls/msxml3/nodelist.c | 148 +++++++++++++++++++++++++++----------------- dlls/msxml3/selection.c | 2 +- dlls/msxml3/tests/domdoc.c | 21 ++++++ 3 files changed, 114 insertions(+), 57 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 6a25463..5710d48 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -33,6 +33,7 @@ #include "winuser.h" #include "ole2.h" #include "msxml6.h" +#include "msxml2did.h" #include "msxml_private.h" @@ -53,6 +54,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _xmlnodelist { + DispatchEx dispex; IXMLDOMNodeList IXMLDOMNodeList_iface; LONG ref; xmlNodePtr parent; @@ -69,7 +71,9 @@ static HRESULT WINAPI xmlnodelist_QueryInterface( REFIID riid, void** ppvObject ) { - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); + xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IDispatch ) || @@ -77,6 +81,10 @@ static HRESULT WINAPI xmlnodelist_QueryInterface( { *ppvObject = iface; } + else if (dispex_query_interface(&This->dispex, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { TRACE("interface %s not implemented\n", debugstr_guid(riid)); @@ -119,12 +127,7 @@ static HRESULT WINAPI xmlnodelist_GetTypeInfoCount( UINT* pctinfo ) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - - TRACE("(%p)->(%p)\n", This, pctinfo); - - *pctinfo = 1; - - return S_OK; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI xmlnodelist_GetTypeInfo( @@ -134,13 +137,8 @@ static HRESULT WINAPI xmlnodelist_GetTypeInfo( ITypeInfo** ppTInfo ) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - HRESULT hr; - - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - hr = get_typeinfo(IXMLDOMNodeList_tid, ppTInfo); - - return hr; + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, + iTInfo, lcid, ppTInfo); } static HRESULT WINAPI xmlnodelist_GetIDsOfNames( @@ -152,23 +150,8 @@ static HRESULT WINAPI xmlnodelist_GetIDsOfNames( DISPID* rgDispId ) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - if(!rgszNames || cNames == 0 || !rgDispId) - return E_INVALIDARG; - - hr = get_typeinfo(IXMLDOMNodeList_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, + riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI xmlnodelist_Invoke( @@ -183,21 +166,8 @@ static HRESULT WINAPI xmlnodelist_Invoke( UINT* puArgErr ) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - hr = get_typeinfo(IXMLDOMNodeList_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMNodeList_iface, dispIdMember, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, + dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI xmlnodelist_get_item( @@ -298,7 +268,6 @@ static HRESULT WINAPI xmlnodelist__newEnum( return E_NOTIMPL; } - static const struct IXMLDOMNodeListVtbl xmlnodelist_vtbl = { xmlnodelist_QueryInterface, @@ -315,22 +284,89 @@ static const struct IXMLDOMNodeListVtbl xmlnodelist_vtbl = xmlnodelist__newEnum, }; +static HRESULT xmlnodelist_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DISPID *dispid) +{ + WCHAR *ptr; + int idx = 0; + + for(ptr = name; *ptr && isdigitW(*ptr); ptr++) + idx = idx*10 + (*ptr-'0'); + if(*ptr) + return DISP_E_UNKNOWNNAME; + + *dispid = DISPID_DOM_COLLECTION_BASE + idx; + TRACE("ret %x\n", *dispid); + return S_OK; +} + +static HRESULT xmlnodelist_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei) +{ + xmlnodelist *This = impl_from_IXMLDOMNodeList( (IXMLDOMNodeList*)iface ); + + TRACE("(%p)->(%x %x %x %p %p %p)\n", This, id, lcid, flags, params, res, ei); + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = NULL; + + if (id < DISPID_DOM_COLLECTION_BASE || id > DISPID_DOM_COLLECTION_MAX) + return DISP_E_UNKNOWNNAME; + + switch(flags) + { + case INVOKE_PROPERTYGET: + { + IXMLDOMNode *disp = NULL; + + IXMLDOMNodeList_get_item(&This->IXMLDOMNodeList_iface, id - DISPID_DOM_COLLECTION_BASE, &disp); + V_DISPATCH(res) = (IDispatch*)disp; + break; + } + default: + { + FIXME("unimplemented flags %x\n", flags); + break; + } + } + + TRACE("ret %p\n", V_DISPATCH(res)); + + return S_OK; +} + +static const dispex_static_data_vtbl_t xmlnodelist_dispex_vtbl = { + xmlnodelist_get_dispid, + xmlnodelist_invoke +}; + +static const tid_t xmlnodelist_iface_tids[] = { + IXMLDOMNodeList_tid, + 0 +}; +static dispex_static_data_t xmlnodelist_dispex = { + &xmlnodelist_dispex_vtbl, + IXMLDOMNodeList_tid, + NULL, + xmlnodelist_iface_tids +}; + IXMLDOMNodeList* create_children_nodelist( xmlNodePtr node ) { - xmlnodelist *nodelist; + xmlnodelist *This; - nodelist = heap_alloc( sizeof *nodelist ); - if ( !nodelist ) + This = heap_alloc( sizeof *This ); + if ( !This ) return NULL; - nodelist->IXMLDOMNodeList_iface.lpVtbl = &xmlnodelist_vtbl; - nodelist->ref = 1; - nodelist->parent = node; - nodelist->current = node->children; - + This->IXMLDOMNodeList_iface.lpVtbl = &xmlnodelist_vtbl; + This->ref = 1; + This->parent = node; + This->current = node->children; xmldoc_add_ref( node->doc ); - return &nodelist->IXMLDOMNodeList_iface; + init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMNodeList_iface, &xmlnodelist_dispex); + + return &This->IXMLDOMNodeList_iface; } #endif diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index aba8e7d..8871817 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -600,7 +600,7 @@ static HRESULT domselection_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD f { IXMLDOMNode *disp = NULL; - domselection_get_item(&This->IXMLDOMSelection_iface, id - DISPID_DOM_COLLECTION_BASE, &disp); + IXMLDOMSelection_get_item(&This->IXMLDOMSelection_iface, id - DISPID_DOM_COLLECTION_BASE, &disp); V_DISPATCH(res) = (IDispatch*)disp; break; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index abd0b37..e72e1f3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10531,6 +10531,27 @@ static void test_dispex(void) IUnknown_Release(unk); IXMLDOMNodeList_Release(node_list); + /* IXMLDOMNodeList for children list */ + hr = IXMLDOMDocument_get_childNodes(doc, &node_list); + EXPECT_HR(hr, S_OK); + IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk); + test_domobj_dispex(unk); + IUnknown_Release(unk); + + /* collection dispex test, empty collection */ + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, S_OK); + did = 0; + hr = IDispatchEx_GetDispID(dispex, _bstr_("0"), 0, &did); + EXPECT_HR(hr, S_OK); + ok(did == DISPID_DOM_COLLECTION_BASE, "got 0x%08x\n", did); + hr = IDispatchEx_GetDispID(dispex, _bstr_("1"), 0, &did); + EXPECT_HR(hr, S_OK); + ok(did == DISPID_DOM_COLLECTION_BASE+1, "got 0x%08x\n", did); + IDispatchEx_Release(dispex); + + IXMLDOMNodeList_Release(node_list); + /* IXMLDOMParseError */ hr = IXMLDOMDocument_get_parseError(doc, &error); EXPECT_HR(hr, S_OK);

1 0

Nikolay Sivov : msxml3: Forward IDispatch to IDispatchEx when supported.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: ed908b7b182f29fdd301ab9d4888d5fe63f7ade4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed908b7b182f29fdd301ab9d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 19 19:32:23 2011 +0300 msxml3: Forward IDispatch to IDispatchEx when supported. --- dlls/msxml3/attribute.c | 51 +++++---------------------------------- dlls/msxml3/cdata.c | 52 +++++----------------------------------- dlls/msxml3/comment.c | 52 +++++----------------------------------- dlls/msxml3/docfrag.c | 52 +++++----------------------------------- dlls/msxml3/doctype.c | 52 +++++----------------------------------- dlls/msxml3/domdoc.c | 58 ++++++--------------------------------------- dlls/msxml3/domimpl.c | 49 +++++--------------------------------- dlls/msxml3/element.c | 52 +++++----------------------------------- dlls/msxml3/entityref.c | 51 +++++---------------------------------- dlls/msxml3/nodemap.c | 47 +++++------------------------------- dlls/msxml3/parseerror.c | 49 +++++--------------------------------- dlls/msxml3/selection.c | 49 +++++--------------------------------- dlls/msxml3/text.c | 52 +++++----------------------------------- 13 files changed, 92 insertions(+), 574 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed908b7b182f29fdd301a…

1 0

Nikolay Sivov : msxml3: Fix support for IXMLDOMDocument3.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: a9d8f9a0a23f197638cb9ae1b79a310f2d6880c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9d8f9a0a23f197638cb9ae1b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 19 17:00:24 2011 +0300 msxml3: Fix support for IXMLDOMDocument3. --- dlls/msxml3/dispex.c | 1 + dlls/msxml3/domdoc.c | 23 ++++++++++------------- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/tests/domdoc.c | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index bcf528d..d71fb04 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -117,6 +117,7 @@ static tid_id_t tid_ids[] = { { &IID_IXMLDOMComment, LibXml2 }, { &IID_IXMLDOMDocument, LibXml2 }, { &IID_IXMLDOMDocument2, LibXml2 }, + { &IID_IXMLDOMDocument3, LibXml2 }, { &IID_IXMLDOMDocumentFragment, LibXml2 }, { &IID_IXMLDOMDocumentType, LibXml2 }, { &IID_IXMLDOMElement, LibXml2 }, diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 2f67781..7d51255 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -813,6 +813,7 @@ static const tid_t domdoc_se_tids[] = { IXMLDOMNode_tid, IXMLDOMDocument_tid, IXMLDOMDocument2_tid, + IXMLDOMDocument3_tid, 0 }; @@ -926,13 +927,10 @@ static HRESULT WINAPI domdoc_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - HRESULT hr; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - hr = get_typeinfo(IXMLDOMDocument2_tid, ppTInfo); - - return hr; + return get_typeinfo(IXMLDOMDocument3_tid, ppTInfo); } static HRESULT WINAPI domdoc_GetIDsOfNames( @@ -953,7 +951,7 @@ static HRESULT WINAPI domdoc_GetIDsOfNames( if(!rgszNames || cNames == 0 || !rgDispId) return E_INVALIDARG; - hr = get_typeinfo(IXMLDOMDocument2_tid, &typeinfo); + hr = get_typeinfo(IXMLDOMDocument3_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); @@ -982,7 +980,7 @@ static HRESULT WINAPI domdoc_Invoke( TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - hr = get_typeinfo(IXMLDOMDocument2_tid, &typeinfo); + hr = get_typeinfo(IXMLDOMDocument3_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMDocument3_iface, dispIdMember, wFlags, @@ -2378,7 +2376,7 @@ static HRESULT WINAPI domdoc_save( case VT_UNKNOWN: { IUnknown *pUnk = V_UNKNOWN(&destination); - IXMLDOMDocument2 *document; + IXMLDOMDocument3 *document; IStream *stream; ret = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMDocument3, (void**)&document); @@ -3011,7 +3009,7 @@ static HRESULT WINAPI domdoc_importNode( return E_NOTIMPL; } -static const struct IXMLDOMDocument3Vtbl domdoc_vtbl = +static const struct IXMLDOMDocument3Vtbl XMLDOMDocument3Vtbl = { domdoc_QueryInterface, domdoc_AddRef, @@ -3412,14 +3410,13 @@ static const IObjectSafetyVtbl domdocObjectSafetyVtbl = { }; static const tid_t domdoc_iface_tids[] = { - IXMLDOMNode_tid, - IXMLDOMDocument_tid, - IXMLDOMDocument2_tid, + IXMLDOMDocument3_tid, 0 }; + static dispex_static_data_t domdoc_dispex = { NULL, - IXMLDOMDocument2_tid, + IXMLDOMDocument3_tid, NULL, domdoc_iface_tids }; @@ -3432,7 +3429,7 @@ HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) if( !doc ) return E_OUTOFMEMORY; - doc->IXMLDOMDocument3_iface.lpVtbl = &domdoc_vtbl; + doc->IXMLDOMDocument3_iface.lpVtbl = &XMLDOMDocument3Vtbl; doc->IPersistStreamInit_iface.lpVtbl = &xmldoc_IPersistStreamInit_VTable; doc->IObjectWithSite_iface.lpVtbl = &domdocObjectSite; doc->IObjectSafety_iface.lpVtbl = &domdocObjectSafetyVtbl; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 65f2834..10067a6 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -44,6 +44,7 @@ typedef enum tid_t { IXMLDOMComment_tid, IXMLDOMDocument_tid, IXMLDOMDocument2_tid, + IXMLDOMDocument3_tid, IXMLDOMDocumentFragment_tid, IXMLDOMDocumentType_tid, IXMLDOMElement_tid, diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 03d19c1..abd0b37 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10712,7 +10712,7 @@ static const supporterror_t supporterror_test[] = { static void test_supporterrorinfo(void) { - static REFIID iids[3] = { &IID_IXMLDOMDocument, &IID_IXMLDOMDocument2 }; + static REFIID iids[4] = { &IID_IXMLDOMDocument, &IID_IXMLDOMDocument2, &IID_IXMLDOMDocument3 }; const supporterror_t *ptr = supporterror_test; ISupportErrorInfo *errorinfo, *info2; IXMLDOMDocument *doc;

1 0

Nikolay Sivov : msxml3: Added common ISupportErrorInfo implementation.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: b26ad412d316ae690a9183ebab38845e00eeba4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26ad412d316ae690a9183eba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 19 16:33:10 2011 +0300 msxml3: Added common ISupportErrorInfo implementation. --- dlls/msxml3/attribute.c | 10 ++++ dlls/msxml3/cdata.c | 10 ++++ dlls/msxml3/comment.c | 10 ++++ dlls/msxml3/dispex.c | 18 +++++-- dlls/msxml3/docfrag.c | 10 ++++ dlls/msxml3/domdoc.c | 52 +++---------------- dlls/msxml3/element.c | 10 ++++ dlls/msxml3/entityref.c | 10 ++++ dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 91 ++++++++++++++++++++++++++++++++ dlls/msxml3/pi.c | 10 ++++ dlls/msxml3/tests/domdoc.c | 121 +++++++++++++++++++++++++++++++++++++------ 12 files changed, 288 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b26ad412d316ae690a918…

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2011