September 2006 - Wine-commits

Paul Vriens : wintrust: Add a bunch of CryptRegisterOIDFunction calls.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 6e38461019ffc2ac7bc330d3b7ce510a0dbe48e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e38461019ffc2ac7bc330d… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Sep 6 13:16:01 2006 +0200 wintrust: Add a bunch of CryptRegisterOIDFunction calls. --- dlls/wintrust/register.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index bc40020..c9baea5 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -703,6 +703,28 @@ static void WINTRUST_RegisterGenChainVer */ HRESULT WINAPI DllRegisterServer(void) { + static const CHAR WVTAsn1SpcPeImageDataEncode[] = "WVTAsn1SpcPeImageDataEncode"; + static const CHAR WVTAsn1SpcPeImageDataDecode[] = "WVTAsn1SpcPeImageDataDecode"; + static const CHAR WVTAsn1SpcLinkEncode[] = "WVTAsn1SpcLinkEncode"; + static const CHAR WVTAsn1SpcLinkDecode[] = "WVTAsn1SpcLinkDecode"; + static const CHAR WVTAsn1SpcSigInfoEncode[] = "WVTAsn1SpcSigInfoEncode"; + static const CHAR WVTAsn1SpcSigInfoDecode[] = "WVTAsn1SpcSigInfoDecode"; + static const CHAR WVTAsn1SpcIndirectDataContentEncode[] = "WVTAsn1SpcIndirectDataContentEncode"; + static const CHAR WVTAsn1SpcIndirectDataContentDecode[] = "WVTAsn1SpcIndirectDataContentDecode"; + static const CHAR WVTAsn1SpcSpAgencyInfoEncode[] = "WVTAsn1SpcSpAgencyInfoEncode"; + static const CHAR WVTAsn1SpcSpAgencyInfoDecode[] = "WVTAsn1SpcSpAgencyInfoDecode"; + static const CHAR WVTAsn1SpcMinimalCriteriaInfoEncode[] = "WVTAsn1SpcMinimalCriteriaInfoEncode"; + static const CHAR WVTAsn1SpcMinimalCriteriaInfoDecode[] = "WVTAsn1SpcMinimalCriteriaInfoDecode"; + static const CHAR WVTAsn1SpcFinancialCriteriaInfoEncode[] = "WVTAsn1SpcFinancialCriteriaInfoEncode"; + static const CHAR WVTAsn1SpcFinancialCriteriaInfoDecode[] = "WVTAsn1SpcFinancialCriteriaInfoDecode"; + static const CHAR WVTAsn1SpcStatementTypeEncode[] = "WVTAsn1SpcStatementTypeEncode"; + static const CHAR WVTAsn1SpcStatementTypeDecode[] = "WVTAsn1SpcStatementTypeDecode"; + static const CHAR WVTAsn1CatNameValueEncode[] = "WVTAsn1CatNameValueEncode"; + static const CHAR WVTAsn1CatNameValueDecode[] = "WVTAsn1CatNameValueDecode"; + static const CHAR WVTAsn1CatMemberInfoEncode[] = "WVTAsn1CatMemberInfoEncode"; + static const CHAR WVTAsn1CatMemberInfoDecode[] = "WVTAsn1CatMemberInfoDecode"; + static const CHAR WVTAsn1SpcSpOpusInfoEncode[] = "WVTAsn1SpcSpOpusInfoEncode"; + static const CHAR WVTAsn1SpcSpOpusInfoDecode[] = "WVTAsn1SpcSpOpusInfoDecode"; HRESULT Res = S_OK; HKEY Key; @@ -718,6 +740,39 @@ HRESULT WINAPI DllRegisterServer(void) * - One call to CryptSIPRemoveProvider (do we need that?) */ +#define WINTRUST_REGISTEROID( oid, encode_funcname, decode_funcname ) \ + CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_ENCODE_OBJECT_FUNC, oid, SP_POLICY_PROVIDER_DLL_NAME, encode_funcname); \ + CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_DECODE_OBJECT_FUNC, oid, SP_POLICY_PROVIDER_DLL_NAME, decode_funcname) + + WINTRUST_REGISTEROID(SPC_PE_IMAGE_DATA_OBJID, WVTAsn1SpcPeImageDataEncode, WVTAsn1SpcPeImageDataDecode); + WINTRUST_REGISTEROID(SPC_PE_IMAGE_DATA_STRUCT, WVTAsn1SpcPeImageDataEncode, WVTAsn1SpcPeImageDataDecode); + WINTRUST_REGISTEROID(SPC_CAB_DATA_OBJID, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_CAB_DATA_STRUCT, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_JAVA_CLASS_DATA_OBJID, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_JAVA_CLASS_DATA_STRUCT, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_LINK_OBJID, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_LINK_STRUCT, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_SIGINFO_OBJID, WVTAsn1SpcSigInfoEncode, WVTAsn1SpcSigInfoDecode); + WINTRUST_REGISTEROID(SPC_SIGINFO_STRUCT, WVTAsn1SpcSigInfoEncode, WVTAsn1SpcSigInfoDecode); + WINTRUST_REGISTEROID(SPC_INDIRECT_DATA_OBJID, WVTAsn1SpcIndirectDataContentEncode, WVTAsn1SpcIndirectDataContentDecode); + WINTRUST_REGISTEROID(SPC_INDIRECT_DATA_CONTENT_STRUCT, WVTAsn1SpcIndirectDataContentEncode, WVTAsn1SpcIndirectDataContentDecode); + WINTRUST_REGISTEROID(SPC_SP_AGENCY_INFO_OBJID, WVTAsn1SpcSpAgencyInfoEncode, WVTAsn1SpcSpAgencyInfoDecode); + WINTRUST_REGISTEROID(SPC_SP_AGENCY_INFO_STRUCT, WVTAsn1SpcSpAgencyInfoEncode, WVTAsn1SpcSpAgencyInfoDecode); + WINTRUST_REGISTEROID(SPC_MINIMAL_CRITERIA_OBJID, WVTAsn1SpcMinimalCriteriaInfoEncode, WVTAsn1SpcMinimalCriteriaInfoDecode); + WINTRUST_REGISTEROID(SPC_MINIMAL_CRITERIA_STRUCT, WVTAsn1SpcMinimalCriteriaInfoEncode, WVTAsn1SpcMinimalCriteriaInfoDecode); + WINTRUST_REGISTEROID(SPC_FINANCIAL_CRITERIA_OBJID, WVTAsn1SpcFinancialCriteriaInfoEncode, WVTAsn1SpcFinancialCriteriaInfoDecode); + WINTRUST_REGISTEROID(SPC_FINANCIAL_CRITERIA_STRUCT, WVTAsn1SpcFinancialCriteriaInfoEncode, WVTAsn1SpcFinancialCriteriaInfoDecode); + WINTRUST_REGISTEROID(SPC_STATEMENT_TYPE_OBJID, WVTAsn1SpcStatementTypeEncode, WVTAsn1SpcStatementTypeDecode); + WINTRUST_REGISTEROID(SPC_STATEMENT_TYPE_STRUCT, WVTAsn1SpcStatementTypeEncode, WVTAsn1SpcStatementTypeDecode); + WINTRUST_REGISTEROID(CAT_NAMEVALUE_OBJID, WVTAsn1CatNameValueEncode, WVTAsn1CatNameValueDecode); + WINTRUST_REGISTEROID(CAT_NAMEVALUE_STRUCT, WVTAsn1CatNameValueEncode, WVTAsn1CatNameValueDecode); + WINTRUST_REGISTEROID(CAT_MEMBERINFO_OBJID, WVTAsn1CatMemberInfoEncode, WVTAsn1CatMemberInfoDecode); + WINTRUST_REGISTEROID(CAT_MEMBERINFO_STRUCT, WVTAsn1CatMemberInfoEncode, WVTAsn1CatMemberInfoDecode); + WINTRUST_REGISTEROID(SPC_SP_OPUS_INFO_OBJID, WVTAsn1SpcSpOpusInfoEncode, WVTAsn1SpcSpOpusInfoDecode); + WINTRUST_REGISTEROID(SPC_SP_OPUS_INFO_STRUCT, WVTAsn1SpcSpOpusInfoEncode, WVTAsn1SpcSpOpusInfoDecode); + +#undef WINTRUST_REGISTEROID + /* Testing on W2K3 shows: * If we cannot open HKLM\Software\Microsoft\Cryptography\Providers\Trust * for writing, DllRegisterServer returns S_FALSE. If the key can be opened

1 0

Paul Vriens : wintrust: Register WINTRUST_ACTION_GENERIC_CHAIN_VERIFY.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 609b7af8cea9ff5b3d2586cc8d631a12211e8e80 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=609b7af8cea9ff5b3d2586c… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 5 20:38:23 2006 +0200 wintrust: Register WINTRUST_ACTION_GENERIC_CHAIN_VERIFY. --- dlls/wintrust/register.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index c7c687a..48d04d8 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -57,6 +57,9 @@ static CRYPT_TRUST_REG_ENTRY DriverIniti static CRYPT_TRUST_REG_ENTRY DriverFinalPolicy; static CRYPT_TRUST_REG_ENTRY DriverCleanupPolicy; +static CRYPT_TRUST_REG_ENTRY GenericChainCertificateTrust; +static CRYPT_TRUST_REG_ENTRY GenericChainFinalProv; + static const WCHAR Trust[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'C','r','y','p','t','o','g','r','a','p','h','y','\\', @@ -106,6 +109,8 @@ #define WINTRUST_INITREGENTRY( action, d WINTRUST_INITREGENTRY(DriverInitializePolicy, SP_POLICY_PROVIDER_DLL_NAME, DRIVER_INITPROV_FUNCTION) WINTRUST_INITREGENTRY(DriverFinalPolicy, SP_POLICY_PROVIDER_DLL_NAME, DRIVER_FINALPOLPROV_FUNCTION) WINTRUST_INITREGENTRY(DriverCleanupPolicy, SP_POLICY_PROVIDER_DLL_NAME, DRIVER_CLEANUPPOLICY_FUNCTION) + WINTRUST_INITREGENTRY(GenericChainCertificateTrust, SP_POLICY_PROVIDER_DLL_NAME, GENERIC_CHAIN_CERTTRUST_FUNCTION) + WINTRUST_INITREGENTRY(GenericChainFinalProv, SP_POLICY_PROVIDER_DLL_NAME, GENERIC_CHAIN_FINALPOLICY_FUNCTION) #undef WINTRUST_INITREGENTRY } @@ -138,6 +143,8 @@ #define WINTRUST_FREEREGENTRY( action ) WINTRUST_FREEREGENTRY(DriverInitializePolicy); WINTRUST_FREEREGENTRY(DriverFinalPolicy); WINTRUST_FREEREGENTRY(DriverCleanupPolicy); + WINTRUST_FREEREGENTRY(GenericChainCertificateTrust); + WINTRUST_FREEREGENTRY(GenericChainFinalProv); #undef WINTRUST_FREEREGENTRY } @@ -662,6 +669,35 @@ static void WINTRUST_RegisterDriverVerif WINTRUST_WriteProviderToReg(GuidString, Cleanup , DriverCleanupPolicy); } +/*************************************************************************** + * WINTRUST_RegisterGenChainVerify + * + * Register WINTRUST_ACTION_GENERIC_CHAIN_VERIFY actions and usages. + * + * NOTES + * WINTRUST_ACTION_GENERIC_CHAIN_VERIFY ({FC451C16-AC75-11D1-B4B8-00C04FB66EA0}) + * is defined in softpub.h + * We don't care about failures (see comments in DllRegisterServer) + */ +static void WINTRUST_RegisterGenChainVerify(void) +{ + static const GUID ProvGUID = WINTRUST_ACTION_GENERIC_CHAIN_VERIFY; + WCHAR GuidString[39]; + + WINTRUST_Guid2Wstr(&ProvGUID , GuidString); + + TRACE("Going to register WINTRUST_ACTION_GENERIC_CHAIN_VERIFY : %s\n", wine_dbgstr_w(GuidString)); + + /* HKLM\Software\Microsoft\Cryptography\Trust\Provider\*\{FC451C16-AC75-11D1-B4B8-00C04FB66EA0} */ + WINTRUST_WriteProviderToReg(GuidString, Initialization, SoftpubInitialization); + WINTRUST_WriteProviderToReg(GuidString, Message , SoftpubMessage); + WINTRUST_WriteProviderToReg(GuidString, Signature , SoftpubSignature); + WINTRUST_WriteProviderToReg(GuidString, Certificate , GenericChainCertificateTrust); + WINTRUST_WriteProviderToReg(GuidString, CertCheck , SoftpubCertCheck); + WINTRUST_WriteProviderToReg(GuidString, FinalPolicy , GenericChainFinalProv); + WINTRUST_WriteProviderToReg(GuidString, Cleanup , SoftpubCleanup); +} + /*********************************************************************** * DllRegisterServer (WINTRUST.@) */ @@ -707,6 +743,7 @@ HRESULT WINAPI DllRegisterServer(void) WINTRUST_RegisterHttpsProv(); WINTRUST_RegisterOfficeSignVerify(); WINTRUST_RegisterDriverVerify(); + WINTRUST_RegisterGenChainVerify(); /* Free the registry structures */ WINTRUST_FreeRegStructs();

1 0

Paul Vriens : wintrust: Only register actions when HKLM\Software\Microsoft\Cryptography\Providers\Trust can be opened .
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 9132cac93c45507355ad36a8bae8ec740fd36efa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9132cac93c45507355ad36a… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Sep 6 10:04:27 2006 +0200 wintrust: Only register actions when HKLM\Software\Microsoft\Cryptography\Providers\Trust can be opened. --- dlls/wintrust/register.c | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 48d04d8..bc40020 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -708,9 +708,6 @@ HRESULT WINAPI DllRegisterServer(void) TRACE("\n"); - /* Create the necessary action registry structures */ - WINTRUST_InitRegStructs(); - /* FIXME: * * A short list of stuff that should be done here: @@ -731,22 +728,33 @@ HRESULT WINAPI DllRegisterServer(void) /* Check if we can open/create HKLM\Software\Microsoft\Cryptography\Providers\Trust */ if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, Trust, 0, NULL, 0, KEY_WRITE, NULL, &Key, NULL) != ERROR_SUCCESS) + { + /* If the opening/creation of the key fails, there is no need to do the action registrations as they + * will fail as well. + */ Res = S_FALSE; - RegCloseKey(Key); - - /* Register several Trust Provider actions */ - WINTRUST_RegisterGenVerifyV2(); - WINTRUST_RegisterPublishedSoftware(); - WINTRUST_RegisterPublishedSoftwareNoBadUi(); - WINTRUST_RegisterGenCertVerify(); - WINTRUST_RegisterTrustProviderTest(); - WINTRUST_RegisterHttpsProv(); - WINTRUST_RegisterOfficeSignVerify(); - WINTRUST_RegisterDriverVerify(); - WINTRUST_RegisterGenChainVerify(); - - /* Free the registry structures */ - WINTRUST_FreeRegStructs(); + } + else + { + RegCloseKey(Key); + + /* Create the necessary action registry structures */ + WINTRUST_InitRegStructs(); + + /* Register several Trust Provider actions */ + WINTRUST_RegisterGenVerifyV2(); + WINTRUST_RegisterPublishedSoftware(); + WINTRUST_RegisterPublishedSoftwareNoBadUi(); + WINTRUST_RegisterGenCertVerify(); + WINTRUST_RegisterTrustProviderTest(); + WINTRUST_RegisterHttpsProv(); + WINTRUST_RegisterOfficeSignVerify(); + WINTRUST_RegisterDriverVerify(); + WINTRUST_RegisterGenChainVerify(); + + /* Free the registry structures */ + WINTRUST_FreeRegStructs(); + } return Res; }

