December 2009 - Wine-commits

Juan Lang : cryptnet: Change guard variable to simplify loop.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 165d380852dbeb391ef22b63af33dad1f1f5a85c URL: http://source.winehq.org/git/wine.git/?a=commit;h=165d380852dbeb391ef22b63a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 1 15:08:21 2009 -0800 cryptnet: Change guard variable to simplify loop. --- dlls/cryptnet/cryptnet_main.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index ff9ab86..ea6047c 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1580,7 +1580,9 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, } else endTime = timeout = 0; - for (j = 0; ret && j < urlArray->cUrl; j++) + if (!ret) + error = GetLastError(); + for (j = 0; !error && j < urlArray->cUrl; j++) { PCCRL_CONTEXT crl; @@ -1593,7 +1595,6 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, { /* The CRL isn't time valid */ error = CRYPT_E_NO_REVOCATION_CHECK; - ret = FALSE; } else { @@ -1604,10 +1605,9 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, { error = CRYPT_E_REVOKED; pRevStatus->dwIndex = index; - ret = FALSE; } } - if (ret && timeout) + if (!error && timeout) { DWORD time = GetTickCount(); @@ -1615,7 +1615,6 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, { error = ERROR_TIMEOUT; pRevStatus->dwIndex = index; - ret = FALSE; } else timeout = endTime - time;

1 0

