October 2009 - Wine-commits

Jacek Caban : jscript: Use the value returned from constructor in 'new' expression if the value if an object.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: fbb763a53e92a38436acf5f542f213b85491f086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbb763a53e92a38436acf5f54… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 19 20:42:03 2009 +0200 jscript: Use the value returned from constructor in 'new' expression if the value if an object. --- dlls/jscript/function.c | 11 +++++++++-- dlls/jscript/tests/lang.js | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 64e645a..faf2daa 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -226,20 +226,27 @@ static HRESULT invoke_constructor(script_ctx_t *ctx, FunctionInstance *function, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DispatchEx *this_obj; + VARIANT var; HRESULT hres; hres = create_object(ctx, &function->dispex, &this_obj); if(FAILED(hres)) return hres; - hres = invoke_source(ctx, function, (IDispatch*)_IDispatchEx_(this_obj), dp, retv, ei, caller); + hres = invoke_source(ctx, function, (IDispatch*)_IDispatchEx_(this_obj), dp, &var, ei, caller); if(FAILED(hres)) { jsdisp_release(this_obj); return hres; } V_VT(retv) = VT_DISPATCH; - V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(this_obj); + if(V_VT(&var) == VT_DISPATCH) { + jsdisp_release(this_obj); + V_DISPATCH(retv) = V_DISPATCH(&var); + }else { + VariantClear(&var); + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(this_obj); + } return S_OK; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index db08b21..9bb0944 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -148,6 +148,21 @@ obj2.pvar = 3; testConstr1.prototype.pvar = 1; ok(obj2.pvar === 3, "obj2.pvar is not 3"); +obj1 = new Object(); +function testConstr3() { + return obj1; +} + +obj2 = new testConstr3(); +ok(obj1 === obj2, "obj1 != obj2"); + +function testConstr4() { + return 2; +} + +obj2 = new testConstr3(); +ok(typeof(obj2) === "object", "typeof(obj2) = " + typeof(obj2)); + var obj3 = new Object; ok(typeof(obj3) === "object", "typeof(obj3) is not object");

1 0

Andrew Eikum : hlink.idl: Fix typo in comment.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: e27576514165e235312db886e22fdf900f742d2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27576514165e235312db886e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 19 15:33:19 2009 -0500 hlink.idl: Fix typo in comment. --- include/hlink.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/hlink.idl b/include/hlink.idl index 886acb3..af3f8f5 100644 --- a/include/hlink.idl +++ b/include/hlink.idl @@ -151,7 +151,7 @@ interface IHlink: IUnknown } /***************************************************************************** - * IHlink interface + * IHlinkSite interface */ [ object,

1 0

Juan Lang : wintrust: Correct sizes of structure members.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 53f964fea8076b5cf847732ccbab3bbe93fc2faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f964fea8076b5cf847732cc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 19 12:46:02 2009 -0700 wintrust: Correct sizes of structure members. --- dlls/wintrust/asn.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 472521f..6a525eb 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -1469,6 +1469,11 @@ struct AsnDecodeSequenceItem */ #define ALIGN_DWORD_PTR(x) (((x) + sizeof(DWORD_PTR) - 1) & ~(sizeof(DWORD_PTR) - 1)) +#define FINALMEMBERSIZE(s, member) (sizeof(s) - offsetof(s, member)) +#define MEMBERSIZE(s, member, nextmember) \ + (offsetof(s, nextmember) - offsetof(s, member)) + + /* Decodes the items in a sequence, where the items are described in items, * the encoded data are in pbEncoded with length cbEncoded. Decodes into * pvStructInfo. nextData is a pointer to the memory location at which the @@ -2244,7 +2249,7 @@ BOOL WINAPI WVTAsn1CatMemberInfoDecode(DWORD dwCertEncodingType, CRYPT_AsnDecodeBMPString, sizeof(LPWSTR), FALSE, TRUE, offsetof(CAT_MEMBERINFO, pwszSubjGuid), 0 }, { ASN_INTEGER, offsetof(CAT_MEMBERINFO, dwCertVersion), - CRYPT_AsnDecodeInt, sizeof(DWORD), + CRYPT_AsnDecodeInt, FINALMEMBERSIZE(CAT_MEMBERINFO, dwCertVersion), FALSE, FALSE, 0, 0 }, }; @@ -2277,7 +2282,8 @@ BOOL WINAPI WVTAsn1CatNameValueDecode(DWORD dwCertEncodingType, CRYPT_AsnDecodeBMPString, sizeof(LPWSTR), FALSE, TRUE, offsetof(CAT_NAMEVALUE, pwszTag), 0 }, { ASN_INTEGER, offsetof(CAT_NAMEVALUE, fdwFlags), - CRYPT_AsnDecodeInt, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + CRYPT_AsnDecodeInt, MEMBERSIZE(CAT_NAMEVALUE, fdwFlags, Value), + FALSE, FALSE, 0, 0 }, { ASN_OCTETSTRING, offsetof(CAT_NAMEVALUE, Value), CRYPT_AsnDecodeOctets, sizeof(CRYPT_DER_BLOB), FALSE, TRUE, offsetof(CAT_NAMEVALUE, Value.pbData), 0 }, @@ -2351,9 +2357,11 @@ BOOL WINAPI WVTAsn1SpcFinancialCriteriaInfoDecode(DWORD dwCertEncodingType, { struct AsnDecodeSequenceItem items[] = { { ASN_BOOL, offsetof(SPC_FINANCIAL_CRITERIA, fFinancialInfoAvailable), - CRYPT_AsnDecodeBool, sizeof(BOOL), FALSE, FALSE, 0, 0 }, + CRYPT_AsnDecodeBool, MEMBERSIZE(SPC_FINANCIAL_CRITERIA, + fFinancialInfoAvailable, fMeetsCriteria), FALSE, FALSE, 0, 0 }, { ASN_BOOL, offsetof(SPC_FINANCIAL_CRITERIA, fMeetsCriteria), - CRYPT_AsnDecodeBool, sizeof(BOOL), FALSE, FALSE, 0, 0 }, + CRYPT_AsnDecodeBool, FINALMEMBERSIZE(SPC_FINANCIAL_CRITERIA, + fMeetsCriteria), FALSE, FALSE, 0, 0 }, }; ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items,

1 0

Juan Lang : crypt32/tests: Get rid of a couple of certs unneeded by a test.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: c0872b218c5a6c3e7aa65248c423bed949a26687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0872b218c5a6c3e7aa65248c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 19 14:46:37 2009 -0700 crypt32/tests: Get rid of a couple of certs unneeded by a test. --- dlls/crypt32/tests/chain.c | 140 +------------------------------------------- 1 files changed, 1 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0872b218c5a6c3e7aa65…

1 0

Juan Lang : crypt32: Test CertFindCertificateStore for finding Unicode strings.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: af4b5303ba94adcf1feb8762917d358adc4bc18d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4b5303ba94adcf1feb87629… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 16 16:33:22 2009 -0700 crypt32: Test CertFindCertificateStore for finding Unicode strings. --- dlls/crypt32/tests/cert.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index a989346..8a00509 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1015,6 +1015,10 @@ static void testFindCert(void) CERT_INFO certInfo = { 0 }; CRYPT_HASH_BLOB blob; BYTE otherSerialNumber[] = { 2 }; + DWORD count; + static const WCHAR juan[] = { 'j','u','a','n',0 }; + static const WCHAR lang[] = { 'L','A','N','G',0 }; + static const WCHAR malcolm[] = { 'm','a','l','c','o','l','m',0 }; store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -1135,6 +1139,44 @@ static void testFindCert(void) ok(context == NULL, "Expected one cert only\n"); } + /* Searching for NULL string matches any context. */ + count = 0; + context = NULL; + do { + context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, + CERT_FIND_ISSUER_STR, NULL, context); + if (context) + count++; + } while (context); + todo_wine + ok(count == 3, "expected 3 contexts\n"); + count = 0; + context = NULL; + do { + context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, + CERT_FIND_ISSUER_STR, juan, context); + if (context) + count++; + } while (context); + todo_wine + ok(count == 2, "expected 2 contexts\n"); + count = 0; + context = NULL; + do { + context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, + CERT_FIND_ISSUER_STR, lang, context); + if (context) + count++; + } while (context); + todo_wine + ok(count == 3, "expected 3 contexts\n"); + SetLastError(0xdeadbeef); + context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, + CERT_FIND_ISSUER_STR, malcolm, NULL); + ok(!context, "expected no certs\n"); + ok(GetLastError() == CRYPT_E_NOT_FOUND, + "expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + CertCloseStore(store, 0); /* Another subject cert search, using iTunes's certs */

1 0

Juan Lang : crypt32: Implement CryptFindCertificateInStore for unicode strings.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 1e424138feead8b70d4d406af92acb079f2304c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e424138feead8b70d4d406af… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 16 16:32:46 2009 -0700 crypt32: Implement CryptFindCertificateInStore for unicode strings. --- dlls/crypt32/cert.c | 66 +++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/cert.c | 3 -- 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b92aee9..5b3b6e3 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1422,6 +1422,69 @@ static PCCERT_CONTEXT find_cert_by_issuer(HCERTSTORE store, DWORD dwType, return found; } +static BOOL compare_cert_by_name_str(PCCERT_CONTEXT pCertContext, + DWORD dwType, DWORD dwFlags, const void *pvPara) +{ + PCERT_NAME_BLOB name; + DWORD len; + BOOL ret = FALSE; + + if (dwType & CERT_INFO_SUBJECT_FLAG) + name = &pCertContext->pCertInfo->Subject; + else + name = &pCertContext->pCertInfo->Issuer; + len = CertNameToStrW(pCertContext->dwCertEncodingType, name, + CERT_SIMPLE_NAME_STR, NULL, 0); + if (len) + { + LPWSTR str = CryptMemAlloc(len * sizeof(WCHAR)); + + if (str) + { + LPWSTR ptr; + + CertNameToStrW(pCertContext->dwCertEncodingType, name, + CERT_SIMPLE_NAME_STR, str, len); + for (ptr = str; *ptr; ptr++) + *ptr = tolowerW(*ptr); + if (strstrW(str, pvPara)) + ret = TRUE; + CryptMemFree(str); + } + } + return ret; +} + +static PCCERT_CONTEXT find_cert_by_name_str(HCERTSTORE store, DWORD dwType, + DWORD dwFlags, const void *pvPara, PCCERT_CONTEXT prev) +{ + PCCERT_CONTEXT found = NULL; + + TRACE("%s\n", debugstr_w(pvPara)); + + if (pvPara) + { + DWORD len = strlenW(pvPara); + LPWSTR str = CryptMemAlloc((len + 1) * sizeof(WCHAR)); + + if (str) + { + LPCWSTR src; + LPWSTR dst; + + for (src = pvPara, dst = str; *src; src++, dst++) + *dst = tolowerW(*src); + *dst = 0; + found = cert_compare_certs_in_store(store, prev, + compare_cert_by_name_str, dwType, dwFlags, str); + CryptMemFree(str); + } + } + else + found = find_cert_any(store, dwType, dwFlags, NULL, prev); + return found; +} + PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, DWORD dwCertEncodingType, DWORD dwFlags, DWORD dwType, const void *pvPara, PCCERT_CONTEXT pPrevCertContext) @@ -1450,6 +1513,9 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, case CERT_COMPARE_PUBLIC_KEY: compare = compare_cert_by_public_key; break; + case CERT_COMPARE_NAME_STR_W: + find = find_cert_by_name_str; + break; case CERT_COMPARE_SUBJECT_CERT: compare = compare_cert_by_subject_cert; break; diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 8a00509..685a564 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1148,7 +1148,6 @@ static void testFindCert(void) if (context) count++; } while (context); - todo_wine ok(count == 3, "expected 3 contexts\n"); count = 0; context = NULL; @@ -1158,7 +1157,6 @@ static void testFindCert(void) if (context) count++; } while (context); - todo_wine ok(count == 2, "expected 2 contexts\n"); count = 0; context = NULL; @@ -1168,7 +1166,6 @@ static void testFindCert(void) if (context) count++; } while (context); - todo_wine ok(count == 3, "expected 3 contexts\n"); SetLastError(0xdeadbeef); context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0,

