wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Jacek Caban : jscript: Added SetProperty(SCRIPTPROP_INVOKEVERSIONING) implementation.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 3b2d5ecdf5865f94322b01c033deeba211894732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2d5ecdf5865f94322b01c03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 19 20:39:24 2009 +0200 jscript: Added SetProperty(SCRIPTPROP_INVOKEVERSIONING) implementation. --- dlls/jscript/jscript.c | 25 +++++++++++++++++++++- dlls/jscript/jscript.h | 1 + dlls/jscript/tests/jscript.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index eb41835..f93962c 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -51,6 +51,7 @@ typedef struct { script_ctx_t *ctx; LONG thread_id; LCID lcid; + DWORD version; IActiveScriptSite *site; @@ -659,6 +660,7 @@ static HRESULT WINAPI JScriptParse_InitNew(IActiveScriptParse *iface) ctx->ref = 1; ctx->state = SCRIPTSTATE_UNINITIALIZED; ctx->safeopt = This->safeopt; + ctx->version = This->version; jsheap_init(&ctx->tmp_heap); ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); @@ -822,8 +824,27 @@ static HRESULT WINAPI JScriptProperty_SetProperty(IActiveScriptProperty *iface, VARIANT *pvarIndex, VARIANT *pvarValue) { JScript *This = ACTSCPPROP_THIS(iface); - FIXME("(%p)->(%x %p %p)\n", This, dwProperty, pvarIndex, pvarValue); - return E_NOTIMPL; + + TRACE("(%p)->(%x %s %s)\n", This, dwProperty, debugstr_variant(pvarIndex), debugstr_variant(pvarValue)); + + if(pvarIndex) + FIXME("unsupported pvarIndex\n"); + + switch(dwProperty) { + case SCRIPTPROP_INVOKEVERSIONING: + if(V_VT(pvarValue) != VT_I4 || V_I4(pvarValue) < 0 || V_I4(pvarValue) > 15) { + WARN("invalid value %s\n", debugstr_variant(pvarValue)); + return E_INVALIDARG; + } + + This->version = V_I4(pvarValue); + break; + default: + FIXME("Unimplemented property %x\n", dwProperty); + return E_NOTIMPL; + } + + return S_OK; } #undef ACTSCPPROP_THIS diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index af1c1c3..2d7d5d9 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -262,6 +262,7 @@ struct _script_ctx_t { IActiveScriptSite *site; IInternetHostSecurityManager *secmgr; DWORD safeopt; + DWORD version; LCID lcid; jsheap_t tmp_heap; diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index e53fc2d..ed94a89 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -295,6 +295,49 @@ static void test_safety(IUnknown *unk) IObjectSafety_Release(safety); } +static HRESULT set_script_prop(IActiveScript *engine, DWORD property, VARIANT *val) +{ + IActiveScriptProperty *script_prop; + HRESULT hres; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptProperty, + (void**)&script_prop); + ok(hres == S_OK, "Could not get IActiveScriptProperty iface: %08x\n", hres); + + hres = IActiveScriptProperty_SetProperty(script_prop, property, NULL, val); + IActiveScriptProperty_Release(script_prop); + return hres; +} + +static void test_invoke_versioning(IActiveScript *script) +{ + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_NULL; + hres = set_script_prop(script, SCRIPTPROP_INVOKEVERSIONING, &v); + if(hres == E_NOTIMPL) { + win_skip("SCRIPTPROP_INVOKESTRING not supported\n"); + return; + } + ok(hres == E_INVALIDARG, "SetProperty(SCRIPTPROP_INVOKEVERSIONING) failed: %08x\n", hres); + + V_VT(&v) = VT_I2; + V_I2(&v) = 0; + hres = set_script_prop(script, SCRIPTPROP_INVOKEVERSIONING, &v); + ok(hres == E_INVALIDARG, "SetProperty(SCRIPTPROP_INVOKEVERSIONING) failed: %08x\n", hres); + + V_VT(&v) = VT_I4; + V_I4(&v) = 16; + hres = set_script_prop(script, SCRIPTPROP_INVOKEVERSIONING, &v); + ok(hres == E_INVALIDARG, "SetProperty(SCRIPTPROP_INVOKEVERSIONING) failed: %08x\n", hres); + + V_VT(&v) = VT_I4; + V_I4(&v) = 2; + hres = set_script_prop(script, SCRIPTPROP_INVOKEVERSIONING, &v); + ok(hres == S_OK, "SetProperty(SCRIPTPROP_INVOKEVERSIONING) failed: %08x\n", hres); +} + static void test_jscript(void) { IActiveScriptParse *parse; @@ -322,6 +365,7 @@ static void test_jscript(void) test_state(script, SCRIPTSTATE_UNINITIALIZED); test_safety(unk); + test_invoke_versioning(script); hres = IActiveScriptParse64_InitNew(parse); ok(hres == S_OK, "InitNew failed: %08x\n", hres);

