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

Aurimas Fišeras : taskmgr: Make all static text translatable.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 34ccc50a992952c5f91f6579bf8d741752dd657f URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ccc50a992952c5f91f6579b… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 15:28:09 2009 +0300 taskmgr: Make all static text translatable. --- programs/taskmgr/En.rc | 17 +++++++++++++++ programs/taskmgr/resource.h | 13 ++++++++++++ programs/taskmgr/taskmgr.c | 46 ++++++++++++++++++++++++++---------------- 3 files changed, 58 insertions(+), 18 deletions(-) diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index 8694588..a36503e 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -484,3 +484,20 @@ BEGIN "Sets process to the BELOW NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sets process to the LOW priority class" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_VIEW_LARGE "Lar&ge Icons" + IDS_VIEW_SMALL "S&mall Icons" + IDS_VIEW_DETAILS "&Details" + IDS_WINDOWS "&Windows" + IDS_VIEW_SELECTCOLUMNS "&Select Columns..." + IDS_OPTIONS_SHOW16BITTASKS "&Show 16-bit tasks" + IDS_VIEW_CPUHISTORY "&CPU History" + IDS_VIEW_CPUHISTORY_ONEGRAPHALL "&One Graph, All CPUs" + IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU "One Graph &Per CPU" + IDS_VIEW_SHOWKERNELTIMES "&Show Kernel Times" + IDS_APPLICATIONS "Applications" + IDS_PROCESSES "Processes" + IDS_PERFORMANCE "Performance" +END diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h index cc9ac01..959efdb 100644 --- a/programs/taskmgr/resource.h +++ b/programs/taskmgr/resource.h @@ -182,6 +182,19 @@ #define ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL 32813 #define ID_PROCESS_PAGE_SETPRIORITY_LOW 32814 #define ID_PROCESS_PAGE_DEBUGCHANNELS 32815 +#define IDS_VIEW_LARGE 32816 +#define IDS_VIEW_SMALL 32817 +#define IDS_VIEW_DETAILS 32818 +#define IDS_WINDOWS 32819 +#define IDS_VIEW_SELECTCOLUMNS 32820 +#define IDS_OPTIONS_SHOW16BITTASKS 32821 +#define IDS_VIEW_CPUHISTORY 32822 +#define IDS_VIEW_CPUHISTORY_ONEGRAPHALL 32823 +#define IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU 32824 +#define IDS_VIEW_SHOWKERNELTIMES 32825 +#define IDS_APPLICATIONS 32826 +#define IDS_PROCESSES 32827 +#define IDS_PERFORMANCE 32828 #define IDC_STATIC -1 /* diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 923a445..8393623 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -122,9 +122,13 @@ static BOOL OnCreate(HWND hWnd) RECT rc; TCITEMW item; - static WCHAR wszApplications[] = {'A','p','p','l','i','c','a','t','i','o','n','s',0}; - static WCHAR wszProcesses[] = {'P','r','o','c','e','s','s','e','s',0}; - static WCHAR wszPerformance[] = {'P','e','r','f','o','r','m','a','n','c','e',0}; + static WCHAR wszApplications[255]; + static WCHAR wszProcesses[255]; + static WCHAR wszPerformance[255]; + + LoadStringW(hInst, IDS_APPLICATIONS, wszApplications, sizeof(wszApplications)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_PERFORMANCE, wszPerformance, sizeof(wszPerformance)/sizeof(WCHAR)); SendMessageW(hMainWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER))); @@ -621,21 +625,27 @@ static void TaskManager_OnTabWndSelChange(void) HMENU hViewMenu; HMENU hSubMenu; - static const WCHAR wszLargeIcons[] = {'L','a','r','&','g','e',' ','I','c','o','n','s',0}; - static const WCHAR wszSmallIcons[] = {'S','&','m','a','l','l',' ','I','c','o','n','s',0}; - static const WCHAR wszDetails[] = {'&','D','e','t','a','i','l','s',0}; - static const WCHAR wszWindows[] = {'&','W','i','n','d','o','w','s',0}; - static const WCHAR wszSelectColumns[] = {'&','S','e','l','e','c','t',' ', - 'C','o','l','u','m','n','s','.','.','.',0}; - static const WCHAR wszShow16bTasks[] = {'&','S','h','o','w',' ','1','6','-','b','i','t',' ', - 't','a','s','k','s',0}; - static const WCHAR wszOneGraphAllCPU[] = {'&','O','n','e',' ','G','r','a','p','h',',',' ', - 'A','l','l',' ','C','P','U','s',0}; - static const WCHAR wszOneGraphPerCPU[] = {'O','n','e',' ','G','r','a','p','h',' ', - '&','P','e','r',' ','C','P','U',0}; - static const WCHAR wszCPUHistory[] = {'&','C','P','U',' ','H','i','s','t','o','r','y',0}; - static const WCHAR wszShowKernelTimes[] = {'&','S','h','o','w',' ','K','e','r','n','e','l',' ', - 'T','i','m','e','s',0}; + WCHAR wszLargeIcons[255]; + WCHAR wszSmallIcons[255]; + WCHAR wszDetails[255]; + WCHAR wszWindows[255]; + WCHAR wszSelectColumns[255]; + WCHAR wszShow16bTasks[255]; + WCHAR wszOneGraphAllCPU[255]; + WCHAR wszOneGraphPerCPU[255]; + WCHAR wszCPUHistory[255]; + WCHAR wszShowKernelTimes[255]; + + LoadStringW(hInst, IDS_VIEW_LARGE, wszLargeIcons, sizeof(wszLargeIcons)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_SMALL, wszSmallIcons, sizeof(wszSmallIcons)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_DETAILS, wszDetails, sizeof(wszDetails)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_WINDOWS, wszWindows, sizeof(wszWindows)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_SELECTCOLUMNS, wszSelectColumns, sizeof(wszSelectColumns)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_OPTIONS_SHOW16BITTASKS, wszShow16bTasks, sizeof(wszShow16bTasks)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_CPUHISTORY_ONEGRAPHALL, wszOneGraphAllCPU, sizeof(wszOneGraphAllCPU)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU, wszOneGraphPerCPU, sizeof(wszOneGraphPerCPU)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_CPUHISTORY, wszCPUHistory, sizeof(wszCPUHistory)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIEW_SHOWKERNELTIMES, wszShowKernelTimes, sizeof(wszShowKernelTimes)/sizeof(WCHAR)); hMenu = GetMenu(hMainWnd); hViewMenu = GetSubMenu(hMenu, 2);

