October 2010 - Wine-commits

Stefan Dösinger : ddraw: Don' t try to enumerate WINED3DFMT_R8G8B8A8_SNORM.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 7cfaf611d05d46eda680255eb3dda53fe08d9611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cfaf611d05d46eda680255eb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 6 14:09:12 2010 +0200 ddraw: Don't try to enumerate WINED3DFMT_R8G8B8A8_SNORM. There is no ddraw equivalent for this format, as ddraw only supports 2 bump channels. Trying to enumerate this format will only lead to a confusing (but correct) ERR message --- dlls/ddraw/device.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 0056a40..720aaa0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1122,7 +1122,6 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, WINED3DFMT_R8G8_SNORM, WINED3DFMT_R5G5_SNORM_L6_UNORM, WINED3DFMT_R8G8_SNORM_L8X8_UNORM, - WINED3DFMT_R8G8B8A8_SNORM, WINED3DFMT_R16G16_SNORM, WINED3DFMT_R10G11B11_SNORM, WINED3DFMT_R10G10B10_SNORM_A2_UNORM

1 0

Stefan Dösinger : ddraw: Handle WINED3DFMT_R16G16_SNORM.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 3ea9024f557f6b428315dabcf991add1f5dcbd1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea9024f557f6b428315dabcf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 6 14:10:59 2010 +0200 ddraw: Handle WINED3DFMT_R16G16_SNORM. --- dlls/ddraw/utils.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 07c3ccc..9d1b892 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -311,6 +311,16 @@ void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_i DDPixelFormat->u5.dwLuminanceAlphaBitMask = 0x00000000; break; + case WINED3DFMT_R16G16_SNORM: + DDPixelFormat->dwFlags = DDPF_BUMPDUDV; + DDPixelFormat->dwFourCC = 0; + DDPixelFormat->u1.dwBumpBitCount = 32; + DDPixelFormat->u2.dwBumpDuBitMask = 0x0000ffff; + DDPixelFormat->u3.dwBumpDvBitMask = 0xffff0000; + DDPixelFormat->u4.dwBumpLuminanceBitMask = 0x00000000; + DDPixelFormat->u5.dwLuminanceAlphaBitMask = 0x00000000; + break; + case WINED3DFMT_R5G5_SNORM_L6_UNORM: DDPixelFormat->dwFlags = DDPF_BUMPDUDV; DDPixelFormat->dwFourCC = 0; @@ -579,6 +589,13 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat { return WINED3DFMT_R8G8_SNORM; } + else if ( (DDPixelFormat->u1.dwBumpBitCount == 32 ) && + (DDPixelFormat->u2.dwBumpDuBitMask == 0x0000ffff) && + (DDPixelFormat->u3.dwBumpDvBitMask == 0xffff0000) && + (DDPixelFormat->u4.dwBumpLuminanceBitMask == 0x00000000) ) + { + return WINED3DFMT_R16G16_SNORM; + } else if ( (DDPixelFormat->u1.dwBumpBitCount == 16 ) && (DDPixelFormat->u2.dwBumpDuBitMask == 0x0000001f) && (DDPixelFormat->u3.dwBumpDvBitMask == 0x000003e0) &&

1 0

Hans Leidekker : msi: Remove a potentially noisy trace.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 8bc9a499d1fd228628fbce36421f4b0fb6289f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc9a499d1fd228628fbce364… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 6 15:42:10 2010 +0200 msi: Remove a potentially noisy trace. --- dlls/msi/join.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msi/join.c b/dlls/msi/join.c index 5e11577..7fe7f1c 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -60,8 +60,6 @@ static UINT JOIN_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *v UINT cols = 0; UINT prev_rows = 1; - TRACE("%d, %d\n", row, col); - if (col == 0 || col > jv->columns) return ERROR_FUNCTION_FAILED;

1 0

Hans Leidekker : msi: Validate packages based on supported version, platform and languages.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: ca7cd1bf89d057d9c48896b70c441fad941e6ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7cd1bf89d057d9c48896b70… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 6 15:44:08 2010 +0200 msi: Validate packages based on supported version, platform and languages. --- dlls/msi/msipriv.h | 2 ++ dlls/msi/package.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/msi/suminfo.c | 12 ++++++++++++ 3 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9149aa6..bff9990 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -315,6 +315,7 @@ typedef struct tagMSIPACKAGE { MSIOBJECTHDR hdr; MSIDATABASE *db; + INT version; enum platform platform; UINT num_langids; LANGID *langids; @@ -855,6 +856,7 @@ extern UINT msi_spawn_error_dialog( MSIPACKAGE*, LPWSTR, LPWSTR ); /* summary information */ extern MSISUMMARYINFO *MSI_GetSummaryInformationW( IStorage *stg, UINT uiUpdateCount ); extern LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ); +extern INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ); extern LPWSTR msi_get_suminfo_product( IStorage *stg ); extern UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2b44e64..cd1cdf8 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1292,6 +1292,9 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package ) WCHAR *template, *p, *q; DWORD i, count; + package->version = msi_suminfo_get_int32( si, PID_PAGECOUNT ); + TRACE("version: %d\n", package->version); + template = msi_suminfo_dup_string( si, PID_TEMPLATE ); if (!template) return ERROR_SUCCESS; /* native accepts missing template property */ @@ -1316,7 +1319,7 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package ) { WARN("unknown platform %s\n", debugstr_w(template)); msi_free( template ); - return ERROR_PATCH_PACKAGE_INVALID; + return ERROR_INSTALL_PLATFORM_UNSUPPORTED; } count = 1; @@ -1345,6 +1348,32 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package ) return ERROR_SUCCESS; } +static UINT validate_package( MSIPACKAGE *package ) +{ + static const BOOL is_64bit = sizeof(void *) > sizeof(int); + BOOL is_wow64; + UINT i; + + IsWow64Process( GetCurrentProcess(), &is_wow64 ); + if (package->platform == PLATFORM_X64) + { + if (!is_64bit && !is_wow64) + return ERROR_INSTALL_PLATFORM_UNSUPPORTED; + if (package->version < 200) + return ERROR_INSTALL_PACKAGE_INVALID; + } + if (!package->num_langids) + { + return ERROR_SUCCESS; + } + for (i = 0; i < package->num_langids; i++) + { + if (!package->langids[i] || IsValidLocale( package->langids[i], LCID_INSTALLED )) + return ERROR_SUCCESS; + } + return ERROR_INSTALL_LANGUAGE_UNSUPPORTED; +} + UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) { static const WCHAR Database[] = {'D','A','T','A','B','A','S','E',0}; @@ -1474,6 +1503,12 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) return r; } + r = validate_package( package ); + if (r != ERROR_SUCCESS) + { + msiobj_release( &package->hdr ); + return r; + } msi_set_property( package->db, Database, db->path ); if( UrlIsW( szPackage, URLIS_URL ) ) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index b174e5b..2a9cd71 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -644,6 +644,18 @@ LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ) return strdupAtoW( prop->u.pszVal ); } +INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) +{ + PROPVARIANT *prop; + + if ( uiProperty >= MSI_MAX_PROPS ) + return -1; + prop = &si->property[uiProperty]; + if( prop->vt != VT_I4 ) + return -1; + return prop->u.lVal; +} + LPWSTR msi_get_suminfo_product( IStorage *stg ) { MSISUMMARYINFO *si;

1 0

Juan Lang : include: Define a few missing CERT_TRUST error and info flags.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: b6a5772a0c2cb023590e5781ca85ea7cea79a4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a5772a0c2cb023590e5781c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 5 13:38:35 2010 -0700 include: Define a few missing CERT_TRUST error and info flags. --- include/wincrypt.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 39c098a..bdd68ea 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -867,6 +867,8 @@ typedef struct _CERT_TRUST_LIST_INFO { #define CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT 0x00008000 #define CERT_TRUST_IS_OFFLINE_REVOCATION 0x01000000 #define CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY 0x02000000 +#define CERT_TRUST_IS_EXPLICIT_DISTRUST 0x04000000 +#define CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT 0x08000000 #define CERT_TRUST_IS_PARTIAL_CHAIN 0x00010000 #define CERT_TRUST_CTL_IS_NOT_TIME_VALID 0x00020000 @@ -881,6 +883,8 @@ typedef struct _CERT_TRUST_LIST_INFO { #define CERT_TRUST_HAS_PREFERRED_ISSUER 0x00000100 #define CERT_TRUST_HAS_ISSUANCE_CHAIN_POLICY 0x00000200 #define CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS 0x00000400 +#define CERT_TRUST_IS_PEER_TRUSTED 0x00000800 +#define CERT_TRUST_HAS_CRL_VALIDITY_EXTENDED 0x00001000 #define CERT_TRUST_IS_COMPLEX_CHAIN 0x00010000

1 0

Juan Lang : include: Define a couple more CERT_CHAIN_POLICY flags.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 70462b5e0800bdd2f1d6e7ea208cda4e7818c4c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70462b5e0800bdd2f1d6e7ea2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 5 19:29:20 2010 -0700 include: Define a couple more CERT_CHAIN_POLICY flags. --- include/wincrypt.h | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index bdd68ea..c813738 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -975,9 +975,11 @@ typedef struct _CERT_CHAIN_POLICY_STATUS { CERT_CHAIN_POLICY_IGNORE_CA_REV_UNKNOWN_FLAG \ CERT_CHAIN_POLICY_IGNORE_ROOT_REV_UNKNOWN_FLAG ) -#define CERT_CHAIN_POLICY_TRUST_TESTROOT_FLAG 0x00004000 -#define CERT_CHAIN_POLICY_ALLOW_TESTROOT_FLAG 0x00008000 -#define MICROSOFT_ROOT_CERT_CHAIN_POLICY_ENABLE_TEST_ROOT_FLAG 0x00010000 +#define CERT_CHAIN_POLICY_IGNORE_PEER_TRUST_FLAG 0x00001000 +#define CERT_CHAIN_POLICY_IGNORE_NOT_SUPPORTED_CRITICAL_EXT_FLAG 0x00002000 +#define CERT_CHAIN_POLICY_TRUST_TESTROOT_FLAG 0x00004000 +#define CERT_CHAIN_POLICY_ALLOW_TESTROOT_FLAG 0x00008000 +#define MICROSOFT_ROOT_CERT_CHAIN_POLICY_ENABLE_TEST_ROOT_FLAG 0x00010000 typedef struct _AUTHENTICODE_EXTRA_CERT_CHAIN_POLICY_PARA { DWORD cbSize;

1 0

Alexandre Julliard : wine.inf: Add a few more common functions to be excluded from relay traces.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: c6a6541d13d51f6f1d350a27edbc986bb7ccdf35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a6541d13d51f6f1d350a27e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 11:44:48 2010 +0200 wine.inf: Add a few more common functions to be excluded from relay traces. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 1146ec6..04fa375 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -483,7 +483,7 @@ HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%" [Debugger] HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" HKLM,%CurrentVersionNT%\AeDebug,"Auto",2,"1" -HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98" +HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98;kernel32.TlsGetValue;kernel32.TlsSetValue;kernel32.FlsGetValue;kernel32.FlsSetValue;kernel32.SetLastError" HKCU,Software\Wine\Debug,"RelayFromExclude",2,"winex11.drv;user32;gdi32;advapi32;kernel32" [Desktop]

1 0

Juan Lang : crypt32/tests: Add more tests of verifying the base policy, including flags to ignore certain errors.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: c4c70b608c569396c0a846ccd2c5cc99b470915b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c70b608c569396c0a846ccd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 4 17:43:09 2010 -0700 crypt32/tests: Add more tests of verifying the base policy, including flags to ignore certain errors. --- dlls/crypt32/tests/chain.c | 70 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index b3fd1c4..5ee5050 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3745,6 +3745,38 @@ static const ChainPolicyCheck basePolicyCheck[] = { { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, NULL, 0 }, }; +static const ChainPolicyCheck ignoredUnknownCABasePolicyCheck = { + { sizeof(chain0) / sizeof(chain0[0]), chain0 }, + { 0, CERT_E_EXPIRED, 0, 0, NULL }, NULL, TODO_ERROR +}; + +/* Windows NT 4 has a different error code when the validity period doesn't + * nest. (It's arguably more correct than other Windows versions, but since + * others do not emulate its behavior, we mark its behavior broken.) + */ +static const CERT_CHAIN_POLICY_STATUS badDateNestingStatus = + { 0, CERT_E_VALIDITYPERIODNESTING, 0, 0, NULL }; + +static const ChainPolicyCheck ignoredBadDateNestingBasePolicyCheck = { + { sizeof(chain2) / sizeof(chain2[0]), chain2 }, + { 0, CERT_E_EXPIRED, 0, 1, NULL}, &badDateNestingStatus, TODO_ERROR +}; + +static const ChainPolicyCheck ignoredInvalidDateBasePolicyCheck = { + { sizeof(googleChain) / sizeof(googleChain[0]), googleChain }, + { 0, CERT_E_EXPIRED, 0, 1, NULL}, NULL, TODO_ERROR +}; + +static const ChainPolicyCheck ignoredInvalidUsageBasePolicyCheck = { + { sizeof(chain15) / sizeof(chain15[0]), chain15 }, + { 0, CERT_E_EXPIRED, 0, 1, NULL}, NULL, TODO_ERROR +}; + +static const ChainPolicyCheck invalidUsageBasePolicyCheck = { + { sizeof(chain15) / sizeof(chain15[0]), chain15 }, + { 0, CERT_E_WRONG_USAGE, 0, 1, NULL}, NULL, TODO_ERROR +}; + static const ChainPolicyCheck sslPolicyCheck[] = { { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, @@ -4039,6 +4071,39 @@ static void checkChainPolicyStatus(LPCSTR policy, HCERTCHAINENGINE engine, } } +static void check_base_policy(void) +{ + DWORD i; + CERT_CHAIN_POLICY_PARA policyPara = { 0 }; + + for (i = 0; + i < sizeof(basePolicyCheck) / sizeof(basePolicyCheck[0]); i++) + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &basePolicyCheck[i], i, &oct2007, NULL); + policyPara.cbSize = sizeof(policyPara); + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG; + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &ignoredUnknownCABasePolicyCheck, 0, &oct2007, &policyPara); + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | + CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &ignoredBadDateNestingBasePolicyCheck, 0, &oct2007, &policyPara); + policyPara.dwFlags = CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &ignoredInvalidDateBasePolicyCheck, 0, &oct2007, &policyPara); + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | + CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG; + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | + CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG | + CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG; + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &ignoredInvalidUsageBasePolicyCheck, 0, &oct2007, &policyPara); + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | + CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &invalidUsageBasePolicyCheck, 0, &oct2007, &policyPara); +} + static void check_ssl_policy(void) { DWORD i; @@ -4288,10 +4353,7 @@ static void testVerifyCertChainPolicy(void) pCertFreeCertificateChain(chain); CertFreeCertificateContext(cert); - for (i = 0; - i < sizeof(basePolicyCheck) / sizeof(basePolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, - &basePolicyCheck[i], i, &oct2007, NULL); + check_base_policy(); check_ssl_policy(); /* The authenticode policy doesn't seem to check anything beyond the base * policy. It might check for chains signed by the MS test cert, but none

1 0

Juan Lang : crypt32: Improve error checking for the base policy.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 966d722752b659a12ffa355a1e559f94907cd66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=966d722752b659a12ffa355a1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 4 18:16:16 2010 -0700 crypt32: Improve error checking for the base policy. --- dlls/crypt32/chain.c | 42 ++++++++++++++++++++++++++++++++---------- dlls/crypt32/tests/chain.c | 13 ++++--------- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 4b6fdba..266e6ab 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2904,7 +2904,12 @@ static BOOL WINAPI verify_base_policy(LPCSTR szPolicyOID, PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, PCERT_CHAIN_POLICY_STATUS pPolicyStatus) { + DWORD checks = 0; + + if (pPolicyPara) + checks = pPolicyPara->dwFlags; pPolicyStatus->lChainIndex = pPolicyStatus->lElementIndex = -1; + pPolicyStatus->dwError = NO_ERROR; if (pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_SIGNATURE_VALID) { @@ -2913,14 +2918,6 @@ static BOOL WINAPI verify_base_policy(LPCSTR szPolicyOID, CERT_TRUST_IS_NOT_SIGNATURE_VALID, &pPolicyStatus->lChainIndex, &pPolicyStatus->lElementIndex); } - else if (pChainContext->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_UNTRUSTED_ROOT) - { - pPolicyStatus->dwError = CERT_E_UNTRUSTEDROOT; - find_element_with_error(pChainContext, - CERT_TRUST_IS_UNTRUSTED_ROOT, &pPolicyStatus->lChainIndex, - &pPolicyStatus->lElementIndex); - } else if (pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_CYCLIC) { pPolicyStatus->dwError = CERT_E_CHAINING; @@ -2929,8 +2926,33 @@ static BOOL WINAPI verify_base_policy(LPCSTR szPolicyOID, /* For a cyclic chain, which element is a cycle isn't meaningful */ pPolicyStatus->lElementIndex = -1; } - else - pPolicyStatus->dwError = NO_ERROR; + if (!pPolicyStatus->dwError && + pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT && + !(checks & CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG)) + { + pPolicyStatus->dwError = CERT_E_UNTRUSTEDROOT; + find_element_with_error(pChainContext, + CERT_TRUST_IS_UNTRUSTED_ROOT, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + } + if (!pPolicyStatus->dwError && + pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID) + { + pPolicyStatus->dwError = CERT_E_EXPIRED; + find_element_with_error(pChainContext, + CERT_TRUST_IS_NOT_TIME_VALID, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + } + if (!pPolicyStatus->dwError && + pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_NOT_VALID_FOR_USAGE && + !(checks & CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG)) + { + pPolicyStatus->dwError = CERT_E_WRONG_USAGE; + find_element_with_error(pChainContext, + CERT_TRUST_IS_NOT_VALID_FOR_USAGE, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + } return TRUE; } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 5ee5050..9fe24b6 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3745,11 +3745,6 @@ static const ChainPolicyCheck basePolicyCheck[] = { { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, NULL, 0 }, }; -static const ChainPolicyCheck ignoredUnknownCABasePolicyCheck = { - { sizeof(chain0) / sizeof(chain0[0]), chain0 }, - { 0, CERT_E_EXPIRED, 0, 0, NULL }, NULL, TODO_ERROR -}; - /* Windows NT 4 has a different error code when the validity period doesn't * nest. (It's arguably more correct than other Windows versions, but since * others do not emulate its behavior, we mark its behavior broken.) @@ -3759,12 +3754,12 @@ static const CERT_CHAIN_POLICY_STATUS badDateNestingStatus = static const ChainPolicyCheck ignoredBadDateNestingBasePolicyCheck = { { sizeof(chain2) / sizeof(chain2[0]), chain2 }, - { 0, CERT_E_EXPIRED, 0, 1, NULL}, &badDateNestingStatus, TODO_ERROR + { 0, CERT_E_EXPIRED, 0, 1, NULL}, &badDateNestingStatus, TODO_ELEMENTS }; static const ChainPolicyCheck ignoredInvalidDateBasePolicyCheck = { { sizeof(googleChain) / sizeof(googleChain[0]), googleChain }, - { 0, CERT_E_EXPIRED, 0, 1, NULL}, NULL, TODO_ERROR + { 0, CERT_E_EXPIRED, 0, 1, NULL}, NULL, TODO_ELEMENTS }; static const ChainPolicyCheck ignoredInvalidUsageBasePolicyCheck = { @@ -3774,7 +3769,7 @@ static const ChainPolicyCheck ignoredInvalidUsageBasePolicyCheck = { static const ChainPolicyCheck invalidUsageBasePolicyCheck = { { sizeof(chain15) / sizeof(chain15[0]), chain15 }, - { 0, CERT_E_WRONG_USAGE, 0, 1, NULL}, NULL, TODO_ERROR + { 0, CERT_E_WRONG_USAGE, 0, 1, NULL}, NULL, 0 }; static const ChainPolicyCheck sslPolicyCheck[] = { @@ -4083,7 +4078,7 @@ static void check_base_policy(void) policyPara.cbSize = sizeof(policyPara); policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG; checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, - &ignoredUnknownCABasePolicyCheck, 0, &oct2007, &policyPara); + &ignoredUnknownCAPolicyCheck, 0, &oct2007, &policyPara); policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL,

1 0

Henri Verbeet : wined3d: Acquire / release the focus window during reset.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: a59d0f45c1ab26c4754c9eb5d8c730a5dc997ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59d0f45c1ab26c4754c9eb5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 6 12:01:29 2010 +0200 wined3d: Acquire / release the focus window during reset. --- dlls/wined3d/device.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7b2b8ce..97acd5f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6354,15 +6354,30 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface, if (!pPresentationParameters->Windowed != !swapchain->presentParms.Windowed || DisplayModeChanged) { + BOOL filter = This->filter_messages; + This->filter_messages = TRUE; + IWineD3DDevice_SetDisplayMode(iface, 0, &mode); if (!pPresentationParameters->Windowed) { - if(swapchain->presentParms.Windowed) { + if (swapchain->presentParms.Windowed) + { + HWND focus_window = This->createParms.hFocusWindow; + if (!focus_window) focus_window = pPresentationParameters->hDeviceWindow; + if (FAILED(hr = IWineD3DDevice_AcquireFocusWindow(iface, focus_window))) + { + ERR("Failed to acquire focus window, hr %#x.\n", hr); + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); + return hr; + } + /* switch from windowed to fs */ swapchain_setup_fullscreen_window(swapchain, pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight); - } else { + } + else + { /* Fullscreen -> fullscreen mode change */ MoveWindow(swapchain->device_window, 0, 0, pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight, @@ -6373,9 +6388,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface, { /* Fullscreen -> windowed switch */ swapchain_restore_fullscreen_window(swapchain); + IWineD3DDevice_ReleaseFocusWindow(iface); } swapchain->presentParms.Windowed = pPresentationParameters->Windowed; - } else if(!pPresentationParameters->Windowed) { + + This->filter_messages = filter; + } + else if (!pPresentationParameters->Windowed) + { DWORD style = This->style, exStyle = This->exStyle; /* If we're in fullscreen, and the mode wasn't changed, we have to get the window back into * the right position. Some applications(Battlefield 2, Guild Wars) move it and then call

1 0