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

Jacek Caban : urlmon: Use GetBinfInfoEx in GetBindInfo implementation if possible.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: b6259956c18ca00eb80362c6781b9e6399f946b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6259956c18ca00eb80362c67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 23:21:37 2009 +0200 urlmon: Use GetBinfInfoEx in GetBindInfo implementation if possible. --- dlls/urlmon/bindctx.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index fe80456..1a89482 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -178,10 +178,22 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { BindStatusCallback *This = STATUSCLB_THIS(iface); + IBindStatusCallbackEx *bscex; + HRESULT hres; TRACE("(%p)->(%p %p)\n", This, grfBINDF, pbindinfo); - return IBindStatusCallback_GetBindInfo(This->callback, grfBINDF, pbindinfo); + hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IBindStatusCallbackEx, (void**)&bscex); + if(SUCCEEDED(hres)) { + DWORD bindf2 = 0, reserv = 0; + + hres = IBindStatusCallbackEx_GetBindInfoEx(bscex, grfBINDF, pbindinfo, &bindf2, &reserv); + IBindStatusCallbackEx_Release(bscex); + }else { + hres = IBindStatusCallback_GetBindInfo(This->callback, grfBINDF, pbindinfo); + } + + return hres; } static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *iface,

1 0

Michael Stefaniuc : wineps.drv: Include a local header last.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 551d1efc9f65fa932beb13d8ed685c9ccd081c04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=551d1efc9f65fa932beb13d8e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:39:04 2009 +0200 wineps.drv: Include a local header last. --- dlls/wineps.drv/driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 158ea1f..904f97a 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -30,12 +30,12 @@ #include <string.h> #include "wine/debug.h" -#include "psdlg.h" #include "psdrv.h" #include "winuser.h" #include "wownt32.h" #include "prsht.h" +#include "psdlg.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv);

1 0

