September 2008 - Wine-commits

Huw Davies : inetcomm: Implement IMimeBody_IsType(IBT_EMPTY).
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 59091374e84eb41e5e8e36fe6546430f95cb3220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59091374e84eb41e5e8e36fe6… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 22 14:36:13 2008 +0100 inetcomm: Implement IMimeBody_IsType(IBT_EMPTY). --- dlls/inetcomm/mimeole.c | 13 +++++++++++-- dlls/inetcomm/tests/mimeole.c | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index bae7dc7..10c6685 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -864,8 +864,17 @@ static HRESULT WINAPI MimeBody_IsType( IMimeBody* iface, IMSGBODYTYPE bodytype) { - FIXME("(%p)->(%d): stub\n", iface, bodytype); - return E_NOTIMPL; + MimeBody *This = impl_from_IMimeBody(iface); + + TRACE("(%p)->(%d)\n", iface, bodytype); + switch(bodytype) + { + case IBT_EMPTY: + return This->data ? S_FALSE : S_OK; + default: + FIXME("Unimplemented bodytype %d - returning S_OK\n", bodytype); + } + return S_OK; } static HRESULT WINAPI MimeBody_SetDisplayName( diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 8200400..1f29abb 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -130,6 +130,8 @@ static void test_CreateBody(void) ok(hr == S_FALSE, "ret %08x\n", hr); hr = IMimeBody_IsContentType(body, NULL, "mixed"); ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_IsType(body, IBT_EMPTY); + ok(hr == S_OK, "got %08x\n", hr); hr = IMimeBody_SetData(body, IET_8BIT, "text", "plain", &IID_IStream, in); ok(hr == S_OK, "ret %08x\n", hr); @@ -148,6 +150,9 @@ static void test_CreateBody(void) ok(offsets.cbBodyStart == 0, "got %d\n", offsets.cbBodyStart); ok(offsets.cbBodyEnd == 0, "got %d\n", offsets.cbBodyEnd); + hr = IMimeBody_IsType(body, IBT_EMPTY); + ok(hr == S_FALSE, "got %08x\n", hr); + hr = MimeOleGetAllocator(&alloc); ok(hr == S_OK, "ret %08x\n", hr);

1 0

Juan Lang : wintrust: Search all additional stores when building a chain, not just the first one.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 49fdba476834a1c171655406a766e0b95304add5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49fdba476834a1c171655406a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 22 10:56:19 2008 -0700 wintrust: Search all additional stores when building a chain, not just the first one. --- dlls/wintrust/softpub.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index f8bf69e..8e58f3f 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -599,7 +599,20 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, PCERT_CHAIN_PARA chainPara) { BOOL ret = TRUE; + HCERTSTORE store = NULL; + if (data->chStores) + { + store = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + if (store) + { + DWORD i; + + for (i = 0; i < data->chStores; i++) + CertAddStoreToCollection(store, data->pahStores[i], 0, 0); + } + } /* Expect the end certificate for each signer to be the only cert in the * chain: */ @@ -608,8 +621,7 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, /* Create a certificate chain for each signer */ ret = CertGetCertificateChain(createInfo->hChainEngine, data->pasSigners[signer].pasCertChain[0].pCert, - &data->pasSigners[signer].sftVerifyAsOf, - data->chStores ? data->pahStores[0] : NULL, + &data->pasSigners[signer].sftVerifyAsOf, store, chainPara, createInfo->dwFlags, createInfo->pvReserved, &data->pasSigners[signer].pChainContext); if (ret) @@ -627,6 +639,7 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, } } } + CertCloseStore(store, 0); return ret; }

1 0

Juan Lang : wintrust: Store the error status and confidence for each element in the chain.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: a9dbc17d50262df5b0daa6ef85dbe25578ccfe73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9dbc17d50262df5b0daa6ef8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 22 10:56:50 2008 -0700 wintrust: Store the error status and confidence for each element in the chain. --- dlls/wintrust/softpub.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 8e58f3f..4b7eadc 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -552,6 +552,20 @@ BOOL WINAPI SoftpubCheckCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, return ret; } +static DWORD WINTRUST_TrustStatusToConfidence(DWORD errorStatus) +{ + DWORD confidence = 0; + + confidence = 0; + if (!(errorStatus & CERT_TRUST_IS_NOT_SIGNATURE_VALID)) + confidence |= CERT_CONFIDENCE_SIG; + if (!(errorStatus & CERT_TRUST_IS_NOT_TIME_VALID)) + confidence |= CERT_CONFIDENCE_TIME; + if (!(errorStatus & CERT_TRUST_IS_NOT_TIME_NESTED)) + confidence |= CERT_CONFIDENCE_TIMENEST; + return confidence; +} + static BOOL WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) { BOOL ret; @@ -559,6 +573,11 @@ static BOOL WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) data->pasSigners[signerIdx].pChainContext->rgpChain[0]; DWORD i; + data->pasSigners[signerIdx].pasCertChain[0].dwConfidence = + WINTRUST_TrustStatusToConfidence( + simpleChain->rgpElement[0]->TrustStatus.dwErrorStatus); + data->pasSigners[signerIdx].pasCertChain[0].dwError = + simpleChain->rgpElement[0]->TrustStatus.dwErrorStatus; data->pasSigners[signerIdx].pasCertChain[0].pChainElement = simpleChain->rgpElement[0]; ret = TRUE; @@ -567,8 +586,15 @@ static BOOL WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) ret = data->psPfns->pfnAddCert2Chain(data, signerIdx, FALSE, 0, simpleChain->rgpElement[i]->pCertContext); if (ret) + { data->pasSigners[signerIdx].pasCertChain[i].pChainElement = simpleChain->rgpElement[i]; + data->pasSigners[signerIdx].pasCertChain[i].dwConfidence = + WINTRUST_TrustStatusToConfidence( + simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus); + data->pasSigners[signerIdx].pasCertChain[i].dwError = + simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus; + } } return ret; }

