Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[cfinck] 36145: - Import some language files from the Web server (they were just copied from the english ones to enable the translation) - Add Hebrew to the list of supported languages. It's already selectable in the online language list for quite some time now, but due to this bug, it always switched back to English :-/ This is all still a big mess....
by cfinck＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cfinck Date: Thu Sep 11 15:15:20 2008 New Revision: 36145 URL: http://svn.reactos.org/svn/reactos?rev=36145&view=rev Log: - Import some language files from the Web server (they were just copied from the english ones to enable the translation) - Add Hebrew to the list of supported languages. It's already selectable in the online language list for quite some time now, but due to this bug, it always switched back to English :-/ This is all still a big mess.... Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/cz.php - copied unchanged from r34825, trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php trunk/web/reactos.org/htdocs/roscms/inc/lang/he.php - copied unchanged from r34825, trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php trunk/web/reactos.org/htdocs/roscms/inc/lang/sk.php - copied unchanged from r34825, trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php trunk/web/reactos.org/htdocs/roscms/inc/lang/tw.php - copied unchanged from r34825, trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php trunk/web/reactos.org/htdocs/roscms/inc/lang/uk.php - copied unchanged from r34825, trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/bg.php trunk/web/reactos.org/htdocs/roscms/lang.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/bg.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/lang/bg.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/lang/bg.php [iso-8859-1] Thu Sep 11 15:15:20 2008 @@ -26,163 +26,163 @@ // Language settings $roscms_langres['charset'] = 'utf-8'; -//$roscms_langres['charset'] = 'cp1251'; -$roscms_langres['lang_code'] = 'BG'; +//$roscms_langres['charset'] = 'iso-8859-1'; +$roscms_langres['lang_code'] = 'EN'; // main menu -$roscms_langres['Navigation'] = 'ÐÐ°ÑÐ¾ÐºÐ°'; -$roscms_langres['Home'] = 'ÐÐ°ÑÐ°Ð»Ð¾'; -$roscms_langres['Dev'] = 'Ð Ð°Ð·ÑÐ°Ð±Ð¾ÑÐºÐ°'; -$roscms_langres['Community'] = 'ÐÐ±ÑÐµÑÑÐ²Ð¾'; -$roscms_langres['Support'] = 'ÐÐ¾Ð´ÑÑÐ¶ÐºÐ°'; -$roscms_langres['myReactOS'] = 'ÐÐ¾ÑÑ Ð ÐµÐ°ÐºÑÐÐ¡'; -$roscms_langres['Info'] = 'Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ'; +$roscms_langres['Navigation'] = 'Navigation'; +$roscms_langres['Home'] = 'Home'; +$roscms_langres['Dev'] = 'Development'; +$roscms_langres['Community'] = 'Community'; +$roscms_langres['Support'] = 'Support'; +$roscms_langres['myReactOS'] = 'myReactOS'; +$roscms_langres['Info'] = 'Info'; // Login bar: -$roscms_langres['Account'] = 'Ð¡Ð¼ÐµÑÐºÐ°'; -$roscms_langres['Login'] = 'ÐÑÐ¾Ð´'; -$roscms_langres['Logout'] = 'ÐÐ·ÑÐ¾Ð´'; -$roscms_langres['Global_Login_System'] = 'ÐÑÐµÐ¾Ð±ÑÐ° Ð²ÑÐ¾Ð´Ð½Ð° ÑÑÐµÐ´Ð±Ð°'; -$roscms_langres['Register_Account'] = 'Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ¼ÐµÑÐºÐ°'; -$roscms_langres['Login_Nick'] = ' ÐÑÐ¾Ð·Ð²Ð¸ÑÐµ: '; -$roscms_langres['LoginPwd'] = ' ÐÐ°ÑÐ¾Ð»Ð°: '; +$roscms_langres['Account'] = 'Account'; +$roscms_langres['Login'] = 'Login'; +$roscms_langres['Logout'] = 'Logout'; +$roscms_langres['Global_Login_System'] = 'Global Login System'; +$roscms_langres['Register_Account'] = 'Register Account'; +$roscms_langres['Login_Nick'] = ' Nick: '; +$roscms_langres['LoginPwd'] = ' Pwd: '; // myReactOS menu -$roscms_langres['User_Profil_Overview'] = 'ÐÐ±Ð·Ð¾Ñ Ð½Ð° Ð¾ÑÐµÑÐºÐ° Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ'; -$roscms_langres['User_Profil'] = 'ÐÑÐµÑÐº Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ'; -$roscms_langres['Overview'] = 'ÐÐ±Ð·Ð¾Ñ'; -$roscms_langres['Login_System'] = 'ÐÑÐ¾Ð´Ð½Ð° ÑÑÐµÐ´Ð±Ð°'; -$roscms_langres['Messages'] = 'Ð¡ÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ'; -$roscms_langres['Contacts'] = 'Ð£ÐºÐ°Ð·Ð°ÑÐµÐ»'; -$roscms_langres['Favorites'] = 'ÐÑÐ±Ð¸Ð¼ÐºÐ¸'; -$roscms_langres['Documentation'] = 'ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸Ñ'; -$roscms_langres['Account_Edit'] = 'ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸'; -$roscms_langres['Accountlist'] = 'Ð¡Ð¿Ð¸ÑÑÐº Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ð¸ÑÐµ'; +$roscms_langres['User_Profil_Overview'] = 'User Profile Overview'; +$roscms_langres['User_Profil'] = 'User Profile'; +$roscms_langres['Overview'] = 'Overview'; +$roscms_langres['Login_System'] = 'Login System'; +$roscms_langres['Messages'] = 'Messages'; +$roscms_langres['Contacts'] = 'Contacts'; +$roscms_langres['Favorites'] = 'Favorites'; +$roscms_langres['Documentation'] = 'Documentation'; +$roscms_langres['Account_Edit'] = 'Settings'; +$roscms_langres['Accountlist'] = 'User List'; // myReactOS Content -$roscms_langres['myReactOS_description'] = 'ÐÐ¾ÑÐµÐ½ Ð¸ ÑÐ´Ð¾Ð±ÐµÐ½ Ð¸Ð½ÑÐµÑÑÐµÐ¹Ñ Ð·Ð° ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð½Ð° ÑÐ¼ÐµÑÐºÐ°ÑÐ° Ð²Ð¸ Ð·Ð° Ð¼ÑÑÑÐ¾ÑÐ¾ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡.'; -$roscms_langres['Account_Information'] = 'Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð·Ð° ÑÐ¼ÐµÑÐºÐ°ÑÐ°'; -$roscms_langres['Account_Information_description'] = 'ÐÐ±Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸ÑÐµ Ð·Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ... <placeholder>'; +$roscms_langres['myReactOS_description'] = 'A powerful and easy to use interface to manage your ReactOS homepage account.'; +$roscms_langres['Account_Information'] = 'Account Information'; +$roscms_langres['Account_Information_description'] = 'A sum up of the account data ... <placeholder>'; // Right side bar: -$roscms_langres['Latest_Release'] = 'ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¾ Ð¸Ð·Ð´Ð°Ð½Ð¸Ðµ'; -$roscms_langres['myReactOS_Developer_Quotes'] = 'ÐÑÐ¼Ð¸ Ð½Ð° ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÑÐ¸ÑÐµ'; +$roscms_langres['Latest_Release'] = 'Latest Release'; +$roscms_langres['myReactOS_Developer_Quotes'] = 'Developer Quotes'; // Error 404 -$roscms_langres['Page_not_found'] = 'Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° Ð½Ðµ Ðµ Ð¾ÑÐºÑÐ¸ÑÐ°'; +$roscms_langres['Page_not_found'] = 'Page not found'; // Admin/Dev/Translator Interface -$roscms_langres['Dev_Interface'] = 'ÐÐ½ÑÐµÑÑÐµÐ¹Ñ Ð·Ð° ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÑÐ¸'; -$roscms_langres['Dev_Overview'] = 'ÐÐ±Ð·Ð¾Ñ'; -$roscms_langres['Dev_Pages'] = 'Ð¡ÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['Dev_Contents'] = 'Ð¡ÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ'; -$roscms_langres['Dev_Help'] = 'ÐÐ¾Ð¼Ð¾Ñ'; +$roscms_langres['Dev_Interface'] = 'Dev Interface'; +$roscms_langres['Dev_Overview'] = 'Overview'; +$roscms_langres['Dev_Pages'] = 'Pages'; +$roscms_langres['Dev_Contents'] = 'Contents'; +$roscms_langres['Dev_Help'] = 'Help'; -$roscms_langres['Dev_DeveloperInterfaceOverview'] = 'ÐÐ½ÑÐµÑÑÐµÐ¹Ñ Ð·Ð° ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÑÐ¸- Ð¾Ð±Ð·Ð¾Ñ'; +$roscms_langres['Dev_DeveloperInterfaceOverview'] = 'Developer Interface - Overview'; -$roscms_langres['ContTrans_generalinfo'] = 'ÐÑÐ½Ð¾Ð²Ð½Ð¸ÑÐµ ÑÑÑÐ°Ð½Ð¸ÑÐ¸ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡ ÑÐµ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ñ Ð²ÐµÐ´Ð½ÑÐ¶ Ð´Ð½ÐµÐ²Ð½Ð¾. ÐÐ¾Ð¶ÐµÑÐµ Ð´Ð° Ð²Ð¸Ð´Ð¸ÑÐµ Ð¿ÑÐµÐ³Ð»ÐµÐ´ Ð½Ð° Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ÑÐµ, ÐºÐ¾Ð¸ÑÐ¾ ÑÑÐµ Ð½Ð°Ð¿ÑÐ°Ð²Ð¸Ð»Ð¸, ÑÐ»ÐµÐ´ ÐºÐ°ÑÐ¾ Ð½Ð°ÑÐ¸ÑÐ½ÐµÑÐµ "ÐÐ°Ð¿Ð¸Ñ".'; +$roscms_langres['ContTrans_generalinfo'] = 'The ReactOS main website pages get updated once a day. You will see a preview of your changes after clicking on "Save".'; -$roscms_langres['ContTrans_Interface_Content'] = 'ÐÐ½ÑÐµÑÑÐµÐ¹Ñ Ð·Ð° ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÑÐ¸- ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ'; -$roscms_langres['ContTrans_Contents'] = 'Ð¡ÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ'; -$roscms_langres['ContTrans_Interface_Pages'] = 'ÐÐ½ÑÐµÑÑÐµÐ¹Ñ Ð·Ð° ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÑÐ¸- ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['ContTrans_Pages'] = 'Ð¡ÑÑÐ°Ð½Ð¸ÑÐ¸'; +$roscms_langres['ContTrans_Interface_Content'] = 'Dev Interface - Content'; +$roscms_langres['ContTrans_Contents'] = 'Content'; +$roscms_langres['ContTrans_Interface_Pages'] = 'Dev Interface - Pages'; +$roscms_langres['ContTrans_Pages'] = 'Pages'; -$roscms_langres['ContTrans_Profile'] = 'ÐÑÐµÑÐº'; +$roscms_langres['ContTrans_Profile'] = 'Profile'; -$roscms_langres['ContTrans_Action'] = 'ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ'; -$roscms_langres['ContTrans_NewContent'] = 'ÐÐ¾Ð²Ð¾ ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ'; -$roscms_langres['ContTrans_NewPage'] = 'ÐÐ¾Ð²Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°'; +$roscms_langres['ContTrans_Action'] = 'Action'; +$roscms_langres['ContTrans_NewContent'] = 'New Content'; +$roscms_langres['ContTrans_NewPage'] = 'New Page'; -$roscms_langres['ContTrans_resetfilters'] = 'Ð¿ÑÐµÑÑÑÐ°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¿ÑÐµÑÑÐ²Ð°Ð½Ð¸ÐµÑÐ¾ Ð¸ Ð¿Ð¾Ð´ÑÐµÐ¶Ð´Ð°Ð½ÐµÑÐ¾'; -$roscms_langres['ContTrans_Info'] = 'Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ'; -$roscms_langres['ContTrans_ContentID'] = 'ÐÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°ÑÐµÐ» (id) Ð½Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸ÐµÑÐ¾'; -$roscms_langres['ContTrans_PageID'] = 'ÐÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°ÑÐµÐ» (id) Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ°'; -$roscms_langres['ContTrans_Content'] = 'Ð¡ÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ'; -$roscms_langres['ContTrans_Rev'] = 'ÐÐ·Ð´.'; -$roscms_langres['ContTrans_Date'] = 'ÐÐ°ÑÐ°'; -$roscms_langres['ContTrans_Time'] = 'ÐÑÐµÐ¼Ðµ'; -$roscms_langres['ContTrans_User'] = 'ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»'; -$roscms_langres['ContTrans_Language'] = 'ÐÐ·Ð¸Ðº'; -$roscms_langres['ContTrans_International'] = 'ÐÐ·ÑÐ¾Ð´ÐµÐ½ (ÐÐ½Ð³Ð»Ð¸Ð¹ÑÐºÐ¸)'; -$roscms_langres['ContTrans_All'] = 'ÐÑÐ¸ÑÐºÐ¾'; -$roscms_langres['ContTrans_Filter'] = 'ÐÑÐµÑÑÐ²Ð°Ð½Ðµ'; +$roscms_langres['ContTrans_resetfilters'] = 'reset filters & sort'; +$roscms_langres['ContTrans_Info'] = 'Info'; +$roscms_langres['ContTrans_ContentID'] = 'Content ID'; +$roscms_langres['ContTrans_PageID'] = 'Page ID'; +$roscms_langres['ContTrans_Content'] = 'Content'; +$roscms_langres['ContTrans_Rev'] = 'Rev.'; +$roscms_langres['ContTrans_Date'] = 'Date'; +$roscms_langres['ContTrans_Time'] = 'Time'; +$roscms_langres['ContTrans_User'] = 'User'; +$roscms_langres['ContTrans_Language'] = 'Language'; +$roscms_langres['ContTrans_International'] = 'Original (English)'; +$roscms_langres['ContTrans_All'] = 'All'; +$roscms_langres['ContTrans_Filter'] = 'Filter'; $roscms_langres['ContTrans_activecontent'] = 'active content'; $roscms_langres['ContTrans_activepages'] = 'active pages'; -$roscms_langres['ContTrans_allcontent'] = 'Ð¿ÑÐ»Ð½Ð¾ ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ'; -$roscms_langres['ContTrans_allpages'] = 'ÐÑÐ¸ÑÐºÐ¸ ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['ContTrans_activeandvisiblecontent'] = 'Ð´ÐµÐ¹Ð½Ð¾ Ð¸ Ð²Ð¸Ð´Ð¸Ð¼Ð¾ ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ'; -$roscms_langres['ContTrans_currentuser'] = 'ÑÐµÐºÑÑ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»'; +$roscms_langres['ContTrans_allcontent'] = 'all content'; +$roscms_langres['ContTrans_allpages'] = 'all pages'; +$roscms_langres['ContTrans_activeandvisiblecontent'] = 'active and visible content'; +$roscms_langres['ContTrans_currentuser'] = 'current user'; -$roscms_langres['ContTrans_normalpages'] = 'Ð¾Ð±Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['ContTrans_dynamicpages'] = 'Ð´Ð¸Ð½Ð°Ð¼Ð¸ÑÐ½Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; +$roscms_langres['ContTrans_normalpages'] = 'normal pages'; +$roscms_langres['ContTrans_dynamicpages'] = 'dynamic pages'; -$roscms_langres['ContTrans_history'] = 'Ð´Ð½ÐµÐ²Ð½Ð¸Ðº'; -$roscms_langres['ContTrans_Sortedby'] = 'ÐÐ¾Ð´ÑÐµÐ¶Ð´Ð°Ð½Ðµ Ð¿Ð¾'; -$roscms_langres['ContTrans_contentid'] = 'Ð¾Ð¿Ð¾Ð·Ð½Ð°Ð²Ð°ÑÐµÐ» (id) Ð½Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸ÐµÑÐ¾'; -$roscms_langres['ContTrans_pageid'] = 'Ð¾Ð¿Ð¾Ð·Ð½Ð°Ð²Ð°ÑÐµÐ» (id) Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ°'; -$roscms_langres['ContTrans_date'] = 'Ð´Ð°ÑÐ°'; -$roscms_langres['ContTrans_user'] = 'Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»'; -$roscms_langres['ContTrans_active'] = 'Ð´ÐµÐµÐ½'; -$roscms_langres['ContTrans_Active'] = 'ÐÐµÐµÐ½'; -$roscms_langres['ContTrans_visible'] = 'Ð²Ð¸Ð´Ð¸Ð¼'; -$roscms_langres['ContTrans_Visible'] = 'ÐÐ¸Ð´Ð¸Ð¼'; -$roscms_langres['ContTrans_version'] = 'Ð²ÐµÑÑÐ¸Ñ'; -$roscms_langres['ContTrans_extra'] = 'Ð¾ÑÐµ'; -$roscms_langres['ContTrans_Extra'] = 'ÐÑÐµ'; -$roscms_langres['ContTrans_language'] = 'ÐµÐ·Ð¸Ðº'; -$roscms_langres['ContTrans_editor'] = 'Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐ¸Ð»'; -$roscms_langres['ContTrans_Editor'] = 'ÐÐ±ÑÐ°Ð±Ð¾ÑÐ¸Ð»'; -$roscms_langres['ContTrans_Translate'] = 'ÐÑÐµÐ²Ð¾Ð´'; -$roscms_langres['ContTrans_Edit'] = 'ÐÑÐµÐ³Ð»ÐµÐ´/ ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ°'; -$roscms_langres['ContTrans_Delete'] = 'ÐÐ·ÑÑÐ¸Ð²Ð°Ð½Ðµ'; -$roscms_langres['ContTrans_filter_history'] = 'ÐÑÐµÑÑÐ²Ð°Ð½Ðµ: Ð´Ð½ÐµÐ²Ð½Ð¸Ðº'; +$roscms_langres['ContTrans_history'] = 'history'; +$roscms_langres['ContTrans_Sortedby'] = 'Sorted by'; +$roscms_langres['ContTrans_contentid'] = 'content id'; +$roscms_langres['ContTrans_pageid'] = 'page id'; +$roscms_langres['ContTrans_date'] = 'date'; +$roscms_langres['ContTrans_user'] = 'user'; +$roscms_langres['ContTrans_active'] = 'active'; +$roscms_langres['ContTrans_Active'] = 'Active'; +$roscms_langres['ContTrans_visible'] = 'visible'; +$roscms_langres['ContTrans_Visible'] = 'Visible'; +$roscms_langres['ContTrans_version'] = 'version'; +$roscms_langres['ContTrans_extra'] = 'extra'; +$roscms_langres['ContTrans_Extra'] = 'Extra'; +$roscms_langres['ContTrans_language'] = 'language'; +$roscms_langres['ContTrans_editor'] = 'editor'; +$roscms_langres['ContTrans_Editor'] = 'Editor'; +$roscms_langres['ContTrans_Translate'] = 'Translate'; +$roscms_langres['ContTrans_Edit'] = 'View / Edit'; +$roscms_langres['ContTrans_Delete'] = 'Delete'; +$roscms_langres['ContTrans_filter_history'] = 'Filter: history'; -$roscms_langres['ContTrans_ViewEditContent'] = 'ÐÑÐµÐ³Ð»ÐµÐ´/ ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸ÐµÑÐ¾'; -$roscms_langres['ContTrans_ViewEditpage'] = 'ÐÑÐµÐ³Ð»ÐµÐ´/ ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ°'; -$roscms_langres['ContTrans_SaveContent'] = 'ÐÐ°Ð¿Ð¸Ñ Ð½Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸ÐµÑÐ¾'; -$roscms_langres['ContTrans_Type'] = 'ÐÐ¸Ð´'; -$roscms_langres['ContTrans_Description'] = 'ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ'; -$roscms_langres['ContTrans_Username'] = 'ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÐºÐ¾ Ð¸Ð¼Ðµ'; -$roscms_langres['ContTrans_egAbout'] = 'Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ "Ð·Ð°"'; -$roscms_langres['ContTrans_checklang'] = 'ÐÐ¾Ð»Ñ, Ð¿ÑÐ¾Ð²ÐµÑÐµÑÐµ Ð´Ð°Ð»Ð¸ ÑÑÐµ Ð¸Ð·Ð±ÑÐ°Ð»Ð¸ Ð¿ÑÐ°Ð²Ð¸Ð»Ð½Ð¸Ñ ÐµÐ·Ð¸Ðº, Ð¿ÑÐµÐ´Ð¸ Ð´Ð° Ð½Ð°ÑÐ¸ÑÐ½ÐµÑÐµ "ÐÐ¾Ð´Ð°Ð²Ð°Ð½Ðµ"!'; -$roscms_langres['ContTrans_SAVE'] = '<b>ÐÐ°Ð¿Ð¸Ñ</b> (Ð½Ð¾Ð²Ð¾ ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ Ð¸ Ð½Ð¾Ð²Ð¾ Ð¿Ð¾Ð¿ÑÐ»Ð½ÐµÐ½Ð¸Ðµ Ð² Ð±Ð°Ð·Ð°ÑÐ° Ð¾Ñ Ð´Ð°Ð½Ð½Ð¸)'; -$roscms_langres['ContTrans_UPDATE'] = '<b>ÐÐ±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ</b> (Ð·Ð°Ð¼ÐµÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐµÐ³Ð°ÑÐ½Ð¾ÑÐ¾ Ð¿Ð¾Ð¿ÑÐ»Ð½ÐµÐ½Ð¸Ðµ)'; -$roscms_langres['ContTrans_Save1'] = 'ÐÐ°Ð¿Ð¸ÑÐ°Ð½Ð° Ðµ Ð½Ð¾Ð²Ð° Ð²ÐµÑÑÐ¸Ñ'; -$roscms_langres['ContTrans_Save2'] = 'Ð½Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸ÐµÑÐ¾!'; -$roscms_langres['ContTrans_Save3'] = 'ÐÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ° \'content edit\' '; -$roscms_langres['ContTrans_Save4'] = 'ÐÐ±ÑÐ°ÑÐ½Ð¾ Ð´Ð¾ ÑÑÑÐ°Ð½Ð¸ÑÐ° \'content edit\' '; -$roscms_langres['ContTrans_Save5'] = 'Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ°'; -$roscms_langres['ContTrans_Save6'] = 'ÐÑÐµÐ³Ð»ÐµÐ´ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° (Ð´Ð¸Ð½Ð°Ð¼Ð¸ÑÐ½Ð° Ð²ÐµÑÑÐ¸Ñ; Ð½Ð¾Ð² Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ)'; -$roscms_langres['ContTrans_Save7'] = 'ÐÐ±ÑÐ°ÑÐ½Ð¾ Ð´Ð¾ ÑÑÑÐ°Ð½Ð¸ÑÐ° \'page edit\' '; +$roscms_langres['ContTrans_ViewEditContent'] = 'View / Edit content'; +$roscms_langres['ContTrans_ViewEditpage'] = 'View / Edit page'; +$roscms_langres['ContTrans_SaveContent'] = 'Save content'; +$roscms_langres['ContTrans_Type'] = 'Type'; +$roscms_langres['ContTrans_Description'] = 'Description'; +$roscms_langres['ContTrans_Username'] = 'Username'; +$roscms_langres['ContTrans_egAbout'] = 'e.g. "about"'; +$roscms_langres['ContTrans_checklang'] = 'Please check, if you have selected the right language, before you click "submit"!'; +$roscms_langres['ContTrans_SAVE'] = '<b>Save</b> (new version and new db entry)'; +$roscms_langres['ContTrans_UPDATE'] = '<b>Update</b> (overwrite the current entry)'; +$roscms_langres['ContTrans_Save1'] = 'A new version of content'; +$roscms_langres['ContTrans_Save2'] = 'has been saved!'; +$roscms_langres['ContTrans_Save3'] = 'Go to the \'content edit\' page'; +$roscms_langres['ContTrans_Save4'] = 'Back to the \'content edit\' page'; +$roscms_langres['ContTrans_Save5'] = 'The page'; +$roscms_langres['ContTrans_Save6'] = 'View the page (dynamic version; new window)'; +$roscms_langres['ContTrans_Save7'] = 'Back to the \'page edit\' page'; -$roscms_langres['ContTrans_Preview'] = 'ÐÑÐµÐ³Ð»ÐµÐ´'; -$roscms_langres['ContTrans_PageTitle'] = 'ÐÐ°Ð³Ð»Ð°Ð²Ð¸Ðµ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ°'; -$roscms_langres['ContTrans_Extention'] = 'Ð Ð°Ð·ÑÐ¸ÑÐµÐ½Ð¸Ðµ'; +$roscms_langres['ContTrans_Preview'] = 'Preview'; +$roscms_langres['ContTrans_PageTitle'] = 'Page Title'; +$roscms_langres['ContTrans_Extention'] = 'Extention'; -$roscms_langres['ContTrans_DevPageGenerator'] = 'Ð Ð°Ð·Ð²Ð¾ÐµÐ½ Ð¸Ð½ÑÐµÑÑÐµÐ¹Ñ - Ð¡ÑÐ·Ð´Ð°ÑÐµÐ» Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['Dev_PageGenerator'] = 'Ð¡ÑÐ·Ð´Ð°ÑÐµÐ» Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['Dev_PageGeneratorOverview'] = 'ÐÐ±Ð·Ð¾Ñ Ð½Ð° ÑÑÐ·Ð´Ð°ÑÐµÐ»Ñ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['ContTrans_Change'] = 'ÐÑÐ¾Ð¼ÑÐ½Ð°'; -$roscms_langres['ContTrans_LatestGen'] = 'ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¾ ÑÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ'; -$roscms_langres['ContTrans_UserGen'] = 'ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ» (ÑÑÐ·Ð´Ð°ÑÐµÐ»)'; +$roscms_langres['ContTrans_DevPageGenerator'] = 'Developer Interface - Page Generator'; +$roscms_langres['Dev_PageGenerator'] = 'Page Generator'; +$roscms_langres['Dev_PageGeneratorOverview'] = 'Page Generator Overview'; +$roscms_langres['ContTrans_Change'] = 'Change'; +$roscms_langres['ContTrans_LatestGen'] = 'Latest Gen.'; +$roscms_langres['ContTrans_UserGen'] = 'User (Generator)'; -$roscms_langres['ContTrans_Gen_desc'] = 'Ð¡ÑÐ·Ð´Ð°ÑÐµÐ»ÑÑ Ð½Ð° ÑÑÐ°ÑÐ¸ÑÐ½Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ¸ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¸Ð·Ð²ÐµÐ´Ðµ ÑÑÑÐ°Ð½Ð¸ÑÐ¸ÑÐµ Ð²ÑÐ² ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ Ð¸Ð»Ð¸ Ð² Ð¾Ð±Ð·Ð¾ÑÐ½Ð¸ÐºÐ°.'; -$roscms_langres['ContTrans_Gen_menu1'] = 'Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð²ÑÐ¸ÑÐºÐ¸ ÐÐÐÐÐÐÐÐ ÑÑÐ°ÑÐ¸ÑÐ½Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['ContTrans_Gen_menu2'] = 'Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð²ÑÐ¸ÑÐºÐ¸ ÑÑÐ°ÑÐ¸ÑÐ½Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['ContTrans_Gen_menu3'] = 'Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ/ Ð¿ÑÐµÐ³Ð»ÐµÐ´ Ð½Ð° Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð° ÑÑÐ°ÑÐ¸ÑÐ½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°'; -$roscms_langres['ContTrans_Gen_menu4'] = 'ÐÑÐµÐ³Ð»ÐµÐ´ (Ð´Ð¸Ð½Ð°Ð¼Ð¸ÑÐ½Ð¾ Ð¾Ñ Ð±Ð°Ð·Ð°ÑÐ° Ð¾Ñ Ð´Ð°Ð½Ð½Ð¸)'; -$roscms_langres['ContTrans_Gen_menu3_desc'] = 'Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° ÐµÐ´Ð½Ð° ÑÑÐ°ÑÐ¸ÑÐ½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°; Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, Ð°ÐºÐ¾ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð¾Ð±Ð½Ð¾Ð²ÐµÑÐµ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°'; -$roscms_langres['ContTrans_allactivepages'] = 'Ð²ÑÐ¸ÑÐºÐ¸ (Ð´ÐµÐ¹Ð½Ð¸) ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; +$roscms_langres['ContTrans_Gen_desc'] = 'The static page generator can output the pages to files or to the browser.'; +$roscms_langres['ContTrans_Gen_menu1'] = 'Generate all UPDATED static pages'; +$roscms_langres['ContTrans_Gen_menu2'] = 'Generate all static pages'; +$roscms_langres['ContTrans_Gen_menu3'] = 'Generate/view a specific static page'; +$roscms_langres['ContTrans_Gen_menu4'] = 'View page (dynamic from database)'; +$roscms_langres['ContTrans_Gen_menu3_desc'] = 'Generate one static page; e.g. if you want to update one specific page'; +$roscms_langres['ContTrans_allactivepages'] = 'all (active) pages'; -$roscms_langres['ContTrans_yes'] = 'Ð´Ð°'; -$roscms_langres['ContTrans_no'] = 'Ð½Ðµ'; +$roscms_langres['ContTrans_yes'] = 'yes'; +$roscms_langres['ContTrans_no'] = 'no'; ?> Modified: trunk/web/reactos.org/htdocs/roscms/lang.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/lang… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/lang.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/lang.php [iso-8859-1] Thu Sep 11 15:15:20 2008 @@ -6,24 +6,37 @@ if (preg_match('/^([a-zA-Z]+)(-[a-zA-Z]+)?$/', $lang, $matches)) { $checked_lang = strtolower($matches[1]); switch($checked_lang) { - case 'de': - case 'en': - case 'fr': - case 'ru': - case 'es': - case 'it': - case 'hu': - case 'sv': - case 'lt': - case 'nl': - case 'pl': - case 'no': - case 'da': - case 'id': - case 'zh': - break; - default: - $checked_lang = ''; + case 'ar': + case 'bg': + case 'ca': + case 'cz': + case 'da': + case 'de': + case 'el': + case 'en': + case 'es': + case 'fr': + case 'he': + case 'hu': + case 'id': + case 'it': + case 'ja': + case 'ko': + case 'lt': + case 'nl': + case 'no': + case 'pl': + case 'pt': + case 'ru': + case 'sv': + case 'uk': + case 'zh': + case 'ro': + case 'tw': + case 'sk': + break; + default: + $checked_lang = ''; } } else if ($lang == '*') { @@ -48,7 +61,12 @@ /* After parameter and cookie processing, we still don't have a valid language. So check whether the HTTP Accept-language header can help us. */ - $accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE']; + if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { + $accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE']; + } + else { + $accept_language = "en"; + } $best_q = 0; while (preg_match('/^\s*([^,]+)((,(.*))|$)/', $accept_language, $matches)) { @@ -81,7 +99,6 @@ $roscms_page_lang = $rpm_lang . '/'; $rpm_lang_session = $rpm_lang . '/'; - if (isset($_COOKIE['roscms_usrset_lang']) || isset($_REQUEST['lang'])) { /* Delete an existing cookie (if any) which uses the full hostname */ setcookie('roscms_usrset_lang', '', -3600); @@ -91,6 +108,7 @@ '/', cookie_domain()); } + //echo "<h1>".$rpm_lang."</h1>"; require("inc/lang/en.php"); // preload the english language text require("inc/lang/".$rpm_lang.".php"); // load the and overwrite the language text

