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

Alistair Leslie-Hughes : mssign32: Add stubs PvkFreeCryptProv, PvkGetCryptProv, PvkPrivateKeyAcquireContextFromMemory.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 9e10eee67bd5e71c4f2c15cc9d16d1ab799d91bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e10eee67bd5e71c4f2c15cc9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 10 19:42:43 2012 +1100 mssign32: Add stubs PvkFreeCryptProv, PvkGetCryptProv, PvkPrivateKeyAcquireContextFromMemory. --- dlls/mssign32/mssign32.spec | 6 +++--- dlls/mssign32/mssign32_main.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mssign32/mssign32.spec b/dlls/mssign32/mssign32.spec index 95b42e4..07d7a99 100644 --- a/dlls/mssign32/mssign32.spec +++ b/dlls/mssign32/mssign32.spec @@ -2,11 +2,11 @@ @ stub DllUnregisterServer @ stub FreeCryptProvFromCert @ stub GetCryptProvFromCert -@ stub PvkFreeCryptProv -@ stub PvkGetCryptProv +@ stdcall PvkFreeCryptProv(ptr wstr long wstr) +@ stdcall PvkGetCryptProv(ptr wstr wstr long wstr wstr ptr ptr ptr) @ stub PvkPrivateKeyAcquireContext @ stub PvkPrivateKeyAcquireContextA -@ stub PvkPrivateKeyAcquireContextFromMemory +@ stdcall PvkPrivateKeyAcquireContextFromMemory(wstr long ptr long ptr wstr ptr ptr ptr) @ stub PvkPrivateKeyAcquireContextFromMemoryA @ stub PvkPrivateKeyLoad @ stub PvkPrivateKeyLoadA diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index 6b403bd..c58c1f0 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -24,7 +24,11 @@ #include "windef.h" #include "winbase.h" +#include "wincrypt.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mssign); BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) { @@ -40,3 +44,33 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) } return TRUE; } + + +HRESULT WINAPI PvkGetCryptProv(HWND hwnd, LPCWSTR pwszCaption, LPCWSTR pwszCapiProvider, + DWORD dwProviderType, LPCWSTR pwszPvkFile, LPCWSTR pwszKeyContainerName, + DWORD *pdwKeySpec, LPWSTR *ppwszTmpContainer, HCRYPTPROV *phCryptProv) +{ + FIXME("%p %s %s %d %s %s %p %p %p stub", hwnd, debugstr_w(pwszCaption), debugstr_w(pwszCapiProvider), + dwProviderType, debugstr_w(pwszPvkFile), debugstr_w(pwszKeyContainerName), + pdwKeySpec, ppwszTmpContainer, phCryptProv); + + return E_FAIL; +} + +BOOL WINAPI PvkPrivateKeyAcquireContextFromMemory(LPCWSTR pwszProvName, DWORD dwProvType, + BYTE *pbData, DWORD cbData, HWND hwndOwner, LPCWSTR pwszKeyName, + DWORD *pdwKeySpec, HCRYPTPROV *phCryptProv, LPWSTR *ppwszTmpContainer) +{ + FIXME("%s %d %p %d %p %s %p %p %p stub", debugstr_w(pwszProvName), dwProvType, + pbData, cbData, hwndOwner, debugstr_w(pwszKeyName), pdwKeySpec, + phCryptProv, ppwszTmpContainer); + + return FALSE; +} + +void WINAPI PvkFreeCryptProv(HCRYPTPROV hProv, LPCWSTR pwszCapiProvider, DWORD dwProviderType, + LPWSTR pwszTmpContainer) +{ + FIXME("%08lx %s %d %s stub", hProv, debugstr_w(pwszCapiProvider), dwProviderType, + debugstr_w(pwszTmpContainer)); +}

1 0

Piotr Caban : msxml3/tests: Skip tests when XMLView object fails to create.
by Alexandre Julliard 13 Mar '12

13 Mar '12

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 partial XMLView IPersistMoniker_Load implementation.
by Alexandre Julliard 13 Mar '12

13 Mar '12

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

Piotr Caban : msxml3: Added XMLView IPersistMoniker_Load test.
by Alexandre Julliard 13 Mar '12