Michael Stefaniuc : winefile: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 08ac4a4c222ff1e115c8745b85c4df33f0ee1ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08ac4a4c222ff1e115c8745b8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:37:52 2009 +0200 winefile: Build language resource files separately. Do not include them from an other rc file. --- programs/winefile/Cs.rc | 2 ++ programs/winefile/Da.rc | 2 ++ programs/winefile/De.rc | 2 ++ programs/winefile/En.rc | 2 ++ programs/winefile/Es.rc | 2 ++ programs/winefile/Fr.rc | 2 ++ programs/winefile/Hu.rc | 2 ++ programs/winefile/It.rc | 2 ++ programs/winefile/Ja.rc | 4 ++-- programs/winefile/Ko.rc | 2 ++ programs/winefile/Lt.rc | 4 ++-- programs/winefile/Makefile.in | 23 ++++++++++++++++++++++- programs/winefile/Nl.rc | 2 ++ programs/winefile/No.rc | 2 ++ programs/winefile/Pl.rc | 2 ++ programs/winefile/Pt.rc | 1 + programs/winefile/Ru.rc | 2 ++ programs/winefile/Si.rc | 4 ++-- programs/winefile/Sv.rc | 2 ++ programs/winefile/Tr.rc | 2 ++ programs/winefile/Zh.rc | 4 ++-- programs/winefile/resource.h | 2 ++ programs/winefile/rsrc.rc | 26 -------------------------- 23 files changed, 63 insertions(+), 35 deletions(-) diff --git a/programs/winefile/Cs.rc b/programs/winefile/Cs.rc index 6d2294a..ad71863 100644 --- a/programs/winefile/Cs.rc +++ b/programs/winefile/Cs.rc @@ -23,6 +23,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/programs/winefile/Da.rc b/programs/winefile/Da.rc index babc0da..ffc7415 100644 --- a/programs/winefile/Da.rc +++ b/programs/winefile/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winefile/De.rc b/programs/winefile/De.rc index ae1a80f..e0718be 100644 --- a/programs/winefile/De.rc +++ b/programs/winefile/De.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/winefile/En.rc b/programs/winefile/En.rc index dc0ef28..644cf2f 100644 --- a/programs/winefile/En.rc +++ b/programs/winefile/En.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winefile/Es.rc b/programs/winefile/Es.rc index fa82f4f..7e445ee 100644 --- a/programs/winefile/Es.rc +++ b/programs/winefile/Es.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/winefile/Fr.rc b/programs/winefile/Fr.rc index 73d7c8e..25e7874 100644 --- a/programs/winefile/Fr.rc +++ b/programs/winefile/Fr.rc @@ -23,6 +23,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/winefile/Hu.rc b/programs/winefile/Hu.rc index f73f376..f7ca49a 100644 --- a/programs/winefile/Hu.rc +++ b/programs/winefile/Hu.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winefile/It.rc b/programs/winefile/It.rc index 832d422..bfbf6f1 100644 --- a/programs/winefile/It.rc +++ b/programs/winefile/It.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/winefile/Ja.rc b/programs/winefile/Ja.rc index cd68b65..b73486a 100644 --- a/programs/winefile/Ja.rc +++ b/programs/winefile/Ja.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -261,5 +263,3 @@ STRINGTABLE IDS_FREE_SPACE_FMT "%s of %s free" } - -#pragma code_page(default) diff --git a/programs/winefile/Ko.rc b/programs/winefile/Ko.rc index 02821d0..0a6207a 100644 --- a/programs/winefile/Ko.rc +++ b/programs/winefile/Ko.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winefile/Lt.rc b/programs/winefile/Lt.rc index 04445e7..32cec0e 100644 --- a/programs/winefile/Lt.rc +++ b/programs/winefile/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -259,5 +261,3 @@ STRINGTABLE IDS_FREE_SPACE_FMT "%s iš %s laisva" } - -#pragma code_page(default) diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in index 804e349..bd808b5 100644 --- a/programs/winefile/Makefile.in +++ b/programs/winefile/Makefile.in @@ -11,7 +11,28 @@ C_SRCS = \ splitpath.c \ winefile.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + Hu.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + rsrc.rc SVG_SRCS = winefile.svg diff --git a/programs/winefile/Nl.rc b/programs/winefile/Nl.rc index 06eef8e..8f6f7f1 100644 --- a/programs/winefile/Nl.rc +++ b/programs/winefile/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/winefile/No.rc b/programs/winefile/No.rc index 04f8509..eec8b82 100644 --- a/programs/winefile/No.rc +++ b/programs/winefile/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL /* Menu */ diff --git a/programs/winefile/Pl.rc b/programs/winefile/Pl.rc index 3131617..50247e3 100644 --- a/programs/winefile/Pl.rc +++ b/programs/winefile/Pl.rc @@ -22,6 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winefile/Pt.rc b/programs/winefile/Pt.rc index d23038d..176a5d7 100644 --- a/programs/winefile/Pt.rc +++ b/programs/winefile/Pt.rc @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" /* Menu */ diff --git a/programs/winefile/Ru.rc b/programs/winefile/Ru.rc index dd07152..ef8c657 100644 --- a/programs/winefile/Ru.rc +++ b/programs/winefile/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winefile/Si.rc b/programs/winefile/Si.rc index 5aa006d..2010f59 100644 --- a/programs/winefile/Si.rc +++ b/programs/winefile/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -258,5 +260,3 @@ STRINGTABLE IDS_FREE_SPACE_FMT "Prosto: %s od %s" } - -#pragma code_page(default) diff --git a/programs/winefile/Sv.rc b/programs/winefile/Sv.rc index 6905c5e..4deddd9 100644 --- a/programs/winefile/Sv.rc +++ b/programs/winefile/Sv.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL /* Menu */ diff --git a/programs/winefile/Tr.rc b/programs/winefile/Tr.rc index 3a75a7e..8735264 100644 --- a/programs/winefile/Tr.rc +++ b/programs/winefile/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT /* Menu */ diff --git a/programs/winefile/Zh.rc b/programs/winefile/Zh.rc index aba7221..8eb3300 100644 --- a/programs/winefile/Zh.rc +++ b/programs/winefile/Zh.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -298,5 +300,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "取消", 2, 158, 23, 47, 14 PUSHBUTTON "幫助(&H)", 254, 158, 43, 47, 14 } - -#pragma code_page(default) diff --git a/programs/winefile/resource.h b/programs/winefile/resource.h index 1e843e5..7c14871 100644 --- a/programs/winefile/resource.h +++ b/programs/winefile/resource.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> /* images */ diff --git a/programs/winefile/rsrc.rc b/programs/winefile/rsrc.rc index 4a65aac..c921271 100644 --- a/programs/winefile/rsrc.rc +++ b/programs/winefile/rsrc.rc @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> - #include "resource.h" /* define language neutral resources */ @@ -52,26 +49,3 @@ IDB_DRIVEBAR BITMAP DISCARDABLE drivebar.bmp /* @makedep: images.bmp */ IDB_IMAGES BITMAP DISCARDABLE images.bmp - -/* include localised resources */ - -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fr.rc" -#include "Hu.rc" -#include "It.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc"