1 0

[cgutman] 36144: - Make sure we successfully allocated memory
by cgutman＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cgutman Date: Thu Sep 11 14:43:19 2008 New Revision: 36144 URL: http://svn.reactos.org/svn/reactos?rev=36144&view=rev Log: - Make sure we successfully allocated memory Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Thu Sep 11 14:43:19 2008 @@ -52,6 +52,7 @@ ULONG EaLength; PWCHAR EaInfoValue = NULL; UINT Disposition, i; + NTSTATUS Status; AFD_DbgPrint(MID_TRACE, ("AfdCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp)); @@ -140,16 +141,27 @@ AFD_DbgPrint(MID_TRACE,("Packet oriented socket\n")); /* Allocate our backup buffer */ FCB->Recv.Window = ExAllocatePool( NonPagedPool, FCB->Recv.Size ); + if( !FCB->Recv.Window ) Status = STATUS_NO_MEMORY; FCB->Send.Window = ExAllocatePool( NonPagedPool, FCB->Send.Size ); + if( !FCB->Send.Window ) { + if( FCB->Recv.Window ) ExFreePool( FCB->Recv.Window ); + Status = STATUS_NO_MEMORY; + } /* A datagram socket is always sendable */ FCB->PollState |= AFD_EVENT_SEND; PollReeval( FCB->DeviceExt, FCB->FileObject ); } - Irp->IoStatus.Status = STATUS_SUCCESS; + if( !NT_SUCCESS(Status) ) { + if( FCB->TdiDeviceName.Buffer ) ExFreePool( FCB->TdiDeviceName.Buffer ); + ExFreePool( FCB ); + FileObject->FsContext = NULL; + } + + Irp->IoStatus.Status = Status; IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - return STATUS_SUCCESS; + return Status; } VOID DestroySocket( PAFD_FCB FCB ) {

