wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Nikolay Sivov : msxml3: Store output stream for processor.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: bb47bab7ced49bc434de44cd7a6f91d7c581229d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb47bab7ced49bc434de44cd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 16 16:44:47 2011 +0300 msxml3: Store output stream for processor. --- dlls/msxml3/stylesheet.c | 29 +++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 6d7507e..b1f7972 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -51,6 +51,7 @@ typedef struct _xslprocessor LONG ref; IXMLDOMNode *input; + IStream *output; } xslprocessor; static HRESULT XSLProcessor_create(IXSLProcessor**); @@ -306,6 +307,7 @@ static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface ) if ( ref == 0 ) { if (This->input) IXMLDOMNode_Release(This->input); + if (This->output) IStream_Release(This->output); heap_free( This ); } @@ -475,9 +477,31 @@ static HRESULT WINAPI xslprocessor_put_output( VARIANT output) { xslprocessor *This = impl_from_IXSLProcessor( iface ); + IStream *stream; + HRESULT hr; - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + FIXME("(%p)->(%s): semi-stub\n", This, debugstr_variant(&output)); + + switch (V_VT(&output)) + { + case VT_EMPTY: + stream = NULL; + hr = S_OK; + break; + case VT_UNKNOWN: + hr = IUnknown_QueryInterface(V_UNKNOWN(&output), &IID_IStream, (void**)&stream); + break; + default: + hr = E_FAIL; + } + + if (hr == S_OK) + { + if (This->output) IStream_Release(This->output); + This->output = stream; + } + + return hr; } static HRESULT WINAPI xslprocessor_get_output( @@ -590,6 +614,7 @@ HRESULT XSLProcessor_create(IXSLProcessor **ppObj) This->IXSLProcessor_iface.lpVtbl = &xslprocessor_vtbl; This->ref = 1; This->input = NULL; + This->output = NULL; *ppObj = &This->IXSLProcessor_iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0c8fff2..d85c678 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7663,9 +7663,10 @@ static void test_xsltemplate(void) IXSLTemplate *template; IXSLProcessor *processor; IXMLDOMDocument *doc; + IStream *stream; VARIANT_BOOL b; HRESULT hr; - ULONG ref1, ref2; + ULONG ref1, ref2, ref; VARIANT v; template = create_xsltemplate(&IID_IXSLTemplate); @@ -7734,6 +7735,37 @@ todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v)); } + + /* reset before it was set */ + V_VT(&v) = VT_EMPTY; + hr = IXSLProcessor_put_output(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CreateStreamOnHGlobal(NULL, TRUE, &stream); + ref = IStream_AddRef(stream); + IStream_Release(stream); + ok(ref == 2, "got %d\n", ref); + + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)stream; + hr = IXSLProcessor_put_output(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* it seems processor grabs 2 references */ + ref = IStream_AddRef(stream); + IStream_Release(stream); + todo_wine ok(ref == 4, "got %d\n", ref); + + /* reset and check stream refcount */ + V_VT(&v) = VT_EMPTY; + hr = IXSLProcessor_put_output(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ref = IStream_AddRef(stream); + IStream_Release(stream); + ok(ref == 2, "got %d\n", ref); + + IStream_Release(stream); IXSLProcessor_Release(processor); /* drop reference */

1 0

Nikolay Sivov : msxml3: Initial implementation of transform() method.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: 4e079d6b3d45e29c43189c33f493a463fbd605d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e079d6b3d45e29c43189c33f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 16 16:45:14 2011 +0300 msxml3: Initial implementation of transform() method. --- dlls/msxml3/stylesheet.c | 34 ++++++++++++++++++++++++++++------ dlls/msxml3/tests/domdoc.c | 11 +++++++++++ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index b1f7972..df29fc2 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -50,11 +50,12 @@ typedef struct _xslprocessor IXSLProcessor IXSLProcessor_iface; LONG ref; + xsltemplate *stylesheet; IXMLDOMNode *input; IStream *output; } xslprocessor; -static HRESULT XSLProcessor_create(IXSLProcessor**); +static HRESULT XSLProcessor_create(xsltemplate*, IXSLProcessor**); static inline xsltemplate *impl_from_IXSLTemplate( IXSLTemplate *iface ) { @@ -226,7 +227,7 @@ static HRESULT WINAPI xsltemplate_createProcessor( IXSLTemplate *iface, if (!processor) return E_INVALIDARG; - return XSLProcessor_create(processor); + return XSLProcessor_create(This, processor); } static const struct IXSLTemplateVtbl xsltemplate_vtbl = @@ -308,6 +309,7 @@ static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface ) { if (This->input) IXMLDOMNode_Release(This->input); if (This->output) IStream_Release(This->output); + IXSLTemplate_Release(&This->stylesheet->IXSLTemplate_iface); heap_free( This ); } @@ -516,12 +518,30 @@ static HRESULT WINAPI xslprocessor_get_output( static HRESULT WINAPI xslprocessor_transform( IXSLProcessor *iface, - VARIANT_BOOL *pbool) + VARIANT_BOOL *ret) { xslprocessor *This = impl_from_IXSLProcessor( iface ); + HRESULT hr; + BSTR p; - FIXME("(%p)->(%p): stub\n", This, pbool); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, ret); + + if (!ret) return E_INVALIDARG; + + hr = IXMLDOMNode_transformNode(This->input, This->stylesheet->node, &p); + if (hr == S_OK) + { + ULONG len = 0; + + /* output to stream */ + hr = IStream_Write(This->output, p, SysStringByteLen(p), &len); + *ret = len == SysStringByteLen(p) ? VARIANT_TRUE : VARIANT_FALSE; + SysFreeString(p); + } + else + *ret = VARIANT_FALSE; + + return hr; } static HRESULT WINAPI xslprocessor_reset( IXSLProcessor *iface ) @@ -601,7 +621,7 @@ static const struct IXSLProcessorVtbl xslprocessor_vtbl = xslprocessor_get_stylesheet }; -HRESULT XSLProcessor_create(IXSLProcessor **ppObj) +HRESULT XSLProcessor_create(xsltemplate *template, IXSLProcessor **ppObj) { xslprocessor *This; @@ -615,6 +635,8 @@ HRESULT XSLProcessor_create(IXSLProcessor **ppObj) This->ref = 1; This->input = NULL; This->output = NULL; + This->stylesheet = template; + IXSLTemplate_AddRef(&template->IXSLTemplate_iface); *ppObj = &This->IXSLProcessor_iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d85c678..d34168e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7724,9 +7724,17 @@ static void test_xsltemplate(void) hr = IXSLTemplate_createProcessor(template, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ref = IXSLTemplate_AddRef(template); + IXSLTemplate_Release(template); + ok(ref == 2, "got %d\n", ref); + hr = IXSLTemplate_createProcessor(template, &processor); ok(hr == S_OK, "got 0x%08x\n", hr); + ref = IXSLTemplate_AddRef(template); + IXSLTemplate_Release(template); + ok(ref == 3, "got %d\n", ref); + /* input no set yet */ V_VT(&v) = VT_BSTR; V_BSTR(&v) = NULL; @@ -7756,6 +7764,9 @@ todo_wine { IStream_Release(stream); todo_wine ok(ref == 4, "got %d\n", ref); + hr = IXSLProcessor_transform(processor, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* reset and check stream refcount */ V_VT(&v) = VT_EMPTY; hr = IXSLProcessor_put_output(processor, v);

1 0

Nikolay Sivov : msxml3: Basic put_input() method for IXSLProcessor.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: 392934af901223ae5f0a0d1e83d69c270721ddc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392934af901223ae5f0a0d1e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 16 16:44:04 2011 +0300 msxml3: Basic put_input() method for IXSLProcessor. --- dlls/msxml3/stylesheet.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 10 ++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 1add7db..6d7507e 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -49,6 +49,8 @@ typedef struct _xslprocessor { IXSLProcessor IXSLProcessor_iface; LONG ref; + + IXMLDOMNode *input; } xslprocessor; static HRESULT XSLProcessor_create(IXSLProcessor**); @@ -302,7 +304,10 @@ static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface ) ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) + { + if (This->input) IXMLDOMNode_Release(This->input); heap_free( This ); + } return ref; } @@ -381,9 +386,39 @@ static HRESULT WINAPI xslprocessor_Invoke( static HRESULT WINAPI xslprocessor_put_input( IXSLProcessor *iface, VARIANT input ) { xslprocessor *This = impl_from_IXSLProcessor( iface ); + IXMLDOMNode *input_node; + HRESULT hr; - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_variant(&input)); + + /* try IXMLDOMNode directly first */ + if (V_VT(&input) == VT_UNKNOWN) + hr = IUnknown_QueryInterface(V_UNKNOWN(&input), &IID_IXMLDOMNode, (void**)&input_node); + else if (V_VT(&input) == VT_DISPATCH) + hr = IDispatch_QueryInterface(V_DISPATCH(&input), &IID_IXMLDOMNode, (void**)&input_node); + else + { + IXMLDOMDocument *doc; + + hr = DOMDocument_create(&CLSID_DOMDocument, NULL, (void**)&doc); + if (hr == S_OK) + { + VARIANT_BOOL b; + + hr = IXMLDOMDocument_load(doc, input, &b); + if (hr == S_OK) + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMNode, (void**)&input_node); + IXMLDOMDocument_Release(doc); + } + } + + if (hr == S_OK) + { + if (This->input) IXMLDOMNode_Release(This->input); + This->input = input_node; + } + + return hr; } static HRESULT WINAPI xslprocessor_get_input( IXSLProcessor *iface, VARIANT *input ) @@ -554,6 +589,7 @@ HRESULT XSLProcessor_create(IXSLProcessor **ppObj) This->IXSLProcessor_iface.lpVtbl = &xslprocessor_vtbl; This->ref = 1; + This->input = NULL; *ppObj = &This->IXSLProcessor_iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b4dc2e1..0c8fff2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7666,6 +7666,7 @@ static void test_xsltemplate(void) VARIANT_BOOL b; HRESULT hr; ULONG ref1, ref2; + VARIANT v; template = create_xsltemplate(&IID_IXSLTemplate); if (!template) return; @@ -7724,6 +7725,15 @@ static void test_xsltemplate(void) hr = IXSLTemplate_createProcessor(template, &processor); ok(hr == S_OK, "got 0x%08x\n", hr); + + /* input no set yet */ + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = NULL; + hr = IXSLProcessor_get_input(processor, &v); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v)); +} IXSLProcessor_Release(processor); /* drop reference */

