October 2008 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLInputElement::put_checked implementation.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: fa577032663b755081ff24f6a5657a7428c0bf1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa577032663b755081ff24f6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 16 15:28:08 2008 -0500 mshtml: Added IHTMLInputElement::put_checked implementation. --- dlls/mshtml/htmlinput.c | 13 +++++++++++-- dlls/mshtml/tests/dom.c | 26 ++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index c14c4a8..abb6e2e 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -415,8 +415,17 @@ static HRESULT WINAPI HTMLInputElement_get_defaultChecked(IHTMLInputElement *ifa static HRESULT WINAPI HTMLInputElement_put_checked(IHTMLInputElement *iface, VARIANT_BOOL v) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLInputElement_SetChecked(This->nsinput, v != VARIANT_FALSE); + if(NS_FAILED(nsres)) { + ERR("SetChecked failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLInputElement_get_checked(IHTMLInputElement *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9f477aa..7a14c29 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1427,6 +1427,28 @@ static void _test_input_set_defaultchecked(unsigned line, IHTMLInputElement *inp _test_input_get_defaultchecked(line, input, b); } +#define test_input_get_checked(i,b) _test_input_get_checked(__LINE__,i,b) +static void _test_input_get_checked(unsigned line, IHTMLInputElement *input, VARIANT_BOOL exb) +{ + VARIANT_BOOL checked = 100; + HRESULT hres; + + hres = IHTMLInputElement_get_checked(input, &checked); + ok_(__FILE__,line) (hres == S_OK, "get_checked failed: %08x\n", hres); + ok_(__FILE__,line) (checked == exb, "checked=%x, expected %x\n", checked, exb); +} + +#define test_input_set_checked(i,b) _test_input_set_checked(__LINE__,i,b) +static void _test_input_set_checked(unsigned line, IHTMLInputElement *input, VARIANT_BOOL b) +{ + HRESULT hres; + + hres = IHTMLInputElement_put_checked(input, b); + ok_(__FILE__,line) (hres == S_OK, "get_checked failed: %08x\n", hres); + + _test_input_get_checked(line, input, b); +} + #define test_input_value(o,t) _test_input_value(__LINE__,o,t) static void _test_input_value(unsigned line, IUnknown *unk, const char *exval) { @@ -3164,6 +3186,10 @@ static void test_elems(IHTMLDocument2 *doc) test_input_set_defaultchecked(input, VARIANT_TRUE); test_input_set_defaultchecked(input, VARIANT_FALSE); + test_input_get_checked(input, VARIANT_FALSE); + test_input_set_checked(input, VARIANT_TRUE); + test_input_set_checked(input, VARIANT_FALSE); + IHTMLInputElement_Release(input); IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Added IHTMLInputElement::[get|put] _defaultChecked implementation.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 3600fb3b56050cbcb281bd005ef1523cc3b29573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3600fb3b56050cbcb281bd005… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 16 15:27:59 2008 -0500 mshtml: Added IHTMLInputElement::[get|put]_defaultChecked implementation. --- dlls/mshtml/htmlinput.c | 28 ++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 26 ++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index fa120d0..c14c4a8 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -381,15 +381,35 @@ static HRESULT WINAPI HTMLInputElement_get_indeterminate(IHTMLInputElement *ifac static HRESULT WINAPI HTMLInputElement_put_defaultChecked(IHTMLInputElement *iface, VARIANT_BOOL v) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLInputElement_SetDefaultChecked(This->nsinput, v != VARIANT_FALSE); + if(NS_FAILED(nsres)) { + ERR("SetDefaultChecked failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLInputElement_get_defaultChecked(IHTMLInputElement *iface, VARIANT_BOOL *p) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRBool default_checked = FALSE; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLInputElement_GetDefaultChecked(This->nsinput, &default_checked); + if(NS_FAILED(nsres)) { + ERR("GetDefaultChecked failed: %08x\n", nsres); + return E_FAIL; + } + + *p = default_checked ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLInputElement_put_checked(IHTMLInputElement *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 75538fe..9f477aa 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1405,6 +1405,28 @@ static void _test_input_set_disabled(unsigned line, IHTMLInputElement *input, VA _test_input_get_disabled(line, input, b); } +#define test_input_get_defaultchecked(i,b) _test_input_get_defaultchecked(__LINE__,i,b) +static void _test_input_get_defaultchecked(unsigned line, IHTMLInputElement *input, VARIANT_BOOL exb) +{ + VARIANT_BOOL checked = 100; + HRESULT hres; + + hres = IHTMLInputElement_get_defaultChecked(input, &checked); + ok_(__FILE__,line) (hres == S_OK, "get_defaultChecked failed: %08x\n", hres); + ok_(__FILE__,line) (checked == exb, "checked=%x, expected %x\n", checked, exb); +} + +#define test_input_set_defaultchecked(i,b) _test_input_set_defaultchecked(__LINE__,i,b) +static void _test_input_set_defaultchecked(unsigned line, IHTMLInputElement *input, VARIANT_BOOL b) +{ + HRESULT hres; + + hres = IHTMLInputElement_put_defaultChecked(input, b); + ok_(__FILE__,line) (hres == S_OK, "get_defaultChecked failed: %08x\n", hres); + + _test_input_get_defaultchecked(line, input, b); +} + #define test_input_value(o,t) _test_input_value(__LINE__,o,t) static void _test_input_value(unsigned line, IUnknown *unk, const char *exval) { @@ -3138,6 +3160,10 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_set_tabindex((IUnknown*)elem, 3); test_elem_title((IUnknown*)elem, "test title"); + test_input_get_defaultchecked(input, VARIANT_FALSE); + test_input_set_defaultchecked(input, VARIANT_TRUE); + test_input_set_defaultchecked(input, VARIANT_FALSE); + IHTMLInputElement_Release(input); IHTMLElement_Release(elem); }

1 0

Christian Costa : d3dxof: Add support for string parsing.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: f32511cf278f39cc0585e1a9e7f281703753d6dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f32511cf278f39cc0585e1a9e… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Oct 16 22:23:46 2008 +0200 d3dxof: Add support for string parsing. --- dlls/d3dxof/d3dxof.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index e92d181..ca4eb73 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -639,6 +639,43 @@ static BOOL is_integer(parse_buffer* buf) return TRUE; } +static BOOL is_string(parse_buffer* buf) +{ + char tmp[32]; + DWORD pos = 1; + char c; + BOOL ok = 0; + + if (*buf->buffer != '"') + return FALSE; + tmp[0] = '"'; + + while (!is_separator(c = *(buf->buffer+pos)) && (pos < 32)) + { + tmp[pos++] = c; + if (c == '"') + { + ok = 1; + break; + } + } + tmp[pos] = 0; + + if (!ok) + { + TRACE("Wrong string %s\n", tmp); + return FALSE; + } + + buf->buffer += pos; + buf->rem_bytes -= pos; + + TRACE("Found string %s\n", tmp); + strcpy((char*)buf->value, tmp); + + return TRUE; +} + static WORD parse_TOKEN(parse_buffer * buf) { WORD token; @@ -704,6 +741,11 @@ static WORD parse_TOKEN(parse_buffer * buf) token = TOKEN_FLOAT; break; } + if (is_string(buf)) + { + token = TOKEN_LPSTR; + break; + } if (is_name(buf)) { token = TOKEN_NAME; @@ -1811,8 +1853,34 @@ static BOOL parse_object_members_list(parse_buffer * buf) return FALSE; } } + else if (token == TOKEN_LPSTR) + { + static char fake_string[] = "Fake string"; + get_TOKEN(buf); + TRACE("%s = %s\n", pt->members[i].name, (char*)buf->value); + /* Assume larger size */ + if ((buf->cur_pdata - buf->pxo->pdata + 4) > MAX_DATA_SIZE) + { + WARN("Buffer too small\n"); + return FALSE; + } + if (pt->members[i].type == TOKEN_LPSTR) + { + /* Use a fake string for now */ + *(((LPCSTR*)(buf->cur_pdata))) = fake_string; + buf->cur_pdata += 4; + } + else + { + FIXME("Token %d not supported\n", pt->members[i].type); + return FALSE; + } + } else + { + FIXME("Unexpected token %d\n", token); return FALSE; + } } }

