August 2007 - Wine-commits - list.winehq.org

Juan Lang : wintrust: Test and implement pfnAddCert2Chain.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: 4f2fae1d991b08d2150709c3b16ef8fec50b7e2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2fae1d991b08d2150709c3b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 16:09:10 2007 -0700 wintrust: Test and implement pfnAddCert2Chain. --- dlls/wintrust/register.c | 2 +- dlls/wintrust/tests/softpub.c | 28 ++++++++++++++++++++++++++++ dlls/wintrust/wintrust_main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust_priv.h | 2 ++ 4 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 9b97d9c..a3e18e0 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -838,7 +838,7 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, pPfns->pfnFree = WINTRUST_Free; pPfns->pfnAddStore2Chain = WINTRUST_AddStore; pPfns->pfnAddSgnr2Chain = WINTRUST_AddSgnr; - pPfns->pfnAddCert2Chain = NULL; + pPfns->pfnAddCert2Chain = WINTRUST_AddCert; pPfns->pfnAddPrivData2Chain = NULL; pPfns->psUIpfns = NULL; pPfns->pfnInitialize = (PFN_PROVIDER_INIT_CALL)WINTRUST_ReadProviderFromReg(GuidString, Initialization); diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index b1ca23a..fa58477 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -130,6 +130,8 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) ok(data.pasSigners != NULL, "Expected pasSigners to be allocated\n"); if (data.pasSigners) { + PCCERT_CONTEXT cert; + ok(!memcmp(&data.pasSigners[0], &sgnr, sizeof(sgnr)), "Unexpected data in signer\n"); /* Adds into the location specified by the index */ @@ -156,6 +158,32 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Crash + ret = funcs->pfnAddCert2Chain(NULL, 0, FALSE, 0, NULL); + ret = funcs->pfnAddCert2Chain(&data, 0, FALSE, 0, NULL); + */ + cert = CertCreateCertificateContext(X509_ASN_ENCODING, v1CertWithPubKey, + sizeof(v1CertWithPubKey)); + if (cert) + { + /* Notes on behavior that are hard to test: + * 1. If pasSigners is invalid, pfnAddCert2Chain crashes + * 2. An invalid signer index isn't checked. + */ + ret = funcs->pfnAddCert2Chain(&data, 0, FALSE, 0, cert); + ok(ret, "pfnAddCert2Chain failed: %08x\n", GetLastError()); + ok(data.pasSigners[0].csCertChain == 1, "Expected 1 cert, got %d\n", + data.pasSigners[0].csCertChain); + ok(data.pasSigners[0].pasCertChain != NULL, + "Expected pasCertChain to be allocated\n"); + if (data.pasSigners[0].pasCertChain) + ok(data.pasSigners[0].pasCertChain[0].pCert == cert, + "Unexpected cert\n"); + CertFreeCertificateContext(cert); + } + else + skip("CertCreateCertificateContext failed: %08x\n", GetLastError()); } } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 0f6dcd6..d6134b7 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -303,3 +303,40 @@ BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, SetLastError(ERROR_OUTOFMEMORY); return ret; } + +BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, + BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add) +{ + BOOL ret = FALSE; + + if (fCounterSigner) + { + FIXME("unimplemented for counter signers\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (data->pasSigners[idxSigner].csCertChain) + data->pasSigners[idxSigner].pasCertChain = + WINTRUST_ReAlloc(data->pasSigners[idxSigner].pasCertChain, + (data->pasSigners[idxSigner].csCertChain + 1) * + sizeof(CRYPT_PROVIDER_CERT)); + else + { + data->pasSigners[idxSigner].pasCertChain = + WINTRUST_Alloc(sizeof(CRYPT_PROVIDER_CERT)); + data->pasSigners[idxSigner].csCertChain = 0; + } + if (data->pasSigners[idxSigner].pasCertChain) + { + CRYPT_PROVIDER_CERT *cert = &data->pasSigners[idxSigner].pasCertChain[ + data->pasSigners[idxSigner].csCertChain]; + + cert->cbStruct = sizeof(CRYPT_PROVIDER_CERT); + cert->pCert = CertDuplicateCertificateContext(pCert2Add); + data->pasSigners[idxSigner].csCertChain++; + ret = TRUE; + } + else + SetLastError(ERROR_OUTOFMEMORY); + return ret; +} diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index 75b0438..4519bd9 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -24,5 +24,7 @@ void WINAPI WINTRUST_Free(void *p); BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store); BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr); +BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, + BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add); #endif /* ndef __WINTRUST_PRIV_H__ */

1 0

Juan Lang : wintrust: Use pfnAddStore2Chain internally.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: a4d85d80a37967a57df85ee9b9d8be8a6fbb4e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d85d80a37967a57df85ee9b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 16:09:34 2007 -0700 wintrust: Use pfnAddStore2Chain internally. --- dlls/wintrust/softpub.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 4c8d356..4b6b33a 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -168,16 +168,8 @@ static BOOL SOFTPUB_CreateStoreFromMessage(CRYPT_PROVIDER_DATA *data) data->hProv, CERT_STORE_NO_CRYPT_RELEASE_FLAG, data->hMsg); if (store) { - data->pahStores = data->psPfns->pfnAlloc(sizeof(HCERTSTORE)); - if (data->pahStores) - { - data->chStores = 1; - data->pahStores[0] = CertDuplicateStore(store); - CertCloseStore(store, 0); - ret = TRUE; - } - else - SetLastError(ERROR_OUTOFMEMORY); + ret = data->psPfns->pfnAddStore2Chain(data, store); + CertCloseStore(store, 0); } TRACE("returning %d\n", ret); return ret;

1 0

Juan Lang : wintrust: Use a helper function to get a signer' s cert info from a message.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: fb07a3aa02cfb3329bce4a08b7d4e8f45e93bbe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb07a3aa02cfb3329bce4a08b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 16:10:00 2007 -0700 wintrust: Use a helper function to get a signer's cert info from a message. --- dlls/wintrust/softpub.c | 74 ++++++++++++++++++++++++++++------------------- 1 files changed, 44 insertions(+), 30 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 4b6b33a..caab601 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -292,6 +292,34 @@ error: return ret ? S_OK : S_FALSE; } +static CERT_INFO *WINTRUST_GetSignerCertInfo(CRYPT_PROVIDER_DATA *data, + DWORD signerIdx) +{ + BOOL ret; + CERT_INFO *certInfo = NULL; + DWORD size; + + ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_CERT_INFO_PARAM, signerIdx, + NULL, &size); + if (ret) + { + certInfo = data->psPfns->pfnAlloc(size); + if (certInfo) + { + ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_CERT_INFO_PARAM, + signerIdx, certInfo, &size); + if (!ret) + { + data->psPfns->pfnFree(certInfo); + certInfo = NULL; + } + } + else + SetLastError(ERROR_OUTOFMEMORY); + } + return certInfo; +} + HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) { BOOL ret; @@ -311,45 +339,31 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) for (i = 0; ret && i < signerCount; i++) { - ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_CERT_INFO_PARAM, - i, NULL, &size); - if (ret) + CERT_INFO *certInfo = WINTRUST_GetSignerCertInfo(data, i); + + if (certInfo) { - CERT_INFO *certInfo = data->psPfns->pfnAlloc(size); + CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA para = { sizeof(para), 0, i, + CMSG_VERIFY_SIGNER_CERT, NULL }; - if (certInfo) + para.pvSigner = (LPVOID)CertGetSubjectCertificateFromStore( + data->pahStores[0], data->dwEncoding, certInfo); + if (para.pvSigner) { - ret = CryptMsgGetParam(data->hMsg, - CMSG_SIGNER_CERT_INFO_PARAM, i, certInfo, &size); - if (ret) - { - CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA para = { - sizeof(para), 0, i, CMSG_VERIFY_SIGNER_CERT, NULL }; - - para.pvSigner = - (LPVOID)CertGetSubjectCertificateFromStore( - data->pahStores[0], data->dwEncoding, certInfo); - if (para.pvSigner) - { - ret = CryptMsgControl(data->hMsg, 0, - CMSG_CTRL_VERIFY_SIGNATURE_EX, &para); - if (!ret) - SetLastError(TRUST_E_CERT_SIGNATURE); - } - else - { - SetLastError(TRUST_E_NO_SIGNER_CERT); - ret = FALSE; - } - } - data->psPfns->pfnFree(certInfo); + ret = CryptMsgControl(data->hMsg, 0, + CMSG_CTRL_VERIFY_SIGNATURE_EX, &para); + if (!ret) + SetLastError(TRUST_E_CERT_SIGNATURE); } else { - SetLastError(ERROR_OUTOFMEMORY); + SetLastError(TRUST_E_NO_SIGNER_CERT); ret = FALSE; } + data->psPfns->pfnFree(certInfo); } + else + ret = FALSE; } } else

