October 2009 - Wine-commits

Henri Verbeet : wined3d: Remove some unused GLINFO_LOCATION definitions.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: d7b087618b3fdf48d0539d82310f18530c2397b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b087618b3fdf48d0539d823… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 10:37:09 2009 +0100 wined3d: Remove some unused GLINFO_LOCATION definitions. --- dlls/wined3d/baseshader.c | 3 +-- dlls/wined3d/cubetexture.c | 6 ------ dlls/wined3d/pixelshader.c | 2 -- dlls/wined3d/stateblock.c | 1 - dlls/wined3d/texture.c | 6 ------ dlls/wined3d/vertexdeclaration.c | 2 -- dlls/wined3d/vertexshader.c | 2 -- dlls/wined3d/volumetexture.c | 2 -- 8 files changed, 1 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a6bea57..bb94a5a 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1391,7 +1391,6 @@ static HRESULT shader_none_alloc(IWineD3DDevice *iface) {return WINED3D_OK;} static void shader_none_free(IWineD3DDevice *iface) {} static BOOL shader_none_dirty_const(IWineD3DDevice *iface) {return FALSE;} -#define GLINFO_LOCATION (*gl_info) static void shader_none_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_info *gl_info, struct shader_caps *pCaps) { @@ -1400,7 +1399,7 @@ static void shader_none_get_caps(WINED3DDEVTYPE devtype, pCaps->PixelShaderVersion = 0; pCaps->PixelShader1xMaxValue = 0.0f; } -#undef GLINFO_LOCATION + static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup) { if (TRACE_ON(d3d_shader) && TRACE_ON(d3d)) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index ade200f..f22845b 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); -#define GLINFO_LOCATION (*gl_info) - static void cubetexture_internal_preload(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb) { /* Override the IWineD3DResource Preload method. */ @@ -141,14 +139,10 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) basetexture_cleanup((IWineD3DBaseTexture *)This); } -#undef GLINFO_LOCATION - /* ******************************************* IWineD3DCubeTexture IUnknown parts follow ******************************************* */ -#define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info - static HRESULT WINAPI IWineD3DCubeTextureImpl_QueryInterface(IWineD3DCubeTexture *iface, REFIID riid, LPVOID *ppobj) { IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index c82faa5..09fbe24 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); -#define GLINFO_LOCATION ((IWineD3DDeviceImpl *) This->baseShader.device)->adapter->gl_info - static HRESULT WINAPI IWineD3DPixelShaderImpl_QueryInterface(IWineD3DPixelShader *iface, REFIID riid, LPVOID *ppobj) { TRACE("iface %p, riid %s, ppobj %p\n", iface, debugstr_guid(riid), ppobj); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 892ac89..2ab1fd9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -26,7 +26,6 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION This->wineD3DDevice->adapter->gl_info static const DWORD pixel_states_render[] = { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index eae78c0..b568005 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); -#define GLINFO_LOCATION (*gl_info) - static void texture_internal_preload(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb) { /* Override the IWineD3DResource PreLoad method. */ @@ -128,14 +126,10 @@ static void texture_cleanup(IWineD3DTextureImpl *This) basetexture_cleanup((IWineD3DBaseTexture *)This); } -#undef GLINFO_LOCATION - /* ******************************************* IWineD3DTexture IUnknown parts follow ******************************************* */ -#define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info - static HRESULT WINAPI IWineD3DTextureImpl_QueryInterface(IWineD3DTexture *iface, REFIID riid, LPVOID *ppobj) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 6d617ed..88b3f27 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl); -#define GLINFO_LOCATION This->wineD3DDevice->adapter->gl_info - static void dump_wined3dvertexelement(const WINED3DVERTEXELEMENT *element) { TRACE(" format: %s (%#x)\n", debug_d3dformat(element->format), element->format); TRACE(" input_slot: %u\n", element->input_slot); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 3712bee..14779a5 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); -#define GLINFO_LOCATION ((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info - static void vshader_set_limits(IWineD3DVertexShaderImpl *This) { DWORD shader_version = WINED3D_SHADER_VERSION(This->baseShader.reg_maps.shader_version.major, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index cad7360..a21211d 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -103,8 +103,6 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) IWineD3DTexture IUnknown parts follow ******************************************* */ -#define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info - static HRESULT WINAPI IWineD3DVolumeTextureImpl_QueryInterface(IWineD3DVolumeTexture *iface, REFIID riid, LPVOID *ppobj) { IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface;