1 0

Gerald Pfeifer : wpp: Add explicit casts when mixing signed and unsigned integers.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: 7a3226be4696a01ddf4f9fe8494224455a6c9a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a3226be4696a01ddf4f9fe84… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Feb 16 02:50:46 2011 +0100 wpp: Add explicit casts when mixing signed and unsigned integers. --- libs/wpp/ppy.y | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index 5f1566e..b50e120 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -59,7 +59,7 @@ if(cv_signed(v1) && cv_signed(v2)) \ r.val.si = v1.val.si OP v2.val.si; \ else if(cv_signed(v1) && !cv_signed(v2)) \ - r.val.si = v1.val.si OP v2.val.ui; \ + r.val.si = v1.val.si OP (signed) v2.val.ui; \ else if(!cv_signed(v1) && cv_signed(v2)) \ r.val.si = v1.val.ui OP v2.val.si; \ else \ @@ -70,7 +70,7 @@ if(cv_signed(v1) && cv_signed(v2)) \ r.val.sl = v1.val.sl OP v2.val.sl; \ else if(cv_signed(v1) && !cv_signed(v2)) \ - r.val.sl = v1.val.sl OP v2.val.ul; \ + r.val.sl = v1.val.sl OP (signed long) v2.val.ul; \ else if(!cv_signed(v1) && cv_signed(v2)) \ r.val.sl = v1.val.ul OP v2.val.sl; \ else \ @@ -81,7 +81,7 @@ if(cv_signed(v1) && cv_signed(v2)) \ r.val.sll = v1.val.sll OP v2.val.sll; \ else if(cv_signed(v1) && !cv_signed(v2)) \ - r.val.sll = v1.val.sll OP v2.val.ull; \ + r.val.sll = v1.val.sll OP (wrc_sll_t) v2.val.ull; \ else if(!cv_signed(v1) && cv_signed(v2)) \ r.val.sll = v1.val.ull OP v2.val.sll; \ else \