1 0

Juan Lang : wintrust: Save signers of a message in SoftpubLoadSignature.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: 5d7bffa5c7117dbdd3849b3141c69445cc8cf08c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7bffa5c7117dbdd3849b314… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 16:10:41 2007 -0700 wintrust: Save signers of a message in SoftpubLoadSignature. --- dlls/wintrust/softpub.c | 103 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 78 insertions(+), 25 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index caab601..b7c6d5d 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -292,6 +292,51 @@ error: return ret ? S_OK : S_FALSE; } +static CMSG_SIGNER_INFO *WINTRUST_GetSigner(CRYPT_PROVIDER_DATA *data, + DWORD signerIdx) +{ + BOOL ret; + CMSG_SIGNER_INFO *signerInfo = NULL; + DWORD size; + + ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_INFO_PARAM, signerIdx, + NULL, &size); + if (ret) + { + signerInfo = data->psPfns->pfnAlloc(size); + if (signerInfo) + { + ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_INFO_PARAM, + signerIdx, signerInfo, &size); + if (!ret) + { + data->psPfns->pfnFree(signerInfo); + signerInfo = NULL; + } + } + else + SetLastError(ERROR_OUTOFMEMORY); + } + return signerInfo; +} + +static BOOL WINTRUST_SaveSigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) +{ + BOOL ret; + CMSG_SIGNER_INFO *signerInfo = WINTRUST_GetSigner(data, signerIdx); + + if (signerInfo) + { + CRYPT_PROVIDER_SGNR sgnr = { sizeof(sgnr), { 0 } }; + + sgnr.psSigner = signerInfo; + ret = data->psPfns->pfnAddSgnr2Chain(data, FALSE, signerIdx, &sgnr); + } + else + ret = FALSE; + return ret; +} + static CERT_INFO *WINTRUST_GetSignerCertInfo(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) { @@ -320,6 +365,37 @@ static CERT_INFO *WINTRUST_GetSignerCertInfo(CRYPT_PROVIDER_DATA *data, return certInfo; } +static BOOL WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) +{ + BOOL ret; + CERT_INFO *certInfo = WINTRUST_GetSignerCertInfo(data, signerIdx); + + if (certInfo) + { + CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA para = { sizeof(para), 0, signerIdx, + CMSG_VERIFY_SIGNER_CERT, NULL }; + + para.pvSigner = (LPVOID)CertGetSubjectCertificateFromStore( + data->pahStores[0], data->dwEncoding, certInfo); + if (para.pvSigner) + { + ret = CryptMsgControl(data->hMsg, 0, CMSG_CTRL_VERIFY_SIGNATURE_EX, + &para); + if (!ret) + SetLastError(TRUST_E_CERT_SIGNATURE); + } + else + { + SetLastError(TRUST_E_NO_SIGNER_CERT); + ret = FALSE; + } + data->psPfns->pfnFree(certInfo); + } + else + ret = FALSE; + return ret; +} + HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) { BOOL ret; @@ -339,31 +415,8 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) for (i = 0; ret && i < signerCount; i++) { - CERT_INFO *certInfo = WINTRUST_GetSignerCertInfo(data, i); - - if (certInfo) - { - CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA para = { sizeof(para), 0, i, - CMSG_VERIFY_SIGNER_CERT, NULL }; - - para.pvSigner = (LPVOID)CertGetSubjectCertificateFromStore( - data->pahStores[0], data->dwEncoding, certInfo); - if (para.pvSigner) - { - ret = CryptMsgControl(data->hMsg, 0, - CMSG_CTRL_VERIFY_SIGNATURE_EX, &para); - if (!ret) - SetLastError(TRUST_E_CERT_SIGNATURE); - } - else - { - SetLastError(TRUST_E_NO_SIGNER_CERT); - ret = FALSE; - } - data->psPfns->pfnFree(certInfo); - } - else - ret = FALSE; + if ((ret = WINTRUST_SaveSigner(data, i))) + ret = WINTRUST_VerifySigner(data, i); } } else