1 0

Henri Verbeet : wined3d: Introduce a separate structure for various OpenGL implementation limits.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 48e03bc18954f5d8b337df479c9474975dbaf5ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e03bc18954f5d8b337df479… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 29 10:37:10 2009 +0100 wined3d: Introduce a separate structure for various OpenGL implementation limits. --- dlls/wined3d/arb_program_shader.c | 34 +++--- dlls/wined3d/ati_fragment_shader.c | 8 +- dlls/wined3d/context.c | 28 ++-- dlls/wined3d/device.c | 28 ++-- dlls/wined3d/directx.c | 216 ++++++++++++++++++---------------- dlls/wined3d/drawprim.c | 6 +- dlls/wined3d/glsl_shader.c | 49 ++++---- dlls/wined3d/nvidia_texture_shader.c | 12 +- dlls/wined3d/pixelshader.c | 6 +- dlls/wined3d/state.c | 74 ++++++------ dlls/wined3d/stateblock.c | 4 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/utils.c | 13 +- dlls/wined3d/wined3d_gl.h | 69 ++++++----- 14 files changed, 284 insertions(+), 265 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48e03bc18954f5d8b337d…

1 0

Juan Lang : crypt32: Allow the caller of checkChainPolicyStatus to specify the date to test with and additional policy parameters .
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: facd2e975a897addca4c6d07d290b85da11ff0b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=facd2e975a897addca4c6d07d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 28 09:07:39 2009 -0700 crypt32: Allow the caller of checkChainPolicyStatus to specify the date to test with and additional policy parameters. --- dlls/crypt32/tests/chain.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 94debf4..ddc9ac5 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2217,15 +2217,16 @@ static const char *num_to_str(WORD num) } static void checkChainPolicyStatus(LPCSTR policy, const ChainPolicyCheck *check, - DWORD testIndex) + DWORD testIndex, SYSTEMTIME *sysTime, PCERT_CHAIN_POLICY_PARA para) + { - PCCERT_CHAIN_CONTEXT chain = getChain(&check->certs, 0, TRUE, &oct2007, + PCCERT_CHAIN_CONTEXT chain = getChain(&check->certs, 0, TRUE, sysTime, check->todo, testIndex); if (chain) { CERT_CHAIN_POLICY_STATUS policyStatus = { 0 }; - BOOL ret = pCertVerifyCertificateChainPolicy(policy, chain, NULL, + BOOL ret = pCertVerifyCertificateChainPolicy(policy, chain, para, &policyStatus); if (check->todo & TODO_POLICY) @@ -2375,7 +2376,8 @@ static void testVerifyCertChainPolicy(void) for (i = 0; i < sizeof(basePolicyCheck) / sizeof(basePolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, &basePolicyCheck[i], i); + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, &basePolicyCheck[i], i, + &oct2007, NULL); /* 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 * of these chains is. @@ -2383,12 +2385,12 @@ static void testVerifyCertChainPolicy(void) for (i = 0; i < sizeof(authenticodePolicyCheck) / sizeof(authenticodePolicyCheck[0]); i++) checkChainPolicyStatus(CERT_CHAIN_POLICY_AUTHENTICODE, - &authenticodePolicyCheck[i], i); + &authenticodePolicyCheck[i], i, &oct2007, NULL); for (i = 0; i < sizeof(basicConstraintsPolicyCheck) / sizeof(basicConstraintsPolicyCheck[0]); i++) checkChainPolicyStatus(CERT_CHAIN_POLICY_BASIC_CONSTRAINTS, - &basicConstraintsPolicyCheck[i], i); + &basicConstraintsPolicyCheck[i], i, &oct2007, NULL); } START_TEST(chain)

1 0

Juan Lang : crypt32: Add some tests of the SSL policy.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 2fbb736e010067b017368aac85dc34e1766347cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fbb736e010067b017368aac8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 28 09:10:29 2009 -0700 crypt32: Add some tests of the SSL policy. --- dlls/crypt32/tests/chain.c | 136 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 136 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index ddc9ac5..10cea4d 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1973,6 +1973,8 @@ static ChainCheck chainCheckNoStore[] = { /* Wednesday, Oct 1, 2007 */ static SYSTEMTIME oct2007 = { 2007, 10, 1, 1, 0, 0, 0, 0 }; +/* Wednesday, Oct 28, 2009 */ +static SYSTEMTIME oct2009 = { 2009, 10, 3, 28, 0, 0, 0, 0 }; static void testGetCertChain(void) { @@ -2139,6 +2141,52 @@ static const ChainPolicyCheck basePolicyCheck[] = { { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, NULL, 0 }, }; +static const ChainPolicyCheck sslPolicyCheck[] = { + { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, + { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, + { 0, TRUST_E_CERT_SIGNATURE, 0, 0, NULL }, NULL, 0 }, + { { sizeof(chain2) / sizeof(chain2[0]), chain2 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, + { { sizeof(chain3) / sizeof(chain3[0]), chain3 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, + { { sizeof(chain4) / sizeof(chain4[0]), chain4 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, NULL, 0 }, + { { sizeof(chain5) / sizeof(chain5[0]), chain5 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, + { { sizeof(chain6) / sizeof(chain6[0]), chain6 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, + { { sizeof(chain7) / sizeof(chain7[0]), chain7 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, + { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, NULL, 0 }, + { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, -1, NULL }, NULL, 0 }, + { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, + { { sizeof(chain11) / sizeof(chain11[0]), chain11 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, + { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, + { 0, TRUST_E_CERT_SIGNATURE, 0, 1, NULL }, NULL, 0 }, + { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, NULL, 0 }, +}; + +static const ChainPolicyCheck sslPolicyCheckWithMatchingNameExpired = { + { sizeof(googleChain) / sizeof(googleChain[0]), googleChain }, + { 0, CERT_E_EXPIRED, 0, 0, NULL}, NULL, 0 +}; + +static const ChainPolicyCheck sslPolicyCheckWithMatchingName = { + { sizeof(googleChain) / sizeof(googleChain[0]), googleChain }, + { 0, 0, -1, -1, NULL}, NULL, 0 +}; + +static const ChainPolicyCheck sslPolicyCheckWithoutMatchingName = { + { sizeof(iTunesChain) / sizeof(iTunesChain[0]), iTunesChain }, + { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, NULL, 0 +}; + static const ChainPolicyCheck authenticodePolicyCheck[] = { { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, @@ -2312,6 +2360,93 @@ static void checkChainPolicyStatus(LPCSTR policy, const ChainPolicyCheck *check, } } +static void check_ssl_policy(void) +{ + DWORD i; + CERT_CHAIN_POLICY_PARA policyPara = { 0 }; + SSL_EXTRA_CERT_CHAIN_POLICY_PARA sslPolicyPara = { { 0 } }; + WCHAR winehq[] = { 'w','i','n','e','h','q','.','o','r','g',0 }; + WCHAR google_dot_com[] = { 'w','w','w','.','g','o','o','g','l','e','.', + 'c','o','m',0 }; + + /* Check ssl policy with no parameter */ + for (i = 0; + i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, + &oct2007, NULL); + /* Check again with a policy parameter that specifies nothing */ + for (i = 0; + i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, + &oct2007, &policyPara); + /* Check yet again, but specify an empty SSL_EXTRA_CERT_CHAIN_POLICY_PARA + * argument. + */ + policyPara.pvExtraPolicyPara = &sslPolicyPara; + for (i = 0; + i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, + &oct2007, &policyPara); + /* And again, but specify the auth type as a client */ + sslPolicyPara.dwAuthType = AUTHTYPE_CLIENT; + for (i = 0; + i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, + &oct2007, &policyPara); + /* And again, but specify the auth type as a server */ + sslPolicyPara.dwAuthType = AUTHTYPE_SERVER; + for (i = 0; + i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, + &oct2007, &policyPara); + /* And again authenticating a client, but specify the size of the policy + * parameter. + */ + sslPolicyPara.cbSize = sizeof(sslPolicyCheck); + sslPolicyPara.dwAuthType = AUTHTYPE_CLIENT; + for (i = 0; + i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, + &oct2007, &policyPara); + /* One more time authenticating a client, but specify winehq.org as the + * server name. + */ + sslPolicyPara.pwszServerName = winehq; + for (i = 0; + i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, + &oct2007, &policyPara); + /* And again authenticating a server, still specifying winehq.org as the + * server name. + */ + sslPolicyPara.dwAuthType = AUTHTYPE_SERVER; + for (i = 0; + i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, + &oct2007, &policyPara); + /* And again authenticating a server, this time specifying the size of the + * policy param. + */ + policyPara.cbSize = sizeof(policyPara); + for (i = 0; + i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, + &oct2007, &policyPara); + /* Yet again, but checking the iTunes chain, which contains a name + * extension. + */ + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + &sslPolicyCheckWithoutMatchingName, 0, &oct2007, &policyPara); + /* And again, but checking the Google chain at a bad date */ + sslPolicyPara.pwszServerName = google_dot_com; + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + &sslPolicyCheckWithMatchingNameExpired, 0, &oct2007, &policyPara); + /* And again, but checking the Google chain at a good date */ + sslPolicyPara.pwszServerName = google_dot_com; + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + &sslPolicyCheckWithMatchingName, 0, &oct2009, &policyPara); +} + static void testVerifyCertChainPolicy(void) { BOOL ret; @@ -2378,6 +2513,7 @@ static void testVerifyCertChainPolicy(void) i < sizeof(basePolicyCheck) / sizeof(basePolicyCheck[0]); i++) checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, &basePolicyCheck[i], i, &oct2007, NULL); + 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 * of these chains is.

1 0

Juan Lang : crypt32: Implement CertVerifyCertificateChainPolicy for CERT_CHAIN_POLICY_SSL.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 9059892ec1da79567279aaeb96f46791718bc7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9059892ec1da79567279aaeb9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 28 09:17:30 2009 -0700 crypt32: Implement CertVerifyCertificateChainPolicy for CERT_CHAIN_POLICY_SSL. --- dlls/crypt32/chain.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 231 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index e8f9de3..8972463 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2117,6 +2117,234 @@ static BOOL WINAPI verify_basic_constraints_policy(LPCSTR szPolicyOID, return TRUE; } +static inline PCERT_EXTENSION get_subject_alt_name_ext(PCCERT_CONTEXT cert) +{ + PCERT_EXTENSION ext; + + ext = CertFindExtension(szOID_SUBJECT_ALT_NAME2, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); + if (!ext) + ext = CertFindExtension(szOID_SUBJECT_ALT_NAME, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension); + return ext; +} + +static BOOL match_dns_to_subject_alt_name(PCERT_EXTENSION ext, + LPCWSTR server_name) +{ + BOOL matches = FALSE; + CERT_ALT_NAME_INFO *subjectName; + DWORD size; + + TRACE_(chain)("%s\n", debugstr_w(server_name)); + /* FIXME: This can be spoofed by the embedded NULL vulnerability. The + * returned CERT_ALT_NAME_INFO doesn't have a way to indicate the + * encoded length of a name, so a certificate issued to + * winehq.org\0badsite.com will get treated as having been issued to + * winehq.org. + */ + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, + ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &subjectName, &size)) + { + DWORD i; + BOOL found = FALSE; + + for (i = 0; !found && i < subjectName->cAltEntry; i++) + { + if (subjectName->rgAltEntry[i].dwAltNameChoice == + CERT_ALT_NAME_DNS_NAME) + { + TRACE_(chain)("dNSName: %s\n", debugstr_w( + subjectName->rgAltEntry[i].u.pwszDNSName)); + found = TRUE; + if (!strcmpiW(server_name, + subjectName->rgAltEntry[i].u.pwszDNSName)) + matches = TRUE; + } + } + LocalFree(subjectName); + } + return matches; +} + +static BOOL find_matching_domain_component(CERT_NAME_INFO *name, + LPCWSTR component) +{ + BOOL matches = FALSE; + DWORD i, j; + + for (i = 0; !matches && i < name->cRDN; i++) + for (j = 0; j < name->rgRDN[i].cRDNAttr; j++) + if (!strcmp(szOID_DOMAIN_COMPONENT, + name->rgRDN[i].rgRDNAttr[j].pszObjId)) + { + PCERT_RDN_ATTR attr; + + attr = &name->rgRDN[i].rgRDNAttr[j]; + /* Compare with memicmpW rather than strcmpiW in order to avoid + * a match with a string with an embedded NULL. The component + * must match one domain component attribute's entire string + * value with a case-insensitive match. + */ + matches = !memicmpW(component, (LPWSTR)attr->Value.pbData, + attr->Value.cbData / sizeof(WCHAR)); + } + return matches; +} + +static BOOL match_dns_to_subject_dn(PCCERT_CONTEXT cert, LPCWSTR server_name) +{ + BOOL matches = FALSE; + CERT_NAME_INFO *name; + DWORD size; + + TRACE_(chain)("%s\n", debugstr_w(server_name)); + if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_UNICODE_NAME, + cert->pCertInfo->Subject.pbData, cert->pCertInfo->Subject.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &name, &size)) + { + /* If the subject distinguished name contains any name components, + * make sure all of them are present. + */ + if (CertFindRDNAttr(szOID_DOMAIN_COMPONENT, name)) + { + LPCWSTR ptr = server_name; + + matches = TRUE; + do { + LPCWSTR dot = strchrW(ptr, '.'), end; + /* 254 is the maximum DNS label length, see RFC 1035 */ + WCHAR component[255]; + DWORD len; + + end = dot ? dot : ptr + strlenW(ptr); + len = end - ptr; + if (len >= sizeof(component) / sizeof(component[0])) + { + WARN_(chain)("domain component %s too long\n", + debugstr_wn(ptr, len)); + matches = FALSE; + } + else + { + memcpy(component, ptr, len * sizeof(WCHAR)); + component[len] = 0; + matches = find_matching_domain_component(name, component); + } + ptr = dot ? dot + 1 : end; + } while (matches && ptr && *ptr); + } + else + { + PCERT_RDN_ATTR attr; + + /* If the certificate isn't using a DN attribute in the name, make + * make sure the common name matches. Again, use memicmpW rather + * than strcmpiW in order to avoid being fooled by an embedded NULL. + */ + if ((attr = CertFindRDNAttr(szOID_COMMON_NAME, name))) + { + TRACE_(chain)("CN = %s\n", debugstr_w( + (LPWSTR)attr->Value.pbData)); + matches = !memicmpW(server_name, (LPWSTR)attr->Value.pbData, + attr->Value.cbData / sizeof(WCHAR)); + } + } + LocalFree(name); + } + return matches; +} + +static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, + PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, + PCERT_CHAIN_POLICY_STATUS pPolicyStatus) +{ + pPolicyStatus->lChainIndex = pPolicyStatus->lElementIndex = -1; + if (pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_NOT_SIGNATURE_VALID) + { + pPolicyStatus->dwError = TRUST_E_CERT_SIGNATURE; + find_element_with_error(pChainContext, + 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_UNTRUSTEDROOT; + find_element_with_error(pChainContext, + CERT_TRUST_IS_CYCLIC, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + /* For a cyclic chain, which element is a cycle isn't meaningful */ + pPolicyStatus->lElementIndex = -1; + } + else if (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); + } + else + pPolicyStatus->dwError = NO_ERROR; + /* We only need bother checking whether the name in the end certificate + * matches if the chain is otherwise okay. + */ + if (!pPolicyStatus->dwError && pPolicyPara && + pPolicyPara->cbSize >= sizeof(CERT_CHAIN_POLICY_PARA)) + { + HTTPSPolicyCallbackData *sslPara = pPolicyPara->pvExtraPolicyPara; + + if (sslPara && sslPara->u.cbSize >= sizeof(HTTPSPolicyCallbackData)) + { + if (sslPara->dwAuthType == AUTHTYPE_SERVER && + sslPara->pwszServerName) + { + PCCERT_CONTEXT cert; + PCERT_EXTENSION altNameExt; + BOOL matches; + + cert = pChainContext->rgpChain[0]->rgpElement[0]->pCertContext; + altNameExt = get_subject_alt_name_ext(cert); + /* If the alternate name extension exists, the name it contains + * is bound to the certificate, so make sure the name matches + * it. Otherwise, look for the server name in the subject + * distinguished name. RFC5280, section 4.2.1.6: + * "Whenever such identities are to be bound into a + * certificate, the subject alternative name (or issuer + * alternative name) extension MUST be used; however, a DNS + * name MAY also be represented in the subject field using the + * domainComponent attribute." + */ + if (altNameExt) + matches = match_dns_to_subject_alt_name(altNameExt, + sslPara->pwszServerName); + else + matches = match_dns_to_subject_dn(cert, + sslPara->pwszServerName); + if (!matches) + { + pPolicyStatus->dwError = CERT_E_CN_NO_MATCH; + pPolicyStatus->lChainIndex = 0; + pPolicyStatus->lElementIndex = 0; + } + } + } + } + return TRUE; +} + static BYTE msPubKey1[] = { 0x30,0x82,0x01,0x0a,0x02,0x82,0x01,0x01,0x00,0xdf,0x08,0xba,0xe3,0x3f,0x6e, 0x64,0x9b,0xf5,0x89,0xaf,0x28,0x96,0x4a,0x07,0x8f,0x1b,0x2e,0x8b,0x3e,0x1d, @@ -2257,6 +2485,9 @@ BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR szPolicyOID, case LOWORD(CERT_CHAIN_POLICY_AUTHENTICODE): verifyPolicy = verify_authenticode_policy; break; + case LOWORD(CERT_CHAIN_POLICY_SSL): + verifyPolicy = verify_ssl_policy; + break; case LOWORD(CERT_CHAIN_POLICY_BASIC_CONSTRAINTS): verifyPolicy = verify_basic_constraints_policy; break;

1 0

Aurimas Fišeras : cryptui: Fix Lithuanian translation.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 878aac41e8115124eae4600d23742c2155696ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878aac41e8115124eae4600d2… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Oct 28 19:39:51 2009 +0200 cryptui: Fix Lithuanian translation. --- dlls/cryptui/cryptui_Lt.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_Lt.rc b/dlls/cryptui/cryptui_Lt.rc index deb5598..ee02eab 100644 --- a/dlls/cryptui/cryptui_Lt.rc +++ b/dlls/cryptui/cryptui_Lt.rc @@ -120,7 +120,7 @@ STRINGTABLE DISCARDABLE IDS_WARN_REMOVE_DEFAULT "Ar tikrai norite pašalinti šį liudijimą?" IDS_WARN_REMOVE_PLURAL_DEFAULT "Ar tikrai norite pašalinti šiuos liudijimus?" IDS_CERT_MGR "Liudijimai" - IDS_FRIENDLY_NAME_NONE "<jokios>" + IDS_FRIENDLY_NAME_NONE "<joks>" IDS_PURPOSE_SERVER_AUTH "Garantuoja nutolusio kompiuterio tapatumą" IDS_PURPOSE_CLIENT_AUTH "Įrodo jūsų tapatumą nutolusiam kompiuteriui" IDS_PURPOSE_CODE_SIGNING "Garantuoja, kad programinė įranga yra iš šio leidėjo\nApsaugo programinę įrangą nuo pakeitimų po išleidimo"

1 0

Juan Lang : cryptui: Fix German translation.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: b8b8ff07545b2978a44e3ecf3bc9d64e8ac7cf2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b8ff07545b2978a44e3ecf3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 28 11:33:08 2009 -0700 cryptui: Fix German translation. --- dlls/cryptui/cryptui_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_De.rc b/dlls/cryptui/cryptui_De.rc index cfaf468..7174015 100644 --- a/dlls/cryptui/cryptui_De.rc +++ b/dlls/cryptui/cryptui_De.rc @@ -119,7 +119,7 @@ STRINGTABLE DISCARDABLE IDS_WARN_REMOVE_DEFAULT "Sind Sie sicher, dass Sie dieses Zertifikat entfernen möchten?" IDS_WARN_REMOVE_PLURAL_DEFAULT "Sind Sie sicher, dass Sie diese Zertifikate entfernen möchten?" IDS_CERT_MGR "Zertifikate" - IDS_FRIENDLY_NAME_NONE "<Keine>" + IDS_FRIENDLY_NAME_NONE "<Keiner>" IDS_PURPOSE_SERVER_AUTH "Garantiert die Identität eines entfernten Computers" IDS_PURPOSE_CLIENT_AUTH "Beweist Ihre Identität für einen entfernten Computers" IDS_PURPOSE_CODE_SIGNING "Schützt Software vor Manipulation nach der Veröffentlichung"

1 0

Jacek Caban : mshtml: Improve debug traces.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: ceb02fb0272fcf6db934039ed024f6af96523d34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceb02fb0272fcf6db934039ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 22:54:48 2009 +0100 mshtml: Improve debug traces. --- dlls/mshtml/script.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4ee0da0..7df0dd6 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -620,11 +620,14 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) VariantInit(&var); memset(&excepinfo, 0, sizeof(excepinfo)); + TRACE(">>>\n"); hres = IActiveScriptParse64_ParseScriptText(script_host->parse, text, windowW, NULL, script_endW, 0, 0, SCRIPTTEXT_ISVISIBLE|SCRIPTTEXT_HOSTMANAGESSOURCE, &var, &excepinfo); - if(FAILED(hres)) - WARN("ParseScriptText failed: %08x\n", hres); + if(SUCCEEDED(hres)) + TRACE("<<<\n"); + else + WARN("<<< %08x\n", hres); }

1 0

Jacek Caban : mshtml: Inherit scriptmode from parent window.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: d76720cc562b9122c5c04427decb1727c78bd562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76720cc562b9122c5c04427d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 28 22:55:26 2009 +0100 mshtml: Inherit scriptmode from parent window. --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9b8dda3..5b07b0f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1582,7 +1582,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->nswindow = nswindow; } - window->scriptmode = SCRIPTMODE_GECKO; + window->scriptmode = parent ? parent->scriptmode : SCRIPTMODE_GECKO; list_init(&window->script_hosts); window->task_magic = get_task_target_magic();

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode::nextSibling implementation.
by Alexandre Julliard 29 Oct '09

29 Oct '09

Module: wine Branch: master Commit: 11651f5731d9f01f3c1d2253a8606b2ae3db4919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11651f5731d9f01f3c1d2253a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 29 02:37:44 2009 +0100 mshtml: Added IHTMLDOMNode::nextSibling implementation. --- dlls/mshtml/htmlnode.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 25 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 9227899..92ad74e 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -729,8 +729,19 @@ static HRESULT WINAPI HTMLDOMNode_get_previousSibling(IHTMLDOMNode *iface, IHTML static HRESULT WINAPI HTMLDOMNode_get_nextSibling(IHTMLDOMNode *iface, IHTMLDOMNode **p) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNode *nssibling = NULL; + + TRACE("(%p)->(%p)\n", This, p); + + nsIDOMNode_GetNextSibling(This->nsnode, &nssibling); + if(nssibling) { + *p = HTMLDOMNODE(get_node(This->doc, nssibling, TRUE)); + IHTMLDOMNode_AddRef(*p); + }else { + *p = NULL; + } + + return S_OK; } #undef HTMLDOMNODE_THIS diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d9642e1..be3022b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1609,6 +1609,20 @@ static IHTMLDOMNode *_test_node_get_parent(unsigned line, IUnknown *unk) return parent; } +#define node_get_next(u) _node_get_next(__LINE__,u) +static IHTMLDOMNode *_node_get_next(unsigned line, IUnknown *unk) +{ + IHTMLDOMNode *node = _get_node_iface(line, unk); + IHTMLDOMNode *next; + HRESULT hres; + + hres = IHTMLDOMNode_get_nextSibling(node, &next); + IHTMLDOMNode_Release(node); + ok_(__FILE__,line) (hres == S_OK, "get_nextSiblibg failed: %08x\n", hres); + + return next; +} + #define test_elem_get_parent(u) _test_elem_get_parent(__LINE__,u) static IHTMLElement *_test_elem_get_parent(unsigned line, IUnknown *unk) { @@ -5248,11 +5262,13 @@ static void test_elems(IHTMLDocument2 *doc) ok(hres == S_OK, "get_length failed: %08x\n", hres); ok(length, "length=0\n"); + node2 = NULL; node = get_child_item(child_col, 0); ok(node != NULL, "node == NULL\n"); if(node) { type = get_node_type((IUnknown*)node); ok(type == 3, "type=%d\n", type); + node2 = node_get_next((IUnknown*)node); IHTMLDOMNode_Release(node); } @@ -5263,6 +5279,8 @@ static void test_elems(IHTMLDocument2 *doc) ok(type == 8, "type=%d\n", type); test_elem_id((IUnknown*)node, NULL); + ok(iface_cmp((IUnknown*)node2, (IUnknown*)node), "node2 != node\n"); + IHTMLDOMNode_Release(node2); IHTMLDOMNode_Release(node); } @@ -5343,6 +5361,13 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_innerhtml((IUnknown*)elem, "inner html"); test_elem_set_innerhtml((IUnknown*)elem, ""); test_elem_innerhtml((IUnknown*)elem, NULL); + node = node_get_next((IUnknown*)elem); + ok(!node, "node = %p\n", node); + + elem2 = get_doc_elem_by_id(doc, "x"); + node = node_get_next((IUnknown*)elem2); + IHTMLDOMNode_Release(node); + IHTMLElement_Release(elem2); IHTMLElement_Release(elem); IHTMLDocument3_Release(doc3);

1 0