13 Mar '12

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

Nikolay Sivov : msxml3: Implement IMXAttributes::addAttribute().
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 70aa4f1a43b80d65330f857ad01fbd3fa62419a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70aa4f1a43b80d65330f857ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 13 10:59:53 2012 +0300 msxml3: Implement IMXAttributes::addAttribute(). --- dlls/msxml3/mxwriter.c | 68 +++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/saxreader.c | 2 - 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 2188557..d0ce946 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -120,10 +120,25 @@ typedef struct typedef struct { + BSTR qname; + BSTR local; + BSTR uri; + BSTR type; + BSTR value; +} mxattribute; + +typedef struct +{ DispatchEx dispex; IMXAttributes IMXAttributes_iface; ISAXAttributes ISAXAttributes_iface; LONG ref; + + MSXML_VERSION class_version; + + mxattribute *attr; + int length; + int allocated; } mxattributes; static inline mxattributes *impl_from_IMXAttributes( IMXAttributes *iface ) @@ -136,6 +151,16 @@ static inline mxattributes *impl_from_ISAXAttributes( ISAXAttributes *iface ) return CONTAINING_RECORD(iface, mxattributes, ISAXAttributes_iface); } +static HRESULT mxattributes_grow(mxattributes *This) +{ + if (This->length < This->allocated) return S_OK; + + This->allocated *= 2; + This->attr = heap_realloc(This->attr, This->allocated*sizeof(mxattribute)); + + return This->attr ? S_OK : E_OUTOFMEMORY; +} + static xml_encoding parse_encoding_name(const WCHAR *encoding) { static const WCHAR utf8W[] = {'U','T','F','-','8',0}; @@ -1505,7 +1530,19 @@ static ULONG WINAPI MXAttributes_Release(IMXAttributes *iface) if (ref == 0) { + int i; + + for (i = 0; i < This->length; i++) + { + SysFreeString(This->attr[i].qname); + SysFreeString(This->attr[i].local); + SysFreeString(This->attr[i].uri); + SysFreeString(This->attr[i].type); + SysFreeString(This->attr[i].value); + } + release_dispex(&This->dispex); + heap_free(This->attr); heap_free(This); } @@ -1557,9 +1594,29 @@ static HRESULT WINAPI MXAttributes_addAttribute(IMXAttributes *iface, BSTR uri, BSTR localName, BSTR QName, BSTR type, BSTR value) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%s %s %s %s %s): stub\n", This, debugstr_w(uri), debugstr_w(localName), + mxattribute *attr; + HRESULT hr; + + TRACE("(%p)->(%s %s %s %s %s)\n", This, debugstr_w(uri), debugstr_w(localName), debugstr_w(QName), debugstr_w(type), debugstr_w(value)); - return E_NOTIMPL; + + if ((!uri || !localName || !QName || !type || !value) && This->class_version != MSXML6) + return E_INVALIDARG; + + /* ensure array is large enough */ + hr = mxattributes_grow(This); + if (hr != S_OK) return hr; + + attr = &This->attr[This->length]; + + attr->qname = SysAllocString(QName); + attr->local = SysAllocString(localName); + attr->uri = SysAllocString(uri); + attr->type = SysAllocString(type); + attr->value = SysAllocString(value); + This->length++; + + return S_OK; } static HRESULT WINAPI MXAttributes_addAttributeFromIndex(IMXAttributes *iface, @@ -1806,6 +1863,7 @@ static dispex_static_data_t mxattrs_dispex = { HRESULT SAXAttributes_create(MSXML_VERSION version, IUnknown *outer, void **ppObj) { + static const int default_count = 10; mxattributes *This; TRACE("(%p, %p)\n", outer, ppObj); @@ -1818,6 +1876,12 @@ HRESULT SAXAttributes_create(MSXML_VERSION version, IUnknown *outer, void **ppOb This->ISAXAttributes_iface.lpVtbl = &SAXAttributesVtbl; This->ref = 1; + This->class_version = version; + + This->attr = heap_alloc(default_count*sizeof(mxattribute)); + This->length = 0; + This->allocated = default_count; + *ppObj = &This->IMXAttributes_iface; init_dispex(&This->dispex, (IUnknown*)&This->IMXAttributes_iface, &mxattrs_dispex); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 505acaf..4aca3af 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3332,7 +3332,6 @@ todo_wine { } hr = IMXAttributes_addAttribute(mxattr, _bstr_(table->uri), _bstr_(table->local), _bstr_(table->qname), _bstr_(table->type), _bstr_(table->value)); -todo_wine ok(hr == table->hr, "%d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); len = -1; @@ -3380,7 +3379,6 @@ todo_wine hr = IMXAttributes_addAttribute(mxattr, _bstr_("uri"), _bstr_("local"), _bstr_("qname"), _bstr_("type"), _bstr_("value")); -todo_wine EXPECT_HR(hr, S_OK); len = -1;

