Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 56101: [CLT2012] - Add hybrid CD tools by Colin. See r51077, r46059
by tfaber＠svn.reactos.org 10 Mar '12

10 Mar '12

Author: tfaber Date: Sat Mar 10 09:41:41 2012 New Revision: 56101 URL: http://svn.reactos.org/svn/reactos?rev=56101&view=rev Log: [CLT2012] - Add hybrid CD tools by Colin. See r51077, r46059 Added: branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini (contents, props changed) - copied, changed from r56095, tags/ReactOS-0.3.13-CLT2011/reactos/hybridcd_freeldr.ini branches/ros-branch-0_3_14-clt2012/make_hybridcd.cmd (props changed) - copied unchanged from r56095, tags/ReactOS-0.3.13-CLT2011/reactos/make_hybridcd.cmd Copied: branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini (from r56095, tags/ReactOS-0.3.13-CLT2011/reactos/hybridcd_freeldr.ini) URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/hybri… ============================================================================== --- tags/ReactOS-0.3.13-CLT2011/reactos/hybridcd_freeldr.ini [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini [iso-8859-1] Sat Mar 10 09:41:41 2012 @@ -3,7 +3,7 @@ Timeout=10 [Display] -TitleText=ReactOS 0.3.13 - CLT 2011 +TitleText=ReactOS 0.3.14 - CLT 2012 StatusBarColor=Cyan StatusBarTextColor=Black BackdropTextColor=White Propchange: branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini ------------------------------------------------------------------------------ svn:eol-style = CRLF Propchange: branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Mar 10 09:41:41 2012 @@ -1,0 +1,6 @@ +/branches/header-work/hybridcd_freeldr.ini:45691-47721 +/branches/reactos-yarotows/hybridcd_freeldr.ini:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/hybridcd_freeldr.ini:49994-49995 +/branches/ros-amd64-bringup/hybridcd_freeldr.ini:36852 +/branches/ros-amd64-bringup/reactos/hybridcd_freeldr.ini:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/trunk/reactos/hybridcd_freeldr.ini:51043-51044,51046-51048,51053,51058,51062-51063,51067,51069 Propchange: branches/ros-branch-0_3_14-clt2012/make_hybridcd.cmd ------------------------------------------------------------------------------ svn:eol-style = CRLF Propchange: branches/ros-branch-0_3_14-clt2012/make_hybridcd.cmd ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Mar 10 09:41:41 2012 @@ -1,0 +1,6 @@ +/branches/header-work/make_hybridcd.cmd:45691-47721 +/branches/reactos-yarotows/make_hybridcd.cmd:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/make_hybridcd.cmd:49994-49995 +/branches/ros-amd64-bringup/make_hybridcd.cmd:36852 +/branches/ros-amd64-bringup/reactos/make_hybridcd.cmd:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/trunk/reactos/make_hybridcd.cmd:51043-51044,51046-51048,51053,51058,51062-51063,51067,51069

1 0

[tfaber] 56100: [CLT2012] - Adjust the CD root readme.txt for CLT - Add CD options to welcome.exe - Taken from previous years, see r51078, r46065
by tfaber＠svn.reactos.org 10 Mar '12

10 Mar '12