1 0

Christian Costa : d3dxof: Move template dumping code in a separate function .
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 7a20c1dc6ce53ae74557181b4f8c4f71ad3b4f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a20c1dc6ce53ae74557181b4… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Oct 16 22:21:43 2008 +0200 d3dxof: Move template dumping code in a separate function. --- dlls/d3dxof/d3dxof.c | 83 ++++++++++++++++++++++++++------------------------ 1 files changed, 43 insertions(+), 40 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 5fae6d5..8e9ef00 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -92,6 +92,48 @@ static const struct IDirectXFileSaveObjectVtbl IDirectXFileSaveObject_Vtbl; static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional); static BOOL parse_object(parse_buffer * buf); +static const char* get_primitive_string(WORD token); + +static void dump_template(xtemplate* templates_array, xtemplate* ptemplate) +{ + int j, k; + GUID* clsid; + + clsid = &ptemplate->class_id; + + DPRINTF("template %s\n", ptemplate->name); + DPRINTF("{\n"); + DPRINTF(CLSIDFMT "\n", clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], + clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); + for (j = 0; j < ptemplate->nb_members; j++) + { + if (ptemplate->members[j].nb_dims) + DPRINTF("array "); + if (ptemplate->members[j].type == TOKEN_NAME) + DPRINTF("%s ", templates_array[ptemplate->members[j].idx_template].name); + else + DPRINTF("%s ", get_primitive_string(ptemplate->members[j].type)); + DPRINTF("%s", ptemplate->members[j].name); + for (k = 0; k < ptemplate->members[j].nb_dims; k++) + { + if (ptemplate->members[j].dim_fixed[k]) + DPRINTF("[%d]", ptemplate->members[j].dim_value[k]); + else + DPRINTF("[%s]", ptemplate->members[ptemplate->members[j].dim_value[k]].name); + } + DPRINTF(";\n"); + } + if (ptemplate->open) + DPRINTF("[...]\n"); + else if (ptemplate->nb_childs) + { + DPRINTF("[%s", ptemplate->childs[0]); + for (j = 1; j < ptemplate->nb_childs; j++) + DPRINTF(",%s", ptemplate->childs[j]); + DPRINTF("]\n"); + } + DPRINTF("}\n"); +} HRESULT IDirectXFileImpl_Create(IUnknown* pUnkOuter, LPVOID* ppObj) { @@ -1081,46 +1123,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP { TRACE("Template successfully parsed:\n"); if (TRACE_ON(d3dxof)) - { - int i,j,k; - GUID* clsid; - - i = This->nb_xtemplates - 1; - clsid = &This->xtemplates[i].class_id; - - DPRINTF("template %s\n", This->xtemplates[i].name); - DPRINTF("{\n"); - DPRINTF(CLSIDFMT "\n", clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], - clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); - for (j = 0; j < This->xtemplates[i].nb_members; j++) - { - if (This->xtemplates[i].members[j].nb_dims) - DPRINTF("array "); - if (This->xtemplates[i].members[j].type == TOKEN_NAME) - DPRINTF("%s ", This->xtemplates[This->xtemplates[i].members[j].idx_template].name); - else - DPRINTF("%s ", get_primitive_string(This->xtemplates[i].members[j].type)); - DPRINTF("%s", This->xtemplates[i].members[j].name); - for (k = 0; k < This->xtemplates[i].members[j].nb_dims; k++) - { - if (This->xtemplates[i].members[j].dim_fixed[k]) - DPRINTF("[%d]", This->xtemplates[i].members[j].dim_value[k]); - else - DPRINTF("[%s]", This->xtemplates[i].members[This->xtemplates[i].members[j].dim_value[k]].name); - } - DPRINTF(";\n"); - } - if (This->xtemplates[i].open) - DPRINTF("[...]\n"); - else if (This->xtemplates[i].nb_childs) - { - DPRINTF("[%s", This->xtemplates[i].childs[0]); - for (j = 1; j < This->xtemplates[i].nb_childs; j++) - DPRINTF(",%s", This->xtemplates[i].childs[j]); - DPRINTF("]\n"); - } - DPRINTF("}\n"); - } + dump_template(This->xtemplates, &This->xtemplates[This->nb_xtemplates - 1]); } }

