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

Frédéric Delanoy : wineconsole: Fix French translation & UI display.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 89260f00bb825965a73d2e0d5194ca0d0f242548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89260f00bb825965a73d2e0d5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 6 12:31:00 2009 +0200 wineconsole: Fix French translation & UI display. --- programs/wineconsole/wineconsole_Fr.rc | 106 ++++++++++++++++--------------- 1 files changed, 55 insertions(+), 51 deletions(-) diff --git a/programs/wineconsole/wineconsole_Fr.rc b/programs/wineconsole/wineconsole_Fr.rc index 63796ec..330436b 100644 --- a/programs/wineconsole/wineconsole_Fr.rc +++ b/programs/wineconsole/wineconsole_Fr.rc @@ -1,6 +1,7 @@ /* * Copyright 2001 Eric Pouech * Copyright 2006 Jonathan Ernst + * Copyright 2009 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,67 +20,70 @@ #include "wineconsole_res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN -IDS_EDIT, "�&dition" -IDS_DEFAULT, "Par &d�faut" -IDS_PROPERTIES, "&Propri�t�s" +IDS_EDIT, "É&dition" +IDS_DEFAULT, "Par &défaut" +IDS_PROPERTIES, "&Propriétés" IDS_MARK, "&Marquer" IDS_COPY, "&Copier" IDS_PASTE, "C&oller" -IDS_SELECTALL, "&S�lectionner tout" -IDS_SCROLL, "&D�filer" +IDS_SELECTALL, "&Sélectionner tout" +IDS_SCROLL, "&Défiler" IDS_SEARCH, "C&hercher" -IDS_FNT_DISPLAY, "Chaque caract�re a %ld points en largeur et %ld points en hauteur" +IDS_FNT_DISPLAY, "Chaque caractère a %ld pixels de largeur et %ld pixels de hauteur" IDS_FNT_PREVIEW_1, "Ceci est un test" -IDS_FNT_PREVIEW_2, "��" -IDS_DLG_TIT_DEFAULT, "Configuration par d�faut" +IDS_FNT_PREVIEW_2, "éèàôë" +IDS_DLG_TIT_DEFAULT, "Configuration par défaut" IDS_DLG_TIT_CURRENT, "Configuration courante" IDS_DLG_TIT_ERROR, "Erreur de configuration" -IDS_DLG_ERR_SBWINSIZE, "La taille du tampon �cran doit �tre plus grande que celle de la fen�tre" +IDS_DLG_ERR_SBWINSIZE, "La taille du tampon écran doit être plus grande ou égale à celle du tampon de la fenêtre" -IDS_CMD_INVALID_EVENT_ID "wineconsole : Impossible d'analyser l'�v�nement\n" -IDS_CMD_INVALID_BACKEND "wineconsole : Moteur invalide\n" -IDS_CMD_INVALID_OPTION "wineconsole : Option de la ligne de commande non reconnue\n" -IDS_CMD_ABOUT "D�marre un programme dans une console Wine\n" -IDS_CMD_LAUNCH_FAILED "wineconsole : �chec lors du d�marrage du programme %s.\n"\ +IDS_CMD_INVALID_EVENT_ID "wineconsole : impossible de déchiffrer l'identifiant d'événement\n" +IDS_CMD_INVALID_BACKEND "wineconsole : moteur invalide\n" +IDS_CMD_INVALID_OPTION "wineconsole : option de ligne de commande non reconnue\n" +IDS_CMD_ABOUT "Démarre un programme dans une console Wine\n" +IDS_CMD_LAUNCH_FAILED "wineconsole : échec lors du démarrage du programme %s.\n"\ "La commande est invalide.\n" IDS_USAGE_HEADER "\nUsage :\n wineconsole [options] <commande>\n\nOptions :\n" -IDS_USAGE_BACKEND " --backend={user|curses} En choisissant � user � une nouvelle fen�tre sera cr��e, � curses �\n"\ - " essaiera de convertir le terminal courant en console Wine\n" -IDS_USAGE_COMMAND " <command> Le programme Wine � ex�cuter dans la console\n" -IDS_USAGE_FOOTER "\nExemple :\n wineconsole cmd\nD�marre l'interpr�teur de commandes de Wine dans une console Wine\n\n" +IDS_USAGE_BACKEND " --backend={user|curses} Utilisez « user » pour utiliser une nouvelle fenêtre\n"\ + " « curses » pour essayer de convertir le terminal courant en console Wine\n" +IDS_USAGE_COMMAND " <commande> Le programme Wine à exécuter dans la console\n" +IDS_USAGE_FOOTER "\nExemple : « wineconsole cmd » démarre l'interpréteur de commandes de Wine dans une console Wine\n\n" END -IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 214, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Options " FONT 8, "MS Shell Dlg" { - GROUPBOX "Taille du curseur", -1, 10, 11, 60, 44, BS_GROUPBOX - AUTORADIOBUTTON "&Petit", IDC_OPT_CURSOR_SMALL, 14, 23, 44, 10, WS_TABSTOP - AUTORADIOBUTTON "&Moyen", IDC_OPT_CURSOR_MEDIUM, 14, 33, 44, 10, WS_TABSTOP - AUTORADIOBUTTON "&Grand", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP - - GROUPBOX "Contr�le", -1, 75, 11, 125, 44, BS_GROUPBOX - LTEXT "Popup menu", -1, 79, 23, 50, 10 - AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP - AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP - LTEXT "�dition rapide", -1, 79, 43, 50, 10 - AUTOCHECKBOX "&activer", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP - - GROUPBOX "Historique des commandes", -1, 10, 57, 190, 35, BS_GROUPBOX - LTEXT "&Taille de la m�moire tampon :", -1, 14, 67, 78, 18 - EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + GROUPBOX "Taille du curseur", -1, 10, 11, 63, 49, BS_GROUPBOX + AUTORADIOBUTTON "&Petit", IDC_OPT_CURSOR_SMALL, 14, 25, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&Moyen", IDC_OPT_CURSOR_MEDIUM, 14, 35, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&Grand", IDC_OPT_CURSOR_LARGE, 14, 45, 44, 10, WS_TABSTOP + + GROUPBOX "Contrôle", -1, 75, 11, 129, 49, BS_GROUPBOX + LTEXT "Menu contextuel", -1, 83, 23, 53, 10 + AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 142, 23, 60, 10, WS_TABSTOP + AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 142, 33, 60, 10, WS_TABSTOP + LTEXT "Édition rapide", -1, 83, 48, 53, 10 + AUTOCHECKBOX "&activer", IDC_OPT_QUICK_EDIT, 142, 48, 60, 10, WS_TABSTOP + + GROUPBOX "Historique des commandes", -1, 10, 62, 194, 35, BS_GROUPBOX + LTEXT "&Nombre de commandes mémorisées :", -1, 14, 72, 78, 18 + EDITTEXT IDC_OPT_HIST_SIZE, 94, 74, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - AUTOCHECKBOX "&Supprimer les doublons", IDC_OPT_HIST_NODOUBLE, 130, 67, 60, 18, WS_TABSTOP|BS_MULTILINE + AUTOCHECKBOX "&Supprimer les doublons", IDC_OPT_HIST_NODOUBLE, 142, 72, 60, 18, WS_TABSTOP|BS_MULTILINE } -IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 205, 106 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Police " FONT 8, "MS Shell Dlg" @@ -90,17 +94,17 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 LTEXT "&Taille", -1, 158, 5, 40, 8 - LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL + LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 43, WS_VSCROLL CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 - LTEXT "", IDC_FNT_FONT_INFO, 128, 76, 80, 18 + LTEXT "", IDC_FNT_FONT_INFO, 120, 69, 78, 28 } -IDD_CONFIG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +IDD_CONFIG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 205, 107 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Configuration " FONT 8, "MS Shell Dlg" { - GROUPBOX "Taille m�moire tampon �cran", -1, 10, 11, 100, 42, BS_GROUPBOX + GROUPBOX "Taille mémoire tampon écran", -1, 10, 11, 100, 42, BS_GROUPBOX LTEXT "&Largeur :", -1, 14, 25, 54, 9 EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 @@ -108,7 +112,7 @@ FONT 8, "MS Shell Dlg" EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - GROUPBOX "Taille de la fen�tre", -1, 10, 55, 100, 42 + GROUPBOX "Taille de la fenêtre", -1, 10, 55, 100, 42 LTEXT "La&rgeur :", -1, 14, 69, 54, 9 EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 @@ -117,21 +121,21 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 GROUPBOX "Fin du programme", -1, 115, 11, 80, 42, BS_GROUPBOX - AUTOCHECKBOX "&Fermer la console", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP + AUTOCHECKBOX "&Fermer la console", IDC_CNF_CLOSE_EXIT, 119, 25, 70, 20, WS_TABSTOP - GROUPBOX "�dition", -1, 115, 55, 80, 42 - COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + GROUPBOX "Édition", -1, 115, 55, 80, 42 + COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 73, 13, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP } -IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 200, 60 +IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 206, 60 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "Param�tres de la console" +CAPTION "Paramètres de la console" FONT 8, "MS Shell Dlg" { - GROUPBOX "", -1, 10, 10, 180, 31, BS_GROUPBOX - AUTORADIOBUTTON "Sauver les param�tres pour les prochaines sessions", IDC_SAV_SAVE, 14, 15, 170, 10, WS_TABSTOP - AUTORADIOBUTTON "Appliquer uniquement � la session courante", IDC_SAV_SESSION, 14, 27, 170, 10, WS_TABSTOP + GROUPBOX "", -1, 10, 10, 185, 31, BS_GROUPBOX + AUTORADIOBUTTON "Sauver les paramètres pour les prochaines sessions", IDC_SAV_SAVE, 14, 15, 180, 10, WS_TABSTOP + AUTORADIOBUTTON "Appliquer uniquement à la session courante", IDC_SAV_SESSION, 14, 27, 180, 10, WS_TABSTOP - PUSHBUTTON "OK", IDOK, 50, 45, 35, 12 - PUSHBUTTON "Annuler", IDCANCEL, 115, 45, 35, 12 + PUSHBUTTON "OK", IDOK, 55, 45, 35, 12 + PUSHBUTTON "Annuler", IDCANCEL, 120, 45, 35, 12 }

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 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: 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 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 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_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: 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

Alexander Scott-Johns : notepad: Refactor DoOpenFile to simplify next patch .
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 93b99e0af36fd6290822a13d2e36c88cb8826956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b99e0af36fd6290822a13d2… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jul 3 00:34:45 2009 +0100 notepad: Refactor DoOpenFile to simplify next patch. --- programs/notepad/dialog.c | 70 ++++++++++++++++----------------------------- 1 files changed, 25 insertions(+), 45 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index c1dbb6d..eae0d30 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -337,24 +337,6 @@ static inline ENCODING detect_encoding_of_buffer(const void* buffer, int size) } } -/* Similar to SetWindowTextA, but uses a CP_UTF8 encoded input, not CP_ACP. - * lpTextInUtf8 should be NUL-terminated and not include the BOM. - * - * Returns FALSE on failure, TRUE on success, like SetWindowTextA/W. - */ -static BOOL SetWindowTextUtf8(HWND hwnd, LPCSTR lpTextInUtf8) -{ - BOOL ret; - int lenW = MultiByteToWideChar(CP_UTF8, 0, lpTextInUtf8, -1, NULL, 0); - LPWSTR textW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); - if (!textW) - return FALSE; - MultiByteToWideChar(CP_UTF8, 0, lpTextInUtf8, -1, textW, lenW); - ret = SetWindowTextW(hwnd, textW); - HeapFree(GetProcessHeap(), 0, textW); - return ret; -} - void DoOpenFile(LPCWSTR szFileName, ENCODING enc) { static const WCHAR dotlog[] = { '.','L','O','G',0 }; @@ -362,7 +344,8 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) LPSTR pTemp; DWORD size; DWORD dwNumRead; - BOOL succeeded; + int lenW; + WCHAR* textW; WCHAR log[5]; /* Close any files and prompt to save changes */ @@ -405,8 +388,6 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) CloseHandle(hFile); size = dwNumRead; - pTemp[size] = 0; /* make sure it's (char)'\0'-terminated */ - pTemp[size+1] = 0; /* make sure it's (WCHAR)'\0'-terminated */ if (enc == ENCODING_AUTO) enc = detect_encoding_of_buffer(pTemp, size); @@ -421,9 +402,6 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) enc = ENCODING_UTF16BE; } - /* SetWindowTextUtf8 and SetWindowTextA try to allocate memory, so we - * check if they succeed. - */ switch (enc) { case ENCODING_UTF16BE: @@ -434,33 +412,35 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) /* fall through */ case ENCODING_UTF16LE: - if (size >= 2 && (BYTE)pTemp[0] == 0xff && (BYTE)pTemp[1] == 0xfe) - succeeded = SetWindowTextW(Globals.hEdit, (LPWSTR)pTemp + 1); - else - succeeded = SetWindowTextW(Globals.hEdit, (LPWSTR)pTemp); - break; - - case ENCODING_UTF8: - if (size >= 3 && (BYTE)pTemp[0] == 0xef && (BYTE)pTemp[1] == 0xbb && - (BYTE)pTemp[2] == 0xbf) - succeeded = SetWindowTextUtf8(Globals.hEdit, pTemp+3); - else - succeeded = SetWindowTextUtf8(Globals.hEdit, pTemp); + textW = (LPWSTR)pTemp; + lenW = size/sizeof(WCHAR); break; default: - succeeded = SetWindowTextA(Globals.hEdit, pTemp); - break; + { + int cp = (enc==ENCODING_UTF8) ? CP_UTF8 : CP_ACP; + lenW = MultiByteToWideChar(cp, 0, pTemp, size, NULL, 0); + textW = HeapAlloc(GetProcessHeap(), 0, (lenW+1) * sizeof(WCHAR)); + if (!textW) + { + ShowLastError(); + HeapFree(GetProcessHeap(), 0, pTemp); + return; + } + MultiByteToWideChar(cp, 0, pTemp, size, textW, lenW); + HeapFree(GetProcessHeap(), 0, pTemp); + break; + } } - if (!succeeded) - { - ShowLastError(); - HeapFree(GetProcessHeap(), 0, pTemp); - return; - } + textW[lenW] = '\0'; - HeapFree(GetProcessHeap(), 0, pTemp); + if (lenW >= 1 && textW[0] == 0xfeff) + SetWindowTextW(Globals.hEdit, textW+1); + else + SetWindowTextW(Globals.hEdit, textW); + + HeapFree(GetProcessHeap(), 0, textW); SendMessageW(Globals.hEdit, EM_SETMODIFY, FALSE, 0); SendMessageW(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0);

1 0

Alexander Scott-Johns : notepad: When opening a file, replace \0 characters with spaces, instead of truncating the file at the first \0.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 32c066f12abbf3864ec75b5cb6e9fb08c288c50b URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c066f12abbf3864ec75b5cb… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jul 3 01:04:00 2009 +0100 notepad: When opening a file, replace \0 characters with spaces, instead of truncating the file at the first \0. --- programs/notepad/dialog.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index eae0d30..5594069 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -346,6 +346,7 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) DWORD dwNumRead; int lenW; WCHAR* textW; + int i; WCHAR log[5]; /* Close any files and prompt to save changes */ @@ -433,6 +434,12 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) } } + /* Replace '\0's with spaces. Other than creating a custom control that + * can deal with '\0' characters, it's the best that can be done. + */ + for (i = 0; i < lenW; i++) + if (textW[i] == '\0') + textW[i] = ' '; textW[lenW] = '\0'; if (lenW >= 1 && textW[0] == 0xfeff)

1 0