1 0

[cgutman] 36143: - Fix 2 typos
by cgutman＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cgutman Date: Thu Sep 11 14:15:35 2008 New Revision: 36143 URL: http://svn.reactos.org/svn/reactos?rev=36143&view=rev Log: - Fix 2 typos Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Thu Sep 11 14:15:35 2008 @@ -174,8 +174,8 @@ ( NonPagedPool, HandleCount * sizeof(AFD_HANDLE) ); for( i = 0; FileObjects && i < HandleCount; i++ ) { - HandleArray[i].Status = 0; - HandleArray[i].Events = HandleArray[i].Events; + FileObjects[i].Status = 0; + FileObjects[i].Events = HandleArray[i].Events; FileObjects[i].Handle = 0; if( !HandleArray[i].Handle ) continue; if( NT_SUCCESS(Status) ) { @@ -206,6 +206,7 @@ } ExFreePool( HandleArray ); + HandleArray = NULL; } /* Returns transitioned state or SOCKET_STATE_INVALID_TRANSITION */

1 0

[fireball] 36142: - Use CD_ROM type instead of DISK.
by fireball＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: fireball Date: Thu Sep 11 13:50:47 2008 New Revision: 36142 URL: http://svn.reactos.org/svn/reactos?rev=36142&view=rev Log: - Use CD_ROM type instead of DISK. Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Thu Sep 11 13:50:47 2008 @@ -331,7 +331,7 @@ Status = IoCreateDevice(CdfsGlobalData->DriverObject, sizeof(DEVICE_EXTENSION), NULL, - FILE_DEVICE_DISK_FILE_SYSTEM, + FILE_DEVICE_CD_ROM_FILE_SYSTEM, 0, FALSE, &NewDeviceObject);

