October 2007 - Wine-commits

Juan Lang : wintrust: Implement GenericChainFinalProv.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: 355193b70db5fac4d878ee294c3fdbcc4226be36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=355193b70db5fac4d878ee294… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 8 15:44:01 2007 -0700 wintrust: Implement GenericChainFinalProv. --- dlls/wintrust/softpub.c | 95 +++++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 96 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 5770244..d9651ad 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -761,6 +761,101 @@ HRESULT WINAPI SoftpubAuthenticode(CRYPT_PROVIDER_DATA *data) return ret ? S_OK : S_FALSE; } +static HRESULT WINAPI WINTRUST_DefaultPolicy(CRYPT_PROVIDER_DATA *pProvData, + DWORD dwStepError, DWORD dwRegPolicySettings, DWORD cSigner, + PWTD_GENERIC_CHAIN_POLICY_SIGNER_INFO rgpSigner, void *pvPolicyArg) +{ + DWORD i; + CERT_CHAIN_POLICY_STATUS policyStatus = { sizeof(policyStatus), 0 }; + + for (i = 0; !policyStatus.dwError && i < cSigner; i++) + { + CERT_CHAIN_POLICY_PARA policyPara = { sizeof(policyPara), 0 }; + + if (dwRegPolicySettings & WTPF_IGNOREEXPIRATION) + policyPara.dwFlags |= + CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG | + CERT_CHAIN_POLICY_IGNORE_CTL_NOT_TIME_VALID_FLAG | + CERT_CHAIN_POLICY_IGNORE_NOT_TIME_NESTED_FLAG; + if (dwRegPolicySettings & WTPF_IGNOREREVOKATION) + policyPara.dwFlags |= + CERT_CHAIN_POLICY_IGNORE_END_REV_UNKNOWN_FLAG | + CERT_CHAIN_POLICY_IGNORE_CTL_SIGNER_REV_UNKNOWN_FLAG | + CERT_CHAIN_POLICY_IGNORE_CA_REV_UNKNOWN_FLAG | + CERT_CHAIN_POLICY_IGNORE_ROOT_REV_UNKNOWN_FLAG; + CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, + rgpSigner[i].pChainContext, &policyPara, &policyStatus); + } + return policyStatus.dwError; +} + +HRESULT WINAPI GenericChainFinalProv(CRYPT_PROVIDER_DATA *data) +{ + HRESULT err = NO_ERROR; /* not a typo, MS confused the types */ + WTD_GENERIC_CHAIN_POLICY_DATA *policyData = + (WTD_GENERIC_CHAIN_POLICY_DATA *)data->pWintrustData->pPolicyCallbackData; + + TRACE("(%p)\n", data); + + if (data->pWintrustData->dwUIChoice != WTD_UI_NONE) + FIXME("unimplemented for UI choice %d\n", + data->pWintrustData->dwUIChoice); + if (!data->csSigners) + err = TRUST_E_NOSIGNATURE; + else + { + PFN_WTD_GENERIC_CHAIN_POLICY_CALLBACK policyCallback; + void *policyArg; + WTD_GENERIC_CHAIN_POLICY_SIGNER_INFO *signers = NULL; + + if (policyData) + { + policyCallback = policyData->pfnPolicyCallback; + policyArg = policyData->pvPolicyArg; + } + else + { + policyCallback = WINTRUST_DefaultPolicy; + policyArg = NULL; + } + if (data->csSigners) + { + DWORD i; + + signers = data->psPfns->pfnAlloc( + data->csSigners * sizeof(WTD_GENERIC_CHAIN_POLICY_SIGNER_INFO)); + if (signers) + { + for (i = 0; i < data->csSigners; i++) + { + signers[i].u.cbSize = + sizeof(WTD_GENERIC_CHAIN_POLICY_SIGNER_INFO); + signers[i].pChainContext = + data->pasSigners[i].pChainContext; + signers[i].dwSignerType = data->pasSigners[i].dwSignerType; + signers[i].pMsgSignerInfo = data->pasSigners[i].psSigner; + signers[i].dwError = data->pasSigners[i].dwError; + if (data->pasSigners[i].csCounterSigners) + FIXME("unimplemented for counter signers\n"); + signers[i].cCounterSigner = 0; + signers[i].rgpCounterSigner = NULL; + } + } + else + err = ERROR_OUTOFMEMORY; + } + if (!err) + err = policyCallback(data, TRUSTERROR_STEP_FINAL_POLICYPROV, + data->dwRegPolicySettings, data->csSigners, signers, policyArg); + data->psPfns->pfnFree(signers); + } + if (err) + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_POLICYPROV] = err; + TRACE("returning %d (%08x)\n", !err ? S_OK : S_FALSE, + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_POLICYPROV]); + return err == NO_ERROR ? S_OK : S_FALSE; +} + HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *data) { DWORD i, j; diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index a5ee3d0..5629c3d 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -47,7 +47,7 @@ @ stub DriverInitializePolicy @ stub FindCertsByIssuer @ stdcall GenericChainCertificateTrust(ptr) -@ stub GenericChainFinalProv +@ stdcall GenericChainFinalProv(ptr) @ stub HTTPSCertificateTrust @ stub HTTPSFinalProv @ stub IsCatalogFile

1 0

Juan Lang : wintrust: Add traces.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: e69cf802e7d57662247b993e6eb486c4e473d373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e69cf802e7d57662247b993e6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 8 15:45:28 2007 -0700 wintrust: Add traces. --- dlls/wintrust/softpub.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index d9651ad..22e6a8c 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -637,6 +637,8 @@ HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) { BOOL ret; + TRACE("(%p)\n", data); + if (!data->csSigners) { ret = FALSE; @@ -657,6 +659,8 @@ HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) if (!ret) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = GetLastError(); + TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]); return ret ? S_OK : S_FALSE; } @@ -717,6 +721,8 @@ HRESULT WINAPI SoftpubAuthenticode(CRYPT_PROVIDER_DATA *data) BOOL ret; CERT_CHAIN_POLICY_STATUS policyStatus = { sizeof(policyStatus), 0 }; + TRACE("(%p)\n", data); + if (data->pWintrustData->dwUIChoice != WTD_UI_NONE) FIXME("unimplemented for UI choice %d\n", data->pWintrustData->dwUIChoice); @@ -758,6 +764,8 @@ HRESULT WINAPI SoftpubAuthenticode(CRYPT_PROVIDER_DATA *data) if (!ret) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_POLICYPROV] = policyStatus.dwError; + TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_POLICYPROV]); return ret ? S_OK : S_FALSE; }

