Module: wine Branch: master Commit: 47b02e8c1ea4ad82cd572dc3dcf60af753222f39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47b02e8c1ea4ad82cd572dc3d... Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 18 17:24:11 2022 +0200 jscript: Return the correct string for Object.toString(undefined) in ES5+ modes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 2 +- dlls/mshtml/tests/es5.js | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 0f5f2c105e3..c01fbcce085 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -60,7 +60,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns if(ctx->version < SCRIPTLANGUAGEVERSION_ES5) str = L"[object Object]"; else - str = is_null(vthis) ? L"[object Null]" : L"[object Object]"; + str = is_null(vthis) ? L"[object Null]" : L"[object Undefined]"; goto set_output; } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 857d47d75aa..6e92fb6a00f 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -807,10 +807,8 @@ sync_test("toString", function() { tmp = Object.prototype.toString.call(null); ok(tmp === "[object Null]", "toString.call(null) = " + tmp); tmp = Object.prototype.toString.call(undefined); - todo_wine. ok(tmp === "[object Undefined]", "toString.call(undefined) = " + tmp); tmp = Object.prototype.toString.call(); - todo_wine. ok(tmp === "[object Undefined]", "toString.call() = " + tmp); obj = Object.create(null);