Author: tfaber Date: Sat Mar 10 09:38:41 2012 New Revision: 56100 URL: http://svn.reactos.org/svn/reactos?rev=56100&view=rev Log: [CLT2012] - Adjust the CD root readme.txt for CLT - Add CD options to welcome.exe - Taken from previous years, see r51078, r46065 Added: branches/ros-branch-0_3_14-clt2012/boot/bootdata/readme.txt (contents, props changed) - copied, changed from r56095, tags/ReactOS-0.3.13-CLT2011/reactos/boot/bootdata/readme.txt Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/bg-BG.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/cs-CZ.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/da-DK.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/el-GR.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/en-US.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/es-ES.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/et-EE.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/fr-FR.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/hu-HU.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/id-ID.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/it-IT.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/ja-JP.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/lt-LT.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/nl-NL.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/no-NO.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/pl-PL.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/pt-BR.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/ro-RO.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/ru-RU.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/sk-SK.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/sv-SE.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/th-TH.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/uk-UA.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/zh-CN.rc Modified: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/CMakeLists.txt branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/de-DE.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/rsrc.rc branches/ros-branch-0_3_14-clt2012/base/setup/welcome/welcome.c branches/ros-branch-0_3_14-clt2012/base/setup/welcome/welcome.rbuild Modified: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/CMakeLists.txt [iso-8859-1] Sat Mar 10 09:38:41 2012 @@ -4,5 +4,5 @@ add_executable(welcome welcome.c welcome.rc) set_module_type(welcome win32gui UNICODE) -add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll) +add_importlibs(welcome gdi32 user32 shell32 msvcrt kernel32 ntdll) add_cd_file(TARGET welcome DESTINATION reactos NO_CAB FOR bootcd) Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/bg-BG.rc (removed) @@ -1,82 +1,0 @@ -/* - * Bulgarian(BG) resources - * - * Copyright (C) 2005 Violin Iliev - * www.violin-bg.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - - -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - ÐÐ¾Ð±ÑÐµ Ð´Ð¾ÑÐ»Ð¸" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "ÐÐ¾Ð±ÑÐµ Ð´Ð¾ÑÐ»Ð¸ Ð² Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð° ÑÐ¸ÑÑÐµÐ¼Ð° React.\n\nÐÐ·Ð±ÐµÑÐµÑÐµ ÑÐ¸ Ð¾Ñ ÑÐµÐ¼Ð¸ÑÐµ Ð² Ð»ÑÐ²Ð¾." -// IDS_CHECKTEXT "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð¹ Ð¾ÑÐ½Ð¾Ð²Ð¾ ÑÐ¾Ð·Ð¸ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ" -// IDS_CLOSETEXT "ÐÐ·ÑÐ¾Ð´" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° ReactOS" - IDS_TOPICBUTTON1 "Ð Ð°Ð·Ð³Ð»ÐµÐ´Ð°Ð¹ ÑÐ¾Ð²Ð° CD" - IDS_TOPICBUTTON2 "ÐÐ·ÑÐ¾Ð´" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° ReactOSS" - IDS_TOPICTITLE1 "Ð Ð°Ð·Ð³Ð»ÐµÐ´Ð°Ð¹ ÑÐ¾Ð²Ð° CD" - IDS_TOPICTITLE2 "ÐÐ·ÑÐ¾Ð´" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð° Ð¸Ð½ÑÑÐ°Ð»Ð°ÑÐ¸Ñ Ð½Ñ ReactOS Ð¸Ð»Ð¸ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÑÑÐµÑÑÐ²ÑÐ²Ð°ÑÐ° ÑÐ°ÐºÐ°Ð²Ð°." - IDS_TOPICDESC1 "Ð Ð°Ð·Ð³Ð»ÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° CD-ÑÐ¾." - IDS_TOPICDESC2 "ÐÐ°ÑÐ¸ÑÐ½ÐµÑÐµ Ð·Ð° Ð¸Ð·ÑÐ¾Ð´ Ð¾Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°ÑÐ°." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/cs-CZ.rc (removed) @@ -1,60 +1,0 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - VÃtejte" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "VÃtejte v operaÄnÃm systÃ©mu ReactOS.\n\nKlepnÄte na tlaÄÃtko v levÃ©m sloupci." -// IDS_CHECKTEXT "Zobrazit dialog znovu" -// IDS_CLOSETEXT "Konec" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Instalovat ReactOS" - IDS_TOPICBUTTON1 "ProhlÃÅ¾et toto CD" - IDS_TOPICBUTTON2 "Konec" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Instalovat ReactOS" - IDS_TOPICTITLE1 "ProhlÃÅ¾et toto CD" - IDS_TOPICTITLE2 "Konec" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Nainstaluje ReactOS na VÃ¡Å¡ poÄÃtaÄ nebo zaktualizuje existujÃcÃ systÃ©m." - IDS_TOPICDESC1 "ProhlÃÅ¾et toto CD." - IDS_TOPICDESC2 "KlepnÄte pro ukonÄenÃ tohoto programu." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/da-DK.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/da-DK.rc (removed) @@ -1,60 +1,0 @@ -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Velkommen" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Velkommen til ReactOs operativ System.\n\nKlik pÃ¥ et emne til venstre." -// IDS_CHECKTEXT "Vis denne dialog igen ved opstart" -// IDS_CLOSETEXT "Afslut" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Installer ReactOS" - IDS_TOPICBUTTON1 "Gennemse Cdrom" - IDS_TOPICBUTTON2 "Afslut" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Installer ReactOS" - IDS_TOPICTITLE1 "Gennemse Cdrom" - IDS_TOPICTITLE2 "Afslut" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Opret en ny ReactOS installation pÃ¥ din computer eller opgradere en eksisterende installation." - IDS_TOPICDESC1 "Gennemse Reactos Installations Cdrom" - IDS_TOPICDESC2 "Klik pÃ¥ Afslut for at lukke." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Modified: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/de-DE.rc [iso-8859-1] Sat Mar 10 09:38:41 2012 @@ -9,56 +9,57 @@ /* Default settings */ STRINGTABLE DISCARDABLE BEGIN - IDS_APPTITLE "ReactOS - Willkommen" + IDS_APPTITLE "ReactOS 0.3.14 - CLT 2012" IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Willkommen in ReactOS.\n\nKlicken Sie auf ein Thema auf der linken Seite." -// IDS_CHECKTEXT "Dialog beim nÃ¤chsen Start wieder anzeigen" -// IDS_CLOSETEXT "Beenden" + IDS_DEFAULTTOPICDESC "ReactOS ist ein modernes Open-Source-Betriebssystem, welches auf dem Design von WindowsÂ® XP/2003 basiert. Dazu gehÃ¶rt sowohl die volle KompatibilitÃ¤t mit Windows-Anwendungen und -Treibern als auch eine Ã¤hnliche BenutzeroberflÃ¤che, damit sich die meisten Anwender sofort zurechtfinden. Der Quellcode des gesamten Systems ist frei verfÃ¼gbar und steht grÃ¶Ãtenteils unter der GNU General Public License." END /* Topic buttons */ STRINGTABLE DISCARDABLE BEGIN IDS_TOPICBUTTON0 "ReactOS installieren" - IDS_TOPICBUTTON1 "CD durchsuchen" - IDS_TOPICBUTTON2 "Beenden" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" + IDS_TOPICBUTTON1 "ReactOS in QEMU ausprobieren" + IDS_TOPICBUTTON2 "ReactOS Build Environment installieren" + IDS_TOPICBUTTON3 "ReactOS-Quellcodepaket Ã¶ffnen" + IDS_TOPICBUTTON4 "Die ReactOS-Website besuchen" + IDS_TOPICBUTTON5 "Die CD durchsuchen" + IDS_TOPICBUTTON6 "Beenden" END /* Topic titles */ STRINGTABLE DISCARDABLE BEGIN IDS_TOPICTITLE0 "ReactOS installieren" - IDS_TOPICTITLE1 "CD durchsuchen" - IDS_TOPICTITLE2 "Beenden" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" + IDS_TOPICTITLE1 "ReactOS in QEMU ausprobieren" + IDS_TOPICTITLE2 "ReactOS Build Environment installieren" + IDS_TOPICTITLE3 "ReactOS-Quellcodepaket Ã¶ffnen" + IDS_TOPICTITLE4 "Die ReactOS-Website besuchen" + IDS_TOPICTITLE5 "Die CD durchsuchen" + IDS_TOPICTITLE6 "Beenden" END /* Topic descriptions */ STRINGTABLE DISCARDABLE BEGIN - IDS_TOPICDESC0 "Installiert ReactOS auf ihrem Computer oder aktualisiert eine bestehende Installation." - IDS_TOPICDESC1 "Die ReactOS-CD durchsuchen." - IDS_TOPICDESC2 "Klicken Sie, um dieses Programm zu beenden." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." + IDS_TOPICDESC0 "Installiert ReactOS auf ihrem Computer.\n\nBitte beachten Sie, dass Sie zur Zeit Ihren Computer mit der ReactOS-CD im Laufwerk neu starten mÃ¼ssen, um die Installation zu starten.\n\nAlternativ kÃ¶nnen Sie ReactOS problemlos in einer virtuellen QEMU-Maschine ausprobieren, wenn Sie den entsprechenden MenÃ¼punkt auf der linken Seite wÃ¤hlen." + IDS_TOPICDESC1 "MÃ¶glicherweise mÃ¶chten Sie ein Betriebssystem im Alpha-Stadium nicht auf Ihrem eigenen Computer testen oder es gibt Probleme bei der Installation. Daher haben wir ReactOS auf einer virtuellen QEMU-Maschine vorinstalliert, mit der Sie das Betriebssystem problemlos testen kÃ¶nnen, ohne dass es direkt auf Ihrem Computer installiert werden muss.\n\nEin Klick auf diesen MenÃ¼punkt Ã¶ffnet das QEMU-Paket in Ihrem ZIP-Archivprogramm." + IDS_TOPICDESC2 "Damit ReactOS so einfach wie mÃ¶glich kompiliert werden kann, wurde das ReactOS Build Environment geschaffen. Dieses enthÃ¤lt die passenden Compiler-Versionen und alle nÃ¶tigen Tools, um den gesamten ReactOS-Quellcode zu kompilieren.\n\nDie Windows-Version des Build Environments ist kompatibel mit Windows 2000, XP oder neueren Versionen. Sie wird Ã¼ber diesen MenÃ¼punkt installiert.\nDie CD enthÃ¤lt auch das Build Environment fÃ¼r Unix-Ã¤hnliche Betriebssysteme, wie z.B. Linux oder Mac OS X.\n\nZusÃ¤tzlich befindet sich auf dieser CD der Quellcode dieser ReactOS-Version in einer ZIP-Datei." + IDS_TOPICDESC3 "Die CD enthÃ¤lt auch den gesamten Quellcode dieser ReactOS-Version, welcher mit dem ReactOS Build Environment kompiliert werden kann.\nEin Klick auf diesen MenÃ¼punkt Ã¶ffnet ihn in Ihrem ZIP-Archivprogramm." + IDS_TOPICDESC4 "Die ReactOS-Website liefert viele weitere Informationen Ã¼ber das Projekt. Hier finden Sie die neusten ReactOS-Versionen und Neuigkeiten bezÃ¼glich der Entwicklung." + IDS_TOPICDESC5 "Durchsuchen Sie den Inhalt dieser CD." + IDS_TOPICDESC6 "Beendet das AutoRun-Programm." +END + +/* Topic actions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICACTION0 "<msg>Zur Zeit mÃ¼ssen Sie Ihren Computer mit der ReactOS-CD im Laufwerk neu starten, um die Installation zu starten.\n\nBITTE BEACHTEN SIE: Es wird dringend davon abgeraten, ReactOS auf einem Computer zu installieren, welcher wichtige Daten enthÃ¤lt!" + IDS_TOPICACTION1 "..\\ReactOS in QEMU\\ReactOS-0.3.14-CLT2012-QEMU.zip" + IDS_TOPICACTION2 "..\\ReactOS Build Environment\\RosBE-2.0.exe" + IDS_TOPICACTION3 "..\\ReactOS-Quellcode\\ReactOS-0.3.14-CLT2012-Quellcode.zip" + IDS_TOPICACTION4 "http://www.reactos.org/" + IDS_TOPICACTION5 "explorer.exe" + IDS_TOPICACTION6 "<exit>" END /* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/el-GR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/el-GR.rc (removed) @@ -1,60 +1,0 @@ -LANGUAGE LANG_GREEK, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - ÎÎ±Î»ÏÏ ÎÎ»Î¸Î±ÏÎµ" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "ÎÎ±Î»ÏÏ Î®Î»Î¸Î±ÏÎµ ÏÏÎ¿ React ÎÎµÎ¹ÏÎ¿ÏÏÎ³Î¹ÎºÏ Î£ÏÏÏÎ·Î¼Î±.\n\nÎÏÎ¹Î»ÎÎ¾ÏÎµ ÎÎ½Î± Î¸ÎÎ¼Î± Î±ÏÏ ÏÎ¿ Î¼ÎµÎ½Î¿Ï ÏÏÎ± Î±ÏÎ¹ÏÏÎµÏÎ¬." -// IDS_CHECKTEXT "Show this dialog again" -// IDS_CLOSETEXT "Exit" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÏÎ¿Ï ReactOS" - IDS_TOPICBUTTON1 "ÎÎ¾ÎµÏÎµÏÎ½Î·ÏÎ· Î±ÏÏÎ¿Ï ÏÎ¿Ï CD" - IDS_TOPICBUTTON2 "ÎÎ¾Î¿Î´Î¿Ï" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÏÎ¿Ï ReactOS" - IDS_TOPICTITLE1 "ÎÎ¾ÎµÏÎµÏÎ½Î·ÏÎ· Î±ÏÏÎ¿Ï ÏÎ¿Ï CD" - IDS_TOPICTITLE2 "ÎÎ¾Î¿Î´Î¿Ï" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î¯Î± Î½ÎÎ±Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï ÏÎ¿Ï ReactOS ÏÏÎ¿Î½ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® Î® Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏÎ· Î¼Î¹Î±Ï Î®Î´Î· ÏÏÎ¬ÏÏÎ¿ÏÏÎ±Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï." - IDS_TOPICDESC1 "ÎÎ¾ÎµÏÎµÏÎ½Î·ÏÎ· Î±ÏÏÎ¿Ï ÏÎ¿Ï CD." - IDS_TOPICDESC2 "Î Î±ÏÎ®ÏÏÎµ Î³Î¹Î± Î½Î± ÏÎµÏÎ¼Î±ÏÎ¯ÏÎµÏÎµ ÏÎ·Î½ ÎµÏÎ±ÏÎ¼Î¿Î³Î® Î±ÏÏÎ®." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/en-US.rc (removed) @@ -1,60 +1,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Welcome" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Welcome to React Operating System.\n\nClick a topic on the left." -// IDS_CHECKTEXT "Show this dialog again" -// IDS_CLOSETEXT "Exit" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Install ReactOS" - IDS_TOPICBUTTON1 "Browse this CD" - IDS_TOPICBUTTON2 "Exit" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Install ReactOS" - IDS_TOPICTITLE1 "Browse this CD" - IDS_TOPICTITLE2 "Exit" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Create a new ReactOS installation on your computer or upgrade an existing installation." - IDS_TOPICDESC1 "Browse the CD." - IDS_TOPICDESC2 "Click to exit this application." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/es-ES.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/es-ES.rc (removed) @@ -1,60 +1,0 @@ -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Bienvenido" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Bienvenido al Sistema Operativo React.\n\nHaz Click en una opciÃ³n a la izquierda." -// IDS_CHECKTEXT "Mostrar este dialogo otra vez" -// IDS_CLOSETEXT "Salir" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Instalar ReactOS" - IDS_TOPICBUTTON1 "Explorar este CD" - IDS_TOPICBUTTON2 "Salir" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Instalar ReactOS" - IDS_TOPICTITLE1 "Explorar este CD" - IDS_TOPICTITLE2 "Salir" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Crear una nueva instalaciÃ³n de ReactOS en su PC o actualizar una instalaciÃ³n existente." - IDS_TOPICDESC1 "Explorar este CD." - IDS_TOPICDESC2 "Haz Click para salir de esta aplicaciÃ³n." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/et-EE.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/et-EE.rc (removed) @@ -1,60 +1,0 @@ -LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Tere tulemast" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Tere tulemast operatsioonisÃ¼steemi ReactOS.\n\nVali teema vasakult." -// IDS_CHECKTEXT "NÃ¤ita seda dialoogi veel" -// IDS_CLOSETEXT "VÃ¤lju" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Paigalda ReactOS" - IDS_TOPICBUTTON1 "Sirvi CD sisu" - IDS_TOPICBUTTON2 "VÃ¤lju" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Paigalda ReactOS" - IDS_TOPICTITLE1 "Sirvi CD sisu" - IDS_TOPICTITLE2 "VÃ¤lju" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Paigalda ReactOS oma arvutisse vÃµi uuenda olemasolevat installatsiooni." - IDS_TOPICDESC1 "Sirvi CD sisu." - IDS_TOPICDESC2 "Vajuta, et vÃ¤ljuda." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/fr-FR.rc (removed) @@ -1,81 +1,0 @@ -/* - * FRENCH(FR) resources - * - * Copyright (C) 2005 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Bienvenue" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Bienvenue sur le systÃ¨me d'exploitation ReactOS.\n\nCliquez sur une section Ã gauche." -// IDS_CHECKTEXT "Afficher cette boÃ®te de dialogue de nouveau." -// IDS_CLOSETEXT "Quitter" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Installer ReactOS" - IDS_TOPICBUTTON1 "Naviguer dans ce CD" - IDS_TOPICBUTTON2 "Quitter" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Installer ReactOS" - IDS_TOPICTITLE1 "Naviguer dans ce CD" - IDS_TOPICTITLE2 "Quitter" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "CrÃ©e une nouvelle installation de ReactOS sur votre ordinateur ou met Ã jour votre installation actuelle." - IDS_TOPICDESC1 "Explore le CD." - IDS_TOPICDESC2 "Cliquez pour quitter l'installation." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/hu-HU.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/hu-HU.rc (removed) @@ -1,64 +1,0 @@ -/* -* Copyright 2005 Robert Horvath - Hungarian trasnlation - talley at cubeclub.hu -*/ - -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - ÃdvÃ¶zlÃ¼nk" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "ÃdvÃ¶zlÃ¼nk a React OperÃ¡ciÃ³s Rendszerben.\n\n" -// IDS_CHECKTEXT "Show this dialog again" -// IDS_CLOSETEXT "KilÃ©pÃ©s" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "ReactOS telepÃtÃ©se" - IDS_TOPICBUTTON1 "A CD bÃ¶ngÃ©szÃ©se" - IDS_TOPICBUTTON2 "KilÃ©pÃ©s" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "ReactOS telepÃtÃ©se" - IDS_TOPICTITLE1 "A CD bÃ¶ngÃ©szÃ©se" - IDS_TOPICTITLE2 "KilÃ©pÃ©s" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "A ReactOS telepÃtÃ©se vagy frissÃtÃ©se." - IDS_TOPICDESC1 "A CD bÃ¶ngÃ©szÃ©se" - IDS_TOPICDESC2 "KilÃ©pÃ©s" -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/id-ID.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/id-ID.rc (removed) @@ -1,64 +1,0 @@ -/* - * Indonesian resources by Zaenal Mutaqin (ade999 at gmail dot com) - */ - -LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Selamat Datang" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Selamat datang di React Operating System.\n\nKlik topik di sisi kiri." -// IDS_CHECKTEXT "Show this dialog again" -// IDS_CLOSETEXT "Exit" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Instalasi ReactOS" - IDS_TOPICBUTTON1 "Lihat CD ini" - IDS_TOPICBUTTON2 "Keluar" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Instalasi ReactOS" - IDS_TOPICTITLE1 "Lihat CD ini" - IDS_TOPICTITLE2 "Keluar" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Buat instalasi baru ReactOS pada komputer anda atau tingkatkan instalasi yang sudah ada." - IDS_TOPICDESC1 "Lihat CD." - IDS_TOPICDESC2 "Klik untuk keluar aplikasi ini." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/it-IT.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/it-IT.rc (removed) @@ -1,62 +1,0 @@ -/* It.rc by Roberto 'Speekix' Pellegrino */ - -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Benvenuto" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Benvenuto nel React Operating System.\n\nClicca su un argomento a sinistra." -// IDS_CHECKTEXT "Mostra ancora questa finestra" -// IDS_CLOSETEXT "Esci" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Installa ReactOS" - IDS_TOPICBUTTON1 "Esplora il CD" - IDS_TOPICBUTTON2 "Esci" -// IDS_TOPICBUTTON3 "Argomento Vuoto 3" -// IDS_TOPICBUTTON4 "Argomento Vuoto 4" -// IDS_TOPICBUTTON5 "Argomento Vuoto 5" -// IDS_TOPICBUTTON6 "Argomento Vuoto 6" -// IDS_TOPICBUTTON7 "Argomento Vuoto 7" -// IDS_TOPICBUTTON8 "Argomento Vuoto 8" -// IDS_TOPICBUTTON9 "Argomento Vuoto 9" -END - -/* Topic Titolos */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Installa ReactOS" - IDS_TOPICTITLE1 "Esplora il CD" - IDS_TOPICTITLE2 "Esci" -// IDS_TOPICTITLE3 "Argomento Vuoto Titolo 3" -// IDS_TOPICTITLE4 "Argomento Vuoto Titolo 4" -// IDS_TOPICTITLE5 "Argomento Vuoto Titolo 5" -// IDS_TOPICTITLE6 "Argomento Vuoto Titolo 6" -// IDS_TOPICTITLE7 "Argomento Vuoto Titolo 7" -// IDS_TOPICTITLE8 "Argomento Vuoto Titolo 8" -// IDS_TOPICTITLE9 "Argomento Vuoto Titolo 9" -END - -/* Descrizione argomentos */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Crea una nuova installazione di ReactOS sul tuo computer o aggiorna l'installazione esistente." - IDS_TOPICDESC1 "Esplora il CD." - IDS_TOPICDESC2 "Clicca per uscire dall'applicazione." -// IDS_TOPICDESC3 "Descrizione argomento 3.\n\nDescrivi l'argomento 3 qui." -// IDS_TOPICDESC4 "Descrizione argomento 4.\n\nDescrivi l'argomento 4 qui." -// IDS_TOPICDESC5 "Descrizione argomento 5.\n\nDescrivi l'argomento 5 qui." -// IDS_TOPICDESC6 "Descrizione argomento 6.\n\nDescrivi l'argomento 6 qui." -// IDS_TOPICDESC7 "Descrizione argomento 7.\n\nDescrivi l'argomento 7 qui." -// IDS_TOPICDESC8 "Descrizione argomento 8.\n\nDescrivi l'argomento 8 qui." -// IDS_TOPICDESC9 "Descrizione argomento 9.\n\nDescrivi l'argomento 9 qui." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/ja-JP.rc (removed) @@ -1,60 +1,0 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Welcome" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "React ã¸ããããã\n\nå·¦å´ã®ãããã¯ãã¯ãªãã¯ãã¦ãã ããã" -// IDS_CHECKTEXT "Show this dialog again" -// IDS_CLOSETEXT "Exit" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "ReactOS ãã¤ã³ã¹ãã¼ã«ãã" - IDS_TOPICBUTTON1 "ãã® CD ãéã" - IDS_TOPICBUTTON2 "çµäº" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "ReactOS ãã¤ã³ã¹ãã¼ã«ãã" - IDS_TOPICTITLE1 "ãã® CD ãéã" - IDS_TOPICTITLE2 "çµäº" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "ã³ã³ãã¥ã¼ã¿ã«æ°ãã ReactOS ãã¤ã³ã¹ãã¼ã«ããããæ¢åã® ReactOS ãã¢ããã°ã¬ã¼ããã¾ãã" - IDS_TOPICDESC1 "CD ã®åå®¹ãåç§ãã¾ãã" - IDS_TOPICDESC2 "ã¯ãªãã¯ããã¨ãã®ã¢ããªã±ã¼ã·ã§ã³ãçµäºãã¾ãã" -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/lt-LT.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/lt-LT.rc (removed) @@ -1,62 +1,0 @@ -// Translation by Vytis 'CMan' GirdÅ¾ijauskas cman(a)cman.us - -LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Sveiki" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Sveiki, Äia React OperacinÄ Sistema.\n\nPasirinkite punktÄ kairÄje." -// IDS_CHECKTEXT "Rodyti Å¡Ä¯ langÄ vÄl" -// IDS_CLOSETEXT "IÅ¡eiti" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Ä®diegti ReactOS" - IDS_TOPICBUTTON1 "PerÅ¾iÅ«rÄti Å¡Ä¯ CD" - IDS_TOPICBUTTON2 "IÅ¡eiti" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Ä®diegti ReactOS" - IDS_TOPICTITLE1 "PerÅ¾iÅ«rÄti Å¡Ä¯ CD" - IDS_TOPICTITLE2 "IÅ¡eiti" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Ä®diekite arba atnaujinkite ReactOS." - IDS_TOPICDESC1 "PerÅ¾iÅ«rÄti Å¡Ä¯ CD." - IDS_TOPICDESC2 "Paspauskite, kad iÅ¡eitumÄte iÅ¡ programos." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/nl-NL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/nl-NL.rc (removed) @@ -1,60 +1,0 @@ -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Welkom" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Welkom bij het React Operation System.\n\nKlik links op een onderwerp." -// IDS_CHECKTEXT "Ga terug naar dit scherm" -// IDS_CLOSETEXT "Afsluiten" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Installeer ReactOS" - IDS_TOPICBUTTON1 "Deze CD Verkennen" - IDS_TOPICBUTTON2 "Afsluiten" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Installeer ReactOS" - IDS_TOPICTITLE1 "Deze CD Verkennen" - IDS_TOPICTITLE2 "Afsluiten" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Maak een nieuwe ReactOS installatie of upgrade een bestaande installatie." - IDS_TOPICDESC1 "Deze CD Verkennen." - IDS_TOPICDESC2 "Klik om dit programma af te sluiten." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/no-NO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/no-NO.rc (removed) @@ -1,60 +1,0 @@ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Velkommen" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Velkommen til React Operativsystem.\n\nTrykk et emne til venstre." -// IDS_CHECKTEXT "Vis denne dialoget igjen" -// IDS_CLOSETEXT "Avslutt" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Innstaller ReactOS" - IDS_TOPICBUTTON1 "Utforsk denne CD" - IDS_TOPICBUTTON2 "Avslutt" -// IDS_TOPICBUTTON3 "Tomt emne 3" -// IDS_TOPICBUTTON4 "Tomt emne 4" -// IDS_TOPICBUTTON5 "Tomt emne 5" -// IDS_TOPICBUTTON6 "Tomt emne 6" -// IDS_TOPICBUTTON7 "Tomt emne 7" -// IDS_TOPICBUTTON8 "Tomt emne 8" -// IDS_TOPICBUTTON9 "Tomt emne 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Innstaller ReactOS" - IDS_TOPICTITLE1 "Utforsk denne CD" - IDS_TOPICTITLE2 "Avslutt" -// IDS_TOPICTITLE3 "Tomt emne tittel 3" -// IDS_TOPICTITLE4 "Tomt emne tittel 4" -// IDS_TOPICTITLE5 "Tomt emne tittel 5" -// IDS_TOPICTITLE6 "Tomt emne tittel 6" -// IDS_TOPICTITLE7 "Tomt emne tittel 7" -// IDS_TOPICTITLE8 "Tomt emne tittel 8" -// IDS_TOPICTITLE9 "Tomt emne tittel 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Opprett en ny ReactOS innstallasjon pÃ¥ din datamaskin eller oppgrader eksisterende innstallasjon." - IDS_TOPICDESC1 "Utforsk CDen." - IDS_TOPICDESC2 "Trykk avslutt for Ã¥ avslutte denne applikasjonen." -// IDS_TOPICDESC3 "Emner beskrivelse 3.\n\nBeskriv emner 3 her." -// IDS_TOPICDESC4 "Emner beskrivelse 4.\n\nBeskriv emner 4 her." -// IDS_TOPICDESC5 "Emner beskrivelse 5.\n\nBeskriv emner 5 her." -// IDS_TOPICDESC6 "Emner beskrivelse 6.\n\nBeskriv emner 6 her." -// IDS_TOPICDESC7 "Emner beskrivelse 7.\n\nBeskriv emner 7 her." -// IDS_TOPICDESC8 "Emner beskrivelse 8.\n\nBeskriv emner 8 her." -// IDS_TOPICDESC9 "Emner beskrivelse 9.\n\nBeskriv emner 9 her." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/pl-PL.rc (removed) @@ -1,66 +1,0 @@ -/* - * translated by Polish Translation Team (Apr, 2007) - * https://sourceforge.net/projects/reactospl - * UTF-8 conversion by Caemyr (May, 2011) - */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Zapraszamy" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Witaj w systemie operacyjnym ReactOS.\n\nWybierz temat po lewej." -// IDS_CHECKTEXT "PokaÅ¼ ten dialog ponownie" -// IDS_CLOSETEXT "WyjÅcie" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Zainstaluj ReactOS" - IDS_TOPICBUTTON1 "PrzeglÄdaj CD" - IDS_TOPICBUTTON2 "WyjÅcie" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Zainstaluj ReactOS" - IDS_TOPICTITLE1 "PrzeglÄdaj CD" - IDS_TOPICTITLE2 "WyjÅcie" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "UtwÃ³rz nowÄ instalacjÄ ReactOS na komputerze lub aktualizuj juÅ¼ istniejÄcÄ." - IDS_TOPICDESC1 "PrzeglÄdaj CD." - IDS_TOPICDESC2 "Kliknij, aby zakoÅczyÄ aplikacjÄ." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/pt-BR.rc (removed) @@ -1,60 +1,0 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Bem vindo" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Bem vindo ao Sistema Operacional React (ReactOS).\n\nClique em um tÃ³pico Ã esquerda." -// IDS_CHECKTEXT "Exibir este diÃ¡logo novamente" -// IDS_CLOSETEXT "Sair" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Instalar ReactOS" - IDS_TOPICBUTTON1 "Examinar este CD" - IDS_TOPICBUTTON2 "Sair" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Instalar ReactOS" - IDS_TOPICTITLE1 "Examinar este CD" - IDS_TOPICTITLE2 "Sair" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Cria uma nova instalaÃ§Ã£o do ReactOS em seu computador ou atualiza uma instalaÃ§Ã£o jÃ¡ existente." - IDS_TOPICDESC1 "Exibe os arquivos contidos no CD." - IDS_TOPICDESC2 "Clique para fechar este aplicativo." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/ro-RO.rc (removed) @@ -1,67 +1,0 @@ -/* - * FILE: base/setup/welcome/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) - * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum to fulea.stefan) - * CHANGE LOG: 2011-10-30 initial translation - */ - -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Bun venit" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Bun venit Ã®n Sistemul de Operare React.\n\nAlegeÈi o opÈiune din stÃ¢nga." -// IDS_CHECKTEXT "AfiÈeazÄ acest dialog Èi altÄ datÄ" -// IDS_CLOSETEXT "IeÈire" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Instalare ReactOS" - IDS_TOPICBUTTON1 "Explorare CD" - IDS_TOPICBUTTON2 "IeÈire" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Instalare ReactOS" - IDS_TOPICTITLE1 "Explorare CD" - IDS_TOPICTITLE2 "IeÈire" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "CreaÈi o instalare nouÄ sau actualizaÈi o instalare existentÄ." - IDS_TOPICDESC1 "ExploraÈi conÈinutul acestui CD." - IDS_TOPICDESC2 "ApÄsaÈi pentru a ieÈi din aplicaÈie." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/ru-RU.rc (removed) @@ -1,62 +1,0 @@ -/* $Id: En.rc 21257 2006-03-08 23:07:09Z audit $ */ - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ!" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ Ð² ReactOS.\n\nÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¿ÑÐ½ÐºÑ ÑÐ»ÐµÐ²Ð°." -// IDS_CHECKTEXT "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ ÑÑÐ¾ Ð¾ÐºÐ½Ð¾ ÑÐ½Ð¾Ð²Ð°" -// IDS_CLOSETEXT "ÐÑÑÐ¾Ð´" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ReactOS" - IDS_TOPICBUTTON1 "ÐÐ±Ð·Ð¾Ñ Ð´Ð¸ÑÐºÐ°" - IDS_TOPICBUTTON2 "ÐÑÑÐ¾Ð´" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ReactOS" - IDS_TOPICTITLE1 "ÐÐ±Ð·Ð¾Ñ Ð´Ð¸ÑÐºÐ°" - IDS_TOPICTITLE2 "ÐÑÑÐ¾Ð´" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸Ñ ReactOS Ð½Ð° ÐÐ°Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ñ Ð½ÑÐ»Ñ Ð¸Ð»Ð¸ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ ÑÐ¶Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÑ Ð²ÐµÑÑÐ¸Ñ." - IDS_TOPICDESC1 "ÐÐ±Ð·Ð¾Ñ Ð´Ð¸ÑÐºÐ°." - IDS_TOPICDESC2 "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð´Ð»Ñ Ð²ÑÑÐ¾Ð´Ð° Ð¸Ð· ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/sk-SK.rc (removed) @@ -1,62 +1,0 @@ -// Slovak translation by Kario 2007 <kario(a)szm.sk> - -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Vitajte" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Vitajte v operaÄnom systÃ©me ReactOS.\n\nKliknite na tlaÄidlo v Ä¾avom stÄºpci." -// IDS_CHECKTEXT "ZobraziÅ¥ toto okno aj nabudÃºce" -// IDS_CLOSETEXT "Koniec" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "InÅ¡talovaÅ¥ ReactOS" - IDS_TOPICBUTTON1 "PrezeraÅ¥ toto CD" - IDS_TOPICBUTTON2 "Koniec" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "InÅ¡talovaÅ¥ ReactOS" - IDS_TOPICTITLE1 "PrezeraÅ¥ toto CD" - IDS_TOPICTITLE2 "Koniec" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "NainÅ¡taluje ReactOS na VÃ¡Å¡ poÄÃtaÄ alebo zaktualizuje uÅ¾ existujÃºci systÃ©m." - IDS_TOPICDESC1 "PrezeraÅ¥ toto CD." - IDS_TOPICDESC2 "KliknutÃm ukonÄÃte tento program." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/sv-SE.rc (removed) @@ -1,80 +1,0 @@ -/* - * Swedish (SE) resources - * - * Copyright (C) 2005 David Nordenberg - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - VÃ¤lkommen" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "VÃ¤lkommen till React Operating System.\n\nKlicka pÃ¥ ett avsnitt till vÃ¤nster." -// IDS_CHECKTEXT "Show this dialog again" -// IDS_CLOSETEXT "Exit" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Installera ReactOS" - IDS_TOPICBUTTON1 "Utforska skivan" - IDS_TOPICBUTTON2 "Avsluta" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Installera ReactOS" - IDS_TOPICTITLE1 "Utforska skivan" - IDS_TOPICTITLE2 "Avsluta" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Skapa en ny ReactOS installation pÃ¥ den hÃ¤r datorn eller uppgradera en befintlig." - IDS_TOPICDESC1 "Utforska skivan." - IDS_TOPICDESC2 "Avsluta det hÃ¤r programmet." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/th-TH.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/th-TH.rc (removed) @@ -1,67 +1,0 @@ -/* - * PROJECT: ReactOS welcome/autorun application - * LICENSE: See COPYING in the top level directory - * FILE: base/setup/welcome/lang/th-TH.rc - * TRANSLATOR: Sumath Aowsakulsutthi - */ - -LANGUAGE LANG_THAI, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - à¸¢à¸´à¸à¸à¸µà¸à¹à¸à¸à¸£à¸±à¸" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "à¸¢à¸´à¸à¸à¸µà¸à¹à¸à¸à¸£à¸±à¸à¸ªà¸¹à¹à¸£à¸°à¸à¸à¸à¸à¸´à¸à¸±à¸à¸´à¸à¸²à¸£ React \n\nà¸à¸à¹à¸¥à¸·à¸à¸à¹à¸à¸·à¹à¸à¸«à¸²à¸à¸à¹à¸à¸à¸à¹à¸²à¸¢à¸¡à¸·à¸" -// IDS_CHECKTEXT "à¹à¸ªà¸à¸à¸à¸³à¹à¸à¸°à¸à¸³à¸à¸µà¸à¸à¸£à¸±à¹à¸" -// IDS_CLOSETEXT "à¸à¸à¸à¸à¸²à¸à¹à¸à¸£à¹à¸à¸£à¸¡" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "à¸à¸´à¸à¸à¸±à¹à¸ ReactOS" - IDS_TOPICBUTTON1 "à¸à¸¹à¸£à¸²à¸¢à¸¥à¸°à¹à¸à¸µà¸¢à¸à¸à¸à¸à¹à¸à¹à¸à¸à¸µà¸à¸µà¸à¸µà¹" - IDS_TOPICBUTTON2 "à¸à¸à¸à¸à¸²à¸à¹à¸à¸£à¹à¸à¸£à¸¡" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "à¸à¸´à¸à¸à¸±à¹à¸ ReactOS" - IDS_TOPICTITLE1 "à¸à¸¹à¸£à¸²à¸¢à¸¥à¸°à¹à¸à¸µà¸¢à¸à¸à¸à¸à¹à¸à¹à¸à¸à¸µà¸à¸µà¸à¸µà¹" - IDS_TOPICTITLE2 "à¸à¸à¸à¸à¸²à¸à¹à¸à¸£à¹à¸à¸£à¸¡" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "à¸à¸¸à¸à¸à¹à¸à¸à¸à¸²à¸£à¸à¸´à¸à¸à¸±à¹à¸ ReactOS à¸¥à¸à¹à¸à¹à¸à¸£à¸·à¹à¸à¸à¸à¸à¸¡à¸à¸´à¸§à¹à¸à¸à¸£à¹à¸à¸à¸à¸à¸¸à¸\n\nà¸«à¸£à¸·à¸à¸à¹à¸à¸à¸à¸²à¸£à¸à¸£à¸±à¸à¹à¸à¹à¸à¹à¸à¸´à¹à¸¡à¹à¸à¸´à¸¡à¸à¸²à¸à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹à¹à¸à¸´à¸¡." - IDS_TOPICDESC1 "à¸à¸¹à¸£à¸²à¸¢à¸¥à¸°à¹à¸à¸µà¸¢à¸à¸à¸à¸à¹à¸à¹à¸à¸à¸µà¸à¸µà¸à¸µà¹." - IDS_TOPICDESC2 "à¸à¸à¹à¸¥à¸·à¸à¸à¸à¸µà¹à¸à¸µà¹à¹à¸à¸·à¹à¸à¸à¹à¸à¸à¸à¸²à¸£à¸à¸à¸à¸à¸²à¸à¸à¸²à¸£à¸à¸´à¸à¸à¸±à¹à¸." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/uk-UA.rc (removed) @@ -1,80 +1,0 @@ -/* - * Welcome (Ukrainian resources) - * - * Copyright 2006 Artem Reznikov - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - ÐÐ°ÑÐºÐ°Ð²Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð¼Ð¾" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "ÐÐ°ÑÐºÐ°Ð²Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð¼Ð¾ Ð´Ð¾ Ð¾Ð¿ÐµÑÐ°ÑÑÐ¹Ð½Ð¾Ñ ÑÐ¸ÑÑÐµÐ¼Ð¸ ReactOS.\n\nÐÐ»Ð°ÑÐ½ÑÑÑ Ð¿Ð¾ ÑÐµÐ¼Ñ Ð»ÑÐ²Ð¾ÑÑÑ" -// IDS_CHECKTEXT "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÐ¸ ÑÐµÐ¹ Ð´ÑÐ°Ð»Ð¾Ð³ Ð·Ð½Ð¾Ð²" -// IDS_CLOSETEXT "ÐÐ¸ÑÑÐ´" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ReactOS" - IDS_TOPICBUTTON1 "ÐÐ³Ð»ÑÐ´ ÑÑÐ¾Ð³Ð¾ CD" - IDS_TOPICBUTTON2 "ÐÐ¸ÑÑÐ´" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ReactOS" - IDS_TOPICTITLE1 "ÐÐ³Ð»ÑÐ´ ÑÑÐ¾Ð³Ð¾ CD" - IDS_TOPICTITLE2 "ÐÐ¸ÑÑÐ´" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Ð¡ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ Ð½Ð¾Ð²Ð¾Ñ ÑÐ½ÑÑÐ°Ð»ÑÑÑÑ ReactOS Ð½Ð° ÐÐ°ÑÐ¾Ð¼Ñ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÑ ÑÐ¸ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑÑÐ½ÑÑÑÐ¾Ñ ÑÐ½ÑÑÐ°Ð»ÑÑÑÑ." - IDS_TOPICDESC1 "ÐÑÐ¾Ð³Ð»ÑÐ½ÑÑÐ¸ CD." - IDS_TOPICDESC2 "ÐÐ°ÑÐ¸ÑÐ½ÑÑÑ Ð´Ð»Ñ Ð²Ð¸ÑÐ¾Ð´Ñ Ð· ÑÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/lang/zh-CN.rc (removed) @@ -1,80 +1,0 @@ -/* - * welcome (Simplified Chinese resources) - * (ç®ä½ä¸æèµæº) - * Copyright 2007 zhangbing <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> - * - * This program 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 program 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 program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - æ¬¢è¿" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "æ¬¢è¿ä½¿ç¨ React æä½ç³»ç»ã\n\n è¯·ç¹å»å·¦è¾¹çä¸»é¢ã" -// IDS_CHECKTEXT "Show this dialog again" -// IDS_CLOSETEXT "Exit" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "å®è£ ReactOS" - IDS_TOPICBUTTON1 "æµè§ CD" - IDS_TOPICBUTTON2 "éåº " -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "å®è£ ReactOS" - IDS_TOPICTITLE1 "æµè§ CD" - IDS_TOPICTITLE2 "éåº" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "éæ°å®è£ ReactOS æ æ´æ°ä½ çReactOS ã" - IDS_TOPICDESC1 "æµè§ CD çåå®¹ã" - IDS_TOPICDESC2 "ç¹å»éåºåºç¨ç¨åºã" -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Modified: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/rsrc.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/rsrc.rc [iso-8859-1] Sat Mar 10 09:38:41 2012 @@ -22,47 +22,7 @@ //IDB_TOPICBITMAP9 BITMAP DISCARDABLE "res/topic9.bmp" -/* Topic actions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICACTION0 "reactos.exe" - IDS_TOPICACTION1 "explorer.exe" - IDS_TOPICACTION2 "<exit>" /* this quits the app */ -// IDS_TOPICACTION3 "..." -// IDS_TOPICACTION4 "..." -// IDS_TOPICACTION5 "..." -// IDS_TOPICACTION6 "..." -// IDS_TOPICACTION7 "..." -// IDS_TOPICACTION8 "..." -// IDS_TOPICACTION9 "..." -END - - /* Language-specific resources */ // UTF-8 #pragma code_page(65001) -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/da-DK.rc" #include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/et-EE.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/lt-LT.rc" -#include "lang/no-NO.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/pt-BR.rc" -#include "lang/ro-RO.rc" -#include "lang/ru-RU.rc" -#include "lang/sk-SK.rc" -#include "lang/sv-SE.rc" -#include "lang/th-TH.rc" -#include "lang/uk-UA.rc" -#include "lang/zh-CN.rc" Modified: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/welcome.c [iso-8859-1] Sat Mar 10 09:38:41 2012 @@ -46,6 +46,7 @@ #define TITLE_WIDTH 480 #define TITLE_HEIGHT 93 +#define TOPIC_DESC_LENGTH 1024 /* GLOBALS ******************************************************************/ @@ -238,15 +239,11 @@ static BOOL RunApplication(int nTopic) { - PROCESS_INFORMATION ProcessInfo; - STARTUPINFO StartupInfo; - TCHAR AppName[256]; - TCHAR CurrentDir[256]; + TCHAR AppName[512]; + TCHAR Parameters[2]; int nLength; InvalidateRect(hwndMain, NULL, TRUE); - - GetCurrentDirectory(256, CurrentDir); nLength = LoadString(hInstance, IDS_TOPICACTION0 + nTopic, AppName, 256); if (nLength == 0) @@ -255,25 +252,18 @@ if (!_tcsicmp(AppName, TEXT("<exit>"))) return FALSE; + if (!_tcsnicmp(AppName, TEXT("<msg>"), 5)) + { + MessageBox(hwndMain, AppName + 5, TEXT("ReactOS"), MB_OK | MB_TASKMODAL); + return TRUE; + } + if (_tcsicmp(AppName, TEXT("explorer.exe")) == 0) - { - _tcscat(AppName, TEXT(" ")); - _tcscat(AppName, CurrentDir); - } - - memset(&StartupInfo, 0, sizeof(STARTUPINFO)); - StartupInfo.cb = sizeof(STARTUPINFO); - StartupInfo.lpTitle = TEXT("Test"); - StartupInfo.dwFlags = STARTF_USESHOWWINDOW; - StartupInfo.wShowWindow = SW_SHOWNORMAL; - - CreateProcess(NULL, AppName, NULL, NULL, FALSE, CREATE_NEW_CONSOLE,NULL, - CurrentDir, - &StartupInfo, - &ProcessInfo); - - CloseHandle(ProcessInfo.hProcess); - CloseHandle(ProcessInfo.hThread); + _tcscpy(Parameters, TEXT("\\")); + else + *Parameters = 0; + + ShellExecute(NULL, TEXT("open"), AppName, Parameters, NULL, SW_SHOWDEFAULT); return TRUE; } @@ -521,7 +511,7 @@ HFONT hOldFont; RECT rcTitle, rcDescription; TCHAR szTopicTitle[80]; - TCHAR szTopicDesc[256]; + TCHAR szTopicDesc[TOPIC_DESC_LENGTH]; int nLength; BITMAP bmpInfo; TCHAR version[50]; @@ -605,13 +595,13 @@ if (nTopic == -1) { - nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, 256); + nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, TOPIC_DESC_LENGTH); } else { - nLength = LoadString(hInstance, IDS_TOPICDESC0 + nTopic, szTopicDesc, 256); + nLength = LoadString(hInstance, IDS_TOPICDESC0 + nTopic, szTopicDesc, TOPIC_DESC_LENGTH); if (nLength == 0) - nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, 256); + nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, TOPIC_DESC_LENGTH); } SetBkMode(hdc, TRANSPARENT); Modified: branches/ros-branch-0_3_14-clt2012/base/setup/welcome/welcome.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/base/setup/welcome/welcome.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/base/setup/welcome/welcome.rbuild [iso-8859-1] Sat Mar 10 09:38:41 2012 @@ -5,6 +5,7 @@ <include base="welcome">.</include> <library>gdi32</library> <library>user32</library> + <library>shell32</library> <file>welcome.c</file> <file>welcome.rc</file> </module> Copied: branches/ros-branch-0_3_14-clt2012/boot/bootdata/readme.txt (from r56095, tags/ReactOS-0.3.13-CLT2011/reactos/boot/bootdata/readme.txt) URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== --- tags/ReactOS-0.3.13-CLT2011/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/boot/bootdata/readme.txt [iso-8859-1] Sat Mar 10 09:38:41 2012 @@ -1,6 +1,6 @@ =========================================================================== -ReactOS Version 0.3.13 -für die Chemnitzer Linux-Tage 2011 +ReactOS Version 0.3.14 +für die Chemnitzer Linux-Tage 2012 =========================================================================== Willkommen zu ReactOS! Propchange: branches/ros-branch-0_3_14-clt2012/boot/bootdata/readme.txt ------------------------------------------------------------------------------ svn:eol-style = CRLF Propchange: branches/ros-branch-0_3_14-clt2012/boot/bootdata/readme.txt ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: branches/ros-branch-0_3_14-clt2012/boot/bootdata/readme.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Mar 10 09:38:41 2012 @@ -1,0 +1,6 @@ +/branches/header-work/boot/bootdata/readme.txt:45691-47721 +/branches/reactos-yarotows/boot/bootdata/readme.txt:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/boot/bootdata/readme.txt:49994-49995 +/branches/ros-amd64-bringup/boot/bootdata/readme.txt:36852 +/branches/ros-amd64-bringup/reactos/boot/bootdata/readme.txt:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/trunk/reactos/boot/bootdata/readme.txt:51043-51044,51046-51048,51053,51058,51062-51063,51067,51069

