wine-commits July 2009

wine-commits@winehq.org

4 participants
1067 discussions

Michael Stefaniuc : winecfg: Fix regression introduced by 807d75a94e378d05.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 4f8ce1b2f2d8dcdfc24489e0ff6d34c0e7c14645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8ce1b2f2d8dcdfc24489e0f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 6 11:35:27 2009 +0200 winecfg: Fix regression introduced by 807d75a94e378d05. This is the fix for the "PACKAGE_STRING" Wine release. --- programs/winecfg/Bg.rc | 1 + programs/winecfg/Cs.rc | 1 + programs/winecfg/Da.rc | 1 + programs/winecfg/De.rc | 1 + programs/winecfg/En.rc | 1 + programs/winecfg/Es.rc | 1 + programs/winecfg/Fi.rc | 1 + programs/winecfg/Fr.rc | 1 + programs/winecfg/Hu.rc | 1 + programs/winecfg/It.rc | 1 + programs/winecfg/Ja.rc | 1 + programs/winecfg/Ko.rc | 1 + programs/winecfg/Lt.rc | 1 + programs/winecfg/Nl.rc | 1 + programs/winecfg/No.rc | 1 + programs/winecfg/Pl.rc | 1 + programs/winecfg/Pt.rc | 1 + programs/winecfg/Ro.rc | 1 + programs/winecfg/Ru.rc | 1 + programs/winecfg/Si.rc | 1 + programs/winecfg/Sv.rc | 1 + programs/winecfg/Tr.rc | 1 + programs/winecfg/Zh.rc | 1 + programs/winecfg/winecfg.rc | 1 + 24 files changed, 24 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 9ddaf2c..00cfbe8 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc index 6f5804b..b34dd06 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc @@ -25,6 +25,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* Czech strings in CP1250 */ diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc index b1df6f6..62b781b 100644 --- a/programs/winecfg/Da.rc +++ b/programs/winecfg/Da.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 045e709..1bedd06 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 88a6269..f71463a 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -22,6 +22,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index e22ada4..2ddce6c 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc index 211669e..f6fb85c 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 2b4d20b..b63adb1 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* UTF-8 */ diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc index e97c7a4..0445c77 100644 --- a/programs/winecfg/Hu.rc +++ b/programs/winecfg/Hu.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 2ee50cb..aea66df 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index eeb0987..a25a953 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -22,6 +22,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* UTF-8 */ diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 151375f..c01b841 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -23,6 +23,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index e31c2cb..3dd3041 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* UTF-8 */ diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 66bd464..99062cf 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -22,6 +22,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 2825675..357539e 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc index f7fb619..8e1d9a2 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc @@ -23,6 +23,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index a3b0219..baf2920 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc index fb8a20b..c836d60 100644 --- a/programs/winecfg/Ro.rc +++ b/programs/winecfg/Ro.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 9656c48..8d61413 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc index 1a8d488..87cd239 100644 --- a/programs/winecfg/Si.rc +++ b/programs/winecfg/Si.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" #pragma code_page(65001) diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc index 5770899..113603c 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index dbe1f2f..883c0f3 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc index 349d106..b483cfe 100644 --- a/programs/winecfg/Zh.rc +++ b/programs/winecfg/Zh.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* Chinese text is encoded in UTF-8 */ diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 7f8fe80..df572fd 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* @makedep: idb_wine.bmp */

1 0

Piotr Caban : jscript: Fixed to_boolean implementation.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: b6549fa743675b9d58f57ec0bbfac0c08fefd9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6549fa743675b9d58f57ec0b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:56 2009 +0200 jscript: Fixed to_boolean implementation. --- dlls/jscript/jsutils.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 73bac94..eab850b 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -211,7 +211,8 @@ HRESULT to_boolean(VARIANT *v, VARIANT_BOOL *b) *b = V_I4(v) ? VARIANT_TRUE : VARIANT_FALSE; break; case VT_R8: - *b = V_R8(v) ? VARIANT_TRUE : VARIANT_FALSE; + if(isnan(V_R8(v))) *b = VARIANT_FALSE; + else *b = V_R8(v) ? VARIANT_TRUE : VARIANT_FALSE; break; case VT_BSTR: *b = V_BSTR(v) && *V_BSTR(v) ? VARIANT_TRUE : VARIANT_FALSE;

