December 2010 - Wine-Commits

Łukasz Wojniłowicz : jscript: Update Polish translation.
by Alexandre Julliard Dec. 30, 2010

Dec. 30, 2010

Module: wine Branch: master Commit: d8186eb4bce451fc1d28f0ce3eff1c2783c99716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8186eb4bce451fc1d28f0ce3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Wed Dec 29 20:29:40 2010 +0100 jscript: Update Polish translation. --- dlls/jscript/jscript_Pl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Pl.rc b/dlls/jscript/jscript_Pl.rc index 397683e..e417095 100644 --- a/dlls/jscript/jscript_Pl.rc +++ b/dlls/jscript/jscript_Pl.rc @@ -34,6 +34,7 @@ STRINGTABLE IDS_LBRACKET "Oczekiwane '('" IDS_RBRACKET "Oczekiwane ')'" IDS_UNTERMINATED_STR "Niezako�czona sta�a znakowa" + IDS_DISABLED_CC "Warunkowa kompilacja jest wy��czona" IDS_NOT_FUNC "Oczekiwana funkcja" IDS_NOT_DATE "'[obiekt]' nie jest obiektem daty" IDS_NOT_NUM "Oczekiwana liczba"

1 0

Anders Jonsson : appwiz.cpl: Update Swedish translation.
by Alexandre Julliard Dec. 30, 2010

Dec. 30, 2010

Module: wine Branch: master Commit: db192b6d7b4d418f46feb0b8ab2439cb82cba301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db192b6d7b4d418f46feb0b8a… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Dec 29 20:33:18 2010 +0100 appwiz.cpl: Update Swedish translation. --- dlls/appwiz.cpl/Sv.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Sv.rc b/dlls/appwiz.cpl/Sv.rc index f9f852b..69a1d96 100644 --- a/dlls/appwiz.cpl/Sv.rc +++ b/dlls/appwiz.cpl/Sv.rc @@ -49,6 +49,7 @@ STRINGTABLE { IDS_DOWNLOADING "Hämtar..." IDS_INSTALLING "Installerar..." + IDS_INVALID_SHA "Oväntad kontrollsumma på hämtad fil. Avbryter installation av korrupt fil." } IDD_MAIN DIALOG 0, 0, 320, 220

1 0

Jacek Caban : shdocvw: Get rid of no longer used DOCHOST_THIS.
by Alexandre Julliard Dec. 30, 2010

Dec. 30, 2010

Module: wine Branch: master Commit: ca3e5c47ce84b4ccbd2b4fd2f48b6cc5484dce1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3e5c47ce84b4ccbd2b4fd2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 29 19:05:39 2010 +0100 shdocvw: Get rid of no longer used DOCHOST_THIS. --- dlls/shdocvw/iexplore.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 745cb17..d966f79 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -44,8 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); #define IDI_APPICON 1 -#define DOCHOST_THIS(iface) DEFINE_THIS2(InternetExplorer,doc_host,iface) - static const WCHAR szIEWinFrame[] = { 'I','E','F','r','a','m','e',0 }; /* Windows uses "Microsoft Internet Explorer" */

1 0

Luca Bennati : jscript: Update Italian translation.
by Alexandre Julliard Dec. 30, 2010

Dec. 30, 2010

Module: wine Branch: master Commit: e6983d20fb4f52d6555f45dd4bfc21dd1aab4d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6983d20fb4f52d6555f45dd4… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Dec 29 21:10:07 2010 +0100 jscript: Update Italian translation. --- dlls/jscript/jscript_It.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_It.rc b/dlls/jscript/jscript_It.rc index 42033d3..fcfc568 100644 --- a/dlls/jscript/jscript_It.rc +++ b/dlls/jscript/jscript_It.rc @@ -38,6 +38,7 @@ STRINGTABLE IDS_LBRACKET "Richiesto '('" IDS_RBRACKET "Richiesto ')'" IDS_UNTERMINATED_STR "Costante stringa non terminata" + IDS_DISABLED_CC "Compilazione condizionale disattivata" IDS_NOT_FUNC "Richiesta una funzione" IDS_NOT_DATE "'[oggetto]' non è un oggetto data" IDS_NOT_NUM "Richiesto un numero"

1 0

Łukasz Wojniłowicz : appwiz.cpl: Update Polish translation.
by Alexandre Julliard Dec. 30, 2010

Dec. 30, 2010