1 0

[pschweitzer] 56099: [HALX86] Revert r56080 Fix the fix of r56090
by pschweitzer＠svn.reactos.org 10 Mar '12

10 Mar '12

Author: pschweitzer Date: Sat Mar 10 07:38:25 2012 New Revision: 56099 URL: http://svn.reactos.org/svn/reactos?rev=56099&view=rev Log: [HALX86] Revert r56080 Fix the fix of r56090 Modified: trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Sat Mar 10 07:38:25 2012 @@ -22,17 +22,9 @@ #endif #ifdef CONFIG_SMP -#if DBG #define HAL_BUILD_TYPE (DBG ? PRCB_BUILD_DEBUG : 0) #else -#define HAL_BUILD_TYPE 0 -#endif -#else -#if DBG #define HAL_BUILD_TYPE ((DBG ? PRCB_BUILD_DEBUG : 0) | PRCB_BUILD_UNIPROCESSOR) -#else -#define HAL_BUILD_TYPE 0 | PRCB_BUILD_UNIPROCESSOR -#endif #endif typedef struct _HAL_BIOS_FRAME

1 0

[arty] 56098: [FSRTL] Handle cases where multiple ranges overlap a new lock, including either exclusive or shared ranges. We expand a shared range when an overlap occurs and add another shared rang...
by arty＠svn.reactos.org 10 Mar '12

