February 2012 - Wine-commits

Joerg Schiermeier : Add lost image file for 'Paypal donate'
by Jeremy Newman 06 Feb '12

06 Feb '12

Module: website Branch: master Commit: 6d993167868a03e63c067548f193d384118f40c7 URL: http://source.winehq.org/git/website.git/?a=commit;h=6d993167868a03e63c0675… Author: Joerg Schiermeier <mywine(a)Schiermeier-Software.de> Date: Fri Feb 3 14:32:19 2012 +0100 Add lost image file for 'Paypal donate' The clickable button for 'Donate Paypal' is missing. This is restored from wine-devel mailinglist archive at 2005-01-19: <http://www.winehq.org/pipermail/wine-devel/2005-January/032957.html> exactly: the attached file <http://www.winehq.org/pipermail/wine-devel/attachments/20050119/ecdf48fe/pp…> Joerg Schiermeier --- images/ppdonate.png | Bin 0 -> 2498 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/ppdonate.png b/images/ppdonate.png new file mode 100644 index 0000000..7ddcdfd Binary files /dev/null and b/images/ppdonate.png differ

1 0

Łukasz Wojniłowicz : Polish translation for release 1.4-rc2
by Jeremy Newman 06 Feb '12

06 Feb '12

Module: website Branch: master Commit: 5c2f8282554f5bae10ce6b171f4db3a6e9523870 URL: http://source.winehq.org/git/website.git/?a=commit;h=5c2f8282554f5bae10ce6b… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Feb 3 16:02:19 2012 +0100 Polish translation for release 1.4-rc2 --- news/pl/2012020201.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pl/2012020201.xml b/news/pl/2012020201.xml new file mode 100644 index 0000000..ccce559 --- /dev/null +++ b/news/pl/2012020201.xml @@ -0,0 +1,12 @@ +<news> +<date>Luty 2, 2012</date> +<title>Wydano Wine 1.4-rc2</title> +<body> + Wydanie rozwojowe Wine 1.4-rc2 jest już dostępne. + <a href="{$root}/announce/1.4-rc2">Co nowego</a> w tym wydaniu: +<ul> + <li>Tylko poprawki błędów, jesteśmy w fazie zamrożenia kodu.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc2.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Wine 1.4-rc2 freigegeben
by Jeremy Newman 06 Feb '12

06 Feb '12

Module: website Branch: master Commit: 14a72a534a9cdd1482101e80c2b7476b74f9a55d URL: http://source.winehq.org/git/website.git/?a=commit;h=14a72a534a9cdd1482101e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 5 12:59:37 2012 +0100 Wine 1.4-rc2 freigegeben --- news/de/2012020201.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/de/2012020201.xml b/news/de/2012020201.xml new file mode 100644 index 0000000..497d550 --- /dev/null +++ b/news/de/2012020201.xml @@ -0,0 +1,12 @@ +<news> +<date>2. Februar 2012</date> +<title>Wine 1.4-rc2 freigegeben</title> +<body> + Die Entwicklungsversion 1.4-rc2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.4-rc2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerbehebungen da wir uns im Code-Freeze befinden.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc2.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

André Hentschel : German translation fix for the Homepage
by Jeremy Newman 06 Feb '12

06 Feb '12

Module: website Branch: master Commit: f0d1d4214ee63c851d507633e5d3720c162f0a0e URL: http://source.winehq.org/git/website.git/?a=commit;h=f0d1d4214ee63c851d5076… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 5 12:59:40 2012 +0100 German translation fix for the Homepage --- templates/de/home.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/de/home.template b/templates/de/home.template index 03457c2..b961325 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -73,7 +73,7 @@ (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">Änderungen (en)</a>) </td></tr> - <tr><td>In Entwicklung:</td> + <tr><td>Entwicklungsversion:</td> <td style="padding-left: 15px;"> <a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a>

1 0

Alexandre Julliard : announce.php: Fix the version number regexp.
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: website Branch: master Commit: 2c6ca4f10864fdf8a2164ade6d70a322769fe6c9 URL: http://source.winehq.org/git/website.git/?a=commit;h=2c6ca4f10864fdf8a2164a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 23:05:46 2012 +0100 announce.php: Fix the version number regexp. --- include/plugins/announce.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index a243475..3f0f0fd 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -28,7 +28,7 @@ if ($arr = file($announce)) { // Link to previous versions in changes $in_bugs = 0; - $arr[$c] = ereg_replace( '[[:digit:].]+', '<a title="Changes since \\0" href="./\\0">\\0</a>', $arr[$c] ); + $arr[$c] = ereg_replace( '[[:digit:].]+(-rc[[:digit:]]+)?', '<a title="Changes since \\0" href="./\\0">\\0</a>', $arr[$c] ); } if ($in_header)

1 0

Alexandre Julliard : Wine release 1.4-rc2
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: website Branch: master Commit: 68f62d130ee61147185a46079f0c0bb9e1c5cc32 URL: http://source.winehq.org/git/website.git/?a=commit;h=68f62d130ee61147185a46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 20:37:13 2012 +0100 Wine release 1.4-rc2 --- news/en/2012020201.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/en/2012020201.xml b/news/en/2012020201.xml new file mode 100644 index 0000000..fbec59a --- /dev/null +++ b/news/en/2012020201.xml @@ -0,0 +1,12 @@ +<news> +<date>February 2, 2012</date> +<title>Wine 1.4-rc2 Released</title> +<body> + The Wine development release 1.4-rc2 is now available. + <a href="{$root}/announce/1.4-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.4-rc2.
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: wine Branch: master Commit: 4d515c07f591a3ccb83f309ac42a92762e00bd7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d515c07f591a3ccb83f309ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 20:27:31 2012 +0100 Release 1.4-rc2. --- ANNOUNCE | 847 ++++++++++++------------------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 178 insertions(+), 689 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d515c07f591a3ccb83f3…