1 0

Michael Stefaniuc : oleview: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 313dd0c3a4ba1fd9576820c2adb508f7204d2bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=313dd0c3a4ba1fd9576820c2a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:36:00 2009 +0200 oleview: Build language resource files separately. Do not include them from an other rc file. --- programs/oleview/Da.rc | 2 ++ programs/oleview/De.rc | 2 ++ programs/oleview/En.rc | 2 ++ programs/oleview/Fr.rc | 2 ++ programs/oleview/Ja.rc | 4 ++-- programs/oleview/Ko.rc | 2 ++ programs/oleview/Lt.rc | 4 ++-- programs/oleview/Makefile.in | 17 ++++++++++++++++- programs/oleview/Nl.rc | 2 ++ programs/oleview/No.rc | 2 ++ programs/oleview/Pl.rc | 2 ++ programs/oleview/Pt.rc | 2 ++ programs/oleview/Ru.rc | 2 ++ programs/oleview/Sv.rc | 2 ++ programs/oleview/Zh.rc | 4 ++-- programs/oleview/resource.h | 3 +++ programs/oleview/rsrc.rc | 18 ------------------ 17 files changed, 47 insertions(+), 25 deletions(-) diff --git a/programs/oleview/Da.rc b/programs/oleview/Da.rc index 02058f6..04b46e4 100644 --- a/programs/oleview/Da.rc +++ b/programs/oleview/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDM_MENU MENU diff --git a/programs/oleview/De.rc b/programs/oleview/De.rc index d010596..8e67cb4 100644 --- a/programs/oleview/De.rc +++ b/programs/oleview/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDM_MENU MENU diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index 700e1d7..36dfada 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDM_MENU MENU diff --git a/programs/oleview/Fr.rc b/programs/oleview/Fr.rc index 56d7250..728f451 100644 --- a/programs/oleview/Fr.rc +++ b/programs/oleview/Fr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDM_MENU MENU diff --git a/programs/oleview/Ja.rc b/programs/oleview/Ja.rc index 955174c..8ed1eac 100644 --- a/programs/oleview/Ja.rc +++ b/programs/oleview/Ja.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -214,5 +216,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "&GetSizeMax", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 } - -#pragma code_page(default) diff --git a/programs/oleview/Ko.rc b/programs/oleview/Ko.rc index e1d61a9..0df4e7f 100644 --- a/programs/oleview/Ko.rc +++ b/programs/oleview/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDM_MENU MENU diff --git a/programs/oleview/Lt.rc b/programs/oleview/Lt.rc index ab887c2..a5d131c 100644 --- a/programs/oleview/Lt.rc +++ b/programs/oleview/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -214,5 +216,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&GetSizeMax()", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 } - -#pragma code_page(default) diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in index 2c69eda..d1dad43 100644 --- a/programs/oleview/Makefile.in +++ b/programs/oleview/Makefile.in @@ -15,7 +15,22 @@ C_SRCS = \ tree.c \ typelib.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Da.rc \ + De.rc \ + En.rc \ + Fr.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Sv.rc \ + Zh.rc \ + rsrc.rc @MAKE_PROG_RULES@ diff --git a/programs/oleview/Nl.rc b/programs/oleview/Nl.rc index ed2821d..6e109af 100644 --- a/programs/oleview/Nl.rc +++ b/programs/oleview/Nl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDM_MENU MENU diff --git a/programs/oleview/No.rc b/programs/oleview/No.rc index f5e885a..5aecd77 100644 --- a/programs/oleview/No.rc +++ b/programs/oleview/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDM_MENU MENU diff --git a/programs/oleview/Pl.rc b/programs/oleview/Pl.rc index 77a0f8a..d3be5b3 100644 --- a/programs/oleview/Pl.rc +++ b/programs/oleview/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDM_MENU MENU diff --git a/programs/oleview/Pt.rc b/programs/oleview/Pt.rc index d520f49..dfc7aba 100644 --- a/programs/oleview/Pt.rc +++ b/programs/oleview/Pt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDM_MENU MENU diff --git a/programs/oleview/Ru.rc b/programs/oleview/Ru.rc index cf63d75..ab8f6b6 100644 --- a/programs/oleview/Ru.rc +++ b/programs/oleview/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_RUSSIAN IDM_MENU MENU diff --git a/programs/oleview/Sv.rc b/programs/oleview/Sv.rc index ed121f1..be9c053 100644 --- a/programs/oleview/Sv.rc +++ b/programs/oleview/Sv.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDM_MENU MENU diff --git a/programs/oleview/Zh.rc b/programs/oleview/Zh.rc index 8f9b59c..4d0f712 100644 --- a/programs/oleview/Zh.rc +++ b/programs/oleview/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -406,5 +408,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "獲取最大(&G)", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 } - -#pragma code_page(default) diff --git a/programs/oleview/resource.h b/programs/oleview/resource.h index e88ec05..9e732e6 100644 --- a/programs/oleview/resource.h +++ b/programs/oleview/resource.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> + #define IDS_APPNAME 1 #define IDS_APPTITLE 2 #define IDM_MENU 3 diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index 14122b7..20537f3 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -18,26 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winuser.h> - #include "resource.h" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Fr.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Sv.rc" -#include "Zh.rc" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDA_OLEVIEW ACCELERATORS DISCARDABLE