1 0

Juan Lang : wintrust: Trace input to WinVerifyTrust.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: 7bff4e7141cf863f555bf9e18306da3935f439ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bff4e7141cf863f555bf9e18… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 8 15:34:27 2007 -0700 wintrust: Trace input to WinVerifyTrust. --- dlls/wintrust/wintrust_main.c | 110 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 110 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index aa51a98..faf837c 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -198,6 +198,115 @@ static LONG WINTRUST_PublishedSoftware(HWND hwnd, GUID *actionID, return WINTRUST_DefaultVerifyAndClose(hwnd, actionID, &wintrust_data); } +static void dump_file_info(WINTRUST_FILE_INFO *pFile) +{ + TRACE("%p\n", pFile); + if (pFile) + { + TRACE("cbStruct: %d\n", pFile->cbStruct); + TRACE("pcwszFilePath: %s\n", debugstr_w(pFile->pcwszFilePath)); + TRACE("hFile: %p\n", pFile->hFile); + TRACE("pgKnownSubject: %s\n", debugstr_guid(pFile->pgKnownSubject)); + } +} + +static void dump_catalog_info(WINTRUST_CATALOG_INFO *catalog) +{ + TRACE("%p\n", catalog); + if (catalog) + { + TRACE("cbStruct: %d\n", catalog->cbStruct); + TRACE("dwCatalogVersion: %d\n", catalog->dwCatalogVersion); + TRACE("pcwszCatalogFilePath: %s\n", + debugstr_w(catalog->pcwszCatalogFilePath)); + TRACE("pcwszMemberTag: %s\n", debugstr_w(catalog->pcwszMemberTag)); + TRACE("pcwszMemberFilePath: %s\n", + debugstr_w(catalog->pcwszMemberFilePath)); + TRACE("hMemberFile: %p\n", catalog->hMemberFile); + TRACE("pbCalculatedFileHash: %p\n", catalog->pbCalculatedFileHash); + TRACE("cbCalculatedFileHash: %d\n", catalog->cbCalculatedFileHash); + TRACE("pcCatalogContext: %p\n", catalog->pcCatalogContext); + } +} + +static void dump_blob_info(WINTRUST_BLOB_INFO *blob) +{ + TRACE("%p\n", blob); + if (blob) + { + TRACE("cbStruct: %d\n", blob->cbStruct); + TRACE("gSubject: %s\n", debugstr_guid(&blob->gSubject)); + TRACE("pcwszDisplayName: %s\n", debugstr_w(blob->pcwszDisplayName)); + TRACE("cbMemObject: %d\n", blob->cbMemObject); + TRACE("pbMemObject: %p\n", blob->pbMemObject); + TRACE("cbMemSignedMsg: %d\n", blob->cbMemSignedMsg); + TRACE("pbMemSignedMsg: %p\n", blob->pbMemSignedMsg); + } +} + +static void dump_sgnr_info(WINTRUST_SGNR_INFO *sgnr) +{ + TRACE("%p\n", sgnr); + if (sgnr) + { + TRACE("cbStruct: %d\n", sgnr->cbStruct); + TRACE("pcwszDisplayName: %s\n", debugstr_w(sgnr->pcwszDisplayName)); + TRACE("psSignerInfo: %p\n", sgnr->psSignerInfo); + TRACE("chStores: %d\n", sgnr->chStores); + } +} + +static void dump_cert_info(WINTRUST_CERT_INFO *cert) +{ + TRACE("%p\n", cert); + if (cert) + { + TRACE("cbStruct: %d\n", cert->cbStruct); + TRACE("pcwszDisplayName: %s\n", debugstr_w(cert->pcwszDisplayName)); + TRACE("psCertContext: %p\n", cert->psCertContext); + TRACE("chStores: %d\n", cert->chStores); + TRACE("dwFlags: %08x\n", cert->dwFlags); + TRACE("psftVerifyAsOf: %p\n", cert->psftVerifyAsOf); + } +} + +static void dump_wintrust_data(WINTRUST_DATA *data) +{ + TRACE("%p\n", data); + if (data) + { + TRACE("cbStruct: %d\n", data->cbStruct); + TRACE("pPolicyCallbackData: %p\n", data->pPolicyCallbackData); + TRACE("pSIPClientData: %p\n", data->pSIPClientData); + TRACE("dwUIChoice: %d\n", data->dwUIChoice); + TRACE("fdwRevocationChecks: %08x\n", data->fdwRevocationChecks); + TRACE("dwUnionChoice: %d\n", data->dwUnionChoice); + switch (data->dwUnionChoice) + { + case WTD_CHOICE_FILE: + dump_file_info(data->u.pFile); + break; + case WTD_CHOICE_CATALOG: + dump_catalog_info(data->u.pCatalog); + break; + case WTD_CHOICE_BLOB: + dump_blob_info(data->u.pBlob); + break; + case WTD_CHOICE_SIGNER: + dump_sgnr_info(data->u.pSgnr); + break; + case WTD_CHOICE_CERT: + dump_cert_info(data->u.pCert); + break; + } + TRACE("dwStateAction: %d\n", data->dwStateAction); + TRACE("hWVTStateData: %p\n", data->hWVTStateData); + TRACE("pwszURLReference: %s\n", debugstr_w(data->pwszURLReference)); + TRACE("dwProvFlags: %08x\n", data->dwProvFlags); + TRACE("dwUIContext: %d\n", data->dwUIContext); + } +} + /*********************************************************************** * WinVerifyTrust (WINTRUST.@) * @@ -227,6 +336,7 @@ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) WINTRUST_DATA *actionData = (WINTRUST_DATA *)ActionData; TRACE("(%p, %s, %p)\n", hwnd, debugstr_guid(ActionID), ActionData); + dump_wintrust_data(ActionData); /* Support for known old-style callers: */ if (IsEqualGUID(ActionID, &published_software))

