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

Piotr Caban : jscript: Added Object_valueOf implementation.
by Alexandre Julliard 07 Jul '09

07 Jul '09

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

Piotr Caban : jscript: Added Object_toString and Object_toLocaleString implementation.
by Alexandre Julliard 07 Jul '09

07 Jul '09

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

Hib Eris : oleaut32/tests: Add tests for VarDecCmp.
by Alexandre Julliard 07 Jul '09

07 Jul '09

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

Huw Davies : wineconsole: Add English neutral translations.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 4a28359ba3a415fff6b40b29bf211a5fa3f32b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a28359ba3a415fff6b40b29b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 6 17:18:33 2009 +0100 wineconsole: Add English neutral translations. --- programs/wineconsole/wineconsole_En.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/wineconsole_En.rc b/programs/wineconsole/wineconsole_En.rc index a1c2173..c9b849a 100644 --- a/programs/wineconsole/wineconsole_En.rc +++ b/programs/wineconsole/wineconsole_En.rc @@ -134,3 +134,21 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 35, 45, 35, 12 PUSHBUTTON "Cancel", IDCANCEL, 80, 45, 35, 12 } + +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL + +IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " Font " +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Font", -1, 5, 5, 24, 8 + LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL + LTEXT "&Colour", -1, 100, 5, 50, 8 + CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 + CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 + LTEXT "&Size", -1, 158, 5, 40, 8 + LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL + CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 + LTEXT "", IDC_FNT_FONT_INFO, 128, 76, 80, 18 +}

1 0

Huw Davies : winecfg: Add English neutral translations.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 7705022c849233ca4f6d74121d99cf25615d1c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7705022c849233ca4f6d74121… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 6 17:14:41 2009 +0100 winecfg: Add English neutral translations. --- programs/winecfg/En.rc | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index f71463a..a69b4d9 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -327,3 +327,70 @@ BEGIN IDC_SYSPARAMS_MENU_HILIGHT "Menu Highlight" IDC_SYSPARAMS_MENUBAR "Menu Bar" END + +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL + +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 +STYLE WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT "&Theme:",IDC_STATIC,15,16,130,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,130,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Install theme...",IDC_THEME_INSTALL,152,23,93,14 + LTEXT "&Colour:",IDC_THEME_COLORTEXT,15,40,112,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,48,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Size:",IDC_THEME_SIZETEXT,135,40,110,8 + COMBOBOX IDC_THEME_SIZECOMBO,135,48,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "It&em:",IDC_STATIC,15,64,112,8 + COMBOBOX IDC_SYSPARAM_COMBO,15,74,112,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "C&olour:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED + PUSHBUTTON "",IDC_SYSPARAM_COLOR,135,74,25,13,WS_DISABLED | BS_OWNERDRAW + LTEXT "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED + EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 + PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED + GROUPBOX " Fol&ders ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "&Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,125,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDC_SYSPARAMS_BUTTON "Controls Background" + IDC_SYSPARAMS_BUTTON_TEXT "Controls Text" + IDC_SYSPARAMS_DESKTOP "Desktop" + IDC_SYSPARAMS_MENU "Menu Background" + IDC_SYSPARAMS_MENU_TEXT "Menu Text" + IDC_SYSPARAMS_SCROLLBAR "Scrollbar" + IDC_SYSPARAMS_SELECTION "Selection Background" + IDC_SYSPARAMS_SELECTION_TEXT "Selection Text" + IDC_SYSPARAMS_TOOLTIP "ToolTip Background" + IDC_SYSPARAMS_TOOLTIP_TEXT "ToolTip Text" + IDC_SYSPARAMS_WINDOW "Window Background" + IDC_SYSPARAMS_WINDOW_TEXT "Window Text" + IDC_SYSPARAMS_ACTIVE_TITLE "Active Title Bar" + IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Active Title Text" + IDC_SYSPARAMS_INACTIVE_TITLE "Inactive Title Bar" + IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inactive Title Text" + IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" + IDC_SYSPARAMS_APPWORKSPACE "Application Workspace" + IDC_SYSPARAMS_WINDOW_FRAME "Window Frame" + IDC_SYSPARAMS_ACTIVE_BORDER "Active Border" + IDC_SYSPARAMS_INACTIVE_BORDER "Inactive Border" + IDC_SYSPARAMS_BUTTON_SHADOW "Controls Shadow" + IDC_SYSPARAMS_GRAY_TEXT "Grey Text" + IDC_SYSPARAMS_BUTTON_HILIGHT "Controls Highlight" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Controls Dark Shadow" + IDC_SYSPARAMS_BUTTON_LIGHT "Controls Light" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Controls Alternate Background" + IDC_SYSPARAMS_HOT_TRACKING "Hot Tracked Item" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Active Title Bar Gradient" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Inactive Title Bar Gradient" + IDC_SYSPARAMS_MENU_HILIGHT "Menu Highlight" + IDC_SYSPARAMS_MENUBAR "Menu Bar" +END