1 0

[cgutman] 36141: - Nicer solution for the problem fixed in r36102
by cgutman＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cgutman Date: Thu Sep 11 13:17:11 2008 New Revision: 36141 URL: http://svn.reactos.org/svn/reactos?rev=36141&view=rev Log: - Nicer solution for the problem fixed in r36102 Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] Thu Sep 11 13:17:11 2008 @@ -57,7 +57,9 @@ PAFD_ACTIVE_POLL Poll OPTIONAL, PIRP _Irp OPTIONAL, PAFD_POLL_INFO PollReq, - NTSTATUS Status + NTSTATUS Status, + KSPIN_LOCK Lock, + KIRQL OldIrql ) { UINT i; @@ -86,6 +88,10 @@ } UnlockHandles( AFD_HANDLES(PollReq), PollReq->HandleCount ); if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); + AFD_DbgPrint(MID_TRACE,("Completing\n")); + KeReleaseSpinLock(&Lock, OldIrql); + IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); + KeAcquireSpinLock(&Lock, &OldIrql); AFD_DbgPrint(MID_TRACE,("Done\n")); } @@ -108,10 +114,8 @@ ZeroEvents( PollReq->Handles, PollReq->HandleCount ); KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); - SignalSocket( Poll, NULL, PollReq, STATUS_TIMEOUT ); + SignalSocket( Poll, NULL, PollReq, STATUS_TIMEOUT, DeviceExt->Lock, OldIrql ); KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); - - IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); AFD_DbgPrint(MID_TRACE,("Timeout\n")); } @@ -145,10 +149,7 @@ if( (PVOID)HandleArray[i].Handle == FileObject && (!OnlyExclusive || (OnlyExclusive && Poll->Exclusive)) ) { ZeroEvents( PollReq->Handles, PollReq->HandleCount ); - SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); - KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); - IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); + SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS, DeviceExt->Lock, OldIrql ); } } } @@ -232,10 +233,7 @@ if( Signalled ) { Status = STATUS_SUCCESS; Irp->IoStatus.Status = Status; - SignalSocket( NULL, Irp, PollReq, Status ); - KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); - IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - return Status; + SignalSocket( NULL, Irp, PollReq, Status, DeviceExt->Lock, OldIrql ); } else { PAFD_ACTIVE_POLL Poll = NULL; @@ -426,10 +424,7 @@ if( UpdatePollWithFCB( Poll, FileObject ) ) { ThePollEnt = ThePollEnt->Flink; AFD_DbgPrint(MID_TRACE,("Signalling socket\n")); - SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); - KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); - IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); + SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS, DeviceExt->Lock, OldIrql ); } else ThePollEnt = ThePollEnt->Flink; }