1 0

Juan Lang : wintrust: Add a helper function to create a chain for a signer.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: cab0c5a5536a7768d8cf8d70ab89f144b138eef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab0c5a5536a7768d8cf8d70a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 8 15:35:17 2007 -0700 wintrust: Add a helper function to create a chain for a signer. --- dlls/wintrust/softpub.c | 67 ++++++++++++++++++++++++++-------------------- 1 files changed, 38 insertions(+), 29 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index bd55d84..bbbd227 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -597,6 +597,42 @@ static void WINTRUST_CreateChainPolicyCreateInfo( info->pvReserved = NULL; } +static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, + DWORD signer, PWTD_GENERIC_CHAIN_POLICY_CREATE_INFO createInfo, + PCERT_CHAIN_PARA chainPara) +{ + BOOL ret = TRUE; + + /* Expect the end certificate for each signer to be the only cert in the + * chain: + */ + if (data->pasSigners[signer].csCertChain) + { + /* 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, + chainPara, createInfo->dwFlags, createInfo->pvReserved, + &data->pasSigners[signer].pChainContext); + if (ret) + { + if (data->pasSigners[signer].pChainContext->cChain != 1) + { + FIXME("unimplemented for more than 1 simple chain\n"); + ret = FALSE; + } + else + { + if ((ret = WINTRUST_CopyChain(data, signer))) + ret = data->psPfns->pfnCertCheckPolicy(data, signer, FALSE, + 0); + } + } + } + return ret; +} + HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) { BOOL ret; @@ -615,35 +651,8 @@ HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) WINTRUST_CreateChainPolicyCreateInfo(data, &createInfo, &chainPara); ret = TRUE; for (i = 0; i < data->csSigners; i++) - { - /* Expect the end certificate for each signer to be the only - * cert in the chain: - */ - if (data->pasSigners[i].csCertChain) - { - /* Create a certificate chain for each signer */ - ret = CertGetCertificateChain(createInfo.hChainEngine, - data->pasSigners[i].pasCertChain[0].pCert, - &data->pasSigners[i].sftVerifyAsOf, - data->chStores ? data->pahStores[0] : NULL, - &chainPara, createInfo.dwFlags, createInfo.pvReserved, - &data->pasSigners[i].pChainContext); - if (ret) - { - if (data->pasSigners[i].pChainContext->cChain != 1) - { - FIXME("unimplemented for more than 1 simple chain\n"); - ret = FALSE; - } - else - { - if ((ret = WINTRUST_CopyChain(data, i))) - ret = data->psPfns->pfnCertCheckPolicy(data, i, - FALSE, 0); - } - } - } - } + ret = WINTRUST_CreateChainForSigner(data, i, &createInfo, + &chainPara); } if (!ret) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] =

