ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Return proper error in Number.toLocaleString with invalid 'this' in ES5 mode. 

Note that, for example, Number.toFixed still returns JS_E_NUMBER_EXPECTED
even in ES5 mode (this is already tested).

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Gabriel Ivăncescu 2022-05-03 18:17:07 +03:00 committed by Alexandre Julliard
parent 8aefdf48f9
commit 41782ec12e
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/jscript/jscript.h
View File

@ -524,7 +524,7 @@ static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags)
#define JS_E_OBJECT_NONEXTENSIBLE MAKE_JSERROR(IDS_OBJECT_NONEXTENSIBLE)
#define JS_E_NONCONFIGURABLE_REDEFINED MAKE_JSERROR(IDS_NONCONFIGURABLE_REDEFINED)
#define JS_E_NONWRITABLE_MODIFIED MAKE_JSERROR(IDS_NONWRITABLE_MODIFIED)
#define JS_E_MAP_EXPECTED MAKE_JSERROR(IDS_MAP_EXPECTED)
#define JS_E_WRONG_THIS MAKE_JSERROR(IDS_WRONG_THIS)
#define JS_E_PROP_DESC_MISMATCH MAKE_JSERROR(IDS_PROP_DESC_MISMATCH)
#define JS_E_INVALID_WRITABLE_PROP_DESC MAKE_JSERROR(IDS_INVALID_WRITABLE_PROP_DESC)

2
dlls/jscript/jscript.rc
View File

@ -75,7 +75,7 @@ STRINGTABLE
IDS_OBJECT_NONEXTENSIBLE "Cannot define property '|': object is not extensible"
IDS_NONCONFIGURABLE_REDEFINED "Cannot redefine non-configurable property '|'"
IDS_NONWRITABLE_MODIFIED "Cannot modify non-writable property '|'"
IDS_MAP_EXPECTED "'this' is not a | object"
IDS_WRONG_THIS "'this' is not a | object"
IDS_PROP_DESC_MISMATCH "Property cannot have both accessors and a value"
IDS_COMPILATION_ERROR "Microsoft JScript compilation error"

5
dlls/jscript/number.c
View File

@ -416,8 +416,11 @@ static HRESULT Number_toLocaleString(script_ctx_t *ctx, jsval_t vthis, WORD flag
TRACE("\n");
hres = numberval_this(vthis, &val);
if(FAILED(hres))
if(FAILED(hres)) {
if(hres == JS_E_NUMBER_EXPECTED && ctx->version >= SCRIPTLANGUAGEVERSION_ES5)
return throw_error(ctx, JS_E_WRONG_THIS, L"Number");
return hres;
}
if(r) {
hres = localize_number(ctx, val, ctx->version >= SCRIPTLANGUAGEVERSION_ES5, &str);

2
dlls/jscript/resource.h
View File

@ -73,7 +73,7 @@
#define IDS_OBJECT_NONEXTENSIBLE 0x13D5
#define IDS_NONCONFIGURABLE_REDEFINED 0x13D6
#define IDS_NONWRITABLE_MODIFIED 0x13D7
#define IDS_MAP_EXPECTED 0x13FC
#define IDS_WRONG_THIS 0x13FC
/* FIXME: This is not compatible with native, but we would
* conflict with IDS_UNSUPPORTED_ACTION otherwise */
#define IDS_PROP_DESC_MISMATCH 0x1F00

4
dlls/jscript/set.c
View File

@ -94,7 +94,7 @@ static HRESULT get_map_this(script_ctx_t *ctx, jsval_t vthis, MapInstance **ret)
return JS_E_OBJECT_EXPECTED;
if(!(jsdisp = to_jsdisp(get_object(vthis))) || !is_class(jsdisp, JSCLASS_MAP)) {
WARN("not a Map object passed as 'this'\n");
return throw_error(ctx, JS_E_MAP_EXPECTED, L"Map");
return throw_error(ctx, JS_E_WRONG_THIS, L"Map");
}
*ret = CONTAINING_RECORD(jsdisp, MapInstance, dispex);
@ -109,7 +109,7 @@ static HRESULT get_set_this(script_ctx_t *ctx, jsval_t vthis, MapInstance **ret)
return JS_E_OBJECT_EXPECTED;
if(!(jsdisp = to_jsdisp(get_object(vthis))) || !is_class(jsdisp, JSCLASS_SET)) {
WARN("not a Set object passed as 'this'\n");
return throw_error(ctx, JS_E_MAP_EXPECTED, L"Set");
return throw_error(ctx, JS_E_WRONG_THIS, L"Set");
}
*ret = CONTAINING_RECORD(jsdisp, MapInstance, dispex);

3
dlls/mshtml/tests/es5.js
View File

@ -97,7 +97,6 @@ sync_test("Number toLocaleString", function() {
ok(false, "expected exception calling it on string");
}catch(ex) {
var n = ex.number >>> 0;
todo_wine.
ok(n === JS_E_WRONG_THIS, "called on string threw " + n);
}
try {
@ -105,7 +104,6 @@ sync_test("Number toLocaleString", function() {
ok(false, "expected exception calling it on undefined");
}catch(ex) {
var n = ex.number >>> 0;
todo_wine.
ok(n === JS_E_WRONG_THIS, "called on undefined threw " + n);
}
try {
@ -113,7 +111,6 @@ sync_test("Number toLocaleString", function() {
ok(false, "expected exception calling it on nullDisp");
}catch(ex) {
var n = ex.number >>> 0;
todo_wine.
ok(n === JS_E_WRONG_THIS, "called on nullDisp threw " + n);
}
});