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

Alexandre Julliard : user32: Use the stored color and mask bitmaps instead of the raw bits in DrawIconEx .
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 072d0b3483f6795cb89e9d503b5d60b6df5f219c URL: http://source.winehq.org/git/wine.git/?a=commit;h=072d0b3483f6795cb89e9d503… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 20 14:26:58 2010 +0200 user32: Use the stored color and mask bitmaps instead of the raw bits in DrawIconEx. --- dlls/user32/cursoricon.c | 240 +++++++++++----------------------------------- 1 files changed, 56 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=072d0b3483f6795cb89e9…

1 0

Alexandre Julliard : user32: Use the stored color and mask bitmaps instead of the raw bits in GetIconInfo .
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: efe1c945f29628035c3668d2936fc463146a84da URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe1c945f29628035c3668d29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 20 14:27:08 2010 +0200 user32: Use the stored color and mask bitmaps instead of the raw bits in GetIconInfo. --- dlls/user32/cursoricon.c | 41 ++++++++++++----------------------------- 1 files changed, 12 insertions(+), 29 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 2647365..06a93d5 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2049,47 +2049,30 @@ HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name) */ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) { - struct cursoricon_object *ciconinfo; - INT height; + struct cursoricon_object *ptr; - if (!(ciconinfo = get_icon_ptr( hIcon ))) return FALSE; + if (!(ptr = get_icon_ptr( hIcon ))) return FALSE; TRACE("%p => %dx%d, %d bpp\n", hIcon, - ciconinfo->data.nWidth, ciconinfo->data.nHeight, ciconinfo->data.bBitsPerPixel); + ptr->data.nWidth, ptr->data.nHeight, ptr->data.bBitsPerPixel); - if ( (ciconinfo->data.ptHotSpot.x == ICON_HOTSPOT) && - (ciconinfo->data.ptHotSpot.y == ICON_HOTSPOT) ) + if ( (ptr->data.ptHotSpot.x == ICON_HOTSPOT) && + (ptr->data.ptHotSpot.y == ICON_HOTSPOT) ) { iconinfo->fIcon = TRUE; - iconinfo->xHotspot = ciconinfo->data.nWidth / 2; - iconinfo->yHotspot = ciconinfo->data.nHeight / 2; + iconinfo->xHotspot = ptr->data.nWidth / 2; + iconinfo->yHotspot = ptr->data.nHeight / 2; } else { iconinfo->fIcon = FALSE; - iconinfo->xHotspot = ciconinfo->data.ptHotSpot.x; - iconinfo->yHotspot = ciconinfo->data.ptHotSpot.y; - } - - height = ciconinfo->data.nHeight; - - if (ciconinfo->data.bBitsPerPixel > 1) - { - iconinfo->hbmColor = CreateBitmap( ciconinfo->data.nWidth, ciconinfo->data.nHeight, - ciconinfo->data.bPlanes, ciconinfo->data.bBitsPerPixel, - (char *)(ciconinfo + 1) - + ciconinfo->data.nHeight * - get_bitmap_width_bytes (ciconinfo->data.nWidth,1) ); - } - else - { - iconinfo->hbmColor = 0; - height *= 2; + iconinfo->xHotspot = ptr->data.ptHotSpot.x; + iconinfo->yHotspot = ptr->data.ptHotSpot.y; } - iconinfo->hbmMask = CreateBitmap ( ciconinfo->data.nWidth, height, - 1, 1, ciconinfo + 1); - release_icon_ptr( hIcon, ciconinfo ); + iconinfo->hbmColor = copy_bitmap( ptr->color ); + iconinfo->hbmMask = copy_bitmap( ptr->mask ); + release_icon_ptr( hIcon, ptr ); return TRUE; }

1 0