10 Mar '12

Author: arty Date: Sat Mar 10 07:28:03 2012 New Revision: 56098 URL: http://svn.reactos.org/svn/reactos?rev=56098&view=rev Log: [FSRTL] Handle cases where multiple ranges overlap a new lock, including either exclusive or shared ranges. We expand a shared range when an overlap occurs and add another shared range to the shared ranges list. Also make sure to complete an IRP along every non-pending case. Reduces failures in kernel32_winetest except an expected successful unlock of ~0,1, which appears to contravene the documentation. Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/filelock.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] Sat Mar 10 07:28:03 2012 @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ @@ -28,17 +28,27 @@ }; FILE_EXCLUSIVE_LOCK_ENTRY Exclusive; } -COMBINED_LOCK_ELEMENT, *PCOMBINED_LOCK_ELEMENT; + COMBINED_LOCK_ELEMENT, *PCOMBINED_LOCK_ELEMENT; typedef struct _LOCK_INFORMATION { - RTL_GENERIC_TABLE RangeTable; - IO_CSQ Csq; - KSPIN_LOCK CsqLock; + RTL_GENERIC_TABLE RangeTable; + IO_CSQ Csq; + KSPIN_LOCK CsqLock; LIST_ENTRY CsqList; - PFILE_LOCK BelongsTo; -} -LOCK_INFORMATION, *PLOCK_INFORMATION; + PFILE_LOCK BelongsTo; + LIST_ENTRY SharedLocks; +} + LOCK_INFORMATION, *PLOCK_INFORMATION; + +typedef struct _LOCK_SHARED_RANGE +{ + LIST_ENTRY Entry; + LARGE_INTEGER Start, End; + ULONG Key; + PVOID ProcessId; +} + LOCK_SHARED_RANGE, *PLOCK_SHARED_RANGE; /* PRIVATE FUNCTIONS *********************************************************/ @@ -72,13 +82,27 @@ { PCOMBINED_LOCK_ELEMENT A = PtrA, B = PtrB; RTL_GENERIC_COMPARE_RESULTS Result; - DPRINT("Starting to compare element %x to element %x\n", PtrA, PtrB); +#if 0 + DPRINT("Starting to compare element %x to element %x\n", PtrA, PtrB); +#endif + /* Match if we overlap */ + if (((A->Exclusive.FileLock.StartingByte.QuadPart < + B->Exclusive.FileLock.EndingByte.QuadPart) && + (A->Exclusive.FileLock.StartingByte.QuadPart >= + B->Exclusive.FileLock.StartingByte.QuadPart)) || + ((B->Exclusive.FileLock.StartingByte.QuadPart < + A->Exclusive.FileLock.EndingByte.QuadPart) && + (B->Exclusive.FileLock.StartingByte.QuadPart >= + A->Exclusive.FileLock.StartingByte.QuadPart))) + return GenericEqual; + /* Otherwise, key on the starting byte */ Result = (A->Exclusive.FileLock.StartingByte.QuadPart < B->Exclusive.FileLock.StartingByte.QuadPart) ? GenericLessThan : (A->Exclusive.FileLock.StartingByte.QuadPart > B->Exclusive.FileLock.StartingByte.QuadPart) ? GenericGreaterThan : GenericEqual; +#if 0 DPRINT("Compare(%x:%x) %x-%x to %x-%x => %d\n", A,B, A->Exclusive.FileLock.StartingByte.LowPart, @@ -86,6 +110,7 @@ B->Exclusive.FileLock.StartingByte.LowPart, B->Exclusive.FileLock.EndingByte.LowPart, Result); +#endif return Result; } @@ -115,24 +140,24 @@ PCOMBINED_LOCK_ELEMENT WhereUnlock = PeekContext; PLOCK_INFORMATION LockInfo = CONTAINING_RECORD(Csq, LOCK_INFORMATION, Csq); PLIST_ENTRY Following; + DPRINT("PeekNextIrp(IRP %p, Context %p)\n", Irp, PeekContext); if (!Irp) { - Irp = CONTAINING_RECORD - (LockInfo->CsqList.Flink, - IRP, - Tail.Overlay.ListEntry); - Following = &Irp->Tail.Overlay.ListEntry; + Following = LockInfo->CsqList.Flink; } else Following = Irp->Tail.Overlay.ListEntry.Flink; - + + DPRINT("ListEntry %p Head %p\n", Following, &LockInfo->CsqList); for (; Following != &LockInfo->CsqList; Following = Following->Flink) { - PIRP Irp = CONTAINING_RECORD(Following, IRP, Tail.Overlay.ListEntry); - PIO_STACK_LOCATION IoStack = IoGetCurrentIrpStackLocation(Irp); + PIO_STACK_LOCATION IoStack; BOOLEAN Matching; + Irp = CONTAINING_RECORD(Following, IRP, Tail.Overlay.ListEntry); + DPRINT("Irp %p\n", Irp); + IoStack = IoGetCurrentIrpStackLocation(Irp); LockElement.Exclusive.FileLock.StartingByte = IoStack->Parameters.LockControl.ByteOffset; LockElement.Exclusive.FileLock.EndingByte.QuadPart = @@ -147,15 +172,16 @@ /* Else get any completable IRP */ else { - Matching = !!RtlLookupElementGenericTable - (&LockInfo->RangeTable, &LockElement); + Matching = FALSE; } if (!Matching) { // This IRP is fine... + DPRINT("Returning the IRP %p\n", Irp); return Irp; } } + DPRINT("Return NULL\n"); return NULL; } @@ -178,6 +204,7 @@ { NTSTATUS Status; PLOCK_INFORMATION LockInfo = CONTAINING_RECORD(Csq, LOCK_INFORMATION, Csq); + DPRINT("Complete cancelled IRP %p Status %x\n", Irp, STATUS_CANCELLED); FsRtlCompleteLockIrpReal (LockInfo->BelongsTo->CompleteLockIrpRoutine, NULL, @@ -201,14 +228,16 @@ { /* Check if we have a file object */ if (FileObject) FileObject->LastLock = NULL; - + /* Set the I/O Status and do completion */ Irp->IoStatus.Status = Status; + DPRINT("Calling completion routine %p Status %x\n", Irp, Status); *NewStatus = CompleteRoutine(Context, Irp); } else { /* Otherwise do a normal I/O complete request */ + DPRINT("Completing IRP %p Status %x\n", Irp, Status); FsRtlCompleteRequest(Irp, Status); *NewStatus = Status; } @@ -229,6 +258,58 @@ Entry = RtlEnumerateGenericTable(FileLock->LockInformation, Restart); if (!Entry) return NULL; else return &Entry->Exclusive.FileLock; +} + +/* This function expands the conflicting range Conflict by removing and reinserting it, + then adds a shared range of the same size */ +PCOMBINED_LOCK_ELEMENT +NTAPI +FsRtlpSubsumeSharedLock +(PFILE_LOCK FileLock, + PLOCK_INFORMATION LockInfo, + PCOMBINED_LOCK_ELEMENT ToInsert, + PCOMBINED_LOCK_ELEMENT Conflict) +{ + BOOLEAN InsertedNew = FALSE, RemovedOld; + COMBINED_LOCK_ELEMENT NewElement; + PLOCK_SHARED_RANGE SharedRange = + ExAllocatePoolWithTag(NonPagedPool, sizeof(*SharedRange), 'FSRA'); + + if (!SharedRange) + return NULL; + + ASSERT(!Conflict->Exclusive.FileLock.ExclusiveLock); + ASSERT(!ToInsert->Exclusive.FileLock.ExclusiveLock); + SharedRange->Start = ToInsert->Exclusive.FileLock.StartingByte; + SharedRange->End = ToInsert->Exclusive.FileLock.EndingByte; + SharedRange->Key = ToInsert->Exclusive.FileLock.Key; + SharedRange->ProcessId = ToInsert->Exclusive.FileLock.ProcessId; + InsertTailList(&LockInfo->SharedLocks, &SharedRange->Entry); + + NewElement = *Conflict; + if (ToInsert->Exclusive.FileLock.StartingByte.QuadPart > + Conflict->Exclusive.FileLock.StartingByte.QuadPart) + { + NewElement.Exclusive.FileLock.StartingByte = + Conflict->Exclusive.FileLock.StartingByte; + } + if (ToInsert->Exclusive.FileLock.EndingByte.QuadPart < + Conflict->Exclusive.FileLock.EndingByte.QuadPart) + { + NewElement.Exclusive.FileLock.EndingByte = + Conflict->Exclusive.FileLock.EndingByte; + } + RemovedOld = RtlDeleteElementGenericTable + (&LockInfo->RangeTable, + Conflict); + ASSERT(RemovedOld); + Conflict = RtlInsertElementGenericTable + (&LockInfo->RangeTable, + ToInsert, + sizeof(*ToInsert), + &InsertedNew); + ASSERT(InsertedNew && Conflict); + return Conflict; } /* @@ -254,32 +335,59 @@ PCOMBINED_LOCK_ELEMENT Conflict; PLOCK_INFORMATION LockInfo; BOOLEAN InsertedNew; - - DPRINT1("FsRtlPrivateLock() is stubplemented!\n"); - /* Windows 2003 ignores that parameter - ASSERT(AlreadySynchronized); - */ - + + DPRINT("FsRtlPrivateLock(%wZ, Offset %08x%08x, Length %08x%08x, Key %x, FailImmediately %d, Exclusive %d)\n", + &FileObject->FileName, + FileOffset->HighPart, + FileOffset->LowPart, + Length->HighPart, + Length->LowPart, + Key, + FailImmediately, + ExclusiveLock); + + if (FileOffset->QuadPart < 0ll || + FileOffset->QuadPart + Length->QuadPart < FileOffset->QuadPart) + { + DPRINT("File offset out of range\n"); + IoStatus->Status = STATUS_INVALID_PARAMETER; + if (Irp) + { + DPRINT("Complete lock %p Status %x\n", Irp, IoStatus->Status); + FsRtlCompleteLockIrpReal + (FileLock->CompleteLockIrpRoutine, + Context, + Irp, + IoStatus->Status, + &Status, + FileObject); + } + return FALSE; + } + /* Initialize the lock, if necessary */ if (!FileLock->LockInformation) { LockInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(LOCK_INFORMATION), 'FLCK'); FileLock->LockInformation = LockInfo; - if (!FileLock) + if (!FileLock) { + IoStatus->Status = STATUS_NO_MEMORY; return FALSE; - + } + LockInfo->BelongsTo = FileLock; - + InitializeListHead(&LockInfo->SharedLocks); + RtlInitializeGenericTable (&LockInfo->RangeTable, LockCompare, LockAllocate, LockFree, NULL); - + KeInitializeSpinLock(&LockInfo->CsqLock); InitializeListHead(&LockInfo->CsqList); - + IoCsqInitializeEx (&LockInfo->Csq, LockInsertIrpEx, @@ -289,7 +397,7 @@ LockReleaseQueueLock, LockCompleteCanceledIrp); } - + LockInfo = FileLock->LockInformation; ToInsert.Exclusive.FileLock.FileObject = FileObject; ToInsert.Exclusive.FileLock.StartingByte = *FileOffset; @@ -297,13 +405,13 @@ ToInsert.Exclusive.FileLock.ProcessId = Process->UniqueProcessId; ToInsert.Exclusive.FileLock.Key = Key; ToInsert.Exclusive.FileLock.ExclusiveLock = ExclusiveLock; - + Conflict = RtlInsertElementGenericTable (FileLock->LockInformation, &ToInsert, sizeof(ToInsert), &InsertedNew); - + if (Conflict && !InsertedNew) { if (Conflict->Exclusive.FileLock.ExclusiveLock || ExclusiveLock) @@ -340,18 +448,112 @@ } else { - IoStatus->Status = STATUS_SUCCESS; - if (Irp) + ULONG i; + /* We know of at least one lock in range that's shared. We need to + * find out if any more exist and any are exclusive. */ + for (i = 0; i < RtlNumberGenericTableElements(&LockInfo->RangeTable); i++) + { + Conflict = RtlGetElementGenericTable(&LockInfo->RangeTable, i); + /* The first argument will be inserted as a shared range */ + if (LockCompare(&LockInfo->RangeTable, Conflict, &ToInsert) == GenericEqual) + { + if (Conflict->Exclusive.FileLock.ExclusiveLock) + { + /* Found an exclusive match */ + if (FailImmediately) + { + IoStatus->Status = STATUS_FILE_LOCK_CONFLICT; + if (Irp) + { + FsRtlCompleteLockIrpReal + (FileLock->CompleteLockIrpRoutine, + Context, + Irp, + IoStatus->Status, + &Status, + FileObject); + } + } + else + { + IoStatus->Status = STATUS_PENDING; + if (Irp) + { + IoMarkIrpPending(Irp); + IoCsqInsertIrpEx + (&LockInfo->Csq, + Irp, + NULL, + NULL); + } + } + return FALSE; + } + else + { + /* We've made all overlapping shared ranges into one big range + * now we need to add a range entry for the new range */ + DPRINT("Overlapping shared lock %wZ %08x%08x %08x%08x\n", + &FileObject->FileName, + Conflict->Exclusive.FileLock.StartingByte.HighPart, + Conflict->Exclusive.FileLock.StartingByte.LowPart, + Conflict->Exclusive.FileLock.EndingByte.HighPart, + Conflict->Exclusive.FileLock.EndingByte.LowPart); + Conflict = FsRtlpSubsumeSharedLock + (FileLock, LockInfo, &ToInsert, Conflict); + if (!Conflict) + { + IoStatus->Status = STATUS_NO_MEMORY; + if (Irp) + { + FsRtlCompleteLockIrpReal + (FileLock->CompleteLockIrpRoutine, + Context, + Irp, + IoStatus->Status, + &Status, + FileObject); + } + return FALSE; + } + } + } + } + + /* We got here because there were only overlapping shared locks */ + DPRINT("Acquired shared lock %wZ %08x%08x %08x%08x\n", + &FileObject->FileName, + Conflict->Exclusive.FileLock.StartingByte.HighPart, + Conflict->Exclusive.FileLock.StartingByte.LowPart, + Conflict->Exclusive.FileLock.EndingByte.HighPart, + Conflict->Exclusive.FileLock.EndingByte.LowPart); + if (!FsRtlpSubsumeSharedLock(FileLock, LockInfo, &ToInsert, Conflict)) { - FsRtlCompleteLockIrpReal - (FileLock->CompleteLockIrpRoutine, - Context, - Irp, - IoStatus->Status, - &Status, - FileObject); + IoStatus->Status = STATUS_NO_MEMORY; + if (Irp) + { + FsRtlCompleteLockIrpReal + (FileLock->CompleteLockIrpRoutine, + Context, + Irp, + IoStatus->Status, + &Status, + FileObject); + } + return FALSE; } - return FALSE; + IoStatus->Status = STATUS_SUCCESS; + if (Irp) + { + FsRtlCompleteLockIrpReal + (FileLock->CompleteLockIrpRoutine, + Context, + Irp, + IoStatus->Status, + &Status, + FileObject); + } + return TRUE; } } else if (!Conflict) @@ -359,13 +561,58 @@ /* Conflict here is (or would be) the newly inserted element, but we ran * out of space probably. */ IoStatus->Status = STATUS_NO_MEMORY; + if (Irp) + { + FsRtlCompleteLockIrpReal + (FileLock->CompleteLockIrpRoutine, + Context, + Irp, + IoStatus->Status, + &Status, + FileObject); + } return FALSE; } else { + DPRINT("Inserted new lock %wZ %08x%08x %08x%08x exclusive %d\n", + &FileObject->FileName, + Conflict->Exclusive.FileLock.StartingByte.HighPart, + Conflict->Exclusive.FileLock.StartingByte.LowPart, + Conflict->Exclusive.FileLock.StartingByte.HighPart, + Conflict->Exclusive.FileLock.StartingByte.LowPart, + Conflict->Exclusive.FileLock.ExclusiveLock); + if (!ExclusiveLock) + { + PLOCK_SHARED_RANGE NewSharedRange; + NewSharedRange = + ExAllocatePoolWithTag(NonPagedPool, sizeof(*NewSharedRange), 'FSRA'); + if (!NewSharedRange) + { + IoStatus->Status = STATUS_NO_MEMORY; + if (Irp) + { + FsRtlCompleteLockIrpReal + (FileLock->CompleteLockIrpRoutine, + Context, + Irp, + IoStatus->Status, + &Status, + FileObject); + } + return FALSE; + } + DPRINT("Adding shared lock %wZ\n", &FileObject->FileName); + NewSharedRange->Start = ToInsert.Exclusive.FileLock.StartingByte; + NewSharedRange->End = ToInsert.Exclusive.FileLock.EndingByte; + NewSharedRange->Key = Key; + NewSharedRange->ProcessId = ToInsert.Exclusive.FileLock.ProcessId; + InsertTailList(&LockInfo->SharedLocks, &NewSharedRange->Entry); + } + /* Assume all is cool, and lock is set */ IoStatus->Status = STATUS_SUCCESS; - + if (Irp) { /* Complete the request */ @@ -375,12 +622,12 @@ IoStatus->Status, &Status, FileObject); - + /* Update the status */ IoStatus->Status = Status; } } - + return TRUE; } @@ -392,10 +639,19 @@ FsRtlCheckLockForReadAccess(IN PFILE_LOCK FileLock, IN PIRP Irp) { + BOOLEAN Result; PIO_STACK_LOCATION IoStack = IoGetCurrentIrpStackLocation(Irp); COMBINED_LOCK_ELEMENT ToFind; PCOMBINED_LOCK_ELEMENT Found; - if (!FileLock->LockInformation) return TRUE; + DPRINT("CheckLockForReadAccess(%wZ, Offset %08x%08x, Length %x)\n", + &IoStack->FileObject->FileName, + IoStack->Parameters.Read.ByteOffset.HighPart, + IoStack->Parameters.Read.ByteOffset.LowPart, + IoStack->Parameters.Read.Length); + if (!FileLock->LockInformation) { + DPRINT("CheckLockForReadAccess(%wZ) => TRUE\n", &IoStack->FileObject->FileName); + return TRUE; + } ToFind.Exclusive.FileLock.StartingByte = IoStack->Parameters.Read.ByteOffset; ToFind.Exclusive.FileLock.EndingByte.QuadPart = ToFind.Exclusive.FileLock.StartingByte.QuadPart + @@ -403,9 +659,14 @@ Found = RtlLookupElementGenericTable (FileLock->LockInformation, &ToFind); - if (!Found) return TRUE; - return !Found->Exclusive.FileLock.ExclusiveLock || + if (!Found) { + DPRINT("CheckLockForReadAccess(%wZ) => TRUE\n", &IoStack->FileObject->FileName); + return TRUE; + } + Result = !Found->Exclusive.FileLock.ExclusiveLock || IoStack->Parameters.Read.Key == Found->Exclusive.FileLock.Key; + DPRINT("CheckLockForReadAccess(%wZ) => %s\n", &IoStack->FileObject->FileName, Result ? "TRUE" : "FALSE"); + return Result; } /* @@ -416,11 +677,20 @@ FsRtlCheckLockForWriteAccess(IN PFILE_LOCK FileLock, IN PIRP Irp) { + BOOLEAN Result; PIO_STACK_LOCATION IoStack = IoGetCurrentIrpStackLocation(Irp); COMBINED_LOCK_ELEMENT ToFind; PCOMBINED_LOCK_ELEMENT Found; PEPROCESS Process = Irp->Tail.Overlay.Thread->ThreadsProcess; - if (!FileLock->LockInformation) return TRUE; + DPRINT("CheckLockForWriteAccess(%wZ, Offset %08x%08x, Length %x)\n", + &IoStack->FileObject->FileName, + IoStack->Parameters.Write.ByteOffset.HighPart, + IoStack->Parameters.Write.ByteOffset.LowPart, + IoStack->Parameters.Write.Length); + if (!FileLock->LockInformation) { + DPRINT("CheckLockForWriteAccess(%wZ) => TRUE\n", &IoStack->FileObject->FileName); + return TRUE; + } ToFind.Exclusive.FileLock.StartingByte = IoStack->Parameters.Write.ByteOffset; ToFind.Exclusive.FileLock.EndingByte.QuadPart = ToFind.Exclusive.FileLock.StartingByte.QuadPart + @@ -428,8 +698,13 @@ Found = RtlLookupElementGenericTable (FileLock->LockInformation, &ToFind); - if (!Found) return TRUE; - return Process->UniqueProcessId == Found->Exclusive.FileLock.ProcessId; + if (!Found) { + DPRINT("CheckLockForWriteAccess(%wZ) => TRUE\n", &IoStack->FileObject->FileName); + return TRUE; + } + Result = Process->UniqueProcessId == Found->Exclusive.FileLock.ProcessId; + DPRINT("CheckLockForWriteAccess(%wZ) => %s\n", &IoStack->FileObject->FileName, Result ? "TRUE" : "FALSE"); + return Result; } /* @@ -447,6 +722,13 @@ PEPROCESS EProcess = Process; COMBINED_LOCK_ELEMENT ToFind; PCOMBINED_LOCK_ELEMENT Found; + DPRINT("FsRtlFastCheckLockForRead(%wZ, Offset %08x%08x, Length %08x%08x, Key %x)\n", + &FileObject->FileName, + FileOffset->HighPart, + FileOffset->LowPart, + Length->HighPart, + Length->LowPart, + Key); ToFind.Exclusive.FileLock.StartingByte = *FileOffset; ToFind.Exclusive.FileLock.EndingByte.QuadPart = FileOffset->QuadPart + Length->QuadPart; @@ -471,19 +753,35 @@ IN PFILE_OBJECT FileObject, IN PVOID Process) { + BOOLEAN Result; PEPROCESS EProcess = Process; COMBINED_LOCK_ELEMENT ToFind; PCOMBINED_LOCK_ELEMENT Found; + DPRINT("FsRtlFastCheckLockForWrite(%wZ, Offset %08x%08x, Length %08x%08x, Key %x)\n", + &FileObject->FileName, + FileOffset->HighPart, + FileOffset->LowPart, + Length->HighPart, + Length->LowPart, + Key); ToFind.Exclusive.FileLock.StartingByte = *FileOffset; ToFind.Exclusive.FileLock.EndingByte.QuadPart = FileOffset->QuadPart + Length->QuadPart; - if (!FileLock->LockInformation) return TRUE; + if (!FileLock->LockInformation) { + DPRINT("CheckForWrite(%wZ) => TRUE\n", &FileObject->FileName); + return TRUE; + } Found = RtlLookupElementGenericTable (FileLock->LockInformation, &ToFind); - if (!Found) return TRUE; - return Found->Exclusive.FileLock.Key == Key && + if (!Found) { + DPRINT("CheckForWrite(%wZ) => TRUE\n", &FileObject->FileName); + return TRUE; + } + Result = Found->Exclusive.FileLock.Key == Key && Found->Exclusive.FileLock.ProcessId == EProcess->UniqueProcessId; + DPRINT("CheckForWrite(%wZ) => %s\n", &FileObject->FileName, Result ? "TRUE" : "FALSE"); + return Result; } /* @@ -500,10 +798,20 @@ IN PVOID Context OPTIONAL, IN BOOLEAN AlreadySynchronized) { + BOOLEAN FoundShared = FALSE; + PLIST_ENTRY SharedEntry; + PLOCK_SHARED_RANGE SharedRange = NULL; COMBINED_LOCK_ELEMENT Find; PCOMBINED_LOCK_ELEMENT Entry; PIRP NextMatchingLockIrp; PLOCK_INFORMATION InternalInfo = FileLock->LockInformation; + DPRINT("FsRtlFastUnlockSingle(%wZ, Offset %08x%08x, Length %08x%08x, Key %x)\n", + &FileObject->FileName, + FileOffset->HighPart, + FileOffset->LowPart, + Length->HighPart, + Length->LowPart, + Key); // The region to unlock must correspond exactly to a previously locked region // -- msdn // But Windows 2003 doesn't assert on it and simply ignores that parameter @@ -512,26 +820,101 @@ Find.Exclusive.FileLock.EndingByte.QuadPart = FileOffset->QuadPart + Length->QuadPart; Entry = RtlLookupElementGenericTable(&InternalInfo->RangeTable, &Find); - if (!Entry) return STATUS_RANGE_NOT_LOCKED; - if (Entry->Exclusive.FileLock.Key != Key || - Entry->Exclusive.FileLock.ProcessId != Process->UniqueProcessId) - return STATUS_RANGE_NOT_LOCKED; - if (Entry->Exclusive.FileLock.StartingByte.QuadPart != FileOffset->QuadPart || - Entry->Exclusive.FileLock.EndingByte.QuadPart != - FileOffset->QuadPart + Length->QuadPart) - return STATUS_RANGE_NOT_LOCKED; + if (!Entry) { + DPRINT("Range not locked %wZ\n", &FileObject->FileName); + return STATUS_RANGE_NOT_LOCKED; + } + + if (Entry->Exclusive.FileLock.ExclusiveLock) + { + if (Entry->Exclusive.FileLock.Key != Key || + Entry->Exclusive.FileLock.ProcessId != Process->UniqueProcessId || + Entry->Exclusive.FileLock.StartingByte.QuadPart != FileOffset->QuadPart || + Entry->Exclusive.FileLock.EndingByte.QuadPart != + FileOffset->QuadPart + Length->QuadPart) + { + DPRINT("Range not locked %wZ\n", &FileObject->FileName); + return STATUS_RANGE_NOT_LOCKED; + } + RtlCopyMemory(&Find, Entry, sizeof(Find)); + } + else + { + DPRINT("Shared lock %wZ Start %08x%08x End %08x%08x\n", + &FileObject->FileName, + Entry->Exclusive.FileLock.StartingByte.HighPart, + Entry->Exclusive.FileLock.StartingByte.LowPart, + Entry->Exclusive.FileLock.EndingByte.HighPart, + Entry->Exclusive.FileLock.EndingByte.LowPart); + for (SharedEntry = InternalInfo->SharedLocks.Flink; + SharedEntry != &InternalInfo->SharedLocks; + SharedEntry = SharedEntry->Flink) + { + SharedRange = CONTAINING_RECORD(SharedEntry, LOCK_SHARED_RANGE, Entry); + if (SharedRange->Start.QuadPart == FileOffset->QuadPart && + SharedRange->End.QuadPart == FileOffset->QuadPart + Length->QuadPart && + SharedRange->Key == Key && + SharedRange->ProcessId == Process->UniqueProcessId) + { + FoundShared = TRUE; + DPRINT("Found shared element to delete %wZ Start %08x%08x End %08x%08x Key %x\n", + &FileObject->FileName, + SharedRange->Start.HighPart, + SharedRange->Start.LowPart, + SharedRange->End.HighPart, + SharedRange->End.LowPart, + SharedRange->Key); + break; + } + } + if (FoundShared) + { + Find.Exclusive.FileLock.StartingByte = SharedRange->Start; + Find.Exclusive.FileLock.EndingByte = SharedRange->End; + SharedEntry = SharedRange->Entry.Flink; + RemoveEntryList(&SharedRange->Entry); + ExFreePool(SharedRange); + } + else + { + return STATUS_RANGE_NOT_LOCKED; + } + } + + if (IsListEmpty(&InternalInfo->SharedLocks)) { + DPRINT("Removing the lock entry %wZ\n", &FileObject->FileName); + RtlDeleteElementGenericTable(&InternalInfo->RangeTable, Entry); + } else { + DPRINT("Lock still has:\n"); + for (SharedEntry = InternalInfo->SharedLocks.Flink; + SharedEntry != &InternalInfo->SharedLocks; + SharedEntry = SharedEntry->Flink) + { + SharedRange = CONTAINING_RECORD(SharedEntry, LOCK_SHARED_RANGE, Entry); + DPRINT("Shared element %wZ Offset %08x%08x Length %08x%08x Key %x\n", + &FileObject->FileName, + SharedRange->Start.HighPart, + SharedRange->Start.LowPart, + SharedRange->End.HighPart, + SharedRange->End.LowPart, + SharedRange->Key); + } + } + // this is definitely the thing we want - RtlCopyMemory(&Find, Entry, sizeof(Find)); - NextMatchingLockIrp = IoCsqRemoveNextIrp(&InternalInfo->Csq, &Find); - RtlDeleteElementGenericTable(&InternalInfo->RangeTable, Entry); - while (NextMatchingLockIrp) - { - // Got a new lock irp... try to do the new lock operation - // Note that we pick an operation that would succeed at the time - // we looked, but can't guarantee that it won't just be re-queued - // because somebody else snatched part of the range in a new thread. - FsRtlProcessFileLock(InternalInfo->BelongsTo, NextMatchingLockIrp, NULL); - } + NextMatchingLockIrp = IoCsqRemoveNextIrp(&InternalInfo->Csq, &Find); + while (NextMatchingLockIrp) + { + // Got a new lock irp... try to do the new lock operation + // Note that we pick an operation that would succeed at the time + // we looked, but can't guarantee that it won't just be re-queued + // because somebody else snatched part of the range in a new thread. + DPRINT("Locking another IRP %p for %p %wZ\n", + &FileObject->FileName, FileLock, NextMatchingLockIrp); + FsRtlProcessFileLock(InternalInfo->BelongsTo, NextMatchingLockIrp, NULL); + } + + DPRINT("Success %wZ\n", &FileObject->FileName); return STATUS_SUCCESS; } @@ -547,11 +930,14 @@ { PCOMBINED_LOCK_ELEMENT Entry; PRTL_GENERIC_TABLE InternalInfo = FileLock->LockInformation; - + DPRINT("FsRtlFastUnlockAll(%wZ)\n", &FileObject->FileName); // XXX Synchronize somehow - if (!FileLock->LockInformation) return STATUS_RANGE_NOT_LOCKED; // no locks + if (!FileLock->LockInformation) { + DPRINT("Not locked %wZ\n", &FileObject->FileName); + return STATUS_RANGE_NOT_LOCKED; // no locks + } for (Entry = RtlEnumerateGenericTable(InternalInfo, TRUE); - Entry; + Entry; Entry = RtlEnumerateGenericTable(InternalInfo, FALSE)) { LARGE_INTEGER Length; @@ -569,7 +955,7 @@ Context, TRUE); } - + DPRINT("Done %wZ\n", &FileObject->FileName); return STATUS_SUCCESS; } @@ -586,11 +972,13 @@ { PCOMBINED_LOCK_ELEMENT Entry; PLOCK_INFORMATION InternalInfo = FileLock->LockInformation; - + + DPRINT("FsRtlFastUnlockAllByKey(%wZ,Key %x)\n", &FileObject->FileName, Key); + // XXX Synchronize somehow if (!FileLock->LockInformation) return STATUS_RANGE_NOT_LOCKED; // no locks for (Entry = RtlEnumerateGenericTable(&InternalInfo->RangeTable, TRUE); - Entry; + Entry; Entry = RtlEnumerateGenericTable(&InternalInfo->RangeTable, FALSE)) { LARGE_INTEGER Length; @@ -612,7 +1000,7 @@ TRUE); } } - + return STATUS_SUCCESS; } @@ -628,110 +1016,99 @@ PIO_STACK_LOCATION IoStackLocation; NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; - + /* Get the I/O Stack location */ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); ASSERT(IoStackLocation->MajorFunction == IRP_MJ_LOCK_CONTROL); - + /* Clear the I/O status block and check what function this is */ IoStatusBlock.Information = 0; + + DPRINT("FsRtlProcessFileLock(%wZ, MinorFunction %x)\n", + &IoStackLocation->FileObject->FileName, + IoStackLocation->MinorFunction); + switch(IoStackLocation->MinorFunction) { /* A lock */ - case IRP_MN_LOCK: - - /* Call the private lock routine */ - FsRtlPrivateLock(FileLock, - IoStackLocation->FileObject, - &IoStackLocation-> - Parameters.LockControl.ByteOffset, - IoStackLocation->Parameters.LockControl.Length, - IoGetRequestorProcess(Irp), - IoStackLocation->Parameters.LockControl.Key, - IoStackLocation->Flags & SL_FAIL_IMMEDIATELY, - IoStackLocation->Flags & SL_EXCLUSIVE_LOCK, - &IoStatusBlock, - Irp, - Context, - FALSE); - break; - + case IRP_MN_LOCK: + + /* Call the private lock routine */ + FsRtlPrivateLock(FileLock, + IoStackLocation->FileObject, + &IoStackLocation-> + Parameters.LockControl.ByteOffset, + IoStackLocation->Parameters.LockControl.Length, + IoGetRequestorProcess(Irp), + IoStackLocation->Parameters.LockControl.Key, + IoStackLocation->Flags & SL_FAIL_IMMEDIATELY, + IoStackLocation->Flags & SL_EXCLUSIVE_LOCK, + &IoStatusBlock, + Irp, + Context, + FALSE); + return IoStatusBlock.Status; + /* A single unlock */ - case IRP_MN_UNLOCK_SINGLE: - - /* Call fast unlock */ - IoStatusBlock.Status = - FsRtlFastUnlockSingle(FileLock, - IoStackLocation->FileObject, - &IoStackLocation->Parameters.LockControl. - ByteOffset, - IoStackLocation->Parameters.LockControl. - Length, - IoGetRequestorProcess(Irp), - IoStackLocation->Parameters.LockControl. - Key, - Context, - FALSE); - - /* Complete the IRP */ - FsRtlCompleteLockIrpReal(FileLock->CompleteLockIrpRoutine, - Context, - Irp, - IoStatusBlock.Status, - &Status, - NULL); - break; - + case IRP_MN_UNLOCK_SINGLE: + + /* Call fast unlock */ + IoStatusBlock.Status = + FsRtlFastUnlockSingle(FileLock, + IoStackLocation->FileObject, + &IoStackLocation->Parameters.LockControl. + ByteOffset, + IoStackLocation->Parameters.LockControl. + Length, + IoGetRequestorProcess(Irp), + IoStackLocation->Parameters.LockControl. + Key, + Context, + FALSE); + break; + /* Total unlock */ - case IRP_MN_UNLOCK_ALL: - - /* Do a fast unlock */ - IoStatusBlock.Status = FsRtlFastUnlockAll(FileLock, - IoStackLocation-> - FileObject, - IoGetRequestorProcess(Irp), - Context); - - /* Complete the IRP */ - FsRtlCompleteLockIrpReal(FileLock->CompleteLockIrpRoutine, - Context, - Irp, - IoStatusBlock.Status, - &Status, - NULL); - break; - + case IRP_MN_UNLOCK_ALL: + + /* Do a fast unlock */ + IoStatusBlock.Status = FsRtlFastUnlockAll(FileLock, + IoStackLocation-> + FileObject, + IoGetRequestorProcess(Irp), + Context); + break; + /* Unlock by key */ - case IRP_MN_UNLOCK_ALL_BY_KEY: - - /* Do it */ - IoStatusBlock.Status = - FsRtlFastUnlockAllByKey(FileLock, - IoStackLocation->FileObject, - IoGetRequestorProcess(Irp), - IoStackLocation->Parameters. - LockControl.Key, - Context); - - /* Complete the IRP */ - FsRtlCompleteLockIrpReal(FileLock->CompleteLockIrpRoutine, - Context, - Irp, - IoStatusBlock.Status, - &Status, - NULL); - break; - + case IRP_MN_UNLOCK_ALL_BY_KEY: + + /* Do it */ + IoStatusBlock.Status = + FsRtlFastUnlockAllByKey(FileLock, + IoStackLocation->FileObject, + IoGetRequestorProcess(Irp), + IoStackLocation->Parameters. + LockControl.Key, + Context); + break; + /* Invalid request */ - default: - - /* Complete it */ - FsRtlCompleteRequest(Irp, STATUS_INVALID_DEVICE_REQUEST); - IoStatusBlock.Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - + default: + + /* Complete it */ + FsRtlCompleteRequest(Irp, STATUS_INVALID_DEVICE_REQUEST); + IoStatusBlock.Status = STATUS_INVALID_DEVICE_REQUEST; + return STATUS_INVALID_DEVICE_REQUEST; + } + /* Return the status */ + DPRINT("Lock IRP %p %x\n", Irp, IoStatusBlock.Status); + FsRtlCompleteLockIrpReal + (FileLock->CompleteLockIrpRoutine, + Context, + Irp, + IoStatusBlock.Status, + &Status, + NULL); return IoStatusBlock.Status; } @@ -764,7 +1141,17 @@ PIRP Irp; PLOCK_INFORMATION InternalInfo = FileLock->LockInformation; PCOMBINED_LOCK_ELEMENT Entry; + PLIST_ENTRY SharedEntry; + PLOCK_SHARED_RANGE SharedRange; // MSDN: this completes any remaining lock IRPs + for (SharedEntry = InternalInfo->SharedLocks.Flink; + SharedEntry != &InternalInfo->SharedLocks;) + { + SharedRange = CONTAINING_RECORD(SharedEntry, LOCK_SHARED_RANGE, Entry); + SharedEntry = SharedEntry->Flink; + RemoveEntryList(SharedEntry); + ExFreePool(SharedRange); + } while ((Entry = RtlGetElementGenericTable(&InternalInfo->RangeTable, 0)) != NULL) { RtlDeleteElementGenericTable(&InternalInfo->RangeTable, Entry); @@ -787,7 +1174,7 @@ IN PUNLOCK_ROUTINE UnlockRoutine OPTIONAL) { PFILE_LOCK FileLock; - + /* Try to allocate it */ FileLock = ExAllocateFromPagedLookasideList(&FsRtlFileLockLookasideList); if (FileLock) @@ -797,7 +1184,7 @@ CompleteLockIrpRoutine, UnlockRoutine); } - + /* Return the lock */ return FileLock; }