1 0

Paul Vriens : wintrust: Register OFFICESIGN_ACTION_VERIFY.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: e47bf4965e667e00130c394cf7c6d4cb0d4b0986 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e47bf4965e667e00130c394… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 5 20:38:15 2006 +0200 wintrust: Register OFFICESIGN_ACTION_VERIFY. --- dlls/wintrust/register.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 0c7b7a2..aeb2897 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -50,6 +50,9 @@ static CRYPT_TRUST_REG_ENTRY SoftpubDump static CRYPT_TRUST_REG_ENTRY HTTPSCertificateTrust; static CRYPT_TRUST_REG_ENTRY HTTPSFinalProv; +static CRYPT_TRUST_REG_ENTRY OfficeInitializePolicy; +static CRYPT_TRUST_REG_ENTRY OfficeCleanupPolicy; + static const WCHAR Trust[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'C','r','y','p','t','o','g','r','a','p','h','y','\\', @@ -94,6 +97,8 @@ #define WINTRUST_INITREGENTRY( action, d WINTRUST_INITREGENTRY(SoftpubDumpStructure, SP_POLICY_PROVIDER_DLL_NAME, SP_TESTDUMPPOLICY_FUNCTION_TEST) WINTRUST_INITREGENTRY(HTTPSCertificateTrust, SP_POLICY_PROVIDER_DLL_NAME, HTTPS_CERTTRUST_FUNCTION) WINTRUST_INITREGENTRY(HTTPSFinalProv, SP_POLICY_PROVIDER_DLL_NAME, HTTPS_FINALPOLICY_FUNCTION) + WINTRUST_INITREGENTRY(OfficeInitializePolicy, OFFICE_POLICY_PROVIDER_DLL_NAME, OFFICE_INITPROV_FUNCTION) + WINTRUST_INITREGENTRY(OfficeCleanupPolicy, OFFICE_POLICY_PROVIDER_DLL_NAME, OFFICE_CLEANUPPOLICY_FUNCTION) #undef WINTRUST_INITREGENTRY } @@ -121,6 +126,8 @@ #define WINTRUST_FREEREGENTRY( action ) WINTRUST_FREEREGENTRY(SoftpubDumpStructure); WINTRUST_FREEREGENTRY(HTTPSCertificateTrust); WINTRUST_FREEREGENTRY(HTTPSFinalProv); + WINTRUST_FREEREGENTRY(OfficeInitializePolicy); + WINTRUST_FREEREGENTRY(OfficeCleanupPolicy); #undef WINTRUST_FREEREGENTRY } @@ -587,6 +594,34 @@ static void WINTRUST_RegisterHttpsProv(v WINTRUST_WriteProviderToReg(GuidString, Cleanup , SoftpubCleanup); } +/*************************************************************************** + * WINTRUST_RegisterOfficeSignVerify + * + * Register OFFICESIGN_ACTION_VERIFY actions and usages. + * + * NOTES + * OFFICESIGN_ACTION_VERIFY ({5555C2CD-17FB-11D1-85C4-00C04FC295EE}) + * is defined in softpub.h + * We don't care about failures (see comments in DllRegisterServer) + */ +static void WINTRUST_RegisterOfficeSignVerify(void) +{ + static const GUID ProvGUID = OFFICESIGN_ACTION_VERIFY; + WCHAR GuidString[39]; + + WINTRUST_Guid2Wstr(&ProvGUID , GuidString); + + TRACE("Going to register OFFICESIGN_ACTION_VERIFY : %s\n", wine_dbgstr_w(GuidString)); + + /* HKLM\Software\Microsoft\Cryptography\Trust\Provider\*\{5555C2CD-17FB-11D1-85C4-00C04FC295EE} */ + WINTRUST_WriteProviderToReg(GuidString, Initialization, OfficeInitializePolicy); + WINTRUST_WriteProviderToReg(GuidString, Message , SoftpubMessage); + WINTRUST_WriteProviderToReg(GuidString, Signature , SoftpubSignature); + WINTRUST_WriteProviderToReg(GuidString, Certificate , SoftpubCertficate); + WINTRUST_WriteProviderToReg(GuidString, CertCheck , SoftpubCertCheck); + WINTRUST_WriteProviderToReg(GuidString, FinalPolicy , SoftpubFinalPolicy); + WINTRUST_WriteProviderToReg(GuidString, Cleanup , OfficeCleanupPolicy); +} /*********************************************************************** * DllRegisterServer (WINTRUST.@) @@ -631,6 +666,7 @@ HRESULT WINAPI DllRegisterServer(void) WINTRUST_RegisterGenCertVerify(); WINTRUST_RegisterTrustProviderTest(); WINTRUST_RegisterHttpsProv(); + WINTRUST_RegisterOfficeSignVerify(); /* Free the registry structures */ WINTRUST_FreeRegStructs();

1 0

Paul Vriens : wintrust: Register DRIVER_ACTION_VERIFY.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 073d4eca9e498932b5535a0e2d77b448d9af9817 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=073d4eca9e498932b5535a0… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 5 20:38:19 2006 +0200 wintrust: Register DRIVER_ACTION_VERIFY. --- dlls/wintrust/register.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index aeb2897..c7c687a 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -53,6 +53,10 @@ static CRYPT_TRUST_REG_ENTRY HTTPSFinalP static CRYPT_TRUST_REG_ENTRY OfficeInitializePolicy; static CRYPT_TRUST_REG_ENTRY OfficeCleanupPolicy; +static CRYPT_TRUST_REG_ENTRY DriverInitializePolicy; +static CRYPT_TRUST_REG_ENTRY DriverFinalPolicy; +static CRYPT_TRUST_REG_ENTRY DriverCleanupPolicy; + static const WCHAR Trust[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'C','r','y','p','t','o','g','r','a','p','h','y','\\', @@ -99,6 +103,9 @@ #define WINTRUST_INITREGENTRY( action, d WINTRUST_INITREGENTRY(HTTPSFinalProv, SP_POLICY_PROVIDER_DLL_NAME, HTTPS_FINALPOLICY_FUNCTION) WINTRUST_INITREGENTRY(OfficeInitializePolicy, OFFICE_POLICY_PROVIDER_DLL_NAME, OFFICE_INITPROV_FUNCTION) WINTRUST_INITREGENTRY(OfficeCleanupPolicy, OFFICE_POLICY_PROVIDER_DLL_NAME, OFFICE_CLEANUPPOLICY_FUNCTION) + WINTRUST_INITREGENTRY(DriverInitializePolicy, SP_POLICY_PROVIDER_DLL_NAME, DRIVER_INITPROV_FUNCTION) + WINTRUST_INITREGENTRY(DriverFinalPolicy, SP_POLICY_PROVIDER_DLL_NAME, DRIVER_FINALPOLPROV_FUNCTION) + WINTRUST_INITREGENTRY(DriverCleanupPolicy, SP_POLICY_PROVIDER_DLL_NAME, DRIVER_CLEANUPPOLICY_FUNCTION) #undef WINTRUST_INITREGENTRY } @@ -128,6 +135,9 @@ #define WINTRUST_FREEREGENTRY( action ) WINTRUST_FREEREGENTRY(HTTPSFinalProv); WINTRUST_FREEREGENTRY(OfficeInitializePolicy); WINTRUST_FREEREGENTRY(OfficeCleanupPolicy); + WINTRUST_FREEREGENTRY(DriverInitializePolicy); + WINTRUST_FREEREGENTRY(DriverFinalPolicy); + WINTRUST_FREEREGENTRY(DriverCleanupPolicy); #undef WINTRUST_FREEREGENTRY } @@ -623,6 +633,35 @@ static void WINTRUST_RegisterOfficeSignV WINTRUST_WriteProviderToReg(GuidString, Cleanup , OfficeCleanupPolicy); } +/*************************************************************************** + * WINTRUST_RegisterDriverVerify + * + * Register DRIVER_ACTION_VERIFY actions and usages. + * + * NOTES + * DRIVER_ACTION_VERIFY ({F750E6C3-38EE-11D1-85E5-00C04FC295EE}) + * is defined in softpub.h + * We don't care about failures (see comments in DllRegisterServer) + */ +static void WINTRUST_RegisterDriverVerify(void) +{ + static const GUID ProvGUID = DRIVER_ACTION_VERIFY; + WCHAR GuidString[39]; + + WINTRUST_Guid2Wstr(&ProvGUID , GuidString); + + TRACE("Going to register DRIVER_ACTION_VERIFY : %s\n", wine_dbgstr_w(GuidString)); + + /* HKLM\Software\Microsoft\Cryptography\Trust\Provider\*\{F750E6C3-38EE-11D1-85E5-00C04FC295EE} */ + WINTRUST_WriteProviderToReg(GuidString, Initialization, DriverInitializePolicy); + WINTRUST_WriteProviderToReg(GuidString, Message , SoftpubMessage); + WINTRUST_WriteProviderToReg(GuidString, Signature , SoftpubSignature); + WINTRUST_WriteProviderToReg(GuidString, Certificate , SoftpubCertficate); + WINTRUST_WriteProviderToReg(GuidString, CertCheck , SoftpubCertCheck); + WINTRUST_WriteProviderToReg(GuidString, FinalPolicy , DriverFinalPolicy); + WINTRUST_WriteProviderToReg(GuidString, Cleanup , DriverCleanupPolicy); +} + /*********************************************************************** * DllRegisterServer (WINTRUST.@) */ @@ -667,6 +706,7 @@ HRESULT WINAPI DllRegisterServer(void) WINTRUST_RegisterTrustProviderTest(); WINTRUST_RegisterHttpsProv(); WINTRUST_RegisterOfficeSignVerify(); + WINTRUST_RegisterDriverVerify(); /* Free the registry structures */ WINTRUST_FreeRegStructs();

1 0

Paul Vriens : wintrust: Register HTTPSPROV_ACTION.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: e7798305bd4f82071d4100fdfcde8f5e419cc625 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e7798305bd4f82071d4100f… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 5 20:38:11 2006 +0200 wintrust: Register HTTPSPROV_ACTION. --- dlls/wintrust/register.c | 68 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index f98e386..0c7b7a2 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -47,6 +47,9 @@ static CRYPT_TRUST_REG_ENTRY SoftpubDefC static CRYPT_TRUST_REG_ENTRY SoftpubDumpStructure; +static CRYPT_TRUST_REG_ENTRY HTTPSCertificateTrust; +static CRYPT_TRUST_REG_ENTRY HTTPSFinalProv; + static const WCHAR Trust[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'C','r','y','p','t','o','g','r','a','p','h','y','\\', @@ -63,6 +66,7 @@ static const WCHAR DiagnosticPolicy[] = static const WCHAR Cleanup[] = {'C','l','e','a','n','u','p','\\', 0}; static const WCHAR DefaultId[] = {'D','e','f','a','u','l','t','I','d', 0}; +static const WCHAR Dll[] = {'$','D','L','L', 0}; /*********************************************************************** * WINTRUST_InitRegStructs @@ -88,6 +92,8 @@ #define WINTRUST_INITREGENTRY( action, d WINTRUST_INITREGENTRY(SoftpubCleanup, SP_POLICY_PROVIDER_DLL_NAME, SP_CLEANUPPOLICY_FUNCTION) WINTRUST_INITREGENTRY(SoftpubDefCertInit, SP_POLICY_PROVIDER_DLL_NAME, SP_GENERIC_CERT_INIT_FUNCTION) WINTRUST_INITREGENTRY(SoftpubDumpStructure, SP_POLICY_PROVIDER_DLL_NAME, SP_TESTDUMPPOLICY_FUNCTION_TEST) + WINTRUST_INITREGENTRY(HTTPSCertificateTrust, SP_POLICY_PROVIDER_DLL_NAME, HTTPS_CERTTRUST_FUNCTION) + WINTRUST_INITREGENTRY(HTTPSFinalProv, SP_POLICY_PROVIDER_DLL_NAME, HTTPS_FINALPOLICY_FUNCTION) #undef WINTRUST_INITREGENTRY } @@ -113,6 +119,8 @@ #define WINTRUST_FREEREGENTRY( action ) WINTRUST_FREEREGENTRY(SoftpubCleanup); WINTRUST_FREEREGENTRY(SoftpubDefCertInit); WINTRUST_FREEREGENTRY(SoftpubDumpStructure); + WINTRUST_FREEREGENTRY(HTTPSCertificateTrust); + WINTRUST_FREEREGENTRY(HTTPSFinalProv); #undef WINTRUST_FREEREGENTRY } @@ -144,7 +152,6 @@ static LONG WINTRUST_WriteProviderToReg( const WCHAR* FunctionType, CRYPT_TRUST_REG_ENTRY RegEntry) { - static const WCHAR Dll[] = {'$','D','L','L', 0}; static const WCHAR Function[] = {'$','F','u','n','c','t','i','o','n', 0}; WCHAR ProvKey[MAX_PATH]; HKEY Key; @@ -523,6 +530,64 @@ static void WINTRUST_RegisterTrustProvid WINTRUST_WriteProviderToReg(GuidString, Cleanup , SoftpubCleanup); } +/*************************************************************************** + * WINTRUST_RegisterHttpsProv + * + * Register HTTPSPROV_ACTION actions and usages. + * + * NOTES + * HTTPSPROV_ACTION ({573E31F8-AABA-11D0-8CCB-00C04FC295EE}) + * is defined in softpub.h + * We don't care about failures (see comments in DllRegisterServer) + */ +static void WINTRUST_RegisterHttpsProv(void) +{ + static WCHAR SoftpubLoadUsage[] = {'S','o','f','t','p','u','b','L','o','a','d','D','e','f','U','s','a','g','e','C','a','l','l','D','a','t','a', 0}; + static WCHAR SoftpubFreeUsage[] = {'S','o','f','t','p','u','b','F','r','e','e','D','e','f','U','s','a','g','e','C','a','l','l','D','a','t','a', 0}; + static const WCHAR CBAlloc[] = {'C','a','l','l','b','a','c','k','A','l','l','o','c','F','u','n','c','t','i','o','n', 0}; + static const WCHAR CBFree[] = {'C','a','l','l','b','a','c','k','F','r','e','e','F','u','n','c','t','i','o','n', 0}; + static const GUID ProvGUID = HTTPSPROV_ACTION; + WCHAR GuidString[39]; + WCHAR ProvDllName[sizeof(SP_POLICY_PROVIDER_DLL_NAME)]; + + WINTRUST_Guid2Wstr(&ProvGUID , GuidString); + + TRACE("Going to register HTTPSPROV_ACTION : %s\n", wine_dbgstr_w(GuidString)); + + lstrcpyW(ProvDllName, SP_POLICY_PROVIDER_DLL_NAME); \ + + /* HKLM\Software\Microsoft\Cryptography\Trust\Usages\1.3.6.1.5.5.7.3.1 */ + WINTRUST_WriteSingleUsageEntry(szOID_PKIX_KP_SERVER_AUTH, Dll, ProvDllName); + WINTRUST_WriteSingleUsageEntry(szOID_PKIX_KP_SERVER_AUTH, CBAlloc, SoftpubLoadUsage ); + WINTRUST_WriteSingleUsageEntry(szOID_PKIX_KP_SERVER_AUTH, CBFree, SoftpubFreeUsage ); + WINTRUST_WriteSingleUsageEntry(szOID_PKIX_KP_SERVER_AUTH, DefaultId, GuidString ); + /* HKLM\Software\Microsoft\Cryptography\Trust\Usages\1.3.6.1.5.5.7.3.2 */ + WINTRUST_WriteSingleUsageEntry(szOID_PKIX_KP_CLIENT_AUTH, Dll, ProvDllName); + WINTRUST_WriteSingleUsageEntry(szOID_PKIX_KP_CLIENT_AUTH, CBAlloc, SoftpubLoadUsage ); + WINTRUST_WriteSingleUsageEntry(szOID_PKIX_KP_CLIENT_AUTH, CBFree, SoftpubFreeUsage ); + WINTRUST_WriteSingleUsageEntry(szOID_PKIX_KP_CLIENT_AUTH, DefaultId, GuidString ); + /* HKLM\Software\Microsoft\Cryptography\Trust\Usages\1.3.6.1.4.1.311.10.3.3 */ + WINTRUST_WriteSingleUsageEntry(szOID_SERVER_GATED_CRYPTO, Dll, ProvDllName); + WINTRUST_WriteSingleUsageEntry(szOID_SERVER_GATED_CRYPTO, CBAlloc, SoftpubLoadUsage ); + WINTRUST_WriteSingleUsageEntry(szOID_SERVER_GATED_CRYPTO, CBFree, SoftpubFreeUsage ); + WINTRUST_WriteSingleUsageEntry(szOID_SERVER_GATED_CRYPTO, DefaultId, GuidString ); + /* HKLM\Software\Microsoft\Cryptography\Trust\Usages\2.16.840.1.113730.4.1 */ + WINTRUST_WriteSingleUsageEntry(szOID_SGC_NETSCAPE, Dll, ProvDllName); + WINTRUST_WriteSingleUsageEntry(szOID_SGC_NETSCAPE, CBAlloc, SoftpubLoadUsage ); + WINTRUST_WriteSingleUsageEntry(szOID_SGC_NETSCAPE, CBFree, SoftpubFreeUsage ); + WINTRUST_WriteSingleUsageEntry(szOID_SGC_NETSCAPE, DefaultId, GuidString ); + + /* HKLM\Software\Microsoft\Cryptography\Trust\Provider\*\{573E31F8-AABA-11D0-8CCB-00C04FC295EE} */ + WINTRUST_WriteProviderToReg(GuidString, Initialization, SoftpubInitialization); + WINTRUST_WriteProviderToReg(GuidString, Message , SoftpubMessage); + WINTRUST_WriteProviderToReg(GuidString, Signature , SoftpubSignature); + WINTRUST_WriteProviderToReg(GuidString, Certificate , HTTPSCertificateTrust); + WINTRUST_WriteProviderToReg(GuidString, CertCheck , SoftpubCertCheck); + WINTRUST_WriteProviderToReg(GuidString, FinalPolicy , HTTPSFinalProv); + WINTRUST_WriteProviderToReg(GuidString, Cleanup , SoftpubCleanup); +} + + /*********************************************************************** * DllRegisterServer (WINTRUST.@) */ @@ -565,6 +630,7 @@ HRESULT WINAPI DllRegisterServer(void) WINTRUST_RegisterPublishedSoftwareNoBadUi(); WINTRUST_RegisterGenCertVerify(); WINTRUST_RegisterTrustProviderTest(); + WINTRUST_RegisterHttpsProv(); /* Free the registry structures */ WINTRUST_FreeRegStructs();

1 0

Paul Vriens : wintrust: Register WINTRUST_ACTION_GENERIC_CERT_VERIFY.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: ccb4ff764f0760f7978b6036f8d6962b4ce5c763 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ccb4ff764f0760f7978b603… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 5 20:38:01 2006 +0200 wintrust: Register WINTRUST_ACTION_GENERIC_CERT_VERIFY. --- dlls/wintrust/register.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index cbc129c..dfb3d1b 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -43,6 +43,8 @@ static CRYPT_TRUST_REG_ENTRY SoftpubCert static CRYPT_TRUST_REG_ENTRY SoftpubFinalPolicy; static CRYPT_TRUST_REG_ENTRY SoftpubCleanup; +static CRYPT_TRUST_REG_ENTRY SoftpubDefCertInit; + static const WCHAR Trust[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'C','r','y','p','t','o','g','r','a','p','h','y','\\', @@ -82,6 +84,7 @@ #define WINTRUST_INITREGENTRY( action, d WINTRUST_INITREGENTRY(SoftpubCertCheck, SP_POLICY_PROVIDER_DLL_NAME, SP_CHKCERT_FUNCTION) WINTRUST_INITREGENTRY(SoftpubFinalPolicy, SP_POLICY_PROVIDER_DLL_NAME, SP_FINALPOLICY_FUNCTION) WINTRUST_INITREGENTRY(SoftpubCleanup, SP_POLICY_PROVIDER_DLL_NAME, SP_CLEANUPPOLICY_FUNCTION) + WINTRUST_INITREGENTRY(SoftpubDefCertInit, SP_POLICY_PROVIDER_DLL_NAME, SP_GENERIC_CERT_INIT_FUNCTION) #undef WINTRUST_INITREGENTRY } @@ -105,6 +108,7 @@ #define WINTRUST_FREEREGENTRY( action ) WINTRUST_FREEREGENTRY(SoftpubCertCheck); WINTRUST_FREEREGENTRY(SoftpubFinalPolicy); WINTRUST_FREEREGENTRY(SoftpubCleanup); + WINTRUST_FREEREGENTRY(SoftpubDefCertInit); #undef WINTRUST_FREEREGENTRY } @@ -456,6 +460,35 @@ static void WINTRUST_RegisterPublishedSo WINTRUST_WriteProviderToReg(GuidString, Cleanup , SoftpubCleanup); } +/*************************************************************************** + * WINTRUST_RegisterGenCertVerify + * + * Register WINTRUST_ACTION_GENERIC_CERT_VERIFY actions and usages. + * + * NOTES + * WINTRUST_ACTION_GENERIC_CERT_VERIFY ({189A3842-3041-11D1-85E1-00C04FC295EE}) + * is defined in softpub.h + * We don't care about failures (see comments in DllRegisterServer) + */ +static void WINTRUST_RegisterGenCertVerify(void) +{ + static const GUID ProvGUID = WINTRUST_ACTION_GENERIC_CERT_VERIFY; + WCHAR GuidString[39]; + + WINTRUST_Guid2Wstr(&ProvGUID , GuidString); + + TRACE("Going to register WINTRUST_ACTION_GENERIC_CERT_VERIFY : %s\n", wine_dbgstr_w(GuidString)); + + /* HKLM\Software\Microsoft\Cryptography\Trust\Provider\*\{189A3842-3041-11D1-85E1-00C04FC295EE} */ + WINTRUST_WriteProviderToReg(GuidString, Initialization, SoftpubDefCertInit); + WINTRUST_WriteProviderToReg(GuidString, Message , SoftpubMessage); + WINTRUST_WriteProviderToReg(GuidString, Signature , SoftpubSignature); + WINTRUST_WriteProviderToReg(GuidString, Certificate , SoftpubCertficate); + WINTRUST_WriteProviderToReg(GuidString, CertCheck , SoftpubCertCheck); + WINTRUST_WriteProviderToReg(GuidString, FinalPolicy , SoftpubFinalPolicy); + WINTRUST_WriteProviderToReg(GuidString, Cleanup , SoftpubCleanup); +} + /*********************************************************************** * DllRegisterServer (WINTRUST.@) */ @@ -496,6 +529,7 @@ HRESULT WINAPI DllRegisterServer(void) WINTRUST_RegisterGenVerifyV2(); WINTRUST_RegisterPublishedSoftware(); WINTRUST_RegisterPublishedSoftwareNoBadUi(); + WINTRUST_RegisterGenCertVerify(); /* Free the registry structures */ WINTRUST_FreeRegStructs();

1 0

Paul Vriens : wintrust: Register WINTRUST_ACTION_TRUSTPROVIDER_TEST.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: f73967a8e0ba6f3189a9e9f6e7ceb6b9e24efb0f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f73967a8e0ba6f3189a9e9f… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 5 20:38:06 2006 +0200 wintrust: Register WINTRUST_ACTION_TRUSTPROVIDER_TEST. --- dlls/wintrust/register.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index dfb3d1b..f98e386 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -45,6 +45,8 @@ static CRYPT_TRUST_REG_ENTRY SoftpubClea static CRYPT_TRUST_REG_ENTRY SoftpubDefCertInit; +static CRYPT_TRUST_REG_ENTRY SoftpubDumpStructure; + static const WCHAR Trust[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'C','r','y','p','t','o','g','r','a','p','h','y','\\', @@ -85,6 +87,7 @@ #define WINTRUST_INITREGENTRY( action, d WINTRUST_INITREGENTRY(SoftpubFinalPolicy, SP_POLICY_PROVIDER_DLL_NAME, SP_FINALPOLICY_FUNCTION) WINTRUST_INITREGENTRY(SoftpubCleanup, SP_POLICY_PROVIDER_DLL_NAME, SP_CLEANUPPOLICY_FUNCTION) WINTRUST_INITREGENTRY(SoftpubDefCertInit, SP_POLICY_PROVIDER_DLL_NAME, SP_GENERIC_CERT_INIT_FUNCTION) + WINTRUST_INITREGENTRY(SoftpubDumpStructure, SP_POLICY_PROVIDER_DLL_NAME, SP_TESTDUMPPOLICY_FUNCTION_TEST) #undef WINTRUST_INITREGENTRY } @@ -109,6 +112,7 @@ #define WINTRUST_FREEREGENTRY( action ) WINTRUST_FREEREGENTRY(SoftpubFinalPolicy); WINTRUST_FREEREGENTRY(SoftpubCleanup); WINTRUST_FREEREGENTRY(SoftpubDefCertInit); + WINTRUST_FREEREGENTRY(SoftpubDumpStructure); #undef WINTRUST_FREEREGENTRY } @@ -489,6 +493,36 @@ static void WINTRUST_RegisterGenCertVeri WINTRUST_WriteProviderToReg(GuidString, Cleanup , SoftpubCleanup); } +/*************************************************************************** + * WINTRUST_RegisterTrustProviderTest + * + * Register WINTRUST_ACTION_TRUSTPROVIDER_TEST actions and usages. + * + * NOTES + * WINTRUST_ACTION_TRUSTPROVIDER_TEST ({573E31F8-DDBA-11D0-8CCB-00C04FC295EE}) + * is defined in softpub.h + * We don't care about failures (see comments in DllRegisterServer) + */ +static void WINTRUST_RegisterTrustProviderTest(void) +{ + static const GUID ProvGUID = WINTRUST_ACTION_TRUSTPROVIDER_TEST; + WCHAR GuidString[39]; + + WINTRUST_Guid2Wstr(&ProvGUID , GuidString); + + TRACE("Going to register WINTRUST_ACTION_TRUSTPROVIDER_TEST : %s\n", wine_dbgstr_w(GuidString)); + + /* HKLM\Software\Microsoft\Cryptography\Trust\Provider\*\{573E31F8-DDBA-11D0-8CCB-00C04FC295EE} */ + WINTRUST_WriteProviderToReg(GuidString, Initialization , SoftpubInitialization); + WINTRUST_WriteProviderToReg(GuidString, Message , SoftpubMessage); + WINTRUST_WriteProviderToReg(GuidString, Signature , SoftpubSignature); + WINTRUST_WriteProviderToReg(GuidString, Certificate , SoftpubCertficate); + WINTRUST_WriteProviderToReg(GuidString, CertCheck , SoftpubCertCheck); + WINTRUST_WriteProviderToReg(GuidString, FinalPolicy , SoftpubFinalPolicy); + WINTRUST_WriteProviderToReg(GuidString, DiagnosticPolicy, SoftpubDumpStructure); + WINTRUST_WriteProviderToReg(GuidString, Cleanup , SoftpubCleanup); +} + /*********************************************************************** * DllRegisterServer (WINTRUST.@) */ @@ -530,6 +564,7 @@ HRESULT WINAPI DllRegisterServer(void) WINTRUST_RegisterPublishedSoftware(); WINTRUST_RegisterPublishedSoftwareNoBadUi(); WINTRUST_RegisterGenCertVerify(); + WINTRUST_RegisterTrustProviderTest(); /* Free the registry structures */ WINTRUST_FreeRegStructs();

1 0

Paul Vriens : wintrust: Register WIN_SPUB_ACTION_PUBLISHED_SOFTWARE.
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: bded72fc958ecc0de362ab4b4f5789a793204081 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bded72fc958ecc0de362ab4… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 5 20:37:39 2006 +0200 wintrust: Register WIN_SPUB_ACTION_PUBLISHED_SOFTWARE. --- dlls/wintrust/register.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 06d6408..fb39211 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -396,6 +396,35 @@ static void WINTRUST_RegisterGenVerifyV2 WINTRUST_WriteProviderToReg(GuidString, Cleanup , SoftpubCleanup); } +/*************************************************************************** + * WINTRUST_RegisterPublishedSoftware + * + * Register WIN_SPUB_ACTION_PUBLISHED_SOFTWARE actions and usages. + * + * NOTES + * WIN_SPUB_ACTION_PUBLISHED_SOFTWARE ({64B9D180-8DA2-11CF-8736-00AA00A485EB}) + * is defined in wintrust.h + * We don't care about failures (see comments in DllRegisterServer) + */ +static void WINTRUST_RegisterPublishedSoftware(void) +{ + static const GUID ProvGUID = WIN_SPUB_ACTION_PUBLISHED_SOFTWARE; + WCHAR GuidString[39]; + + WINTRUST_Guid2Wstr(&ProvGUID , GuidString); + + TRACE("Going to register WIN_SPUB_ACTION_PUBLISHED_SOFTWARE : %s\n", wine_dbgstr_w(GuidString)); + + /* HKLM\Software\Microsoft\Cryptography\Trust\Provider\*\{64B9D180-8DA2-11CF-8736-00AA00A485EB} */ + WINTRUST_WriteProviderToReg(GuidString, Initialization, SoftpubInitialization); + WINTRUST_WriteProviderToReg(GuidString, Message , SoftpubMessage); + WINTRUST_WriteProviderToReg(GuidString, Signature , SoftpubSignature); + WINTRUST_WriteProviderToReg(GuidString, Certificate , SoftpubCertficate); + WINTRUST_WriteProviderToReg(GuidString, CertCheck , SoftpubCertCheck); + WINTRUST_WriteProviderToReg(GuidString, FinalPolicy , SoftpubFinalPolicy); + WINTRUST_WriteProviderToReg(GuidString, Cleanup , SoftpubCleanup); +} + /*********************************************************************** * DllRegisterServer (WINTRUST.@) */ @@ -432,8 +461,9 @@ HRESULT WINAPI DllRegisterServer(void) Res = S_FALSE; RegCloseKey(Key); - /* Register WINTRUST_ACTION_GENERIC_VERIFY_V2 */ + /* Register several Trust Provider actions */ WINTRUST_RegisterGenVerifyV2(); + WINTRUST_RegisterPublishedSoftware(); /* Free the registry structures */ WINTRUST_FreeRegStructs();

1 0

Paul Vriens : wintrust: Register WIN_SPUB_ACTION_PUBLISHED_SOFTWARE_NOBADUI .
by Alexandre Julliard 07 Sep '06

07 Sep '06

Module: wine Branch: master Commit: 32407f9074d5e3d55552b8cef836c4d750c78dc3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32407f9074d5e3d55552b8c… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 5 20:37:55 2006 +0200 wintrust: Register WIN_SPUB_ACTION_PUBLISHED_SOFTWARE_NOBADUI. --- dlls/wintrust/register.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index fb39211..cbc129c 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -425,6 +425,37 @@ static void WINTRUST_RegisterPublishedSo WINTRUST_WriteProviderToReg(GuidString, Cleanup , SoftpubCleanup); } +#define WIN_SPUB_ACTION_PUBLISHED_SOFTWARE_NOBADUI { 0xc6b2e8d0, 0xe005, 0x11cf, { 0xa1,0x34,0x00,0xc0,0x4f,0xd7,0xbf,0x43 }} + +/*************************************************************************** + * WINTRUST_RegisterPublishedSoftwareNoBadUi + * + * Register WIN_SPUB_ACTION_PUBLISHED_SOFTWARE_NOBADUI actions and usages. + * + * NOTES + * WIN_SPUB_ACTION_PUBLISHED_SOFTWARE_NOBADUI ({C6B2E8D0-E005-11CF-A134-00C04FD7BF43}) + * is not defined in any include file. (FIXME: Find out if the name is correct). + * We don't care about failures (see comments in DllRegisterServer) + */ +static void WINTRUST_RegisterPublishedSoftwareNoBadUi(void) +{ + static const GUID ProvGUID = WIN_SPUB_ACTION_PUBLISHED_SOFTWARE_NOBADUI; + WCHAR GuidString[39]; + + WINTRUST_Guid2Wstr(&ProvGUID , GuidString); + + TRACE("Going to register WIN_SPUB_ACTION_PUBLISHED_SOFTWARE_NOBADUI : %s\n", wine_dbgstr_w(GuidString)); + + /* HKLM\Software\Microsoft\Cryptography\Trust\Provider\*\{C6B2E8D0-E005-11CF-A134-00C04FD7BF43} */ + WINTRUST_WriteProviderToReg(GuidString, Initialization, SoftpubInitialization); + WINTRUST_WriteProviderToReg(GuidString, Message , SoftpubMessage); + WINTRUST_WriteProviderToReg(GuidString, Signature , SoftpubSignature); + WINTRUST_WriteProviderToReg(GuidString, Certificate , SoftpubCertficate); + WINTRUST_WriteProviderToReg(GuidString, CertCheck , SoftpubCertCheck); + WINTRUST_WriteProviderToReg(GuidString, FinalPolicy , SoftpubFinalPolicy); + WINTRUST_WriteProviderToReg(GuidString, Cleanup , SoftpubCleanup); +} + /*********************************************************************** * DllRegisterServer (WINTRUST.@) */ @@ -464,6 +495,7 @@ HRESULT WINAPI DllRegisterServer(void) /* Register several Trust Provider actions */ WINTRUST_RegisterGenVerifyV2(); WINTRUST_RegisterPublishedSoftware(); + WINTRUST_RegisterPublishedSoftwareNoBadUi(); /* Free the registry structures */ WINTRUST_FreeRegStructs();

1 0