Jörg Höhle : winmm: Have MCI drivers handle notification for MCI_OPEN.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 594a70f55024c1c98cf842f21a4aaea8a6017cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=594a70f55024c1c98cf842f21… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed May 19 05:42:18 2010 +0200 winmm: Have MCI drivers handle notification for MCI_OPEN. All notifications are handled locally by the drivers. --- dlls/mciavi32/mciavi.c | 5 +++++ dlls/mcicda/mcicda.c | 11 +++++++++-- dlls/mciqtz32/mciqtz.c | 3 +++ dlls/mciseq/mcimidi.c | 5 +++++ dlls/winmm/mci.c | 8 +------- dlls/winmm/tests/mci.c | 3 +-- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index a3bce9d..731083e 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -286,6 +286,11 @@ static DWORD MCIAVI_mciOpen(UINT wDevID, DWORD dwFlags, } LeaveCriticalSection(&wma->cs); + + if (!dwRet && (dwFlags & MCI_NOTIFY)) { + mciDriverNotify(HWND_32(LOWORD(lpOpenParms->dwCallback)), + wDevID, MCI_NOTIFY_SUCCESSFUL); + } return dwRet; } diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 5c99534..9f62594 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -464,8 +464,15 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar /* now, open the handle */ root[0] = root[1] = '\\'; root[2] = '.'; root[3] = '\\'; root[4] = drive; root[5] = ':'; root[6] = '\0'; wmcda->handle = CreateFileW(root, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); - if (wmcda->handle != INVALID_HANDLE_VALUE) - return 0; + if (wmcda->handle == INVALID_HANDLE_VALUE) + goto the_error; + + if (dwFlags & MCI_NOTIFY) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpOpenParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpOpenParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } + return 0; the_error: --wmcda->nUseCount; diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 75f2c01..a42529b 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -221,6 +221,9 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, wma->opened = TRUE; + if (dwFlags & MCI_NOTIFY) + mciDriverNotify(HWND_32(LOWORD(lpOpenParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); + return 0; err: diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 87753c3..ec9a24a 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -799,6 +799,11 @@ static DWORD MIDI_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpParms) } else { wmm->dwPositionMS = 0; wmm->dwStatus = MCI_MODE_STOP; + if (dwFlags & MCI_NOTIFY) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmm->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } } return dwRet; } diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 8a66ab4..f65aee7 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1660,16 +1660,10 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSW lpParms) /* only handled devices fall through */ TRACE("wDevID=%04X wDeviceID=%d dwRet=%d\n", wmd->wDeviceID, lpParms->wDeviceID, dwRet); - - if (dwParam & MCI_NOTIFY) - mciDriverNotify((HWND)lpParms->dwCallback, wmd->wDeviceID, MCI_NOTIFY_SUCCESSFUL); - return 0; + errCleanUp: if (wmd) MCI_UnLoadMciDriver(wmd); - - if (dwParam & MCI_NOTIFY) - mciDriverNotify((HWND)lpParms->dwCallback, 0, MCI_NOTIFY_FAILURE); return dwRet; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index b064c0c..66633bc 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -359,9 +359,8 @@ static void test_recordWAVE(HWND hwnd) err = mciGetDeviceID("waveaudio"); todo_wine ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); - /* In Wine, both MCI_Open and the individual drivers send notifications. */ test_notification(hwnd, "open new", MCI_NOTIFY_SUCCESSFUL); - todo_wine test_notification(hwnd, "open new no #2", 0); + test_notification(hwnd, "open new no #2", 0); /* Do not query time format as string because result depends on locale! */ parm.status.dwItem = MCI_STATUS_TIME_FORMAT;

1 0