1 0

Christian Costa : d3dxof: Reference the right objects.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 94ae7ab42ebdb8f4c520c6e4711889ff1310d51e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ae7ab42ebdb8f4c520c6e47… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Oct 16 22:22:52 2008 +0200 d3dxof: Reference the right objects. --- dlls/d3dxof/d3dxof.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 8e9ef00..e92d181 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1868,7 +1868,7 @@ _exit: return FALSE; } buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->cur_subobject++]; - buf->pxo->childs[buf->pxo->nb_childs]->ptarget = &buf->pxo_globals[i*MAX_SUBOBJECTS]; + buf->pxo->childs[buf->pxo->nb_childs]->ptarget = &buf->pxo_globals[i*MAX_SUBOBJECTS+j]; buf->pxo->nb_childs++; } else if (check_TOKEN(buf) == TOKEN_NAME) @@ -1964,7 +1964,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE IDirectXFileDataImpl* object; HRESULT hr; LPBYTE pdata; - + TRACE("(%p/%p)->(%p)\n", This, iface, ppDataObj); if (!This->buf.rem_bytes)

1 0

Jacek Caban : jscript: Added infinity and nan handling to str_to_number.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 531f8336a875f0cca2ccb557472c7d23670e011a URL: http://source.winehq.org/git/wine.git/?a=commit;h=531f8336a875f0cca2ccb5574… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 16 14:31:40 2008 -0500 jscript: Added infinity and nan handling to str_to_number. --- dlls/jscript/jsutils.c | 30 +++++++++++++++--------------- dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 2adfcb7..defddd4 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -246,26 +246,26 @@ static HRESULT str_to_number(BSTR str, VARIANT *ret) while(isspaceW(*ptr)) ptr++; + if(*ptr == '-') { + neg = TRUE; + ptr++; + }else if(*ptr == '+') { + ptr++; + } + if(!strncmpW(ptr, infinityW, sizeof(infinityW)/sizeof(WCHAR))) { ptr += sizeof(infinityW)/sizeof(WCHAR); while(*ptr && isspaceW(*ptr)) ptr++; - if(*ptr) { - FIXME("NaN\n"); - return E_NOTIMPL; - } - - FIXME("inf\n"); - return E_NOTIMPL; + if(*ptr) + num_set_nan(ret); + else + num_set_inf(ret, !neg); + return S_OK; } - if(*ptr == '-') { - neg = TRUE; - ptr++; - }else if(*ptr == '+') { - ptr++; - }else if(*ptr == '0' && ptr[1] == 'x') { + if(*ptr == '0' && ptr[1] == 'x') { DWORD l = 0; ptr += 2; @@ -313,8 +313,8 @@ static HRESULT str_to_number(BSTR str, VARIANT *ret) ptr++; if(*ptr) { - FIXME("NaN\n"); - return E_NOTIMPL; + num_set_nan(ret); + return S_OK; } if(neg) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 2b92d68..d66e887 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -813,4 +813,11 @@ ok((Infinity < 2) === false, "(Infinity < 2) !== false"); ok((Infinity > 2) === true, "(Infinity > 2) !== true"); ok((-Infinity < 2) === true, "(-Infinity < 2) !== true"); +ok(isNaN(+"test") === true, "isNaN(+'test') !== true"); +ok(isNaN(+"123t") === true, "isNaN(+'123t') !== true"); +ok(isNaN(+"Infinity x") === true, "isNaN(+'Infinity x') !== true"); +ok(+"Infinity" === Infinity, "+'Infinity' !== Infinity"); +ok(+" Infinity " === Infinity, "+' Infinity ' !== Infinity"); +ok(+"-Infinity" === -Infinity, "+'-Infinity' !== -Infinity"); + reportSuccess();