1 0

[jimtabor] 56097: [Explorer] - Patch by Rodion overclocker@list.ru - Fixes Ctrl-Esc, see bug 968. - Fixes minimize all windows, see bug 6239.
by jimtabor＠svn.reactos.org 10 Mar '12

10 Mar '12

Author: jimtabor Date: Sat Mar 10 03:21:57 2012 New Revision: 56097 URL: http://svn.reactos.org/svn/reactos?rev=56097&view=rev Log: [Explorer] - Patch by Rodion overclocker(a)list.ru - Fixes Ctrl-Esc, see bug 968. - Fixes minimize all windows, see bug 6239. Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.h Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] Sat Mar 10 03:21:57 2012 @@ -235,8 +235,11 @@ if (minimized.empty()) { EnumWindows(MinimizeDesktopEnumFct, (LPARAM)&minimized); } else { - for(list<MinimizeStruct>::const_iterator it=minimized.begin(); it!=minimized.end(); ++it) + for(list<MinimizeStruct>::const_reverse_iterator it=minimized.rbegin(); + it!=minimized.rend(); ++it) { ShowWindowAsync(it->first, it->second&WS_MAXIMIZE? SW_MAXIMIZE: SW_RESTORE); + Sleep(20); + } minimized.clear(); } Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Sat Mar 10 03:21:57 2012 @@ -140,9 +140,6 @@ rbBand.cbSize = sizeof(REBARBANDINFO); rbBand.fMask = RBBIM_TEXT|RBBIM_STYLE|RBBIM_CHILD|RBBIM_CHILDSIZE|RBBIM_SIZE|RBBIM_ID|RBBIM_IDEALSIZE; -#ifndef RBBS_HIDETITLE // missing in MinGW headers as of 25.02.2004 -#define RBBS_HIDETITLE 0x400 -#endif rbBand.cyChild = REBARBAND_HEIGHT; rbBand.cyMaxChild = (ULONG)-1; rbBand.cyMinChild = REBARBAND_HEIGHT; @@ -249,6 +246,7 @@ RegisterHotKey(_hwnd, IDHK_RUN, MOD_WIN, 'R'); RegisterHotKey(_hwnd, IDHK_DESKTOP, MOD_WIN, 'D'); RegisterHotKey(_hwnd, IDHK_LOGOFF, MOD_WIN, 'L'); + RegisterHotKey(_hwnd, IDHK_STARTMENU, MOD_CONTROL, VK_ESCAPE); ///@todo register all common hotkeys } @@ -272,6 +270,9 @@ g_Globals._desktops.ToggleMinimize(); break; + case IDHK_STARTMENU: + ShowOrHideStartMenu(); + break; ///@todo implement all common hotkeys } } Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.h [iso-8859-1] Sat Mar 10 03:21:57 2012 @@ -68,6 +68,7 @@ #define IDHK_RUN 1 #define IDHK_DESKTOP 2 #define IDHK_LOGOFF 3 +#define IDHK_STARTMENU 4 /// desktop bar window, also known as "system tray" struct DesktopBar : public