1 0

Jacek Caban : msxml3: Silence QueryInterface FIXME.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: e703763e51c9190c2fe7c324e0847238f41d9857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e703763e51c9190c2fe7c324e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 16 11:26:57 2011 +0100 msxml3: Silence QueryInterface FIXME. --- dlls/msxml3/httprequest.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 4dd4de8..0be4fbb 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -505,7 +505,8 @@ static HRESULT WINAPI httprequest_QueryInterface(IXMLHTTPRequest *iface, REFIID } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; }

1 0

Thomas Mullaly : mshtml: Fixed a few typos.
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: 5624ece30df5cdb42922b5dd6eb4e507415a4504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5624ece30df5cdb42922b5dd6… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Tue Feb 15 20:22:58 2011 -0500 mshtml: Fixed a few typos. --- dlls/mshtml/persist.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index d10b353..43d7e3c 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -203,9 +203,9 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel hres = get_client_disp_property(This->doc_obj->client, DISPID_AMBIENT_OFFLINEIFNOTCONNECTED, &offline); if(SUCCEEDED(hres)) { - if(V_VT(&silent) != VT_BOOL) - WARN("V_VT(offline) = %d\n", V_VT(&silent)); - else if(V_BOOL(&silent)) + if(V_VT(&offline) != VT_BOOL) + WARN("V_VT(offline) = %d\n", V_VT(&offline)); + else if(V_BOOL(&offline)) FIXME("offline == true\n"); } }