1 0

Jacek Caban : urlmon: Added IBindStatusCallbackEx implementation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: df826fe82fab3416eb194c7e361d6fa8d72bfb69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df826fe82fab3416eb194c7e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 2 23:22:13 2009 +0200 urlmon: Added IBindStatusCallbackEx implementation. --- dlls/urlmon/bindctx.c | 65 ++++++++++++++++++++++++++++++++-------------- dlls/urlmon/tests/url.c | 1 - 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 1a89482..0b3efa6 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -28,10 +28,10 @@ static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_ extern IID IID_IBindStatusCallbackHolder; typedef struct { - const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl; - const IServiceProviderVtbl *lpServiceProviderVtbl; - const IHttpNegotiate2Vtbl *lpHttpNegotiate2Vtbl; - const IAuthenticateVtbl *lpAuthenticateVtbl; + const IBindStatusCallbackExVtbl *lpBindStatusCallbackExVtbl; + const IServiceProviderVtbl *lpServiceProviderVtbl; + const IHttpNegotiate2Vtbl *lpHttpNegotiate2Vtbl; + const IAuthenticateVtbl *lpAuthenticateVtbl; LONG ref; @@ -39,7 +39,8 @@ typedef struct { IServiceProvider *serv_prov; } BindStatusCallback; -#define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) +#define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackExVtbl) +#define STATUSCLBEX(x) ((IBindStatusCallbackEx*)&(x)->lpBindStatusCallbackExVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define HTTPNEG2(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl) #define AUTHENTICATE(x) ((IAuthenticate*) &(x)->lpAuthenticateVtbl) @@ -56,9 +57,9 @@ static void *get_callback_iface(BindStatusCallback *This, REFIID riid) return SUCCEEDED(hres) ? ret : NULL; } -#define STATUSCLB_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallback, iface) +#define STATUSCLB_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallbackEx, iface) -static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallbackEx *iface, REFIID riid, void **ppv) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -71,6 +72,9 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa }else if(IsEqualGUID(&IID_IBindStatusCallback, riid)) { TRACE("(%p)->(IID_IBindStatusCallback, %p)\n", This, ppv); *ppv = STATUSCLB(This); + }else if(IsEqualGUID(&IID_IBindStatusCallbackEx, riid)) { + TRACE("(%p)->(IID_IBindStatusCallback, %p)\n", This, ppv); + *ppv = STATUSCLBEX(This); }else if(IsEqualGUID(&IID_IBindStatusCallbackHolder, riid)) { TRACE("(%p)->(IID_IBindStatusCallbackHolder, %p)\n", This, ppv); *ppv = This; @@ -97,7 +101,7 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa return E_NOINTERFACE; } -static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface) +static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallbackEx *iface) { BindStatusCallback *This = STATUSCLB_THIS(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -107,7 +111,7 @@ static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface) return ref; } -static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) +static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallbackEx *iface) { BindStatusCallback *This = STATUSCLB_THIS(iface); LONG ref = InterlockedDecrement(&This->ref); @@ -124,7 +128,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface) return ref; } -static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallbackEx *iface, DWORD dwReserved, IBinding *pbind) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -134,7 +138,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa return IBindStatusCallback_OnStartBinding(This->callback, 0xff, pbind); } -static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallback *iface, LONG *pnPriority) +static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallbackEx *iface, LONG *pnPriority) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -143,7 +147,7 @@ static HRESULT WINAPI BindStatusCallback_GetPriority(IBindStatusCallback *iface, return IBindStatusCallback_GetPriority(This->callback, pnPriority); } -static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *iface, DWORD reserved) +static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallbackEx *iface, DWORD reserved) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -152,7 +156,7 @@ static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *ifac return IBindStatusCallback_OnLowResource(This->callback, reserved); } -static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, +static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallbackEx *iface, ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -164,7 +168,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, ulProgressMax, ulStatusCode, szStatusText); } -static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallbackEx *iface, HRESULT hresult, LPCWSTR szError) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -174,7 +178,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac return IBindStatusCallback_OnStopBinding(This->callback, hresult, szError); } -static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallbackEx *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -196,7 +200,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, return hres; } -static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallbackEx *iface, DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -206,7 +210,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if return IBindStatusCallback_OnDataAvailable(This->callback, grfBSCF, dwSize, pformatetc, pstgmed); } -static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, +static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallbackEx *iface, REFIID riid, IUnknown *punk) { BindStatusCallback *This = STATUSCLB_THIS(iface); @@ -216,9 +220,29 @@ static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback * return IBindStatusCallback_OnObjectAvailable(This->callback, riid, punk); } +static HRESULT WINAPI BindStatusCallback_GetBindInfoEx(IBindStatusCallbackEx *iface, DWORD *grfBINDF, + BINDINFO *pbindinfo, DWORD *grfBINDF2, DWORD *pdwReserved) +{ + BindStatusCallback *This = STATUSCLB_THIS(iface); + IBindStatusCallbackEx *bscex; + HRESULT hres; + + TRACE("(%p)->(%p %p %p %p)\n", This, grfBINDF, pbindinfo, grfBINDF2, pdwReserved); + + hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IBindStatusCallbackEx, (void**)&bscex); + if(SUCCEEDED(hres)) { + hres = IBindStatusCallbackEx_GetBindInfoEx(bscex, grfBINDF, pbindinfo, grfBINDF2, pdwReserved); + IBindStatusCallbackEx_Release(bscex); + }else { + hres = IBindStatusCallback_GetBindInfo(This->callback, grfBINDF, pbindinfo); + } + + return hres; +} + #undef STATUSCLB_THIS -static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { +static const IBindStatusCallbackExVtbl BindStatusCallbackExVtbl = { BindStatusCallback_QueryInterface, BindStatusCallback_AddRef, BindStatusCallback_Release, @@ -229,7 +253,8 @@ static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { BindStatusCallback_OnStopBinding, BindStatusCallback_GetBindInfo, BindStatusCallback_OnDataAvailable, - BindStatusCallback_OnObjectAvailable + BindStatusCallback_OnObjectAvailable, + BindStatusCallback_GetBindInfoEx }; #define SERVPROV_THIS(iface) DEFINE_THIS(BindStatusCallback, ServiceProvider, iface) @@ -439,7 +464,7 @@ static IBindStatusCallback *create_bsc(IBindStatusCallback *bsc) { BindStatusCallback *ret = heap_alloc_zero(sizeof(BindStatusCallback)); - ret->lpBindStatusCallbackVtbl = &BindStatusCallbackVtbl; + ret->lpBindStatusCallbackExVtbl = &BindStatusCallbackExVtbl; ret->lpServiceProviderVtbl = &BSCServiceProviderVtbl; ret->lpHttpNegotiate2Vtbl = &BSCHttpNegotiateVtbl; ret->lpAuthenticateVtbl = &BSCAuthenticateVtbl; diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 473c6ab..b5bf79c 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1941,7 +1941,6 @@ static void test_GetBindInfoEx(IBindStatusCallback *holder) hres = IBindStatusCallback_QueryInterface(holder, &IID_IBindStatusCallbackEx, (void**)&bscex); if(FAILED(hres)) { - todo_wine win_skip("IBindStatusCallbackEx not supported\n"); return; }

1 0

Huw Davies : gdi32/tests: Fix tests on win9x and winMe.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 395436d2e9eec57d84cfdc4e27d4dcc7a30d2358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395436d2e9eec57d84cfdc4e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 2 17:08:31 2009 +0100 gdi32/tests: Fix tests on win9x and winMe. --- dlls/gdi32/tests/metafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index a85c608..d1966da 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2429,7 +2429,9 @@ static void getwinmetafilebits(UINT mode, int scale) default: pt.x = pt.y = 0; } - ok((short)rec->rdParm[0] == pt.y, "got %d expect %d\n", (short)rec->rdParm[0], pt.y); + ok((short)rec->rdParm[0] == pt.y || + broken(mode >= MM_LOMETRIC && mode <= MM_TWIPS && (short)rec->rdParm[0] == pt.y - 1), /* win9x, winme */ + "got %d expect %d\n", (short)rec->rdParm[0], pt.y); ok((short)rec->rdParm[1] == pt.x, "got %d expect %d\n", (short)rec->rdParm[1], pt.x); } if(rec_num == mfcomment_chunks + 2)