1 0

Andrey Turkin : programs: Update Russian translations.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 64d488065a62b86c50fe4a2def2004ba4041c713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d488065a62b86c50fe4a2de… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Oct 19 18:41:42 2009 +0400 programs: Update Russian translations. --- programs/notepad/Ru.rc | 1 + programs/reg/Ru.rc | 5 +++++ programs/regedit/Ru.rc | 1 + programs/taskmgr/Ru.rc | 2 ++ programs/wordpad/Ru.rc | 11 ++++++++--- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/programs/notepad/Ru.rc b/programs/notepad/Ru.rc index 814b7fc..0d17be0 100644 --- a/programs/notepad/Ru.rc +++ b/programs/notepad/Ru.rc @@ -56,6 +56,7 @@ POPUP "&Правка" { POPUP "П&оиск" { MENUITEM "&Найти...", CMD_SEARCH MENUITEM "Найти &далее\tF3", CMD_SEARCH_NEXT + MENUITEM "&Заменить...\tCtrl+H", CMD_REPLACE } POPUP "&Справка" { MENUITEM "&Содержание", CMD_HELP_CONTENTS diff --git a/programs/reg/Ru.rc b/programs/reg/Ru.rc index cac53a3..b3cfc1f 100644 --- a/programs/reg/Ru.rc +++ b/programs/reg/Ru.rc @@ -31,4 +31,9 @@ STRINGTABLE STRING_ADD_USAGE, "REG ADD <ключ> [/v <параметр> | /ve] [/t <тип>] [/s <разделитель>] [/d данные] [/f]\n" STRING_DELETE_USAGE, "REG DELETE <ключ> [/v <параметр> | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY <ключ> [/v <параметр> | /ve] [/s]\n" + STRING_SUCCESS, "Операция успешно завершена\n" + STRING_INVALID_KEY, "Ошибка: неправильное имя ключа\n" + STRING_INVALID_CMDLINE, "Ошибка: неправильные параметры командной строки\n" + STRING_NO_REMOTE, "Ошибка: невозможно добавить ключи на удаленной машине\n" + STRING_CANNOT_FIND, "Ошибка: не удалось найти указанный ключ реестра или значение\n" } diff --git a/programs/regedit/Ru.rc b/programs/regedit/Ru.rc index 2692c99..1c038b8 100644 --- a/programs/regedit/Ru.rc +++ b/programs/regedit/Ru.rc @@ -286,6 +286,7 @@ BEGIN ID_EDIT_COPYKEYNAME "Копирует имя выделенного ключа в буфер обмена" ID_EDIT_FIND "Ищет текстовую строку в ключе, значении или данных" ID_EDIT_FINDNEXT "Ищет следующее совпадение текста, заданного в предыдущем поиске" + ID_EDIT_EXPORT "Экспортирует выделенную ветку реестра в текстовый файл" END STRINGTABLE DISCARDABLE diff --git a/programs/taskmgr/Ru.rc b/programs/taskmgr/Ru.rc index fd42d6d..74462e3 100644 --- a/programs/taskmgr/Ru.rc +++ b/programs/taskmgr/Ru.rc @@ -488,6 +488,7 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Устанавливает класс приоритета НИЖЕ СРЕДНЕГО для процесса" ID_PROCESS_PAGE_SETPRIORITY_LOW "Устанавливает класс приоритета НИЗКИЙ для процесса" + ID_PROCESS_PAGE_DEBUGCHANNELS "Управляет каналами отладки" END STRINGTABLE DISCARDABLE @@ -547,6 +548,7 @@ BEGIN IDS_TERMINATE_MESSAGE "ВНИМАНИЕ! Завершение процесса может\nпривести к нежелательным результатам, в том числе\nк потере данных или к нестабильной работе системы.\nВы действительно хотите завершить процесс?" IDS_TERMINATE_UNABLE2TERMINATE "Невозможно завершить процесс" IDS_DEBUG_MESSAGE "ВНИМАНИЕ! Отладка этого процесса может привести к потере данных.\nВы действительно хотите использовать отладчик?" + IDS_DEBUG_UNABLE2DEBUG "Отладка процесса невозможна." IDS_AFFINITY_ERROR_MESSAGE "Процессу должен соответствовать хотя бы один ЦП." IDS_AFFINITY_ERROR_TITLE "Неправильный параметр" IDS_AFFINITY_UNABLE2ACCESS "Невозможно получить доступ или установить соответствие процесса" diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index c48b16f..2841f2f 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -219,8 +219,8 @@ BEGIN STRING_PREVIEW_PRINT, "Печать" STRING_PREVIEW_NEXTPAGE, "Следующая страница" STRING_PREVIEW_PREVPAGE, "Предыдущая страница" - STRING_PREVIEW_TWOPAGES, "Two pages" - STRING_PREVIEW_ONEPAGE, "One page" + STRING_PREVIEW_TWOPAGES, "Две страницы" + STRING_PREVIEW_ONEPAGE, "Одна страница" STRING_PREVIEW_CLOSE, "Закрыть" END @@ -231,7 +231,7 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_DEFAULT_FILENAME, "Document" + STRING_DEFAULT_FILENAME, "Документ" STRING_PROMPT_SAVE_CHANGES, "Сохранить изменения в '%s'?" STRING_SEARCH_FINISHED, "Поиск в документе завершен." STRING_LOAD_RICHED_FAILED, "Ошибка загрузки библиотеки RichEdit." @@ -240,5 +240,10 @@ BEGIN "этой операции?" STRING_INVALID_NUMBER, "Неправильный числовой формат" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage документы не поддерживаются" + STRING_WRITE_FAILED, "Невозможно сохранить файл." + STRING_WRITE_ACCESS_DENIED, "Недостаточно прав для сохранения файла." + STRING_OPEN_FAILED, "Невозможно открыть файл." + STRING_OPEN_ACCESS_DENIED, "Недостаточно прав для открытия файла." STRING_PRINTING_NOT_IMPLEMENTED, "Печать не поддерживается" + STRING_MAX_TAB_STOPS, "Нельзя добавить более 32 позиций табуляции." END

1 0

Andrey Turkin : dlls: Update Russian translations.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: b78d457efb414a1861074c58830e2097f952a4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b78d457efb414a1861074c588… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Oct 19 18:41:56 2009 +0400 dlls: Update Russian translations. --- dlls/appwiz.cpl/Ru.rc | 2 ++ dlls/setupapi/Ru.rc | 8 ++++++++ dlls/shell32/shell32_Ru.rc | 6 ++++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Ru.rc b/dlls/appwiz.cpl/Ru.rc index 4de5991..9547818 100644 --- a/dlls/appwiz.cpl/Ru.rc +++ b/dlls/appwiz.cpl/Ru.rc @@ -38,6 +38,8 @@ STRINGTABLE IDS_COLUMN_NAME, "Название" IDS_COLUMN_PUBLISHER, "Издатель" IDS_COLUMN_VERSION, "Версия" + IDS_INSTALL_FILTER, "Установщики\0*instal*.exe;*setup*.exe;*.msi\0Программы (*.exe)\0*.exe\0Все файлы (*.*)\0*.*\0\0" + IDS_REMOVE, "&Удалить..." IDS_MODIFY_REMOVE, "&Изменить/Удалить..." diff --git a/dlls/setupapi/Ru.rc b/dlls/setupapi/Ru.rc index 669cb1c..c5a6eec 100644 --- a/dlls/setupapi/Ru.rc +++ b/dlls/setupapi/Ru.rc @@ -25,6 +25,14 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "Файл '%s' на %s необходим" + IDS_UNKNOWN "Неизвестно" + IDS_COPYFROM "Копировать файлы из:" + IDS_INFO "Введите путь к файлу и нажмите OK." +} + COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Копирование файлов..." diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc index 65f670a..dc55aa9 100644 --- a/dlls/shell32/shell32_Ru.rc +++ b/dlls/shell32/shell32_Ru.rc @@ -248,6 +248,12 @@ STRINGTABLE IDS_SHUTDOWN_TITLE "Выключить питание" IDS_SHUTDOWN_PROMPT "Закончить работу с Wine?" + /* Run File dialog */ + IDS_RUNDLG_ERROR "Невозможно отобразить диалог Запуск файла (внутренняя ошибка)" + IDS_RUNDLG_BROWSE_ERROR "Невозможно отобразить диалог Обзор (внутренняя ошибка)" + IDS_RUNDLG_BROWSE_CAPTION "Обзор" + IDS_RUNDLG_BROWSE_FILTER "Исполняемые файлы\0*.exe\0Все файлы\0*.*\0\0" + /* shell folder path default values */ IDS_PROGRAMS "Главное меню\\Программы" IDS_PERSONAL "Мои документы"

