November 2011 - Wine-commits

Juan Lang : rsaenh: Test importing a key with an input buffer that' s too small for the key it contains.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: f0e2cba471824e5c6228b062cb6dba7a04f7d448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e2cba471824e5c6228b062c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 31 10:43:43 2011 -0700 rsaenh: Test importing a key with an input buffer that's too small for the key it contains. --- dlls/rsaenh/tests/rsaenh.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 27fedd9..58e6eb8 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1516,7 +1516,9 @@ static void test_import_private(void) 0x40, 0x64, 0x28, 0xe8, 0x8a, 0xe7, 0xa4, 0xd4, 0x1c, 0xfd, 0xde, 0x71 }; - + BLOBHEADER *blobHeader = (BLOBHEADER *)abPlainPrivateKey; + RSAPUBKEY *rsaPubKey = (RSAPUBKEY *)(blobHeader+1); + dwLen = (DWORD)sizeof(abPlainPrivateKey); result = CryptImportKey(hProv, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey); if (!result) { @@ -1561,6 +1563,22 @@ static void test_import_private(void) CryptDestroyKey(hSessionKey); CryptDestroyKey(hKeyExchangeKey); + + /* Test importing a private key with a buffer that's smaller than the + * actual buffer. The private exponent can be omitted, its length is + * inferred from the passed-in length parameter. + */ + dwLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + rsaPubKey->bitlen / 8 + 5 * rsaPubKey->bitlen / 16; + for (; dwLen < sizeof(abPlainPrivateKey); dwLen++) + { + result = CryptImportKey(hProv, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey); + todo_wine + ok(result, "CryptImportKey failed at size %d: %d (%08x)\n", dwLen, + GetLastError(), GetLastError()); + if (result) + CryptDestroyKey(hKeyExchangeKey); + } } static void test_verify_signature(void) {

1 0

Juan Lang : rsaenh: Infer private exponent length from data length.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 2d658db553f1c9df313a4bfcd2c06618997ef5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d658db553f1c9df313a4bfcd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 31 10:44:23 2011 -0700 rsaenh: Infer private exponent length from data length. --- dlls/rsaenh/implglue.c | 8 ++++++-- dlls/rsaenh/implglue.h | 2 +- dlls/rsaenh/rsaenh.c | 6 +++--- dlls/rsaenh/tests/rsaenh.c | 1 - 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index c217007..2d5a1b4 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -482,7 +482,7 @@ BOOL export_private_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD } BOOL import_private_key_impl(CONST BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwPubExp) + DWORD dwDataLen, DWORD dwPubExp) { BYTE *pbTemp, *pbBigNum; @@ -496,7 +496,7 @@ BOOL import_private_key_impl(CONST BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD pbTemp = HeapAlloc(GetProcessHeap(), 0, 2*dwKeyLen+5*((dwKeyLen+1)>>1)); if (!pbTemp) return FALSE; - memcpy(pbTemp, pbSrc, 2*dwKeyLen+5*((dwKeyLen+1)>>1)); + memcpy(pbTemp, pbSrc, min(dwDataLen, 2*dwKeyLen+5*((dwKeyLen+1)>>1))); pbBigNum = pbTemp; pKeyContext->rsa.type = PK_PRIVATE; @@ -518,6 +518,10 @@ BOOL import_private_key_impl(CONST BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD reverse_bytes(pbBigNum, (dwKeyLen+1)>>1); mp_read_unsigned_bin(&pKeyContext->rsa.qP, pbBigNum, (dwKeyLen+1)>>1); pbBigNum += (dwKeyLen+1)>>1; + /* The size of the private exponent d is inferred from the remaining + * data length. + */ + dwKeyLen = min(dwKeyLen, dwDataLen - (pbBigNum - pbTemp)); reverse_bytes(pbBigNum, dwKeyLen); mp_read_unsigned_bin(&pKeyContext->rsa.d, pbBigNum, dwKeyLen); mp_set_int(&pKeyContext->rsa.e, dwPubExp); diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index c07a279..efb5891 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -98,7 +98,7 @@ BOOL import_public_key_impl(CONST BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD d BOOL export_private_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, DWORD *pdwPubExp) DECLSPEC_HIDDEN; BOOL import_private_key_impl(CONST BYTE* pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwPubExp) DECLSPEC_HIDDEN; + DWORD dwDataLen, DWORD dwPubExp) DECLSPEC_HIDDEN; BOOL gen_rand_impl(BYTE *pbBuffer, DWORD dwLen) DECLSPEC_HIDDEN; diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index f332cfb..fc04579 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2745,10 +2745,10 @@ static BOOL import_private_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat return FALSE; } if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + - (2 * pRSAPubKey->bitlen >> 3) + (5 * ((pRSAPubKey->bitlen+8)>>4)))) + (pRSAPubKey->bitlen >> 3) + (5 * ((pRSAPubKey->bitlen+8)>>4)))) { DWORD expectedLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + - (2 * pRSAPubKey->bitlen >> 3) + (5 * ((pRSAPubKey->bitlen+8)>>4)); + (pRSAPubKey->bitlen >> 3) + (5 * ((pRSAPubKey->bitlen+8)>>4)); ERR("blob too short for pub key: expect %d, got %d\n", expectedLen, dwDataLen); @@ -2760,7 +2760,7 @@ static BOOL import_private_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) return FALSE; setup_key(pCryptKey); ret = import_private_key_impl((CONST BYTE*)(pRSAPubKey+1), &pCryptKey->context, - pRSAPubKey->bitlen/8, pRSAPubKey->pubexp); + pRSAPubKey->bitlen/8, dwDataLen, pRSAPubKey->pubexp); if (ret) { if (dwFlags & CRYPT_EXPORTABLE) pCryptKey->dwPermissions |= CRYPT_EXPORT; diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 58e6eb8..4af3cdcc 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1573,7 +1573,6 @@ static void test_import_private(void) for (; dwLen < sizeof(abPlainPrivateKey); dwLen++) { result = CryptImportKey(hProv, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey); - todo_wine ok(result, "CryptImportKey failed at size %d: %d (%08x)\n", dwLen, GetLastError(), GetLastError()); if (result)

1 0

Alexandre Julliard : oleview: Convert dialogs to po files.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: efd7465e5f5ce9e79c69bb08963d06591cb39d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd7465e5f5ce9e79c69bb089… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 1 11:12:19 2011 +0100 oleview: Convert dialogs to po files. --- po/ar.po | 80 ++++++++++++++++++++- po/bg.po | 84 +++++++++++++++++++++- po/ca.po | 87 ++++++++++++++++++++++- po/cs.po | 84 +++++++++++++++++++++- po/da.po | 87 ++++++++++++++++++++--- po/de.po | 80 ++++++++++++++++++++- po/el.po | 82 +++++++++++++++++++++- po/en.po | 78 ++++++++++++++++++++- po/en_US.po | 80 ++++++++++++++++++++- po/eo.po | 84 +++++++++++++++++++++- po/es.po | 84 +++++++++++++++++++++- po/fa.po | 80 ++++++++++++++++++++- po/fi.po | 92 +++++++++++++++++++++++- po/fr.po | 80 ++++++++++++++++++++- po/he.po | 80 ++++++++++++++++++++- po/hi.po | 78 ++++++++++++++++++++- po/hu.po | 85 ++++++++++++++++++++++- po/it.po | 80 ++++++++++++++++++++- po/ja.po | 80 ++++++++++++++++++++- po/ko.po | 80 ++++++++++++++++++++- po/lt.po | 80 ++++++++++++++++++++- po/ml.po | 78 ++++++++++++++++++++- po/nb_NO.po | 87 ++++++++++++++++++++--- po/nl.po | 80 ++++++++++++++++++++- po/or.po | 78 ++++++++++++++++++++- po/pa.po | 78 ++++++++++++++++++++- po/pl.po | 80 ++++++++++++++++++++- po/pt_BR.po | 80 ++++++++++++++++++++- po/pt_PT.po | 80 ++++++++++++++++++++- po/rm.po | 80 ++++++++++++++++++++- po/ro.po | 80 ++++++++++++++++++++- po/ru.po | 80 ++++++++++++++++++++- po/sk.po | 84 +++++++++++++++++++++- po/sl.po | 87 ++++++++++++++++++++++- po/sr_RS(a)cyrillic.po | 84 +++++++++++++++++++++- po/sr_RS(a)latin.po | 92 +++++++++++++++++++++++- po/sv.po | 80 ++++++++++++++++++++- po/te.po | 78 ++++++++++++++++++++- po/th.po | 82 +++++++++++++++++++++- po/tr.po | 84 +++++++++++++++++++++- po/uk.po | 80 ++++++++++++++++++++- po/wa.po | 81 ++++++++++++++++++++- po/wine.pot | 78 ++++++++++++++++++++- po/zh_CN.po | 80 ++++++++++++++++++++- po/zh_TW.po | 80 ++++++++++++++++++++- programs/oleview/Da.rc | 89 ----------------------- programs/oleview/De.rc | 91 ------------------------ programs/oleview/En.rc | 89 ----------------------- programs/oleview/Fr.rc | 92 ------------------------ programs/oleview/He.rc | 97 ------------------------- programs/oleview/It.rc | 92 ------------------------ programs/oleview/Ja.rc | 92 ------------------------ programs/oleview/Ko.rc | 92 ------------------------ programs/oleview/Lt.rc | 92 ------------------------ programs/oleview/Makefile.in | 22 +------ programs/oleview/Nl.rc | 91 ------------------------ programs/oleview/No.rc | 89 ----------------------- programs/oleview/Pl.rc | 90 ------------------------ programs/oleview/Pt.rc | 125 --------------------------------- programs/oleview/Ro.rc | 92 ------------------------ programs/oleview/Ru.rc | 92 ------------------------ programs/oleview/Sv.rc | 89 ----------------------- programs/oleview/Uk.rc | 93 ------------------------ programs/oleview/Zh.rc | 159 ------------------------------------------ programs/oleview/oleview.rc | 65 +++++++++++++++++ 65 files changed, 3595 insertions(+), 1914 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efd7465e5f5ce9e79c69b…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 7203980a70a875a8524831882a5a05246400286b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7203980a70a875a8524831882… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 1 00:23:04 2011 +0100 po: Update French translation. --- po/fr.po | 41 ++++++++++++++--------------------------- 1 files changed, 14 insertions(+), 27 deletions(-) diff --git a/po/fr.po b/po/fr.po index 761f77b..2553638 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-10-10 22:11+0100\n" +"PO-Revision-Date: 2011-11-01 00:20+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -7734,9 +7734,8 @@ msgstr "" "\n" #: attrib.rc:28 -#, fuzzy msgid "%1: File Not Found\n" -msgstr "%s : fichier non trouvé\n" +msgstr "%1 : fichier non trouvé\n" #: attrib.rc:47 msgid "" @@ -8696,14 +8695,12 @@ msgstr "" "où « service » est le nom du service à arrêter.\n" #: net.rc:30 -#, fuzzy msgid "Stopping dependent service: %1\n" -msgstr "Arrêt du service dépendant : %s\n" +msgstr "Arrêt du service dépendant : %1\n" #: net.rc:31 -#, fuzzy msgid "Could not stop service %1\n" -msgstr "Impossible d'arrêter le service %s\n" +msgstr "Impossible d'arrêter le service %1\n" #: net.rc:32 msgid "Could not get handle to service control manager.\n" @@ -8714,34 +8711,28 @@ msgid "Could not get handle to service.\n" msgstr "Impossible d'obtenir un descripteur du service.\n" #: net.rc:34 -#, fuzzy msgid "The %1 service is starting.\n" -msgstr "Le service %s démarre.\n" +msgstr "Le service %1 démarre.\n" #: net.rc:35 -#, fuzzy msgid "The %1 service was started successfully.\n" -msgstr "Le service %s a démarré avec succès.\n" +msgstr "Le service %1 a été démarré avec succès.\n" #: net.rc:36 -#, fuzzy msgid "The %1 service failed to start.\n" -msgstr "Le service %s n'a pas pu être démarré.\n" +msgstr "Le service %1 n'a pas pu être démarré.\n" #: net.rc:37 -#, fuzzy msgid "The %1 service is stopping.\n" -msgstr "Le service %s est en cours d'arrêt.\n" +msgstr "Le service %1 est en cours d'arrêt.\n" #: net.rc:38 -#, fuzzy msgid "The %1 service was stopped successfully.\n" -msgstr "Le service %s a été arrêté avec succès.\n" +msgstr "Le service %1 a été arrêté avec succès.\n" #: net.rc:39 -#, fuzzy msgid "The %1 service failed to stop.\n" -msgstr "Le service %s n'a pas pu être arrêté.\n" +msgstr "Le service %1 n'a pas pu être arrêté.\n" #: net.rc:41 msgid "There are no entries in the list.\n" @@ -8758,9 +8749,8 @@ msgstr "" "---------------------------------------------------------------\n" #: net.rc:43 -#, fuzzy msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%s %s %s Ressources ouvertes : %lu\n" +msgstr "%1 %2 %3 Ressources ouvertes : %4!u!\n" #: net.rc:44 notepad.rc:122 winemine.rc:68 winemine.rc:78 winemine.rc:92 msgid "OK" @@ -10903,9 +10893,8 @@ msgstr "" "de la fenêtre" #: wineconsole.rc:34 -#, fuzzy msgid "Each character is %1!u! pixels wide on %2!u! pixels high" -msgstr "Chaque caractère fait %ld pixels de large et %ld pixels de haut" +msgstr "Chaque caractère fait %1!u! pixels de large sur %2!u! pixels de haut" #: wineconsole.rc:35 msgid "This is a test" @@ -11129,9 +11118,8 @@ msgid "Security" msgstr "Sécurité" #: winefile.rc:120 -#, fuzzy msgid "%1 of %2 free" -msgstr "%s libres sur %s" +msgstr "%1 libres sur %2" #: winemine.rc:34 msgid "&Game" @@ -11202,9 +11190,8 @@ msgid "Rows" msgstr "Lignes" #: winemine.rc:87 -#, fuzzy msgid "Columns" -msgstr "c&olonne" +msgstr "Colonnes" #: winemine.rc:88 msgid "Mines"

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 8c1f33086e2c568d07b459616ccd09fe61b8baa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1f33086e2c568d07b459616… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Oct 31 19:23:34 2011 +0100 po: Update Italian translation. --- po/it.po | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/po/it.po b/po/it.po index a75ab1e..0b5b45b 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-10-21 19:24+0200\n" +"PO-Revision-Date: 2011-10-31 19:18+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -349,7 +349,7 @@ msgid "" "Margins overlap or fall outside Paper boundaries.\n" "Please reenter margins." msgstr "" -"I margini si sovrappongono o si trovano oltre il limite della carta.\n" +"I margini si sovrappongono o si trovano oltre il limite del foglio.\n" "Per favore ridefinire i margini." #: comdlg32.rc:74 @@ -8829,7 +8829,7 @@ msgstr "&Note a piè di pagina:" #: notepad.rc:112 msgid "&Margins (millimeters):" -msgstr "&Margini:" +msgstr "&Margini (millimetri):" #: notepad.rc:113 msgid "&Left:" @@ -11127,9 +11127,8 @@ msgid "Rows" msgstr "Righe" #: winemine.rc:87 -#, fuzzy msgid "Columns" -msgstr "C&olonna" +msgstr "Colonne" #: winemine.rc:88 msgid "Mines"

1 0

Juan Lang : wininet: Implement ShowX509EncodedCertificate.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 044f645477f2721cb5c9192b905a8353427702b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=044f645477f2721cb5c9192b9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 31 12:55:15 2011 -0700 wininet: Implement ShowX509EncodedCertificate. --- dlls/wininet/Makefile.in | 2 +- dlls/wininet/http.c | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 1e705a3..f3710f3 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_WINX32_ MODULE = wininet.dll IMPORTLIB = wininet IMPORTS = mpr shlwapi shell32 user32 advapi32 -DELAYIMPORTS = secur32 crypt32 +DELAYIMPORTS = secur32 crypt32 cryptui EXTRALIBS = @SOCKETLIBS@ @ZLIB@ C_SRCS = \ diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 70d5f2e..1847820 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -65,6 +65,8 @@ #include "shlwapi.h" #include "sspi.h" #include "wincrypt.h" +#include "winuser.h" +#include "cryptuiapi.h" #include "internet.h" #include "wine/debug.h" @@ -6077,6 +6079,24 @@ BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) */ DWORD WINAPI ShowX509EncodedCertificate(HWND parent, LPBYTE cert, DWORD len) { - FIXME("stub: %p %p %u\n", parent, cert, len); - return ERROR_CALL_NOT_IMPLEMENTED; + PCCERT_CONTEXT certContext = CertCreateCertificateContext(X509_ASN_ENCODING, + cert, len); + DWORD ret; + + if (certContext) + { + CRYPTUI_VIEWCERTIFICATE_STRUCTW view; + + memset(&view, 0, sizeof(view)); + view.hwndParent = parent; + view.pCertContext = certContext; + if (CryptUIDlgViewCertificateW(&view, NULL)) + ret = ERROR_SUCCESS; + else + ret = GetLastError(); + CertFreeCertificateContext(certContext); + } + else + ret = GetLastError(); + return ret; }

1 0

André Hentschel : dbghelp: Rename SymMatchString and forward it to SymMatchStringA.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 7e3fe1975a906185d6d2280652003f7c2d8bebe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3fe1975a906185d6d228065… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 31 20:07:32 2011 +0100 dbghelp: Rename SymMatchString and forward it to SymMatchStringA. --- dlls/dbghelp/dbghelp.spec | 4 ++-- dlls/dbghelp/symbol.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 7678e53..926218b 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -137,8 +137,8 @@ @ stdcall SymLoadModuleExW(long long wstr wstr int64 long ptr long) @ stdcall SymMatchFileName(str str ptr ptr) @ stdcall SymMatchFileNameW(wstr wstr ptr ptr) -@ stdcall SymMatchString(str str long) -@ stub SymMatchStringA +@ stdcall SymMatchString(str str long) SymMatchStringA +@ stdcall SymMatchStringA(str str long) @ stub SymMatchStringW @ stub SymNext @ stub SymNextW diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 4682c85..4ee0695 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1874,10 +1874,10 @@ DWORD WINAPI UnDecorateSymbolName(PCSTR DecoratedName, PSTR UnDecoratedName, } /****************************************************************** - * SymMatchString (DBGHELP.@) + * SymMatchStringA (DBGHELP.@) * */ -BOOL WINAPI SymMatchString(PCSTR string, PCSTR re, BOOL _case) +BOOL WINAPI SymMatchStringA(PCSTR string, PCSTR re, BOOL _case) { regex_t preg; BOOL ret;

1 0

André Hentschel : dbghelp: Implement SymMatchStringW.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: d6fadb882f1d5575e38e33e89ef75bf8b533e2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6fadb882f1d5575e38e33e89… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 31 20:08:00 2011 +0100 dbghelp: Implement SymMatchStringW. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 926218b..5b48ae5 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -139,7 +139,7 @@ @ stdcall SymMatchFileNameW(wstr wstr ptr ptr) @ stdcall SymMatchString(str str long) SymMatchStringA @ stdcall SymMatchStringA(str str long) -@ stub SymMatchStringW +@ stdcall SymMatchStringW(wstr wstr long) @ stub SymNext @ stub SymNextW @ stub SymPrev diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 4ee0695..add3a1a 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1891,6 +1891,35 @@ BOOL WINAPI SymMatchStringA(PCSTR string, PCSTR re, BOOL _case) } /****************************************************************** + * SymMatchStringW (DBGHELP.@) + * + * FIXME: SymMatchStringA should convert and pass the strings to SymMatchStringW, + * but that needs a unicode RE library. + */ +BOOL WINAPI SymMatchStringW(PCWSTR string, PCWSTR re, BOOL _case) +{ + BOOL ret; + LPSTR s, r; + DWORD len; + + TRACE("%s %s %c\n", debugstr_w(string), debugstr_w(re), _case ? 'Y' : 'N'); + + len = WideCharToMultiByte( CP_ACP, 0, string, -1, NULL, 0, NULL, NULL ); + s = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, string, -1, s, len, NULL, NULL ); + + len = WideCharToMultiByte( CP_ACP, 0, re, -1, NULL, 0, NULL, NULL ); + r = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, re, -1, r, len, NULL, NULL ); + + ret = SymMatchStringA(s, r, _case); + + HeapFree( GetProcessHeap(), 0, r ); + HeapFree( GetProcessHeap(), 0, s ); + return ret; +} + +/****************************************************************** * SymSearch (DBGHELP.@) */ BOOL WINAPI SymSearch(HANDLE hProcess, ULONG64 BaseOfDll, DWORD Index,

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: ee3c0c3e8077704e011dfddea8f1fcb8e5620b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3c0c3e8077704e011dfddea… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Oct 31 20:16:19 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index c01209c..2c743cb 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-10-22 10:23+0300\n" +"PO-Revision-Date: 2011-10-31 20:15+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Virtaal 0.7.0\n" +"X-Generator: Virtaal 0.7.1-rc1\n" "X-Project-Style: default\n" #: appwiz.rc:28 @@ -11070,9 +11070,8 @@ msgid "Rows" msgstr "Eilutės" #: winemine.rc:87 -#, fuzzy msgid "Columns" -msgstr "&stulpelį" +msgstr "Stulpeliai" #: winemine.rc:88 msgid "Mines"

1 0

Juan Lang : rsaenh: Add error messages for failed private key imports.
by Alexandre Julliard 01 Nov '11

01 Nov '11

Module: wine Branch: master Commit: 54b972e2fcdc34c09387d359b5d9cc21aa20b29a URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b972e2fcdc34c09387d359b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 26 16:02:03 2011 -0700 rsaenh: Add error messages for failed private key imports. --- dlls/rsaenh/rsaenh.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index db58e44..f332cfb 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2731,11 +2731,27 @@ static BOOL import_private_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat return FALSE; } - if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY)) || - (pRSAPubKey->magic != RSAENH_MAGIC_RSA2) || - (dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY))) + { + ERR("datalen %d not long enough for a BLOBHEADER + RSAPUBKEY\n", + dwDataLen); + SetLastError(NTE_BAD_DATA); + return FALSE; + } + if (pRSAPubKey->magic != RSAENH_MAGIC_RSA2) + { + ERR("unexpected magic %08x\n", pRSAPubKey->magic); + SetLastError(NTE_BAD_DATA); + return FALSE; + } + if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + (2 * pRSAPubKey->bitlen >> 3) + (5 * ((pRSAPubKey->bitlen+8)>>4)))) { + DWORD expectedLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + (2 * pRSAPubKey->bitlen >> 3) + (5 * ((pRSAPubKey->bitlen+8)>>4)); + + ERR("blob too short for pub key: expect %d, got %d\n", + expectedLen, dwDataLen); SetLastError(NTE_BAD_DATA); return FALSE; }

1 0