September 2008 - Wine-commits

Juan Lang : wintrust: Add traces to a few more functions.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: 500403957d4ffc90734cbfce40a6ddcf8d799956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=500403957d4ffc90734cbfce4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 18 09:14:54 2008 -0700 wintrust: Add traces to a few more functions. --- dlls/wintrust/wintrust_main.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index e7b9af4..84bd2aa 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -607,6 +607,8 @@ BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) { BOOL ret = FALSE; + TRACE("(%p, %p)\n", data, store); + if (data->chStores) data->pahStores = WINTRUST_ReAlloc(data->pahStores, (data->chStores + 1) * sizeof(HCERTSTORE)); @@ -630,6 +632,8 @@ BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, { BOOL ret = FALSE; + TRACE("(%p, %d, %d, %p)\n", data, fCounterSigner, idxSigner, sgnr); + if (sgnr->cbStruct > sizeof(CRYPT_PROVIDER_SGNR)) { SetLastError(ERROR_INVALID_PARAMETER); @@ -681,6 +685,9 @@ BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, { BOOL ret = FALSE; + TRACE("(%p, %d, %d, %d, %p)\n", data, idxSigner, fCounterSigner, + idxSigner, pCert2Add); + if (fCounterSigner) { FIXME("unimplemented for counter signers\n");

1 0

Juan Lang : include: Fix typo.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: c7e6c0ccd7a3dedd67a19cd245a2776b66716249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e6c0ccd7a3dedd67a19cd24… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 18 10:36:49 2008 -0700 include: Fix typo. --- include/cryptdlg.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/cryptdlg.h b/include/cryptdlg.h index 6a012c7..47bd984 100644 --- a/include/cryptdlg.h +++ b/include/cryptdlg.h @@ -278,7 +278,7 @@ typedef struct _CERT_VERIFY_CERTIFICATE_TRUST LPSTR pszUsageOid; HCRYPTPROV hprov; DWORD cRootStores; - HCERTSTORE rghstoreRoots; + HCERTSTORE *rghstoreRoots; DWORD cStores; HCERTSTORE *rghstoreCAs; DWORD cTrustStores;

1 0

Jacek Caban : jscript: Added more to_string implementation.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: 4778c069039a567da9f86858da9fc3b3ea71b3a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4778c069039a567da9f86858d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 00:46:05 2008 +0200 jscript: Added more to_string implementation. --- dlls/jscript/jsutils.c | 26 +++++++++++++++++++++++++- dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 4913568..f368c3e 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -320,15 +320,39 @@ static BSTR int_to_bstr(INT i) /* ECMA-262 3rd Edition 9.8 */ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) { + const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; + const WCHAR nullW[] = {'n','u','l','l',0}; + const WCHAR trueW[] = {'t','r','u','e',0}; + const WCHAR falseW[] = {'f','a','l','s','e',0}; + switch(V_VT(v)) { + case VT_EMPTY: + *str = SysAllocString(undefinedW); + break; + case VT_NULL: + *str = SysAllocString(nullW); + break; case VT_I4: *str = int_to_bstr(V_I4(v)); break; - case VT_BSTR: *str = SysAllocString(V_BSTR(v)); break; + case VT_DISPATCH: { + VARIANT prim; + HRESULT hres; + hres = to_primitive(ctx, v, ei, &prim); + if(FAILED(hres)) + return hres; + + hres = to_string(ctx, &prim, ei, str); + VariantClear(&prim); + return hres; + } + case VT_BOOL: + *str = SysAllocString(V_BOOL(v) ? trueW : falseW); + break; default: FIXME("unsupported vt %d\n", V_VT(v)); return E_NOTIMPL; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 82a612a..3a24864 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -342,6 +342,10 @@ ok(+null === 0, "+null !== 0"); ok("" + 0 === "0", "\"\" + 0 !== \"0\""); ok("" + 123 === "123", "\"\" + 123 !== \"123\""); ok("" + (-5) === "-5", "\"\" + (-5) !== \"-5\""); +ok("" + null === "null", "\"\" + null !== \"null\""); +ok("" + undefined === "undefined", "\"\" + undefined !== \"undefined\""); +ok("" + true === "true", "\"\" + true !== \"true\""); +ok("" + false === "false", "\"\" + false !== \"false\""); ok(1 < 3.4, "1 < 3.4 failed"); ok(!(3.4 < 1), "3.4 < 1");

1 0

Jacek Caban : jscript: Added function constructor object.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: 5e07e0cf53357432002bd0804987cf102f677a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e07e0cf53357432002bd0804… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 00:46:26 2008 +0200 jscript: Added function constructor object. --- dlls/jscript/function.c | 46 ++++++++++++++++++++++++++++++++++++++++--- dlls/jscript/global.c | 9 ++++++- dlls/jscript/jscript.h | 2 + dlls/jscript/tests/lang.js | 6 +++++ 4 files changed, 57 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 4c07cb3..7d39ad0 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -369,7 +369,21 @@ static const builtin_info_t Function_info = { NULL }; -static HRESULT create_function(script_ctx_t *ctx, DWORD flags, DispatchEx *prototype, FunctionInstance **ret) +static HRESULT FunctionConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT FunctionProt_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT create_function(script_ctx_t *ctx, DWORD flags, BOOL funcprot, DispatchEx *prototype, FunctionInstance **ret) { FunctionInstance *function; HRESULT hres; @@ -378,7 +392,10 @@ static HRESULT create_function(script_ctx_t *ctx, DWORD flags, DispatchEx *proto if(!function) return E_OUTOFMEMORY; - hres = init_dispex(&function->dispex, ctx, &Function_info, NULL); + if(funcprot) + hres = init_dispex(&function->dispex, ctx, &Function_info, prototype); + else + hres = init_dispex_from_constr(&function->dispex, ctx, &Function_info, ctx->function_constr); if(FAILED(hres)) return hres; @@ -410,7 +427,7 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, FunctionInstance *function; HRESULT hres; - hres = create_function(ctx, flags, prototype, &function); + hres = create_function(ctx, flags, FALSE, prototype, &function); if(FAILED(hres)) return hres; @@ -433,7 +450,7 @@ HRESULT create_source_function(parser_ctx_t *ctx, parameter_t *parameters, sourc if(FAILED(hres)) return hres; - hres = create_function(ctx->script, PROPF_CONSTR, prototype, &function); + hres = create_function(ctx->script, PROPF_CONSTR, FALSE, prototype, &function); jsdisp_release(prototype); if(FAILED(hres)) return hres; @@ -456,3 +473,24 @@ HRESULT create_source_function(parser_ctx_t *ctx, parameter_t *parameters, sourc *ret = &function->dispex; return S_OK; } + +HRESULT init_function_constr(script_ctx_t *ctx) +{ + FunctionInstance *prot, *constr; + HRESULT hres; + + hres = create_function(ctx, PROPF_CONSTR, TRUE, NULL, &prot); + if(FAILED(hres)) + return hres; + + prot->value_proc = FunctionProt_value; + + hres = create_function(ctx, PROPF_CONSTR, TRUE, &prot->dispex, &constr); + jsdisp_release(&prot->dispex); + if(FAILED(hres)) + return hres; + + constr->value_proc = FunctionConstr_value; + ctx->function_constr = &constr->dispex; + return hres; +} diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 70983fc..4404bff 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -106,8 +106,9 @@ static HRESULT JSGlobal_Date(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA static HRESULT JSGlobal_Function(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + return constructor_call(dispex->ctx->function_constr, lcid, flags, dp, retv, ei, sp); } static HRESULT JSGlobal_Number(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -332,6 +333,10 @@ static HRESULT init_constructors(script_ctx_t *ctx) { HRESULT hres; + hres = init_function_constr(ctx); + if(FAILED(hres)) + return hres; + hres = create_array_constr(ctx, &ctx->array_constr); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 603b279..6c4e272 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -165,6 +165,7 @@ struct _script_ctx_t { DispatchEx *script_disp; DispatchEx *global; + DispatchEx *function_constr; DispatchEx *array_constr; DispatchEx *bool_constr; DispatchEx *number_constr; @@ -181,6 +182,7 @@ static inline void script_addref(script_ctx_t *ctx) } HRESULT init_global(script_ctx_t*); +HRESULT init_function_constr(script_ctx_t*); HRESULT create_array_constr(script_ctx_t*,DispatchEx**); HRESULT create_bool_constr(script_ctx_t*,DispatchEx**); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 3a24864..83732a2 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -79,6 +79,12 @@ ok(Number.prototype !== undefined, "Number.prototype is undefined"); ok(RegExp.prototype !== undefined, "RegExp.prototype is undefined"); ok(Math !== undefined, "Math is undefined"); ok(Math.prototype === undefined, "Math.prototype is not undefined"); +ok(Function.prototype !== undefined, "Function.prototype is undefined"); +ok(Function.prototype.prototype === undefined, "Function.prototype is not undefined"); + +Function.prototype.test = true; +ok(testFunc1.test === true, "testFunc1.test !== true"); +ok(Function.test === true, "Function.test !== true"); ok(typeof(0) === "number", "typeof(0) is not number"); ok(typeof(1.5) === "number", "typeof(1.5) is not number");

1 0

Owen Rudge : shell32: Check CPL_NEWINQUIRE message in control panel applets if we can' t retrieve valid strings/icon.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: 4e7a07631efcf54e4df45644fdff95249339ddf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7a07631efcf54e4df45644f… Author: Owen Rudge <owen(a)owenrudge.net> Date: Fri Sep 19 00:13:58 2008 +0100 shell32: Check CPL_NEWINQUIRE message in control panel applets if we can't retrieve valid strings/icon. --- dlls/shell32/control.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index aa5abfe..83b4418 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -119,6 +119,22 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) LoadStringW(applet->hModule, info.idInfo, applet->info[i].szInfo, sizeof(applet->info[i].szInfo) / sizeof(WCHAR)); + /* some broken control panels seem to return incorrect values in CPL_INQUIRE, + but proper data in CPL_NEWINQUIRE. if we get an empty string or a null + icon, see what we can get from CPL_NEWINQUIRE */ + + if ((applet->info[i].szName == 0) || (lstrlenW(applet->info[i].szName) == 0)) + info.idName = CPL_DYNAMIC_RES; + + /* zero-length szInfo may not be a buggy applet, but it doesn't hurt for us + to check anyway */ + + if ((applet->info[i].szInfo == 0) || (lstrlenW(applet->info[i].szInfo) == 0)) + info.idInfo = CPL_DYNAMIC_RES; + + if (applet->info[i].hIcon == NULL) + info.idIcon = CPL_DYNAMIC_RES; + if ((info.idIcon == CPL_DYNAMIC_RES) || (info.idName == CPL_DYNAMIC_RES) || (info.idInfo == CPL_DYNAMIC_RES)) { applet->proc(hWnd, CPL_NEWINQUIRE, i, (LPARAM)&newinfo);

1 0

Jacek Caban : jscript: Minor fixes.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: 3435603520b8da0514b959c97e428904edffd294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3435603520b8da0514b959c97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 00:45:50 2008 +0200 jscript: Minor fixes. --- dlls/jscript/engine.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 617d1ac..f0f5062 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1486,6 +1486,7 @@ HRESULT new_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j return S_OK; } +/* ECMA-262 3rd Edition 11.2.3 */ HRESULT call_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { call_expression_t *expr = (call_expression_t*)_expr; @@ -1527,6 +1528,7 @@ HRESULT call_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, return S_OK; } +/* ECMA-262 3rd Edition 11.1.1 */ HRESULT this_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { TRACE("\n"); @@ -1877,12 +1879,14 @@ HRESULT binary_and_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f return binary_expr_eval(ctx, expr, bitand_eval, ei, ret); } +/* ECMA-262 3rd Edition 11.8.6 */ HRESULT instanceof_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { FIXME("\n"); return E_NOTIMPL; } +/* ECMA-262 3rd Edition 11.8.7 */ HRESULT in_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { FIXME("\n"); @@ -2046,6 +2050,7 @@ HRESULT div_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j return binary_expr_eval(ctx, expr, div_eval, ei, ret); } +/* ECMA-262 3rd Edition 11.5.3 */ HRESULT mod_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { FIXME("\n"); @@ -2553,11 +2558,11 @@ HRESULT not_equal2_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f TRACE("\n"); - hres = get_binary_expr_values(ctx, expr, ei, &rval, &lval); + hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); if(FAILED(hres)) return hres; - hres = equal2_values(&rval, &lval, &b); + hres = equal2_values(&lval, &rval, &b); if(FAILED(hres)) return hres; @@ -2940,6 +2945,7 @@ HRESULT assign_div_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f return assign_oper_eval(ctx, expr->expression1, expr->expression2, div_eval, ei, ret); } +/* ECMA-262 3rd Edition 11.13.2 */ HRESULT assign_mod_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { FIXME("\n");

1 0

Jacek Caban : jscript: Added '<<=' expression implementation.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: 701797489d3b683a29af54ede839833caa0d6832 URL: http://source.winehq.org/git/wine.git/?a=commit;h=701797489d3b683a29af54ede… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 00:45:05 2008 +0200 jscript: Added '<<=' expression implementation. --- dlls/jscript/engine.c | 10 +++++++--- dlls/jscript/tests/lang.js | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5f93ace..2b9a2bb 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2870,10 +2870,14 @@ HRESULT assign_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags return S_OK; } -HRESULT assign_lshift_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.13.2 */ +HRESULT assign_lshift_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return assign_oper_eval(ctx, expr->expression1, expr->expression2, lshift_eval, ei, ret); } HRESULT assign_rshift_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 45bdd4e..5e725be 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -246,6 +246,9 @@ tmp = 5; ok((tmp /= 2) === 2.5, "tmp /= 2 !== 2.5"); ok(tmp === 2.5, "tmp !=== 2.5"); +tmp = 8; +ok((tmp <<= 1) === 16, "tmp <<= 1 !== 16"); + tmp = 3 || ok(false, "second or expression called"); ok(tmp === 3, "3 || (...) is not 3");

1 0

Jacek Caban : jscript: Added '>>=' expression implementation.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: bc641097a90410c4a845d1ad17a3a82b561e13ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc641097a90410c4a845d1ad1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 00:45:20 2008 +0200 jscript: Added '>>=' expression implementation. --- dlls/jscript/engine.c | 10 +++++++--- dlls/jscript/tests/lang.js | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2b9a2bb..3efec65 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2880,10 +2880,14 @@ HRESULT assign_lshift_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWOR return assign_oper_eval(ctx, expr->expression1, expr->expression2, lshift_eval, ei, ret); } -HRESULT assign_rshift_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.13.2 */ +HRESULT assign_rshift_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return assign_oper_eval(ctx, expr->expression1, expr->expression2, rshift_eval, ei, ret); } HRESULT assign_rrshift_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 5e725be..250093d 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -249,6 +249,9 @@ ok(tmp === 2.5, "tmp !=== 2.5"); tmp = 8; ok((tmp <<= 1) === 16, "tmp <<= 1 !== 16"); +tmp = 8; +ok((tmp >>= 1) === 4, "tmp >>= 1 !== 4"); + tmp = 3 || ok(false, "second or expression called"); ok(tmp === 3, "3 || (...) is not 3");

1 0

Jacek Caban : jscript: Added '>>>=' expression implementation.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: c1b76a333b79ea94e3a7fc9108fcb8162263e8c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b76a333b79ea94e3a7fc910… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 00:45:35 2008 +0200 jscript: Added '>>>=' expression implementation. --- dlls/jscript/engine.c | 10 +++++++--- dlls/jscript/tests/lang.js | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3efec65..617d1ac 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2890,10 +2890,14 @@ HRESULT assign_rshift_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWOR return assign_oper_eval(ctx, expr->expression1, expr->expression2, rshift_eval, ei, ret); } -HRESULT assign_rrshift_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.13.2 */ +HRESULT assign_rrshift_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return assign_oper_eval(ctx, expr->expression1, expr->expression2, rshift2_eval, ei, ret); } /* ECMA-262 3rd Edition 11.13.2 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 250093d..82a612a 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -252,6 +252,9 @@ ok((tmp <<= 1) === 16, "tmp <<= 1 !== 16"); tmp = 8; ok((tmp >>= 1) === 4, "tmp >>= 1 !== 4"); +tmp = 8; +ok((tmp >>>= 1) === 4, "tmp >>>= 1 !== 4"); + tmp = 3 || ok(false, "second or expression called"); ok(tmp === 3, "3 || (...) is not 3");

1 0

Jacek Caban : jscript: Added '>>' expression implementation.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: 74fefe94ebe5d43c49a20fdcd4c4c092bcf16bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74fefe94ebe5d43c49a20fdcd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 00:44:29 2008 +0200 jscript: Added '>>' expression implementation. --- dlls/jscript/engine.c | 28 ++++++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 6 ++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ae41df4..25120af 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2777,10 +2777,34 @@ HRESULT left_shift_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f return binary_expr_eval(ctx, expr, lshift_eval, ei, ret); } +/* ECMA-262 3rd Edition 11.7.2 */ +static HRESULT rshift_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) +{ + DWORD ri; + INT li; + HRESULT hres; + + hres = to_int32(ctx->parser->script, lval, ei, &li); + if(FAILED(hres)) + return hres; + + hres = to_uint32(ctx->parser->script, rval, ei, &ri); + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_I4; + V_I4(retv) = li >> (ri&0x1f); + return S_OK; +} + +/* ECMA-262 3rd Edition 11.7.2 */ HRESULT right_shift_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return binary_expr_eval(ctx, expr, rshift_eval, ei, ret); } HRESULT right2_shift_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index c7a79d8..7599340 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -295,6 +295,12 @@ ok(tmp === 16, "2 << 3 = " + tmp); tmp = 2 << 35; ok(tmp === 16, "2 << 35 = " + tmp); +tmp = 8 >> 2; +ok(tmp === 2, "8 >> 2 = " + tmp); + +tmp = -64 >> 4; +ok(tmp === -4, "-64 >> 4 = " + tmp); + tmp = 10; ok((tmp &= 8) === 8, "tmp(10) &= 8 !== 8"); ok(getVT(tmp) === "VT_I4", "getVT(tmp &= 8) = " + getVT(tmp));

1 0