Hans Leidekker : msi: Fix memory leaks in deformat_string_internal.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: a4c25196b0c83a5fd042bdc615e9b3cc073f6b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c25196b0c83a5fd042bdc61… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 20 12:00:53 2010 +0200 msi: Fix memory leaks in deformat_string_internal. --- dlls/msi/format.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 278a08f..c4ff30f 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -805,12 +805,12 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, format.deformatted = *data; format.len = *len; - stack = create_stack(); - temp = create_stack(); - if (!verify_format(*data)) return ERROR_SUCCESS; + stack = create_stack(); + temp = create_stack(); + while ((type = format_lex(&format, &str)) != FORMAT_NULL) { if (type == FORMAT_LBRACK || type == FORMAT_LBRACE ||

1 0

Hans Leidekker : msi: Release the package in MsiGetProductPropertyW.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: e5dd5099011426108fbc0725eb28924422e6098b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5dd5099011426108fbc0725e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 20 12:01:15 2010 +0200 msi: Release the package in MsiGetProductPropertyW. --- dlls/msi/msi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 3170e6d..afa7005 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2388,6 +2388,7 @@ done: r = ERROR_SUCCESS; } + msiobj_release(&package->hdr); return r; }

1 0

Juan Lang : crypt32: Support hExclusiveRoot when creating a certificate chain engine.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: d298e1e614f1d3f48a1a21b9fca21ea217029c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d298e1e614f1d3f48a1a21b9f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed May 19 16:46:11 2010 -0700 crypt32: Support hExclusiveRoot when creating a certificate chain engine. --- dlls/crypt32/chain.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index ec7f602..d324314 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -186,7 +186,10 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, HCERTSTORE root; HCERTCHAINENGINE engine; - if (pConfig->hRestrictedRoot) + if (pConfig->cbSize >= sizeof(CERT_CHAIN_ENGINE_CONFIG) && + pConfig->hExclusiveRoot) + root = CertDuplicateStore(pConfig->hExclusiveRoot); + else if (pConfig->hRestrictedRoot) root = CertDuplicateStore(pConfig->hRestrictedRoot); else root = CertOpenSystemStoreW(0, rootW);

1 0

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

20 May '10

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

