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

Nikolay Sivov : msxml3: Support VT_BSTR|VT_BYREF as reader input.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 2b4f20b8c3b6c98a2c3f2452d6498f94a47b7839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4f20b8c3b6c98a2c3f2452d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 3 08:54:52 2014 +0400 msxml3: Support VT_BSTR|VT_BYREF as reader input. --- dlls/msxml3/saxreader.c | 7 +++++-- dlls/msxml3/tests/saxreader.c | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index baabdd4..ea2b15f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2472,9 +2472,12 @@ static HRESULT internal_parse( switch(V_VT(&varInput)) { case VT_BSTR: - hr = internal_parseBuffer(This, (const char*)V_BSTR(&varInput), - strlenW(V_BSTR(&varInput))*sizeof(WCHAR), vbInterface); + case VT_BSTR|VT_BYREF: + { + BSTR str = V_ISBYREF(&varInput) ? *V_BSTRREF(&varInput) : V_BSTR(&varInput); + hr = internal_parseBuffer(This, (const char*)str, strlenW(str)*sizeof(WCHAR), vbInterface); break; + } case VT_ARRAY|VT_UI1: { void *pSAData; LONG lBound, uBound; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 05f6b91..bb3ea2a 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2512,6 +2512,7 @@ static void test_saxreader_properties(void) ISAXXMLReader *reader; HRESULT hr; VARIANT v; + BSTR str; hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (void**)&reader); @@ -2659,6 +2660,13 @@ static void test_saxreader_properties(void) hr = ISAXXMLReader_parse(reader, v); EXPECT_HR(hr, S_OK); + /* VT_BSTR|VT_BYREF input type */ + str = _bstr_("<?xml version=\"1.0\"?><element></element>"); + V_VT(&v) = VT_BSTR|VT_BYREF; + V_BSTRREF(&v) = &str; + hr = ISAXXMLReader_parse(reader, v); + EXPECT_HR(hr, S_OK); + V_VT(&v) = VT_EMPTY; V_BSTR(&v) = (void*)0xdeadbeef; hr = ISAXXMLReader_getProperty(reader, _bstr_("xmldecl-version"), &v);

1 0

Nikolay Sivov : msxml3: Fix IVBSAXXMLReader interface definition.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: a41446b1f76aea4ad223a12cde6512ef76b42c1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41446b1f76aea4ad223a12cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 3 08:55:16 2014 +0400 msxml3: Fix IVBSAXXMLReader interface definition. --- dlls/msxml3/saxreader.c | 122 ++++++++++++++++++++++++----------------------- include/msxml2.idl | 18 +++---- include/msxml6.idl | 18 +++---- 3 files changed, 80 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a41446b1f76aea4ad223a…

1 0

Nikolay Sivov : msxml3: Support more variant types in putProperty().
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: a28ace9ae7f6bdae8ad8e1d6580741325f3d2f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a28ace9ae7f6bdae8ad8e1d65… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 3 08:55:37 2014 +0400 msxml3: Support more variant types in putProperty(). --- dlls/msxml3/saxreader.c | 122 ++++++++++++++++++----------------------- dlls/msxml3/tests/saxreader.c | 32 +++++++++++ 2 files changed, 86 insertions(+), 68 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 530ca02..df92997 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2602,99 +2602,85 @@ static HRESULT internal_parseURL( return detach_bsc(bsc); } -static HRESULT internal_putProperty( - saxreader* This, - const WCHAR *prop, - VARIANT value, - BOOL vbInterface) +static HRESULT saxreader_put_handler_from_variant(saxreader *This, enum saxhandler_type type, const VARIANT *v, BOOL vb) { - TRACE("(%p)->(%s %s)\n", This, debugstr_w(prop), debugstr_variant(&value)); - - if(!memcmp(prop, PropertyDeclHandlerW, sizeof(PropertyDeclHandlerW))) - { - if(This->isParsing) return E_FAIL; + const IID *riid; - switch (V_VT(&value)) - { - case VT_EMPTY: - saxreader_put_handler(This, SAXDeclHandler, NULL, vbInterface); - break; - case VT_UNKNOWN: - { - IUnknown *handler = NULL; + if (V_VT(v) == VT_EMPTY) + return saxreader_put_handler(This, type, NULL, vb); - if (V_UNKNOWN(&value)) - { - HRESULT hr; + switch (type) + { + case SAXDeclHandler: + riid = vb ? &IID_IVBSAXDeclHandler : &IID_ISAXDeclHandler; + break; + case SAXLexicalHandler: + riid = vb ? &IID_IVBSAXLexicalHandler : &IID_ISAXLexicalHandler; + break; + default: + ERR("wrong handler type %d\n", type); + return E_FAIL; + } - if (vbInterface) - hr = IUnknown_QueryInterface(V_UNKNOWN(&value), &IID_IVBSAXDeclHandler, (void**)&handler); - else - hr = IUnknown_QueryInterface(V_UNKNOWN(&value), &IID_ISAXDeclHandler, (void**)&handler); - if (FAILED(hr)) return hr; - } + switch (V_VT(v)) + { + case VT_DISPATCH: + case VT_UNKNOWN: + { + IUnknown *handler = NULL; - saxreader_put_handler(This, SAXDeclHandler, handler, vbInterface); - if (handler) IUnknown_Release(handler); - break; - } - default: - return E_INVALIDARG; + if (V_UNKNOWN(v)) + { + HRESULT hr = IUnknown_QueryInterface(V_UNKNOWN(v), riid, (void**)&handler); + if (FAILED(hr)) return hr; } - return S_OK; + saxreader_put_handler(This, type, handler, vb); + if (handler) IUnknown_Release(handler); + break; + } + default: + ERR("value type %d not supported\n", V_VT(v)); + return E_INVALIDARG; } - if(!memcmp(prop, PropertyLexicalHandlerW, sizeof(PropertyLexicalHandlerW))) - { - if(This->isParsing) return E_FAIL; + return S_OK; +} - switch (V_VT(&value)) - { - case VT_EMPTY: - saxreader_put_handler(This, SAXLexicalHandler, NULL, vbInterface); - break; - case VT_UNKNOWN: - { - IUnknown *handler = NULL; +static HRESULT internal_putProperty( + saxreader* This, + const WCHAR *prop, + VARIANT value, + BOOL vbInterface) +{ + VARIANT *v; - if (V_UNKNOWN(&value)) - { - HRESULT hr; + TRACE("(%p)->(%s %s)\n", This, debugstr_w(prop), debugstr_variant(&value)); - if (vbInterface) - hr = IUnknown_QueryInterface(V_UNKNOWN(&value), &IID_IVBSAXLexicalHandler, (void**)&handler); - else - hr = IUnknown_QueryInterface(V_UNKNOWN(&value), &IID_ISAXLexicalHandler, (void**)&handler); - if (FAILED(hr)) return hr; - } + if (This->isParsing) return E_FAIL; - saxreader_put_handler(This, SAXLexicalHandler, handler, vbInterface); - if (handler) IUnknown_Release(handler); - break; - } - default: - return E_INVALIDARG; - } + v = V_VT(&value) == (VT_VARIANT|VT_BYREF) ? V_VARIANTREF(&value) : &value; + if(!memcmp(prop, PropertyDeclHandlerW, sizeof(PropertyDeclHandlerW))) + return saxreader_put_handler_from_variant(This, SAXDeclHandler, v, vbInterface); - return S_OK; - } + if(!memcmp(prop, PropertyLexicalHandlerW, sizeof(PropertyLexicalHandlerW))) + return saxreader_put_handler_from_variant(This, SAXLexicalHandler, v, vbInterface); if(!memcmp(prop, PropertyMaxXMLSizeW, sizeof(PropertyMaxXMLSizeW))) { - if (V_VT(&value) == VT_I4 && V_I4(&value) == 0) return S_OK; - FIXME("(%p)->(%s): max-xml-size unsupported\n", This, debugstr_variant(&value)); + if (V_VT(v) == VT_I4 && V_I4(v) == 0) return S_OK; + FIXME("(%p)->(%s): max-xml-size unsupported\n", This, debugstr_variant(v)); return E_NOTIMPL; } if(!memcmp(prop, PropertyMaxElementDepthW, sizeof(PropertyMaxElementDepthW))) { - if (V_VT(&value) == VT_I4 && V_I4(&value) == 0) return S_OK; - FIXME("(%p)->(%s): max-element-depth unsupported\n", This, debugstr_variant(&value)); + if (V_VT(v) == VT_I4 && V_I4(v) == 0) return S_OK; + FIXME("(%p)->(%s): max-element-depth unsupported\n", This, debugstr_variant(v)); return E_NOTIMPL; } - FIXME("(%p)->(%s:%s): unsupported property\n", This, debugstr_w(prop), debugstr_variant(&value)); + FIXME("(%p)->(%s:%s): unsupported property\n", This, debugstr_w(prop), debugstr_variant(v)); if(!memcmp(prop, PropertyCharsetW, sizeof(PropertyCharsetW))) return E_NOTIMPL; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index bb3ea2a..f581fd3 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2523,6 +2523,7 @@ static void test_saxreader_properties(void) while (ptr->prop_name) { + VARIANT varref; LONG ref; init_saxlexicalhandler(&lexicalhandler, S_OK); @@ -2535,6 +2536,7 @@ static void test_saxreader_properties(void) ok(V_VT(&v) == VT_UNKNOWN, "got %d\n", V_VT(&v)); ok(V_UNKNOWN(&v) == NULL, "got %p\n", V_UNKNOWN(&v)); + /* VT_UNKNOWN */ V_VT(&v) = VT_UNKNOWN; V_UNKNOWN(&v) = ptr->iface; ref = get_refcount(ptr->iface); @@ -2542,6 +2544,36 @@ static void test_saxreader_properties(void) EXPECT_HR(hr, S_OK); ok(ref < get_refcount(ptr->iface), "expected inreased refcount\n"); + /* VT_DISPATCH */ + V_VT(&v) = VT_DISPATCH; + V_UNKNOWN(&v) = ptr->iface; + ref = get_refcount(ptr->iface); + hr = ISAXXMLReader_putProperty(reader, _bstr_(ptr->prop_name), v); + EXPECT_HR(hr, S_OK); + ok(ref == get_refcount(ptr->iface), "got wrong refcount %d, expected %d\n", get_refcount(ptr->iface), ref); + + /* VT_VARIANT|VT_BYREF with VT_UNKNOWN in referenced variant */ + V_VT(&varref) = VT_UNKNOWN; + V_UNKNOWN(&varref) = ptr->iface; + + V_VT(&v) = VT_VARIANT|VT_BYREF; + V_VARIANTREF(&v) = &varref; + ref = get_refcount(ptr->iface); + hr = ISAXXMLReader_putProperty(reader, _bstr_(ptr->prop_name), v); + EXPECT_HR(hr, S_OK); + ok(ref == get_refcount(ptr->iface), "got wrong refcount %d, expected %d\n", get_refcount(ptr->iface), ref); + + /* VT_VARIANT|VT_BYREF with VT_DISPATCH in referenced variant */ + V_VT(&varref) = VT_DISPATCH; + V_UNKNOWN(&varref) = ptr->iface; + + V_VT(&v) = VT_VARIANT|VT_BYREF; + V_VARIANTREF(&v) = &varref; + ref = get_refcount(ptr->iface); + hr = ISAXXMLReader_putProperty(reader, _bstr_(ptr->prop_name), v); + EXPECT_HR(hr, S_OK); + ok(ref == get_refcount(ptr->iface), "got wrong refcount %d, expected %d\n", get_refcount(ptr->iface), ref); + V_VT(&v) = VT_EMPTY; V_UNKNOWN(&v) = (IUnknown*)0xdeadbeef;

1 0

Nikolay Sivov : msxml3: Added IVBSAXDeclHandler interface for MXWriter.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 94dcff1dda7a3ce45c0b60617dd73a7c661b1557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94dcff1dda7a3ce45c0b60617… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 3 08:55:59 2014 +0400 msxml3: Added IVBSAXDeclHandler interface for MXWriter. --- dlls/msxml3/mxwriter.c | 125 ++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/saxreader.c | 30 +++++++++- 2 files changed, 153 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=94dcff1dda7a3ce45c0b6…

1 0

Nikolay Sivov : msxml3: Added IVBSAXLexicalHandler interface for MXWriter.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: d6de1be777bfbcc390db48489e7f1b78cb3a9ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6de1be777bfbcc390db48489… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 3 08:56:20 2014 +0400 msxml3: Added IVBSAXLexicalHandler interface for MXWriter. --- dlls/msxml3/mxwriter.c | 141 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/saxreader.c | 25 +++++++- 2 files changed, 164 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6de1be777bfbcc390db4…

1 0

Aric Stewart : user32: Correct buffer calculation for GetMenuStringA.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: beab7da6cd7af154ec27608d8d943ae5990a342a URL: http://source.winehq.org/git/wine.git/?a=commit;h=beab7da6cd7af154ec27608d8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 3 14:10:05 2014 +0900 user32: Correct buffer calculation for GetMenuStringA. --- dlls/user32/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index bbaa5f3..915b1c5 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3687,7 +3687,7 @@ INT WINAPI GetMenuStringA( return 0; } if (!item->text) return 0; - if (!str || !nMaxSiz) return strlenW(item->text); + if (!str || !nMaxSiz) return WideCharToMultiByte( CP_ACP, 0, item->text, -1, NULL, 0, NULL, NULL ); if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, str, nMaxSiz, NULL, NULL )) str[nMaxSiz-1] = 0; TRACE("returning %s\n", debugstr_a(str));

1 0

Hans Leidekker : msi: Remove the product reference when a shared component is unregistered.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: f5250381427c0b8ac00864940574461d8d29bc63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5250381427c0b8ac00864940… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 3 10:50:34 2014 +0100 msi: Remove the product reference when a shared component is unregistered. --- dlls/msi/action.c | 24 ++++++- dlls/msi/tests/install.c | 159 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 173 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5250381427c0b8ac0086…

1 0

Jacek Caban : secur32/tests: Fixed tests with new winehq.org setup.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 29a409b222d865c16cc7d21c3af63396137e82a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a409b222d865c16cc7d21c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 3 13:55:11 2014 +0100 secur32/tests: Fixed tests with new winehq.org setup. --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 8cfa4f8..fa61f4a 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -518,7 +518,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Jacek Caban : wininet/tests: Fixed tests for the new winehq.org cert.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: fd3563b2b9b0a8aeac31d00674adef49d24220da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3563b2b9b0a8aeac31d0067… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 3 15:08:39 2014 +0100 wininet/tests: Fixed tests for the new winehq.org cert. --- dlls/wininet/tests/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 2f9c36c..e40cdb6 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4029,9 +4029,9 @@ typedef struct { } cert_struct_test_t; static const cert_struct_test_t test_winehq_org_cert = { - "0mJuv1t-1CFypQkyTZwfvjHHBAbnUndG\r\n" + "6JcR7G3G8tgjkeoMcitK-bTbzcpumDSy\r\n" "GT98380011\r\n" - "See www.rapidssl.com/resources/cps (c)13\r\n" + "See www.rapidssl.com/resources/cps (c)14\r\n" "Domain Control Validated - RapidSSL(R)\r\n" "*.winehq.org",

1 0

Jacek Caban : qcap: Added AVICompressorIn_Disconnect implementation.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 955ce003aec2ac6f1bcdc3cef5b5c08484fac9cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=955ce003aec2ac6f1bcdc3cef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 3 15:43:19 2014 +0100 qcap: Added AVICompressorIn_Disconnect implementation. --- dlls/qcap/avico.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index aedcf27..caef183 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -416,8 +416,17 @@ static HRESULT WINAPI AVICompressorIn_ReceiveConnection(IPin *iface, static HRESULT WINAPI AVICompressorIn_Disconnect(IPin *iface) { AVICompressor *This = impl_from_IPin(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)\n", This); + + hres = BasePinImpl_Disconnect(iface); + if(FAILED(hres)) + return hres; + + heap_free(This->videoinfo); + This->videoinfo = NULL; + return S_OK; } static const IPinVtbl AVICompressorInputPinVtbl = {

1 0