1 0

[cwittich] 36140: fix heap corruption
by cwittich＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cwittich Date: Thu Sep 11 12:00:47 2008 New Revision: 36140 URL: http://svn.reactos.org/svn/reactos?rev=36140&view=rev Log: fix heap corruption Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Thu Sep 11 12:00:47 2008 @@ -286,7 +286,7 @@ lpService->Arguments = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - ControlPacket->dwSize * sizeof(WCHAR)); + (ControlPacket->dwSize + 1) * sizeof(WCHAR)); if (lpService->Arguments == NULL) return ERROR_OUTOFMEMORY;

1 0

[sginsberg] 36139: - IoAcquire/ReleaseVpbSpinLock: Use the queued IopVpbSpinLock spinlock instead of a regular "IoVpbLock" spinlock
by sginsberg＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: sginsberg Date: Thu Sep 11 11:53:36 2008 New Revision: 36139 URL: http://svn.reactos.org/svn/reactos?rev=36139&view=rev Log: - IoAcquire/ReleaseVpbSpinLock: Use the queued IopVpbSpinLock spinlock instead of a regular "IoVpbLock" spinlock Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/iomgr/volume.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Thu Sep 11 11:53:36 2008 @@ -68,7 +68,6 @@ extern LIST_ENTRY IopTimerQueueHead; extern KDPC IopTimerDpc; extern KTIMER IopTimer; -extern KSPIN_LOCK IoVpbLock; extern KSPIN_LOCK IoStatisticsLock; extern KSPIN_LOCK DriverReinitListLock; extern KSPIN_LOCK DriverBootReinitListLock; @@ -462,7 +461,6 @@ InitializeListHead(&LastChanceShutdownListHead); InitializeListHead(&FsChangeNotifyListHead); InitializeListHead(&IopErrorLogListHead); - KeInitializeSpinLock(&IoVpbLock); KeInitializeSpinLock(&IoStatisticsLock); KeInitializeSpinLock(&DriverReinitListLock); KeInitializeSpinLock(&DriverBootReinitListLock); Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Thu Sep 11 11:53:36 2008 @@ -26,7 +26,6 @@ LIST_ENTRY IopCdRomFsListHead, IopTapeFsListHead; KGUARDED_MUTEX FsChangeNotifyListLock; LIST_ENTRY FsChangeNotifyListHead; -KSPIN_LOCK IoVpbLock; /* PRIVATE FUNCTIONS *********************************************************/ @@ -923,7 +922,7 @@ IoAcquireVpbSpinLock(OUT PKIRQL Irql) { /* Simply acquire the lock */ - KeAcquireSpinLock(&IoVpbLock, Irql); + *Irql = KeAcquireQueuedSpinLock(LockQueueIoVpbLock); } /* @@ -934,7 +933,7 @@ IoReleaseVpbSpinLock(IN KIRQL Irql) { /* Just release the lock */ - KeReleaseSpinLock(&IoVpbLock, Irql); + KeReleaseQueuedSpinLock(LockQueueIoVpbLock, Irql); } /*

