May 2010 - Wine-Commits - list.winehq.org

Juan Lang : crypt32/tests: Allow specifying a chain engine when creating a certificate chain.
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: 742b4f37c80103227dcae94e8a384ac4d3d6e2f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=742b4f37c80103227dcae94e8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed May 19 16:49:18 2010 -0700 crypt32/tests: Allow specifying a chain engine when creating a certificate chain. --- dlls/crypt32/tests/chain.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 6b23361..4983020 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2496,9 +2496,9 @@ typedef struct _CONST_BLOB_ARRAY * certArray, where the last certificate in the chain is expected to be the * end certificate (the one from which the chain is built.) */ -static PCCERT_CHAIN_CONTEXT getChain(const CONST_BLOB_ARRAY *certArray, - DWORD flags, BOOL includeStore, LPSYSTEMTIME checkTime, DWORD todo, - DWORD testIndex) +static PCCERT_CHAIN_CONTEXT getChain(HCERTCHAINENGINE engine, + const CONST_BLOB_ARRAY *certArray, DWORD flags, BOOL includeStore, + LPSYSTEMTIME checkTime, DWORD todo, DWORD testIndex) { HCERTSTORE store; PCCERT_CHAIN_CONTEXT chain = NULL; @@ -2536,7 +2536,7 @@ static PCCERT_CHAIN_CONTEXT getChain(const CONST_BLOB_ARRAY *certArray, FILETIME fileTime; SystemTimeToFileTime(checkTime, &fileTime); - ret = pCertGetCertificateChain(NULL, endCert, &fileTime, + ret = pCertGetCertificateChain(engine, endCert, &fileTime, includeStore ? store : NULL, &chainPara, flags, NULL, &chain); if (todo & TODO_CHAIN) todo_wine ok(ret, "Chain %d: CertGetCertificateChain failed: %08x\n", @@ -3569,7 +3569,7 @@ static void testGetCertChain(void) for (i = 0; i < sizeof(chainCheck) / sizeof(chainCheck[0]); i++) { - chain = getChain(&chainCheck[i].certs, 0, TRUE, &oct2007, + chain = getChain(NULL, &chainCheck[i].certs, 0, TRUE, &oct2007, chainCheck[i].todo, i); if (chain) { @@ -3581,7 +3581,7 @@ static void testGetCertChain(void) for (i = 0; i < sizeof(chainCheckNoStore) / sizeof(chainCheckNoStore[0]); i++) { - chain = getChain(&chainCheckNoStore[i].certs, 0, FALSE, &oct2007, + chain = getChain(NULL, &chainCheckNoStore[i].certs, 0, FALSE, &oct2007, chainCheckNoStore[i].todo, i); if (chain) { @@ -3590,7 +3590,7 @@ static void testGetCertChain(void) pCertFreeCertificateChain(chain); } } - chain = getChain(&chainCheckEmbeddedNull.certs, 0, TRUE, &oct2007, + chain = getChain(NULL, &chainCheckEmbeddedNull.certs, 0, TRUE, &oct2007, chainCheckEmbeddedNull.todo, 0); if (chain) { @@ -3887,7 +3887,7 @@ static void checkChainPolicyStatus(LPCSTR policy, const ChainPolicyCheck *check, DWORD testIndex, SYSTEMTIME *sysTime, PCERT_CHAIN_POLICY_PARA para) { - PCCERT_CHAIN_CONTEXT chain = getChain(&check->certs, 0, TRUE, sysTime, + PCCERT_CHAIN_CONTEXT chain = getChain(NULL, &check->certs, 0, TRUE, sysTime, check->todo, testIndex); if (chain)

1 0

Henri Verbeet : wined3d: Split checking for "empty" source and destination rectangles in IWineD3DBaseSurfaceImpl_Blt().
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: c48ff6c12a35703a3c982ca2db40870c4639bab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48ff6c12a35703a3c982ca2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 20 09:12:19 2010 +0200 wined3d: Split checking for "empty" source and destination rectangles in IWineD3DBaseSurfaceImpl_Blt(). Assuming this is supposed to check for empty source / destination rectangles, the check doesn't look quite right to me. I'm going to leave that alone for the time being though. --- dlls/wined3d/surface_base.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 9778c81..43642de 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1020,21 +1020,24 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D return WINEDDERR_INVALIDRECT; } - /* Now handle negative values in the rectangles. Warning: only supported for now - in the 'simple' cases (ie not in any stretching / rotation cases). - - First, the case where nothing is to be done. - */ - if ((DestRect && ((DestRect->bottom <= 0) || (DestRect->right <= 0) || - (DestRect->top >= (int) This->currentDesc.Height) || - (DestRect->left >= (int) This->currentDesc.Width))) || - ((Src != NULL) && (SrcRect != NULL) && - ((SrcRect->bottom <= 0) || (SrcRect->right <= 0) || - (SrcRect->top >= (int) Src->currentDesc.Height) || - (SrcRect->left >= (int) Src->currentDesc.Width)) )) + /* Now handle negative values in the rectangles. Warning: only supported + * for now in the 'simple' cases (ie not in any stretching / rotation + * cases). First, the case where nothing is to be done. */ + + if (DestRect && (DestRect->bottom <= 0 || DestRect->right <= 0 + || DestRect->top >= (int)This->currentDesc.Height + || DestRect->left >= (int)This->currentDesc.Width)) + { + TRACE("Nothing to be done.\n"); + return WINED3D_OK; + } + + if (Src && SrcRect && (SrcRect->bottom <= 0 || SrcRect->right <= 0 + || SrcRect->top >= (int)Src->currentDesc.Height + || SrcRect->left >= (int)Src->currentDesc.Width)) { - TRACE("Nothing to be done !\n"); - return WINED3D_OK; + TRACE("Nothing to be done.\n"); + return WINED3D_OK; } if (DestRect)

1 0

Henri Verbeet : wined3d: Merge source rectangle operations into a single block in IWineD3DBaseSurfaceImpl_Blt ().
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: 3884bb3bdca854522a7c5c9ad5a4575c8d7c012a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3884bb3bdca854522a7c5c9ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 20 09:12:20 2010 +0200 wined3d: Merge source rectangle operations into a single block in IWineD3DBaseSurfaceImpl_Blt(). --- dlls/wined3d/surface_base.c | 76 +++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 43642de..4e964da 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -993,19 +993,46 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D FIXME("Filters not supported in software blit\n"); } - /* First check for the validity of source / destination rectangles. This was - * verified using a test application + by MSDN. - */ - if ((Src != NULL) && (SrcRect != NULL) && - ((SrcRect->bottom > Src->currentDesc.Height)||(SrcRect->bottom < 0) || - (SrcRect->top > Src->currentDesc.Height)||(SrcRect->top < 0) || - (SrcRect->left > Src->currentDesc.Width) ||(SrcRect->left < 0) || - (SrcRect->right > Src->currentDesc.Width) ||(SrcRect->right < 0) || - (SrcRect->right < SrcRect->left) ||(SrcRect->bottom < SrcRect->top))) + /* First check for the validity of source / destination rectangles. + * This was verified using a test application + by MSDN. */ + + if (SrcRect) { - WARN("Application gave us bad source rectangle for Blt.\n"); - return WINEDDERR_INVALIDRECT; + if (Src) + { + if (SrcRect->right < SrcRect->left || SrcRect->bottom < SrcRect->top + || SrcRect->left > Src->currentDesc.Width || SrcRect->left < 0 + || SrcRect->top > Src->currentDesc.Height || SrcRect->top < 0 + || SrcRect->right > Src->currentDesc.Width || SrcRect->right < 0 + || SrcRect->bottom > Src->currentDesc.Height || SrcRect->bottom < 0) + { + WARN("Application gave us bad source rectangle for Blt.\n"); + return WINEDDERR_INVALIDRECT; + } + + if (!SrcRect->right || !SrcRect->bottom + || SrcRect->left == (int)Src->currentDesc.Width + || SrcRect->top == (int)Src->currentDesc.Height) + { + TRACE("Nothing to be done.\n"); + return WINED3D_OK; + } + } + + xsrc = *SrcRect; + } + else if (Src) + { + xsrc.left = 0; + xsrc.top = 0; + xsrc.right = Src->currentDesc.Width; + xsrc.bottom = Src->currentDesc.Height; } + else + { + memset(&xsrc, 0, sizeof(xsrc)); + } + /* For the Destination rect, it can be out of bounds on the condition that a clipper * is set for the given surface. */ @@ -1032,14 +1059,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D return WINED3D_OK; } - if (Src && SrcRect && (SrcRect->bottom <= 0 || SrcRect->right <= 0 - || SrcRect->top >= (int)Src->currentDesc.Height - || SrcRect->left >= (int)Src->currentDesc.Width)) - { - TRACE("Nothing to be done.\n"); - return WINED3D_OK; - } - if (DestRect) { xdst = *DestRect; @@ -1052,25 +1071,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D xdst.right = This->currentDesc.Width; } - if (SrcRect) - { - xsrc = *SrcRect; - } - else - { - if (Src) - { - xsrc.top = 0; - xsrc.bottom = Src->currentDesc.Height; - xsrc.left = 0; - xsrc.right = Src->currentDesc.Width; - } - else - { - memset(&xsrc,0,sizeof(xsrc)); - } - } - /* The easy case : the source-less blits.... */ if (Src == NULL && DestRect) {

1 0

Juan Lang : crypt32/tests: Test wildcards in subject alternative name.
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: 1d79e5de9a1804e3bb23652fa48c6c569ba40136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d79e5de9a1804e3bb23652fa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed May 19 18:12:21 2010 -0700 crypt32/tests: Test wildcards in subject alternative name. --- dlls/crypt32/tests/chain.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 900a30d..0484aa1 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2472,6 +2472,37 @@ static const BYTE chain28_1[] = { 0x44,0x76,0x66,0x26,0xa7,0x05,0x3c,0x68,0x66,0x1c,0x07,0x4d,0xcf,0x54,0xaa, 0x5d,0xba,0x7a,0x8f,0x06,0xa7,0x1e,0x86,0xf1,0x5a,0x4b,0x50,0x16,0xad,0x9f, 0x89 }; +/* A chain whose end certificate is issued to *.winehq.org. */ +static const BYTE chain29_1[] = { +0x30,0x82,0x01,0xab,0x30,0x82,0x01,0x16,0xa0,0x03,0x02,0x01,0x02,0x02,0x01, +0x01,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x30, +0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43,0x65,0x72, +0x74,0x31,0x30,0x1e,0x17,0x0d,0x30,0x37,0x30,0x35,0x30,0x31,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x17,0x0d,0x30,0x37,0x31,0x30,0x30,0x31,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03, +0x13,0x05,0x43,0x65,0x72,0x74,0x32,0x30,0x81,0x9d,0x30,0x0b,0x06,0x09,0x2a, +0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x03,0x81,0x8d,0x00,0x30,0x81,0x89, +0x02,0x81,0x81,0x00,0xb8,0x52,0xda,0xc5,0x4b,0x3f,0xe5,0x33,0x0e,0x67,0x5f, +0x48,0x21,0xdc,0x7e,0xef,0x37,0x33,0xba,0xff,0xb4,0xc6,0xdc,0xb6,0x17,0x8e, +0x20,0x55,0x07,0x12,0xd2,0x7b,0x3c,0xce,0x30,0xc5,0xa7,0x48,0x9f,0x6e,0xfe, +0xb8,0xbe,0xdb,0x9f,0x9b,0x17,0x60,0x16,0xde,0xc6,0x8b,0x47,0xd1,0x57,0x71, +0x3c,0x93,0xfc,0xbd,0xec,0x44,0x32,0x3b,0xb9,0xcf,0x6b,0x05,0x72,0xa7,0x87, +0x8e,0x7e,0xd4,0x9a,0x87,0x1c,0x2f,0xb7,0x82,0x40,0xfc,0x6a,0x80,0x83,0x68, +0x28,0xce,0x84,0xf4,0x0b,0x2e,0x44,0xcb,0x53,0xac,0x85,0x85,0xb5,0x46,0x36, +0x98,0x3c,0x10,0x02,0xaa,0x02,0xbc,0x8b,0xa2,0x23,0xb2,0xd3,0x51,0x9a,0x22, +0x4a,0xe3,0xaa,0x4e,0x7c,0xda,0x38,0xcf,0x49,0x98,0x72,0xa3,0x02,0x03,0x01, +0x00,0x01,0xa3,0x1b,0x30,0x19,0x30,0x17,0x06,0x03,0x55,0x1d,0x07,0x04,0x10, +0x30,0x0e,0x82,0x0c,0x2a,0x2e,0x77,0x69,0x6e,0x65,0x68,0x71,0x2e,0x6f,0x72, +0x67,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x03, +0x81,0x81,0x00,0x65,0xbf,0xfa,0xf7,0xc3,0x09,0x70,0x25,0x8a,0x46,0x69,0xf6, +0xdc,0x07,0x1e,0x30,0xc9,0xe4,0x58,0x89,0x65,0x3a,0xa8,0xda,0xbd,0x17,0xf8, +0x1d,0x0d,0x7d,0x47,0xb1,0xb2,0xda,0x17,0x9f,0xf6,0x47,0xe0,0xe4,0x4a,0xeb, +0x02,0xc9,0x2e,0x69,0x1c,0x57,0x2a,0x80,0xc9,0x01,0x77,0x7b,0x27,0xff,0x2f, +0xaf,0xdf,0xf3,0x65,0x12,0xd8,0x7d,0xc2,0xbf,0x1b,0x1d,0x18,0x96,0x5c,0xf6, +0xba,0x43,0xc5,0x43,0x57,0xc0,0xdd,0x97,0x95,0xfb,0x1c,0xad,0x64,0x0f,0x61, +0x3a,0xe9,0x27,0xa4,0x57,0x27,0x34,0xa7,0x42,0xde,0x78,0x1a,0x71,0x80,0x23, +0xd6,0xd7,0x22,0xf0,0x24,0x0d,0x71,0xf1,0x2b,0xd0,0xd8,0x76,0x3d,0xef,0x4c, +0xce,0x1c,0x3b,0x83,0x1b,0x63,0x10,0x6c,0x63,0xe5,0x69 }; typedef struct _CONST_DATA_BLOB { @@ -3069,6 +3100,18 @@ static const CERT_TRUST_STATUS elementStatus28[] = { static const SimpleChainStatusCheck simpleStatus28[] = { { sizeof(elementStatus28) / sizeof(elementStatus28[0]), elementStatus28 }, }; +static CONST_DATA_BLOB chain29[] = { + { sizeof(chain0_0), chain0_0 }, + { sizeof(chain29_1), chain29_1 }, +}; +static const CERT_TRUST_STATUS elementStatus29[] = { + { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, +}; +static const SimpleChainStatusCheck simpleStatus29[] = { + { sizeof(elementStatus29) / sizeof(elementStatus29[0]), elementStatus29 }, +}; static CONST_DATA_BLOB selfSignedChain[] = { { sizeof(selfSignedCert), selfSignedCert } }; @@ -3354,6 +3397,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus28 }, 0 }, + /* chain29 is handled separately elsewhere */ { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, @@ -3772,6 +3816,16 @@ static const ChainPolicyCheck opensslPolicyCheckWithoutMatchingName = { { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, NULL, 0 }; +static const ChainPolicyCheck winehqPolicyCheckWithMatchingName = { + { sizeof(chain29) / sizeof(chain29[0]), chain29 }, + { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR +}; + +static const ChainPolicyCheck winehqPolicyCheckWithoutMatchingName = { + { sizeof(chain29) / sizeof(chain29[0]), chain29 }, + { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, NULL, 0 +}; + static const ChainPolicyCheck stanfordPolicyCheckWithMatchingName = { { sizeof(stanfordChain) / sizeof(stanfordChain[0]), stanfordChain }, { 0, 0, -1, -1, NULL}, NULL, 0 @@ -4000,6 +4054,13 @@ static void check_ssl_policy(void) 's','t','a','n','f','o','r','d','.','e','d','u',0 }; WCHAR a_dot_cs_dot_stanford_dot_edu[] = { 'a','.','c','s','.', 's','t','a','n','f','o','r','d','.','e','d','u',0 }; + WCHAR test_dot_winehq_dot_org[] = { 't','e','s','t','.', + 'w','i','n','e','h','q','.','o','r','g',0 }; + WCHAR a_dot_b_dot_winehq_dot_org[] = { 'a','.','b','.', + 'w','i','n','e','h','q','.','o','r','g',0 }; + HCERTSTORE testRoot; + CERT_CHAIN_ENGINE_CONFIG engineConfig = { sizeof(engineConfig), 0 }; + HCERTCHAINENGINE engine; /* Check ssl policy with no parameter */ for (i = 0; @@ -4111,6 +4172,34 @@ static void check_ssl_policy(void) sslPolicyPara.pwszServerName = a_dot_cs_dot_stanford_dot_edu; checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &stanfordPolicyCheckWithoutMatchingName, 0, &oct2009, &policyPara); + /* Check chain29, which has a wildcard in its subject alternative name, + * but not in its distinguished name. + * Step 1: create a chain engine that trusts chain29's root. + */ + testRoot = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + CertAddEncodedCertificateToStore(testRoot, X509_ASN_ENCODING, chain0_0, + sizeof(chain0_0), CERT_STORE_ADD_ALWAYS, NULL); + engineConfig.hExclusiveRoot = testRoot; + if (!CertCreateCertificateChainEngine(&engineConfig, &engine)) + { + skip("Couldn't create chain engine\n"); + return; + } + /* With "winehq.org": no match */ + sslPolicyPara.pwszServerName = winehq; + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, engine, + &winehqPolicyCheckWithoutMatchingName, 0, &oct2007, &policyPara); + /* With "test.winehq.org": match */ + sslPolicyPara.pwszServerName = test_dot_winehq_dot_org; + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, engine, + &winehqPolicyCheckWithMatchingName, 0, &oct2007, &policyPara); + /* With "a.b.winehq.org": no match */ + sslPolicyPara.pwszServerName = a_dot_b_dot_winehq_dot_org; + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, engine, + &winehqPolicyCheckWithoutMatchingName, 0, &oct2007, &policyPara); + CertFreeCertificateChainEngine(engine); + CertCloseStore(testRoot, 0); } static void testVerifyCertChainPolicy(void)

1 0

Juan Lang : crypt32: Update definition of CERT_CHAIN_ENGINE_CONFIG.
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: d3db308853123653fc333fce027900a17c17a3c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3db308853123653fc333fce0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed May 19 18:06:54 2010 -0700 crypt32: Update definition of CERT_CHAIN_ENGINE_CONFIG. --- dlls/crypt32/chain.c | 17 ++++++++++++++++- dlls/crypt32/tests/chain.c | 30 ++++++++++++++++++++++-------- include/wincrypt.h | 2 ++ 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 1724f42..ec7f602 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -152,6 +152,20 @@ HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, return engine; } +typedef struct _CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT +{ + DWORD cbSize; + HCERTSTORE hRestrictedRoot; + HCERTSTORE hRestrictedTrust; + HCERTSTORE hRestrictedOther; + DWORD cAdditionalStore; + HCERTSTORE *rghAdditionalStore; + DWORD dwFlags; + DWORD dwUrlRetrievalTimeout; + DWORD MaximumCachedCertificates; + DWORD CycleDetectionModulus; +} CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT; + BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, HCERTCHAINENGINE *phChainEngine) { @@ -159,7 +173,8 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, TRACE("(%p, %p)\n", pConfig, phChainEngine); - if (pConfig->cbSize != sizeof(*pConfig)) + if (pConfig->cbSize != sizeof(CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT) + && pConfig->cbSize != sizeof(CERT_CHAIN_ENGINE_CONFIG)) { SetLastError(E_INVALIDARG); return FALSE; diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index f9ccaed..6b23361 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -60,11 +60,25 @@ static BOOL (WINAPI *pCertVerifyCertificateChainPolicy)(LPCSTR,PCCERT_CHAIN_CONT #define IS_INTOID(x) (((ULONG_PTR)(x) >> 16) == 0) +typedef struct _CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT +{ + DWORD cbSize; + HCERTSTORE hRestrictedRoot; + HCERTSTORE hRestrictedTrust; + HCERTSTORE hRestrictedOther; + DWORD cAdditionalStore; + HCERTSTORE *rghAdditionalStore; + DWORD dwFlags; + DWORD dwUrlRetrievalTimeout; + DWORD MaximumCachedCertificates; + DWORD CycleDetectionModulus; +} CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT; static void testCreateCertChainEngine(void) { BOOL ret; - CERT_CHAIN_ENGINE_CONFIG config = { 0 }; + CERT_CHAIN_ENGINE_CONFIG_NO_EXCLUSIVE_ROOT config = { 0 }; + CERT_CHAIN_ENGINE_CONFIG *pConfig = (CERT_CHAIN_ENGINE_CONFIG *)&config; HCERTCHAINENGINE engine; HCERTSTORE store; @@ -77,21 +91,21 @@ static void testCreateCertChainEngine(void) /* Crash ret = pCertCreateCertificateChainEngine(NULL, NULL); ret = pCertCreateCertificateChainEngine(NULL, &engine); - ret = pCertCreateCertificateChainEngine(&config, NULL); + ret = pCertCreateCertificateChainEngine(pConfig, NULL); */ - ret = pCertCreateCertificateChainEngine(&config, &engine); + ret = pCertCreateCertificateChainEngine(pConfig, &engine); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); /* Crashes config.cbSize = sizeof(config); - ret = pCertCreateCertificateChainEngine(&config, NULL); + ret = pCertCreateCertificateChainEngine(pConfig, NULL); */ config.cbSize = sizeof(config); - ret = pCertCreateCertificateChainEngine(&config, &engine); + ret = pCertCreateCertificateChainEngine(pConfig, &engine); ok(ret, "CertCreateCertificateChainEngine failed: %08x\n", GetLastError()); pCertFreeCertificateChainEngine(engine); config.dwFlags = 0xff000000; - ret = pCertCreateCertificateChainEngine(&config, &engine); + ret = pCertCreateCertificateChainEngine(pConfig, &engine); ok(ret, "CertCreateCertificateChainEngine failed: %08x\n", GetLastError()); pCertFreeCertificateChainEngine(engine); @@ -99,7 +113,7 @@ static void testCreateCertChainEngine(void) store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); config.hRestrictedRoot = store; - ret = pCertCreateCertificateChainEngine(&config, &engine); + ret = pCertCreateCertificateChainEngine(pConfig, &engine); ok(ret, "CertCreateCertificateChainEngine failed: %08x\n", GetLastError()); pCertFreeCertificateChainEngine(engine); @@ -108,7 +122,7 @@ static void testCreateCertChainEngine(void) */ CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert), CERT_STORE_ADD_ALWAYS, NULL); - ret = pCertCreateCertificateChainEngine(&config, &engine); + ret = pCertCreateCertificateChainEngine(pConfig, &engine); ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); diff --git a/include/wincrypt.h b/include/wincrypt.h index e536213..d3f56b9 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3389,6 +3389,8 @@ typedef struct _CERT_CHAIN_ENGINE_CONFIG DWORD dwUrlRetrievalTimeout; DWORD MaximumCachedCertificates; DWORD CycleDetectionModulus; + HCERTSTORE hExclusiveRoot; + HCERTSTORE hExclusiveRootTrustedPeople; } CERT_CHAIN_ENGINE_CONFIG, *PCERT_CHAIN_ENGINE_CONFIG; /* message-related definitions */

1 0

Michael Stefaniuc : shlwapi: Remove redundant "not NULL" checks of the len arg (coccicheck).
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: f38336d82a05b4f470da3f515b606b6d29d73cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38336d82a05b4f470da3f515… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 20 01:14:19 2010 +0200 shlwapi: Remove redundant "not NULL" checks of the len arg (coccicheck). --- dlls/shlwapi/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index e00a925..a0269b6 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1415,7 +1415,7 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, break; case STRRET_CSTR: - if (!MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len ) && len) + if (!MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len )) dest[len-1] = 0; break; @@ -1423,7 +1423,7 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, if (pidl) { if (!MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset, -1, - dest, len ) && len) + dest, len )) dest[len-1] = 0; } break;

1 0

Michael Stefaniuc : wininet: Remove redundant "not NULL/0" checks ( coccicheck).
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: 2c07791c5bc02b3415a1f7542dd7e36af5d0f01d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c07791c5bc02b3415a1f7542… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 20 01:15:33 2010 +0200 wininet: Remove redundant "not NULL/0" checks (coccicheck). --- dlls/wininet/http.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bd2e574..dc6533b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4259,11 +4259,8 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, if(hIC->lpszProxyBypass) FIXME("Proxy bypass is ignored.\n"); } - if (lpszServerName && lpszServerName[0]) - { - lpwhs->lpszServerName = heap_strdupW(lpszServerName); - lpwhs->lpszHostName = heap_strdupW(lpszServerName); - } + lpwhs->lpszServerName = heap_strdupW(lpszServerName); + lpwhs->lpszHostName = heap_strdupW(lpszServerName); if (lpszUserName && lpszUserName[0]) lpwhs->lpszUserName = heap_strdupW(lpszUserName); if (lpszPassword && lpszPassword[0])

1 0

Piotr Caban : msvcrt: Fix compilation error (x86_64-pc-mingw32).
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: 4134c57a917b8a92950c28b7fdd0ecaed03a9e13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4134c57a917b8a92950c28b7f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 02:36:44 2010 +0200 msvcrt: Fix compilation error (x86_64-pc-mingw32). --- dlls/msvcrt/locale.c | 74 +++++++++++++++++++++++----------------------- dlls/msvcrt/main.c | 4 +- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 4 +- 4 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4134c57a917b8a92950c2…

1 0

Michael Stefaniuc : quartz: Avoid using the long type.
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: 63512e8e98457fd3ba33423a6760c02267c4a352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63512e8e98457fd3ba33423a6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 20 01:14:09 2010 +0200 quartz: Avoid using the long type. --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/avisplit.c | 2 +- dlls/quartz/dsoundrender.c | 12 ++++++------ dlls/quartz/filtergraph.c | 16 ++++++++-------- dlls/quartz/memallocator.c | 2 +- dlls/quartz/pin.c | 2 +- dlls/quartz/pin.h | 2 +- dlls/quartz/tests/referenceclock.c | 4 ++-- dlls/quartz/videorenderer.c | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index c275d83..a032391 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -105,7 +105,7 @@ static HRESULT ACMWrapper_ProcessSampleData(InputPin *pin, IMediaSample *pSample tMed = tStart; - TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); + TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); if (FAILED(hr)) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 8469bbc..b7d45e9 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -101,7 +101,7 @@ static HRESULT AVIDec_ProcessSampleData(InputPin *pin, IMediaSample *pSample) cbSrcStream = IMediaSample_GetActualDataLength(pSample); - TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); + TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); if (FAILED(hr)) { diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 3d567d2..6107880 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -770,7 +770,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE { const AVISUPERINDEX *pIndex = (const AVISUPERINDEX *)pChunk; DWORD x; - long rest = pIndex->cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex[0]) * ANYSIZE_ARRAY; + UINT rest = pIndex->cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex[0]) * ANYSIZE_ARRAY; if (pIndex->cb < sizeof(AVISUPERINDEX) - sizeof(RIFFCHUNK)) { diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 115577c..b327c00 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -78,8 +78,8 @@ typedef struct DSoundRenderImpl HANDLE state_change, blocked; - long volume; - long pan; + LONG volume; + LONG pan; } DSoundRenderImpl; /* Seeking is not needed for a renderer, rely on newsegment for the appropriate changes */ @@ -238,7 +238,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) { DSoundRenderImpl *This = iface; LPBYTE pbSrcStream = NULL; - long cbSrcStream = 0; + LONG cbSrcStream = 0; REFERENCE_TIME tStart, tStop; HRESULT hr; AM_MEDIA_TYPE *amt; @@ -344,7 +344,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) } cbSrcStream = IMediaSample_GetActualDataLength(pSample); - TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, cbSrcStream); + TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); #if 0 /* For debugging purpose */ { @@ -877,11 +877,11 @@ static HRESULT WINAPI DSoundRender_InputPin_ReceiveConnection(IPin * iface, IPin { hr = IDirectSoundBuffer_SetVolume(DSImpl->dsbuffer, DSImpl->volume); if (FAILED(hr)) - ERR("Can't set volume to %ld (%x)\n", DSImpl->volume, hr); + ERR("Can't set volume to %d (%x)\n", DSImpl->volume, hr); hr = IDirectSoundBuffer_SetPan(DSImpl->dsbuffer, DSImpl->pan); if (FAILED(hr)) - ERR("Can't set pan to %ld (%x)\n", DSImpl->pan, hr); + ERR("Can't set pan to %d (%x)\n", DSImpl->pan, hr); DSImpl->write_pos = 0; hr = S_OK; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 66a9a95..18bf97c 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -45,14 +45,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct { - HWND hWnd; /* Target window */ - long msg; /* User window message */ - long instance; /* User data */ - int disabled; /* Disabled messages posting */ + HWND hWnd; /* Target window */ + UINT msg; /* User window message */ + LONG_PTR instance; /* User data */ + int disabled; /* Disabled messages posting */ } WndNotify; typedef struct { - long lEventCode; /* Event code */ + LONG lEventCode; /* Event code */ LONG_PTR lParam1; /* Param1 */ LONG_PTR lParam2; /* Param2 */ } Event; @@ -120,7 +120,7 @@ static int EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) return TRUE; } -static int EventsQueue_GetEvent(EventsQueue* omr, Event* evt, long msTimeOut) +static int EventsQueue_GetEvent(EventsQueue* omr, Event* evt, LONG msTimeOut) { if (WaitForSingleObject(omr->msg_event, msTimeOut) != WAIT_OBJECT_0) return FALSE; @@ -182,7 +182,7 @@ typedef struct _IFilterGraphImpl { LPWSTR * pFilterNames; int nFilters; int filterCapacity; - long nameIndex; + LONG nameIndex; IReferenceClock *refClock; EventsQueue evqueue; HANDLE hEventCompletion; @@ -4970,7 +4970,7 @@ static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface, This->notif.hWnd = (HWND)hwnd; This->notif.msg = lMsg; - This->notif.instance = (long) lInstanceData; + This->notif.instance = lInstanceData; return S_OK; } diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 16b94e3..a1c4473 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -785,7 +785,7 @@ static HRESULT StdMemAllocator_Alloc(IMemAllocator * iface) StdMemAllocator *This = (StdMemAllocator *)iface; StdMediaSample2 * pSample = NULL; SYSTEM_INFO si; - long i; + LONG i; assert(list_empty(&This->base.free_list)); diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index ca34d93..fd0d5a2 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1834,7 +1834,7 @@ HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinI return E_FAIL; } -HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, long outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) +HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) { OutputPin * pPinImpl; diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index 2cbaddb..e356ef3 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -143,7 +143,7 @@ typedef struct PullPin /*** Constructors ***/ HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PUSH pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin); -HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, long outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); +HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, STOPPROCESSPROC, REQUESTPROC pCustomRequest, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); /**************************/ diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/referenceclock.c index 164fc3d..ddce02e 100644 --- a/dlls/quartz/tests/referenceclock.c +++ b/dlls/quartz/tests/referenceclock.c @@ -54,7 +54,7 @@ static void test_IReferenceClock_methods(const char * clockdesc, IReferenceClock HRESULT hr; REFERENCE_TIME time1; REFERENCE_TIME time2; - signed long diff; + LONG diff; /* Test response from invalid (NULL) argument */ hr = IReferenceClock_GetTime(pClock, NULL); @@ -86,7 +86,7 @@ static void test_IReferenceClock_methods(const char * clockdesc, IReferenceClock /* FIXME: How much deviation should be allowed after a sleep? */ /* 0.3% is common, and 0.4% is sometimes observed. */ diff = time2 - time1; - ok (9940000 <= diff && diff <= 10240000, "%s - Expected difference around 10000000, got %lu\n", clockdesc, diff); + ok (9940000 <= diff && diff <= 10240000, "%s - Expected difference around 10000000, got %u\n", clockdesc, diff); } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 40b1acb..268373f 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -343,7 +343,7 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) { VideoRendererImpl *This = iface; LPBYTE pbSrcStream = NULL; - long cbSrcStream = 0; + LONG cbSrcStream = 0; REFERENCE_TIME tStart, tStop; HRESULT hr; @@ -395,7 +395,7 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) cbSrcStream = IMediaSample_GetActualDataLength(pSample); - TRACE("val %p %ld\n", pbSrcStream, cbSrcStream); + TRACE("val %p %d\n", pbSrcStream, cbSrcStream); #if 0 /* For debugging purpose */ {

1 0

Michael Stefaniuc : wineoss.drv: Avoid a potential NULL pointer dereference in a TRACE.
by Alexandre Julliard May 20, 2010

May 20, 2010

Module: wine Branch: master Commit: 4deab508ba936d3708bc04204fcae4c316b14d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4deab508ba936d3708bc04204… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 20 01:15:56 2010 +0200 wineoss.drv: Avoid a potential NULL pointer dereference in a TRACE. --- dlls/wineoss.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 9c712c8..5598879 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1967,7 +1967,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) audio_buf_info info; DWORD ret; - TRACE("(%u, %p[cb=%08lx], %08X);\n", wDevID, lpDesc, lpDesc->dwCallback, dwFlags); + TRACE("(%u, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { WARN("Invalid Parameter !\n"); return MMSYSERR_INVALPARAM;

1 0