1 0

Juan Lang : wintrust: Add a helper function to initialize chain creation parameters.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: 1a88c8bccbc70f8c28a42b2acf3786f4d1af339b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a88c8bccbc70f8c28a42b2ac… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 8 15:34:54 2007 -0700 wintrust: Add a helper function to initialize chain creation parameters. --- dlls/wintrust/softpub.c | 45 +++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 87e5209..bd55d84 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "wintrust.h" #include "mssip.h" +#include "softpub.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wintrust); @@ -574,6 +575,28 @@ static BOOL WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) return ret; } +static void WINTRUST_CreateChainPolicyCreateInfo( + const CRYPT_PROVIDER_DATA *data, PWTD_GENERIC_CHAIN_POLICY_CREATE_INFO info, + PCERT_CHAIN_PARA chainPara) +{ + chainPara->cbSize = sizeof(CERT_CHAIN_PARA); + if (data->pRequestUsage) + memcpy(&chainPara->RequestedUsage, data->pRequestUsage, + sizeof(CERT_USAGE_MATCH)); + info->u.cbSize = sizeof(WTD_GENERIC_CHAIN_POLICY_CREATE_INFO); + info->hChainEngine = NULL; + info->pChainPara = chainPara; + if (data->dwProvFlags & CPD_REVOCATION_CHECK_END_CERT) + info->dwFlags = CERT_CHAIN_REVOCATION_CHECK_END_CERT; + else if (data->dwProvFlags & CPD_REVOCATION_CHECK_CHAIN) + info->dwFlags = CERT_CHAIN_REVOCATION_CHECK_CHAIN; + else if (data->dwProvFlags & CPD_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT) + info->dwFlags = CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT; + else + info->dwFlags = 0; + info->pvReserved = NULL; +} + HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) { BOOL ret; @@ -586,35 +609,25 @@ HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) else { DWORD i; + WTD_GENERIC_CHAIN_POLICY_CREATE_INFO createInfo; + CERT_CHAIN_PARA chainPara; + WINTRUST_CreateChainPolicyCreateInfo(data, &createInfo, &chainPara); ret = TRUE; for (i = 0; i < data->csSigners; i++) { - CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; - DWORD flags; - - if (data->pRequestUsage) - memcpy(&chainPara.RequestedUsage, data->pRequestUsage, - sizeof(CERT_USAGE_MATCH)); - if (data->dwProvFlags & CPD_REVOCATION_CHECK_END_CERT) - flags = CERT_CHAIN_REVOCATION_CHECK_END_CERT; - else if (data->dwProvFlags & CPD_REVOCATION_CHECK_CHAIN) - flags = CERT_CHAIN_REVOCATION_CHECK_CHAIN; - else if (data->dwProvFlags & CPD_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT) - flags = CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT; - else - flags = 0; /* Expect the end certificate for each signer to be the only * cert in the chain: */ if (data->pasSigners[i].csCertChain) { /* Create a certificate chain for each signer */ - ret = CertGetCertificateChain(NULL, + ret = CertGetCertificateChain(createInfo.hChainEngine, data->pasSigners[i].pasCertChain[0].pCert, &data->pasSigners[i].sftVerifyAsOf, data->chStores ? data->pahStores[0] : NULL, - &chainPara, flags, NULL, &data->pasSigners[i].pChainContext); + &chainPara, createInfo.dwFlags, createInfo.pvReserved, + &data->pasSigners[i].pChainContext); if (ret) { if (data->pasSigners[i].pChainContext->cChain != 1)

