March 2012 - Wine-Commits - list.winehq.org

Nikolay Sivov : msxml3: Implement ISAXAttributes::getLength() for MXAttributes.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 3eaa0df7286fce0ede5c15e00f45ef0381ebd537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eaa0df7286fce0ede5c15e00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 13 11:05:45 2012 +0300 msxml3: Implement ISAXAttributes::getLength() for MXAttributes. --- dlls/msxml3/mxwriter.c | 10 ++++++++-- dlls/msxml3/tests/saxreader.c | 13 +++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index d0ce946..6217d45 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1727,8 +1727,14 @@ static ULONG WINAPI SAXAttributes_Release(ISAXAttributes *iface) static HRESULT WINAPI SAXAttributes_getLength(ISAXAttributes *iface, int *length) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%p): stub\n", This, length); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, length); + + if (!length && (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3)) + return E_POINTER; + + *length = This->length; + + return S_OK; } static HRESULT WINAPI SAXAttributes_getURI(ISAXAttributes *iface, int nIndex, const WCHAR **pUrl, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 4aca3af..27200cb 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3315,34 +3315,30 @@ static void test_mxattr_addAttribute(void) hr = IMXAttributes_QueryInterface(mxattr, &IID_ISAXAttributes, (void**)&saxattr); EXPECT_HR(hr, S_OK); - /* SAXAttributes30 and SAXAttributes60 both crash on this test */ + /* SAXAttributes40 and SAXAttributes60 both crash on this test */ if (IsEqualGUID(table->clsid, &CLSID_SAXAttributes) || IsEqualGUID(table->clsid, &CLSID_SAXAttributes30)) { hr = ISAXAttributes_getLength(saxattr, NULL); - todo_wine EXPECT_HR(hr, E_POINTER); } len = -1; hr = ISAXAttributes_getLength(saxattr, &len); -todo_wine { EXPECT_HR(hr, S_OK); ok(len == 0, "got %d\n", len); -} + hr = IMXAttributes_addAttribute(mxattr, _bstr_(table->uri), _bstr_(table->local), _bstr_(table->qname), _bstr_(table->type), _bstr_(table->value)); ok(hr == table->hr, "%d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); len = -1; hr = ISAXAttributes_getLength(saxattr, &len); -todo_wine { EXPECT_HR(hr, S_OK); if (table->hr == S_OK) ok(len == 1, "%d: got %d length, expected 0\n", i, len); else ok(len == 0, "%d: got %d length, expected 1\n", i, len); -} ISAXAttributes_Release(saxattr); IMXAttributes_Release(mxattr); @@ -3383,10 +3379,8 @@ todo_wine len = -1; hr = ISAXAttributes_getLength(saxattr, &len); -todo_wine { EXPECT_HR(hr, S_OK); ok(len == 1, "got %d\n", len); -} len = -1; hr = ISAXAttributes_getQName(saxattr, 0, NULL, &len); @@ -3415,10 +3409,9 @@ todo_wine len = -1; hr = ISAXAttributes_getLength(saxattr, &len); -todo_wine { EXPECT_HR(hr, S_OK); +todo_wine ok(len == 0, "got %d\n", len); -} len = -1; ptr = (void*)0xdeadbeef;

1 0