Module: wine Branch: master Commit: 5766d7565dcb30aa76e4af804e59b3dfbd05602d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5766d7565dcb30aa76e4af804… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Wed Dec 29 20:29:39 2010 +0100 appwiz.cpl: Update Polish translation. --- dlls/appwiz.cpl/Pl.rc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/Pl.rc b/dlls/appwiz.cpl/Pl.rc index 38f8fe0..a8ba3d0 100644 --- a/dlls/appwiz.cpl/Pl.rc +++ b/dlls/appwiz.cpl/Pl.rc @@ -44,8 +44,9 @@ STRINGTABLE STRINGTABLE { - IDS_DOWNLOADING "Pobieranie plik�w..." - IDS_INSTALLING "Instalacja..." + IDS_DOWNLOADING "Pobieranie..." + IDS_INSTALLING "Instalowanie..." + IDS_INVALID_SHA "Nieoczekiwana suma pobranego pliku. Przerywanie instalacji uszkodzonego pliku." } IDD_MAIN DIALOG 0, 0, 320, 220

1 0

Jacek Caban : jscript: Moved remaining registration to IRegistrar mechanism .
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

Module: wine Branch: master Commit: 4582a8fe42a974f2004127d3251ae4eb3f21d9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=4582a8fe42a974f2004127d32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 29 16:02:46 2010 +0100 jscript: Moved remaining registration to IRegistrar mechanism. --- dlls/jscript/jscript.inf | 86 ------------------------------ dlls/jscript/jscript.rgs | 124 +++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript_main.c | 75 +------------------------- dlls/jscript/rsrc.rc | 4 +- 4 files changed, 128 insertions(+), 161 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4582a8fe42a974f200412…

1 0

Jacek Caban : jscript: Return 'unknown' in typeof operator for native object's values that can't be retrieved.
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