1 0

Aurimas Fišeras : setupapi: Add Lithuanian translation .
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: f326c268744b07f05d00ebf55f02e1d6c28cba0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f326c268744b07f05d00ebf55… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 16:40:22 2009 +0300 setupapi: Add Lithuanian translation. --- dlls/setupapi/Lt.rc | 61 +++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.rc | 1 + 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Lt.rc b/dlls/setupapi/Lt.rc new file mode 100644 index 0000000..f56b079 --- /dev/null +++ b/dlls/setupapi/Lt.rc @@ -0,0 +1,61 @@ +/* + * Lithuanian resources for SETUPAPI + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "Reikalingas failas '%s' esantis %s" + IDS_UNKNOWN "Nežinomas" + IDS_COPYFROM "Kopijuoti failus iš:" + IDS_INFO "Įveskite kelią iki failo, o tada spauskite Gerai." +} + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Kopijuojami failai..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Atsisakyti", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Šaltinis:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Paskirtis:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + 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 "Reikalingi failai" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Įdėkite gamintojo diegimo diską, o tada\nįsitikinkite, kad žemiau išrinktas teisingas diskas", 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 "Kopijuoti gamintojo failus iš:", 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 "Gerai", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Atsisakyti", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Parinkti...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +#pragma code_page(default) diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc index 4a98758..97d2a07 100644 --- a/dlls/setupapi/setupapi.rc +++ b/dlls/setupapi/setupapi.rc @@ -37,6 +37,7 @@ #include "It.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

Aurimas Fišeras : shlwapi: Add Lithuanian translation.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: ec7fc36862d91d2f4a3ec967497fa89b0160816c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7fc36862d91d2f4a3ec9674… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 16:48:19 2009 +0300 shlwapi: Add Lithuanian translation. --- dlls/shlwapi/shlwapi.rc | 1 + dlls/shlwapi/shlwapi_Lt.rc | 48 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.rc b/dlls/shlwapi/shlwapi.rc index d159dab..f9e6873 100644 --- a/dlls/shlwapi/shlwapi.rc +++ b/dlls/shlwapi/shlwapi.rc @@ -36,6 +36,7 @@ #include "shlwapi_It.rc" #include "shlwapi_Ja.rc" #include "shlwapi_Ko.rc" +#include "shlwapi_Lt.rc" #include "shlwapi_Nl.rc" #include "shlwapi_No.rc" #include "shlwapi_Pl.rc" diff --git a/dlls/shlwapi/shlwapi_Lt.rc b/dlls/shlwapi/shlwapi_Lt.rc new file mode 100644 index 0000000..9ef2593 --- /dev/null +++ b/dlls/shlwapi/shlwapi_Lt.rc @@ -0,0 +1,48 @@ +/* + * Lithuanian resources for shlwapi + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Klaida!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "Daugiau ne&rodyti šio pranešimo", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Gerai" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Atsisakyti" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Taip" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ne" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_BYTES_FORMAT "%ld baitai" + IDS_TIME_INTERVAL_HOURS " val" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sek" +} + +#pragma code_page(default)

1 0

Jaime Rave : notepad: Update Spanish translation.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: e1f1774498f8c13a3843a86a07c1ec98a011c3d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f1774498f8c13a3843a86a0… Author: Jaime Rave <jaimerave(a)gmail.com> Date: Sun Jun 21 12:29:29 2009 -0500 notepad: Update Spanish translation. --- programs/notepad/Es.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Es.rc b/programs/notepad/Es.rc index dd19927..ae1e0f7 100644 --- a/programs/notepad/Es.rc +++ b/programs/notepad/Es.rc @@ -55,6 +55,7 @@ POPUP "&Editar" { POPUP "&Buscar" { MENUITEM "&Buscar...\tCtrl+F", CMD_SEARCH MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT + MENUITEM "&Reemplazar...\tCtrl+H", CMD_REPLACE } POPUP "A&yuda" { MENUITEM "�&ndice", CMD_HELP_CONTENTS

1 0

Aric Stewart : browseui: Add Japanese translation.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 43f6c4cb70f7488aa12ee2bb0e25fc3e4a4e7b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f6c4cb70f7488aa12ee2bb0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 22 10:21:34 2009 +0900 browseui: Add Japanese translation. --- dlls/browseui/rsrc.rc | 1 + dlls/browseui/rsrc_Ja.rc | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/rsrc.rc b/dlls/browseui/rsrc.rc index c16391f..e593c38 100644 --- a/dlls/browseui/rsrc.rc +++ b/dlls/browseui/rsrc.rc @@ -28,6 +28,7 @@ #include "rsrc_En.rc" #include "rsrc_Es.rc" #include "rsrc_Fr.rc" +#include "rsrc_Ja.rc" #include "rsrc_Ko.rc" #include "rsrc_Lt.rc" #include "rsrc_Nl.rc" diff --git a/dlls/browseui/rsrc_Ja.rc b/dlls/browseui/rsrc_Ja.rc new file mode 100644 index 0000000..ee78414 --- /dev/null +++ b/dlls/browseui/rsrc_Ja.rc @@ -0,0 +1,42 @@ +/* + * Copyright 2009 Aric Stewart, CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CANCELLING "キャンセル…" +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "キャンセル(&C)", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +} + +#pragma code_page(default)

1 0

Alexandre Julliard : wrc: Add support for loading multiple input files at once.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: e25bc79da1fb69faa9815caac2f093bb47ff968a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e25bc79da1fb69faa9815caac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 22 12:05:57 2009 +0200 wrc: Add support for loading multiple input files at once. --- tools/wrc/parser.h | 1 + tools/wrc/parser.l | 2 + tools/wrc/parser.y | 20 +++++-- tools/wrc/wrc.c | 154 ++++++++++++++++++++++++++----------------------- tools/wrc/wrc.man.in | 4 +- 5 files changed, 102 insertions(+), 79 deletions(-) diff --git a/tools/wrc/parser.h b/tools/wrc/parser.h index b9e2045..e9fc8e6 100644 --- a/tools/wrc/parser.h +++ b/tools/wrc/parser.h @@ -34,5 +34,6 @@ extern char *parser_text; extern int yy_flex_debug; int parser_lex(void); +int parser_lex_destroy(void); #endif diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index bddc309..e706100 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -121,6 +121,8 @@ cident [a-zA-Z_][0-9a-zA-Z_]* /* Always update the current character position within a line */ #define YY_USER_ACTION char_number+=yyleng; wanted_id = want_id; want_id = 0; +#define YY_USER_INIT current_codepage = -1; + static void addcchar(char c); static void addwchar(WCHAR s); static string_t *get_buffered_cstring(void); diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 512d272..f891f24 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -169,12 +169,12 @@ int want_nl = 0; /* Signal flex that we need the next newline */ int want_id = 0; /* Signal flex that we need the next identifier */ -stringtable_t *tagstt; /* Stringtable tag. +static stringtable_t *tagstt; /* Stringtable tag. * It is set while parsing a stringtable to one of * the stringtables in the sttres list or a new one * if the language was not parsed before. */ -stringtable_t *sttres; /* Stringtable resources. This holds the list of +static stringtable_t *sttres; /* Stringtable resources. This holds the list of * stringtables with different lanuages */ static int dont_want_id = 0; /* See language parsing for details */ @@ -358,7 +358,7 @@ static int rsrcid_to_token(int lookahead); resource_file : resources { - resource_t *rsc; + resource_t *rsc, *head; /* First add stringtables to the resource-list */ rsc = build_stt_resources(sttres); /* 'build_stt_resources' returns a head and $1 is a tail */ @@ -384,8 +384,18 @@ resource_file } else $1 = rsc; - /* Final statement before were done */ - resource_top = get_resource_head($1); + + /* Final statements before were done */ + head = get_resource_head($1); + if (resource_top) /* append to existing resources */ + { + resource_t *tail = resource_top; + while (tail->next) tail = tail->next; + tail->next = head; + head->prev = tail; + } + else resource_top = head; + sttres = NULL; } ; diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 05bd3f8..833d602 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -232,6 +232,68 @@ static void exit_on_signal( int sig ) exit(1); /* this will call the atexit functions */ } +/* load a single input file */ +static int load_file( const char *input_name, const char *output_name ) +{ + int ret; + + /* Run the preprocessor on the input */ + if(!no_preprocess) + { + /* + * Preprocess the input to a temp-file, or stdout if + * no output was given. + */ + + chat("Starting preprocess\n"); + + if (!preprocess_only) + { + ret = wpp_parse_temp( input_name, output_name, &temp_name ); + } + else if (output_name) + { + FILE *output; + + if (!(output = fopen( output_name, "w" ))) + fatal_perror( "Could not open %s for writing", output_name ); + ret = wpp_parse( input_name, output ); + fclose( output ); + } + else + { + ret = wpp_parse( input_name, stdout ); + } + + if (ret) return ret; + + if(preprocess_only) + { + output_name = NULL; + exit(0); + } + + input_name = temp_name; + } + + /* Go from .rc to .res */ + chat("Starting parse\n"); + + if(!(parser_in = fopen(input_name, "rb"))) + fatal_perror("Could not open %s for input", input_name); + + ret = parser_parse(); + fclose(parser_in); + parser_lex_destroy(); + if (temp_name) + { + unlink( temp_name ); + temp_name = NULL; + } + return ret; +} + + int main(int argc,char *argv[]) { extern char* optarg; @@ -240,7 +302,6 @@ int main(int argc,char *argv[]) int opti = 0; int stdinc = 1; int lose = 0; - int ret; int i; int cmdlen; @@ -402,20 +463,6 @@ int main(int argc,char *argv[]) wpp_add_include_path(INCLUDEDIR"/msvcrt"); wpp_add_include_path(INCLUDEDIR"/windows"); } - - /* Check for input file on command-line */ - if(optind < argc) - { - if (!input_name) input_name = argv[optind++]; - else error("Too many input files.\n"); - } - - /* Check for output file on command-line */ - if(optind < argc) - { - if (!output_name) output_name = argv[optind++]; - else error("Too many output files.\n"); - } /* Kill io buffering when some kind of debuglevel is enabled */ if(debuglevel) @@ -435,65 +482,28 @@ int main(int argc,char *argv[]) if(!currentlanguage) currentlanguage = new_language(0, 0); - /* Generate appropriate outfile names */ - if(!output_name && !preprocess_only) - { - output_name = dup_basename(input_name, ".rc"); - strcat(output_name, ".res"); - } atexit(cleanup_files); - /* Run the preprocessor on the input */ - if(!no_preprocess) - { - /* - * Preprocess the input to a temp-file, or stdout if - * no output was given. - */ - - chat("Starting preprocess\n"); - - if (!preprocess_only) - { - ret = wpp_parse_temp( input_name, output_name, &temp_name ); - } - else if (output_name) - { - FILE *output; - - if (!(output = fopen( output_name, "w" ))) - fatal_perror( "Could not open %s for writing", output_name ); - ret = wpp_parse( input_name, output ); - fclose( output ); - } - else - { - ret = wpp_parse( input_name, stdout ); - } - - if(ret) - exit(1); /* Error during preprocess */ - - if(preprocess_only) - { - output_name = NULL; - exit(0); - } - - input_name = temp_name; - } - - /* Go from .rc to .res */ - chat("Starting parse\n"); - - if(!(parser_in = fopen(input_name, "rb"))) - fatal_perror("Could not open %s for input", input_name); - - ret = parser_parse(); - - if(input_name) fclose(parser_in); - - if(ret) exit(1); /* Error during parse */ + if (input_name) /* specified with -i option */ + { + if(!output_name && !preprocess_only) + { + output_name = dup_basename(input_name, ".rc"); + strcat(output_name, ".res"); + } + if (load_file( input_name, output_name )) exit(1); + } + + while (optind < argc) + { + input_name = argv[optind++]; + if(!output_name && !preprocess_only) + { + output_name = dup_basename(input_name, ".rc"); + strcat(output_name, ".res"); + } + if (load_file( input_name, output_name )) exit(1); + } if(debuglevel & DEBUGLEVEL_DUMP) dump_resources(resource_top); diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index 7dfefc0..5c8d0c0 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -3,7 +3,7 @@ .SH NAME wrc \- Wine Resource Compiler .SH SYNOPSIS -.BI "wrc " "[options] " "[inputfile]" +.BI "wrc " "[options] " "[inputfiles]" .SH DESCRIPTION .B wrc compiles resources from \fBinputfile\fR @@ -14,7 +14,7 @@ preprocessor before the resources are compiled. See \fBPREPROCESSOR\fR below. .PP .B wrc -takes only one \fBinputfile\fR as argument. The resources are read from +takes a series of \fBinputfile\fR as argument. The resources are read from standard input if no inputfile is given. If the output file is not specified with \fI-o\fR, then \fBwrc\fR will write the output to \fBinputfile.res\fR with \fB.rc\fR stripped, or to \fBwrc.tab.res\fR if