Juan Lang : crypt32/tests: Allow specifying a chain engine when verifying a chain policy.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: fbd3a1dd7b20507019db24070845f53200ef5c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd3a1dd7b20507019db24070… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed May 19 18:00:25 2010 -0700 crypt32/tests: Allow specifying a chain engine when verifying a chain policy. --- dlls/crypt32/tests/chain.c | 74 ++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 4983020..900a30d 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3883,12 +3883,12 @@ static const char *num_to_str(WORD num) return buf; } -static void checkChainPolicyStatus(LPCSTR policy, const ChainPolicyCheck *check, - DWORD testIndex, SYSTEMTIME *sysTime, PCERT_CHAIN_POLICY_PARA para) - +static void checkChainPolicyStatus(LPCSTR policy, HCERTCHAINENGINE engine, + const ChainPolicyCheck *check, DWORD testIndex, SYSTEMTIME *sysTime, + PCERT_CHAIN_POLICY_PARA para) { - PCCERT_CHAIN_CONTEXT chain = getChain(NULL, &check->certs, 0, TRUE, sysTime, - check->todo, testIndex); + PCCERT_CHAIN_CONTEXT chain = getChain(engine, &check->certs, 0, TRUE, + sysTime, check->todo, testIndex); if (chain) { @@ -4004,33 +4004,33 @@ static void check_ssl_policy(void) /* 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); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &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); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &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); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &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); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &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); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &sslPolicyCheck[i], + i, &oct2007, &policyPara); /* And again authenticating a client, but specify the size of the policy * parameter. */ @@ -4038,78 +4038,78 @@ static void check_ssl_policy(void) sslPolicyPara.dwAuthType = AUTHTYPE_CLIENT; for (i = 0; i < sizeof(sslPolicyCheck) / sizeof(sslPolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, &sslPolicyCheck[i], i, - &oct2007, &policyPara); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &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); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &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); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &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); + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &sslPolicyCheck[i], + i, &oct2007, &policyPara); /* Yet again, but checking the iTunes chain, which contains a name * extension. */ - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &iTunesPolicyCheckWithoutMatchingName, 0, &oct2007, &policyPara); /* And again, but checking the Google chain at a bad date */ sslPolicyPara.pwszServerName = google_dot_com; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &googlePolicyCheckWithMatchingNameExpired, 0, &oct2007, &policyPara); /* And again, but checking the Google chain at a good date */ sslPolicyPara.pwszServerName = google_dot_com; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &googlePolicyCheckWithMatchingName, 0, &oct2009, &policyPara); /* Check again with the openssl cert, which has a wildcard in its name, * with various combinations of matching and non-matching names. * With "a.openssl.org": match */ sslPolicyPara.pwszServerName = a_dot_openssl_dot_org; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &opensslPolicyCheckWithMatchingName, 0, &oct2009, &policyPara); /* With "openssl.org": no match */ sslPolicyPara.pwszServerName = openssl_dot_org; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &opensslPolicyCheckWithoutMatchingName, 0, &oct2009, &policyPara); /* With "fopenssl.org": no match */ sslPolicyPara.pwszServerName = fopenssl_dot_org; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &opensslPolicyCheckWithoutMatchingName, 0, &oct2009, &policyPara); /* with "a.b.openssl.org": no match */ sslPolicyPara.pwszServerName = a_dot_b_dot_openssl_dot_org; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &opensslPolicyCheckWithoutMatchingName, 0, &oct2009, &policyPara); /* Check again with the cs.stanford.edu, which has both cs.stanford.edu * and www.cs.stanford.edu in its subject alternative name. * With "cs.stanford.edu": match */ sslPolicyPara.pwszServerName = cs_dot_stanford_dot_edu; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &stanfordPolicyCheckWithMatchingName, 0, &oct2009, &policyPara); /* With "www.cs.stanford.edu": match */ sslPolicyPara.pwszServerName = www_dot_cs_dot_stanford_dot_edu; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &stanfordPolicyCheckWithMatchingName, 0, &oct2009, &policyPara); /* With "a.cs.stanford.edu": no match */ sslPolicyPara.pwszServerName = a_dot_cs_dot_stanford_dot_edu; - checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, &stanfordPolicyCheckWithoutMatchingName, 0, &oct2009, &policyPara); } @@ -4177,8 +4177,8 @@ static void testVerifyCertChainPolicy(void) for (i = 0; i < sizeof(basePolicyCheck) / sizeof(basePolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, &basePolicyCheck[i], i, - &oct2007, NULL); + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &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 @@ -4186,12 +4186,12 @@ static void testVerifyCertChainPolicy(void) */ for (i = 0; i < sizeof(authenticodePolicyCheck) / sizeof(authenticodePolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_AUTHENTICODE, + checkChainPolicyStatus(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, &authenticodePolicyCheck[i], i, &oct2007, NULL); for (i = 0; i < sizeof(basicConstraintsPolicyCheck) / sizeof(basicConstraintsPolicyCheck[0]); i++) - checkChainPolicyStatus(CERT_CHAIN_POLICY_BASIC_CONSTRAINTS, + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASIC_CONSTRAINTS, NULL, &basicConstraintsPolicyCheck[i], i, &oct2007, NULL); }

1 0

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

20 May '10

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

Henri Verbeet : wined3d: Check for a destination clipper in IWineD3DBaseSurfaceImpl_Blt().
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: becf8dc82829b403068d61908c77c98a406aea3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=becf8dc82829b403068d61908… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 20 09:12:18 2010 +0200 wined3d: Check for a destination clipper in IWineD3DBaseSurfaceImpl_Blt(). This check was there in the original ddraw code, but apparently got lost during the ddraw rewrite in 2006. --- dlls/wined3d/surface_base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index d752827..9778c81 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1009,7 +1009,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D /* For the Destination rect, it can be out of bounds on the condition that a clipper * is set for the given surface. */ - if ((/*This->clipper == NULL*/ TRUE) && (DestRect) && + if (!This->clipper && DestRect && ((DestRect->bottom > This->currentDesc.Height)||(DestRect->bottom < 0) || (DestRect->top > This->currentDesc.Height)||(DestRect->top < 0) || (DestRect->left > This->currentDesc.Width) ||(DestRect->left < 0) ||

1 0