1 0

Ricardo Filipe : notepad: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 7143a64d715292e51bc2080384fbc06533f75ede URL: http://source.winehq.org/git/wine.git/?a=commit;h=7143a64d715292e51bc208038… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 03:55:29 2009 -0700 notepad: Update Portuguese translation and convert to UTF8. --- programs/notepad/Pt.rc | 84 +++++++++++++++++++++++++++++------------------ 1 files changed, 52 insertions(+), 32 deletions(-) diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc index 8ad0809..eeae39d 100644 --- a/programs/notepad/Pt.rc +++ b/programs/notepad/Pt.rc @@ -5,7 +5,7 @@ * Copyright 1999 Marcel Baur <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,6 +24,8 @@ #include "notepad_res.h" +#pragma code_page(65001) + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN MAIN_MENU MENU @@ -35,7 +37,7 @@ MAIN_MENU MENU MENUITEM "Salvar &como...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "&Imprimir...\tCtrl+P", CMD_PRINT - MENUITEM "C&onfigurar p�gina...", CMD_PAGE_SETUP + MENUITEM "C&onfigurar página...", CMD_PAGE_SETUP MENUITEM "Configurar i&mpressora...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "Sai&r", CMD_EXIT @@ -51,15 +53,15 @@ POPUP "&Editar" { MENUITEM "Selecionar &tudo", CMD_SELECT_ALL MENUITEM "&Data/Hora\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&Quebrar autom�tica de linha", CMD_WRAP + MENUITEM "&Quebrar automática de linha", CMD_WRAP MENUITEM "&Fonte...", CMD_FONT } POPUP "&Pesquisa" { MENUITEM "&Localizar...", CMD_SEARCH - MENUITEM "Localizar &pr�xima\tF3", CMD_SEARCH_NEXT + MENUITEM "Localizar &próxima\tF3", CMD_SEARCH_NEXT } POPUP "&Ajuda" { - MENUITEM "&Conte�do", CMD_HELP_CONTENTS + MENUITEM "&Conteúdo", CMD_HELP_CONTENTS MENUITEM "&Procurar...", CMD_HELP_SEARCH MENUITEM "&Ajuda na ajuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR @@ -78,7 +80,7 @@ MAIN_MENU MENU MENUITEM "Gravar &como...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "&Imprimir", CMD_PRINT - MENUITEM "C&onfigurar p�gina...", CMD_PAGE_SETUP + MENUITEM "C&onfigurar página...", CMD_PAGE_SETUP MENUITEM "Configurar i&mpressora...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "Sai&r", CMD_EXIT @@ -94,19 +96,20 @@ POPUP "&Editar" { MENUITEM "Seleccionar &tudo", CMD_SELECT_ALL MENUITEM "&Data/Hora\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "&Quebrar autom�tica de linha", CMD_WRAP + MENUITEM "&Quebrar automática de linha", CMD_WRAP MENUITEM "&Tipo de Letra...", CMD_FONT } POPUP "&Pesquisa" { MENUITEM "&Localizar...", CMD_SEARCH - MENUITEM "Localizar &pr�xima\tF3", CMD_SEARCH_NEXT + MENUITEM "Localizar &próxima\tF3", CMD_SEARCH_NEXT + MENUITEM "&Substituir...\tCtrl+H", CMD_REPLACE } POPUP "&Ajuda" { - MENUITEM "&Conte�do", CMD_HELP_CONTENTS + MENUITEM "&Conteúdo", CMD_HELP_CONTENTS MENUITEM "&Procurar...", CMD_HELP_SEARCH MENUITEM "&Ajuda na ajuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Acerca do Notepad...", CMD_HELP_ABOUT_NOTEPAD } } @@ -118,11 +121,11 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Configurar p�gina" +CAPTION "Configurar página" { -LTEXT "&Cabe�alho (mm):", 0x140, 10, 07, 40, 15 +LTEXT "&Cabeçalho (mm):", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "&Rodap�:", 0x142, 10, 24, 40, 15 +LTEXT "&Rodapé:", 0x142, 10, 24, 40, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP GROUPBOX "&Margens:", 0x144, 10, 43,160, 45 @@ -140,35 +143,42 @@ PUSHBUTTON "Cancelar", IDCANCEL, 180, 21, 40, 15, WS_TABSTO PUSHBUTTON "&Ajuda", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Codificação:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" -STRING_PAGESETUP_FOOTERVALUE, "P�gina &p" +STRING_PAGESETUP_FOOTERVALUE, "Página &p" STRING_NOTEPAD, "Notepad" STRING_ERROR, "ERRO" STRING_WARNING, "AVISO" -STRING_INFO, "Informa��o" +STRING_INFO, "Informação" STRING_UNTITLED, "(sem nome)" STRING_ALL_FILES, "Todos os arquivos (*.*)" STRING_TEXT_FILES_TXT, "Arquivos texto (*.txt)" -STRING_TOOLARGE, "Arquivo '%s' � muito longo para o notepad.\n \ +STRING_TOOLARGE, "Arquivo '%s' é muito longo para o notepad.\n \ Por favor use um editor diferente." -STRING_NOTEXT, "Voc� n�o digitou nenhum texto. \ +STRING_NOTEXT, "Você não digitou nenhum texto. \ \nPor favor digite alguma coisa e tente novamente" -STRING_DOESNOTEXIST, "Arquivo '%s'\nn�o existe\n\n \ -Voc� deseja criar um novo arquivo?" +STRING_DOESNOTEXIST, "Arquivo '%s'\nnão existe\n\n \ +Você deseja criar um novo arquivo?" STRING_NOTSAVED, "Arquivo '%s'\nfoi modificado\n\n \ -Gostaria de salvar as altera��es?" -STRING_NOTFOUND, "'%s' n�o pode ser encontrado." -STRING_OUT_OF_MEMORY, "N�o h� mem�ria suficiente para completar essa \ -tarefa.\nFeche uma ou mais aplica��es para aumentar a quantidade de mem�ria livre." +Gostaria de salvar as alteraçÕes?" +STRING_NOTFOUND, "'%s' não pode ser encontrado." +STRING_OUT_OF_MEMORY, "Não há memória suficiente para completar essa \ +tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória livre." } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -176,27 +186,37 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" - STRING_PAGESETUP_FOOTERVALUE, "P�gina &p" + STRING_PAGESETUP_FOOTERVALUE, "Página &p" STRING_NOTEPAD, "Notepad" STRING_ERROR, "ERRO" STRING_WARNING, "AVISO" - STRING_INFO, "Informa��o" + STRING_INFO, "Informação" STRING_UNTITLED, "(sem nome)" STRING_ALL_FILES, "Todos os arquivos (*.*)" STRING_TEXT_FILES_TXT, "Ficheiros de texto (*.txt)" - STRING_TOOLARGE, "Ficheiros '%s' � muito longo para o notepad.\n \ + STRING_TOOLARGE, "Ficheiros '%s' é muito longo para o notepad.\n \ Por favor use um editor diferente." - STRING_NOTEXT, "N�o digitou nenhum texto. \ + STRING_NOTEXT, "Não digitou nenhum texto. \ \nPor favor digite alguma coisa e tente novamente" - STRING_DOESNOTEXIST, "Ficheiro '%s'\nn�o existe\n\n \ + STRING_DOESNOTEXIST, "Ficheiro '%s'\nnão existe\n\n \ Deseja criar um novo ficheiro?" STRING_NOTSAVED, "Ficheiro '%s'\nfoi modificado\n\n \ -Gostaria de gravar as altera��es?" - STRING_NOTFOUND, "'%s' n�o pode ser encontrado." - STRING_OUT_OF_MEMORY, "N�o h� mem�ria suficiente para completar esta \ -tarefa.\nFeche uma ou mais aplica��es para aumentar a quantidade de mem�ria livre." +Gostaria de gravar as alteraçÕes?" + STRING_NOTFOUND, "'%s' não pode ser encontrado." + STRING_OUT_OF_MEMORY, "Não há memória suficiente para completar esta \ +tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória livre." + +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Este ficheiro contém caracteres Unicode que serão perdidos se\n\ +guardar este ficheiro na codificação %s. \n\ +Para manter estes caracteres, carregue em Cancelar, e depois seleccione\n\ +uma das opções Unicode na lista de Codificações. \n\ +Continuar?" }