1 0

Gerald Pfeifer : dsound/tests: Fix two broken conditions.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 94203b5ddb4b1d988465a68320d43b23db9b303d URL: http://source.winehq.org/git/wine.git/?a=commit;h=94203b5ddb4b1d988465a6832… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jun 19 19:17:22 2009 +0200 dsound/tests: Fix two broken conditions. --- dlls/dsound/tests/dsound8.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index a52f653..a2b16d8 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -759,7 +759,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(((rc==DSERR_CONTROLUNAVAIL || DSERR_INVALIDCALL /* 2003 */) && !secondary) + ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -805,7 +805,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(((rc==DSERR_CONTROLUNAVAIL || DSERR_INVALIDCALL /* 2003 */) && !secondary) + ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary);

1 0

Aurimas Fišeras : oleaut32: Add Lithuanian translation .
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 0ecb7de0a0783881064b07cc6a36e37d9d5a530c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ecb7de0a0783881064b07cc6… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 11:12:35 2009 +0300 oleaut32: Add Lithuanian translation. --- dlls/oleaut32/oleaut32.rc | 1 + dlls/oleaut32/oleaut32_Lt.rc | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/oleaut32.rc b/dlls/oleaut32/oleaut32.rc index 206a539..156a8f9 100644 --- a/dlls/oleaut32/oleaut32.rc +++ b/dlls/oleaut32/oleaut32.rc @@ -36,6 +36,7 @@ #include "oleaut32_Hu.rc" #include "oleaut32_It.rc" #include "oleaut32_Ko.rc" +#include "oleaut32_Lt.rc" #include "oleaut32_Nl.rc" #include "oleaut32_No.rc" #include "oleaut32_Pl.rc" diff --git a/dlls/oleaut32/oleaut32_Lt.rc b/dlls/oleaut32/oleaut32_Lt.rc new file mode 100644 index 0000000..202a5d3 --- /dev/null +++ b/dlls/oleaut32/oleaut32_Lt.rc @@ -0,0 +1,36 @@ +/* + * Lithuanian resources for oleaut32 + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Tiesa" + IDS_FALSE "Netiesa" + IDS_YES "Taip" + IDS_NO "Ne" + IDS_ON "Įjungta" + IDS_OFF "Išjungta" +} + +#pragma code_page(default)