1 0

Juan Lang : wintrust: Implement pfnCertificateTrust.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: b157166345693d9b4b6eceafd6edaa79c3512381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b157166345693d9b4b6eceafd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 16:11:14 2007 -0700 wintrust: Implement pfnCertificateTrust. --- dlls/wintrust/softpub.c | 140 +++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/tests/softpub.c | 92 +++++++++++++++++++++++++++ dlls/wintrust/wintrust.spec | 4 +- 3 files changed, 234 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b157166345693d9b4b6ec…

1 0

Juan Lang : crypt32: Set trust status on root element in chain.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: eda48d8868065d2d7debafa79ba25fd8e1d8bc59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda48d8868065d2d7debafa79… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 15:52:37 2007 -0700 crypt32: Set trust status on root element in chain. --- dlls/crypt32/chain.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 161ba29..2b00ff0 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -340,20 +340,25 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, } if (ret) { - PCCERT_CONTEXT root = chain->rgpElement[chain->cElement - 1]-> - pCertContext; + PCERT_CHAIN_ELEMENT rootElement = + chain->rgpElement[chain->cElement - 1]; + PCCERT_CONTEXT root = rootElement->pCertContext; if (!(ret = CRYPT_IsCertificateSelfSigned(root))) TRACE("Last certificate is not self-signed\n"); else { - chain->rgpElement[chain->cElement - 1]->TrustStatus.dwInfoStatus - |= CERT_TRUST_IS_SELF_SIGNED; + rootElement->TrustStatus.dwInfoStatus |= + CERT_TRUST_IS_SELF_SIGNED; if (!(ret = CryptVerifyCertificateSignatureEx(0, root->dwCertEncodingType, CRYPT_VERIFY_CERT_SIGN_SUBJECT_CERT, (void *)root, CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, (void *)root, 0, NULL))) + { TRACE("Last certificate's signature is invalid\n"); + rootElement->TrustStatus.dwErrorStatus |= + CERT_TRUST_IS_NOT_SIGNATURE_VALID; + } } if (ret) { @@ -367,11 +372,15 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, trustedRoot = CertFindCertificateInStore(engine->hRoot, root->dwCertEncodingType, 0, CERT_FIND_SHA1_HASH, &blob, NULL); if (!trustedRoot) - chain->TrustStatus.dwErrorStatus |= + rootElement->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_UNTRUSTED_ROOT; else CertFreeCertificateContext(trustedRoot); } + chain->TrustStatus.dwErrorStatus |= + rootElement->TrustStatus.dwErrorStatus; + chain->TrustStatus.dwInfoStatus |= + rootElement->TrustStatus.dwInfoStatus & ~CERT_TRUST_IS_SELF_SIGNED; } if (!ret) {

1 0

Juan Lang : wintrust: Add missing definitions.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: 3db50276ab66c87ea9e8ab8548dcc5f06d6afe3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db50276ab66c87ea9e8ab854… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 15:52:55 2007 -0700 wintrust: Add missing definitions. --- include/wintrust.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/include/wintrust.h b/include/wintrust.h index 3290e31..fa8870f 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -136,6 +136,7 @@ typedef struct _WINTRUST_DATA #define WTD_HASH_ONLY_FLAG 0x00000200 #define WTD_USE_DEFAULT_OSVER_CHECK 0x00000400 #define WTD_LIFETIME_SIGNING_FLAG 0x00000800 +#define WTD_CACHE_ONLY_URL_RETRIEVAL 0x00001000 #define WTD_UICONTEXT_EXECUTE 0 #define WTD_UICONTEXT_INSTALL 1 @@ -199,6 +200,13 @@ typedef struct _CRYPT_PROVIDER_CERT { PCERT_CHAIN_ELEMENT pChainElement; } CRYPT_PROVIDER_CERT, *PCRYPT_PROVIDER_CERT; +#define CERT_CONFIDENCE_SIG 0x10000000 +#define CERT_CONFIDENCE_TIME 0x01000000 +#define CERT_CONFIDENCE_TIMENEST 0x00100000 +#define CERT_CONFIDENCE_AUTHIDEXT 0x00010000 +#define CERT_CONFIDENCE_HYGIENE 0x00001000 +#define CERT_CONFIDENCE_HIGHEST 0x11111000 + typedef struct _CRYPT_PROVIDER_SGNR { DWORD cbStruct; FILETIME sftVerifyAsOf; @@ -212,6 +220,8 @@ typedef struct _CRYPT_PROVIDER_SGNR { PCCERT_CHAIN_CONTEXT pChainContext; } CRYPT_PROVIDER_SGNR, *PCRYPT_PROVIDER_SGNR; +#define SGNR_TYPE_TIMESTAMP 0x00000010 + typedef struct _CRYPT_PROVIDER_PRIVDATA { DWORD cbStruct; GUID gProviderID; @@ -346,6 +356,19 @@ typedef struct _CRYPT_PROVIDER_DATA { DWORD dwUIStateFlags; } CRYPT_PROVIDER_DATA, *PCRYPT_PROVIDER_DATA; +#define CPD_CHOICE_SIP 1 + +#define CPD_USE_NT5_CHAIN_FLAG 0x80000000 +#define CPD_REVOCATION_CHECK_NONE 0x00010000 +#define CPD_REVOCATION_CHECK_END_CERT 0x00020000 +#define CPD_REVOCATION_CHECK_CHAIN 0x00040000 +#define CPD_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT 0x00080000 + +#define CPD_UISTATE_MODE_PROMPT 0x00000000 +#define CPD_UISTATE_MODE_BLOCK 0x00000001 +#define CPD_UISTATE_MODE_ALLOW 0x00000002 +#define CPD_UISTATE_MODE_MASK 0x00000003 + typedef BOOL (*PFN_PROVUI_CALL)(HWND hWndSecurityDialog, struct _CRYPT_PROVIDER_DATA *pProvData); @@ -552,6 +575,36 @@ typedef struct _WIN_CERTIFICATE { #define WIN_CERT_TYPE_RESERVED_1 0x0003 /* Reserved */ #define WIN_CERT_TYPE_TS_STACK_SIGNED 0x0004 +typedef LPVOID WIN_TRUST_SUBJECT; + +typedef struct _WIN_TRUST_ACTDATA_CONTEXT_WITH_SUBJECT +{ + HANDLE hClientToken; + GUID *SubjectType; + WIN_TRUST_SUBJECT Subject; +} WIN_TRUST_ACTDATA_CONTEXT_WITH_SUBJECT, + *LPWIN_TRUST_ACTDATA_CONTEXT_WITH_SUBJECT; + +typedef struct _WIN_TRUST_ACTDATA_CONTEXT_SUBJECT_ONLY +{ + GUID *SubjectType; + WIN_TRUST_SUBJECT Subject; +} WIN_TRUST_ACTDATA_CONTEXT_SUBJECT_ONLY, + *LPWIN_TRUST_ACTDATA_CONTEXT_SUBJECT_ONLY; + +typedef struct _WIN_TRUST_SUBJECT_FILE +{ + HANDLE hFile; + LPCWSTR lpPath; +} WIN_TRUST_SUBJECT_FILE, *LPWIN_TRUST_SUBJECT_FILE; + +typedef struct _WIN_TRUST_SUBJECT_FILE_AND_DISPLAY +{ + HANDLE hFile; + LPCWSTR lpPath; + LPCWSTR lpDisplayName; +} WIN_TRUST_SUBJECT_FILE_AND_DISPLAY, *LPWIN_TRUST_SUBJECT_FILE_AND_DISPLAY; + #define WIN_SPUB_ACTION_PUBLISHED_SOFTWARE \ { 0x64b9d180, 0x8da2, 0x11cf, { 0x87,0x36,0x00,0xaa,0x00,0xa4,0x85,0xeb }}

1 0

Stefan Leichter : dswave: Remove 'recursive registry key delete' function.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: 411f5f7957bf35ce6f12bcbc607e7c6fd241c064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=411f5f7957bf35ce6f12bcbc6… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Aug 28 20:59:41 2007 +0200 dswave: Remove 'recursive registry key delete' function. --- dlls/dswave/regsvr.c | 77 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 69 deletions(-) diff --git a/dlls/dswave/regsvr.c b/dlls/dswave/regsvr.c index be95519..d88e4b8 100644 --- a/dlls/dswave/regsvr.c +++ b/dlls/dswave/regsvr.c @@ -101,9 +101,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -190,7 +187,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) { WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -295,16 +293,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) { WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -411,68 +412,6 @@ error_close_progid_key: RegCloseKey(progid_key); return res; } - -/*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) { - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - /*********************************************************************** * coclass list */