1 0

Juan Lang : crypt32: Add a safe default for unsupported critical extensions .
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 87405ade02bfe5c815ae32d16453436d4e0c6e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87405ade02bfe5c815ae32d16… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 19 09:04:51 2009 -0700 crypt32: Add a safe default for unsupported critical extensions. --- dlls/crypt32/chain.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index fa9fdf0..c9f7618 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -814,6 +814,44 @@ static void dump_element(PCCERT_CONTEXT cert) dump_extension(&cert->pCertInfo->rgExtension[i]); } +static BOOL CRYPT_CriticalExtensionsSupported(PCCERT_CONTEXT cert) +{ + BOOL ret = TRUE; + DWORD i; + + for (i = 0; ret && i < cert->pCertInfo->cExtension; i++) + { + if (cert->pCertInfo->rgExtension[i].fCritical) + { + LPCSTR oid = cert->pCertInfo->rgExtension[i].pszObjId; + + if (!strcmp(oid, szOID_BASIC_CONSTRAINTS)) + ret = TRUE; + else if (!strcmp(oid, szOID_BASIC_CONSTRAINTS2)) + ret = TRUE; + else if (!strcmp(oid, szOID_NAME_CONSTRAINTS)) + ret = TRUE; + else if (!strcmp(oid, szOID_KEY_USAGE)) + { + static int warned; + + if (!warned++) + FIXME("key usage extension unsupported, ignoring\n"); + ret = TRUE; + } + else if (!strcmp(oid, szOID_SUBJECT_ALT_NAME)) + ret = TRUE; + else + { + FIXME("unsupported critical extension %s\n", + debugstr_a(oid)); + ret = FALSE; + } + } + } + return ret; +} + static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, PCERT_SIMPLE_CHAIN chain, LPFILETIME time) { @@ -878,6 +916,11 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, CERT_TRUST_INVALID_BASIC_CONSTRAINTS; } /* FIXME: check valid usages */ + /* Check whether every critical extension is supported */ + if (!CRYPT_CriticalExtensionsSupported( + chain->rgpElement[i]->pCertContext)) + chain->rgpElement[i]->TrustStatus.dwErrorStatus |= + CERT_TRUST_INVALID_EXTENSION; CRYPT_CombineTrustStatus(&chain->TrustStatus, &chain->rgpElement[i]->TrustStatus); }