1 0

Piotr Caban : jscript: Added Bool_toLocaleString implementation.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 2ed3903f0f3fb9080abe113014de3955a1f5413b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed3903f0f3fb9080abe11301… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:51 2009 +0200 jscript: Added Bool_toLocaleString implementation. --- dlls/jscript/bool.c | 5 +++-- dlls/jscript/tests/api.js | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index c1cf297..ab9ef43 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -1,5 +1,6 @@ /* * Copyright 2008 Jacek Caban for CodeWeavers + * Copyright 2009 Piotr Caban * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -70,8 +71,8 @@ static HRESULT Bool_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA static HRESULT Bool_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return Bool_toString(dispex, lcid, flags, dp, retv, ei, sp); } /* ECMA-262 3rd Edition 15.6.4.3 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2e7f2d4..23a4ad5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1085,5 +1085,6 @@ ok(bool.toString() === "false", "bool.toString() = " + bool.toString()); var bool = new Boolean("false"); ok(bool.toString() === "true", "bool.toString() = " + bool.toString()); ok(bool.valueOf() === Boolean(1), "bool.valueOf() = " + bool.valueOf()); +ok(bool.toLocaleString() === bool.toString(), "bool.toLocaleString() = " + bool.toLocaleString()); reportSuccess();

1 0

Piotr Caban : jscript: Added Bool_valueOf implementation.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 4725b5698ceb7023879772f888e5cc1f8cf2df29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4725b5698ceb7023879772f88… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:45 2009 +0200 jscript: Added Bool_valueOf implementation. --- dlls/jscript/bool.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index e7cf22f..c1cf297 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -74,11 +74,25 @@ static HRESULT Bool_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DI return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.6.4.3 */ static HRESULT Bool_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_BOOLEAN)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + BoolInstance *bool = (BoolInstance*)dispex; + + V_VT(retv) = VT_BOOL; + V_BOOL(retv) = bool->val; + } + + return S_OK; } static HRESULT Bool_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c789cc0..2e7f2d4 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1084,5 +1084,6 @@ var bool = new Boolean(); ok(bool.toString() === "false", "bool.toString() = " + bool.toString()); var bool = new Boolean("false"); ok(bool.toString() === "true", "bool.toString() = " + bool.toString()); +ok(bool.valueOf() === Boolean(1), "bool.valueOf() = " + bool.valueOf()); reportSuccess();

1 0

Piotr Caban : jscript: Added Bool_toString implementation.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 1e72bc8718ae35867b8ecdbdb7ac3efbb52a3ad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e72bc8718ae35867b8ecdbdb… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:41 2009 +0200 jscript: Added Bool_toString implementation. --- dlls/jscript/bool.c | 28 ++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index be36787..e7cf22f 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -36,11 +36,35 @@ static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; +/* ECMA-262 3rd Edition 15.6.4.2 */ static HRESULT Bool_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR trueW[] = {'t','r','u','e',0}; + static const WCHAR falseW[] = {'f','a','l','s','e',0}; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_BOOLEAN)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + BoolInstance *bool = (BoolInstance*)dispex; + BSTR val; + + if(bool->val) val = SysAllocString(trueW); + else val = SysAllocString(falseW); + + if(!val) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = val; + } + + return S_OK; } static HRESULT Bool_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index b76e94b..c789cc0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1080,4 +1080,9 @@ ok(Math.floor(Math.SQRT1_2*100) === 70, "Math.SQRT1_2 = " + Math.SQRT1_2); Math.SQRT1_2 = "test"; ok(Math.floor(Math.SQRT1_2*100) === 70, "modified Math.SQRT1_2 = " + Math.SQRT1_2); +var bool = new Boolean(); +ok(bool.toString() === "false", "bool.toString() = " + bool.toString()); +var bool = new Boolean("false"); +ok(bool.toString() === "true", "bool.toString() = " + bool.toString()); + reportSuccess();

1 0

