October 2009 - Wine-Commits

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

Oct. 20, 2009

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

Jacek Caban : jscript: Added invoke version 2 tests.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

Module: wine Branch: master Commit: fded8dc017a6571344fd6d31737d4e9ba7ffa029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fded8dc017a6571344fd6d317… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 19 20:41:32 2009 +0200 jscript: Added invoke version 2 tests. --- dlls/jscript/tests/api.js | 54 ++++++++++++++++++----- dlls/jscript/tests/run.c | 105 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 132 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fded8dc017a6571344fd6…

1 0

Andrew Eikum : hlink.idl: Fix typo in comment.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

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 : crypt32/tests: Get rid of a couple of certs unneeded by a test.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

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 : wintrust: Correct sizes of structure members.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

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

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

Oct. 20, 2009

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

Jacek Caban : jscript: Return array length in Array. unshift for invoke version >= 2.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

Module: wine Branch: master Commit: 96cbc45a528966bff136d3f5214edfb69cafbb58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96cbc45a528966bff136d3f52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 19 20:40:39 2009 +0200 jscript: Return array length in Array.unshift for invoke version >= 2. --- dlls/jscript/array.c | 55 +++++++++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index e4ee4db..8ce35cf 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -967,29 +967,25 @@ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP return hres; argc = arg_cnt(dp); - if(!argc) { - if(retv) - V_VT(retv) = VT_EMPTY; - return S_OK; - } - - buf_end = buf + sizeof(buf)/sizeof(WCHAR)-1; - *buf_end-- = 0; - i = length; + if(argc) { + buf_end = buf + sizeof(buf)/sizeof(WCHAR)-1; + *buf_end-- = 0; + i = length; - while(i--) { - str = idx_to_str(i, buf_end); + while(i--) { + str = idx_to_str(i, buf_end); - hres = jsdisp_get_id(jsthis, str, 0, &id); - if(SUCCEEDED(hres)) { - hres = jsdisp_propget(jsthis, id, &var, ei, caller); - if(FAILED(hres)) - return hres; + hres = jsdisp_get_id(jsthis, str, 0, &id); + if(SUCCEEDED(hres)) { + hres = jsdisp_propget(jsthis, id, &var, ei, caller); + if(FAILED(hres)) + return hres; - hres = jsdisp_propput_idx(jsthis, i+argc, &var, ei, caller); - VariantClear(&var); - }else if(hres == DISP_E_UNKNOWNNAME) { - hres = IDispatchEx_DeleteMemberByDispID(vthis->u.dispex, id); + hres = jsdisp_propput_idx(jsthis, i+argc, &var, ei, caller); + VariantClear(&var); + }else if(hres == DISP_E_UNKNOWNNAME) { + hres = IDispatchEx_DeleteMemberByDispID(vthis->u.dispex, id); + } } if(FAILED(hres)) @@ -1002,12 +998,21 @@ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP return hres; } - hres = set_length(jsthis, ei, length+argc); - if(FAILED(hres)) - return hres; + if(argc) { + length += argc; + hres = set_length(jsthis, ei, length); + if(FAILED(hres)) + return hres; + } - if(retv) - V_VT(retv) = VT_EMPTY; + if(retv) { + if(ctx->version < 2) { + V_VT(retv) = VT_EMPTY; + }else { + V_VT(retv) = VT_I4; + V_I4(retv) = length; + } + } return S_OK; }

1 0

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

Oct. 20, 2009

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

Andrey Turkin : dlls: Update Russian translations.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

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

Andrew Eikum : mshtml/tests: Remove todo_wine paths.
by Alexandre Julliard Oct. 20, 2009

Oct. 20, 2009

Module: wine Branch: master Commit: b16634c2f95c1177765eb8dbf34bc99f18c0f96f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16634c2f95c1177765eb8dbf… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 19 11:18:21 2009 -0500 mshtml/tests: Remove todo_wine paths. --- dlls/mshtml/tests/htmllocation.c | 207 +++++++++++++------------------------- 1 files changed, 72 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b16634c2f95c1177765eb…

1 0