1 0

[spetreolle] 56096: [ROSAPPS] Fix screensavers build.
by spetreolle＠svn.reactos.org 10 Mar '12

10 Mar '12

Author: spetreolle Date: Sat Mar 10 00:54:06 2012 New Revision: 56096 URL: http://svn.reactos.org/svn/reactos?rev=56096&view=rev Log: [ROSAPPS] Fix screensavers build. Modified: trunk/rosapps/applications/screensavers/CMakeLists.txt trunk/rosapps/applications/screensavers/blankscr/CMakeLists.txt trunk/rosapps/applications/screensavers/cylfrac/CMakeLists.txt trunk/rosapps/applications/screensavers/matrix/CMakeLists.txt trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt Modified: trunk/rosapps/applications/screensavers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/CMakeLists.txt [iso-8859-1] Sat Mar 10 00:54:06 2012 @@ -3,6 +3,6 @@ add_subdirectory(circles) add_subdirectory(cylfrac) add_subdirectory(matrix) -#add_subdirectory(mazescr) +add_subdirectory(mazescr) add_subdirectory(starfield) add_subdirectory(ssstars) Modified: trunk/rosapps/applications/screensavers/blankscr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/blankscr/CMakeLists.txt [iso-8859-1] Sat Mar 10 00:54:06 2012 @@ -9,6 +9,6 @@ set_target_properties(blankscr PROPERTIES SUFFIX ".scr") target_link_libraries(blankscr scrnsave) -add_importlibs(blankscr user32 gdi32) +add_importlibs(blankscr user32 gdi32 msvcrt kernel32) add_cd_file(TARGET blankscr DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/screensavers/cylfrac/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/cylfrac/CMakeLists.txt [iso-8859-1] Sat Mar 10 00:54:06 2012 @@ -8,7 +8,6 @@ set_module_type(cylfrac win32gui UNICODE) set_target_properties(cylfrac PROPERTIES SUFFIX ".scr") -target_link_libraries(cylfrac scrnsave) add_importlibs(cylfrac user32 gdi32 opengl32 glu32 winmm msvcrt kernel32) add_cd_file(TARGET cylfrac DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/screensavers/matrix/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/matrix/CMakeLists.txt [iso-8859-1] Sat Mar 10 00:54:06 2012 @@ -13,7 +13,6 @@ set_module_type(matrix win32gui UNICODE) set_target_properties(matrix PROPERTIES SUFFIX ".scr") -target_link_libraries(matrix scrnsave uuid) add_importlibs(matrix user32 gdi32 winspool advapi32 comctl32 comdlg32 shell32 msvcrt kernel32) add_cd_file(TARGET matrix DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt [iso-8859-1] Sat Mar 10 00:54:06 2012 @@ -6,7 +6,7 @@ maze.c scrnsave.rc) -set_module_type(mazescr win32gui UNICODE) +set_module_type(mazescr win32gui) set_target_properties(mazescr PROPERTIES SUFFIX ".scr") add_importlibs(mazescr user32 gdi32 msvcrt kernel32)