Juan Lang : cryptnet: Use helper function to check a cert against a CRL.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 44e4ac2128f8f4d7194c50e94f10cfa91e4a6870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e4ac2128f8f4d7194c50e94… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 30 10:14:48 2009 -0800 cryptnet: Use helper function to check a cert against a CRL. --- dlls/cryptnet/cryptnet_main.c | 45 ++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index ea6047c..8d6dd8f 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1544,6 +1544,33 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, return ret; } +static DWORD verify_cert_revocation_with_crl(PCCERT_CONTEXT cert, + PCCRL_CONTEXT crl, DWORD index, FILETIME *pTime, + PCERT_REVOCATION_STATUS pRevStatus) +{ + DWORD error; + + if (CertVerifyCRLTimeValidity(pTime, crl->pCrlInfo)) + { + /* The CRL isn't time valid */ + error = CRYPT_E_NO_REVOCATION_CHECK; + } + else + { + PCRL_ENTRY entry = NULL; + + CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); + if (entry) + { + error = CRYPT_E_REVOKED; + pRevStatus->dwIndex = index; + } + else + error = ERROR_SUCCESS; + } + return error; +} + static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, FILETIME *pTime, DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus) @@ -1591,22 +1618,8 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, NULL, NULL, NULL, NULL); if (ret) { - if (CertVerifyCRLTimeValidity(pTime, crl->pCrlInfo)) - { - /* The CRL isn't time valid */ - error = CRYPT_E_NO_REVOCATION_CHECK; - } - else - { - PCRL_ENTRY entry = NULL; - - CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); - if (entry) - { - error = CRYPT_E_REVOKED; - pRevStatus->dwIndex = index; - } - } + error = verify_cert_revocation_with_crl(cert, crl, index, + pTime, pRevStatus); if (!error && timeout) { DWORD time = GetTickCount();

1 0

Juan Lang : cryptnet: If the caller specifies the location of a CRL, check a cert's revocation status against it.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 60ddb1365d77f0ac982b2a2e7e913c8dc40e4d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ddb1365d77f0ac982b2a2e7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 30 11:02:50 2009 -0800 cryptnet: If the caller specifies the location of a CRL, check a cert's revocation status against it. --- dlls/cryptnet/cryptnet_main.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 8d6dd8f..9e29daa 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1582,8 +1582,34 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, 0, NULL, &cbUrlArray, NULL, NULL, NULL); if (!ret && GetLastError() == CRYPT_E_NOT_FOUND) { - error = CRYPT_E_NO_REVOCATION_CHECK; - pRevStatus->dwIndex = index; + if (pRevPara && pRevPara->hCrlStore && pRevPara->pIssuerCert) + { + PCCRL_CONTEXT crl; + + /* If the caller was helpful enough to tell us where to find a CRL + * for the cert, look for one and check it. + */ + crl = CertFindCRLInStore(pRevPara->hCrlStore, + cert->dwCertEncodingType, + CRL_FIND_ISSUED_BY_SIGNATURE_FLAG | CRL_FIND_ISSUED_BY_AKI_FLAG, + CRL_FIND_ISSUED_BY, pRevPara->pIssuerCert, NULL); + if (crl) + { + error = verify_cert_revocation_with_crl(cert, crl, index, + pTime, pRevStatus); + CertFreeCRLContext(crl); + } + else + { + error = CRYPT_E_NO_REVOCATION_CHECK; + pRevStatus->dwIndex = index; + } + } + else + { + error = CRYPT_E_NO_REVOCATION_CHECK; + pRevStatus->dwIndex = index; + } } else if (ret) {

1 0

Roderick Colenbrander : wined3d: Fix a bug in BtlFast which was uncovered by the 32-bit dibsection support.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 6d8c4572efae3b7e8e64100504c10270b2168079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8c4572efae3b7e8e6410050… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Nov 14 16:30:25 2009 +0100 wined3d: Fix a bug in BtlFast which was uncovered by the 32-bit dibsection support. --- dlls/ddraw/tests/dsurface.c | 34 ++++++++++++++++++++++++++++++++++ dlls/wined3d/surface_base.c | 10 +++++++++- 2 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index ab0408b..d53d6a0 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -304,6 +304,40 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Unlock(lpDst, NULL); ok(rc==DD_OK,"Unlock returned: %x\n",rc); + /* Below we repeat the same test as above but now using BltFast instead of Blt. Before + * we can carry out the test we need to restore the color of the destination surface. + */ + rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); + ok(rc==DD_OK,"Lock returned: %x\n",rc); + lpData = ddsd2.lpSurface; + lpData[0] = 0xCCCCCCCC; + lpData[1] = 0xCCCCCCCC; + lpData[2] = 0xCCCCCCCC; + lpData[3] = 0xCCCCCCCC; + rc = IDirectDrawSurface_Unlock(lpDst, NULL); + ok(rc==DD_OK,"Unlock returned: %x\n",rc); + + IDirectDrawSurface_BltFast(lpDst, 0, 0, lpSrc, NULL, DDBLTFAST_SRCCOLORKEY); + + rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); + ok(rc==DD_OK,"Lock returned: %x\n",rc); + ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); + lpData = ddsd2.lpSurface; + /* Different behavior on some drivers / windows versions. Some versions ignore the X channel when + * color keying, but copy it to the destination surface. Others apply it for color keying, but + * do not copy it into the destination surface. + */ + if(lpData[0]==0x00010203) { + trace("X channel was not copied into the destination surface\n"); + ok((lpData[0]==0x00010203)&&(lpData[1]==0x00010203)&&(lpData[2]==0x00FF00FF)&&(lpData[3]==0xCCCCCCCC), + "Destination data after blitting is not correct\n"); + } else { + ok((lpData[0]==0x77010203)&&(lpData[1]==0x00010203)&&(lpData[2]==0xCCCCCCCC)&&(lpData[3]==0xCCCCCCCC), + "Destination data after blitting is not correct\n"); + } + rc = IDirectDrawSurface_Unlock(lpDst, NULL); + ok(rc==DD_OK,"Unlock returned: %x\n",rc); + /* Also test SetColorKey */ IDirectDrawSurface_GetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); ok(DDColorKey.dwColorSpaceLowValue == 0xFF00FF && DDColorKey.dwColorSpaceHighValue == 0xFF00FF, diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index c737f99..dc29ad2 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1695,6 +1695,14 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst if (trans & (WINEDDBLTFAST_SRCCOLORKEY | WINEDDBLTFAST_DESTCOLORKEY)) { DWORD keylow, keyhigh; + DWORD mask = Src->resource.format_desc->red_mask | + Src->resource.format_desc->green_mask | + Src->resource.format_desc->blue_mask; + + /* For some 8-bit formats like L8 and P8 color masks don't make sense */ + if(!mask && bpp==1) + mask = 0xff; + TRACE("Color keyed copy\n"); if (trans & WINEDDBLTFAST_SRCCOLORKEY) { @@ -1716,7 +1724,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst for (y = 0; y < h; y++) { \ for (x = 0; x < w; x++) { \ tmp = s[x]; \ - if (tmp < keylow || tmp > keyhigh) d[x] = tmp; \ + if ((tmp & mask) < keylow || (tmp & mask) > keyhigh) d[x] = tmp; \ } \ s = (const type *)((const BYTE *)s + slock.Pitch); \ d = (type *)((BYTE *)d + dlock.Pitch); \

1 0

Jacek Caban : wininet: Make sure to not read over chunk end in read_gzip_data.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 78b2cedaa616a92ef8ac542ffd646280ac2bcf77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b2cedaa616a92ef8ac542ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 17 00:02:47 2009 +0100 wininet: Make sure to not read over chunk end in read_gzip_data. --- dlls/wininet/http.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5dfbe6a..6786380 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1952,6 +1952,7 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync, #ifdef HAVE_ZLIB z_stream *zstream = &req->gzip_stream->zstream; + DWORD buf_avail; int zres; while(read < size && !req->gzip_stream->end_of_data) { @@ -1960,14 +1961,16 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync, break; } + buf_avail = req->dwContentLength == ~0 ? req->read_size : min(req->read_size, req->dwContentLength-req->dwContentRead); + zstream->next_in = req->read_buf+req->read_pos; - zstream->avail_in = req->read_size; + zstream->avail_in = buf_avail; zstream->next_out = buf+read; zstream->avail_out = size-read; zres = inflate(zstream, Z_FULL_FLUSH); read = size - zstream->avail_out; - req->dwContentRead += req->read_size-zstream->avail_in; - remove_data(req, req->read_size-zstream->avail_in); + req->dwContentRead += buf_avail-zstream->avail_in; + remove_data(req, buf_avail-zstream->avail_in); if(zres == Z_STREAM_END) { TRACE("end of data\n"); req->gzip_stream->end_of_data = TRUE;

1 0

Paul Vriens : ntdll/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: fa2ec0f06c32c134f3aa6cbe2260532c88eb4bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa2ec0f06c32c134f3aa6cbe2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 16 16:14:02 2009 +0100 ntdll/tests: Fix a memory leak (Valgrind). --- dlls/ntdll/tests/file.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 398f198..3672b51 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -229,6 +229,8 @@ static void create_file_test(void) FILE_OVERWRITE_IF, 0, NULL, 0 ); ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_ACCESS_DENIED, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + pRtlFreeUnicodeString( &nameW ); } static void open_file_test(void)

1 0

Piotr Caban : urlmon: Added tests for CoInternetGetSecurityUrl.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 5cc277c677275ebede22fa89ab0c2a02fd0ea92f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc277c677275ebede22fa89a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 16 16:35:03 2009 +0100 urlmon: Added tests for CoInternetGetSecurityUrl. --- dlls/urlmon/tests/sec_mgr.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 06df952..e441698 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -91,6 +91,15 @@ static struct secmgr_test { {url7, 3, S_OK, sizeof(secid7), secid7, S_OK} }; +static int strcmp_w(const WCHAR *str1, const WCHAR *str2) +{ + DWORD len1 = lstrlenW(str1); + DWORD len2 = lstrlenW(str2); + + if(len1!=len2) return 1; + return memcmp(str1, str2, len1*sizeof(WCHAR)); +} + static void test_SecurityManager(void) { int i; @@ -630,11 +639,44 @@ static void test_InternetSecurityMarshalling(void) IInternetSecurityManager_Release(secmgr); } +static void test_InternetGetSecurityUrl(void) +{ + const WCHAR url5_out[] = {'h','t','t','p',':','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; + const WCHAR url7_out[] = {'f','t','p',':','w','i','n','e','h','q','.','o','r','g',0}; + + const WCHAR *in[] = {url2, url3, url4, url5, url7, url8, url9, url10}; + const WCHAR *out_default[] = {url2, url3, url4, url5_out, url7_out, url8, url5_out, url10}; + const WCHAR *out_securl[] = {url2, url3, url4, url5, url7, url8, url9, url10}; + + WCHAR *sec; + DWORD i; + HRESULT hres; + + for(i=0; i<sizeof(in)/sizeof(WCHAR*); i++) { + hres = CoInternetGetSecurityUrl(in[i], &sec, PSU_DEFAULT, 0); + ok(hres == S_OK, "(%d) CoInternetGetSecurityUrl returned: %08x\n", i, hres); + if(hres == S_OK) { + ok(!strcmp_w(sec, out_default[i]), "(%d) Got %s, expected %s\n", + i, wine_dbgstr_w(sec), wine_dbgstr_w(out_default[i])); + CoTaskMemFree(sec); + } + + hres = CoInternetGetSecurityUrl(in[i], &sec, PSU_SECURITY_URL_ONLY, 0); + ok(hres == S_OK, "(%d) CoInternetGetSecurityUrl returned: %08x\n", i, hres); + if(hres == S_OK) { + ok(!strcmp_w(sec, out_securl[i]), "(%d) Got %s, expected %s\n", + i, wine_dbgstr_w(sec), wine_dbgstr_w(out_securl[i])); + CoTaskMemFree(sec); + } + } +} + START_TEST(sec_mgr) { OleInitialize(NULL); + test_InternetGetSecurityUrl(); test_SecurityManager(); test_polices(); test_CoInternetCreateZoneManager();

1 0

Amine Khaldi : crypt32: Remove an unneeded assignment.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: e402260db42e62a9e7408d954fe0f28aefe8008e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e402260db42e62a9e7408d954… Author: Amine Khaldi <amine48rz(a)gmail.com> Date: Wed Dec 16 18:19:15 2009 +0100 crypt32: Remove an unneeded assignment. --- dlls/crypt32/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index e5ad7dc..0d1a2f0 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -619,7 +619,7 @@ static BOOL rfc822_name_matches(LPCWSTR constraint, LPCWSTR name, *trustErrorStatus |= CERT_TRUST_INVALID_NAME_CONSTRAINTS; else if (!name) ; /* no match */ - else if ((at = strchrW(constraint, '@'))) + else if (strchrW(constraint, '@')) match = !lstrcmpiW(constraint, name); else {

1 0

Amine Khaldi : cryptdlg: Remove an unused variable.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 4ec6979825c2c411af34d2e565d9766bfe586387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec6979825c2c411af34d2e56… Author: Amine Khaldi <amine48rz(a)gmail.com> Date: Wed Dec 16 18:39:47 2009 +0100 cryptdlg: Remove an unused variable. --- dlls/cryptdlg/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index 1971578..f6653ec 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -535,7 +535,7 @@ static BOOL CRYPT_FormatCPS(DWORD dwCertEncodingType, pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &cpsValue, &size))) { LPCWSTR headingSep, sep; - DWORD headingSepLen, sepLen; + DWORD sepLen; if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) { @@ -547,8 +547,8 @@ static BOOL CRYPT_FormatCPS(DWORD dwCertEncodingType, headingSep = colonSpace; sep = commaSep; } + sepLen = strlenW(sep); - headingSepLen = strlenW(headingSep); if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) {

1 0

Amine Khaldi : inetcomm: Remove an unneeded variable.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 978e22a85e3efc7913b0e6bcd372c30311d1c0bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=978e22a85e3efc7913b0e6bcd… Author: Amine Khaldi <amine48rz(a)gmail.com> Date: Wed Dec 16 18:57:38 2009 +0100 inetcomm: Remove an unneeded variable. --- dlls/inetcomm/internettransport.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/inetcomm/internettransport.c b/dlls/inetcomm/internettransport.c index af4772c..dcce0d9 100644 --- a/dlls/inetcomm/internettransport.c +++ b/dlls/inetcomm/internettransport.c @@ -167,14 +167,12 @@ HRESULT InternetTransport_HandsOffCallback(InternetTransport *This) HRESULT InternetTransport_DropConnection(InternetTransport *This) { - int ret; - if (This->Status == IXP_DISCONNECTED) return IXP_E_NOT_CONNECTED; - ret = shutdown(This->Socket, SD_BOTH); + shutdown(This->Socket, SD_BOTH); - ret = closesocket(This->Socket); + closesocket(This->Socket); DestroyWindow(This->hwnd); This->hwnd = NULL;

1 0