1 0

Juan Lang : softpub.h: Add missing definitions.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: e4aa2a547727fd5d5b2a42d7a24d18247f6e8a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4aa2a547727fd5d5b2a42d7a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 8 15:33:59 2007 -0700 softpub.h: Add missing definitions. --- include/softpub.h | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/include/softpub.h b/include/softpub.h index 14bcec7..4640399 100644 --- a/include/softpub.h +++ b/include/softpub.h @@ -52,6 +52,49 @@ static const WCHAR GENERIC_CHAIN_CERTTRUST_FUNCTION[] = {'G','e','n','e','r','i','c','C','h','a','i','n','C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t', 0}; #endif +typedef struct _WTD_GENERIC_CHAIN_POLICY_SIGNER_INFO +{ + union { + DWORD cbStruct; + DWORD cbSize; + } DUMMYUNIONNAME; + PCCERT_CHAIN_CONTEXT pChainContext; + DWORD dwSignerType; + PCMSG_SIGNER_INFO pMsgSignerInfo; + DWORD dwError; + DWORD cCounterSigner; + struct _WTD_GENERIC_CHAIN_POLICY_SIGNER_INFO *rgpCounterSigner; +} WTD_GENERIC_CHAIN_POLICY_SIGNER_INFO, *PWTD_GENERIC_CHAIN_POLICY_SIGNER_INFO; + +typedef HRESULT (WINAPI *PFN_WTD_GENERIC_CHAIN_POLICY_CALLBACK)( + PCRYPT_PROVIDER_DATA pProvData, DWORD dwStepError, DWORD dwRegPolicySettings, + DWORD cSigner, PWTD_GENERIC_CHAIN_POLICY_SIGNER_INFO rgpSigner, + void *pvPolicyArg); + +typedef struct _WTD_GENERIC_CHAIN_POLICY_CREATE_INFO +{ + union { + DWORD cbStruct; + DWORD cbSize; + } DUMMYUNIONNAME; + HCERTCHAINENGINE hChainEngine; + PCERT_CHAIN_PARA pChainPara; + DWORD dwFlags; + void *pvReserved; +} WTD_GENERIC_CHAIN_POLICY_CREATE_INFO, *PWTD_GENERIC_CHAIN_POLICY_CREATE_INFO; + +typedef struct _WTD_GENERIC_CHAIN_POLICY_DATA +{ + union { + DWORD cbStruct; + DWORD cbSize; + } DUMMYUNIONNAME; + PWTD_GENERIC_CHAIN_POLICY_CREATE_INFO pSignerChainInfo; + PWTD_GENERIC_CHAIN_POLICY_CREATE_INFO pCounterSignerChainInfo; + PFN_WTD_GENERIC_CHAIN_POLICY_CALLBACK pfnPolicyCallback; + void *pvPolicyArg; +} WTD_GENERIC_CHAIN_POLICY_DATA, *PWTD_GENERIC_CHAIN_POLICY_DATA; + #if defined(__GNUC__) #define SP_POLICY_PROVIDER_DLL_NAME (const WCHAR []) \ {'W','I','N','T','R','U','S','T','.','D','L','L' ,0} @@ -177,4 +220,26 @@ static const WCHAR DRIVER_CLEANUPPOLICY_FUNCTION[] = {'D','r','i','v','e','r','C','l','e','a','n','u','p','P','o','l','i','c','y', 0}; #endif +typedef struct DRIVER_VER_MAJORMINOR_ +{ + DWORD dwMajor; + DWORD dwMinor; +} DRIVER_VER_MAJORMINOR; + +typedef struct DRIVER_VER_INFO_ +{ + DWORD cbStruct; + ULONG_PTR dwReserved1; + ULONG_PTR dwReserved2; + DWORD dwPlatform; + DWORD dwVersion; + WCHAR wszVersion[MAX_PATH]; + WCHAR wszSignedBy[MAX_PATH]; + PCCERT_CONTEXT pcSignerCertContext; + DRIVER_VER_MAJORMINOR sOSVersionLow; + DRIVER_VER_MAJORMINOR sOSVersionHigh; + DWORD dwBuildNumberLow; + DWORD dwBuildNumberHigh; +} DRIVER_VER_INFO, *PDRIVER_VER_INFO; + #endif /* __WINE_SOFTPUB_H */