1 0

Aurimas Fišeras : localspl: Add Lithuanian translation .
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 1631a6750d82fd283b324d91450dbf63aa38072e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1631a6750d82fd283b324d914… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 09:47:38 2009 +0300 localspl: Add Lithuanian translation. --- dlls/localspl/localspl.rc | 1 + dlls/localspl/spl_Lt.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index 71c1e46..8d0563f 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -41,6 +41,7 @@ #include "spl_De.rc" #include "spl_Fr.rc" #include "spl_Ko.rc" +#include "spl_Lt.rc" #include "spl_Nl.rc" #include "spl_No.rc" #include "spl_Pl.rc" diff --git a/dlls/localspl/spl_Lt.rc b/dlls/localspl/spl_Lt.rc new file mode 100644 index 0000000..321ab06 --- /dev/null +++ b/dlls/localspl/spl_Lt.rc @@ -0,0 +1,32 @@ +/* + * Lithuanian resources for localspl + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Vietinis prievadas" + IDS_LOCALMONITOR "Vietinis monitorius" +} + +#pragma code_page(default)

1 0

Aurimas Fišeras : mpr: Add Lithuanian translation.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: d7434fea990b61394bbf4347ad46eb6ec8b2613e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7434fea990b61394bbf4347a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Jun 19 20:36:25 2009 +0300 mpr: Add Lithuanian translation. --- dlls/mpr/mpr.rc | 1 + dlls/mpr/mpr_Lt.rc | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/mpr.rc b/dlls/mpr/mpr.rc index e9f0cfb..adc0d72 100644 --- a/dlls/mpr/mpr.rc +++ b/dlls/mpr/mpr.rc @@ -36,6 +36,7 @@ #include "mpr_It.rc" #include "mpr_Ja.rc" #include "mpr_Ko.rc" +#include "mpr_Lt.rc" #include "mpr_Nl.rc" #include "mpr_No.rc" #include "mpr_Pl.rc" diff --git a/dlls/mpr/mpr_Lt.rc b/dlls/mpr/mpr_Lt.rc new file mode 100644 index 0000000..aa5dd14 --- /dev/null +++ b/dlls/mpr/mpr_Lt.rc @@ -0,0 +1,51 @@ +/* + * MPR dll resources + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Visas tinklas" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Įveskite tinklo slaptažodį" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Įveskite savo naudotojo vardą ir slaptažodį:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Įgaliot. serv.", -1, 40, 26, 50, 10 +/* LTEXT "Sritis", -1, 40, 46, 50, 10 */ + LTEXT "Naudotojas", -1, 40, 66, 50, 10 + LTEXT "Slaptažodis", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "Į&rašyti šį slaptažodį (nesaugu)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Gerai", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +#pragma code_page(default)

1 0