1 0

Stefan Leichter : dsound: Remove 'recursive registry key delete' function.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: 6357676c54cbd858dac255a4771242cb0e4ede67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6357676c54cbd858dac255a47… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Aug 28 21:04:47 2007 +0200 dsound: Remove 'recursive registry key delete' function. --- dlls/dsound/regsvr.c | 79 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 71 deletions(-) diff --git a/dlls/dsound/regsvr.c b/dlls/dsound/regsvr.c index edea8f8..2549043 100644 --- a/dlls/dsound/regsvr.c +++ b/dlls/dsound/regsvr.c @@ -115,9 +115,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -206,7 +203,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -313,16 +311,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -435,70 +436,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static GUID const CLSID_DirectSoundBufferConfig = {

1 0

Roderick Colenbrander : wined3d: CreateAdditionalSwapChain bugfix.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: dc7252a1f839c52b1c40702a30982d3c0aa0a240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc7252a1f839c52b1c40702a3… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Aug 28 22:37:37 2007 +0200 wined3d: CreateAdditionalSwapChain bugfix. --- dlls/wined3d/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4544bf8..044e2af 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1361,7 +1361,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic if (pPresentationParameters->Windowed && ((pPresentationParameters->BackBufferWidth == 0) || - (pPresentationParameters->BackBufferHeight == 0))) { + (pPresentationParameters->BackBufferHeight == 0) || + (pPresentationParameters->BackBufferFormat == WINED3DFMT_UNKNOWN))) { RECT Rect; GetClientRect(object->win_handle, &Rect);

1 0