1 0

Frédéric Delanoy : crypt32: Update French translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: f6c42d37e578e85e1d0671944d94db422efc9cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c42d37e578e85e1d0671944… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 2 19:06:47 2009 +0200 crypt32: Update French translation. --- dlls/crypt32/crypt32_Fr.rc | 347 ++++++++++++++++++++++---------------------- 1 files changed, 175 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6c42d37e578e85e1d067…

1 0

Aurimas Fišeras : winecfg: Improve Lithuanian translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: e628509a29600a20ab3a51532262a6c97c84a620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e628509a29600a20ab3a51532… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jul 2 23:26:14 2009 +0300 winecfg: Improve Lithuanian translation. --- programs/winecfg/Lt.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index 297b411..296390b 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -144,7 +144,7 @@ BEGIN LTEXT "&Tipas:",IDC_STATIC_TYPE,15,138,21,10 COMBOBOX IDC_COMBO_TYPE,41,135,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Žymė ir numeris",IDC_LABELSERIAL_STATIC,15,155,95,10 + LTEXT "Vardas ir serijos numeris",IDC_LABELSERIAL_STATIC,15,155,80,10 PUSHBUTTON "Rodyti papil&domas",IDC_BUTTON_SHOW_HIDE_ADVANCED,180,136,66,13 CONTROL "Automatiškai aptikti iš įrenginio:",IDC_RADIO_AUTODETECT,"Button", @@ -154,7 +154,7 @@ BEGIN CONTROL "P&riskirti rankiniu būdu:",IDC_RADIO_ASSIGN,"Button", BS_AUTORADIOBUTTON,15,195,85,10 - LTEXT "&Žymė:",IDC_STATIC_LABEL,33,208,29,12 + LTEXT "&Vardas:",IDC_STATIC_LABEL,33,208,29,12 EDITTEXT IDC_EDIT_LABEL,63,205,78,13,ES_AUTOHSCROLL | WS_TABSTOP LTEXT "N&umeris:",IDC_STATIC_SERIAL,33,225,29,12 EDITTEXT IDC_EDIT_SERIAL,63,221,78,13,ES_AUTOHSCROLL | WS_TABSTOP @@ -217,7 +217,7 @@ BEGIN IDS_CHOOSE_PATH "Prašome išsirinkti unix paskirties aplanką." IDS_HIDE_ADVANCED "Slėpti papil&domas" IDS_SHOW_ADVANCED "Rodyti papil&domas" - IDS_NOTHEME "(Nėra apipavidalinimo)" + IDS_NOTHEME "(nėra apipavidalinimo)" IDS_TAB_GRAPHICS "Grafika" IDS_TAB_DESKTOP_INTEGRATION "Darbalaukio integravimas" IDS_TAB_AUDIO "Garsas" @@ -226,7 +226,7 @@ BEGIN IDS_WINECFG_TITLE_APP "Wine konfigūravimas: %s" IDS_THEMEFILE "Apipavidalinimo failai" IDS_THEMEFILE_SELECT "Pasirinkite apipavidalinimo failą" - IDS_AUDIO_MISSING "Registre nėra nurodyta garso tvarkyklė.\n\nRekomenduojama tvarkyklė buvo parinkta.\nGalite naudoti šią tvarkyklę ar pasirinkti kitą, jei tokių yra.\n\nTurite paspausti 'Vykdyti', kad pasirinkimas įsigaliotų." + IDS_AUDIO_MISSING "Registre nėra nurodyta garso tvarkyklė.\n\nRekomenduojama tvarkyklė buvo parinkta.\nGalite naudoti šią tvarkyklę ar pasirinkti kitą, jei tokių yra.\n\nTurite paspausti „Vykdyti“, kad pasirinkimas įsigaliotų." IDS_SHELL_FOLDER "Aplankas" IDS_LINKS_TO "Susietas su" END @@ -261,10 +261,10 @@ BEGIN IDS_DRIVE_CDROM "CD-ROM" IDS_DRIVE_LETTERS_EXCEEDED "Nebegalite pridėti daugiau diskų.\n\nKiekvienas diskas turi turėti raidę, nuo A iki Z, todėl negalite turėti daugiau nei 26" IDS_SYSTEM_DRIVE_LABEL "Sisteminis diskas" - IDS_CONFIRM_DELETE_C "Ar tikrai norite ištrinti C diską?\n\nDaugelis Windows programų mano, kad C diskas egzistuoja ir neveikia, jei jis neegzistuoja. Jei tęsite, nepamirškite atkurti C disko!" + IDS_CONFIRM_DELETE_C "Ar tikrai norite pašalinti C diską?\n\nDaugelis Windows programų mano, kad C diskas egzistuoja ir neveikia, kai jis neegzistuoja. Jei tęsite, nepamirškite atkurti C disko!" IDS_COL_DRIVELETTER "Raidė" IDS_COL_DRIVEMAPPING "Disko atvaizdavimas" - IDS_NO_DRIVE_C "Neturite C disko. Tai nėra gerai.\n\nNepamirškite paspausti 'Pridėti' diskų kortelėje, kad jį sukurtumėte!\n" + IDS_NO_DRIVE_C "Neturite C disko. Tai nėra gerai.\n\nNepamirškite paspausti „Pridėti“ diskų kortelėje, kad jį sukurtumėte!\n" END STRINGTABLE DISCARDABLE @@ -288,7 +288,7 @@ BEGIN IDS_DEVICES_MIDIIN "MIDI In įrenginiai" IDS_DEVICES_AUX "Aux įrenginiai" IDS_DEVICES_MIXER "Mixer įrenginiai" - IDS_UNAVAILABLE_DRIVER "Registre rasta tvarkyklė, kuri yra neprieinama!\n\nPašalinti '%s' iš registro?" + IDS_UNAVAILABLE_DRIVER "Registre rasta tvarkyklė, kuri yra neprieinama!\n\nPašalinti „%s“ iš registro?" IDS_WARNING "Įspėjimas" END