1 0

Detlef Riekenberg : msxml3: Remove redundant NULL check before SysFreeString.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: f4558c64755feb0ad4cc62aa6bcc20b8c27a577d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4558c64755feb0ad4cc62aa6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Sep 21 15:56:18 2008 +0200 msxml3: Remove redundant NULL check before SysFreeString. --- dlls/msxml3/saxreader.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 84dd9f4..646df91 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1517,10 +1517,8 @@ static ULONG WINAPI isaxlocator_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - if(This->publicId) - SysFreeString(This->publicId); - if(This->systemId) - SysFreeString(This->systemId); + SysFreeString(This->publicId); + SysFreeString(This->systemId); HeapFree(GetProcessHeap(), 0, This->nsStack); ISAXXMLReader_Release((ISAXXMLReader*)&This->saxreader->lpSAXXMLReaderVtbl); @@ -1558,7 +1556,7 @@ static HRESULT WINAPI isaxlocator_getPublicId( BSTR publicId; saxlocator *This = impl_from_ISAXLocator( iface ); - if(This->publicId) SysFreeString(This->publicId); + SysFreeString(This->publicId); publicId = bstr_from_xmlChar(xmlSAX2GetPublicId(This->pParserCtxt)); if(SysStringLen(publicId)) @@ -1580,7 +1578,7 @@ static HRESULT WINAPI isaxlocator_getSystemId( BSTR systemId; saxlocator *This = impl_from_ISAXLocator( iface ); - if(This->systemId) SysFreeString(This->systemId); + SysFreeString(This->systemId); systemId = bstr_from_xmlChar(xmlSAX2GetSystemId(This->pParserCtxt)); if(SysStringLen(systemId))

1 0

Detlef Riekenberg : msi: Remove redundant NULL check before SysFreeString.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 88a5bdb858e9efc6085f4ff08917f3ff2f222790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a5bdb858e9efc6085f4ff08… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Sep 21 15:58:28 2008 +0200 msi: Remove redundant NULL check before SysFreeString. --- dlls/msi/automation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index c15126a..60224b6 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -441,7 +441,7 @@ static HRESULT WINAPI AutomationObject_Invoke( if (pVarResult == &varResultDummy) VariantClear(pVarResult); /* Free function name if we retrieved it */ - if (bstrName) SysFreeString(bstrName); + SysFreeString(bstrName); TRACE("Returning 0x%08x, %s\n", hr, SUCCEEDED(hr) ? "ok" : "not ok");

1 0

Huw Davies : inetcomm: Content-Disposition can have parameters.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: cfbd34cac7c1227ea69bac35af2769faab877216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfbd34cac7c1227ea69bac35a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 22 14:25:22 2008 +0100 inetcomm: Content-Disposition can have parameters. --- dlls/inetcomm/mimeole.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 1c1161a..bae7dc7 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -69,7 +69,7 @@ static const property_t default_props[] = {"Content-Type", PID_HDR_CNTTYPE, MPF_MIME | MPF_HASPARAMS, VT_LPSTR}, {"Content-Transfer-Encoding", PID_HDR_CNTXFER, MPF_MIME, VT_LPSTR}, {"Content-ID", PID_HDR_CNTID, MPF_MIME, VT_LPSTR}, - {"Content-Disposition", PID_HDR_CNTDISP, MPF_MIME, VT_LPSTR}, + {"Content-Disposition", PID_HDR_CNTDISP, MPF_MIME | MPF_HASPARAMS, VT_LPSTR}, {"To", PID_HDR_TO, MPF_ADDRESS, VT_LPSTR}, {"Cc", PID_HDR_CC, MPF_ADDRESS, VT_LPSTR}, {"Sender", PID_HDR_SENDER, MPF_ADDRESS, VT_LPSTR},

1 0

Detlef Riekenberg : shdocvw: Remove redundant NULL check before SysFreeString.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 3b3ac07265e8c8f294fadbd5a982a6225484276b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3ac07265e8c8f294fadbd5a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Sep 21 16:10:14 2008 +0200 shdocvw: Remove redundant NULL check before SysFreeString. --- dlls/shdocvw/navigate.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 7ca0b0f..b5299d5 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -162,8 +162,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) IOleClientSite_Release(CLIENTSITE(This->doc_host)); if(This->post_data) GlobalFree(This->post_data); - if(This->headers) - SysFreeString(This->headers); + SysFreeString(This->headers); heap_free(This->url); heap_free(This); }

1 0

Detlef Riekenberg : oleaut32: Remove redundant NULL check before SysFreeString.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 410302d8987cb5f51dcf4ec2f57280ec41f303e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=410302d8987cb5f51dcf4ec2f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Sep 21 15:52:16 2008 +0200 oleaut32: Remove redundant NULL check before SysFreeString. --- dlls/oleaut32/tmarshal.c | 6 ++-- dlls/oleaut32/typelib.c | 55 ++++++++++++++------------------------------- 2 files changed, 20 insertions(+), 41 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index fdfe07c..a7b4009 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1420,8 +1420,8 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) TRACE_(olerelay)("("); } - if (iname) SysFreeString(iname); - if (fname) SysFreeString(fname); + SysFreeString(iname); + SysFreeString(fname); memset(&buf,0,sizeof(buf)); @@ -2080,7 +2080,7 @@ TMStubImpl_Invoke( goto exit; } - if (iname) SysFreeString (iname); + SysFreeString (iname); /* Need them for hack below */ memset(names,0,sizeof(names)); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ceb2295..9539bd0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -838,7 +838,7 @@ enddeleteloop: } end: - if (tlibPath) SysFreeString(tlibPath); + SysFreeString(tlibPath); if (typeLib) ITypeLib_Release(typeLib); if (subKey) RegCloseKey(subKey); if (key) RegCloseKey(key); @@ -3833,29 +3833,17 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) } TRACE(" destroying ITypeLib(%p)\n",This); - if (This->Name) - { - SysFreeString(This->Name); - This->Name = NULL; - } + SysFreeString(This->Name); + This->Name = NULL; - if (This->DocString) - { - SysFreeString(This->DocString); - This->DocString = NULL; - } + SysFreeString(This->DocString); + This->DocString = NULL; - if (This->HelpFile) - { - SysFreeString(This->HelpFile); - This->HelpFile = NULL; - } + SysFreeString(This->HelpFile); + This->HelpFile = NULL; - if (This->HelpStringDll) - { - SysFreeString(This->HelpStringDll); - This->HelpStringDll = NULL; - } + SysFreeString(This->HelpStringDll); + This->HelpStringDll = NULL; for (pCustData = This->pCustData; pCustData; pCustData = pCustDataNext) { @@ -4679,23 +4667,14 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface) if (This->no_free_data) goto finish_free; - if (This->Name) - { - SysFreeString(This->Name); - This->Name = 0; - } + SysFreeString(This->Name); + This->Name = NULL; - if (This->DocString) - { - SysFreeString(This->DocString); - This->DocString = 0; - } + SysFreeString(This->DocString); + This->DocString = NULL; - if (This->DllName) - { - SysFreeString(This->DllName); - This->DllName = 0; - } + SysFreeString(This->DllName); + This->DllName = NULL; for (pFInfo = This->funclist; pFInfo; pFInfo = pFInfoNext) { @@ -6526,7 +6505,7 @@ static HRESULT WINAPI ITypeInfo_fnAddressOfMember( ITypeInfo2 *iface, { ERR("couldn't load %s\n", debugstr_w(dll)); SysFreeString(dll); - if (entry) SysFreeString(entry); + SysFreeString(entry); return STG_E_FILENOTFOUND; } /* FIXME: store library somewhere where we can free it */ @@ -6552,7 +6531,7 @@ static HRESULT WINAPI ITypeInfo_fnAddressOfMember( ITypeInfo2 *iface, } SysFreeString(dll); - if (entry) SysFreeString(entry); + SysFreeString(entry); if (!*ppv) return TYPE_E_DLLFUNCTIONNOTFOUND;

1 0

Alexandre Julliard : regedit: Fix file exports in ASCII format.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 700b5c6d7ff2c1182248abf01bfc3ba5280de496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=700b5c6d7ff2c1182248abf01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 22 15:34:41 2008 +0200 regedit: Fix file exports in ASCII format. --- programs/regedit/regproc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index bdbdba9..9178d4e 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -940,7 +940,7 @@ static void REGPROC_write_line(FILE *file, const WCHAR* str, BOOL unicode) } else { char* strA = GetMultiByteString(str); - fprintf(file, strA); + fputs(strA, file); HeapFree(GetProcessHeap(), 0, strA); } }

1 0

Zachary Goldberg : WWN Issue 352
by Jeremy Newman 23 Sep '08

23 Sep '08

Module: website Branch: master Commit: 8b06b0629a6ba8a41364a02ec47539e43a8a41e6 URL: http://source.winehq.org/git/website.git/?a=commit;h=8b06b0629a6ba8a41364a0… Author: Zachary Goldberg <zgold(a)bluesata.com> Date: Tue Sep 23 09:26:42 2008 -0500 WWN Issue 352 --- news/en/2008092301.xml | 18 + wwn/en/wn20080922_352.xml | 3503 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3521 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=8b06b0629a6ba8a413…

1 0