1 0

[tfaber] 56095: [CLT2012] - Change version to 0.3.14-CLT2012
by tfaber＠svn.reactos.org 09 Mar '12

09 Mar '12

Author: tfaber Date: Fri Mar 9 19:28:53 2012 New Revision: 56095 URL: http://svn.reactos.org/svn/reactos?rev=56095&view=rev Log: [CLT2012] - Change version to 0.3.14-CLT2012 Modified: branches/ros-branch-0_3_14-clt2012/base/shell/explorer-new/res/logov.bmp branches/ros-branch-0_3_14-clt2012/base/shell/explorer/res/logov.bmp branches/ros-branch-0_3_14-clt2012/include/reactos/version.cmake branches/ros-branch-0_3_14-clt2012/include/reactos/version.h Modified: branches/ros-branch-0_3_14-clt2012/base/shell/explorer-new/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_14-clt2012/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/base/… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_14-clt2012/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/inclu… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/include/reactos/version.cmake [iso-8859-1] Fri Mar 9 19:28:53 2012 @@ -30,11 +30,11 @@ today(KERNEL_VERSION_BUILD) set(KERNEL_VERSION_MAJOR "0") -set(KERNEL_VERSION_MINOR "4") -set(KERNEL_VERSION_PATCH_LEVEL "0") +set(KERNEL_VERSION_MINOR "3") +set(KERNEL_VERSION_PATCH_LEVEL "14") set(COPYRIGHT_YEAR "2012") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "SVN") +set(KERNEL_VERSION_BUILD_TYPE "CLT2012") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") Modified: branches/ros-branch-0_3_14-clt2012/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/inclu… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/include/reactos/version.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/include/reactos/version.h [iso-8859-1] Fri Mar 9 19:28:53 2012 @@ -24,7 +24,7 @@ #define COPYRIGHT_YEAR "2012" /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ -#define KERNEL_VERSION_BUILD_TYPE L"" +#define KERNEL_VERSION_BUILD_TYPE L"CLT2012" #endif