1 0

Juan Lang : rsaenh: Add some traces to key importing.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 9a727896860591dda1cb5f3d2843fca7f9647811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a727896860591dda1cb5f3d2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 19 13:16:24 2009 -0700 rsaenh: Add some traces to key importing. --- dlls/rsaenh/rsaenh.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 04048cf..0cc4fb4 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -777,6 +777,8 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK peaAlgidInfo = get_algid_info(hProv, aiAlgid); if (!peaAlgidInfo) return (HCRYPTKEY)INVALID_HANDLE_VALUE; + TRACE("alg = %s, dwKeyLen = %d\n", debugstr_a(peaAlgidInfo->szName), + dwKeyLen); /* * Assume the default key length, if none is specified explicitly */ @@ -822,6 +824,8 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK dwKeyLen > peaAlgidInfo->dwMaxLen || dwKeyLen < peaAlgidInfo->dwMinLen) { + TRACE("key len %d out of bounds (%d, %d)\n", dwKeyLen, + peaAlgidInfo->dwMinLen, peaAlgidInfo->dwMaxLen); SetLastError(NTE_BAD_FLAGS); return (HCRYPTKEY)INVALID_HANDLE_VALUE; } @@ -2948,6 +2952,8 @@ static BOOL import_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, pBlobHeader->bVersion != CUR_BLOB_VERSION || pBlobHeader->reserved != 0) { + TRACE("bVersion = %d, reserved = %d\n", pBlobHeader->bVersion, + pBlobHeader->reserved); SetLastError(NTE_BAD_DATA); return FALSE; } @@ -2956,6 +2962,7 @@ static BOOL import_key(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, * fStoreKey's original value. */ fStoreKey = fStoreKey && !(dwFlags & CRYPT_VERIFYCONTEXT); + TRACE("blob type: %x\n", pBlobHeader->bType); switch (pBlobHeader->bType) { case PRIVATEKEYBLOB:

1 0