Nikolay Sivov : msxml3: Implement ISAXAttributes_getQName() for MXAttributes.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 6ac1cc682bc32946f27159818e3d26224de8e66e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac1cc682bc32946f27159818… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 13 11:12:16 2012 +0300 msxml3: Implement ISAXAttributes_getQName() for MXAttributes. --- dlls/msxml3/mxwriter.c | 12 ++++++++++-- dlls/msxml3/tests/saxreader.c | 13 +++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 6217d45..f749eb5 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1756,8 +1756,16 @@ static HRESULT WINAPI SAXAttributes_getLocalName(ISAXAttributes *iface, int nInd static HRESULT WINAPI SAXAttributes_getQName(ISAXAttributes *iface, int index, const WCHAR **qname, int *length) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%d %p %p): stub\n", This, index, qname, length); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p %p)\n", This, index, qname, length); + + if (index >= This->length) return E_INVALIDARG; + if (!qname || !length) return E_POINTER; + + *qname = This->attr[index].qname; + *length = SysStringLen(This->attr[index].qname); + + return S_OK; } static HRESULT WINAPI SAXAttributes_getName(ISAXAttributes *iface, int nIndex, const WCHAR **pUri, int *pUriLength, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 27200cb..8b0a3c4 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3366,11 +3366,9 @@ static void test_mxattr_clear(void) EXPECT_HR(hr, S_OK); hr = ISAXAttributes_getQName(saxattr, 0, NULL, NULL); -todo_wine EXPECT_HR(hr, E_INVALIDARG); hr = ISAXAttributes_getQName(saxattr, 0, &ptr, &len); -todo_wine EXPECT_HR(hr, E_INVALIDARG); hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("local"), @@ -3384,24 +3382,19 @@ todo_wine len = -1; hr = ISAXAttributes_getQName(saxattr, 0, NULL, &len); -todo_wine EXPECT_HR(hr, E_POINTER); ok(len == -1, "got %d\n", len); ptr = (void*)0xdeadbeef; hr = ISAXAttributes_getQName(saxattr, 0, &ptr, NULL); -todo_wine EXPECT_HR(hr, E_POINTER); ok(ptr == (void*)0xdeadbeef, "got %p\n", ptr); len = 0; hr = ISAXAttributes_getQName(saxattr, 0, &ptr, &len); -todo_wine { EXPECT_HR(hr, S_OK); ok(len == 5, "got %d\n", len); - if (hr == S_OK) - ok(!lstrcmpW(ptr, _bstr_("qname")), "got %s\n", wine_dbgstr_w(ptr)); -} + ok(!lstrcmpW(ptr, _bstr_("qname")), "got %s\n", wine_dbgstr_w(ptr)); hr = IMXAttributes_clear(mxattr); todo_wine @@ -3416,11 +3409,11 @@ todo_wine len = -1; ptr = (void*)0xdeadbeef; hr = ISAXAttributes_getQName(saxattr, 0, &ptr, &len); -todo_wine +todo_wine { EXPECT_HR(hr, E_INVALIDARG); ok(len == -1, "got %d\n", len); ok(ptr == (void*)0xdeadbeef, "got %p\n", ptr); - +} IMXAttributes_Release(mxattr); ISAXAttributes_Release(saxattr); free_bstrs();

1 0

Jacek Caban : mshtml: Store more info about properties in func_info_t.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: dfaa1e9541e5cfc1c82976a60e6fa59ec58dfb83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfaa1e9541e5cfc1c82976a60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 13 11:46:32 2012 +0100 mshtml: Store more info about properties in func_info_t. --- dlls/mshtml/dispex.c | 55 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 42 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index dcbff1c..bdad32e 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -47,7 +48,10 @@ typedef struct { DISPID id; BSTR name; tid_t tid; - int func_disp_idx; + SHORT put_vtbl_off; + SHORT get_vtbl_off; + SHORT func_disp_idx; + VARTYPE prop_vt; } func_info_t; struct dispex_data_t { @@ -185,23 +189,48 @@ HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUNCDESC *desc, ITypeInfo *dti) { + func_info_t *info; HRESULT hres; - if(data->func_cnt && data->funcs[data->func_cnt-1].id == desc->memid) - return; + if(data->func_cnt && data->funcs[data->func_cnt-1].id == desc->memid) { + info = data->funcs+data->func_cnt-1; + }else { + if(data->func_cnt == *size) + data->funcs = heap_realloc(data->funcs, (*size <<= 1)*sizeof(func_info_t)); - if(data->func_cnt == *size) - data->funcs = heap_realloc(data->funcs, (*size <<= 1)*sizeof(func_info_t)); + info = data->funcs+data->func_cnt; + hres = ITypeInfo_GetDocumentation(dti, desc->memid, &info->name, NULL, NULL, NULL); + if(FAILED(hres)) + return; - hres = ITypeInfo_GetDocumentation(dti, desc->memid, &data->funcs[data->func_cnt].name, NULL, NULL, NULL); - if(FAILED(hres)) - return; + data->func_cnt++; - data->funcs[data->func_cnt].id = desc->memid; - data->funcs[data->func_cnt].tid = tid; - data->funcs[data->func_cnt].func_disp_idx = (desc->invkind & DISPATCH_METHOD) ? data->func_disp_cnt++ : -1; + info->id = desc->memid; + info->tid = tid; + info->func_disp_idx = -1; + info->prop_vt = VT_EMPTY; + info->put_vtbl_off = 0; + info->get_vtbl_off = 0; + } + + if(desc->invkind & DISPATCH_METHOD) { + info->func_disp_idx = data->func_disp_cnt++; + }else if(desc->invkind & (DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYGET)) { + VARTYPE vt = VT_EMPTY; + + if(desc->invkind & DISPATCH_PROPERTYGET) { + vt = desc->elemdescFunc.tdesc.vt; + info->get_vtbl_off = desc->oVft/sizeof(void*); + } + if(desc->invkind & DISPATCH_PROPERTYPUT) { + assert(desc->cParams == 1); + vt = desc->lprgelemdescParam->tdesc.vt; + info->put_vtbl_off = desc->oVft/sizeof(void*); + } - data->func_cnt++; + assert(info->prop_vt == VT_EMPTY || vt == info->prop_vt); + info->prop_vt = vt; + } } static int dispid_cmp(const void *p1, const void *p2)

1 0

Jacek Caban : mshtml: Don't use ITypeInfo for InvokeEx(DISPATCH_PROPERTYPUT ) implementation.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: ba1d4d71d8d89dd19d9a0d83b676f36036299423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba1d4d71d8d89dd19d9a0d83b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 13 11:46:55 2012 +0100 mshtml: Don't use ITypeInfo for InvokeEx(DISPATCH_PROPERTYPUT) implementation. --- dlls/mshtml/dispex.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 88f10c3..29628eb 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -810,6 +810,54 @@ static HRESULT builtin_propget(DispatchEx *This, func_info_t *func, DISPPARAMS * return S_OK; } +static HRESULT builtin_propput(DispatchEx *This, func_info_t *func, DISPPARAMS *dp) +{ + VARIANT *v, tmpv; + IUnknown *iface; + HRESULT hres; + + if(dp->cArgs != 1 || (dp->cNamedArgs == 1 && *dp->rgdispidNamedArgs != DISPID_PROPERTYPUT) + || dp->cNamedArgs > 1) { + FIXME("invalid args\n"); + return E_INVALIDARG; + } + + if(!func->put_vtbl_off) { + FIXME("No setter\n"); + return E_FAIL; + } + + v = dp->rgvarg; + if(func->prop_vt != VT_VARIANT && V_VT(v) != func->prop_vt) { + V_VT(&tmpv) = VT_EMPTY; + VariantChangeType(&tmpv, v, 0, func->prop_vt); + if(FAILED(hres)) + return hres; + v = &tmpv; + } + + hres = IUnknown_QueryInterface(This->outer, tid_ids[func->tid], (void**)&iface); + if(SUCCEEDED(hres)) { + switch(func->prop_vt) { +#define CASE_VT(vt,type,access) \ + case vt: \ + hres = ((HRESULT (WINAPI*)(IUnknown*,type))((void**)iface->lpVtbl)[func->put_vtbl_off])(iface,access(v)); \ + break + BUILTIN_TYPES_SWITCH; +#undef CASE_VT + default: + FIXME("Unimplemented vt %d\n", func->prop_vt); + hres = E_NOTIMPL; + } + + IUnknown_Release(iface); + } + + if(v == &tmpv) + VariantClear(v); + return hres; +} + static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { @@ -831,6 +879,11 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD return function_invoke(This, func, flags, dp, res, ei); switch(flags) { + case DISPATCH_PROPERTYPUT: + if(res) + V_VT(res) = VT_EMPTY; + hres = builtin_propput(This, func, dp); + break; case DISPATCH_PROPERTYGET: hres = builtin_propget(This, func, dp, res); break;

1 0

Piotr Caban : msxml3/tests: Skip tests when XMLView object fails to create.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 55d34f470f970719a315c944a3e5850db563fd5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d34f470f970719a315c944a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 12 20:41:32 2012 +0100 msxml3/tests: Skip tests when XMLView object fails to create. --- dlls/msxml3/tests/xmlview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/xmlview.c b/dlls/msxml3/tests/xmlview.c index c1b221e..65c991e 100644 --- a/dlls/msxml3/tests/xmlview.c +++ b/dlls/msxml3/tests/xmlview.c @@ -40,8 +40,8 @@ static void test_QueryInterface(void) hres = CoCreateInstance(&CLSID_XMLView, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&xmlview); - if(hres == REGDB_E_CLASSNOTREG) { - win_skip("XMLView class not registered\n"); + if(FAILED(hres)) { + win_skip("Failed to create XMLView instance\n"); return; } ok(hres == S_OK, "CoCreateInstance returned %x, expected S_OK\n", hres);

1 0

Piotr Caban : msxml3: Added XMLView IPersistMoniker_Load test.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 7a6494e2272ec2c7f522413ed896e4bddfcbf0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a6494e2272ec2c7f522413ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 12 20:42:06 2012 +0100 msxml3: Added XMLView IPersistMoniker_Load test. --- dlls/msxml3/tests/Makefile.in | 2 + dlls/msxml3/tests/rsrc.rc | 23 +++++ dlls/msxml3/tests/xmlview.c | 190 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/xmlview.xml | 12 +++ dlls/msxml3/tests/xmlview.xsl | 26 ++++++ 5 files changed, 253 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/Makefile.in b/dlls/msxml3/tests/Makefile.in index 22103cd..05c4f50 100644 --- a/dlls/msxml3/tests/Makefile.in +++ b/dlls/msxml3/tests/Makefile.in @@ -9,4 +9,6 @@ C_SRCS = \ xmlparser.c \ xmlview.c +RC_SRCS = rsrc.rc + @MAKE_TEST_RULES@ diff --git a/dlls/msxml3/tests/rsrc.rc b/dlls/msxml3/tests/rsrc.rc new file mode 100644 index 0000000..94d8bc8 --- /dev/null +++ b/dlls/msxml3/tests/rsrc.rc @@ -0,0 +1,23 @@ +/* + * Copyright 2012 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: xmlview.xml */ +xmlview.xml XML "xmlview.xml" + +/* @makedep: xmlview.xsl */ +xmlview.xsl XML "xmlview.xsl" diff --git a/dlls/msxml3/tests/xmlview.c b/dlls/msxml3/tests/xmlview.c index 65c991e..b238d69 100644 --- a/dlls/msxml3/tests/xmlview.c +++ b/dlls/msxml3/tests/xmlview.c @@ -24,14 +24,128 @@ #include "windows.h" #include "ole2.h" #include "mshtml.h" +#include "mshtmdid.h" #include "initguid.h" #include "perhist.h" #include "docobj.h" +#include "urlmon.h" #include "wine/test.h" DEFINE_GUID(CLSID_XMLView, 0x48123bc4, 0x99d9, 0x11d1, 0xa6,0xb3, 0x00,0xc0,0x4f,0xd9,0x15,0x55); +HRESULT (WINAPI *pCreateURLMoniker)(IMoniker*, LPCWSTR, IMoniker**); + +static const char xmlview_html[] = +"\r\n" +"<BODY><H2>Generated HTML</H2>\r\n" +"<TABLE>\r\n" +"<TBODY>\r\n" +"<TR bgColor=green>\r\n" +"<TH>Title</TH>\r\n" +"<TH>Value</TH></TR>\r\n" +"<TR>\r\n" +"<TD>title1</TD>\r\n" +"<TD>value1</TD></TR>\r\n" +"<TR>\r\n" +"<TD>title2</TD>\r\n" +"<TD>value2</TD></TR></TBODY></TABLE></BODY>"; + +IHTMLDocument2 *html_doc; +BOOL loaded; + +static int html_src_compare(LPCWSTR strw, const char *stra) +{ + char buf[2048], *p1; + const char *p2; + + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + + p1 = buf; + p2 = stra; + while(1) { + while(*p1=='\r' || *p1=='\n' || *p1=='\"') p1++; + while(*p2=='\r' || *p2=='\n') p2++; + + if(!*p1 || !*p2 || tolower(*p1)!=tolower(*p2)) + break; + + p1++; + p2++; + } + + return *p1 != *p2; +} + +static HRESULT WINAPI HTMLEvents_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "Unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI HTMLEvents_AddRef(IDispatch *iface) +{ + return 2; +} + +static ULONG WINAPI HTMLEvents_Release(IDispatch *iface) +{ + return 1; +} + +static HRESULT WINAPI HTMLEvents_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLEvents_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLEvents_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLEvents_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + if(dispIdMember == DISPID_HTMLDOCUMENTEVENTS2_ONREADYSTATECHANGE) { + static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0}; + BSTR state; + + IHTMLDocument2_get_readyState(html_doc, &state); + if(!memcmp(state, completeW, sizeof(completeW))) + loaded = TRUE; + } + + return S_OK; +} + +static const IDispatchVtbl HTMLEventsVtbl = { + HTMLEvents_QueryInterface, + HTMLEvents_AddRef, + HTMLEvents_Release, + HTMLEvents_GetTypeInfoCount, + HTMLEvents_GetTypeInfo, + HTMLEvents_GetIDsOfNames, + HTMLEvents_Invoke +}; + +static IDispatch HTMLEvents = { &HTMLEventsVtbl }; + static void test_QueryInterface(void) { IUnknown *xmlview, *unk; @@ -73,9 +187,85 @@ static void test_QueryInterface(void) IUnknown_Release(xmlview); } +static void test_Load(void) +{ + static const WCHAR xmlview_xmlW[] = {'/','x','m','l','/','x','m','l','v','i','e','w','.','x','m','l',0}; + static const WCHAR res[] = {'r','e','s',':','/','/',0}; + + WCHAR buf[1024]; + IPersistMoniker *pers_mon; + IConnectionPointContainer *cpc; + IConnectionPoint *cp; + IMoniker *mon; + IBindCtx *bctx; + IHTMLElement *elem; + HRESULT hres; + MSG msg; + BSTR source; + + lstrcpyW(buf, res); + GetModuleFileNameW(NULL, buf+lstrlenW(buf), (sizeof(buf)-sizeof(res))/sizeof(WCHAR)); + lstrcatW(buf, xmlview_xmlW); + + if(!pCreateURLMoniker) { + win_skip("CreateURLMoniker not available\n"); + return; + } + + hres = CoCreateInstance(&CLSID_XMLView, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IPersistMoniker, (void**)&pers_mon); + if(FAILED(hres)) { + win_skip("Failed to create XMLView instance\n"); + return; + } + ok(hres == S_OK, "CoCreateInstance returned %x, expected S_OK\n", hres); + + hres = IPersistMoniker_QueryInterface(pers_mon, &IID_IHTMLDocument2, (void**)&html_doc); + ok(hres == S_OK, "QueryInterface(HTMLDocument2) returned %x, expected S_OK\n", hres); + hres = IPersistMoniker_QueryInterface(pers_mon, &IID_IConnectionPointContainer, (void**)&cpc); + ok(hres == S_OK, "QueryInterface(IConnectionPointContainer) returned %x, expected S_OK\n", hres); + hres = IConnectionPointContainer_FindConnectionPoint(cpc, &IID_IDispatch, &cp); + ok(hres == S_OK, "FindConnectionPoint returned %x, expected S_OK\n", hres); + hres = IConnectionPoint_Advise(cp, (IUnknown*)&HTMLEvents, NULL); + ok(hres == S_OK, "Advise returned %x, expected S_OK\n", hres); + IConnectionPoint_Release(cp); + IConnectionPointContainer_Release(cpc); + + hres = CreateBindCtx(0, &bctx); + ok(hres == S_OK, "CreateBindCtx returned %x, expected S_OK\n", hres); + hres = pCreateURLMoniker(NULL, buf, &mon); + ok(hres == S_OK, "CreateUrlMoniker returned %x, expected S_OK\n", hres); + loaded = FALSE; + hres = IPersistMoniker_Load(pers_mon, TRUE, mon, bctx, 0); + ok(hres == S_OK, "Load returned %x, expected S_OK\n", hres); + IBindCtx_Release(bctx); + IMoniker_Release(mon); + + while(!loaded && GetMessage(&msg, NULL, 0, 0)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + hres = IHTMLDocument2_get_body(html_doc, &elem); + ok(hres == S_OK, "get_body returned %x, expected S_OK\n", hres); + hres = IHTMLElement_get_outerHTML(elem, &source); + ok(hres == S_OK, "get_outerHTML returned %x, expected S_OK\n", hres); + ok(!html_src_compare(source, xmlview_html), "Incorrect HTML source: %s\n", wine_dbgstr_w(source)); + IHTMLElement_Release(elem); + SysFreeString(source); + + IHTMLDocument2_Release(html_doc); + html_doc = NULL; + IPersistMoniker_Release(pers_mon); +} + START_TEST(xmlview) { + HMODULE urlmon = LoadLibraryA("urlmon.dll"); + pCreateURLMoniker = (void*)GetProcAddress(urlmon, "CreateURLMoniker"); + CoInitialize(NULL); test_QueryInterface(); + test_Load(); CoUninitialize(); } diff --git a/dlls/msxml3/tests/xmlview.xml b/dlls/msxml3/tests/xmlview.xml new file mode 100644 index 0000000..a3c4bf4 --- /dev/null +++ b/dlls/msxml3/tests/xmlview.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml-stylesheet type="text/xsl" href="xmlview.xsl"?> +<test> + <field> + <title>title1</title> + <value>value1</value> + </field> + <field> + <title>title2</title> + <value>value2</value> + </field> +</test> diff --git a/dlls/msxml3/tests/xmlview.xsl b/dlls/msxml3/tests/xmlview.xsl new file mode 100644 index 0000000..1b20f35 --- /dev/null +++ b/dlls/msxml3/tests/xmlview.xsl @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + +<xsl:template match="/"> + <html> + <body> + <h2>Generated HTML</h2> + <table> + <tr bgcolor="green"> + <th>Title</th> + <th>Value</th> + </tr> + <xsl:for-each select="test/field"> + <tr> + <td><xsl:value-of select="title"/></td> + <td><xsl:value-of select="value"/></td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + +</xsl:stylesheet>

1 0

Alexandre Julliard : winevdm: Try DOSBox first for running DOS applications .
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: afd0590bfe111aa685146514a0bc027bf91d19fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd0590bfe111aa685146514a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 13 13:09:40 2012 +0100 winevdm: Try DOSBox first for running DOS applications. --- programs/winevdm/winevdm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 0dcc806..b143cb8 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -215,6 +215,8 @@ static void start_dos_exe( LPCSTR filename, LPCSTR cmdline ) MEMORY_BASIC_INFORMATION mem_info; const char *reason; + start_dosbox( filename, cmdline ); + if (VirtualQuery( NULL, &mem_info, sizeof(mem_info) ) && mem_info.State != MEM_FREE) { __wine_load_dos_exe( filename, cmdline ); @@ -225,11 +227,9 @@ static void start_dos_exe( LPCSTR filename, LPCSTR cmdline ) } else reason = "because the DOS memory range is unavailable"; - start_dosbox( filename, cmdline ); - WINE_MESSAGE( "winevdm: Cannot start DOS application %s\n", filename ); WINE_MESSAGE( " %s.\n", reason ); - WINE_MESSAGE( " Try running this application with DOSBox.\n" ); + WINE_MESSAGE( " You should install DOSBox.\n" ); ExitProcess(1); }

1 0

Piotr Caban : msxml3: Added partial XMLView IPersistMoniker_Load implementation.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 85055298fa519d74ac44e5c364cdd1e62584fcb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85055298fa519d74ac44e5c36… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 12 20:41:45 2012 +0100 msxml3: Added partial XMLView IPersistMoniker_Load implementation. --- dlls/msxml3/domdoc.c | 5 +- dlls/msxml3/msxml_private.h | 1 - dlls/msxml3/xmlview.c | 936 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 934 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85055298fa519d74ac44e…

1 0

Hans Leidekker : msi: Fix deleting services on installation.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: c98bf1b57b795e97161c8960e1964eafde1816ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98bf1b57b795e97161c8960e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 13 12:51:26 2012 +0100 msi: Fix deleting services on installation. Based on a patch by Berhard Loos. --- dlls/msi/action.c | 19 ++++++--------- dlls/msi/tests/action.c | 56 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 87fc906..16e2186 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5913,28 +5913,25 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) MSIPACKAGE *package = param; MSICOMPONENT *comp; MSIRECORD *uirow; - LPCWSTR component; LPWSTR name = NULL, display_name = NULL; DWORD event, len; SC_HANDLE scm = NULL, service = NULL; - event = MSI_RecordGetInteger( rec, 3 ); - if (!(event & msidbServiceControlEventDelete)) - return ERROR_SUCCESS; - - component = MSI_RecordGetString(rec, 6); - comp = msi_get_loaded_component(package, component); + comp = msi_get_loaded_component( package, MSI_RecordGetString(rec, 6) ); if (!comp) return ERROR_SUCCESS; + event = MSI_RecordGetInteger( rec, 3 ); + deformat_string( package, MSI_RecordGetString(rec, 2), &name ); + comp->Action = msi_get_component_action( package, comp ); - if (comp->Action != INSTALLSTATE_ABSENT) + if (!(comp->Action == INSTALLSTATE_LOCAL && (event & msidbServiceControlEventDelete)) && + !(comp->Action == INSTALLSTATE_ABSENT && (event & msidbServiceControlEventUninstallDelete))) { - TRACE("component not scheduled for removal %s\n", debugstr_w(component)); + TRACE("service %s not scheduled for removal\n", debugstr_w(name)); + msi_free( name ); return ERROR_SUCCESS; } - - deformat_string( package, MSI_RecordGetString(rec, 2), &name ); stop_service( name ); scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ); diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 3743e50..2b482df 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -73,7 +73,8 @@ static const char component_dat[] = "Two\t{BF03D1A6-20DA-4A65-82F3-6CAC995915CE}\tFIRSTDIR\t2\t\ttwo.txt\n" "dangler\t{6091DF25-EF96-45F1-B8E9-A9B1420C7A3C}\tTARGETDIR\t4\t\tregdata\n" "component\t\tMSITESTDIR\t0\t1\tfile\n" - "service_comp\t\tMSITESTDIR\t0\t1\tservice_file"; + "service_comp\t{935A0A91-22A3-4F87-BCA8-928FFDFE2353}\tMSITESTDIR\t0\t\tservice_file\n" + "service_comp2\t{3F7B04A4-9521-4649-BDC9-0C8722740A49}\tMSITESTDIR\t0\t\tservice_file2"; static const char directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -109,7 +110,8 @@ static const char feature_comp_dat[] = "Three\tThree\n" "Two\tTwo\n" "feature\tcomponent\n" - "service_feature\tservice_comp\n"; + "service_feature\tservice_comp\n" + "service_feature\tservice_comp2"; static const char file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" @@ -121,7 +123,8 @@ static const char file_dat[] = "three.txt\tThree\tthree.txt\t1000\t\t\t0\t3\n" "two.txt\tTwo\ttwo.txt\t1000\t\t\t0\t2\n" "file\tcomponent\tfilename\t100\t\t\t8192\t1\n" - "service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t1"; + "service_file\tservice_comp\tservice.exe\t100\t\t\t8192\t6\n" + "service_file2\tservice_comp2\tservice2.exe\t100\t\t\t8192\t7"; static const char install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -149,7 +152,7 @@ static const char media_dat[] = "i2\ti4\tL64\tS255\tS32\tS72\n" "Media\tDiskId\n" "1\t3\t\t\tDISK1\t\n" - "2\t5\t\tmsitest.cab\tDISK2\t\n"; + "2\t7\t\tmsitest.cab\tDISK2\t\n"; static const char property_dat[] = "Property\tValue\n" @@ -172,7 +175,9 @@ static const char property_dat[] = "AdminProperties\tPOSTADMIN\n" "ROOTDRIVE\tC:\\\n" "SERVNAME\tTestService\n" + "SERVNAME2\tTestService2\n" "SERVDISP\tTestServiceDisp\n" + "SERVDISP2\tTestServiceDisp2\n" "MSIFASTINSTALL\t1\n"; static const char environment_dat[] = @@ -211,13 +216,15 @@ static const char service_install_dat[] = "LoadOrderGroup\tDependencies\tStartName\tPassword\tArguments\tComponent_\tDescription\n" "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" "ServiceInstall\tServiceInstall\n" - "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService\t\t-a arg\tservice_comp\tdescription"; + "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService\t\t-a arg\tservice_comp\tdescription\n" + "TestService2\tSERVNAME2]\t[SERVDISP2]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService2\t\t-a arg\tservice_comp2\tdescription"; static const char service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" "s72\tl255\ti2\tL255\tI2\ts72\n" "ServiceControl\tServiceControl\n" - "ServiceControl\tTestService\t8\t\t0\tservice_comp"; + "ServiceControl\tTestService3\t8\t\t0\tservice_comp\n" + "ServiceControl2\tTestService3\t128\t\t0\tservice_comp2"; static const char sss_service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" @@ -254,11 +261,13 @@ static const char sds_install_exec_seq_dat[] = "CostFinalize\t\t1000\n" "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" - "DeleteServices\tInstalled\t5000\n" + "StopServices\t\t5000\n" + "DeleteServices\t\t5050\n" "MoveFiles\t\t5100\n" "InstallFiles\t\t5200\n" "DuplicateFiles\t\t5300\n" - "InstallServices\tNOT Installed\t5400\n" + "InstallServices\t\t5400\n" + "StartServices\t\t5450\n" "RegisterProduct\t\t5500\n" "PublishFeatures\t\t5600\n" "PublishProduct\t\t5700\n" @@ -2181,6 +2190,7 @@ static void create_test_files(void) create_file("msitest\\filename", 100); create_file("msitest\\service.exe", 100); + create_file("msitest\\service2.exe", 100); DeleteFileA("four.txt"); DeleteFileA("five.txt"); @@ -2208,6 +2218,7 @@ static void delete_test_files(void) DeleteFileA("msitest\\first\\two.txt"); DeleteFileA("msitest\\one.txt"); DeleteFileA("msitest\\service.exe"); + DeleteFileA("msitest\\service2.exe"); DeleteFileA("msitest\\filename"); RemoveDirectoryA("msitest\\second"); RemoveDirectoryA("msitest\\first"); @@ -4706,6 +4717,7 @@ static void test_envvar(void) delete_pf("msitest\\filename", TRUE); delete_pf("msitest\\one.txt", TRUE); delete_pf("msitest\\service.exe", TRUE); + delete_pf("msitest\\service2.exe", TRUE); delete_pf("msitest", FALSE); error: @@ -4830,6 +4842,7 @@ static void test_start_services(void) ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); delete_test_files(); @@ -4853,6 +4866,8 @@ static void test_start_services(void) static void test_delete_services(void) { UINT r; + SC_HANDLE manager, service; + DWORD error; if (is_process_limited()) { @@ -4860,6 +4875,18 @@ static void test_delete_services(void) return; } + manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(manager != NULL, "can't open service manager %u\n", GetLastError()); + if (!manager) return; + + service = CreateServiceA(manager, "TestService3", "TestService3", + SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, "C:\\doesnt_exist.exe", NULL, NULL, NULL, NULL, NULL); + ok(service != NULL, "can't create service %u\n", GetLastError()); + CloseServiceHandle(service); + CloseServiceHandle(manager); + if (!service) goto error; + create_test_files(); create_database(msifile, sds_tables, sizeof(sds_tables) / sizeof(msi_table)); @@ -4873,6 +4900,16 @@ static void test_delete_services(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(manager != NULL, "can't open service manager\n"); + if (!manager) goto error; + + service = OpenServiceA(manager, "TestService3", GENERIC_ALL); + error = GetLastError(); + ok(service == NULL, "TestService3 not deleted\n"); + ok(error == ERROR_SERVICE_DOES_NOT_EXIST, "wrong error %u\n", error); + CloseServiceHandle(manager); + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -4887,6 +4924,7 @@ static void test_delete_services(void) ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: @@ -4928,6 +4966,7 @@ static void test_self_registration(void) ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: @@ -5034,6 +5073,7 @@ static void test_validate_product_id(void) ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); error:

1 0

Jacek Caban : mshtml: Added property value conversion type tests.
by Alexandre Julliard March 13, 2012

March 13, 2012

Module: wine Branch: master Commit: 68b76ed0282a74a773e92d2a9315f13eabf2c146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b76ed0282a74a773e92d2a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 13 11:47:24 2012 +0100 mshtml: Added property value conversion type tests. --- dlls/mshtml/tests/script.c | 133 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 125 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index d1a4d4a..43c66c6 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -129,6 +129,8 @@ DEFINE_EXPECT(AXSetInterfaceSafetyOptions_IDispatch_data); DEFINE_EXPECT(AXSetInterfaceSafetyOptions_IDispatchEx_caller_secmgr); DEFINE_EXPECT(AXSetInterfaceSafetyOptions_IDispatchEx_caller); DEFINE_EXPECT(external_success); +DEFINE_EXPECT(QS_VariantConversion); +DEFINE_EXPECT(ChangeType); #define TESTSCRIPT_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80746}" #define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}" @@ -270,6 +272,88 @@ static IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { static IPropertyNotifySink PropertyNotifySink = { &PropertyNotifySinkVtbl }; +static HRESULT WINAPI VariantChangeType_QueryInterface(IVariantChangeType *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI VariantChangeType_AddRef(IVariantChangeType *iface) +{ + return 2; +} + +static ULONG WINAPI VariantChangeType_Release(IVariantChangeType *iface) +{ + return 1; +} + +static HRESULT WINAPI VariantChangeType_ChangeType(IVariantChangeType *iface, VARIANT *dst, VARIANT *src, LCID lcid, VARTYPE vt) +{ + CHECK_EXPECT(ChangeType); + + ok(dst != NULL, "dst = NULL\n"); + ok(V_VT(dst) == VT_EMPTY, "V_VT(dst) = %d\n", V_VT(dst)); + ok(src != NULL, "src = NULL\n"); + ok(V_VT(src) == VT_I4, "V_VT(src) = %d\n", V_VT(src)); + ok(V_I4(src) == 0xf0f0f0, "V_I4(src) = %x\n", V_I4(src)); + ok(lcid == LOCALE_NEUTRAL, "lcid = %d\n", lcid); + ok(vt == VT_BSTR, "vt = %d\n", vt); + + V_VT(dst) = VT_BSTR; + V_BSTR(dst) = a2bstr("red"); + return S_OK; +} + +static const IVariantChangeTypeVtbl VariantChangeTypeVtbl = { + VariantChangeType_QueryInterface, + VariantChangeType_AddRef, + VariantChangeType_Release, + VariantChangeType_ChangeType +}; + +static IVariantChangeType VChangeType = { &VariantChangeTypeVtbl }; + +static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ServiceProvider_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(guidService, &SID_VariantConversion)) { + CHECK_EXPECT(QS_VariantConversion); + ok(IsEqualGUID(riid, &IID_IVariantChangeType), "uenxpected riid %s\n", debugstr_guid(riid)); + *ppv = &VChangeType; + return S_OK; + } + + ok(0, "unexpected service %s\n", debugstr_guid(guidService)); + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + ServiceProvider_QueryInterface, + ServiceProvider_AddRef, + ServiceProvider_Release, + ServiceProvider_QueryService +}; + +static IServiceProvider caller_sp = { &ServiceProviderVtbl }; + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -1761,13 +1845,13 @@ static HRESULT WINAPI ActiveScriptParse_AddScriptlet(IActiveScriptParse *iface, return E_NOTIMPL; } -static HRESULT dispex_propput(IDispatchEx *obj, DISPID id, DWORD flags, VARIANT *var) +static HRESULT dispex_propput(IDispatchEx *obj, DISPID id, DWORD flags, VARIANT *var, IServiceProvider *caller_sp) { DISPID propput_arg = DISPID_PROPERTYPUT; DISPPARAMS dp = {var, &propput_arg, 1, 1}; EXCEPINFO ei = {0}; - return IDispatchEx_InvokeEx(obj, id, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT|flags, &dp, NULL, &ei, NULL); + return IDispatchEx_InvokeEx(obj, id, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT|flags, &dp, NULL, &ei, caller_sp); } static void test_func(IDispatchEx *obj) @@ -1815,7 +1899,7 @@ static void test_func(IDispatchEx *obj) V_VT(&var) = VT_I4; V_I4(&var) = 100; - hres = dispex_propput(obj, id, 0, &var); + hres = dispex_propput(obj, id, 0, &var, NULL); ok(hres == E_NOTIMPL, "InvokeEx failed: %08x\n", hres); IDispatchEx_Release(dispex); @@ -1834,7 +1918,7 @@ static void test_nextdispid(IDispatchEx *dispex) SysFreeString(name); V_VT(&var) = VT_EMPTY; - hres = dispex_propput(dispex, dyn_id, 0, &var); + hres = dispex_propput(dispex, dyn_id, 0, &var, NULL); ok(hres == S_OK, "dispex_propput failed: %08x\n", hres); while(last_id != dyn_id) { @@ -1887,6 +1971,37 @@ static void test_global_id(void) VariantClear(&var); } +static void test_arg_conv(IHTMLWindow2 *window) +{ + IHTMLDocument2 *doc; + IDispatchEx *dispex; + IHTMLElement *elem; + VARIANT v; + HRESULT hres; + + hres = IHTMLWindow2_get_document(window, &doc); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + + hres = IHTMLDocument2_get_body(doc, &elem); + IHTMLDocument2_Release(doc); + ok(hres == S_OK, "get_body failed: %08x\n", hres); + + hres = IHTMLElement_QueryInterface(elem, &IID_IDispatchEx, (void**)&dispex); + IHTMLElement_Release(elem); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + + SET_EXPECT(QS_VariantConversion); + SET_EXPECT(ChangeType); + V_VT(&v) = VT_I4; + V_I4(&v) = 0xf0f0f0; + hres = dispex_propput(dispex, DISPID_IHTMLBODYELEMENT_BACKGROUND, 0, &v, &caller_sp); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + CHECK_CALLED(QS_VariantConversion); + CHECK_CALLED(ChangeType); + + IDispatchEx_Release(dispex); +} + static void test_script_run(void) { IDispatchEx *document, *dispex; @@ -1943,7 +2058,7 @@ static void test_script_run(void) V_VT(&var) = VT_I4; V_I4(&var) = 100; - hres = dispex_propput(document, id, 0, &var); + hres = dispex_propput(document, id, 0, &var, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); tmp = SysAllocString(testW); @@ -1964,7 +2079,7 @@ static void test_script_run(void) V_VT(&var) = VT_I4; V_I4(&var) = 200; - hres = dispex_propput(document, id, DISPATCH_PROPERTYPUTREF, &var); + hres = dispex_propput(document, id, DISPATCH_PROPERTYPUTREF, &var, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); VariantInit(&var); @@ -1994,7 +2109,7 @@ static void test_script_run(void) V_VT(&var) = VT_BSTR; V_BSTR(&var) = NULL; - dispex_propput(document, id, 0,&var); + dispex_propput(document, id, 0, &var, NULL); VariantInit(&var); memset(&dp, 0, sizeof(dp)); @@ -2047,7 +2162,6 @@ static void test_script_run(void) ok(hres == S_OK, "Could not get IHTMLWindow2 iface: %08x\n", hres); hres = IHTMLWindow2_get_navigator(window, &navigator); - IHTMLWindow2_Release(window); ok(hres == S_OK, "get_navigator failed: %08x\n", hres); hres = IOmNavigator_QueryInterface(navigator, &IID_IDispatchEx, (void**)&dispex); @@ -2057,6 +2171,9 @@ static void test_script_run(void) test_func(dispex); test_nextdispid(dispex); + test_arg_conv(window); + IHTMLWindow2_Release(window); + tmp = a2bstr("test"); hres = IDispatchEx_DeleteMemberByName(dispex, tmp, fdexNameCaseSensitive); ok(hres == E_NOTIMPL, "DeleteMemberByName failed: %08x\n", hres);

1 0