1 0

Kirill K. Smirnov : gdiplus: IPicture_SaveAsFile updates seek pointer, so put it back.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: e0325b098fc86145f94886b2f883b56f17e024aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0325b098fc86145f94886b2f… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Oct 16 18:07:44 2008 +0400 gdiplus: IPicture_SaveAsFile updates seek pointer, so put it back. --- dlls/gdiplus/image.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ffd270b..0cb5ded 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -253,6 +253,7 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) IStream* stream; HRESULT hr; INT size; + LARGE_INTEGER move; TRACE("%p, %p\n", image, cloneImage); @@ -279,6 +280,12 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) goto out; } + /* Set seek pointer back to the beginning of the picture */ + move.QuadPart = 0; + hr = IStream_Seek(stream, move, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) + goto out; + hr = OleLoadPicture(stream, size, FALSE, &IID_IPicture, (LPVOID*) &(*cloneImage)->picture); if (FAILED(hr))

1 0

Jacek Caban : jscript: Added Math.abs with no arg implementation.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 142cffc249ca95b7e3335006fb88f74d0152c575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=142cffc249ca95b7e3335006f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 16 14:31:58 2008 -0500 jscript: Added Math.abs with no arg implementation. --- dlls/jscript/math.c | 5 +++-- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index b55ed52..1d37de5 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -121,8 +121,9 @@ static HRESULT Math_abs(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d TRACE("\n"); if(!arg_cnt(dp)) { - FIXME("arg_cnt = 0\n"); - return E_NOTIMPL; + if(retv) + num_set_nan(retv); + return S_OK; } hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c0e63ef..3bb3ddf 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -431,6 +431,15 @@ ok(tmp === 3, "Math.abs(-3) = " + tmp); tmp = Math.abs(true); ok(tmp === 1, "Math.abs(true) = " + tmp); +tmp = Math.abs(); +ok(isNaN(tmp), "Math.abs() is not NaN"); + +tmp = Math.abs(NaN); +ok(isNaN(tmp), "Math.abs() is not NaN"); + +tmp = Math.abs(-Infinity); +ok(tmp === Infinity, "Math.abs(-Infinite) = " + tmp); + tmp = Math.abs(-3, 2); ok(tmp === 3, "Math.abs(-3, 2) = " + tmp);

1 0

Jacek Caban : jscript: Added NaN comparation tests.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 9d5139f4d97ba236e9f7bb75b81c3057cdb59eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5139f4d97ba236e9f7bb75b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 16 14:32:05 2008 -0500 jscript: Added NaN comparation tests. --- dlls/jscript/tests/lang.js | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index d66e887..71dd2aa 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -820,4 +820,16 @@ ok(+"Infinity" === Infinity, "+'Infinity' !== Infinity"); ok(+" Infinity " === Infinity, "+' Infinity ' !== Infinity"); ok(+"-Infinity" === -Infinity, "+'-Infinity' !== -Infinity"); +ok((NaN !== NaN) === true, "(NaN !== NaN) !== true"); +ok((NaN === NaN) === false, "(NaN === NaN) !== false"); +ok((Infinity !== NaN) === true, "(Infinity !== NaN) !== true"); +ok((Infinity !== NaN) === true, "(Infinity !== NaN) !== true"); +ok((0 === NaN) === false, "(0 === NaN) !== false"); + +ok((NaN != NaN) === true, "(NaN !== NaN) != true"); +ok((NaN == NaN) === false, "(NaN === NaN) != false"); +ok((Infinity != NaN) === true, "(Infinity != NaN) !== true"); +ok((Infinity != NaN) === true, "(Infinity != NaN) !== true"); +ok((0 == NaN) === false, "(0 === NaN) != false"); + reportSuccess();

1 0

Jacek Caban : jscript: Added NaN handling to Math.min and Math.max.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 2e075e9862e55c7937477d7cdfd2810e5ea415ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e075e9862e55c7937477d7cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 16 14:31:52 2008 -0500 jscript: Added NaN handling to Math.min and Math.max. --- dlls/jscript/math.c | 21 +++++++++++---------- dlls/jscript/tests/api.js | 12 ++++++++++++ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index e0e88e4..b55ed52 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <math.h> #include "jscript.h" @@ -222,11 +225,10 @@ static HRESULT Math_max(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d TRACE("\n"); - /* FIXME: Handle NaN */ - if(!arg_cnt(dp)) { - FIXME("arg_cnt = 0\n"); - return E_NOTIMPL; + if(retv) + num_set_inf(retv, FALSE); + return S_OK; } hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); @@ -240,7 +242,7 @@ static HRESULT Math_max(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d return hres; d = num_val(&v); - if(d > max) + if(d > max || isnan(d)) max = d; } @@ -260,11 +262,10 @@ static HRESULT Math_min(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d TRACE("\n"); - /* FIXME: Handle NaN */ - if(!arg_cnt(dp)) { - FIXME("arg_cnt = 0\n"); - return E_NOTIMPL; + if(retv) + num_set_inf(retv, TRUE); + return S_OK; } hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); @@ -278,7 +279,7 @@ static HRESULT Math_min(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d return hres; d = num_val(&v); - if(d < min) + if(d < min || isnan(d)) min = d; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 42dc080..c0e63ef 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -368,6 +368,12 @@ ok(tmp === 1, "Math.min(1) = " + tmp); tmp = Math.min(1, false); ok(tmp === 0, "Math.min(1, false) = " + tmp); +tmp = Math.min(); +ok(tmp === Infinity, "Math.min() = " + tmp); + +tmp = Math.min(1, NaN, -Infinity, false); +ok(isNaN(tmp), "Math.min(1, NaN, -Infinity, false) is not NaN"); + tmp = Math.min(1, false, true, null, -3); ok(tmp === -3, "Math.min(1, false, true, null, -3) = " + tmp); @@ -380,6 +386,12 @@ ok(tmp === 1, "Math.max(true, 0) = " + tmp); tmp = Math.max(-2, false, true, null, 1); ok(tmp === 1, "Math.max(-2, false, true, null, 1) = " + tmp); +tmp = Math.max(); +ok(tmp === -Infinity, "Math.max() = " + tmp); + +tmp = Math.max(true, NaN, 0); +ok(isNaN(tmp), "Math.max(true, NaN, 0) is not NaN"); + tmp = Math.round(0.5); ok(tmp === 1, "Math.round(0.5) = " + tmp);

1 0