September 2008 - Wine-Commits

Juan Lang : crypt32: Add support for the CERT_EXTENDED_ERROR_INFO_PROP_ID.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: abde9a91f26e20648ae3236b2ffcb0f899ab582c URL: http://source.winehq.org/git/wine.git/?a=commit;h=abde9a91f26e20648ae3236b2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 17 16:15:56 2008 -0700 crypt32: Add support for the CERT_EXTENDED_ERROR_INFO_PROP_ID. --- dlls/crypt32/cert.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 8de96c8..e294997 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -468,6 +468,7 @@ static BOOL WINAPI CertContext_SetProperty(void *context, DWORD dwPropId, case CERT_SIGNATURE_HASH_PROP_ID: case CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID: case CERT_SUBJECT_NAME_MD5_HASH_PROP_ID: + case CERT_EXTENDED_ERROR_INFO_PROP_ID: case CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID: case CERT_ENROLLMENT_PROP_ID: case CERT_CROSS_CERT_DIST_POINTS_PROP_ID:

1 0

Juan Lang : wintrust: Don't assume dwStateAction is set in WINTRUST_DATA.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: 61077035fcbb9a21beea588d2c03c92350d43b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61077035fcbb9a21beea588d2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 17 16:15:34 2008 -0700 wintrust: Don't assume dwStateAction is set in WINTRUST_DATA. --- dlls/wintrust/wintrust_main.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index ed6a8ed..e7b9af4 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -381,6 +381,8 @@ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) err = WINTRUST_PublishedSoftware(hwnd, ActionID, ActionData); else { + DWORD stateAction; + /* Check known actions to warn of possible problems */ if (!IsEqualGUID(ActionID, &unknown) && !IsEqualGUID(ActionID, &generic_verify_v2) && @@ -388,7 +390,14 @@ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) !IsEqualGUID(ActionID, &generic_chain_verify)) WARN("unknown action %s, default behavior may not be right\n", debugstr_guid(ActionID)); - switch (actionData->dwStateAction) + if (WVT_ISINSTRUCT(WINTRUST_DATA, actionData->cbStruct, dwStateAction)) + stateAction = actionData->dwStateAction; + else + { + TRACE("no dwStateAction, assuming WTD_STATEACTION_IGNORE\n"); + stateAction = WTD_STATEACTION_IGNORE; + } + switch (stateAction) { case WTD_STATEACTION_IGNORE: err = WINTRUST_DefaultVerifyAndClose(hwnd, ActionID, ActionData);

1 0

Juan Lang : wintrust: Add a few missing defines.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: 1a1a2187de8c97360fb6bf33060697882d7bfcba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1a2187de8c97360fb6bf330… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 17 16:15:11 2008 -0700 wintrust: Add a few missing defines. --- include/wintrust.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/wintrust.h b/include/wintrust.h index 2e4006b..228d868 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -385,6 +385,10 @@ typedef struct _CRYPT_PROVUI_FUNCS { #include <poppack.h> +#define WVT_OFFSETOF(t,f) ((ULONG)((ULONG_PTR)(&((t*)0)->f))) +#define WVT_ISINSTRUCT(t,s,f) (WVT_OFFSETOF(t,f) + sizeof(((t*)0)->f) <= (s)) +#define WVT_IS_CBSTRUCT_GT_MEMBEROFFSET(t,s,f) WVT_ISINSTRUCT(t,s,f) + #define WTPF_TRUSTTEST 0x00000020 #define WTPF_TESTCANBEVALID 0x00000080 #define WTPF_IGNOREEXPIRATION 0x00000100

1 0

Paul Vriens : crypt32/tests: Don't crash on win9x.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: 9b4a5cd065c63af39e08de5fb28bb61053b4a3f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4a5cd065c63af39e08de5fb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Sep 17 23:20:39 2008 +0200 crypt32/tests: Don't crash on win9x. --- dlls/crypt32/tests/encode.c | 156 +++++++++++++++++++++++++++---------------- 1 files changed, 97 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b4a5cd065c63af39e08d…

1 0

Jacek Caban : jscript: Added for statement implementation.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: 9e68badeaf63cf514d32c3a22038adf87fa13258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e68badeaf63cf514d32c3a22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:36:19 2008 +0200 jscript: Added for statement implementation. --- dlls/jscript/engine.c | 80 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 22 ++++++++++++ 2 files changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8d92533..80bc9d9 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -695,10 +695,84 @@ HRESULT while_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t return S_OK; } -HRESULT for_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +/* ECMA-262 3rd Edition 12.6.3 */ +HRESULT for_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { - FIXME("\n"); - return E_NOTIMPL; + for_statement_t *stat = (for_statement_t*)_stat; + VARIANT val, tmp, retv; + exprval_t exprval; + VARIANT_BOOL b; + HRESULT hres; + + TRACE("\n"); + + if(stat->variable_list) { + hres = variable_list_eval(ctx, stat->variable_list, &rt->ei); + if(FAILED(hres)) + return hres; + }else if(stat->begin_expr) { + hres = expr_eval(ctx, stat->begin_expr, EXPR_NEWREF, &rt->ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, &rt->ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + VariantClear(&val); + } + + V_VT(&retv) = VT_EMPTY; + + while(1) { + if(stat->expr) { + hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &exprval); + if(FAILED(hres)) + break; + + hres = exprval_to_boolean(ctx->parser->script, &exprval, &rt->ei, &b); + exprval_release(&exprval); + if(FAILED(hres) || !b) + break; + } + + hres = stat_eval(ctx, stat->statement, rt, &tmp); + if(FAILED(hres)) + break; + + VariantClear(&retv); + retv = tmp; + + if(rt->type == RT_CONTINUE) + rt->type = RT_NORMAL; + else if(rt->type != RT_NORMAL) + break; + + if(stat->end_expr) { + hres = expr_eval(ctx, stat->end_expr, 0, &rt->ei, &exprval); + if(FAILED(hres)) + break; + + hres = exprval_to_value(ctx->parser->script, &exprval, &rt->ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + break; + + VariantClear(&val); + } + } + + if(FAILED(hres)) { + VariantClear(&retv); + return hres; + } + + if(rt->type == RT_BREAK) + rt->type = RT_NORMAL; + + *ret = retv; + return S_OK; } HRESULT forin_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 74a84ef..3b0d130 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -593,4 +593,26 @@ while(tmp < 4) { } ok(tmp === 4, "tmp !== 4"); +for(tmp=0; tmp < 4; tmp++) + ok(tmp < 4, "tmp = " + tmp); +ok(tmp === 4, "tmp !== 4"); + +for(tmp=0; tmp < 4; tmp++) { + if(tmp === 2) + break; + ok(tmp < 2, "tmp = " + tmp); +} +ok(tmp === 2, "tmp !== 2"); + +for(tmp=0; tmp < 4; tmp++) { + if(tmp === 2) + continue; + ok(tmp < 4 && tmp != 2, "tmp = " + tmp); +} +ok(tmp === 4, "tmp !== 4"); + +for(var fi=0; fi < 4; fi++) + ok(fi < 4, "fi = " + fi); +ok(fi === 4, "fi !== 4"); + reportSuccess();

1 0

Jacek Caban : jscript: Added continue statement implementation.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: 99335680630f0a48e999a2426b835dfb248e1459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99335680630f0a48e999a2426… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:35:57 2008 +0200 jscript: Added continue statement implementation. --- dlls/jscript/engine.c | 17 ++++++++++++++--- dlls/jscript/tests/lang.js | 11 +++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 36286da..8d92533 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -707,10 +707,21 @@ HRESULT forin_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t * return E_NOTIMPL; } -HRESULT continue_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +/* ECMA-262 3rd Edition 12.7 */ +HRESULT continue_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { - FIXME("\n"); - return E_NOTIMPL; + branch_statement_t *stat = (branch_statement_t*)_stat; + + TRACE("\n"); + + if(stat->identifier) { + FIXME("indentifier not implemented\n"); + return E_NOTIMPL; + } + + rt->type = RT_CONTINUE; + V_VT(ret) = VT_EMPTY; + return S_OK; } /* ECMA-262 3rd Edition 12.8 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 6acc82c..74a84ef 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -582,4 +582,15 @@ do { } while(false); ok(tmp === 1, "tmp !== 4"); +tmp = 0; +while(tmp < 4) { + tmp++; + if(tmp === 2) { + continue; + ok(false, "break did not break"); + } + ok(tmp <= 4 && tmp != 2, "tmp = " + tmp); +} +ok(tmp === 4, "tmp !== 4"); + reportSuccess();

1 0

Jacek Caban : jscript: Added while and do..while statement implementation.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: 7bde1a3345fb98075b0d5ed1d5cd16d159beb58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bde1a3345fb98075b0d5ed1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:35:38 2008 +0200 jscript: Added while and do..while statement implementation. --- dlls/jscript/engine.c | 58 +++++++++++++++++++++++++++++++++++++------ dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 3 +- dlls/jscript/tests/lang.js | 32 ++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2a37d05..36286da 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -641,16 +641,58 @@ HRESULT if_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt return hres; } -HRESULT dowhile_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +/* ECMA-262 3rd Edition 12.6.2 */ +HRESULT while_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { - FIXME("\n"); - return E_NOTIMPL; -} + while_statement_t *stat = (while_statement_t*)_stat; + exprval_t exprval; + VARIANT val, tmp; + VARIANT_BOOL b; + BOOL test_expr; + HRESULT hres; -HRESULT while_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) -{ - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + V_VT(&val) = VT_EMPTY; + test_expr = !stat->do_while; + + while(1) { + if(test_expr) { + hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &exprval); + if(FAILED(hres)) + break; + + hres = exprval_to_boolean(ctx->parser->script, &exprval, &rt->ei, &b); + exprval_release(&exprval); + if(FAILED(hres) || !b) + break; + }else { + test_expr = TRUE; + } + + hres = stat_eval(ctx, stat->statement, rt, &tmp); + if(FAILED(hres)) + break; + + VariantClear(&val); + val = tmp; + + if(rt->type == RT_CONTINUE) + rt->type = RT_NORMAL; + if(rt->type != RT_NORMAL) + break; + } + + if(FAILED(hres)) { + VariantClear(&val); + return hres; + } + + if(rt->type == RT_BREAK) + rt->type = RT_NORMAL; + + *ret = val; + return S_OK; } HRESULT for_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 5c64853..3f7fda8 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -161,6 +161,7 @@ typedef struct { typedef struct { statement_t stat; + BOOL do_while; expression_t *expr; statement_t *statement; } while_statement_t; @@ -229,7 +230,6 @@ HRESULT var_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); HRESULT empty_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); HRESULT expression_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); HRESULT if_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); -HRESULT dowhile_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); HRESULT while_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); HRESULT for_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); HRESULT forin_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index d8b876e..a6cb5eb 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1086,8 +1086,9 @@ static statement_t *new_while_statement(parser_ctx_t *ctx, BOOL dowhile, express { while_statement_t *ret = parser_alloc(ctx, sizeof(while_statement_t)); - ret->stat.eval = dowhile ? dowhile_statement_eval : while_statement_eval; + ret->stat.eval = while_statement_eval; ret->stat.next = NULL; + ret->do_while = dowhile; ret->expr = expr; ret->statement = stat; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index e2b5800..6acc82c 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -550,4 +550,36 @@ ok(tmp["3"] === 2, "tmp[3] !== 2"); ok(tmp["6"] === true, "tmp[6] !== true"); ok(tmp[2] === 1, "tmp[2] !== 1"); +tmp = 0; +while(tmp < 4) { + ok(tmp < 4, "tmp >= 4"); + tmp++; +} +ok(tmp === 4, "tmp !== 4"); + +tmp = 0; +while(true) { + ok(tmp < 4, "tmp >= 4"); + tmp++; + if(tmp === 4) { + break; + ok(false, "break did not break"); + } +} +ok(tmp === 4, "tmp !== 4"); + +tmp = 0; +do { + ok(tmp < 4, "tmp >= 4"); + tmp++; +} while(tmp < 4); +ok(tmp === 4, "tmp !== 4"); + +tmp = 0; +do { + ok(tmp === 0, "tmp !=== 0"); + tmp++; +} while(false); +ok(tmp === 1, "tmp !== 4"); + reportSuccess();

1 0

Jacek Caban : jscript: Added String.length implementation.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: b48489be3c884aecca8b5f3dd8f9eb21d4baa989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b48489be3c884aecca8b5f3dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:35:12 2008 +0200 jscript: Added String.length implementation. --- dlls/jscript/string.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index b310cab..0831532 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -70,8 +70,22 @@ static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p',' static HRESULT String_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("%p\n", dispex); + + switch(flags) { + case DISPATCH_PROPERTYGET: { + StringInstance *jsthis = (StringInstance*)dispex; + + V_VT(retv) = VT_I4; + V_I4(retv) = jsthis->length; + break; + } + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT String_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index eed48dc..d6893e0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -16,6 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +ok("".length === 0, "\"\".length = " + "".length); +ok(getVT("".length) == "VT_I4", "\"\".length = " + "".length); +ok("abc".length === 3, "\"abc\".length = " + "abc".length); +ok(String.prototype.length === 0, "String.prototype.length = " + String.prototype.length); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

Jacek Caban : jscript: Added to_string(VT_I4) implementation.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: c1372814695510564f53645346c1eab8b1dc0d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1372814695510564f5364534… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:34:56 2008 +0200 jscript: Added to_string(VT_I4) implementation. --- dlls/jscript/jsutils.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 5 +++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 19c3b8d..7184cb9 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -253,19 +253,54 @@ HRESULT to_int32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, INT *ret) return S_OK; } +static BSTR int_to_bstr(INT i) +{ + WCHAR buf[12], *p; + BOOL neg = FALSE; + + if(!i) { + static const WCHAR zeroW[] = {'0',0}; + return SysAllocString(zeroW); + } + + if(i < 0) { + neg = TRUE; + i = -i; + } + + p = buf + sizeof(buf)/sizeof(*buf)-1; + *p-- = 0; + while(i) { + *p-- = i%10 + '0'; + i /= 10; + } + + if(neg) + *p = '-'; + else + p++; + + return SysAllocString(p); +} + /* ECMA-262 3rd Edition 9.8 */ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) { switch(V_VT(v)) { + case VT_I4: + *str = int_to_bstr(V_I4(v)); + break; + case VT_BSTR: *str = SysAllocString(V_BSTR(v)); - return S_OK; + break; default: FIXME("unsupported vt %d\n", V_VT(v)); + return E_NOTIMPL; } - return E_NOTIMPL; + return *str ? S_OK : E_OUTOFMEMORY; } /* ECMA-262 3rd Edition 9.9 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index afb71bf..e2b5800 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -312,6 +312,10 @@ ok(+true === 1, "+true !== 1"); ok(+false === 0, "+false !== 0"); ok(+null === 0, "+null !== 0"); +ok("" + 0 === "0", "\"\" + 0 !== \"0\""); +ok("" + 123 === "123", "\"\" + 123 !== \"123\""); +ok("" + (-5) === "-5", "\"\" + (-5) !== \"-5\""); + ok(1 < 3.4, "1 < 3.4 failed"); ok(!(3.4 < 1), "3.4 < 1"); ok("abc" < "abcd", "abc < abcd failed"); @@ -544,5 +548,6 @@ ok(tmp.length === 7, "tmp.length !== 7"); ok(tmp["0"] === undefined, "tmp[0] is not undefined"); ok(tmp["3"] === 2, "tmp[3] !== 2"); ok(tmp["6"] === true, "tmp[6] !== true"); +ok(tmp[2] === 1, "tmp[2] !== 1"); reportSuccess();

1 0

Jacek Caban : jscript: Added array literal implementation.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: 788197d592794849c981c79d8c6449f90bcec2b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=788197d592794849c981c79d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:34:23 2008 +0200 jscript: Added array literal implementation. --- dlls/jscript/engine.c | 52 +++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 6 +++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 09b1efe..2a37d05 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1329,10 +1329,56 @@ HRESULT literal_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flag return S_OK; } -HRESULT array_literal_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.1.4 */ +HRESULT array_literal_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + array_literal_expression_t *expr = (array_literal_expression_t*)_expr; + DWORD length = 0, i = 0; + array_element_t *elem; + DispatchEx *array; + exprval_t exprval; + VARIANT val; + HRESULT hres; + + TRACE("\n"); + + for(elem = expr->element_list; elem; elem = elem->next) + length += elem->elision+1; + length += expr->length; + + hres = create_array(ctx->parser->script, length, &array); + if(FAILED(hres)) + return hres; + + for(elem = expr->element_list; elem; elem = elem->next) { + i += elem->elision; + + hres = expr_eval(ctx, elem->expr, 0, ei, &exprval); + if(FAILED(hres)) + break; + + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + break; + + hres = jsdisp_propput_idx(array, i, ctx->parser->script->lcid, &val, ei, NULL/*FIXME*/); + VariantClear(&val); + if(FAILED(hres)) + break; + + i++; + } + + if(FAILED(hres)) { + jsdisp_release(array); + return hres; + } + + ret->type = EXPRVAL_VARIANT; + V_VT(&ret->u.var) = VT_DISPATCH; + V_DISPATCH(&ret->u.var) = (IDispatch*)_IDispatchEx_(array); + return S_OK; } /* ECMA-262 3rd Edition 11.1.5 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 8a47cf4..afb71bf 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -539,4 +539,10 @@ try { } ok(state === "finally", "state = " + state + " expected finally"); +tmp = [,,1,2,,,true]; +ok(tmp.length === 7, "tmp.length !== 7"); +ok(tmp["0"] === undefined, "tmp[0] is not undefined"); +ok(tmp["3"] === 2, "tmp[3] !== 2"); +ok(tmp["6"] === true, "tmp[6] !== true"); + reportSuccess();

1 0