1 0

Aurimas Fišeras : notepad: Update Lithuanian translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 509a580b6226435ed1d91b9d53c1451b44c18553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509a580b6226435ed1d91b9d5… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jul 2 17:46:12 2009 +0300 notepad: Update Lithuanian translation. --- programs/notepad/Lt.rc | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Lt.rc b/programs/notepad/Lt.rc index 0a12305..ddc2d61 100644 --- a/programs/notepad/Lt.rc +++ b/programs/notepad/Lt.rc @@ -94,6 +94,14 @@ PUSHBUTTON "Atsisakyti", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Žinynas", 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 "Koduotė:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -121,4 +129,12 @@ STRING_NOTFOUND, "Frazė „%s“ nerasta." STRING_OUT_OF_MEMORY, "Neužtenka atminties operacijai užbaigti.\n\ Norėdami atlaisvinti atminties uždarykite vieną ar daugiau programų." +STRING_UNICODE_LE, "Unikodas (UTF-16)" +STRING_UNICODE_BE, "Unikodas (UTF-16 mažėjantys baitai)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ + Šiame faile yra unikodo ženklų, kurie bus prarasti, jei išsaugosite failą %s koduotėje.\n\ + Norėdami išsaugoti šiuos ženklus, spauskite „Atsisakyti“ ir pasirinkite vieną iš \ + unikodo nuostatų koduotės išskleidžiamajame sąraše.\n\ + Tęsti?" }

1 0

Aurimas Fišeras : cmd: Add Lithuanian translation.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: d7a1cb2c25a00e07d8e6749099641629b6ebf6c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a1cb2c25a00e07d8e674909… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jul 2 17:09:14 2009 +0300 cmd: Add Lithuanian translation. --- programs/cmd/Lt.rc | 279 ++++++++++++++++++++++++++++++++++++++++++++++ programs/cmd/Makefile.in | 1 + 2 files changed, 280 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7a1cb2c25a00e07d8e67…

1 0