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

Huw Davies : shdoclc: Add English neutral translations and fix US English.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 0c61a5ac116b456e86e810614a1825e8138712ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c61a5ac116b456e86e810614… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 7 12:30:01 2009 +0100 shdoclc: Add English neutral translations and fix US English. --- dlls/shdoclc/En.rc | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 219 insertions(+), 1 deletions(-) diff --git a/dlls/shdoclc/En.rc b/dlls/shdoclc/En.rc index b3823c2..4cb0a11 100644 --- a/dlls/shdoclc/En.rc +++ b/dlls/shdoclc/En.rc @@ -47,7 +47,7 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "&Paste", IDM_PASTE MENUITEM SEPARATOR MENUITEM "Create Shor&tcut", IDM_CREATESHORTCUT - MENUITEM "Add to &Favourites", IDM_ADDFAVORITES + MENUITEM "Add to &Favorites", IDM_ADDFAVORITES MENUITEM "&View Source", IDM_VIEWSOURCE MENUITEM SEPARATOR MENUITEM "&Encoding", IDM_LANGUAGE @@ -246,3 +246,221 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Scroll Right", IDM_SCROLL_RIGHT } } + +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL + +IDR_BROWSE_CONTEXT_MENU MENU +{ + POPUP "Default" + { + MENUITEM "&Back", IDM_GOBACKWARD + MENUITEM "F&orward", IDM_GOFORWARD + MENUITEM SEPARATOR + MENUITEM "&Save Background As...", IDM_SAVEBACKGROUND + MENUITEM "Set As Back&ground", IDM_SETWALLPAPER + MENUITEM "&Copy Background", IDM_COPYBACKGROUND + MENUITEM "Set as &Desktop Item", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "Select &All", IDM_SELECTALL + MENUITEM "&Paste", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Create Shor&tcut", IDM_CREATESHORTCUT + MENUITEM "Add to &Favourites", IDM_ADDFAVORITES + MENUITEM "&View Source", IDM_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&Encoding", IDM_LANGUAGE + MENUITEM SEPARATOR + MENUITEM "Pr&int", IDM_PRINT + MENUITEM "&Refresh", _IDM_REFRESH + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&Properties", IDM_PROPERTIES + } + + POPUP "Image" + { + MENUITEM "&Open Link", IDM_FOLLOWLINKC + MENUITEM "Open Link in &New Window", IDM_FOLLOWLINKN + MENUITEM "Save Target &As...", IDM_SAVETARGET + MENUITEM "&Print Target", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "S&how Picture", IDM_SHOWPICTURE + MENUITEM "&Save Picture As...", IDM_SAVEPICTURE + MENUITEM "&E-mail Picture...", IDM_MP_EMAILPICTURE + MENUITEM "Pr&int Picture...", IDM_MP_PRINTPICTURE + MENUITEM "&Go to My Pictures", IDM_MP_MYPICS + MENUITEM "Set as Back&ground", IDM_SETWALLPAPER + MENUITEM "Set as &Desktop Item...", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "Cu&t", IDM_CUT + MENUITEM "&Copy", IDM_COPY + MENUITEM "Copy Shor&tcut", IDM_COPYSHORTCUT + MENUITEM "&Paste", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Add to &Favourites...", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "P&roperties", IDM_PROPERTIES + } + + POPUP "Control" + { + MENUITEM "&Undo", IDM_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t", IDM_CUT + MENUITEM "&Copy", IDM_COPY + MENUITEM "&Paste", IDM_PASTE + MENUITEM "&Delete", IDM_DELETE + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Select &All", IDM_SELECTALL + } + + POPUP "Table" + { + POPUP "&Select" + { + MENUITEM "&Cell", IDM_CELLSELECT + MENUITEM "&Row", IDM_ROWSELECT + MENUITEM "&Column", IDM_COLUMNSELECT + MENUITEM "&Table", IDM_TABLESELECT + } + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&Cell Properties", IDM_CELLPROPERTIES + MENUITEM "&Table Properties", IDM_TABLEPROPERTIES + } + + POPUP "1DSite Select" + { + MENUITEM "Cu&t", IDM_CUT + MENUITEM "&Copy", IDM_COPY + MENUITEM "Paste", IDM_PASTE + MENUITEM "Select &All", IDM_SELECTALL + MENUITEM "&Print", IDM_PRINT + MENUITEM SEPARATOR + } + + POPUP "Anchor" + { + MENUITEM "&Open", IDM_FOLLOWLINKC + MENUITEM "Open in &New Window", IDM_FOLLOWLINKN + MENUITEM "Save Target &As...", IDM_SAVETARGET + MENUITEM "&Print Target", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "Cut", IDM_CUT + MENUITEM "&Copy", IDM_COPY + MENUITEM "Copy Shor&tcut", IDM_COPYSHORTCUT + MENUITEM "&Paste", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Add to &Favourites...",IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "P&roperties", IDM_PROPERTIES + } + + POPUP "Context Unknown" + { + MENUITEM SEPARATOR + } + + POPUP "DYNSRC Image" + { + MENUITEM "&Open Link", IDM_FOLLOWLINKC + MENUITEM "Open Link in &New Window", IDM_FOLLOWLINKN + MENUITEM "Save Target &As...", IDM_SAVETARGET + MENUITEM "&Print Target", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "S&how Picture", IDM_SHOWPICTURE + MENUITEM "&Save Video As...", IDM_SAVEPICTURE + MENUITEM "Set as Back&ground", IDM_SETWALLPAPER + MENUITEM "Set as &Desktop Item...", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "Cu&t", IDM_CUT + MENUITEM "&Copy", IDM_COPY + MENUITEM "Copy Shor&tcut", IDM_COPYSHORTCUT + MENUITEM "&Paste", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Add to &Favourites...", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Play", IDM_DYNSRCPLAY + MENUITEM "Stop", IDM_DYNSRCSTOP + MENUITEM "P&roperties", IDM_PROPERTIES + } + + POPUP "ART Image" + { + MENUITEM "&Open Link", IDM_FOLLOWLINKC + MENUITEM "Open Link in &New Window", IDM_FOLLOWLINKN + MENUITEM "Save Target &As...", IDM_SAVETARGET + MENUITEM "&Print Target", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "S&how Picture", IDM_SHOWPICTURE + MENUITEM "&Save Picture As...", IDM_SAVEPICTURE + MENUITEM "Set as Back&ground", IDM_SETWALLPAPER + MENUITEM "Set as &Desktop Item...", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "Cu&t", IDM_CUT + MENUITEM "&Copy", IDM_COPY + MENUITEM "Copy Shor&tcut", IDM_COPYSHORTCUT + MENUITEM "&Paste", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "Add to &Favourites...", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM "Play", IDM_IMGARTPLAY + MENUITEM "Stop", IDM_IMGARTSTOP + MENUITEM "Rewind", IDM_IMGARTREWIND + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "P&roperties", IDM_PROPERTIES + } + + POPUP "Debug" + { + MENUITEM "Trace Tags", IDM_TRACETAGS + MENUITEM "Resource Failures", IDM_RESOURCEFAILURES + MENUITEM "Dump Tracking Info", IDM_DUMPTRACKINGINFO + MENUITEM "Debug Break", IDM_DEBUGBREAK + MENUITEM "Debug View", IDM_DEBUGVIEW + MENUITEM "Dump Tree", IDM_DUMPTREE + MENUITEM "Dump Lines", IDM_DUMPLINES + MENUITEM "Dump DisplayTree", IDM_DUMPDISPLAYTREE + MENUITEM "Dump FormatCaches", IDM_DUMPFORMATCACHES + MENUITEM "Dump LayoutRects", IDM_DUMPLAYOUTRECTS + MENUITEM "Memory Monitor", IDM_MEMORYMONITOR + MENUITEM "Performance Meters", IDM_PERFORMANCEMETERS + MENUITEM "Save HTML", IDM_SAVEHTML + MENUITEM SEPARATOR + MENUITEM "&Browse View", IDM_BROWSEMODE + MENUITEM "&Edit View", IDM_EDITMODE + } + + POPUP "Vertical Scrollbar" + { + MENUITEM "Scroll Here", IDM_SCROLL_HERE + MENUITEM SEPARATOR + MENUITEM "Top", IDM_SCROLL_TOP + MENUITEM "Bottom", IDM_SCROLL_BOTTOM + MENUITEM SEPARATOR + MENUITEM "Page Up", IDM_SCROLL_PAGEUP + MENUITEM "Page Down", IDM_SCROLL_PAGEDOWN + MENUITEM SEPARATOR + MENUITEM "Scroll Up", IDM_SCROLL_UP + MENUITEM "Scroll Down", IDM_SCROLL_DOWN + } + + POPUP "Horizontal Scrollbar" + { + MENUITEM "Scroll Here", IDM_SCROLL_HERE + MENUITEM SEPARATOR + MENUITEM "Left Edge", IDM_SCROLL_LEFTEDGE + MENUITEM "Right Edge", IDM_SCROLL_RIGHTEDGE + MENUITEM SEPARATOR + MENUITEM "Page Left", IDM_SCROLL_PAGELEFT + MENUITEM "Page Right", IDM_SCROLL_PAGERIGHT + MENUITEM SEPARATOR + MENUITEM "Scroll Left", IDM_SCROLL_LEFT + MENUITEM "Scroll Right", IDM_SCROLL_RIGHT + } +}

1 0

Huw Davies : regedit: Update English neutral translations.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: ba615affa89b90a61c9c7b7cf57fcc48c645f4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba615affa89b90a61c9c7b7cf… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 7 12:17:17 2009 +0100 regedit: Update English neutral translations. --- programs/regedit/En.rc | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc index 3c152a4..8d127ad 100644 --- a/programs/regedit/En.rc +++ b/programs/regedit/En.rc @@ -97,6 +97,29 @@ BEGIN END END +IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Add Favourite" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Name:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,120,36,40,15,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,165,36,40,15,WS_GROUP +END + +IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Remove Favourite" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Name:",IDC_STATIC,5,5,119,8 + LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,120,72,40,15,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,165,72,40,15,WS_GROUP +END + + /* English Default (US) Resources */ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

1 0

Paul Vriens : winhlp32: Improve Dutch translations and convert to UTF8.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 7cc7e7b06e3c7edbaff3e98471621765356aed22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc7e7b06e3c7edbaff3e9847… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 7 13:39:32 2009 +0200 winhlp32: Improve Dutch translations and convert to UTF8. --- programs/winhlp32/Nl.rc | 46 ++++++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 22 deletions(-) diff --git a/programs/winhlp32/Nl.rc b/programs/winhlp32/Nl.rc index 35daef7..029d582 100644 --- a/programs/winhlp32/Nl.rc +++ b/programs/winhlp32/Nl.rc @@ -21,6 +21,8 @@ #include "winhelp_res.h" +#pragma code_page(65001) + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL @@ -34,28 +36,28 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL MENUITEM "&Afsluiten", MNID_FILE_EXIT } POPUP "&Bewerken" { - MENUITEM "&Kopi�ren...", MNID_EDIT_COPYDLG + MENUITEM "&Kopiëren...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR MENUITEM "&Annoteren...", MNID_EDIT_ANNOTATE } POPUP "&Favorieten" { MENUITEM "&Aanmaken...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "&Opties" { + POPUP "Help altijd zichtbaar" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Standaard", MNID_OPTS_HELP_DEFAULT + MENUITEM "Zichtbaar", MNID_OPTS_HELP_VISIBLE + MENUITEM "Niet zichtbaar", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Historie", MNID_OPTS_HISTORY + POPUP "Lettertype" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL - MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Klein", MNID_OPTS_FONTS_SMALL + MENUITEM "Standaard", MNID_OPTS_FONTS_NORMAL + MENUITEM "Groot", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Gebruik systeemkleuren", MNID_OPTS_SYSTEM_COLORS } POPUP "&Help" { MENUITEM "Hulp &bij help", MNID_HELP_HELPON @@ -63,7 +65,7 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&Over WINE", MNID_HELP_WINE + MENUITEM "&Over Wine", MNID_HELP_WINE #endif } } @@ -81,26 +83,26 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Zoeken" { - LTEXT "Nog niet geimplementeerd", -1, 10, 10, 180, 150 + LTEXT "Nog niet geïmplementeerd", -1, 10, 10, 180, 150 } /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL { -STID_WINE_HELP, "WINE Help" +STID_WINE_HELP, "Wine Help" STID_WHERROR, "FOUT" STID_WARNING, "WAARSCHUWING" STID_INFO, "Informatie" -STID_NOT_IMPLEMENTED, "Niet ge�mplementeerd" -STID_HLPFILE_ERROR_s, "Fout bij het lezen van het helpbestand `%s'" -STID_INDEX, "&Inhoud" -STID_CONTENTS, "Summary" +STID_NOT_IMPLEMENTED, "Niet geïmplementeerd" +STID_HLPFILE_ERROR_s, "Fout bij het lezen van het helpbestand '%s'" +STID_INDEX, "Inde&x" +STID_CONTENTS, "&Inhoudsopgave" STID_BACK, "&Terug" STID_ALL_FILES, "Alle bestanden (*.*)" STID_HELP_FILES_HLP, "Helpbestanden (*.hlp)" STID_FILE_NOT_FOUND_s "Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " +STID_NO_RICHEDIT "Kan geen richedit implementatie vinden... Actie afgebroken" +STID_PSH_INDEX, "Help onderwerpen: " } CONTEXT_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL @@ -108,7 +110,7 @@ BEGIN POPUP "" BEGIN MENUITEM "Annotering...", MNID_CTXT_ANNOTATE - MENUITEM "Kopi�ren", MNID_CTXT_COPY + MENUITEM "Kopiëren", MNID_CTXT_COPY MENUITEM "Print...", MNID_CTXT_PRINT POPUP "Lettertypes" BEGIN

1 0

Hib Eris : oleaut32/tests: Add tests for VarDecCmp.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: eb8778f9a09d7f467e951eb075dae7f76686a493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8778f9a09d7f467e951eb07… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue Jul 7 14:00:24 2009 +0200 oleaut32/tests: Add tests for VarDecCmp. --- dlls/oleaut32/tests/vartype.c | 95 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 3e5730b..c3ec180 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4413,9 +4413,104 @@ static void test_VarDecCmp(void) MATHVARS1; CHECKPTR(VarDecCmp); + SETDEC(l,0,0,0,1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_EQ; SETDEC(l,0,0,0,1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,0,1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_LT; + + SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,0,1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,0,0); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,0,0,0); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(l,0,0,0,0); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_LT; + + SETDEC(l,0,0,0,0); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,0,0); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(l,0,0,0,0); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_GT; + + SETDEC(l,0,DECIMAL_NEG,0,0); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,0); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(l,0,DECIMAL_NEG,0,0); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_LT; + + SETDEC(l,0,DECIMAL_NEG,0,0); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,DECIMAL_NEG,0,0); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(l,0,DECIMAL_NEG,0,0); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_GT; + + SETDEC(l,0,0,-1,-1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,-1,-1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,-1,-1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; + + SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(l,0,0,-1,-1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); SETDEC(out,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; + + + SETDEC(out,0,0,0,1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(out,0,0,0,1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,0,0,1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_GT; + + SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,0,0,1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,0,1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_LT; + + SETDEC(out,0,0,0,0); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,0,0,0); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(out,0,0,0,0); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_GT; + + SETDEC(out,0,0,0,0); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,0,0,0); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(out,0,0,0,0); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_LT; + + SETDEC(out,0,DECIMAL_NEG,0,0); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,0,0); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(out,0,DECIMAL_NEG,0,0); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_GT; + + SETDEC(out,0,DECIMAL_NEG,0,0); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,DECIMAL_NEG,0,0); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(out,0,DECIMAL_NEG,0,0); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_LT; + + SETDEC(out,0,0,-1,-1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,0,-1,-1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,0,-1,-1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; + + SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_LT; + SETDEC(out,0,0,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_LT; + + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,0,1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,0,-1,-1); MATH1(VarDecCmp); todo_wine EXPECT_GT; + + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,1); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; + SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; + } /*

1 0

Piotr Caban : jscript: Added Object_toString and Object_toLocaleString implementation.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 8ce4de7d2c92f65e317ce5e58e3ad5645f160bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce4de7d2c92f65e317ce5e58… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 7 13:45:38 2009 +0200 jscript: Added Object_toString and Object_toLocaleString implementation. --- dlls/jscript/object.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index f2e3956..fe9a50c 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -35,15 +35,23 @@ static const WCHAR default_valueW[] = {'[','o','b','j','e','c','t',' ','O','b',' static HRESULT Object_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(default_valueW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + + return S_OK; } static HRESULT Object_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return Object_toString(dispex, lcid, flags, dp, retv, ei, sp); } static HRESULT Object_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

1 0

Piotr Caban : jscript: Added Object_valueOf implementation.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 3a1698ff06069cbf2397ca6a80eaa3869403c803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1698ff06069cbf2397ca6a8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 7 14:07:47 2009 +0200 jscript: Added Object_valueOf implementation. --- dlls/jscript/object.c | 12 ++++++++++-- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 9474bc4..f2e3956 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -49,8 +49,16 @@ static HRESULT Object_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, static HRESULT Object_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(retv) { + IDispatchEx_AddRef(_IDispatchEx_(dispex)); + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(dispex); + } + + return S_OK; } static HRESULT Object_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 23a4ad5..7075aec 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -439,6 +439,9 @@ ok(arr.sort() === arr, "arr.sort() !== arr"); for(var i=0; i < arr.length; i++) ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); +ok(arr.valueOf === Object.prototype.valueOf, "arr.valueOf !== Object.prototype.valueOf"); +ok(arr === arr.valueOf(), "arr !== arr.valueOf"); + var num = new Number(6); arr = [0,1,2]; tmp = arr.concat(3, [4,5], num);

1 0

Ricardo Filipe : comctl32: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: c5e02d71c1064e8bdc76df9740fa0958c40f0931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5e02d71c1064e8bdc76df974… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Mon Jul 6 13:09:13 2009 -0700 comctl32: Update Portuguese translation and convert to UTF8. --- dlls/comctl32/comctl_Pt.rc | 45 +++++++------------------------------------ 1 files changed, 8 insertions(+), 37 deletions(-) diff --git a/dlls/comctl32/comctl_Pt.rc b/dlls/comctl32/comctl_Pt.rc index e96d9b5..914c4c2 100644 --- a/dlls/comctl32/comctl_Pt.rc +++ b/dlls/comctl32/comctl_Pt.rc @@ -1,6 +1,7 @@ /* * Copyright 2003 Marcelo Duarte - * Copyright 2006-2007 Am�rico Jos� Melo + * Copyright 2006-2007 Américo José Melo + * Copyright 2009 Ricardo Filipe * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,21 +20,9 @@ #include "comctl32.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +#pragma code_page(65001) -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propriedades para %s" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Ajuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 -END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE @@ -47,27 +36,21 @@ BEGIN CONTROL "Separador", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Assistente" FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< &Voltar", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Avan�ar >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "&Avançar >", IDC_NEXT_BUTTON,121,138,50,14 DEFPUSHBUTTON "Finalizar", IDC_FINISH_BUTTON,121,138,50,14 PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14 PUSHBUTTON "Ajuda", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + CONTROL "Separador", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Personalizar barra de ferramentas" @@ -78,42 +61,30 @@ BEGIN PUSHBUTTON "&Ajuda", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "A&cima", IDC_MOVEUP_BTN,308,74,44,14 PUSHBUTTON "A&baixo", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "Bot�es &dispon�veis:", -1,4,5,84,10 + LTEXT "Botões &disponíveis:", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Adicionar ->", IDOK, 131, 42, 44, 14 PUSHBUTTON "<- &Remover", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Bot�es da barra de ferramentas:", -1,182,5,78,10 + LTEXT "&Botões da barra de ferramentas:", -1,182,5,78,10 LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - STRINGTABLE DISCARDABLE { IDS_CLOSE "Fechar" } - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - STRINGTABLE DISCARDABLE { IDM_TODAY "Hoje:" IDM_GOTODAY "Ir para hoje" } - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - STRINGTABLE DISCARDABLE { IDS_SEPARATOR "Separador" } - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - STRINGTABLE DISCARDABLE { HKY_NONE "Nenhum"

1 0

Ricardo Filipe : clock: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: a6c8a095efd50aee5fc5e3fd8cbcfe34f818b855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c8a095efd50aee5fc5e3fd8… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 03:26:39 2009 -0700 clock: Update Portuguese translation and convert to UTF8. --- programs/clock/Pt.rc | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 38 insertions(+), 12 deletions(-) diff --git a/programs/clock/Pt.rc b/programs/clock/Pt.rc index 2b04583..1e64342 100644 --- a/programs/clock/Pt.rc +++ b/programs/clock/Pt.rc @@ -5,7 +5,7 @@ * Copyright 1999 Gustavo Junior Alves <alves(a)correionet.com.br> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2003 Marcelo Duarte - * Copyright 2004 Am�rico Jos� Melo + * Copyright 2004 Américo José Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,25 +24,27 @@ #include "clock_res.h" +#pragma code_page(65001) + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN MAIN_MENU MENU { POPUP "&Propriedades" { - MENUITEM "&Anal�gico", IDM_ANALOG + MENUITEM "&Analógico", IDM_ANALOG MENUITEM "Digi&tal", IDM_DIGITAL MENUITEM SEPARATOR MENUITEM "&Fonte...", IDM_FONT MENUITEM SEPARATOR - MENUITEM "&Sem barra de t�tulo", IDM_NOTITLE + MENUITEM "&Sem barra de título", IDM_NOTITLE MENUITEM SEPARATOR MENUITEM "&Segundos", IDM_SECONDS MENUITEM "&Data", IDM_DATE MENUITEM SEPARATOR - MENUITEM "&Sempre vis�vel", IDM_ONTOP + MENUITEM "&Sempre visível", IDM_ONTOP } - POPUP "&Informa��es" { - MENUITEM "&Licen�a...", IDM_LICENSE + POPUP "&Informações" { + MENUITEM "&Licença...", IDM_LICENSE MENUITEM "&SEM GARANTIA...", IDM_NOWARRANTY MENUITEM "&Sobre Clock...", IDM_ABOUT } @@ -53,20 +55,20 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE MAIN_MENU MENU { POPUP "&Propriedades" { - MENUITEM "&Anal�gico", IDM_ANALOG + MENUITEM "&Analógico", IDM_ANALOG MENUITEM "Digi&tal", IDM_DIGITAL MENUITEM SEPARATOR MENUITEM "Tipo de &Letra...", IDM_FONT MENUITEM SEPARATOR - MENUITEM "&Sem barra de t�tulo", IDM_NOTITLE + MENUITEM "&Sem barra de título", IDM_NOTITLE MENUITEM SEPARATOR MENUITEM "&Segundos", IDM_SECONDS MENUITEM "&Data", IDM_DATE MENUITEM SEPARATOR - MENUITEM "&Sempre vis�vel", IDM_ONTOP + MENUITEM "&Sempre visível", IDM_ONTOP } - POPUP "&Informa��es" { - MENUITEM "&Licen�a...", IDM_LICENSE + POPUP "&Informações" { + MENUITEM "&Licença...", IDM_LICENSE MENUITEM "&SEM GARANTIA...", IDM_NOWARRANTY MENUITEM "&Acerca do Clock...", IDM_ABOUT } @@ -77,5 +79,29 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { -IDS_CLOCK, "Rel�gio" +IDS_CLOCK, "Relógio" +} + +STRINGTABLE DISCARDABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +{ +IDS_LICENSE_CAPTION, "Licença do Wine" +IDS_LICENSE, +"O Wine é software livre; você pode redistribuí-lo e/ou \ +modificá-lo sob os termos da GNU Lesser General Public \ +License tal como publicado pela Free Software Foundation; seja a \ +versão 2.1 da Licença, ou (por sua escolha) outra versão mais recente.\n\n\ +O Wine é distribuído na esperança que seja útil, \ +mas SEM QUALQUER GARANTIA; nem sequer a garantia implícita de \ +MERCANTIBILIDADE ou FEITO PARA UM PROPÓSITO ESPECÍFICO. veja a GNU \ +Lesser General Public License para mais detalhes.\n\n\ +Deverá ter recebido uma cópia da GNU Lesser General Public \ +License com o Wine; se não, escreva à Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." + +IDS_WARRANTY_CAPTION, "SEM GARANTIA" +IDS_WARRANTY, +"O Wine é distribuído na esperança que seja útil, \ +mas SEM QUALQUER GARANTIA; nem sequer a garantia implícita de \ +MERCANTIBILIDADE ou FEITO PARA UM PROPÓSITO ESPECÍFICO. veja a GNU \ +Lesser General Public License para mais detalhes." }

1 0

Piotr Caban : jscript: Fix DateConstr_parse implementation.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 12760a0c6b02888c085fef7a38f7ecec0cdf3ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=12760a0c6b02888c085fef7a3… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 7 13:44:53 2009 +0200 jscript: Fix DateConstr_parse implementation. --- dlls/jscript/date.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 525a3a2..3a681b9 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2492,7 +2492,7 @@ static inline HRESULT date_parse(BSTR input, VARIANT *retv) { static HRESULT DateConstr_parse(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - VARIANT prim; + BSTR parse_str; HRESULT hres; TRACE("\n"); @@ -2503,16 +2503,14 @@ static HRESULT DateConstr_parse(DispatchEx *dispex, LCID lcid, WORD flags, DISPP return S_OK; } - hres = to_primitive(dispex->ctx, get_arg(dp,0), ei, &prim); + hres = to_string(dispex->ctx, get_arg(dp,0), ei, &parse_str); if(FAILED(hres)) return hres; - if(V_VT(&prim) != VT_BSTR) { - if(retv) - num_set_nan(retv); - return S_OK; - } - return date_parse(V_BSTR(&prim), retv); + hres = date_parse(parse_str, retv); + + SysFreeString(parse_str); + return hres; } static HRESULT DateConstr_UTC(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

1 0

Piotr Caban : jscript: Inherit Array valueOf from Object.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 7fcded1fc3ba541ee7b15bd6c51dd07676eb196b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcded1fc3ba541ee7b15bd6c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 7 13:45:06 2009 +0200 jscript: Inherit Array valueOf from Object. --- dlls/jscript/array.c | 11 +---------- dlls/jscript/global.c | 8 ++++---- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index cd40e43..75d3871 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -40,7 +40,6 @@ static const WCHAR sortW[] = {'s','o','r','t',0}; static const WCHAR spliceW[] = {'s','p','l','i','c','e',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; -static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; static const WCHAR unshiftW[] = {'u','n','s','h','i','f','t',0}; static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; static const WCHAR propertyIsEnumerableW[] = @@ -638,13 +637,6 @@ static HRESULT Array_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, D return E_NOTIMPL; } -static HRESULT Array_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Array_unshift(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -732,7 +724,6 @@ static const builtin_prop_t Array_props[] = { {toLocaleStringW, Array_toLocaleString, PROPF_METHOD}, {toStringW, Array_toString, PROPF_METHOD}, {unshiftW, Array_unshift, PROPF_METHOD}, - {valueOfW, Array_valueOf, PROPF_METHOD} }; static const builtin_info_t Array_info = { @@ -809,7 +800,7 @@ static HRESULT alloc_array(script_ctx_t *ctx, BOOL use_constr, ArrayInstance **r if(use_constr) hres = init_dispex_from_constr(&array->dispex, ctx, &Array_info, ctx->array_constr); else - hres = init_dispex(&array->dispex, ctx, &Array_info, NULL); + hres = init_dispex_from_constr(&array->dispex, ctx, &Array_info, ctx->object_constr); if(FAILED(hres)) { heap_free(array); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index a714f8e..4f95653 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -582,6 +582,10 @@ static HRESULT init_constructors(script_ctx_t *ctx) if(FAILED(hres)) return hres; + hres = create_object_constr(ctx, &ctx->object_constr); + if(FAILED(hres)) + return hres; + hres = create_array_constr(ctx, &ctx->array_constr); if(FAILED(hres)) return hres; @@ -598,10 +602,6 @@ static HRESULT init_constructors(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = create_object_constr(ctx, &ctx->object_constr); - if(FAILED(hres)) - return hres; - hres = create_regexp_constr(ctx, &ctx->regexp_constr); if(FAILED(hres)) return hres;

1 0