1 0

Ricardo Filipe : cmdlgtst: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 80de51bd3ff01fec2a79820371c3b5f966131527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80de51bd3ff01fec2a7982037… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jul 7 03:42:49 2009 -0700 cmdlgtst: Update Portuguese translation and convert to UTF8. --- programs/cmdlgtst/Pt.rc | 121 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 91 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80de51bd3ff01fec2a798…

1 0

Ricardo Filipe : setupapi: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 2263c97bf4d2351a7109fd007cd866c11b9c12c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2263c97bf4d2351a7109fd007… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Mon Jul 6 14:45:59 2009 -0700 setupapi: Update Portuguese translation and convert to UTF8. --- dlls/setupapi/Pt.rc | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/Pt.rc b/dlls/setupapi/Pt.rc index 5780b8f..5d7ebdb 100644 --- a/dlls/setupapi/Pt.rc +++ b/dlls/setupapi/Pt.rc @@ -2,7 +2,8 @@ * Portuguese resources for SETUPAPI * * Copyright 2003 Marcelo Duarte - * Copyright 2004 Am�rico Jos� Melo + * Copyright 2004 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 @@ -21,6 +22,18 @@ #include "setupapi_private.h" +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "O ficheiro '%s' em %s é necessário" + IDS_UNKNOWN "Desconhecido" + IDS_COPYFROM "Copiar ficheiros de:" + IDS_INFO "Insira o caminho onde se encontram os ficheiros, depois carregue em OK." +} + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 @@ -50,3 +63,17 @@ BEGIN LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ficheiros Necessários" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insira o disco de instalação do fabricante, depois\nverifique se a drive correcta está seleccionada", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copiar ficheiros do fabricante de:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Procurar...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

Ricardo Filipe : shell32: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: b7432f3c01a1011b0890f728eb33e64fc33b1540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7432f3c01a1011b0890f728e… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Mon Jul 6 16:26:21 2009 -0700 shell32: Update Portuguese translation and convert to UTF8. --- dlls/shell32/shell32_Pt.rc | 253 +++++++++++++++++++++++++++++--------------- 1 files changed, 167 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7432f3c01a1011b0890f…

1 0

Ricardo Filipe : user32: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 5d5cf8ceb2bfc911c8b98c8db218eadcc91b3438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5cf8ceb2bfc911c8b98c8db… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Mon Jul 6 16:42:34 2009 -0700 user32: Update Portuguese translation and convert to UTF8. --- dlls/user32/resources/user32_Pt.rc | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/user32/resources/user32_Pt.rc b/dlls/user32/resources/user32_Pt.rc index d0310e6..a57e64f 100644 --- a/dlls/user32/resources/user32_Pt.rc +++ b/dlls/user32/resources/user32_Pt.rc @@ -1,6 +1,7 @@ /* * Copyright 1997 Ricardo R. Massaro - * Copyright 2006 Am�rico Jos� Melo + * Copyright 2006 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,6 +20,8 @@ #include "resources.h" +#pragma code_page(65001) + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE @@ -85,23 +88,23 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE } -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL MSGBOX DIALOG 100, 80, 216, 168 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX - PUSHBUTTON "&Ok", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Cancelar", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Abortar", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Repetir", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ignorar", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Sim", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&N�o", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Não", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Tente Novamente", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Continuar", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ajuda", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -130,7 +133,7 @@ BEGIN END -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE {

1 0