1 0

[tfaber] 56094: [CLT2012] - Create a branch for the 0.3.14-CLT2012 version
by tfaber＠svn.reactos.org 09 Mar '12

09 Mar '12

Author: tfaber Date: Fri Mar 9 19:00:33 2012 New Revision: 56094 URL: http://svn.reactos.org/svn/reactos?rev=56094&view=rev Log: [CLT2012] - Create a branch for the 0.3.14-CLT2012 version Added: branches/ros-branch-0_3_14-clt2012/ (props changed) - copied from r56093, tags/ReactOS-0.3.14/ Propchange: branches/ros-branch-0_3_14-clt2012/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Mar 9 19:00:33 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-branch-0_3_14-clt2012/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-branch-0_3_14-clt2012/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-branch-0_3_14-clt2012/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Mar 9 19:00:33 2012 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/ros-branch-0_3_14-clt2012/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Mar 9 19:00:33 2012 @@ -1,0 +1,14 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/branches/wlan-bringup:54809-54998 +/trunk/reactos:55012,55173,55430,55432 Propchange: branches/ros-branch-0_3_14-clt2012/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[cgutman] 56093: [NTOSKRNL] - Add an assertion to catch a bug in the I/O manager
by cgutman＠svn.reactos.org 08 Mar '12

08 Mar '12

Author: cgutman Date: Thu Mar 8 23:02:45 2012 New Revision: 56093 URL: http://svn.reactos.org/svn/reactos?rev=56093&view=rev Log: [NTOSKRNL] - Add an assertion to catch a bug in the I/O manager Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Thu Mar 8 23:02:45 2012 @@ -59,6 +59,9 @@ PAGED_CODE(); DPRINT1("Deleting driver object '%wZ'\n", &DriverObject->DriverName); + + /* There must be no device objects remaining at this point */ + ASSERT(!DriverObject->DeviceObject); /* Get the extension and loop them */ DriverExtension = IoGetDrvObjExtension(DriverObject)->

1 0

[sginsberg] 56092: - Addendum to 56090.
by sginsberg＠svn.reactos.org 08 Mar '12

08 Mar '12

Author: sginsberg Date: Thu Mar 8 09:23:24 2012 New Revision: 56092 URL: http://svn.reactos.org/svn/reactos?rev=56092&view=rev Log: - Addendum to 56090. Modified: trunk/reactos/ntoskrnl/include/internal/spinlock.h Modified: trunk/reactos/ntoskrnl/include/internal/spinlock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/spinlock.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/spinlock.h [iso-8859-1] Thu Mar 8 09:23:24 2012 @@ -75,7 +75,7 @@ } #endif } -#ifdef DBG +#if DBG /* On debug builds, we OR in the KTHREAD */ *SpinLock = (KSPIN_LOCK)KeGetCurrentThread() | 1; #endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs