September 2006 - Wine-commits

Paul Vriens : wintrust: Simplify registration by using WintrustAddDefaultForUsage.
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: 796057fdec829516dbda99018a96f61ed3522942 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=796057fdec829516dbda990… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 12 19:52:16 2006 +0200 wintrust: Simplify registration by using WintrustAddDefaultForUsage. --- dlls/wintrust/register.c | 67 ++++++++++++++++++---------------------------- 1 files changed, 26 insertions(+), 41 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index aa9d75a..5a7f219 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -361,7 +361,8 @@ BOOL WINAPI WintrustRemoveActionID( GUID /*********************************************************************** * WINTRUST_WriteSingleUsageEntry * - * Write a single value and its data to: + * Helper for WintrustAddDefaultForUsage, writes a single value and its + * data to: * * HKLM\Software\Microsoft\Cryptography\Trust\Usages\<OID> */ @@ -425,14 +426,13 @@ static void WINTRUST_RegisterGenVerifyV2 SoftpubFinalPolicy, { 0, NULL, NULL }, /* No diagnostic policy */ SoftpubCleanup }; - WCHAR GuidString[39]; - - WINTRUST_Guid2Wstr(&ProvGUID , GuidString); - - TRACE("Going to register WINTRUST_ACTION_GENERIC_VERIFY_V2 : %s\n", wine_dbgstr_w(GuidString)); + CRYPT_PROVIDER_REGDEFUSAGE DefUsage = { sizeof(CRYPT_PROVIDER_REGDEFUSAGE), + &ProvGUID, + NULL, /* No Dll provided */ + NULL, /* No load callback function */ + NULL }; /* No free callback function */ - /* HKLM\Software\Microsoft\Cryptography\Trust\Usages\1.3.6.1.5.5.7.3.3 */ - WINTRUST_WriteSingleUsageEntry(szOID_PKIX_KP_CODE_SIGNING, DefaultId, GuidString); + WintrustAddDefaultForUsage(szOID_PKIX_KP_CODE_SIGNING, &DefUsage); WintrustAddActionID(&ProvGUID, 0, &ProvInfo); } @@ -487,6 +487,7 @@ static void WINTRUST_RegisterPublishedSo SoftpubFinalPolicy, { 0, NULL, NULL }, /* No diagnostic policy */ SoftpubCleanup }; + WintrustAddActionID(&ProvGUID, 0, &ProvInfo); } @@ -554,10 +555,8 @@ static void WINTRUST_RegisterTrustProvid */ 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 CHAR SoftpubLoadUsage[] = "SoftpubLoadDefUsageCallData"; + static CHAR SoftpubFreeUsage[] = "SoftpubFreeDefUsageCallData"; static GUID ProvGUID = HTTPSPROV_ACTION; CRYPT_REGISTER_ACTIONID ProvInfo = { sizeof(CRYPT_REGISTER_ACTIONID), SoftpubInitialization, @@ -568,35 +567,21 @@ static void WINTRUST_RegisterHttpsProv(v HTTPSFinalProv, { 0, NULL, NULL }, /* No diagnostic policy */ SoftpubCleanup }; - 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 ); + CRYPT_PROVIDER_REGDEFUSAGE DefUsage = { sizeof(CRYPT_PROVIDER_REGDEFUSAGE), + &ProvGUID, + NULL, /* Will be filled later */ + SoftpubLoadUsage, + SoftpubFreeUsage }; + + DefUsage.pwszDllName = HeapAlloc(GetProcessHeap(), 0, sizeof(SP_POLICY_PROVIDER_DLL_NAME)); + lstrcpyW(DefUsage.pwszDllName, SP_POLICY_PROVIDER_DLL_NAME); + + WintrustAddDefaultForUsage(szOID_PKIX_KP_SERVER_AUTH, &DefUsage); + WintrustAddDefaultForUsage(szOID_PKIX_KP_CLIENT_AUTH, &DefUsage); + WintrustAddDefaultForUsage(szOID_SERVER_GATED_CRYPTO, &DefUsage); + WintrustAddDefaultForUsage(szOID_SGC_NETSCAPE, &DefUsage); + + HeapFree(GetProcessHeap(), 0, DefUsage.pwszDllName); WintrustAddActionID(&ProvGUID, 0, &ProvInfo); }