1 0

Andrew Eikum : mshtml/tests: Remove todo_wine paths.
by Alexandre Julliard 20 Oct '09

20 Oct '09

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

Andrew Eikum : mshtml: Implement IHTMLLocation::get_search.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: bbf8a4baf570814aea05111da76d18615ca420af URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf8a4baf570814aea05111da… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 19 11:18:18 2009 -0500 mshtml: Implement IHTMLLocation::get_search. --- dlls/mshtml/htmllocation.c | 24 ++++++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 12 ++++++------ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index b97cb01..5db5267 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -462,12 +462,32 @@ static HRESULT WINAPI HTMLLocation_put_search(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_search(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + HRESULT hres; + const WCHAR hash[] = {'#',0}; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - return E_NOTIMPL; + url.dwExtraInfoLength = 1; + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; + + if(!url.dwExtraInfoLength){ + *p = NULL; + return S_OK; + } + + url.dwExtraInfoLength = strcspnW(url.lpszExtraInfo, hash); + + *p = SysAllocStringLen(url.lpszExtraInfo, url.dwExtraInfoLength); + + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_put_hash(IHTMLLocation *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index e6b43e2..b66fe62 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -62,7 +62,7 @@ static const struct location_test http_test = { "www.winehq.org", TRUE, "80", TRUE, "", TRUE, - "?search", FALSE, + "?search", TRUE, "#hash", TRUE }; @@ -76,7 +76,7 @@ static const struct location_test http_file_test = { "www.winehq.org", TRUE, "80", TRUE, "file", TRUE, - "?search", FALSE, + "?search", TRUE, "#hash", TRUE }; @@ -90,7 +90,7 @@ static const struct location_test ftp_test = { "ftp.winehq.org", TRUE, "21", TRUE, "", TRUE, - NULL, FALSE, + NULL, TRUE, NULL, TRUE }; @@ -104,7 +104,7 @@ static const struct location_test ftp_file_test = { "ftp.winehq.org", TRUE, "21", TRUE, "file", TRUE, - NULL, FALSE, + NULL, TRUE, NULL, TRUE }; @@ -118,7 +118,7 @@ static const struct location_test file_test = { NULL, TRUE, "", TRUE, "C:\\windows\\win.ini", TRUE, - NULL, FALSE, + NULL, TRUE, NULL, TRUE }; @@ -291,7 +291,7 @@ static void test_search(IHTMLLocation *loc, const struct location_test *test) test->name, E_POINTER, hres); hres = IHTMLLocation_get_search(loc, &str); - todo_wine ok(hres == S_OK, "%s: get_search failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_search failed: 0x%08x\n", test->name, hres); if(hres == S_OK){ if(test->search_ok) ok(str_eq_wa(str, test->search),

1 0

Andrew Eikum : mshtml: Implement IHTMLLocation::get_hash.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 4ebf01f681b00b56d3ef913234e01d6bf8c702d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ebf01f681b00b56d3ef91323… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 19 11:18:15 2009 -0500 mshtml: Implement IHTMLLocation::get_hash. --- dlls/mshtml/htmllocation.c | 26 ++++++++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 12 ++++++------ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 5f09958..b97cb01 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -480,12 +480,34 @@ static HRESULT WINAPI HTMLLocation_put_hash(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_hash(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + const WCHAR hash[] = {'#',0}; + DWORD hash_pos = 0; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - return E_NOTIMPL; + url.dwExtraInfoLength = 1; + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; + + if(!url.dwExtraInfoLength){ + *p = NULL; + return S_OK; + } + + hash_pos = strcspnW(url.lpszExtraInfo, hash); + url.dwExtraInfoLength -= hash_pos; + + *p = SysAllocStringLen(url.lpszExtraInfo + hash_pos, url.dwExtraInfoLength); + + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_reload(IHTMLLocation *iface, VARIANT_BOOL flag) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index e4d545e..e6b43e2 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -63,7 +63,7 @@ static const struct location_test http_test = { "80", TRUE, "", TRUE, "?search", FALSE, - "#hash", FALSE + "#hash", TRUE }; static const WCHAR http_file_url[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','f','i','l','e','?','s','e','a','r','c','h','#','h','a','s','h',0}; @@ -77,7 +77,7 @@ static const struct location_test http_file_test = { "80", TRUE, "file", TRUE, "?search", FALSE, - "#hash", FALSE + "#hash", TRUE }; static const WCHAR ftp_url[] = {'f','t','p',':','/','/','f','t','p','.','w','i','n','e','h','q','.','o','r','g','/',0}; @@ -91,7 +91,7 @@ static const struct location_test ftp_test = { "21", TRUE, "", TRUE, NULL, FALSE, - NULL, FALSE + NULL, TRUE }; static const WCHAR ftp_file_url[] = {'f','t','p',':','/','/','f','t','p','.','w','i','n','e','h','q','.','o','r','g','/','f','i','l','e',0}; @@ -105,7 +105,7 @@ static const struct location_test ftp_file_test = { "21", TRUE, "file", TRUE, NULL, FALSE, - NULL, FALSE + NULL, TRUE }; static const WCHAR file_url[] = {'f','i','l','e',':','/','/','C',':','\\','w','i','n','d','o','w','s','\\','w','i','n','.','i','n','i',0}; @@ -119,7 +119,7 @@ static const struct location_test file_test = { "", TRUE, "C:\\windows\\win.ini", TRUE, NULL, FALSE, - NULL, FALSE + NULL, TRUE }; static int str_eq_wa(LPCWSTR strw, const char *stra) @@ -315,7 +315,7 @@ static void test_hash(IHTMLLocation *loc, const struct location_test *test) test->name, E_POINTER, hres); hres = IHTMLLocation_get_hash(loc, &str); - todo_wine ok(hres == S_OK, "%s: get_hash failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_hash failed: 0x%08x\n", test->name, hres); if(hres == S_OK){ if(test->hash_ok) ok(str_eq_wa(str, test->hash),

1 0

Juan Lang : rsaenh: Make the enhanced crypto provider the default.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 7a6381e852a4daf0bbc77ffcb9da3bd85002e1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a6381e852a4daf0bbc77ffcb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 19 13:39:50 2009 -0700 rsaenh: Make the enhanced crypto provider the default. --- dlls/rsaenh/rsaenh.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 0cc4fb4..de3125c 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -4459,7 +4459,8 @@ HRESULT WINAPI DllRegisterServer(void) { static const WCHAR szName[] = { 'N','a','m','e',0 }; static const WCHAR szRSAName[3][54] = { - { 'M','i','c','r','o','s','o','f','t',' ', 'B','a','s','e',' ', + { 'M','i','c','r','o','s','o','f','t',' ', + 'E','n','h','a','n','c','e','d',' ', 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ', 'P','r','o','v','i','d','e','r',' ','v','1','.','0',0 }, { 'M','i','c','r','o','s','o','f','t',' ','R','S','A',' ',

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

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

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

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

Alexandre Julliard : user32/tests: Use the correct lparam in the WM_DDE_ACK reply.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 9390bc921e012888d488e8314a4379bc76e2c4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9390bc921e012888d488e8314… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 19 16:21:50 2009 +0200 user32/tests: Use the correct lparam in the WM_DDE_ACK reply. --- dlls/user32/tests/dde.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 9e1da70..202bb41 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -211,7 +211,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA executed = TRUE; - lparam = ReuseDDElParam(lparam, WM_DDE_EXECUTE, WM_DDE_ACK, DDE_FACK, HIWORD(lparam)); + lparam = ReuseDDElParam(lparam, WM_DDE_EXECUTE, WM_DDE_ACK, DDE_FACK, lparam); PostMessageA(client, WM_DDE_ACK, (WPARAM)hwnd, lparam); break;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009