July 2009 - Wine-Commits - list.winehq.org

Frédéric Delanoy : taskmgr: Fix typo in French translation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 4a5182e35ddd378c7d8d912cf99c14f17a3a8f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5182e35ddd378c7d8d912cf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 16:53:31 2009 +0200 taskmgr: Fix typo in French translation. --- programs/taskmgr/Fr.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/Fr.rc b/programs/taskmgr/Fr.rc index 1477003..0c1e2d2 100644 --- a/programs/taskmgr/Fr.rc +++ b/programs/taskmgr/Fr.rc @@ -170,7 +170,7 @@ BEGIN END MENUITEM "Définir l'&affinité...", ID_PROCESS_PAGE_SETAFFINITY - MENUITEM "Modifier les &canaux de déboguage...", ID_PROCESS_PAGE_DEBUGCHANNELS + MENUITEM "Modifier les &canaux de débogage...", ID_PROCESS_PAGE_DEBUGCHANNELS END END @@ -273,7 +273,7 @@ END IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Canaux de déboguage" +CAPTION "Canaux de débogage" FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | @@ -491,7 +491,7 @@ BEGIN "Place le processus dans la classe de priorité INFÉRIEURE À LA NORMALE" ID_PROCESS_PAGE_SETPRIORITY_LOW "Place le processus dans la classe de priorité BASSE" ID_PROCESS_PAGE_DEBUGCHANNELS - "Contrôle les canaux de déboguage" + "Contrôle les canaux de débogage" END STRINGTABLE DISCARDABLE @@ -571,7 +571,7 @@ BEGIN IDS_APPLICATION_RUNNING "En cours d'exécution" IDS_APPLICATION_TASK "Tâche" IDS_APPLICATION_STATUS "Statut" - IDS_DEBUG_CHANNEL "Canaux de déboguage" + IDS_DEBUG_CHANNEL "Canaux de débogage" IDS_DEBUG_CHANNEL_FIXME "Fixme" IDS_DEBUG_CHANNEL_ERR "Err" IDS_DEBUG_CHANNEL_WARN "Warn"

1 0