1 0

Tag wine-1.4-rc2 : Alexandre Julliard : Release 1.4-rc2
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: wine Branch: refs/tags/wine-1.4-rc2 Tag: 52d9b5ea6b736e669a6a14651064b413e428b389 URL: http://source.winehq.org/git/wine.git/?a=tag;h=52d9b5ea6b736e669a6a14651064… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 20:27:32 2012 +0100 Release 1.4-rc2

1 0

Aric Stewart : usp10: We do not yet shape hangul properly so allow for SSA_LINK flags to take effect .
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: wine Branch: master Commit: 17cd9d3325994a6862706d4946c55d8f1e35adf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17cd9d3325994a6862706d494… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 1 14:52:35 2012 -0600 usp10: We do not yet shape hangul properly so allow for SSA_LINK flags to take effect. --- dlls/usp10/usp10.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 1f2b863..cad234f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1856,6 +1856,10 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, } } + /* FIXME: When we properly shape Hangul remove this check */ + if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && analysis->pItem[i].a.eScript == Script_Hangul) + analysis->pItem[i].a.fNoGlyphIndex = TRUE; + if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && !scriptInformation[analysis->pItem[i].a.eScript].props.fComplex) analysis->pItem[i].a.fNoGlyphIndex = TRUE;

1 0

Juan Lang : crypt32: Test and correct CryptVerifyCertificateSignature.
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: wine Branch: master Commit: 441f7b6d9eefa8ee05fd265e14079b5290f21784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=441f7b6d9eefa8ee05fd265e1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 1 20:15:27 2012 -0800 crypt32: Test and correct CryptVerifyCertificateSignature. --- dlls/crypt32/cert.c | 4 ++- dlls/crypt32/tests/cert.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 63107e1..557a17b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2239,8 +2239,10 @@ BOOL WINAPI CryptVerifyCertificateSignature(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded, PCERT_PUBLIC_KEY_INFO pPublicKey) { + CRYPT_DATA_BLOB blob = { cbEncoded, (BYTE *)pbEncoded }; + return CryptVerifyCertificateSignatureEx(hCryptProv, dwCertEncodingType, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, (void *)pbEncoded, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &blob, CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY, pPublicKey, 0, NULL); } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 8239af8..759b0da 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1765,6 +1765,73 @@ static void testVerifyCertSig(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, DWORD size = 0; BOOL ret; + if (!pCryptEncodeObjectEx) + { + win_skip("no CryptEncodeObjectEx support\n"); + return; + } + ret = CryptVerifyCertificateSignature(0, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + ret = CryptVerifyCertificateSignature(csp, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + ret = CryptVerifyCertificateSignature(csp, X509_ASN_ENCODING, NULL, 0, + NULL); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG), + "Expected CRYPT_E_ASN1_EOD or OSS_BAD_ARG, got %08x\n", GetLastError()); + info.ToBeSigned.cbData = toBeSigned->cbData; + info.ToBeSigned.pbData = toBeSigned->pbData; + info.SignatureAlgorithm.pszObjId = (LPSTR)sigOID; + info.SignatureAlgorithm.Parameters.cbData = 0; + info.Signature.cbData = sigLen; + info.Signature.pbData = (BYTE *)sig; + info.Signature.cUnusedBits = 0; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &cert, &size); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (cert) + { + PCERT_PUBLIC_KEY_INFO pubKeyInfo = NULL; + DWORD pubKeySize; + + if (0) + { + /* Crashes prior to Vista */ + ret = CryptVerifyCertificateSignature(csp, X509_ASN_ENCODING, + cert, size, NULL); + } + CryptExportPublicKeyInfoEx(csp, AT_SIGNATURE, X509_ASN_ENCODING, + (LPSTR)sigOID, 0, NULL, NULL, &pubKeySize); + pubKeyInfo = HeapAlloc(GetProcessHeap(), 0, pubKeySize); + if (pubKeyInfo) + { + ret = CryptExportPublicKeyInfoEx(csp, AT_SIGNATURE, + X509_ASN_ENCODING, (LPSTR)sigOID, 0, NULL, pubKeyInfo, + &pubKeySize); + ok(ret, "CryptExportKey failed: %08x\n", GetLastError()); + if (ret) + { + ret = CryptVerifyCertificateSignature(csp, X509_ASN_ENCODING, + cert, size, pubKeyInfo); + ok(ret, "CryptVerifyCertificateSignature failed: %08x\n", + GetLastError()); + } + HeapFree(GetProcessHeap(), 0, pubKeyInfo); + } + LocalFree(cert); + } +} + +static void testVerifyCertSigEx(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, + LPCSTR sigOID, const BYTE *sig, DWORD sigLen) +{ + CERT_SIGNED_CONTENT_INFO info; + LPBYTE cert = NULL; + DWORD size = 0; + BOOL ret; + if (!pCryptVerifyCertificateSignatureEx) { win_skip("no CryptVerifyCertificateSignatureEx support\n"); @@ -1875,6 +1942,7 @@ static void testCertSigs(void) testSignCert(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, &sigSize); testVerifyCertSig(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, sigSize); + testVerifyCertSigEx(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, sigSize); CryptReleaseContext(csp, 0); ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL,

1 0