1 0

Juan Lang : crypt32: Don' t assign a count value unless memory allocation succeeds (clang).
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: 3cdd20f91de873f806621f0f2163c7c2ce7c4f3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cdd20f91de873f806621f0f2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 15 11:31:16 2011 -0800 crypt32: Don't assign a count value unless memory allocation succeeds (clang). --- dlls/crypt32/encode.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 825eb44..6b61337 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1330,13 +1330,15 @@ static BOOL CRYPT_AsnEncodeRdn(DWORD dwCertEncodingType, const CERT_RDN *rdn, ret = TRUE; if (rdn->cRDNAttr) { - setOf.cBlob = rdn->cRDNAttr; setOf.rgBlob = CryptMemAlloc(rdn->cRDNAttr * sizeof(CRYPT_DER_BLOB)); if (!setOf.rgBlob) ret = FALSE; else + { + setOf.cBlob = rdn->cRDNAttr; memset(setOf.rgBlob, 0, setOf.cBlob * sizeof(CRYPT_DER_BLOB)); + } } for (i = 0; ret && i < rdn->cRDNAttr; i++) {

1 0

Juan Lang : crypt32: Don't assume a function succeeded (clang).
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: b377f83453cf82d5274aeebc233702e72a100a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b377f83453cf82d5274aeebc2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 15 11:16:25 2011 -0800 crypt32: Don't assume a function succeeded (clang). --- dlls/crypt32/msg.c | 46 +++++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 97860e5..50c1bee 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1559,38 +1559,42 @@ static BOOL WINAPI CRYPT_ExportKeyTrans( X509_ASN_ENCODING, &keyInfo, &expKey); if (ret) { - BYTE *keyBlob; DWORD size; ret = CryptExportKey(pContentEncryptInfo->hContentEncryptKey, expKey, SIMPLEBLOB, 0, NULL, &size); - keyBlob = CryptMemAlloc(size); - if (keyBlob) + if (ret) { - ret = CryptExportKey(pContentEncryptInfo->hContentEncryptKey, - expKey, SIMPLEBLOB, 0, keyBlob, &size); - if (ret) - { - DWORD head = sizeof(BLOBHEADER) + sizeof(ALG_ID); + BYTE *keyBlob; - pKeyTransEncryptInfo->EncryptedKey.pbData = - CryptMemAlloc(size - head); - if (pKeyTransEncryptInfo->EncryptedKey.pbData) + keyBlob = CryptMemAlloc(size); + if (keyBlob) + { + ret = CryptExportKey(pContentEncryptInfo->hContentEncryptKey, + expKey, SIMPLEBLOB, 0, keyBlob, &size); + if (ret) { - DWORD i, k = 0; + DWORD head = sizeof(BLOBHEADER) + sizeof(ALG_ID); + + pKeyTransEncryptInfo->EncryptedKey.pbData = + CryptMemAlloc(size - head); + if (pKeyTransEncryptInfo->EncryptedKey.pbData) + { + DWORD i, k = 0; - pKeyTransEncryptInfo->EncryptedKey.cbData = size - head; - for (i = size - 1; i >= head; --i, ++k) - pKeyTransEncryptInfo->EncryptedKey.pbData[k] = - keyBlob[i]; + pKeyTransEncryptInfo->EncryptedKey.cbData = size - head; + for (i = size - 1; i >= head; --i, ++k) + pKeyTransEncryptInfo->EncryptedKey.pbData[k] = + keyBlob[i]; + } + else + ret = FALSE; } - else - ret = FALSE; + CryptMemFree(keyBlob); } - CryptMemFree(keyBlob); + else + ret = FALSE; } - else - ret = FALSE; CryptDestroyKey(expKey); }