Module: wine Branch: master Commit: 3d1595dc81b62793063212c9ead3e347333dd9a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d1595dc81b62793063212c9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 29 16:02:25 2010 +0100 jscript: Return 'unknown' in typeof operator for native object's values that can't be retrieved. --- dlls/jscript/engine.c | 8 +++++++- dlls/jscript/tests/lang.js | 7 +++++-- dlls/jscript/tests/run.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 42d6762..9a5ecbc 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2365,6 +2365,7 @@ static HRESULT typeof_exprval(script_ctx_t *ctx, exprval_t *exprval, jsexcept_t static const WCHAR objectW[] = {'o','b','j','e','c','t',0}; static const WCHAR stringW[] = {'s','t','r','i','n','g',0}; static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; + static const WCHAR unknownW[] = {'u','n','k','n','o','w','n',0}; if(exprval->type == EXPRVAL_INVALID) { *ret = undefinedW; @@ -2372,8 +2373,13 @@ static HRESULT typeof_exprval(script_ctx_t *ctx, exprval_t *exprval, jsexcept_t } hres = exprval_to_value(ctx, exprval, ei, &val); - if(FAILED(hres)) + if(FAILED(hres)) { + if(exprval->type == EXPRVAL_IDREF) { + *ret = unknownW; + return S_OK; + } return hres; + } switch(V_VT(&val)) { case VT_EMPTY: diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 5a361d7..bf74ed7 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -108,6 +108,11 @@ ok(typeof(testFunc1) === "function", "typeof(testFunc1) is not function"); ok(typeof(String) === "function", "typeof(String) is not function"); ok(typeof(ScriptEngine) === "function", "typeof(ScriptEngine) is not function"); ok(typeof(this) === "object", "typeof(this) is not object"); +ok(typeof(doesnotexist) === "undefined", "typeof(doesnotexist) = " + typeof(doesnotexist)); +tmp = typeof((new Object()).doesnotexist); +ok(tmp === "undefined", "typeof((new Object).doesnotexist = " + tmp); +tmp = typeof(testObj.onlyDispID); +ok(tmp === "unknown", "typeof(testObj.onlyDispID) = " + tmp); ok(testFunc1(true, "test") === true, "testFunc1 not returned true"); @@ -1057,8 +1062,6 @@ if(false) { ok(in_if_false(), "in_if_false failed"); -ok(typeof(doesnotexist) === "undefined", "typeof(doesnotexist) = " + typeof(doesnotexist)); - (function() { newValue = 1; })(); ok(newValue === 1, "newValue = " + newValue); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 7b198df..f473c6c 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -68,6 +68,8 @@ DEFINE_EXPECT(testobj_delete); DEFINE_EXPECT(testobj_value); DEFINE_EXPECT(testobj_prop_d); DEFINE_EXPECT(testobj_noprop_d); +DEFINE_EXPECT(testobj_onlydispid_d); +DEFINE_EXPECT(testobj_onlydispid_i); DEFINE_EXPECT(GetItemInfo_testVal); DEFINE_EXPECT(ActiveScriptSite_OnScriptError); DEFINE_EXPECT(invoke_func); @@ -90,6 +92,7 @@ DEFINE_EXPECT(invoke_func); #define DISPID_GLOBAL_ISWIN64 0x100f #define DISPID_TESTOBJ_PROP 0x2000 +#define DISPID_TESTOBJ_ONLYDISPID 0x2001 static const WCHAR testW[] = {'t','e','s','t',0}; static const CHAR testA[] = "test"; @@ -230,6 +233,13 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD test_grfdex(grfdex, fdexNameCaseSensitive); return DISP_E_UNKNOWNNAME; } + if(!strcmp_wa(bstrName, "onlyDispID")) { + if(strict_dispid_check) + CHECK_EXPECT(testobj_onlydispid_d); + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_TESTOBJ_ONLYDISPID; + return S_OK; + } ok(0, "unexpected name %s\n", wine_dbgstr_w(bstrName)); return E_NOTIMPL; @@ -266,6 +276,19 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VT(pvarRes) = VT_I4; V_I4(pvarRes) = 1; return S_OK; + case DISPID_TESTOBJ_ONLYDISPID: + if(strict_dispid_check) + CHECK_EXPECT(testobj_onlydispid_i); + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + return DISP_E_MEMBERNOTFOUND; } ok(0, "unexpected call %x\n", id); @@ -1431,6 +1454,12 @@ static void run_tests(void) parse_script_a("testThis(this);"); parse_script_a("(function () { testThis(this); })();"); + SET_EXPECT(testobj_onlydispid_d); + SET_EXPECT(testobj_onlydispid_i); + parse_script_a("ok(typeof(testObj.onlyDispID) === 'unknown', 'unexpected typeof(testObj.onlyDispID)');"); + CHECK_CALLED(testobj_onlydispid_d); + CHECK_CALLED(testobj_onlydispid_i); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Alexandre Julliard : configure: Make the import lib name optional in WINE_CONFIG_DLL.
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

Module: wine Branch: master Commit: 1858f43d99dfb3e9875eeb891e025a6c8b09c412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1858f43d99dfb3e9875eeb891… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 29 14:10:47 2010 +0100 configure: Make the import lib name optional in WINE_CONFIG_DLL. --- aclocal.m4 | 2 +- configure | 290 +++++++++++++++++++++++++------------------------- configure.ac | 288 +++++++++++++++++++++++++------------------------- tools/make_makefiles | 2 +- 4 files changed, 291 insertions(+), 291 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1858f43d99dfb3e9875ee…

1 0

Hwang YunSong : net: Update Korean resource.
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

Module: wine Branch: master Commit: ab4eb729fd147e23ca654e6effce5480beec1a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4eb729fd147e23ca654e6ef… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Dec 29 11:03:03 2010 +0900 net: Update Korean resource. --- programs/net/Ko.rc | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/programs/net/Ko.rc b/programs/net/Ko.rc index 713edf8..20f1e0f 100644 --- a/programs/net/Ko.rc +++ b/programs/net/Ko.rc @@ -3,7 +3,7 @@ * KOREAN language support * * Copyright (C) 2007 Tim Schwartz - * Copyright (C) 2007 YunSong Hwang (hys545(a)dreamwiz.com) + * Copyright (C) 2007,2010 YunSong Hwang (hys545(a)dreamwiz.com) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,26 +22,28 @@ #include "resources.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "�� ɾ�� :\n\nNET [ HELP | START | STOP | USE ]\n" - STRING_START_USAGE, "�� .\n" - STRING_STOP_USAGE, "�� .\n" - STRING_STOP_DEP, "��ӵ� �� : %s\n" - STRING_CANT_STOP, "%s ��񽺸� �� ϴ�\n" - STRING_NO_SCM, "�� ڸ� �ٷ� �� ϴ�.\n" - STRING_NO_SVCHANDLE, "�� ڵ�� ϴ�.\n" - STRING_START_SVC, "%s ��񽺴� ��.\n" - STRING_START_SVC_SUCCESS, " %s �� .\n" - STRING_START_SVC_FAIL, "%s �� .\n" - STRING_STOP_SVC, "%s �� .\n" - STRING_STOP_SVC_SUCCESS, "%s �� .\n" - STRING_STOP_SVC_FAIL, "%s �� .\n" - STRING_HELP_USAGE, "��ɾ� ��:\n\nNET HELP ��ɾ�\n -or-\nNET ��ɾ� /HELP\n\n"\ - " �� ɾ�:\n NET HELP NET START NET STOP NET USE\n" - STRING_NO_ENTRIES, "��Ʈ�� ֽ��ϴ�.\n" - STRING_USE_HEADER, "\n�� \n---------------------------------------------------------------\n" - STRING_USE_ENTRY, "%s %S %S �� ҽ�: %lu\n" + STRING_USAGE, "이 명령어의 문법:\n\nNET [ HELP | START | STOP | USE ]\n" + STRING_START_USAGE, "지정된 서비스 시작.\n" + STRING_STOP_USAGE, "지정된 서비스 정지.\n" + STRING_STOP_DEP, "종속된 서비스 정지중: %s\n" + STRING_CANT_STOP, "%s 서비스를 정지할 수 없습니다\n" + STRING_NO_SCM, "서비스 제어 관리자를 다룰 수 없습니다.\n" + STRING_NO_SVCHANDLE, "서비스 핸들을 얻을 수 없습니다.\n" + STRING_START_SVC, "%s 서비스는 시작중.\n" + STRING_START_SVC_SUCCESS, " %s 서비스 시작 성공.\n" + STRING_START_SVC_FAIL, "%s 서비스 시작 실패.\n" + STRING_STOP_SVC, "%s 서비스 정지.\n" + STRING_STOP_SVC_SUCCESS, "%s 서비스 정지 성공.\n" + STRING_STOP_SVC_FAIL, "%s 서비스 정지 실패.\n" + STRING_HELP_USAGE, "명령어 문법:\n\nNET HELP 명령어\n -or-\nNET 명령어 /HELP\n\n"\ + " 가능한 명령어:\n NET HELP NET START NET STOP NET USE\n" + STRING_NO_ENTRIES, "리스트가 비어 있습니다.\n" + STRING_USE_HEADER, "\n상태 로컬 원격\n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S 열린 리소스: %lu\n" }

1 0

Jacek Caban : jscript: Don't unescape '\v'.
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

Module: wine Branch: master Commit: 48202ee09ea0ab7a93920252276e3bf8cc170888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48202ee09ea0ab7a939202522… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 29 16:01:56 2010 +0100 jscript: Don't unescape '\v'. --- dlls/jscript/lex.c | 3 --- dlls/jscript/tests/lang.js | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 0329fa4..723f0ef 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -266,9 +266,6 @@ static BOOL unescape(WCHAR *str) case 'n': c = '\n'; break; - case 'v': - c = '\v'; - break; case 'f': c = '\f'; break; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index bdf039a..5a361d7 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -942,6 +942,30 @@ ok((Infinity != NaN) === true, "(Infinity != NaN) !== true"); ok((Infinity != NaN) === true, "(Infinity != NaN) !== true"); ok((0 == NaN) === false, "(0 === NaN) != false"); +// escape tests +var escapeTests = [ + ["\'", "\\'", 39], + ["\"", "\\\"", 34], + ["\\", "\\\\", 92], + ["\b", "\\b", 8], + ["\t", "\\t", 9], + ["\n", "\\n", 10], + ["\v", "\\v", 118], + ["\f", "\\f", 12], + ["\r", "\\r", 13], + ["\xf3", "\\xf3", 0xf3], + ["\u1234", "\\u1234", 0x1234], + ["\a", "\\a", 97], + ["\?", "\\?", 63] +]; + +for(i=0; i<escapeTests.length; i++) { + tmp = escapeTests[i][0].charCodeAt(0); + ok(tmp === escapeTests[i][2], "escaped '" + escapeTests[i][1] + "' = " + tmp + " expected " + escapeTests[i][2]); +} + +tmp = !+"\v1"; +ok(tmp === true, '!+"\v1" = ' + tmp); ok(typeof(testFunc2) === "function", "typeof(testFunc2) = " + typeof(testFunc2)); tmp = testFunc2(1);

1 0