1 0

Paul Vriens : wintrust: We do care about errors during this kind of registration.
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: 7bcec7c5dddcedfde7151d2c52cd76991bf7cd6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7bcec7c5dddcedfde7151d2… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 12 19:52:56 2006 +0200 wintrust: We do care about errors during this kind of registration. --- dlls/wintrust/register.c | 89 +++++++++++++++++++++++++++++----------------- 1 files changed, 57 insertions(+), 32 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 5a7f219..061dfaf 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -412,10 +412,10 @@ static LONG WINTRUST_WriteSingleUsageEnt * NOTES * WINTRUST_ACTION_GENERIC_VERIFY_V2 ({00AAC56B-CD44-11D0-8CC2-00C04FC295EE} * is defined in softpub.h - * We don't care about failures (see comments in DllRegisterServer) */ -static void WINTRUST_RegisterGenVerifyV2(void) +static BOOL WINTRUST_RegisterGenVerifyV2(void) { + BOOL RegisteredOK = TRUE; static GUID ProvGUID = WINTRUST_ACTION_GENERIC_VERIFY_V2; CRYPT_REGISTER_ACTIONID ProvInfo = { sizeof(CRYPT_REGISTER_ACTIONID), SoftpubInitialization, @@ -432,9 +432,13 @@ static void WINTRUST_RegisterGenVerifyV2 NULL, /* No load callback function */ NULL }; /* No free callback function */ - WintrustAddDefaultForUsage(szOID_PKIX_KP_CODE_SIGNING, &DefUsage); + if (!WintrustAddDefaultForUsage(szOID_PKIX_KP_CODE_SIGNING, &DefUsage)) + RegisteredOK = FALSE; - WintrustAddActionID(&ProvGUID, 0, &ProvInfo); + if (!WintrustAddActionID(&ProvGUID, 0, &ProvInfo)) + RegisteredOK = FALSE; + + return RegisteredOK; } /*************************************************************************** @@ -445,9 +449,8 @@ static void WINTRUST_RegisterGenVerifyV2 * 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 BOOL WINTRUST_RegisterPublishedSoftware(void) { static GUID ProvGUID = WIN_SPUB_ACTION_PUBLISHED_SOFTWARE; CRYPT_REGISTER_ACTIONID ProvInfo = { sizeof(CRYPT_REGISTER_ACTIONID), @@ -460,7 +463,10 @@ static void WINTRUST_RegisterPublishedSo { 0, NULL, NULL }, /* No diagnostic policy */ SoftpubCleanup }; - WintrustAddActionID(&ProvGUID, 0, &ProvInfo); + if (!WintrustAddActionID(&ProvGUID, 0, &ProvInfo)) + return FALSE; + + return TRUE; } #define WIN_SPUB_ACTION_PUBLISHED_SOFTWARE_NOBADUI { 0xc6b2e8d0, 0xe005, 0x11cf, { 0xa1,0x34,0x00,0xc0,0x4f,0xd7,0xbf,0x43 }} @@ -473,9 +479,8 @@ #define WIN_SPUB_ACTION_PUBLISHED_SOFTWA * 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 BOOL WINTRUST_RegisterPublishedSoftwareNoBadUi(void) { static GUID ProvGUID = WIN_SPUB_ACTION_PUBLISHED_SOFTWARE_NOBADUI; CRYPT_REGISTER_ACTIONID ProvInfo = { sizeof(CRYPT_REGISTER_ACTIONID), @@ -488,7 +493,10 @@ static void WINTRUST_RegisterPublishedSo { 0, NULL, NULL }, /* No diagnostic policy */ SoftpubCleanup }; - WintrustAddActionID(&ProvGUID, 0, &ProvInfo); + if (!WintrustAddActionID(&ProvGUID, 0, &ProvInfo)) + return FALSE; + + return TRUE; } /*************************************************************************** @@ -499,9 +507,8 @@ static void WINTRUST_RegisterPublishedSo * 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 BOOL WINTRUST_RegisterGenCertVerify(void) { static GUID ProvGUID = WINTRUST_ACTION_GENERIC_CERT_VERIFY; CRYPT_REGISTER_ACTIONID ProvInfo = { sizeof(CRYPT_REGISTER_ACTIONID), @@ -514,7 +521,10 @@ static void WINTRUST_RegisterGenCertVeri { 0, NULL, NULL }, /* No diagnostic policy */ SoftpubCleanup }; - WintrustAddActionID(&ProvGUID, 0, &ProvInfo); + if (!WintrustAddActionID(&ProvGUID, 0, &ProvInfo)) + return FALSE; + + return TRUE; } /*************************************************************************** @@ -525,9 +535,8 @@ static void WINTRUST_RegisterGenCertVeri * 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 BOOL WINTRUST_RegisterTrustProviderTest(void) { static GUID ProvGUID = WINTRUST_ACTION_TRUSTPROVIDER_TEST; CRYPT_REGISTER_ACTIONID ProvInfo = { sizeof(CRYPT_REGISTER_ACTIONID), @@ -540,7 +549,10 @@ static void WINTRUST_RegisterTrustProvid SoftpubDumpStructure, SoftpubCleanup }; - WintrustAddActionID(&ProvGUID, 0, &ProvInfo); + if (!WintrustAddActionID(&ProvGUID, 0, &ProvInfo)) + return FALSE; + + return TRUE; } /*************************************************************************** @@ -551,10 +563,10 @@ static void WINTRUST_RegisterTrustProvid * 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 BOOL WINTRUST_RegisterHttpsProv(void) { + BOOL RegisteredOK = TRUE; static CHAR SoftpubLoadUsage[] = "SoftpubLoadDefUsageCallData"; static CHAR SoftpubFreeUsage[] = "SoftpubFreeDefUsageCallData"; static GUID ProvGUID = HTTPSPROV_ACTION; @@ -576,14 +588,21 @@ static void WINTRUST_RegisterHttpsProv(v DefUsage.pwszDllName = HeapAlloc(GetProcessHeap(), 0, sizeof(SP_POLICY_PROVIDER_DLL_NAME)); lstrcpyW(DefUsage.pwszDllName, SP_POLICY_PROVIDER_DLL_NAME); - WintrustAddDefaultForUsage(szOID_PKIX_KP_SERVER_AUTH, &DefUsage); - WintrustAddDefaultForUsage(szOID_PKIX_KP_CLIENT_AUTH, &DefUsage); - WintrustAddDefaultForUsage(szOID_SERVER_GATED_CRYPTO, &DefUsage); - WintrustAddDefaultForUsage(szOID_SGC_NETSCAPE, &DefUsage); + if (!WintrustAddDefaultForUsage(szOID_PKIX_KP_SERVER_AUTH, &DefUsage)) + RegisteredOK = FALSE; + if (!WintrustAddDefaultForUsage(szOID_PKIX_KP_CLIENT_AUTH, &DefUsage)) + RegisteredOK = FALSE; + if (!WintrustAddDefaultForUsage(szOID_SERVER_GATED_CRYPTO, &DefUsage)) + RegisteredOK = FALSE; + if (!WintrustAddDefaultForUsage(szOID_SGC_NETSCAPE, &DefUsage)) + RegisteredOK = FALSE; HeapFree(GetProcessHeap(), 0, DefUsage.pwszDllName); - WintrustAddActionID(&ProvGUID, 0, &ProvInfo); + if (!WintrustAddActionID(&ProvGUID, 0, &ProvInfo)) + RegisteredOK = FALSE; + + return RegisteredOK; } /*************************************************************************** @@ -594,9 +613,8 @@ static void WINTRUST_RegisterHttpsProv(v * 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 BOOL WINTRUST_RegisterOfficeSignVerify(void) { static GUID ProvGUID = OFFICESIGN_ACTION_VERIFY; CRYPT_REGISTER_ACTIONID ProvInfo = { sizeof(CRYPT_REGISTER_ACTIONID), @@ -609,7 +627,10 @@ static void WINTRUST_RegisterOfficeSignV { 0, NULL, NULL }, /* No diagnostic policy */ OfficeCleanupPolicy }; - WintrustAddActionID(&ProvGUID, 0, &ProvInfo); + if (!WintrustAddActionID(&ProvGUID, 0, &ProvInfo)) + return FALSE; + + return TRUE; } /*************************************************************************** @@ -620,9 +641,8 @@ static void WINTRUST_RegisterOfficeSignV * 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 BOOL WINTRUST_RegisterDriverVerify(void) { static GUID ProvGUID = DRIVER_ACTION_VERIFY; CRYPT_REGISTER_ACTIONID ProvInfo = { sizeof(CRYPT_REGISTER_ACTIONID), @@ -635,7 +655,10 @@ static void WINTRUST_RegisterDriverVerif { 0, NULL, NULL }, /* No diagnostic policy */ DriverCleanupPolicy }; - WintrustAddActionID(&ProvGUID, 0, &ProvInfo); + if (!WintrustAddActionID(&ProvGUID, 0, &ProvInfo)) + return FALSE; + + return TRUE; } /*************************************************************************** @@ -646,9 +669,8 @@ static void WINTRUST_RegisterDriverVerif * 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 BOOL WINTRUST_RegisterGenChainVerify(void) { static GUID ProvGUID = WINTRUST_ACTION_GENERIC_CHAIN_VERIFY; CRYPT_REGISTER_ACTIONID ProvInfo = { sizeof(CRYPT_REGISTER_ACTIONID), @@ -661,7 +683,10 @@ static void WINTRUST_RegisterGenChainVer { 0, NULL, NULL }, /* No diagnostic policy */ SoftpubCleanup }; - WintrustAddActionID(&ProvGUID, 0, &ProvInfo); + if (!WintrustAddActionID(&ProvGUID, 0, &ProvInfo)) + return FALSE; + + return TRUE; } /***********************************************************************

1 0

Paul Vriens : wintrust: Use the return values of the registration functions .
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: 0b0fc5593d88e3f42ae47e2e0b4ec2f68f5d9611 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b0fc5593d88e3f42ae47e2… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 12 19:53:53 2006 +0200 wintrust: Use the return values of the registration functions. --- dlls/wintrust/register.c | 80 +++++++++++++++++++++++----------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 061dfaf..7a55e88 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -797,8 +797,8 @@ HRESULT WINAPI DllRegisterServer(void) static const CHAR CatMemberInfoDecode[] = "WVTAsn1CatMemberInfoDecode"; static const CHAR SpcSpOpusInfoEncode[] = "WVTAsn1SpcSpOpusInfoEncode"; static const CHAR SpcSpOpusInfoDecode[] = "WVTAsn1SpcSpOpusInfoDecode"; - HRESULT Res = S_OK; - HKEY Key; + HRESULT CryptRegisterRes = S_OK; + HRESULT TrustProviderRes = S_OK; TRACE("\n"); @@ -822,12 +822,12 @@ #define WINTRUST_REGISTEROID( oid, encod do { \ if (!CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_ENCODE_OBJECT_FUNC, oid, SP_POLICY_PROVIDER_DLL_NAME, encode_funcname)) \ { \ - Res = HRESULT_FROM_WIN32(GetLastError()); \ + CryptRegisterRes = HRESULT_FROM_WIN32(GetLastError()); \ goto add_trust_providers; \ } \ if (!CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_DECODE_OBJECT_FUNC, oid, SP_POLICY_PROVIDER_DLL_NAME, decode_funcname)) \ { \ - Res = HRESULT_FROM_WIN32(GetLastError()); \ + CryptRegisterRes = HRESULT_FROM_WIN32(GetLastError()); \ goto add_trust_providers; \ } \ } while (0) @@ -864,44 +864,44 @@ #undef WINTRUST_REGISTEROID add_trust_providers: /* 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 - * there is no check whether the actions can be written in the registry. - * As the previous list shows, there are several calls after these registrations. - * If they fail they will overwrite the returnvalue of DllRegisterServer. + * All registry writes are tried. If one fails this part will return S_FALSE + * but only if the first (CryptRegisterOIDFunction calls) and the third + * (CryptSIPAddProvider calls) part succeed. + * + * Last error is set to the last error encountered, regardless if the first + * part failed or not. */ - /* 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; - } - 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; + /* Create the necessary action registry structures */ + WINTRUST_InitRegStructs(); + + /* Register several Trust Provider actions */ + if (!WINTRUST_RegisterGenVerifyV2()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterPublishedSoftware()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterPublishedSoftwareNoBadUi()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterGenCertVerify()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterTrustProviderTest()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterHttpsProv()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterOfficeSignVerify()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterDriverVerify()) + TrustProviderRes = S_FALSE; + if (!WINTRUST_RegisterGenChainVerify()) + TrustProviderRes = S_FALSE; + + /* Free the registry structures */ + WINTRUST_FreeRegStructs(); + + if (CryptRegisterRes == S_OK) + return TrustProviderRes; + + return CryptRegisterRes; } /***********************************************************************

1 0

Louis. Lenders : shdocvw: Update version info.
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: 590d262b5a565df2791992d572c1e582be7f7842 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=590d262b5a565df2791992d… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Sep 12 17:51:09 2006 +0100 shdocvw: Update version info. --- dlls/shdocvw/version.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/version.rc b/dlls/shdocvw/version.rc index 66d9f8b..103b77c 100644 --- a/dlls/shdocvw/version.rc +++ b/dlls/shdocvw/version.rc @@ -19,9 +19,9 @@ #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine core dll" #define WINE_FILENAME_STR "shdocvw.dll" -#define WINE_FILEVERSION 5,50,4134,599 -#define WINE_FILEVERSION_STR "5.50.4134.599" -#define WINE_PRODUCTVERSION 5,50,4134,599 -#define WINE_PRODUCTVERSION_STR "5.50" +#define WINE_FILEVERSION 6,0,2900,2180 +#define WINE_FILEVERSION_STR "6.0.2900.2180" +#define WINE_PRODUCTVERSION 6,0,2900,2180 +#define WINE_PRODUCTVERSION_STR "6.0.2900.2180" #include "wine/wine_common_ver.rc"

1 0

Mike McCormack : msi: Delete databases we create but never commit.
by Alexandre Julliard 13 Sep '06

13 Sep '06

Module: wine Branch: master Commit: 74a6a1e71b06f0fbf6e6c61e00233ebb2ab29d82 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=74a6a1e71b06f0fbf6e6c61… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Sep 13 00:47:10 2006 +0900 msi: Delete databases we create but never commit. --- dlls/msi/database.c | 26 ++++++++++++++++++++------ dlls/msi/msipriv.h | 1 + dlls/msi/msiquery.c | 6 ++++++ dlls/msi/tests/db.c | 41 ++++++++++++++++++++++++++++++++++------- 4 files changed, 61 insertions(+), 13 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index b92d3bf..1c0a586 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -64,6 +64,11 @@ static VOID MSI_CloseDatabase( MSIOBJECT r = IStorage_Release( db->storage ); if( r ) ERR("database reference count was not zero (%ld)\n", r); + if (db->deletefile) + { + DeleteFileW( db->deletefile ); + msi_free( db->deletefile ); + } } UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) @@ -74,6 +79,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, UINT ret = ERROR_FUNCTION_FAILED; LPCWSTR szMode; STATSTG stat; + BOOL created = FALSE; TRACE("%s %s\n",debugstr_w(szDBPath),debugstr_w(szPersist) ); @@ -83,12 +89,15 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, szMode = szPersist; if( HIWORD( szPersist ) ) { - /* UINT len = lstrlenW( szPerist ) + 1; */ - FIXME("don't support persist files yet\b"); - return ERROR_INVALID_PARAMETER; - /* szMode = msi_alloc( len * sizeof (DWORD) ); */ + if (!CopyFileW( szDBPath, szPersist, FALSE )) + return ERROR_OPEN_FAILED; + + szDBPath = szPersist; + szPersist = MSIDBOPEN_TRANSACT; + created = TRUE; } - else if( szPersist == MSIDBOPEN_READONLY ) + + if( szPersist == MSIDBOPEN_READONLY ) { r = StgOpenStorage( szDBPath, NULL, STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); @@ -97,13 +106,14 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, { /* FIXME: MSIDBOPEN_CREATE should case STGM_TRANSACTED flag to be * used here: */ - r = StgCreateDocfile( szDBPath, + r = StgCreateDocfile( szDBPath, STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg); if( r == ERROR_SUCCESS ) { IStorage_SetClass( stg, &CLSID_MsiDatabase ); r = init_string_table( stg ); } + created = TRUE; } else if( szPersist == MSIDBOPEN_TRANSACT ) { @@ -157,6 +167,10 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, db->storage = stg; db->mode = szMode; + if (created) + db->deletefile = strdupW( szDBPath ); + else + db->deletefile = NULL; list_init( &db->tables ); list_init( &db->transforms ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9a9b8b4..9177b1d 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -71,6 +71,7 @@ typedef struct tagMSIDATABASE MSIOBJECTHDR hdr; IStorage *storage; string_table *strings; + LPWSTR deletefile; LPCWSTR mode; struct list tables; struct list transforms; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 78614fe..157ae18 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -753,6 +753,12 @@ UINT WINAPI MsiDatabaseCommit( MSIHANDLE msiobj_release( &db->hdr ); + if (r == ERROR_SUCCESS) + { + msi_free( db->deletefile ); + db->deletefile = NULL; + } + return r; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index f46190a..86d2389 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -40,6 +40,15 @@ static void test_msidatabase(void) DeleteFile(msifile); + res = MsiOpenDatabase( msifile, msifile2, &hdb ); + ok( res == ERROR_OPEN_FAILED, "expected failure\n"); + + res = MsiOpenDatabase( msifile, (LPSTR) 0xff, &hdb ); + ok( res == ERROR_INVALID_PARAMETER, "expected failure\n"); + + res = MsiCloseHandle( hdb ); + ok( res == ERROR_SUCCESS , "Failed to close database\n" ); + /* create an empty database */ res = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb ); ok( res == ERROR_SUCCESS , "Failed to create database\n" ); @@ -51,18 +60,36 @@ static void test_msidatabase(void) res = MsiCloseHandle( hdb ); ok( res == ERROR_SUCCESS , "Failed to close database\n" ); - todo_wine { res = MsiOpenDatabase( msifile, msifile2, &hdb2 ); - ok( res == ERROR_SUCCESS , "Failed to close database\n" ); + ok( res == ERROR_SUCCESS , "Failed to open database\n" ); ok( INVALID_FILE_ATTRIBUTES != GetFileAttributes( msifile2 ), "database should exist\n"); res = MsiDatabaseCommit( hdb2 ); ok( res == ERROR_SUCCESS , "Failed to commit database\n" ); - } + res = MsiCloseHandle( hdb2 ); ok( res == ERROR_SUCCESS , "Failed to close database\n" ); + res = MsiOpenDatabase( msifile, msifile2, &hdb2 ); + ok( res == ERROR_SUCCESS , "Failed to open database\n" ); + + res = MsiCloseHandle( hdb2 ); + ok( res == ERROR_SUCCESS , "Failed to close database\n" ); + + ok( INVALID_FILE_ATTRIBUTES == GetFileAttributes( msifile2 ), "uncommitted database should not exist\n"); + + res = MsiOpenDatabase( msifile, msifile2, &hdb2 ); + ok( res == ERROR_SUCCESS , "Failed to close database\n" ); + + res = MsiDatabaseCommit( hdb2 ); + ok( res == ERROR_SUCCESS , "Failed to commit database\n" ); + + res = MsiCloseHandle( hdb2 ); + ok( res == ERROR_SUCCESS , "Failed to close database\n" ); + + ok( INVALID_FILE_ATTRIBUTES != GetFileAttributes( msifile2 ), "committed database should exist\n"); + res = MsiOpenDatabase( msifile, MSIDBOPEN_READONLY, &hdb ); ok( res == ERROR_SUCCESS , "Failed to open database\n" ); @@ -80,9 +107,9 @@ static void test_msidatabase(void) res = MsiCloseHandle( hdb ); ok( res == ERROR_SUCCESS , "Failed to close database\n" ); - todo_wine { - ok( INVALID_FILE_ATTRIBUTES != GetFileAttributes( msifile2 ), "database should exist\n"); + ok( INVALID_FILE_ATTRIBUTES != GetFileAttributes( msifile ), "database should exist\n"); + todo_wine { /* MSIDBOPEN_CREATE deletes the database if MsiCommitDatabase isn't called */ res = MsiOpenDatabase( msifile, MSIDBOPEN_CREATE, &hdb ); ok( res == ERROR_SUCCESS , "Failed to open database\n" ); @@ -98,10 +125,10 @@ static void test_msidatabase(void) res = MsiCloseHandle( hdb ); ok( res == ERROR_SUCCESS , "Failed to close database\n" ); - + } res = DeleteFile( msifile2 ); ok( res == TRUE, "Failed to delete database\n" ); - } + res = DeleteFile( msifile ); ok( res == TRUE, "Failed to delete database\n" ); }

1 0

Alexandre Julliard : git-notify: Always exec the main git binary instead of the specific commands.
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: tools Branch: master Commit: e87d936f2129488aa8ba20508c4611e1c87b3cfb URL: http://source.winehq.org/git/?p=tools.git;a=commit;h=e87d936f2129488aa8ba20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 20:07:06 2006 +0200 git-notify: Always exec the main git binary instead of the specific commands. --- git-notify | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/git-notify b/git-notify index 8301824..228d7a4 100755 --- a/git-notify +++ b/git-notify @@ -153,7 +153,7 @@ sub mail_notification($$$@) # get the default repository name sub get_repos_name() { - my $dir = `git-rev-parse --git-dir`; + my $dir = `git rev-parse --git-dir`; chomp $dir; my $repos = realpath($dir); $repos =~ s/(.*?)((\.git\/)?\.git)$/\1/; @@ -169,10 +169,12 @@ sub get_object_info($) my @log = (); my $do_log = 0; - my $type = `git-cat-file -t $obj`; + open TYPE, "-|" or exec "git", "cat-file", "-t", $obj or die "cannot run git-cat-file"; + my $type = <TYPE>; chomp $type; + close TYPE; - open OBJ, "git-cat-file $type $obj |" or die "cannot run git-cat-file"; + open OBJ, "-|" or exec "git", "cat-file", $type, $obj or die "cannot run git-cat-file"; while (<OBJ>) { chomp; @@ -325,7 +327,7 @@ sub send_global_notice($$$) my ($ref, $old_sha1, $new_sha1) = @_; my @notice = (); - open LIST, "-|" or exec "git-rev-list", "--pretty", "^$old_sha1", "$new_sha1", @exclude_list or die "cannot exec git-rev-list"; + open LIST, "-|" or exec "git", "rev-list", "--pretty", "^$old_sha1", "$new_sha1", @exclude_list or die "cannot exec git-rev-list"; while (<LIST>) { chomp; @@ -351,7 +353,7 @@ if ($ARGV[1] eq '0' x 40) # new ref my @commits = (); -open LIST, "-|" or exec "git-rev-list", "^$ARGV[1]", "$ARGV[2]", @exclude_list or die "cannot exec git-rev-list"; +open LIST, "-|" or exec "git", "rev-list", "^$ARGV[1]", "$ARGV[2]", @exclude_list or die "cannot exec git-rev-list"; while (<LIST>) { chomp;

1 0

Alexandre Julliard : git-notify: Add rename information in CIA notices.
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: tools Branch: master Commit: fffa24869eed8a035530bccddbc1caa1b9c9d2bf URL: http://source.winehq.org/git/?p=tools.git;a=commit;h=fffa24869eed8a035530bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 20:06:06 2006 +0200 git-notify: Add rename information in CIA notices. --- git-notify | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/git-notify b/git-notify index 794f4b2..8301824 100755 --- a/git-notify +++ b/git-notify @@ -289,7 +289,7 @@ sub send_cia_notice($$) " <log>" . xml_escape(join "\n", @{$info{"log"}}) . "</log>", " <files>"; - open COMMIT, "git-diff-tree --name-status -r $commit |" or die "cannot run git-diff-tree"; + open COMMIT, "-|" or exec "git", "diff-tree", "--name-status", "-r", "-M", $commit or die "cannot run git-diff-tree"; while (<COMMIT>) { chomp; @@ -300,6 +300,11 @@ sub send_cia_notice($$) next unless defined $actions{$action}; push @cia_text, " <file action=\"$actions{$action}\">" . xml_escape($file) . "</file>"; } + elsif (/^R\d+\t(.*)\t(.*)$/) + { + my ($old, $new) = ($1, $2); + push @cia_text, " <file action=\"rename\" to=\"" . xml_escape($new) . "\">" . xml_escape($old) . "</file>"; + } } close COMMIT;

1 0

Alexandre Julliard : git-notify: Show rename information in mailed diffs and stats.
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: tools Branch: master Commit: 93eb18b8cba016ae1965567f5320ae761b738cb0 URL: http://source.winehq.org/git/?p=tools.git;a=commit;h=93eb18b8cba016ae196556… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 20:05:23 2006 +0200 git-notify: Show rename information in mailed diffs and stats. --- git-notify | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/git-notify b/git-notify index 2a42670..794f4b2 100755 --- a/git-notify +++ b/git-notify @@ -240,10 +240,14 @@ sub send_commit_notice($$) "---", ""; - my $stat = `git-diff-tree -p $obj | git-apply --stat --summary`; - my $diff = `git-diff-tree -p --no-commit-id $obj`; + open STAT, "-|" or exec "git", "diff-tree", "--stat", "-M", "--no-commit-id", $obj or die "cannot exec git-diff-tree"; + push @notice, join("", <STAT>); + close STAT; + + open DIFF, "-|" or exec "git", "diff-tree", "-p", "-M", "--no-commit-id", $obj or die "cannot exec git-diff-tree"; + my $diff = join( "", <DIFF> ); + close DIFF; - push @notice, $stat; if (($max_diff_size == -1) || (length($diff) < $max_diff_size)) { push @notice, $diff;

1 0

Alexandre Julliard : wine_release: Avoid truncation issues with man2html.
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: tools Branch: master Commit: 213e166e771e77e912c714d89852412e8aacaf6c URL: http://source.winehq.org/git/?p=tools.git;a=commit;h=213e166e771e77e912c714… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 24 18:25:29 2006 +0200 wine_release: Avoid truncation issues with man2html. --- wine_release | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/wine_release b/wine_release index 60bd0ea..5d2fde7 100755 --- a/wine_release +++ b/wine_release @@ -68,7 +68,7 @@ for f in $manpages do name=`basename $f .man` make -C `dirname $f` $name.man - nroff -man $f | ../bin/man2html | ../html2template -o $templates_dir/en/docs/$name.template + nroff -man $f | ../bin/man2html --pgsize=100000 | ../html2template -o $templates_dir/en/docs/$name.template done git diff --stat wine-$oldver wine-$version >../ds$version.txt

1 0

lostwages/templates/en status.template status_ ...
by Jeremy Newman 12 Sep '06

12 Sep '06

ChangeSet ID: 28027 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/09/12 11:14:15 Modified files: templates/en : status.template status_changelog.template status_directx.template status_dlls.template status_multimedia.template status_todo.template status_wine.template Log message: Tom Wickline <twickline(a)gmail.com> status updates Patch: http://cvs.winehq.org/patch.py?id=28027 Old revision New revision Changes Path 1.45 1.46 +1 -1 lostwages/templates/en/status.template 1.49 1.50 +14 -0 lostwages/templates/en/status_changelog.template 1.22 1.23 +1 -1 lostwages/templates/en/status_directx.template 1.41 1.42 +61 -34 lostwages/templates/en/status_dlls.template 1.19 1.20 +1 -1 lostwages/templates/en/status_multimedia.template 1.19 1.20 +3 -7 lostwages/templates/en/status_todo.template 1.27 1.28 +26 -11 lostwages/templates/en/status_wine.template

1 0