Piotr Caban : jscript: Added Boolean constructor implementation.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 4b341bfdd4300d840800be1e7a62ecd0f3de3dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b341bfdd4300d840800be1e7… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:36 2009 +0200 jscript: Added Boolean constructor implementation. --- dlls/jscript/bool.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index 7e3bf7a..be36787 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -106,8 +106,41 @@ static const builtin_info_t Bool_info = { static HRESULT BoolConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + VARIANT_BOOL value = VARIANT_FALSE; + + if(arg_cnt(dp)) { + hres = to_boolean(get_arg(dp,0), &value); + if(FAILED(hres)) + return hres; + } + + switch(flags) { + case DISPATCH_CONSTRUCT: { + DispatchEx *bool; + + hres = create_bool(dispex->ctx, value, &bool); + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(bool); + return S_OK; + } + + case INVOKE_FUNC: + if(retv) { + V_VT(retv) = VT_BOOL; + V_BOOL(retv) = value; + } + return S_OK; + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT alloc_bool(script_ctx_t *ctx, BOOL use_constr, BoolInstance **ret)

1 0

Piotr Caban : jscript: Added Date_valueOf implementation.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 9a30d39b350088cee62eaafac4d4ca711667b069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a30d39b350088cee62eaafac… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:31 2009 +0200 jscript: Added Date_valueOf implementation. --- dlls/jscript/date.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index fe65702..525a3a2 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -676,8 +676,18 @@ static HRESULT Date_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DIS static HRESULT Date_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + num_set_val(retv, date->time); + } + return S_OK; } /* ECMA-262 3rd Edition 15.9.5.42 */

1 0

Piotr Caban : jscript: Fix do while loop parsing.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 60748ebf515ba25b5e7506c54ecaa86486f9d009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60748ebf515ba25b5e7506c54… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:23 2009 +0200 jscript: Fix do while loop parsing. --- dlls/jscript/parser.y | 2 +- dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 52a31c8..d47d40d 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -386,7 +386,7 @@ IfStatement /* ECMA-262 3rd Edition 12.6 */ IterationStatement - : kDO Statement kWHILE '(' Expression ')' ';' + : kDO Statement kWHILE '(' Expression ')' semicolon_opt { $$ = new_while_statement(ctx, TRUE, $5, $2); } | kWHILE '(' Expression ')' Statement { $$ = new_while_statement(ctx, FALSE, $3, $5); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 86eba86..cf04f9e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -672,6 +672,13 @@ do { ok(tmp === 1, "tmp !== 1"); tmp = 0; +do { + ok(tmp < 4, "tmp >= 4"); + tmp++; +} while(tmp < 4) +ok(tmp === 4, "tmp !== 4") + +tmp = 0; while(tmp < 4) { tmp++; if(tmp === 2) {

1 0

Piotr Caban : jscript: Added calling Date as function implementation.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: b5a82030adbe3a965690a2f974511291984818c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a82030adbe3a965690a2f97… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:14 2009 +0200 jscript: Added calling Date as function implementation. --- dlls/jscript/date.c | 75 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 50 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index aa06f4e..fe65702 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -455,9 +455,7 @@ static SYSTEMTIME create_systemtime(DOUBLE time) return st; } -/* ECMA-262 3rd Edition 15.9.1.2 */ -static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, VARIANT *retv) { static const WCHAR NaNW[] = { 'N','a','N',0 }; static const WCHAR formatW[] = { '%','s',' ','%','s',' ','%','d',' ', @@ -466,6 +464,9 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA static const WCHAR formatUTCW[] = { '%','s',' ','%','s',' ','%','d',' ', '%','0','2','d',':','%','0','2','d',':','%','0','2','d',' ', 'U','T','C',' ','%','d','%','s',0 }; + static const WCHAR formatNoOffsetW[] = { '%','s',' ','%','s',' ', + '%','d',' ','%','0','2','d',':','%','0','2','d',':', + '%','0','2','d',' ','%','d','%','s',0 }; static const WCHAR ADW[] = { 0 }; static const WCHAR BCW[] = { ' ','B','.','C','.',0 }; @@ -481,23 +482,12 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA BOOL formatAD = TRUE; BSTR week, month; - DateInstance *date; BSTR date_str; - DOUBLE time; - int len, size, year, day, offset; + int len, size, year, day; DWORD lcid_en, week_id, month_id; WCHAR sign = '-'; - TRACE("\n"); - - if(!is_class(dispex, JSCLASS_DATE)) { - FIXME("throw TypeError\n"); - return E_FAIL; - } - - date = (DateInstance*)dispex; - - if(isnan(date->time)) { + if(isnan(time)) { if(retv) { V_VT(retv) = VT_BSTR; V_BSTR(retv) = SysAllocString(NaNW); @@ -507,8 +497,6 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return S_OK; } - time = local_time(date->time, date); - if(retv) { len = 21; @@ -554,10 +542,8 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } while(day); day = date_from_time(time); - offset = date->bias + - daylight_saving_ta(time, date); - - if(offset == 0) len -= 5; + if(!show_offset) len -= 9; + else if(offset == 0) len -= 5; else if(offset < 0) { sign = '+'; offset = -offset; @@ -570,15 +556,19 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return E_OUTOFMEMORY; } - if(offset) + if(!show_offset) + sprintfW(date_str, formatNoOffsetW, week, month, day, + (int)hour_from_time(time), (int)min_from_time(time), + (int)sec_from_time(time), year, formatAD?ADW:BCW); + else if(offset) sprintfW(date_str, formatW, week, month, day, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), sign, offset/60, offset%60, year, formatAD?ADW:BCW); else sprintfW(date_str, formatUTCW, week, month, day, - (int)hour_from_time(time), (int)min_from_time(time), - (int)sec_from_time(time), year, formatAD?ADW:BCW); + (int)hour_from_time(time), (int)min_from_time(time), + (int)sec_from_time(time), year, formatAD?ADW:BCW); SysFreeString(week); SysFreeString(month); @@ -589,6 +579,29 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return S_OK; } +/* ECMA-262 3rd Edition 15.9.1.2 */ +static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + DateInstance *date; + DOUBLE time; + int offset; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + time = local_time(date->time, date); + offset = date->bias + + daylight_saving_ta(time, date); + + return date_to_string(time, TRUE, offset, retv); +} + /* ECMA-262 3rd Edition 15.9.1.5 */ static HRESULT Date_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) @@ -2652,6 +2665,18 @@ static HRESULT DateConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPP V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(date); return S_OK; + case INVOKE_FUNC: { + FILETIME system_time, local_time; + LONGLONG lltime; + + GetSystemTimeAsFileTime(&system_time); + FileTimeToLocalFileTime(&system_time, &local_time); + lltime = ((LONGLONG)local_time.dwHighDateTime<<32) + + local_time.dwLowDateTime; + + return date_to_string(lltime/10000-TIME_EPOCH, FALSE, 0, retv); + } + default: FIXME("unimplemented flags %x\n", flags); return E_NOTIMPL;

1 0

Piotr Caban : jscript: Added string argument handling to Date constructor.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 8150960f8ccdd5e52c1d2f83f857b6c9114a734e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8150960f8ccdd5e52c1d2f83f… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:08 2009 +0200 jscript: Added string argument handling to Date constructor. --- dlls/jscript/date.c | 9 ++++----- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index d43708a..aa06f4e 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2617,12 +2617,11 @@ static HRESULT DateConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPP if(FAILED(hres)) return hres; - if(V_VT(&prim) == VT_BSTR) { - FIXME("VT_BSTR not supported\n"); - return E_NOTIMPL; - } + if(V_VT(&prim) == VT_BSTR) + hres = date_parse(V_BSTR(&prim), &num); + else + hres = to_number(dispex->ctx, &prim, ei, &num); - hres = to_number(dispex->ctx, &prim, ei, &num); VariantClear(&prim); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 27eabfc..b76e94b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -940,6 +940,8 @@ date = new Date(8.64e15+1); ok(isNaN(0+date.getTime()), "date.getTime() is not NaN"); date = new Date(Infinity); ok(isNaN(0+date.getTime()), "date.getTime() is not NaN"); +date = new Date("3 July 2009 22:28:00 UTC+0100"); +ok(date.getTime() === 1246656480000, "date.getTime() = " + date.getTime()); date = new Date(1984, 11, 29, 13, 51, 24, 120); ok(date.getFullYear() === 1984, "date.getFullYear() = " + date.getFullYear()); ok(date.getMonth() === 11, "date.getMonth() = " + date.getMonth());

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2009