1 0

Jacek Caban : mshtml: Fixed tests on IE7.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: 0ea075477123607ff4c82095f768ab8639682d71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea075477123607ff4c82095f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 7 17:11:58 2007 +0200 mshtml: Fixed tests on IE7. --- dlls/mshtml/tests/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 3127841..62c7e37 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -69,7 +69,7 @@ static void test_HTMLLoadOptions(void) memset(buf, 0xdd, sizeof(buf)); hres = IHtmlLoadOptions_QueryOption(loadopts, HTMLLOADOPTION_CODEPAGE, buf, &size); ok(hres == E_FAIL, "QueryOption failed: %08x\n", hres); - ok(size == sizeof(data), "size = %d\n", size); + ok(size == sizeof(data) || !size, "size = %d\n", size); ok(buf[0] == 0xdd, "buf changed\n"); data = 100;

1 0

Jacek Caban : mshtml: Move init_nsevents call from start_binding to read_stream_data to avoid race .
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: 9a9de4d65b9dda6c0a788e7255da5e368e56a0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a9de4d65b9dda6c0a788e725… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 9 01:21:41 2007 +0200 mshtml: Move init_nsevents call from start_binding to read_stream_data to avoid race. --- dlls/mshtml/navigate.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 014fcdb..659ba22 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -220,6 +220,10 @@ static HRESULT read_stream_data(BSCallback *This, IStream *stream) (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); if(NS_FAILED(nsres)) FIXME("OnStartRequest failed: %08x\n", nsres); + + /* events are reset when a new document URI is loaded, so re-initialise them here */ + if(This->doc && This->doc->nscontainer) + init_nsevents(This->doc->nscontainer); } This->readed += This->nsstream->buf_size; @@ -819,10 +823,6 @@ HRESULT start_binding(BSCallback *bscallback) IMoniker_Release(bscallback->mon); bscallback->mon = NULL; - /* events are reset when a new document URI is loaded, so re-initialise them here */ - if(bscallback->doc && bscallback->doc->nscontainer) - init_nsevents(bscallback->doc->nscontainer); - return S_OK; }

1 0

James Hawkins : user32: Set client_pid to zero before initializing dde.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: c26a745444673d6caae958db235323911fbad690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c26a745444673d6caae958db2… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Oct 8 04:04:48 2007 -0500 user32: Set client_pid to zero before initializing dde. --- dlls/user32/tests/dde.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 0c7adba..1dd0cda 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -507,6 +507,7 @@ static void test_ddeml_client(void) DWORD client_pid; HCONV conversation; + client_pid = 0; ret = DdeInitializeA(&client_pid, client_ddeml_callback, APPCMD_CLIENTONLY, 0); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret);

1 0

James Hawkins : user32: Move the test_ddeml_client function closer to the other ddeml client test functions .
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: 3349afdbc06cae8d1ba70433c2928d46f4a7fcaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3349afdbc06cae8d1ba70433c… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Oct 8 04:06:08 2007 -0500 user32: Move the test_ddeml_client function closer to the other ddeml client test functions. --- dlls/user32/tests/dde.c | 524 +++++++++++++++++++++++----------------------- 1 files changed, 262 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3349afdbc06cae8d1ba70…

1 0