1 0

Juan Lang : crypt32: Fix return value in error cases (clang).
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: bcd14a1822e29c40b972a38df6a36ec2b6ea6779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd14a1822e29c40b972a38df… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 15 11:12:41 2011 -0800 crypt32: Fix return value in error cases (clang). --- dlls/crypt32/chain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d7c10b3..ca76cef 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3213,7 +3213,8 @@ static BOOL match_domain_component(LPCWSTR allowed_component, DWORD allowed_len, break; } } - matches = tolowerW(*allowed_ptr) == tolowerW(*server_ptr); + if (matches) + matches = tolowerW(*allowed_ptr) == tolowerW(*server_ptr); } if (matches && server_ptr - server_component < server_len) {

1 0

Juan Lang : crypt32: Fix return value (clang).
by Alexandre Julliard 16 Feb '11

16 Feb '11

Module: wine Branch: master Commit: a7534610a39eb1049c958a30af7cf88e3a328150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7534610a39eb1049c958a30a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 15 11:10:52 2011 -0800 crypt32: Fix return value (clang). --- dlls/crypt32/crl.c | 4 +++- dlls/crypt32/ctl.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 72180c5..cafe564 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -472,8 +472,10 @@ BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext, ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, pvData, pcbData); else + { *(DWORD *)pvData = 0; - ret = TRUE; + ret = TRUE; + } } break; default: diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 40895fa..09ebf26 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -605,8 +605,10 @@ BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext, ret = CertGetStoreProperty(pCTLContext->hCertStore, dwPropId, pvData, pcbData); else + { *(DWORD *)pvData = 0; - ret = TRUE; + ret = TRUE; + } } break; default:

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
68
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 February 2011