Alexandre Julliard : transl: Add a colored background to the main table.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: tools Branch: master Commit: 98c2b1fc8e86edbe427c3d59c54ad7dfac0ee1b0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=98c2b1fc8e86edbe427c3d59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 13:25:19 2009 +0200 transl: Add a colored background to the main table. --- transl/php/style.css | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/transl/php/style.css b/transl/php/style.css index ee17ee3..e600cc7 100644 --- a/transl/php/style.css +++ b/transl/php/style.css @@ -59,6 +59,14 @@ th { border-bottom-color: #601919; } +table.index th { + background-color: #f0d2d2; +} + +table.index td { + background-color: #fff4f4; +} + /* used to mark resource parts that are not literaly in the string, like \0, \n etc*/ .resmeta {

1 0

Paul Vriens : transl: Incorporate neutral language in sublang statistics if appropriate.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: tools Branch: master Commit: 0e31bad14df1a8cf35d27ccf9e7bbbe2cdf04212 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0e31bad14df1a8cf35d27ccf… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Fri Jul 10 12:51:38 2009 +0200 transl: Incorporate neutral language in sublang statistics if appropriate. --- transl/scripts/ver.pl | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --git a/transl/scripts/ver.pl b/transl/scripts/ver.pl index 9b7f289..9d76d2f 100755 --- a/transl/scripts/ver.pl +++ b/transl/scripts/ver.pl @@ -87,6 +87,11 @@ $norm_fn =~ s/[^a-zA-Z0-9]/-/g; #$deflangs{"009:00"} = TRUE; $deflangs{"009:01"} = TRUE; +# Get just the sublangs +opendir(DIR, "$scriptsdir/conf"); +(a)languages = grep(!/(^\.|.:00)/, readdir(DIR)); +closedir(DIR); + while (<STDIN>) { if (m/^TYPE NEXT/) @@ -115,7 +120,38 @@ while (<STDIN>) if (m/^EXIST ([0-9a-f]{3}:[0-9a-f]{2})/) { $lang = collapse($1); - if (not defined $deflangs{$lang}) + + # Don't add neutral langs (nn:00) to the file_langs array + # if we have sublangs (nn:xx) in the conf directory, add + # it's sublangs instead (if present). + # + # English:Neutral (009:00) is an exception to this rule. + # + if (($lang =~ /^[0-9a-f]{3}:00/) && ($lang ne "009:00")) + { + # Find the sublangs + $primary_lang = $lang; + $primary_lang =~ s/:00//; + $found = 0; + foreach $language (@languages) + { + if ($language =~ /$primary_lang:./) + { + if (not defined $deflangs{$language}) + { + $deflangs{$language} = TRUE; + push @file_langs, $language; + } + $found = 1; + } + } + if ((!$found) && (not defined $deflangs{$lang})) + { + $deflangs{$lang} = TRUE; + push @file_langs, $lang; + } + } + elsif (not defined $deflangs{$lang}) { $deflangs{$lang} = TRUE; push @file_langs, $lang;

1 0

Jeremy Newman : adding a link to the CodeWeavers Internships page, other misc cleanup
by Jeremy Newman July 9, 2009

July 9, 2009

Module: website Branch: master Commit: 32f681b5d8960a8d7ac954b05b3a27194af008e8 URL: http://source.winehq.org/git/website.git/?a=commit;h=32f681b5d8960a8d7ac954… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jul 9 15:29:28 2009 -0500 adding a link to the CodeWeavers Internships page, other misc cleanup --- templates/en/devel.template | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/templates/en/devel.template b/templates/en/devel.template index ddb54a8..dd1e4ca 100644 --- a/templates/en/devel.template +++ b/templates/en/devel.template @@ -13,25 +13,33 @@ various resources available for our developers.</p> <td bgcolor="black"><b style="color: #FFFFFF">About this Option</b></td> </tr> - <tr bgcolor="#ffffff"> <td> <a href="http://wiki.winehq.org/Developers">Wine Wiki Developer Documentation</a> </td> <td valign="top"> - The Wine Wiki Developer pages usually have more current information than this page. - A great volunteer job - still available! - would be trimming this page and mostly pointing - it to the Wiki pages. + The <a href="http://wiki.winehq.org//Developers">Wine Wiki Developer</a> pages will have more current + information than this page. It should be the first place for new developers to look. </td> </tr> + <tr bgcolor="#ffffff"> + <td> + <a href="http://www.codeweavers.com/about/general/jobs/interns/">Internships</a> + </td> + <td valign="top"> + Beginning in Fall 2009, CodeWeavers will be filling 1-2 Wine Development Internship slots every quarter for + qualified undergraduate and graduate-level students. We are accepting applications for these positions on + an ongoing basis. Students from both the United States and overseas are equally welcome. + </td> + </tr> <tr bgcolor="#ffffff"> <td> <a href="{$root}/contributing">Contributing to Wine</a> </td> <td valign="top"> - Information for 1st time contributers. + Information for 1st time contributors. </td> </tr>

1 0

Alexandre Julliard : transl: Fix character limits for string dumping.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: tools Branch: master Commit: 576c6feaebd32470a94ca855fb8f6d55a87495c7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=576c6feaebd32470a94ca855… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 20:39:04 2009 +0200 transl: Fix character limits for string dumping. --- transl/php/lib_res.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index 3a16776..5a980f8 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -117,8 +117,9 @@ function dump_unicode($unistr, $quoted = TRUE) echo """; for ($i = 0; $i < count($unistr); $i++) { - if (($unistr[$i] >= ord('a') && $unistr[$i] < ord('z')) - || ($unistr[$i] >= ord('A') && $unistr[$i] < ord('Z')) + if (($unistr[$i] >= ord('a') && $unistr[$i] <= ord('z')) + || ($unistr[$i] >= ord('A') && $unistr[$i] <= ord('Z')) + || ($unistr[$i] >= ord('0') && $unistr[$i] <= ord('9')) || $unistr[$i] == ord(' ')) echo chr($unistr[$i]); else if ($unistr[$i] == 10) {

1 0

Paul Vriens : transl: Support for MESSAGETABLE.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: tools Branch: master Commit: 933e6256451f83f257002a6511d4a87b7b83dda7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=933e6256451f83f257002a65… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Thu Jul 9 17:18:16 2009 +0200 transl: Support for MESSAGETABLE. --- transl/php/lib.php | 2 +- transl/php/lib_res.php | 74 +++++++++++++++++++++++++++++++++++++++++++++++ transl/php/resource.php | 3 ++ 3 files changed, 78 insertions(+), 1 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index a7e7a90..adde182 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -153,7 +153,7 @@ function get_resource_name($type, $name) function is_dumpable_type($type) { - return ($type == 4) || ($type == 5) || ($type == 6) || ($type == 261 /* wrc for DIALOGEX */); + return ($type == 4) || ($type == 5) || ($type == 6) || ($type == 11) || ($type == 261 /* wrc for DIALOGEX */); } function update_lang_from_resfile($lang, $resfile) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index ff877b0..3a16776 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -439,6 +439,80 @@ class StringTable extends Resource } } +class MessageTable extends Resource +{ + var $strings; + var $table_id; + var $message_count; + + function MessageTable($header, $data, $table_id) + { + $this->Resource($header); + $this->strings = array(); + $this->table_id = $table_id; + $this->message_count = 0; + + // First skip some header information (basically ignore) + $dummy = get_dword($data); + $dummy = get_dword($data); + $dummy = get_dword($data); + // Where can we find the first message string + $offset = get_dword($data); + // This block shows where there are gaps between message id's (with offsets to the next one) + for ($i = 0; $i < ($offset - 16) / 4; $i++) + $dummy = get_dword($data); + + for ($i = 0; strlen($data) > 0; $i++) + { + $counter = 0; + $str = array(); + + // Were can we find the next message string + $offset = get_word($data); + $counter += 2; + + // Ansi = 0; Unicode = 1 ? + $unicode = get_word($data); + $counter += 2; + + while ($char = get_word($data)) + { + $counter += 2; + $str[] = $char; + } + $counter += 2; + $this->strings[] = $str; + $this->message_count++; + for ($j = 0; $j < ($offset - $counter) / 2; $j++) + $dummy = get_word($data); + } + } + + function getString($id) + { + return $this->strings[$id]; + } + + function dump_string($lparam) + { + dump_unicode_or_empty($this->strings[$lparam]); + } + + function is_string_different(&$other, $lparam) + { + $uni_str = $this->strings[$lparam]; + $other_uni_str = $other->strings[$lparam]; + return ((!$other_uni_str && $uni_str) || ($other_uni_str && !$uni_str)); + } + + function dump($master_res = NULL) + { + for ($i=0; $i<$this->message_count; $i++) + dump_resource_row(($this->table_id-1)*16+$i, $this, $master_res, + "dump_string", "is_string_different", $i); + } +} + class MenuResource extends Resource { var $items; diff --git a/transl/php/resource.php b/transl/php/resource.php index 1b9b404..877c363 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -43,6 +43,9 @@ function load_resource(&$resources, $type, $id, $langid, &$res) case 6: /* RT_STRING*/ $res = new StringTable($resdata[0], $resdata[1], $id); return TRUE; + case 11: /* RT_MESSAGETABLE */ + $res = new MessageTable($resdata[0], $resdata[1], $id); + return TRUE; default: die("Unhandled resource type $type"); }

1 0

Aric Stewart : msctf: Correct return value from GetValue.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 34751fbdf26d9a237b6a2746282286268edf94ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=34751fbdf26d9a237b6a27462… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jul 9 08:16:14 2009 -0500 msctf: Correct return value from GetValue. --- dlls/msctf/compartmentmgr.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 3afcfda..06a691d 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -530,17 +530,15 @@ static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface, static HRESULT WINAPI Compartment_GetValue(ITfCompartment *iface, VARIANT *pvarValue) { - HRESULT hr = S_OK; Compartment *This = (Compartment *)iface; TRACE("(%p) %p\n",This, pvarValue); if (!pvarValue) return E_INVALIDARG; - pvarValue->n1.n2.vt = VT_EMPTY; - if (!This->variant.n1.n2.vt == VT_EMPTY) - hr = VariantCopy(pvarValue,&This->variant); - return hr; + VariantInit(pvarValue); + if (V_VT(&This->variant) == VT_EMPTY) return S_FALSE; + return VariantCopy(pvarValue,&This->variant); } static const ITfCompartmentVtbl ITfCompartment_Vtbl ={

1 0

Alexandre Julliard : mswsock: Convert the language-neutral resource file to UTF-8.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 82f1cdc23731020b8f3e7077df20726c60788138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f1cdc23731020b8f3e7077d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 15:47:43 2009 +0200 mswsock: Convert the language-neutral resource file to UTF-8. --- dlls/mswsock/version.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mswsock/version.rc b/dlls/mswsock/version.rc index 09dfc5d..1408b99 100644 --- a/dlls/mswsock/version.rc +++ b/dlls/mswsock/version.rc @@ -1,6 +1,6 @@ /* * Copyright 2003 Francois Gouget (for CodeWeavers) - * Copyright 2003 Andr� Johansen + * Copyright 2003 André Johansen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Piotr Caban : jscript: Added Function_valueOf implementation.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 3f18e9841349c47c63cc86369bc0e40ee2861559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f18e9841349c47c63cc86369… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 7 23:19:54 2009 +0200 jscript: Added Function_valueOf implementation. --- dlls/jscript/function.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index d780aee..c2ea230 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -302,8 +302,16 @@ static HRESULT Function_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags static HRESULT Function_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + WARN("should be inherited from Object\n"); + + if(retv) { + IDispatchEx_AddRef(_IDispatchEx_(dispex)); + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(dispex); + } + + return S_OK; } static HRESULT Function_apply(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

1 0

Piotr Caban : jscript: Changed to_primitive implementation.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: b9be3bd7661495d41fc1b8ce2a327802fc5ff447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9be3bd7661495d41fc1b8ce2… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 8 10:52:56 2009 +0200 jscript: Changed to_primitive implementation. --- dlls/jscript/date.c | 2 +- dlls/jscript/dispex.c | 2 +- dlls/jscript/engine.c | 12 ++++---- dlls/jscript/jscript.h | 9 +++++- dlls/jscript/jsutils.c | 63 ++++++++++++++++++++++++++++++++++++++++--- dlls/jscript/tests/api.js | 2 + dlls/jscript/tests/lang.js | 12 ++++++++ 7 files changed, 88 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 3a681b9..642c9ec 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2634,7 +2634,7 @@ static HRESULT DateConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPP case 1: { VARIANT prim, num; - hres = to_primitive(dispex->ctx, get_arg(dp,0), ei, &prim); + hres = to_primitive(dispex->ctx, get_arg(dp,0), ei, &prim, NO_HINT); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index a387ecd..01f4d49 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -828,7 +828,7 @@ HRESULT jsdisp_call_value(DispatchEx *disp, LCID lcid, WORD flags, DISPPARAMS *d return disp->builtin_info->value_prop.invoke(disp, lcid, flags, dp, retv, ei, caller); } -static HRESULT jsdisp_call(DispatchEx *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, +HRESULT jsdisp_call(DispatchEx *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { dispex_prop_t *prop; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 05c6225..00eb087 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1931,11 +1931,11 @@ static HRESULT add_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_ VARIANT r, l; HRESULT hres; - hres = to_primitive(ctx->parser->script, lval, ei, &l); + hres = to_primitive(ctx->parser->script, lval, ei, &l, NO_HINT); if(FAILED(hres)) return hres; - hres = to_primitive(ctx->parser->script, rval, ei, &r); + hres = to_primitive(ctx->parser->script, rval, ei, &r, NO_HINT); if(FAILED(hres)) { VariantClear(&l); return hres; @@ -2518,7 +2518,7 @@ static HRESULT equal_values(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexc VARIANT v; HRESULT hres; - hres = to_primitive(ctx->parser->script, rval, ei, &v); + hres = to_primitive(ctx->parser->script, rval, ei, &v, NO_HINT); if(FAILED(hres)) return hres; @@ -2533,7 +2533,7 @@ static HRESULT equal_values(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexc VARIANT v; HRESULT hres; - hres = to_primitive(ctx->parser->script, lval, ei, &v); + hres = to_primitive(ctx->parser->script, lval, ei, &v, NO_HINT); if(FAILED(hres)) return hres; @@ -2638,11 +2638,11 @@ static HRESULT less_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, BOOL gre VARIANT l, r, ln, rn; HRESULT hres; - hres = to_primitive(ctx->parser->script, lval, ei, &l); + hres = to_primitive(ctx->parser->script, lval, ei, &l, NO_HINT); if(FAILED(hres)) return hres; - hres = to_primitive(ctx->parser->script, rval, ei, &r); + hres = to_primitive(ctx->parser->script, rval, ei, &r, NO_HINT); if(FAILED(hres)) { VariantClear(&l); return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 7a4158c..8d7d61f 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -123,6 +123,7 @@ DispatchEx *iface_to_jsdisp(IUnknown*); HRESULT disp_call(IDispatch*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_call_value(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT jsdisp_call(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT disp_propget(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT disp_propput(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propget(DispatchEx*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); @@ -145,7 +146,13 @@ HRESULT create_string(script_ctx_t*,const WCHAR*,DWORD,DispatchEx**); HRESULT create_bool(script_ctx_t*,VARIANT_BOOL,DispatchEx**); HRESULT create_number(script_ctx_t*,VARIANT*,DispatchEx**); -HRESULT to_primitive(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*); +typedef enum { + NO_HINT, + HINT_STRING, + HINT_NUMBER +} hint_t; + +HRESULT to_primitive(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*, hint_t); HRESULT to_boolean(VARIANT*,VARIANT_BOOL*); HRESULT to_number(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*); HRESULT to_integer(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*); diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index eab850b..4a885a5 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -175,7 +175,7 @@ jsheap_t *jsheap_mark(jsheap_t *heap) } /* ECMA-262 3rd Edition 9.1 */ -HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) +HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret, hint_t hint) { switch(V_VT(v)) { case VT_EMPTY: @@ -189,8 +189,61 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret V_VT(ret) = VT_BSTR; V_BSTR(ret) = SysAllocString(V_BSTR(v)); break; - case VT_DISPATCH: - return disp_propget(V_DISPATCH(v), DISPID_VALUE, ctx->lcid, ret, ei, NULL /*FIXME*/); + case VT_DISPATCH: { + DispatchEx *jsdisp; + DISPID id; + DISPPARAMS dp = {NULL, NULL, 0, 0}; + HRESULT hres; + + static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; + static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; + + jsdisp = iface_to_jsdisp((IUnknown*)V_DISPATCH(v)); + if(!jsdisp) + return disp_propget(V_DISPATCH(v), DISPID_VALUE, ctx->lcid, ret, ei, NULL /*FIXME*/); + + if(hint == NO_HINT) + hint = is_class(jsdisp, JSCLASS_DATE) ? HINT_STRING : HINT_NUMBER; + + /* Native implementation doesn't throw TypeErrors, returns strange values */ + + hres = jsdisp_get_id(jsdisp, hint == HINT_STRING ? toStringW : valueOfW, 0, &id); + if(SUCCEEDED(hres)) { + hres = jsdisp_call(jsdisp, id, ctx->lcid, DISPATCH_METHOD, &dp, ret, ei, NULL /*FIXME*/); + if(FAILED(hres)) { + FIXME("throw TypeError\n"); + jsdisp_release(jsdisp); + return hres; + } + else if(V_VT(ret) != VT_DISPATCH) { + jsdisp_release(jsdisp); + return S_OK; + } + else + IDispatch_Release(V_DISPATCH(ret)); + } + + hres = jsdisp_get_id(jsdisp, hint == HINT_STRING ? valueOfW : toStringW, 0, &id); + if(SUCCEEDED(hres)) { + hres = jsdisp_call(jsdisp, id, ctx->lcid, DISPATCH_METHOD, &dp, ret, ei, NULL /*FIXME*/); + if(FAILED(hres)) { + FIXME("throw TypeError\n"); + jsdisp_release(jsdisp); + return hres; + } + else if(V_VT(ret) != VT_DISPATCH) { + jsdisp_release(jsdisp); + return S_OK; + } + else + IDispatch_Release(V_DISPATCH(ret)); + } + + jsdisp_release(jsdisp); + + FIXME("throw TypeError\n"); + return E_FAIL; + } default: FIXME("Unimplemented for vt %d\n", V_VT(v)); return E_NOTIMPL; @@ -356,7 +409,7 @@ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) VARIANT prim; HRESULT hres; - hres = to_primitive(ctx, v, ei, &prim); + hres = to_primitive(ctx, v, ei, &prim, HINT_NUMBER); if(FAILED(hres)) return hres; @@ -489,7 +542,7 @@ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) VARIANT prim; HRESULT hres; - hres = to_primitive(ctx, v, ei, &prim); + hres = to_primitive(ctx, v, ei, &prim, HINT_STRING); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7075aec..79b255b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1026,6 +1026,8 @@ date.setUTCMonth(22, 37); ok(date.getTime() === 60987050010, "date.getTime() = " + date.getTime()); date.setUTCFullYear(83, 21, 321); ok(date.getTime() === -59464984149990, "date.getTime() = " + date.getTime()); +ok(Math.abs(date) === 59464984149990, "Math.abs(date) = " + Math.abs(date)); +ok(getVT(date+1) === "VT_BSTR", "getVT(date+1) = " + getVT(date+1)); ok(isNaN(Date.parse()), "Date.parse() is not NaN"); ok(isNaN(Date.parse("")), "Date.parse(\"\") is not NaN"); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index cf04f9e..fcd6ec3 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -882,4 +882,16 @@ function testEmbededFunctions() { testEmbededFunctions(); +date = new Date(); +date.toString = function() { return "toString"; } +ok(""+date === "toString", "''+date = " + date); +date.toString = function() { return this; } +ok(""+date === ""+date.valueOf(), "''+date = " + date); + +str = new String("test"); +str.valueOf = function() { return "valueOf"; } +ok(""+str === "valueOf", "''+str = " + str); +str.valueOf = function() { return new Date(); } +ok(""+str === "test", "''+str = " + str); + reportSuccess();

1 0