1 0

[cwittich] 36138: add missing HandleBind() calls
by cwittich＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cwittich Date: Thu Sep 11 11:48:42 2008 New Revision: 36138 URL: http://svn.reactos.org/svn/reactos?rev=36138&view=rev Log: add missing HandleBind() calls Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Thu Sep 11 11:48:42 2008 @@ -2326,6 +2326,8 @@ { DWORD dwError; + HandleBind(); + _SEH_TRY { dwError = RStartServiceA(BindingHandle, @@ -2362,6 +2364,8 @@ { DWORD dwError; + HandleBind(); + _SEH_TRY { dwError = RStartServiceW(BindingHandle,

1 0

[fireball] 36137: - Use a correct device type when creating volume device objects.
by fireball＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: fireball Date: Thu Sep 11 09:43:12 2008 New Revision: 36137 URL: http://svn.reactos.org/svn/reactos?rev=36137&view=rev Log: - Use a correct device type when creating volume device objects. Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Thu Sep 11 09:43:12 2008 @@ -331,8 +331,7 @@ Status = IoCreateDevice(CdfsGlobalData->DriverObject, sizeof(DEVICE_EXTENSION), NULL, - FILE_DEVICE_FILE_SYSTEM, -// FILE_DEVICE_DISK_FILE_SYSTEM, + FILE_DEVICE_DISK_FILE_SYSTEM, 0, FALSE, &NewDeviceObject); Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Thu Sep 11 09:43:12 2008 @@ -422,7 +422,7 @@ Status = IoCreateDevice(VfatGlobalData->DriverObject, ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize, NULL, - FILE_DEVICE_FILE_SYSTEM, + FILE_DEVICE_DISK_FILE_SYSTEM, 0, FALSE, &DeviceObject);

1 0

[sginsberg] 36136: - NtQueryInformationProcess with ProcessImageFileName query type: Free the buffer allocated by SeLocateProcessImageName, and set return status if return buffer is too small (so caller will know to allocate more memory). Spotted by #3714 See issue #3714 for more details.
by sginsberg＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: sginsberg Date: Thu Sep 11 09:24:41 2008 New Revision: 36136 URL: http://svn.reactos.org/svn/reactos?rev=36136&view=rev Log: - NtQueryInformationProcess with ProcessImageFileName query type: Free the buffer allocated by SeLocateProcessImageName, and set return status if return buffer is too small (so caller will know to allocate more memory). Spotted by #3714 See issue #3714 for more details. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=36… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Thu Sep 11 09:24:41 2008 @@ -426,6 +426,14 @@ } _SEH_END; } + else + { + /* Buffer too small */ + Status = STATUS_INFO_LENGTH_MISMATCH; + } + + /* Free the image path */ + ExFreePool(ImageName); } break;

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008