1 0

Nikolay Sivov : msxml3: Implement ISAXAttributes::getLength() for MXAttributes.
by Alexandre Julliard 13 Mar '12

13 Mar '12

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 13 Mar '12

13 Mar '12

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

Alexandre Julliard : winevdm: Try DOSBox first for running DOS applications .
by Alexandre Julliard 13 Mar '12

13 Mar '12

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

Jacek Caban : mshtml: Store more info about properties in func_info_t.
by Alexandre Julliard 13 Mar '12

13 Mar '12

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_PROPERTYGET ) implementation.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: c9eed8f987ff3fa19bc11ef3baf319d697f7b2e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9eed8f987ff3fa19bc11ef3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 13 11:46:42 2012 +0100 mshtml: Don't use ITypeInfo for InvokeEx(DISPATCH_PROPERTYGET) implementation. --- dlls/mshtml/dispex.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index bdad32e..88f10c3 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -759,6 +759,57 @@ static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID return DISP_E_UNKNOWNNAME; } +/* List all types used by IDispatchEx-based properties */ +#define BUILTIN_TYPES_SWITCH \ + CASE_VT(VT_I2, INT16, V_I2); \ + CASE_VT(VT_I4, INT32, V_I4); \ + CASE_VT(VT_R4, float, V_R4); \ + CASE_VT(VT_BSTR, BSTR, V_BSTR); \ + CASE_VT(VT_BOOL, VARIANT_BOOL, V_BOOL); \ + CASE_VT(VT_VARIANT, VARIANT, *); \ + CASE_VT(VT_PTR, void*, V_BYREF); \ + CASE_VT(VT_UNKNOWN, IUnknown*, V_UNKNOWN); \ + CASE_VT(VT_DISPATCH, IDispatch*, V_DISPATCH) + +static HRESULT builtin_propget(DispatchEx *This, func_info_t *func, DISPPARAMS *dp, VARIANT *res) +{ + IUnknown *iface; + HRESULT hres; + + if(dp->cArgs) { + FIXME("cArgs %d\n", dp->cArgs); + return E_NOTIMPL; + } + + assert(func->get_vtbl_off); + + 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: { \ + type val; \ + hres = ((HRESULT (WINAPI*)(IUnknown*,type*))((void**)iface->lpVtbl)[func->get_vtbl_off])(iface,&val); \ + if(SUCCEEDED(hres)) \ + access(res) = val; \ + } \ + break + BUILTIN_TYPES_SWITCH; +#undef CASE_VT + default: + FIXME("Unhandled vt %d\n", func->prop_vt); + hres = E_NOTIMPL; + } + IUnknown_Release(iface); + } + + if(FAILED(hres)) + return hres; + + V_VT(res) = func->prop_vt == VT_PTR ? VT_DISPATCH : func->prop_vt; + return S_OK; +} + static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { @@ -776,10 +827,16 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD if(FAILED(hres)) return hres; - if(func->func_disp_idx == -1) + if(func->func_disp_idx != -1) + return function_invoke(This, func, flags, dp, res, ei); + + switch(flags) { + case DISPATCH_PROPERTYGET: + hres = builtin_propget(This, func, dp, res); + break; + default: hres = typeinfo_invoke(This, func, flags, dp, res, ei); - else - hres = function_invoke(This, func, flags, dp, res, ei); + } return hres; }

1 0