Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[dreimer] 49587: Bug 5726: PATCH: regedit: Language File skeleton strings (geekdundee<A_T>gmail.com) Bug 5735: PATCH: updated slovak translations by Mario Kacmar Bug 5740: TRANSLATION: rapps: polis...

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Nov 14 15:22:48 2010 New Revision: 49587 URL: http://svn.reactos.org/svn/reactos?rev=49587&view=rev Log: Bug 5726: PATCH: regedit: Language File skeleton strings (geekdundee<A_T>gmail.com) Bug 5735: PATCH: updated slovak translations by Mario Kacmar Bug 5740: TRANSLATION: rapps: polish (wojtekkozlo664<A_T>op.pl) Updated the Rapps Versions, too. Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt trunk/reactos/base/applications/rapps/rapps/dosblaster.txt trunk/reactos/base/applications/rapps/rapps/fap.txt trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/go-oo.txt trunk/reactos/base/applications/rapps/rapps/kdewin.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/mono2.txt trunk/reactos/base/applications/rapps/rapps/mpc.txt trunk/reactos/base/applications/rapps/rapps/net11.txt trunk/reactos/base/applications/rapps/rapps/net20.txt trunk/reactos/base/applications/rapps/rapps/net20sp2.txt trunk/reactos/base/applications/rapps/rapps/python.txt trunk/reactos/base/applications/rapps/rapps/remood.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/steam.txt trunk/reactos/base/applications/rapps/rapps/superfinder.txt trunk/reactos/base/applications/rapps/rapps/tahoma.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/ultravnc.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt trunk/reactos/base/applications/regedit/lang/bg-BG.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/regedit/lang/de-DE.rc trunk/reactos/base/applications/regedit/lang/el-GR.rc trunk/reactos/base/applications/regedit/lang/es-ES.rc trunk/reactos/base/applications/regedit/lang/fr-FR.rc trunk/reactos/base/applications/regedit/lang/hu-HU.rc trunk/reactos/base/applications/regedit/lang/id-ID.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ko-KR.rc trunk/reactos/base/applications/regedit/lang/nl-NL.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pt-BR.rc trunk/reactos/base/applications/regedit/lang/pt-PT.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc trunk/reactos/base/applications/regedit/lang/sk-SK.rc trunk/reactos/base/applications/regedit/lang/sl-SI.rc trunk/reactos/base/applications/regedit/lang/sv-SE.rc trunk/reactos/base/applications/regedit/lang/th-TH.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/zh-CN.rc trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/system/format/lang/sk-SK.rc Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 30-01-2008 - * LAST CHANGE: 31-05-2010 + * LAST CHANGE: 17-09-2010 * --------------------------------------- * TODO: * pridanie navigaèných znaèiek "&" ? @@ -545,9 +545,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_ENERGY_15_C_CALORIES "15 °C calories" - IDS_ENERGY_BTUS "British Thermal Units" + IDS_ENERGY_BTUS "Britské termálne jednotky" IDS_ENERGY_ERGS "Ergs" - IDS_ENERGY_EVS "Electron-Volts" + IDS_ENERGY_EVS "Elektron-Volty" IDS_ENERGY_FOOT_POUNDS "Foot-Pounds" IDS_ENERGY_IT_CALORIES "International Table calories" IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" @@ -593,7 +593,7 @@ IDS_LENGTH_MILLIMETERS "Milimetre" IDS_LENGTH_NAUTICAL_MILES "Námorné míle" IDS_LENGTH_NIEU "Nieu" - IDS_LENGTH_PARSECS "Parsecy" + IDS_LENGTH_PARSECS "Parseky" IDS_LENGTH_PICAS "Picas" IDS_LENGTH_RI_JAPAN "Ri (Japonsko)" IDS_LENGTH_RI_KOREA "Ri (Kórea)" @@ -626,10 +626,10 @@ BEGIN IDS_PRESSURE_ATMOSPHERES "Atmosféry" IDS_PRESSURE_BARS "Bary" - IDS_PRESSURE_HECTOPASCALS "Hektopascals" - IDS_PRESSURE_KILOPASCALS "Kilopascals" - IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" - IDS_PRESSURE_PASCALS "Pascals" + IDS_PRESSURE_HECTOPASCALS "Hektopascaly" + IDS_PRESSURE_KILOPASCALS "Kilopascaly" + IDS_PRESSURE_MM_OF_MERCURY "Milimetre ortuti" + IDS_PRESSURE_PASCALS "Pascaly" IDS_PRESSURE_PSI "Libry na tvorcový palec" END Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -17,5 +17,8 @@ [Section.040a] Description = Utilidad para crear y abrir 7zip, zip, tar, rar y otros archivos comprimidos. +[Section.0415] +Description = NarzÄdzie do tworzenia i otwierania plikÃ³w typu 7zip, zip, tar, i innych plikÃ³w archiwizacyjnych. + [Section.0422] Description = Ð£ÑÐ¸Ð»ÑÑÐ° Ð´Ð»Ñ ÑÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÐ° Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ 7zip, zip, tar, rar ÑÐ° ÑÐ½ÑÐ¸Ñ Ð°ÑÑÑÐ²Ð½Ð¸Ñ ÑÐ°Ð¹Ð»ÑÐ². Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -14,5 +14,10 @@ [Section.0407] Description = Abyss Web Server ermÃ¶glicht es Webseiten auf Ihrem Computer zu hosten. Er unterstÃ¼tzt sichere SSL/TLS Verbindungen (HTTPS) sowie eine Vielfalt an Web Technologien. Er kann ebenfalls PHP, Perl, Python, ASP, ASP.NET, und Ruby on Rails Web Anwendungen ausfÃ¼hren, welche von Datenbanken, wie MySQL, SQLite, MS SQL Server, MS Access, oder Oracle unterstÃ¼tzt werden kÃ¶nnen. +[Section.0415] +Description = Abyss Web Server pozwala Ci na stworzenie serwera WWW na wÅasnym komputerze. Ten program obsÅuguje zabezpieczone poÅÄczenia typu SSL/TLS (HTTPS) i wiele technologii Sieci. +MoÅ¼e takÅ¼e uruchamiaÄ zaawansowane aplikacje internetowe takie jak PHP, Perl, Python, ASP, ASP.NET, i Ruby on Rails. +MogÄ one zostaÄ oparte o MySQL, SQLite, MS SQL Server, MS Access, lub Oracle. + [Section.0422] Description = Abyss Web Server Ð´Ð¾Ð·Ð²Ð¾Ð»Ð¸ÑÑ Ð²Ð°Ð¼ ÑÑÑÐ¸Ð¼ÑÐ²Ð°ÑÐ¸ Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ¸ Ð½Ð° Ð²Ð°ÑÐ¾Ð¼Ñ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÑ. ÐÑÐ´ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑ Ð±ÐµÐ·Ð¿ÐµÑÐ½Ñ SSL/TLS Ð·'ÑÐ´Ð½Ð°Ð½Ð½Ñ (HTTPS) ÑÐ° Ð²ÐµÐ»Ð¸ÐºÐ¸Ð¹ ÑÑÐ´ Ð²ÐµÐ±-ÑÐµÑÐ½Ð¾Ð»Ð¾Ð³ÑÐ¹. ÐÑÐ½ ÑÐ°ÐºÐ¾Ð¶ Ð·Ð°Ð¿ÑÑÐºÐ°Ñ PHP, Perl, Python, ASP, ASP.NET, ÑÐ° Ruby on Rails Ð²ÐµÐ±-Ð´Ð¾Ð´Ð°ÑÐºÐ¸, ÑÐºÑ Ð¼Ð¾Ð¶ÑÑÑ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÐ²Ð°ÑÐ¸ÑÑ ÑÐ°ÐºÐ¸Ð¼Ð¸ Ð±Ð°Ð·Ð°Ð¼Ð¸ Ð´Ð°Ð½Ð¸Ñ, ÑÐº MySQL, SQLite, MS SQL Server, MS Access, ÑÐ¸ Oracle. Modified: trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -21,7 +21,7 @@ [Section.0415] Licence = Nieznana -Description = X jest uÅ¼ywana przez czÄÅÄ aplikacji. +Description = Microsoft Visual Basic 6.0 Common Controls jest uÅ¼ywany przez czÄÅÄ aplikacji. [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Modified: trunk/reactos/base/applications/rapps/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dosblaster.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dosblaster.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -17,5 +17,8 @@ [Section.040a] Description = DosBlaster en una extensiÃ³n Shell que permite abrir cualquier ejecutable DOS en DOSBox desde el botÃ³n derecho del ratÃ³n. Esta versiÃ³n contiene DOSBox 0.70, pero puede ser actualizado facilmente instalando una nueva versiÃ³n de DOSBox en la carpeta de DosBlaster. +[Section.0415] +Description = DosBlaster to rozszerzenie powÅoki, ktÃ³re umoÅ¼liwia otwarcie kaÅ¼dego DOS-owego pliku wykonywalnego w DOSBox za pomocÄ prawego klawisza myszki. Ta wersja zawiera DosBox 0.70, ale moÅ¼na go Åatwo zaktualizowaÄ, instalujÄc nowszÄ wersje DOSBox do folderÃ³w DosBlaster. + [Section.0422] Description = DosBlaster ÑÐµ ÑÐ¾Ð·ÑÐ¸ÑÐµÐ½Ð½Ñ Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÐ¸, ÑÐºÐµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÐ¸ Ð±ÑÐ´Ñ-ÑÐºÐ¸Ð¹ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð²ÑÐ¸Ð¹ ÑÐ°Ð¹Ð» DOS Ð² DOSBox ÑÐµÑÐµÐ· Ð¿ÑÐ°Ð²Ð¸Ð¹ ÐºÐ»ÑÐº. Ð¦Ñ Ð²ÐµÑÑÑÑ Ð¼ÑÑÑÐ¸ÑÑ DOSBox 0.70, Ð°Ð»Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð° Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÐ¼ Ð½Ð¾Ð²ÑÑÐ¾Ñ Ð²ÐµÑÑÑÑ DOSBox Ð² ÑÐµÐºÐ¸ DosBlaster. Modified: trunk/reactos/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/fap.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/fap.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -14,5 +14,8 @@ [Section.0407] Description = Kleiner und einfacher Mediaplayer. +[Section.0415] +Description = Prosty i lekki odtwarzacz audio. + [Section.0422] Description = ÐÑÐ¾ÑÑÐ¸Ð¹ ÑÐ° Ð¼Ð°Ð»ÐµÐ½ÑÐºÐ¸Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ Ð°ÑÐ´ÑÐ¾ ÑÐ°Ð¹Ð»ÑÐ². Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -2,47 +2,47 @@ [Section] Name = Mozilla Firefox 3.6 -Version = 3.6.11 +Version = 3.6.12 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 8.1M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.11/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/e… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 8.0M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.11/win32/d… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/d… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 8.0M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.11/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/e… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 8.0M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.11/win32/n… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/n… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 8.8M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.11/win32/p… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/p… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 8.4M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.11/win32/r… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/r… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 8.4M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.11/win32/u… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.12/win32/u… Modified: trunk/reactos/base/applications/rapps/rapps/go-oo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/go-oo.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/go-oo.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -18,7 +18,7 @@ Description = La suite de ofimÃ¡tica de cÃ³digo abierto. [Section.0415] -Description = Otwarty pakiet biurowy. +Description = Otwarty pakiet biurowy, bazujÄcy na Open Office, ale znacznie lepszy. [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. Modified: trunk/reactos/base/applications/rapps/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -14,5 +14,8 @@ [Section.0407] Description = KDE fÃ¼r Windows. +[Section.0415] +Description = KDE dla Windows. + [Section.0422] Description = KDE Ð´Ð»Ñ Windows. Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.9.8 +Version = 0.9.10 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 3.0MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.8-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.10-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -2,13 +2,13 @@ [Section] Name = mIRC -Version = 7.14 +Version = 7.15 Licence = Shareware Description = The most popular client for the Internet Relay Chat (IRC). Size = 2.0M Category = 5 URLSite = http://www.mirc.com/ -URLDownload = http://download.mirc.com/mirc714.exe +URLDownload = http://download.mirc.com/mirc715.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -2,14 +2,17 @@ [Section] Name = Mono .net Development Framework -Version = 2.6.7 +Version = 2.8 Licence = Unknown Description = Open Source .net Framework. -Size = 72MB +Size = 78MB Category = 14 URLSite = http://www.mono-project.com/Main_Page -URLDownload = http://ftp.novell.com/pub/mono/archive/2.6.7/windows-installer/2/mono-2.6.7… +URLDownload = http://ftp.novell.com/pub/mono/archive/2.8/windows-installer/9/mono-2.8-gtk… CDPath = none + +[Section.0415] +Description = Pakiet Mono .net Framework dla ProgramistÃ³w. [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ .net Ð¤ÑÐµÐ¹Ð¼Ð²Ð¾ÑÐº. Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -20,5 +20,8 @@ [Section.0419] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½ÑÐ¹ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ. +[Section.0415] +Description = Odtwarzacz multimediÃ³w. + [Section.0422] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´ÑÐ¹Ð½Ð¸Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net11.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/net11.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -10,3 +10,6 @@ URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyId=262D25E3-F589-4842… URLDownload = http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203… CDPath = none + +[Section.0415] +Description = Microsoft .NET Framework Wersja 1.1 - Pakiet Dystrybucyjny. Modified: trunk/reactos/base/applications/rapps/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net20.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/net20.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -10,3 +10,6 @@ URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d… URLDownload = http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-521544… CDPath = none + +[Section.0415] +Description = Microsoft .NET Framework Wersja 2.0 - Pakiet Dystrybucyjny. Modified: trunk/reactos/base/applications/rapps/rapps/net20sp2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net20sp2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/net20sp2.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -10,3 +10,6 @@ URLSite = http://www.microsoft.com/downloads/details.aspx?familyid=5B2C0358-915B-4EB5… URLDownload = http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff7… CDPath = none + +[Section.0415] +Description = Microsoft .NET Framework Wersja 2.0 Service Pack 2. Modified: trunk/reactos/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -14,5 +14,9 @@ [Section.0407] Description = Eine sehr mÃ¤chtige, dynamische Programmiersprache. + +[Section.0415] +Description = PotÄÅ¼y i dynamiczny jÄzyk programowania. + [Section.0422] Description = ÐÑÐ¶Ðµ Ð¿Ð¾ÑÑÐ¶Ð½Ð° Ð´Ð¸Ð½Ð°Ð¼ÑÑÐ½Ð° Ð¼Ð¾Ð²Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ÑÐ²Ð°Ð½Ð½Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -14,5 +14,8 @@ [Section.0407] Description = ReMooD ist ein Port des Doom Legacy Sources. Es versucht das klassische Legacy Erfahrung zusammen mit neuen Features und mehr Stabilität zu bieten. Unterstützt werden Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x und höher; und Linux (x86 und x86_64). +[Section.0415] +Description = ¯ród³owy port Doom. Jego celem jest zapewnienie rozrywki znanej z klasycznej wersji z nowymi funkcjami, i lepsz¹ stabilnoci¹. Obs³uguje Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x i wy¿sze; i Linux (x86 i x86_64). + [Section.0422] Description = ReMooD Ñ ÐÐ¾ÑÑÐ¾Ð¼ Ð²Ð¸ÑÑÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÑÐ² Doom Legacy. ÐÐ¾Ð³Ð¾ Ð¼ÐµÑÐ¾Ñ Ñ Ð´Ð¾Ð´Ð°ÑÐ¸ Ð½Ð¾Ð²Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ ÑÐ° ÑÑÐ°Ð±ÑÐ»ÑÐ½ÑÑÑÑ Ð´Ð¾ Ð´Ð¾ÑÐ²ÑÐ´Ñ ÐºÐ»Ð°ÑÐ¸ÑÐ½Ð¾Ð³Ð¾ Legacy. ÐÑÐ½ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑ Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x ÑÐ° Ð½Ð¾Ð²ÑÑÑ; Ð° ÑÐ°ÐºÐ¾Ð¶ Linux (x86 ÑÐ° x86_64). Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -2,13 +2,13 @@ [Section] Name = SciTE -Version = 2.21 +Version = 2.22 Licence = Freeware Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. Size = 0.6M Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://kent.dl.sourceforge.net/project/scintilla/SciTE/2.21/Sc221.exe +URLDownload = http://kent.dl.sourceforge.net/project/scintilla/SciTE/2.22/Sc222.exe CDPath = none [Section.0407] @@ -17,5 +17,8 @@ [Section.040a] Description = Editor de texto basado en SCIntilla. Originalmente creado para demostrar Scintilla, a crecido para ser un gran editor con capacidad para crear y ejecutar programas. +[Section.0415] +Description = SciTE to edytor tekstu bazowany na SCIntilla. Oryginalnie stworzony aby pokazaÄ Scintille, staÅ sie ogÃ³lnie przydatnym edytorem z infrastrukturÄ potrzebnÄ do tworzenia i uruchamiania programÃ³w. + [Section.0422] Description = Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ñ SCIntilla. ÐÑÐ² Ð·ÑÐ±ÑÐ°Ð½Ð¸Ð¹ ÑÐº Ð¿ÑÐµÐ·ÐµÐ½ÑÐ°ÑÑÑ Scintilla, Ð°Ð»Ðµ Ð²Ð¸ÑÑÑ Ð´Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ° Ð·Ð°Ð³Ð°Ð»ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð· Ð·Ð°ÑÐ¾Ð±Ð°Ð¼Ð¸ Ð·Ð±Ð¸ÑÐ°Ð½Ð½Ñ ÑÐ° Ð·Ð°Ð¿ÑÑÐºÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼. Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -2,31 +2,31 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.0.9 +Version = 2.0.10 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. Size = 10.1MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.9/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 10.0MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.9/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32… [Section.040a] Description = La suite de Mozilla estÃ¡ viva. Es el primero y Ãºnico navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarÃ¡s. Size = 10.0MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.9/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 10.8MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.9/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32… [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 10.4MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.9/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32… Modified: trunk/reactos/base/applications/rapps/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/steam.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/steam.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -14,5 +14,8 @@ [Section.0407] Description = Die STEAM Spieleplattform, die von viele Spielen verwendet wird. +[Section.0415] +Description = STEAM - platforma, ktÃ³rÄ uÅ¼ywa obecnie wiele gier. + [Section.0422] Description = ÐÐ³ÑÐ¾Ð²Ð° Ð¿Ð»Ð°ÑÑÐ¾ÑÐ¼Ð°, ÑÐ¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑÑÑÑÑ Ð±Ð°Ð³Ð°ÑÑÐ¼Ð° ÑÐ³ÑÐ°Ð¼Ð¸. Modified: trunk/reactos/base/applications/rapps/rapps/superfinder.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/superfinder.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/superfinder.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -13,3 +13,6 @@ [Section.0407] Description = Eine schnelle und effektive Suchanwendung. + +[Section.0415] +Description = Szybka i bogata w opcje aplikacja szukajÄca. Modified: trunk/reactos/base/applications/rapps/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tahoma.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tahoma.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -15,6 +15,9 @@ Licence = Unbekannt Description = Tahoma Font pack, der von einigen Anwendungen benÃ¶tigt wird (Steam). +[Section.0415] +Description = Pakiet Czcionki Tahoma wymagany przez niektÃ³re programy (np. Steam). + [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Description = ÐÐ°ÐºÐµÑ ÑÑÐ¸ÑÑÑÐ² Tahoma, ÑÐ¾ Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ñ Ð´ÐµÑÐºÐ¸Ð¼ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°Ð¼ (Steam). Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -2,41 +2,41 @@ [Section] Name = Mozilla Thunderbird -Version = 3.1.5 +Version = 3.1.6 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 9.0M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win3… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 8.8M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win3… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 8.8M URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win3… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 9.7M URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win3… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 9.2M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win3… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 9.2M URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.5/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.6/win3… Modified: trunk/reactos/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -2,17 +2,20 @@ [Section] Name = UltraVNC -Version = 1.0.8.2 +Version = 1.0.9.1 Licence = GPL Description = Open-source VNC client/server. -Size = 1.9MB +Size = 2.0MB Category = 5 URLSite = http://www.uvnc.com/ -URLDownload = http://support1.uvnc.com/download/1082/UltraVNC_1.0.8.2_Setup.exe +URLDownload = http://support1.uvnc.com/download/109/UltraVNC_1.0.9.1_Setup.exe CDPath = none [Section.040a] Description = Cliente/Servidor VNC de cÃ³digo abierto. +[Section.0415] +Description = Otwarty klient/serwer VNC. + [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ VNC ÐºÐ»ÑÑÐ½Ñ/ÑÐµÑÐ²ÐµÑ. Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -2,13 +2,13 @@ [Section] Name = ÂµTorrent -Version = 2.0.4 +Version = 2.2 Licence = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. -Size = 320K +Size = 385K Category = 5 URLSite = http://www.utorrent.com/ -URLDownload = http://download.utorrent.com/2.0.4/utorrent.exe +URLDownload = http://download.utorrent.com/2.2/utorrent.exe CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -2,13 +2,13 @@ [Section] Name = VLC media player -Version = 1.1.4 +Version = 1.1.5 Licence = GPL Description = A media player. -Size = 18.7MB +Size = 19.1MB Category = 1 URLSite = http://www.videolan.org/vlc/ -URLDownload = http://ignum.dl.sourceforge.net/project/vlc/1.1.4/win32/vlc-1.1.4-win32.exe +URLDownload = http://ignum.dl.sourceforge.net/project/vlc/1.1.5/win32/vlc-1.1.5-win32.exe CDPath = none [Section.0407] @@ -20,5 +20,8 @@ [Section.0419] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½ÑÐ¹ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ. +[Section.0415] +Description = Odtwarzacz multimediÃ³w. + [Section.0422] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´ÑÐ¹Ð½Ð¸Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ. Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -177,6 +177,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -276,6 +286,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Âíàñÿ ñëîâåñåí ôàéë â ðåãèñòúðà" ID_REGISTRY_EXPORTREGISTRYFILE "Èçíàñÿ öåëèÿ ðåãèñòúð èëè ÷àñòè îò íåãî â ñëîâåñåí ôàéë" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Ñâúðçâà ñå ñ ðåãèñòúðà íà äàëå÷åí êîìïþòúð" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -332,6 +346,8 @@ IDS_MY_COMPUTER "Ìîÿò êîìïþòúð" IDS_IMPORT_REG_FILE "Âíîñ íà ðåãèñòúðåí ôàéë" IDS_EXPORT_REG_FILE "Èçíîñ íà ðåãèñòúðåí ôàéë" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(ñàìîñòîÿòåëíà ñòîéíîñò íà äâîéíà äóìà)" END Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -175,6 +175,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -274,6 +284,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Importuje textový soubor do registru" ID_REGISTRY_EXPORTREGISTRYFILE "Exportuje vechny èásti registru do textového souboru" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Pøipojí se ke vzdálenému registru jiného poèítaèe" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -330,6 +344,8 @@ IDS_MY_COMPUTER "Tento poèítaè" IDS_IMPORT_REG_FILE "Importovat soubor registru" IDS_EXPORT_REG_FILE "Exportovat do souboru registru" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(Neplatná hodnota DWORD)" END Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -177,6 +177,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -276,6 +286,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Importiert eine Textddatei in die Registry" ID_REGISTRY_EXPORTREGISTRYFILE "Exportiert Teile oder die ganze Registry in eine Textdatei" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Verbindet zu einer Registry eines Fremdcomputers" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -332,6 +346,8 @@ IDS_MY_COMPUTER "Arbeitsplatz" IDS_IMPORT_REG_FILE "Registry importieren" IDS_EXPORT_REG_FILE "Registry exportieren" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(ungültiger DWORD-Wert)" END Modified: trunk/reactos/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -177,6 +177,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -276,6 +286,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "ÅéóÜãåé Ýíá áñ÷åßï êåéìÝíïõ óôç registry" ID_REGISTRY_EXPORTREGISTRYFILE "ÅîÜãùç üëç Þ Ýíá êïììÜôé ôçò registry óå Ýíá áñ÷åßï êåéìÝíïõ" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "ÓõíäÝååôáé óôç registry åíüò áðïìáêñõóìÝíïõ õðïëïãéóôÞ" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -332,6 +346,8 @@ IDS_MY_COMPUTER "Ï ÕðïëïãéóôÞò Ìïõ" IDS_IMPORT_REG_FILE "ÅéóáãùãÞ Áñ÷åßïõ Registry" IDS_EXPORT_REG_FILE "ÅîáãùãÞ Áñ÷åßïõ Registry" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(ìç Ýãêõñç DWORD ôéìÞ)" END Modified: trunk/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -180,6 +180,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -279,6 +289,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Importa un archivo de texto al registro" ID_REGISTRY_EXPORTREGISTRYFILE "Exporta todo o parte del registro a un archivo de texto" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Se conecta al registro de un ordenador remoto" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -335,6 +349,8 @@ IDS_MY_COMPUTER "Mi PC" IDS_IMPORT_REG_FILE "Importa Fichero de Registro" IDS_EXPORT_REG_FILE "Exporta Fichero de Registro" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(valor DWORD invalido)" END Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -180,6 +180,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -279,6 +289,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Importe un fichier texte dans les registres" ID_REGISTRY_EXPORTREGISTRYFILE "Exporte tout ou une partie des registres dans un fichier texte" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Connecte aux registres d'un ordinateur distant" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -335,6 +349,8 @@ IDS_MY_COMPUTER "Mon ordinateur" IDS_IMPORT_REG_FILE "Importer un fichier registre" IDS_EXPORT_REG_FILE "Exporter un fichier registre" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(valeur mot double invalide)" END Modified: trunk/reactos/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -178,6 +178,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -277,6 +287,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Imports a text file into the registry" ID_REGISTRY_EXPORTREGISTRYFILE "Exports all or part of the registry to a text file" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Connects to a remote computer's registry" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -333,6 +347,8 @@ IDS_MY_COMPUTER "My Computer" IDS_IMPORT_REG_FILE "Import Registry File" IDS_EXPORT_REG_FILE "Export Registry File" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(invalid DWORD value)" END Modified: trunk/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -177,6 +177,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -276,6 +286,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Mengimpor file teks ke dalam registri" ID_REGISTRY_EXPORTREGISTRYFILE "Mengekspor semua atau sebagian registri le file teks" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Menyambung ke registri komputer remote" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -332,6 +346,8 @@ IDS_MY_COMPUTER "My Computer" IDS_IMPORT_REG_FILE "Impor File Registri" IDS_EXPORT_REG_FILE "Ekspor File Registri" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(nilai DWORD tidak benar)" END Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -180,6 +180,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -281,6 +291,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Importa un file di testo nel Registro" ID_REGISTRY_EXPORTREGISTRYFILE "Esporta tutto o parte del Registro in un file di testo" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Si connette al Registro di un computer remoto" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -337,6 +351,8 @@ IDS_MY_COMPUTER "Il mio Computer" IDS_IMPORT_REG_FILE "Importa file di Registro" IDS_EXPORT_REG_FILE "Esporta file di Registro" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(valore DWORD non valido)" END Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -175,6 +175,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -274,6 +284,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "eLXg t@CðWXgÉC|[gµÜ·B" ID_REGISTRY_EXPORTREGISTRYFILE "WXgÌêÜ½ÍSÌðeLXg t@CÉGNX|[gµÜ·B" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "[g Rs[^ÌWXgÉÚ±µÜ·B" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -330,6 +344,8 @@ IDS_MY_COMPUTER "}C Rs[^" IDS_IMPORT_REG_FILE "WXg t@CÌC|[g" IDS_EXPORT_REG_FILE "WXg t@CÌGNX|[g" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(³øÈ DWORD l)" END Modified: trunk/reactos/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -162,6 +162,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -261,6 +271,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "ÅØ½ºÆ® ÆÄÀÏÀ» ·¹Áö½ºÆ®¸®·Î ºÒ·¯ ¿É´Ï´Ù" ID_REGISTRY_EXPORTREGISTRYFILE "ÅØ½ºÆ® ÆÄÀÏ·Î ·¹Áö½ºÆ®¸®ÀÇ ÀüÃ¼³ª ÀÏºÎ¸¦ ³»º¸³À´Ï´Ù" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "¿ø°Ý ÄÄÇ»ÅÍÀÇ ·¹Áö½ºÆ®¸®·Î Á¢¼ÓÇÕ´Ï´Ù" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -317,6 +331,8 @@ IDS_MY_COMPUTER "³» ÄÄÇ»ÅÍ" IDS_IMPORT_REG_FILE "·¹Áö½ºÆ®¸® ÆÄÀÏ ºÒ·¯¿À±â" IDS_EXPORT_REG_FILE "·¹Áö½ºÆ®¸® ÆÄÀÏ ³»º¸³»±â" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(Àß¸øµÈ DWORD°ª)" END Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -177,6 +177,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -276,6 +286,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Een tekstbestand in het register importeren" ID_REGISTRY_EXPORTREGISTRYFILE "Het register of een gedeelte ervan naar een tekstbestand exporteren" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Een verbinding maken met het register van een externe computer" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -332,6 +346,8 @@ IDS_MY_COMPUTER "My Computer" IDS_IMPORT_REG_FILE "Import Registry File" IDS_EXPORT_REG_FILE "Export Registry File" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(invalid DWORD value)" END Modified: trunk/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -177,6 +177,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -276,6 +286,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Importerer en tekstfil inn i Registret" ID_REGISTRY_EXPORTREGISTRYFILE "Eksporterer hele eller deler av Registret til en tekstfil" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Kobler til Registret på en annen datamaskin" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -332,6 +346,8 @@ IDS_MY_COMPUTER "Min datamaskin" IDS_IMPORT_REG_FILE "Importer registerfil" IDS_EXPORT_REG_FILE "Eksporter registerfil" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(ugyldig DWORD-verdi)" END Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -182,6 +182,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -281,6 +291,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Importuje plik do rejestru" ID_REGISTRY_EXPORTREGISTRYFILE "Eksportuje ca³oæ lub czêæ rejestru do pliku" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Po³¹czenie z rejestrem zdalnego komputera" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -337,6 +351,8 @@ IDS_MY_COMPUTER "Mój komputer" IDS_IMPORT_REG_FILE "Importuj plik rejestru" IDS_EXPORT_REG_FILE "Eksportuj plik rejestru" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(niew³aciwa wartoæ DWORD)" END Modified: trunk/reactos/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -178,6 +178,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -277,6 +287,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Importa um arquivo de texto para o registro" ID_REGISTRY_EXPORTREGISTRYFILE "Exporta todo ou parte do Registro para um arquivo texto" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Conecta-se ao Registro de um computador remoto" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -333,6 +347,8 @@ IDS_MY_COMPUTER "Meu computador" IDS_IMPORT_REG_FILE "Importar arquivo do Registro" IDS_EXPORT_REG_FILE "Exportar arquivo do Registro" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(valor DWORD inválido)" END Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -277,6 +277,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Importa um arquivo texto para o registro." ID_REGISTRY_EXPORTREGISTRYFILE "Exporta todo ou parte do registro para um arquivo texto." + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Conecta a um registro em um computador remoto." ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -333,6 +337,8 @@ IDS_MY_COMPUTER "My Computer" IDS_IMPORT_REG_FILE "Import Registry File" IDS_EXPORT_REG_FILE "Export Registry File" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(invalid DWORD value)" END @@ -384,6 +390,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EXPORTRANGE DIALOGEX DISCARDABLE 50, 50, 370, 50 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -177,6 +177,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU @@ -275,6 +285,8 @@ ID_EDIT_NEW_DWORDVALUE "Äîáàâëÿåò íîâîå DWORD-çíà÷åíèå" ID_REGISTRY_IMPORTREGISTRYFILE "Èìïîðòèðóåò òåêñòîâîé ôàéë â ðååñòð" ID_REGISTRY_EXPORTREGISTRYFILE "Ýêñïîðòèðóåò âåñü ðååñòð èëè åãî ÷àñòü â òåêñòîâîé ôàéë" + ID_REGISTRY_LOADHIVE "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Ïîäêëþ÷àåòñÿ ê ðååñòðó óäàë¸ííîãî êîìïüþòåðà" @@ -332,6 +344,8 @@ IDS_MY_COMPUTER "Ìîé êîìïüþòåð" IDS_IMPORT_REG_FILE "Èìïîðòèðîâàíèå ôàéëà ðååñòðà" IDS_EXPORT_REG_FILE "Ýêñïîðòèðîâàíèå ôàéëà ðååñòðà" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(íåïðàâèëüíîå çíà÷åíèå DWORD)" END Modified: trunk/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -162,6 +162,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -261,6 +271,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Imports a text file into the registry" ID_REGISTRY_EXPORTREGISTRYFILE "Exports all or part of the registry to a text file" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Connects to a remote computer's registry" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -317,6 +331,8 @@ IDS_MY_COMPUTER "Tento poèítaè" IDS_IMPORT_REG_FILE "Import Registry File" IDS_EXPORT_REG_FILE "Export Registry File" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(neplatná DWORD hodnota)" END Modified: trunk/reactos/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -177,6 +177,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -276,6 +286,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "V register uvozi datoteko z besedilom" ID_REGISTRY_EXPORTREGISTRYFILE "Registrsko datoteko ali njen del izvozi v besedilno datoteko" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Vzpostavi povezavo z registrom oddaljenega raèunalnika" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -332,6 +346,8 @@ IDS_MY_COMPUTER "My Computer" IDS_IMPORT_REG_FILE "Import Registry File" IDS_EXPORT_REG_FILE "Export Registry File" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(invalid DWORD value)" END Modified: trunk/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -175,6 +175,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -274,6 +284,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Importerar en textfil till registret" ID_REGISTRY_EXPORTREGISTRYFILE "Exporterar hela eller en del av registret till en textfil" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Ansluter till en annan dators register" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -330,6 +344,8 @@ IDS_MY_COMPUTER "Den här datorn" IDS_IMPORT_REG_FILE "Importera registerfil" IDS_EXPORT_REG_FILE "Exportera registerfil" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(felaktigt DWORD-värde)" END Modified: trunk/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -177,6 +177,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -276,6 +286,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "Imports a text file into the registry" ID_REGISTRY_EXPORTREGISTRYFILE "Exports all or part of the registry to a text file" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Connects to a remote computer's registry" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -332,6 +346,8 @@ IDS_MY_COMPUTER "My Computer" IDS_IMPORT_REG_FILE "Import Registry File" IDS_EXPORT_REG_FILE "Export Registry File" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(invalid DWORD value)" END Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -178,6 +178,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -277,6 +287,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "²ìïîðòóº òåêñòîâèé ôàéë äî ðåºñòðó" ID_REGISTRY_EXPORTREGISTRYFILE "Åêñïîðòóº âåñü ðåºñòð àáî éîãî ÷àñòèíó â òåêñòîâèé ôàéë" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Ï³äêëþ÷àºòüñÿ äî ðåºñòðó â³ääàëåíîãî êîìï'þòåðà" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -333,6 +347,8 @@ IDS_MY_COMPUTER "Ì³é êîìï'þòåð" IDS_IMPORT_REG_FILE "²ìïîðòóâàòè ôàéë ðåºñòðó" IDS_EXPORT_REG_FILE "Åêñïîðòóâàòè ôàéë ðåºñòðó" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(Íåïðàâèëüíå çíà÷åííÿ DWORD)" END Modified: trunk/reactos/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -177,6 +177,16 @@ /* * Dialog */ +IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Load Hive" +FONT 8, "Ms Shell Dlg" +{ + LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 +} IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | @@ -276,6 +286,10 @@ ID_REGISTRY_IMPORTREGISTRYFILE "½«ÎÄ¼þµ¼Èëµ½×¢²á±íÖÐ¡£" ID_REGISTRY_EXPORTREGISTRYFILE "½«×¢²á±íÈ«²¿»ò²¿·Öµ¼³öµ½ÎÄ¼þÖÐ¡£" + ID_REGISTRY_LOADHIVE + "Loads a hive file into the registry" + ID_REGISTRY_UNLOADHIVE + "Unloads a hive from the registry" ID_REGISTRY_CONNECTNETWORKREGISTRY "Á¬½Óµ½Ô¶³Ì¼ÆËã»úµÄ×¢²á±í¡£" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -332,6 +346,8 @@ IDS_MY_COMPUTER "My Computer" IDS_IMPORT_REG_FILE "µ¼Èë×¢²á±íÎÄ¼þ" IDS_EXPORT_REG_FILE "µ¼³ö×¢²á±íÎÄ¼þ" + IDS_LOAD_HIVE "Load Hive" + IDS_UNLOAD_HIVE "Unload Hive" IDS_INVALID_DWORD "(²»ÕýÈ·µÄ DWORD Öµ)" END Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -1,7 +1,7 @@ /* TRANSLATOR: M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 22-01-2008 * Encoding : Latin II (852) - * LastChange: 31-05-2010 + * LastChange: 05-09-2010 */ #pragma once @@ -993,13 +993,13 @@ { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "Nainçtalova zav dza systmu na pevnì disk (MBR a VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "Nainçtalova zav dza systmu na pevnì disk (iba VBR).", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -1,9 +1,9 @@ /* Slovak translation for CMD * TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 21-03-2009 - * LastChange: 21-06-2009 + * LastChange: 10-08-2010 * _________________________________________________________________ - * NOTE : this file is not really translated (only scrap yet) + * NOTE : this file is not fully translated */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -118,7 +118,7 @@ 6 6 Yellow 14 E Bright Yellow\n\ 7 7 White 15 F Bright White\n" -STRING_COPY_HELP1, "Overwrite %s (Yes/No/All)? " +STRING_COPY_HELP1, "Prepísa %s (Yes/No/All)? " STRING_COPY_HELP2, "Skopíruje jeden alebo viac súborov na iné umiestnenie.\n\n\ COPY [/V][/Y|/-Y][/A|/B] source [/A|/B]\n\ @@ -141,7 +141,7 @@ STRING_DATE_HELP3, "\nZadajte nový dátum (rrrr%cmm%cdd): " -STRING_DATE_HELP4, "Displays or sets the date.\n\n\ +STRING_DATE_HELP4, "Zobrazí alebo nastaví dátum.\n\n\ DATE [/T][date]\n\n\ /T display only\n\n\ Type DATE without parameters to display the current date setting and\n\ @@ -469,7 +469,7 @@ TITLE [string]\n\n\ string Specifies the title for the command prompt window.\n" -STRING_TIME_HELP1, "Displays or sets the system time.\n\n\ +STRING_TIME_HELP1, "Zobrazí alebo nastaví systémový èas.\n\n\ TIME [/T][time]\n\n\ /T display only\n\n\ Type TIME with no parameters to display the current time setting and a prompt\n\ @@ -547,18 +547,18 @@ WINDOW [/POS[=]left,top,width,heigth]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ /POS specify window placement and dimensions\n\ -MIN minimize the window\n\ -MAX maximize the window\n\ -RESTORE restore the window" +MIN minimalizova okno\n\ +MAX maximalizujte okno\n\ +RESTORE obnovi okno" STRING_WINDOW_HELP2, "change console window aspect\n\n\ ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window tile of window on which perform actions\n\ /POS specify window placement and dimensions\n\ -MIN minimize the window\n\ -MAX maximize the window\n\ -RESTORE restore the window\n\ +MIN minimalizova okno\n\ +MAX maximalizujte okno\n\ +RESTORE obnovi okno\n\ title new title\n" @@ -576,7 +576,7 @@ CMD Starts a new instance of the ReactOS command interpreter.\n\ COLOR Sets the default console foreground and background colors.\n\ COPY Skopíruje jeden alebo viac súborov na iné umiestnenie.\n\ -DATE Displays or sets the date.\n\ +DATE Zobrazí alebo nastaví dátum.\n\ DELETE Deletes one or more files.\n\ DIR Displays a list of files and subdirectories in a directory.\n\ ECHO Displays messages, or turns command echoing on or off.\n\ @@ -590,8 +590,8 @@ HISTORY List all commands which has been used\n\ IF Performs conditional processing in batch programs.\n\ LABEL Creates, changes, or deletes the volume label of a disk.\n\ -MD Creates a directory.\n\ -MKDIR Creates a directory.\n\ +MD Vytvorí adresár.\n\ +MKDIR Vytvorí adresár.\n\ MKLINK Creates a filesystem link object.\n\ MOVE Moves one or more files from one directory to another\n\ directory.\n\ @@ -603,8 +603,8 @@ PUSHD Saves the current directory then changes it.\n\ RD Removes a directory.\n\ REM Records comments (remarks) in batch files.\n\ -REN Renames a file or files.\n\ -RENAME Renames a file or files.\n\ +REN Premenuje súbor alebo súbory.\n\ +RENAME Premenuje súbor alebo súbory.\n\ REPLACE Replaces files.\n\ RMDIR Removes a directory.\n\ SCREEN Move cursor and optionally print text.\n\ @@ -612,7 +612,7 @@ SHIFT Shifts the position of replaceable parameters in batch files.\n" STRING_HELP2, "START Starts a separate window to run a specified program or command.\n\ Executes command.\n\ -TIME Displays or sets the system time.\n\ +TIME Zobrazí alebo nastaví systémový èas.\n\ TIMER Allow the use of ten stopwatches.\n\ TITLE Sets the window title for a CMD.EXE session.\n\ TYPE Displays the contents of a text file.\n\ @@ -651,9 +651,9 @@ STRING_COPY_ERROR4, "Chyba: Zatia¾ neimplementované!\n" //Not implemented yet STRING_DATE_ERROR, "Neplatný dátum." STRING_DEL_ERROR5, "The file %s will be deleted! " -STRING_DEL_ERROR6, "Are you sure (Y/N)?" +STRING_DEL_ERROR6, "Ste si istý (Y/N)?" STRING_DEL_ERROR7, "Deleting: %s\n" -STRING_ERROR_ERROR1, "Unknown error! Error code: 0x%lx\n" +STRING_ERROR_ERROR1, "Neznáma chyba! Kód chyby: 0x%lx\n" STRING_ERROR_ERROR2, "Syntax error" STRING_FOR_ERROR1, "'in' missing in for statement." STRING_FOR_ERROR2, "no brackets found." @@ -675,47 +675,47 @@ STRING_TYPE_ERROR1, "Invalid option '/%s'\n" -STRING_WINDOW_ERROR1, "window not found" +STRING_WINDOW_ERROR1, "okno sa nenalo" STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct - %c\n" -STRING_ERROR_INVALID_SWITCH, "Invalid switch - /%c\n" +STRING_ERROR_INVALID_SWITCH, "Neplatný prepínaè - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS, "Príli ve¾a parametrov - %s\n" -STRING_ERROR_PATH_NOT_FOUND, "Path not found\n" -STRING_ERROR_FILE_NOT_FOUND, "File not found\n" +STRING_ERROR_PATH_NOT_FOUND, "Cesta sa nenala\n" +STRING_ERROR_FILE_NOT_FOUND, "Súbor sa nenaiel\n" STRING_ERROR_REQ_PARAM_MISSING, "Required parameter missing\n" STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n" -STRING_ERROR_BADCOMMAND, "Bad command or filename - %s\n" +STRING_ERROR_BADCOMMAND, "Chybný príkaz alebo názov súboru - %s\n" STRING_ERROR_OUT_OF_MEMORY, "Chyba (z) nedostatku pamäte.\n" //Out of memory error. -STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n" +STRING_ERROR_CANNOTPIPE, "Chyba! Cannot pipe! Cannot open temporary file!\n" STRING_ERROR_D_PAUSEMSG, "Pokraèujte stlaèením ¾ubovo¾ného klávesu ..." -STRING_ERROR_DRIVER_NOT_READY, "Drive not ready" +STRING_ERROR_DRIVER_NOT_READY, "Jednotka nie je pripravená" STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" -STRING_REPLACE_ERROR1, "Invalid switch - %s\n" -STRING_REPLACE_ERROR2, "Path not found - %s\n" +STRING_REPLACE_ERROR1, "Neplatný prepínaè - %s\n" +STRING_REPLACE_ERROR2, "Cesta sa nenala - %s\n" STRING_REPLACE_ERROR3, "The filename, directory name, or volume label syntax is incorrect.\n" STRING_REPLACE_ERROR4, "Invalid parameter combination\n" -STRING_REPLACE_ERROR5, "Access denied - %s\n" -STRING_REPLACE_ERROR6, "No files found - %s\n" +STRING_REPLACE_ERROR5, "Prístup zamietnutý - %s\n" +STRING_REPLACE_ERROR6, "iadne súbory sa nenali - %s\n" STRING_REPLACE_ERROR7, "Extended Error 32\n" STRING_REACTOS_VERSION, "Operaèný systém ReactOS [Verzia %s-%s]\n" -STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter\nVerzia %s %s" +STRING_CMD_SHELLINFO, "\nInterpréter príkazového riadku systému ReactOS\nVerzia %s %s" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d súbor(ov) skopírovaný(ch)\n" STRING_DELETE_WIPE, "wiped" STRING_FOR_ERROR, "bad variable specification." -STRING_SCREEN_COL, "invalid value for col" -STRING_SCREEN_ROW, "invalid value for row" +STRING_SCREEN_COL, "neplatná hodnota pre ståpec" +STRING_SCREEN_ROW, "neplatná hodnota pre riadok" STRING_TIMER_TIME "Timer %d is %s: " STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" STRING_MORE, "Viac? " //"More? " -STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) " +STRING_CANCEL_BATCH_FILE, "\r\nStlaèené Ctrl-Break. Cancel batch file? (Yes/No/All) " STRING_INVALID_OPERAND, "Invalid operand." STRING_EXPECTED_CLOSE_PAREN, "Oèakávaná ')'." Modified: trunk/reactos/base/system/format/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/sk… ============================================================================== --- trunk/reactos/base/system/format/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/sk-SK.rc [iso-8859-1] Sun Nov 14 15:22:48 2010 @@ -1,6 +1,6 @@ /* TRANSLATOR : M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 15-02-2008 - * LAST CHANGE: 08-08-2008 + * LAST CHANGE: 10-08-2010 */ #include "resource.h" @@ -14,14 +14,14 @@ -FS:systm s£borov Uruje typ s£borovho systmu (%s).\n\ -V:menovka Uruje menovku zvzku.\n\ -Q Vykon va rìchle form tovanie.\n\ - -A:vekos Overrides the default allocation unit size. Default settings\n\ - are strongly recommended for general use\n\ - NTFS supports 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ - FAT supports 8192, 16K, 32K, 64K, 128K, 256K.\n\ - NTFS compression is not supported for allocation unit sizes\n\ - above 4096.\n\ - -C Files created on the new volume will be compressed by\n\ - default.\n\n" + -A:vekos Prep¡çe predvolen£ vekos alokanej jednotky. Pre vçeobecn\n\ + pou§itie s£ drazne odpor£an predvolen nastavenia\n\ + NTFS podporuje 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ + FAT podporuje 8192, 16K, 32K, 64K, 128K, 256K.\n\ + NTFS kompresia nie je podporovan pre vekosti alokanej\n\ + jednotky nad 4096.\n\ + -C S£bory vytvoren na novom zvzku bud£ automaticky\n\ + komprimovan.\n\n" STRING_COMPLETE "Dokonen na %lu percent.\r" @@ -29,19 +29,19 @@ STRING_NO_SUPPORT "Oper cia nie je podporovan " -STRING_FMIFS_FAIL "Could not located FMIFS entry points.\n\n" +STRING_FMIFS_FAIL "Nepodarilo sa lokalizova vstupn body FMIFS.\n\n" STRING_UNKNOW_ARG "Nezn my argument: %s\n" STRING_DRIVE_PARM "Chìba nevyhnutnì parameter jednotky.\n\n" -STRING_ERROR_DRIVE_TYPE "Could not get drive type" +STRING_ERROR_DRIVE_TYPE "Nemo§no z¡ska typ jednotky" STRING_INSERT_DISK "Vlo§te nov£ disketu do jednotky %C:\na potom stlate ENTER..." -STRING_NO_VOLUME "Could not query volume" +STRING_NO_VOLUME "Nemo§no dotazova zvzok" -STRING_NO_VOLUME_SIZE "Could not query volume size" +STRING_NO_VOLUME_SIZE "Nemo§no dotazova vekos zvzku" STRING_FILESYSTEM "Typ systmu s£borov je %s.\n" @@ -49,8 +49,8 @@ STRING_ERROR_LABEL "Bola zadan nespr vna menovka zvzku pre t£to jednotku.\n" -STRING_YN_FORMAT "\nWARNING, ALL DATA ON NON_REMOVABLE DISK\n\ -DRIVE %C: WILL BE LOST!\nProceed with Format (A/N)? " +STRING_YN_FORMAT "\nUPOZORNENIE: VæETKY éDAJE NA NIE_VYMENITENEJ DISKOVEJ\n\ +JEDNOTKE %C: BUDé STRATEN!\nPokraova s form tovan¡m (A/N)? " STRING_YES_NO_FAQ "AN"

14 years, 1 month

[tkreuzer] 49586: [ASM} Add .org for ML

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 14 13:55:05 2010 New Revision: 49586 URL: http://svn.reactos.org/svn/reactos?rev=49586&view=rev Log: [ASM} Add .org for ML Modified: branches/cmake-bringup/include/asm/asm.inc Modified: branches/cmake-bringup/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/asm.i… ============================================================================== --- branches/cmake-bringup/include/asm/asm.inc [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/asm.inc [iso-8859-1] Sun Nov 14 13:55:05 2010 @@ -105,6 +105,10 @@ .double MACRO args:VARARG dq args +ENDM + +.org MACRO value + ORG value ENDM .fill MACRO repeat, size, value

14 years, 1 month

[tkreuzer] 49585: [CMAKE] Fix a typo

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 14 13:42:03 2010 New Revision: 49585 URL: http://svn.reactos.org/svn/reactos?rev=49585&view=rev Log: [CMAKE] Fix a typo Modified: branches/cmake-bringup/include/asm/CMakeLists.txt Modified: branches/cmake-bringup/include/asm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/CMake… ============================================================================== --- branches/cmake-bringup/include/asm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/CMakeLists.txt [iso-8859-1] Sun Nov 14 13:42:03 2010 @@ -3,7 +3,6 @@ set_entrypoint(genincdata DummyEntry) add_dependencies(genincdata bugcodes) -endif() if(MSVC) set(OPT_MS "-ms")

14 years, 1 month

[tkreuzer] 49584: [GENINCDATA] add dependency to bugcodes, factor out definitions in template files. [ASM] Add asm.inc, to be included in all asm files for GAS / ML compatibility

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 14 13:40:19 2010 New Revision: 49584 URL: http://svn.reactos.org/svn/reactos?rev=49584&view=rev Log: [GENINCDATA] add dependency to bugcodes, factor out definitions in template files. [ASM] Add asm.inc, to be included in all asm files for GAS / ML compatibility Added: branches/cmake-bringup/include/asm/asm.inc branches/cmake-bringup/include/asm/ks386.template.h (with props) branches/cmake-bringup/include/asm/ksamd64.template.h (with props) branches/cmake-bringup/include/asm/ksx.template.h (with props) Modified: branches/cmake-bringup/include/asm/CMakeLists.txt branches/cmake-bringup/include/asm/genincdata.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/include/asm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/CMake… Added: branches/cmake-bringup/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/asm.i… Modified: branches/cmake-bringup/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/genin… Added: branches/cmake-bringup/include/asm/ks386.template.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ks386… Added: branches/cmake-bringup/include/asm/ksamd64.template.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ksamd… Added: branches/cmake-bringup/include/asm/ksx.template.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ksx.t…

14 years, 1 month

[tkreuzer] 49583: [FREELDR] - Use macro __ASM__ instead of ASM - guard #pragma once against inclusion in asm files - Use the HEX() macro for constants for the asm files

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 14 13:36:25 2010 New Revision: 49583 URL: http://svn.reactos.org/svn/reactos?rev=49583&view=rev Log: [FREELDR] - Use macro __ASM__ instead of ASM - guard #pragma once against inclusion in asm files - Use the HEX() macro for constants for the asm files Modified: branches/cmake-bringup/boot/freeldr/freeldr/include/arch.h branches/cmake-bringup/boot/freeldr/freeldr/include/multiboot.h branches/cmake-bringup/boot/freeldr/freeldr/include/ver.h Modified: branches/cmake-bringup/boot/freeldr/freeldr/include/arch.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/include/arch.h [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/include/arch.h [iso-8859-1] Sun Nov 14 13:36:25 2010 @@ -17,7 +17,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef __ASM__ #pragma once +#endif + +#ifndef HEX +#define HEX(y) 0x##y +#endif #ifdef _M_AMD64 #include <arch/amd64/amd64.h> @@ -25,18 +31,18 @@ #if defined (_M_IX86) /* Defines needed for switching between real and protected mode */ -#define NULL_DESC 0x00 /* NULL descriptor */ -#define PMODE_CS 0x08 /* PMode code selector, base 0 limit 4g */ -#define PMODE_DS 0x10 /* PMode data selector, base 0 limit 4g */ -#define RMODE_CS 0x18 /* RMode code selector, base 0 limit 64k */ -#define RMODE_DS 0x20 /* RMode data selector, base 0 limit 64k */ +#define NULL_DESC HEX(00) /* NULL descriptor */ +#define PMODE_CS HEX(08) /* PMode code selector, base 0 limit 4g */ +#define PMODE_DS HEX(10) /* PMode data selector, base 0 limit 4g */ +#define RMODE_CS HEX(18) /* RMode code selector, base 0 limit 64k */ +#define RMODE_DS HEX(20) /* RMode data selector, base 0 limit 64k */ #endif -#define CR0_PE_SET 0x00000001 /* OR this value with CR0 to enable pmode */ -#define CR0_PE_CLR 0xFFFFFFFE /* AND this value with CR0 to disable pmode */ +#define CR0_PE_SET HEX(00000001) /* OR this value with CR0 to enable pmode */ +#define CR0_PE_CLR HEX(FFFFFFFE) /* AND this value with CR0 to disable pmode */ -#define STACK16ADDR 0x7000 /* The 16-bit stack top will be at 0000:7000 */ -#define STACK32ADDR 0x78000 /* The 32-bit stack top will be at 7000:8000, or 0x78000 */ +#define STACK16ADDR HEX(7000) /* The 16-bit stack top will be at 0000:7000 */ +#define STACK32ADDR HEX(78000) /* The 32-bit stack top will be at 7000:8000, or 0x78000 */ #if defined (_M_IX86) || defined (_M_AMD64) #define BIOSCALLBUFFER 0x78000 /* Buffer to store temporary data for any Int386() call */ @@ -59,21 +65,21 @@ // Flag Masks -#define I386FLAG_CF 0x0001 // Carry Flag -#define I386FLAG_RESV1 0x0002 // Reserved - Must be 1 -#define I386FLAG_PF 0x0004 // Parity Flag -#define I386FLAG_RESV2 0x0008 // Reserved - Must be 0 -#define I386FLAG_AF 0x0010 // Auxiliary Flag -#define I386FLAG_RESV3 0x0020 // Reserved - Must be 0 -#define I386FLAG_ZF 0x0040 // Zero Flag -#define I386FLAG_SF 0x0080 // Sign Flag -#define I386FLAG_TF 0x0100 // Trap Flag (Single Step) -#define I386FLAG_IF 0x0200 // Interrupt Flag -#define I386FLAG_DF 0x0400 // Direction Flag -#define I386FLAG_OF 0x0800 // Overflow Flag +#define I386FLAG_CF HEX(0001) // Carry Flag +#define I386FLAG_RESV1 HEX(0002) // Reserved - Must be 1 +#define I386FLAG_PF HEX(0004) // Parity Flag +#define I386FLAG_RESV2 HEX(0008) // Reserved - Must be 0 +#define I386FLAG_AF HEX(0010) // Auxiliary Flag +#define I386FLAG_RESV3 HEX(0020) // Reserved - Must be 0 +#define I386FLAG_ZF HEX(0040) // Zero Flag +#define I386FLAG_SF HEX(0080) // Sign Flag +#define I386FLAG_TF HEX(0100) // Trap Flag (Single Step) +#define I386FLAG_IF HEX(0200) // Interrupt Flag +#define I386FLAG_DF HEX(0400) // Direction Flag +#define I386FLAG_OF HEX(0800) // Overflow Flag -#ifndef ASM +#ifndef __ASM__ #include <pshpack1.h> typedef struct @@ -172,4 +178,4 @@ VOID DetectHardware(VOID); // Implemented in hardware.c -#endif /* ! ASM */ +#endif /* ! __ASM__ */ Modified: branches/cmake-bringup/boot/freeldr/freeldr/include/multiboot.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/include/multiboot.h [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/include/multiboot.h [iso-8859-1] Sun Nov 14 13:36:25 2010 @@ -16,18 +16,20 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef __ASM__ #pragma once +#endif /* Macros. */ /* The magic number for the Multiboot header. */ -#define MULTIBOOT_HEADER_MAGIC 0x1BADB002 +#define MULTIBOOT_HEADER_MAGIC HEX(1BADB002) /* The flags for the Multiboot header. */ -#define MULTIBOOT_HEADER_FLAGS 0x00010003 +#define MULTIBOOT_HEADER_FLAGS HEX(00010003) /* The magic number passed by a Multiboot-compliant boot loader. */ -#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002 +#define MULTIBOOT_BOOTLOADER_MAGIC HEX(2BADB002) /* The size of our stack (16KB). */ #define STACK_SIZE 0x4000 @@ -39,20 +41,20 @@ # define EXT_C(sym) sym #endif -#define MB_INFO_FLAG_MEM_SIZE 0x00000001 -#define MB_INFO_FLAG_BOOT_DEVICE 0x00000002 -#define MB_INFO_FLAG_COMMAND_LINE 0x00000004 -#define MB_INFO_FLAG_MODULES 0x00000008 -#define MB_INFO_FLAG_AOUT_SYMS 0x00000010 -#define MB_INFO_FLAG_ELF_SYMS 0x00000020 -#define MB_INFO_FLAG_MEMORY_MAP 0x00000040 -#define MB_INFO_FLAG_DRIVES 0x00000080 -#define MB_INFO_FLAG_CONFIG_TABLE 0x00000100 -#define MB_INFO_FLAG_BOOT_LOADER_NAME 0x00000200 -#define MB_INFO_FLAG_APM_TABLE 0x00000400 -#define MB_INFO_FLAG_GRAPHICS_TABLE 0x00000800 +#define MB_INFO_FLAG_MEM_SIZE HEX(00000001) +#define MB_INFO_FLAG_BOOT_DEVICE HEX(00000002) +#define MB_INFO_FLAG_COMMAND_LINE HEX(00000004) +#define MB_INFO_FLAG_MODULES HEX(00000008) +#define MB_INFO_FLAG_AOUT_SYMS HEX(00000010) +#define MB_INFO_FLAG_ELF_SYMS HEX(00000020) +#define MB_INFO_FLAG_MEMORY_MAP HEX(00000040) +#define MB_INFO_FLAG_DRIVES HEX(00000080) +#define MB_INFO_FLAG_CONFIG_TABLE HEX(00000100) +#define MB_INFO_FLAG_BOOT_LOADER_NAME HEX(00000200) +#define MB_INFO_FLAG_APM_TABLE HEX(00000400) +#define MB_INFO_FLAG_GRAPHICS_TABLE HEX(00000800) -#ifndef ASM +#ifndef __ASM__ /* Do not include here in boot.S. */ /* Types. */ @@ -101,4 +103,4 @@ unsigned long reserved; } memory_map_t; -#endif /* ! ASM */ +#endif /* ! __ASM__ */ Modified: branches/cmake-bringup/boot/freeldr/freeldr/include/ver.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/include/ver.h [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/include/ver.h [iso-8859-1] Sun Nov 14 13:36:25 2010 @@ -17,7 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef __ASM__ #pragma once +#endif /* just some stuff */ #define VERSION "FreeLoader v3.0" @@ -37,8 +39,8 @@ #define FREELOADER_PATCH_VERSION 0 -#ifndef ASM +#ifndef __ASM__ PCHAR GetFreeLoaderVersionString(VOID); -#endif // ASM +#endif // __ASM__

14 years, 1 month

[tkreuzer] 49582: [FREELDR] Convert arch.S to intel syntax.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 14 13:25:20 2010 New Revision: 49582 URL: http://svn.reactos.org/svn/reactos?rev=49582&view=rev Log: [FREELDR] Convert arch.S to intel syntax. Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/arch.S Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/arch.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] Sun Nov 14 13:25:20 2010 @@ -17,27 +17,29 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - .text - .code16 +.intel_syntax noprefix +#define HEX(y) 0x##y #define ASM #include <arch.h> #include <multiboot.h> + .code16 EXTERN(RealEntryPoint) cli /* Setup segment registers */ - xorw %ax,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%fs - movw %ax,%gs - movw %ax,%ss + xor ax, ax + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax + /* Setup a stack */ - movw stack16,%sp + mov sp, word ptr ds:stack16 sti @@ -47,24 +49,24 @@ .code32 /* Zero BootDrive and BootPartition */ - xorl %eax,%eax - movl %eax,(_BootDrive) - movl %eax,(_BootPartition) + xor eax, eax + mov dword ptr [_BootDrive], eax + mov dword ptr [_BootPartition], eax /* Store the boot drive */ - movb %dl,(_BootDrive) + mov byte ptr [_BootDrive], dl /* Store the boot partition */ - movb %dh,(_BootPartition) + mov byte ptr [_BootPartition], dh /* GO! */ - pushl %eax + push eax call _BootMain call switch_to_real .code16 - int $0x19 + int HEX(19) /* We should never get here */ stop: @@ -78,7 +80,7 @@ */ EXTERN(switch_to_prot) - .code16 +.code16 cli /* None of these */ @@ -88,18 +90,18 @@ /* Of course CS has to already be valid. */ /* We are currently in real-mode so we */ /* need real-mode segment values. */ - xorw %ax,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%fs - movw %ax,%gs - movw %ax,%ss + xor ax, ax + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax /* Get the return address off the stack */ - popw (code32ret) + pop word ptr ds:[code32ret] /* Save 16-bit stack pointer */ - movw %sp,stack16 + mov word ptr ds:[stack16], sp /* Load the GDT */ lgdt gdtptr @@ -107,28 +109,28 @@ lidt i386idtptr /* Enable Protected Mode */ - mov %cr0,%eax - orl $CR0_PE_SET,%eax - mov %eax,%cr0 + mov eax, cr0 + or eax, CR0_PE_SET + mov cr0, eax /* Clear prefetch queue & correct CS */ - ljmp $PMODE_CS, $inpmode - - - .code32 + //ljmp PMODE_CS, inpmode + jmp far ptr PMODE_CS:inpmode + +.code32 inpmode: /* Setup segment selectors */ - movw $PMODE_DS,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%fs - movw %ax,%gs - movw %ax,%ss - movl stack32,%esp + mov ax, PMODE_DS + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax + mov esp, dword ptr [stack32] /* Put the return address back onto the stack */ - pushl (code32ret) + push dword ptr [code32ret] /* Now return in p-mode! */ ret @@ -139,7 +141,7 @@ */ EXTERN(switch_to_real) - .code32 +.code32 /* We don't know what values are currently */ /* in the segment registers. So we are */ @@ -147,48 +149,49 @@ /* Of course CS has to already be valid. */ /* We are currently in protected-mode so we */ /* need protected-mode segment values. */ - movw $PMODE_DS,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%fs - movw %ax,%gs - movw %ax,%ss + mov ax, PMODE_DS + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax /* Get the return address off the stack */ - popl (code16ret) + pop dword ptr [code16ret] /* Save 32-bit stack pointer */ - movl %esp,stack32 + mov dword ptr [stack32], esp /* jmp to 16-bit segment to set the limit correctly */ - ljmp $RMODE_CS, $switch_to_real16 + ljmp RMODE_CS, switch_to_real16 switch_to_real16: - .code16 +.code16 /* Restore segment registers to correct limit */ - movw $RMODE_DS,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%fs - movw %ax,%gs - movw %ax,%ss + mov ax, RMODE_DS + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax /* Disable Protected Mode */ - mov %cr0,%eax - andl $CR0_PE_CLR,%eax - mov %eax,%cr0 + mov eax, cr0 + and eax, CR0_PE_CLR + mov cr0, eax /* Clear prefetch queue & correct CS */ - ljmp $0, $inrmode + //ljmp $0, $inrmode + jmp far ptr 0:inrmode inrmode: - movw %cs,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%fs - movw %ax,%gs - movw %ax,%ss + mov ax, cs + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax /* Clear out the high 16-bits of ESP */ /* This is needed because I have one */ @@ -196,12 +199,12 @@ /* anything other than 0x0000 is in the high */ /* 16-bits of ESP. Even though real-mode */ /* code should only use SP and not ESP. */ - xorl %esp,%esp - - movw stack16,%sp + xor esp, esp + + mov sp, word ptr ds:[stack16] /* Put the return address back onto the stack */ - pushw (code16ret) + push word ptr ds:[code16ret] /* Load IDTR with real mode value */ lidt rmode_idtptr @@ -215,14 +218,14 @@ /* * Needed for enabling the a20 address line */ - .code16 +.code16 empty_8042: .word 0x00eb,0x00eb // jmp $+2, jmp $+2 - inb $0x64,%al - cmp $0xff, %al // legacy-free machine without keyboard - jz empty_8042_ret // controllers on Intel Macs read back 0xFF - testb $0x02,%al - jnz empty_8042 + in al, HEX(64) + cmp al, HEX(ff) // legacy-free machine without keyboard + jz empty_8042_ret // controllers on Intel Macs read back 0xFF + test al, 2 + jnz empty_8042 empty_8042_ret: ret @@ -230,24 +233,24 @@ * Enable the A20 address line (to allow access to over 1mb) */ EXTERN(_EnableA20) +.code32 + + pusha + + call switch_to_real +.code16 + + call empty_8042 + mov al, HEX(D1) // command write + out HEX(64), al + call empty_8042 + mov al, HEX(DF) // A20 on + out HEX(60), al + call empty_8042 + call switch_to_prot .code32 - pushal - - call switch_to_real - .code16 - - call empty_8042 - movb $0xD1,%al // command write - outb %al,$0x64 - call empty_8042 - mov $0xDF,%al // A20 on - out %al,$0x60 - call empty_8042 - call switch_to_prot - .code32 - - popal + popa ret @@ -255,24 +258,24 @@ * Disable the A20 address line */ EXTERN(_DisableA20) - .code32 - - pushal - - call switch_to_real +.code32 + + pusha + + call switch_to_real .code16 call empty_8042 - movb $0xD1,%al // command write - outb %al,$0x64 - call empty_8042 - mov $0xDD,%al // A20 off - out %al,$0x60 + mov al, HEX(D1) // command write + out HEX(64), al + call empty_8042 + mov al, HEX(DD) // A20 off + out HEX(60), al call empty_8042 call switch_to_prot .code32 - popal + popa ret @@ -294,11 +297,11 @@ * above 1MB. So we let Grub load us there and then relocate * ourself to 0x8000 */ -#define FREELDR_BASE 0x8000 -#define INITIAL_BASE 0x200000 +#define FREELDR_BASE HEX(8000) +#define INITIAL_BASE HEX(200000) /* Align 32 bits boundary */ - .align 4 +.align 4 /* Multiboot header */ MultibootHeader: @@ -330,44 +333,45 @@ * our own */ lgdt gdtptrhigh + INITIAL_BASE - FREELDR_BASE /* Reload segment selectors */ - ljmp $PMODE_CS, $(mb1 + INITIAL_BASE - FREELDR_BASE) + //ljmp $PMODE_CS, $(mb1 + INITIAL_BASE - FREELDR_BASE) + jmp far ptr PMODE_CS: (mb1 + INITIAL_BASE - FREELDR_BASE) mb1: - movw $PMODE_DS,%dx - movw %dx,%ds - movw %dx,%es + mov dx, PMODE_DS + mov ds, dx + mov es, dx /* Check for valid multiboot signature */ - cmpl $MULTIBOOT_BOOTLOADER_MAGIC,%eax - jne mbfail + cmp eax, MULTIBOOT_BOOTLOADER_MAGIC + jne mbfail /* Store multiboot info in a safe place */ - movl %ebx,%esi - movl $(mb_info + INITIAL_BASE - FREELDR_BASE),%edi - movl $MB_INFO_SIZE,%ecx + mov esi, ebx + mov edi, offset mb_info + INITIAL_BASE - FREELDR_BASE + mov ecx, MB_INFO_SIZE rep movsb /* Save commandline */ - movl MB_INFO_FLAGS_OFFSET(%ebx),%edx - testl $MB_INFO_FLAG_COMMAND_LINE,MB_INFO_FLAGS_OFFSET(%ebx) - jz mb3 - movl MB_INFO_COMMAND_LINE_OFFSET(%ebx),%esi - movl $(cmdline + INITIAL_BASE - FREELDR_BASE),%edi - movl $CMDLINE_SIZE,%ecx + mov edx, [ebx + MB_INFO_FLAGS_OFFSET] + test dword ptr [ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_COMMAND_LINE + jz mb3 + mov esi, [ebx + MB_INFO_COMMAND_LINE_OFFSET] + mov edi, offset cmdline + INITIAL_BASE - FREELDR_BASE + mov ecx, CMDLINE_SIZE mb2: lodsb stosb - testb %al,%al - jz mb3 - dec %ecx - jnz mb2 + test al, al + jz mb3 + dec ecx + jnz mb2 mb3: /* Copy to low mem */ - movl $INITIAL_BASE,%esi - movl $FREELDR_BASE,%edi - movl $(__bss_end__ - FREELDR_BASE),%ecx - addl $3,%ecx - shrl $2,%ecx - rep movsl + mov esi, INITIAL_BASE + mov edi, FREELDR_BASE + mov ecx, (offset __bss_end__ - FREELDR_BASE) + add ecx, 3 + shr ecx, 2 + rep movsd /* Load the GDT and IDT */ lgdt gdtptr @@ -375,47 +379,49 @@ /* Clear prefetch queue & correct CS, * jump to low mem */ - ljmp $PMODE_CS, $mb4 + //ljmp $PMODE_CS, $mb4 + jmp far ptr PMODE_CS:mb4 mb4: /* Reload segment selectors */ - movw $PMODE_DS,%dx - movw %dx,%ds - movw %dx,%es - movw %dx,%fs - movw %dx,%gs - movw %dx,%ss - movl $STACK32ADDR,%esp - - movl $mb_info,%ebx + mov dx, PMODE_DS + mov ds, dx + mov es, dx + mov fs, dx + mov gs, dx + mov ss, dx + mov esp, STACK32ADDR + + mov ebx, offset mb_info /* See if the boot device was passed in */ - movl MB_INFO_FLAGS_OFFSET(%ebx),%edx - testl $MB_INFO_FLAG_BOOT_DEVICE,%edx - jz mb5 + mov edx, [ebx + MB_INFO_FLAGS_OFFSET] + test edx, MB_INFO_FLAG_BOOT_DEVICE + jz mb5 /* Retrieve boot device info */ - movl MB_INFO_BOOT_DEVICE_OFFSET(%ebx),%eax - shrl $16,%eax - incb %al - movb %al,_BootPartition - movb %ah,_BootDrive - jmp mb6 + mov eax, [ebx + MB_INFO_BOOT_DEVICE_OFFSET] + shr eax, 16 + inc al + mov byte ptr _BootPartition, al + mov byte ptr _BootDrive, ah + jmp mb6 mb5: /* No boot device known, assume first partition of first harddisk */ - movb $0x80,_BootDrive - movb $1,_BootPartition + mov byte ptr _BootDrive, HEX(80) + mov byte ptr _BootPartition, 1 mb6: /* Check for command line */ - mov $cmdline,%eax - testl $MB_INFO_FLAG_COMMAND_LINE,MB_INFO_FLAGS_OFFSET(%ebx) - jnz mb7 - xorl %eax,%eax + mov eax, offset cmdline + test dword ptr [ebx + MB_INFO_FLAGS_OFFSET], MB_INFO_FLAG_COMMAND_LINE + jnz mb7 + xor eax, eax mb7: /* GO! */ - pushl %eax + push eax call _BootMain -mbfail: call switch_to_real +mbfail: + call switch_to_real .code16 - int $0x19 + int 0x19 mbstop: jmp mbstop /* We should never get here */ .code32 @@ -437,52 +443,52 @@ .long 0 - .p2align 2 /* force 4-byte alignment */ + .align 4 /* force 4-byte alignment */ gdt: /* NULL Descriptor */ - .word 0x0000 - .word 0x0000 - .word 0x0000 - .word 0x0000 + .word HEX(0000) + .word HEX(0000) + .word HEX(0000) + .word HEX(0000) /* 32-bit flat CS */ - .word 0xFFFF - .word 0x0000 - .word 0x9A00 - .word 0x00CF + .word HEX(FFFF) + .word HEX(0000) + .word HEX(9A00) + .word HEX(00CF) /* 32-bit flat DS */ - .word 0xFFFF - .word 0x0000 - .word 0x9200 - .word 0x00CF + .word HEX(FFFF) + .word HEX(0000) + .word HEX(9200) + .word HEX(00CF) /* 16-bit real mode CS */ - .word 0xFFFF - .word 0x0000 - .word 0x9E00 - .word 0x0000 + .word HEX(FFFF) + .word HEX(0000) + .word HEX(9E00) + .word HEX(0000) /* 16-bit real mode DS */ - .word 0xFFFF - .word 0x0000 - .word 0x9200 - .word 0x0000 + .word HEX(FFFF) + .word HEX(0000) + .word HEX(9200) + .word HEX(0000) /* GDT table pointer */ gdtptr: - .word 0x27 /* Limit */ - .long gdt /* Base Address */ + .word HEX(27) /* Limit */ + .long gdt /* Base Address */ /* Initial GDT table pointer for multiboot */ gdtptrhigh: - .word 0x27 /* Limit */ - .long gdt + INITIAL_BASE - FREELDR_BASE /* Base Address */ + .word HEX(27) /* Limit */ + .long gdt + INITIAL_BASE - FREELDR_BASE /* Base Address */ /* Real-mode IDT pointer */ rmode_idtptr: - .word 0x3ff /* Limit */ - .long 0 /* Base Address */ + .word HEX(3ff) /* Limit */ + .long 0 /* Base Address */ mb_info: .fill MB_INFO_SIZE, 1, 0

14 years, 1 month

[gadamopoulos] 49581: [win32k] -Rename MsqInsertSystemMessage to MsqInsertMouseMessage

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Nov 14 09:53:07 2010 New Revision: 49581 URL: http://svn.reactos.org/svn/reactos?rev=49581&view=rev Log: [win32k] -Rename MsqInsertSystemMessage to MsqInsertMouseMessage Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Sun Nov 14 09:53:07 2010 @@ -196,7 +196,7 @@ VOID FASTCALL MsqPostHotKeyMessage(PVOID Thread, HWND hWnd, WPARAM wParam, LPARAM lParam); VOID FASTCALL -MsqInsertSystemMessage(MSG* Msg); +MsqInsertMouseMessage(MSG* Msg); BOOL FASTCALL MsqIsClkLck(LPMSG Msg, BOOL Remove); BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sun Nov 14 09:53:07 2010 @@ -217,7 +217,7 @@ Msg.wParam = CurInfo->ButtonsDown; Msg.lParam = MAKELPARAM(x, y); Msg.pt = pt; - MsqInsertSystemMessage(&Msg); + MsqInsertMouseMessage(&Msg); } /* Store the new cursor position */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Nov 14 09:53:07 2010 @@ -1156,7 +1156,7 @@ Msg.message = SwapBtnMsg[0][SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - MsqInsertSystemMessage(&Msg); + MsqInsertMouseMessage(&Msg); } else if(mi->dwFlags & MOUSEEVENTF_LEFTUP) { @@ -1164,7 +1164,7 @@ Msg.message = SwapBtnMsg[1][SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - MsqInsertSystemMessage(&Msg); + MsqInsertMouseMessage(&Msg); } if(mi->dwFlags & MOUSEEVENTF_MIDDLEDOWN) { @@ -1172,7 +1172,7 @@ Msg.message = WM_MBUTTONDOWN; CurInfo->ButtonsDown |= MK_MBUTTON; Msg.wParam |= CurInfo->ButtonsDown; - MsqInsertSystemMessage(&Msg); + MsqInsertMouseMessage(&Msg); } else if(mi->dwFlags & MOUSEEVENTF_MIDDLEUP) { @@ -1180,7 +1180,7 @@ Msg.message = WM_MBUTTONUP; CurInfo->ButtonsDown &= ~MK_MBUTTON; Msg.wParam |= CurInfo->ButtonsDown; - MsqInsertSystemMessage(&Msg); + MsqInsertMouseMessage(&Msg); } if(mi->dwFlags & MOUSEEVENTF_RIGHTDOWN) { @@ -1188,7 +1188,7 @@ Msg.message = SwapBtnMsg[0][!SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[!SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - MsqInsertSystemMessage(&Msg); + MsqInsertMouseMessage(&Msg); } else if(mi->dwFlags & MOUSEEVENTF_RIGHTUP) { @@ -1196,7 +1196,7 @@ Msg.message = SwapBtnMsg[1][!SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[!SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - MsqInsertSystemMessage(&Msg); + MsqInsertMouseMessage(&Msg); } if((mi->dwFlags & (MOUSEEVENTF_XDOWN | MOUSEEVENTF_XUP)) && @@ -1214,14 +1214,14 @@ gQueueKeyStateTable[VK_XBUTTON1] |= 0xc0; CurInfo->ButtonsDown |= MK_XBUTTON1; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); - MsqInsertSystemMessage(&Msg); + MsqInsertMouseMessage(&Msg); } if(mi->mouseData & XBUTTON2) { gQueueKeyStateTable[VK_XBUTTON2] |= 0xc0; CurInfo->ButtonsDown |= MK_XBUTTON2; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); - MsqInsertSystemMessage(&Msg); + MsqInsertMouseMessage(&Msg); } } else if(mi->dwFlags & MOUSEEVENTF_XUP) @@ -1232,21 +1232,21 @@ gQueueKeyStateTable[VK_XBUTTON1] &= ~0x80; CurInfo->ButtonsDown &= ~MK_XBUTTON1; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); - MsqInsertSystemMessage(&Msg); + MsqInsertMouseMessage(&Msg); } if(mi->mouseData & XBUTTON2) { gQueueKeyStateTable[VK_XBUTTON2] &= ~0x80; CurInfo->ButtonsDown &= ~MK_XBUTTON2; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); - MsqInsertSystemMessage(&Msg); + MsqInsertMouseMessage(&Msg); } } if(mi->dwFlags & MOUSEEVENTF_WHEEL) { Msg.message = WM_MOUSEWHEEL; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, mi->mouseData); - MsqInsertSystemMessage(&Msg); + MsqInsertMouseMessage(&Msg); } return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun Nov 14 09:53:07 2010 @@ -137,7 +137,7 @@ } VOID FASTCALL -MsqInsertSystemMessage(MSG* Msg) +MsqInsertMouseMessage(MSG* Msg) { LARGE_INTEGER LargeTickCount; KIRQL OldIrql; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Nov 14 09:53:07 2010 @@ -2569,7 +2569,7 @@ msg.wParam = IntGetSysCursorInfo()->ButtonsDown; msg.lParam = MAKELPARAM(gpsi->ptCursor.x, gpsi->ptCursor.y); msg.pt = gpsi->ptCursor; - MsqInsertSystemMessage(&msg); + MsqInsertMouseMessage(&msg); if (!IntIsWindow(Window->head.h)) {

14 years, 1 month

[gadamopoulos] 49580: [win32k] - Simplify co_IntPeekMessage even more

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Nov 14 09:01:17 2010 New Revision: 49580 URL: http://svn.reactos.org/svn/reactos?rev=49580&view=rev Log: [win32k] - Simplify co_IntPeekMessage even more Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/include/win32kp.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Sun Nov 14 09:01:17 2010 @@ -127,7 +127,7 @@ IN PWND Window, IN UINT MsgFilterLow, IN UINT MsgFilterHigh, - OUT PUSER_MESSAGE* Message); + OUT PMSG Message); BOOLEAN FASTCALL MsqInitializeMessageQueue(struct _ETHREAD *Thread, PUSER_MESSAGE_QUEUE MessageQueue); VOID FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sun Nov 14 09:01:17 2010 @@ -11,8 +11,12 @@ #pragma once #define INTERNAL_CALL APIENTRY +#ifndef _MSC_VER #define PLACE_IN_SECTION(s) __attribute__((section(s))) #define INIT_FUNCTION PLACE_IN_SECTION("INIT") +#else +#define INIT_FUNCTION +#endif /* Internal Win32k Headers */ #include <include/accelerator.h> Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Nov 14 09:01:17 2010 @@ -887,7 +887,7 @@ * Internal version of PeekMessage() doing all the work */ BOOL FASTCALL -co_IntPeekMessage( PUSER_MESSAGE Msg, +co_IntPeekMessage( PMSG Msg, PWND Window, UINT MsgFilterMin, UINT MsgFilterMax, @@ -896,7 +896,6 @@ PTHREADINFO pti; LARGE_INTEGER LargeTickCount; PUSER_MESSAGE_QUEUE ThreadQueue; - PUSER_MESSAGE Message; BOOL RemoveMessages; pti = PsGetCurrentThreadWin32Thread(); @@ -920,10 +919,10 @@ { /* According to the PSDK, WM_QUIT messages are always returned, regardless of the filter specified */ - Msg->Msg.hwnd = NULL; - Msg->Msg.message = WM_QUIT; - Msg->Msg.wParam = ThreadQueue->QuitExitCode; - Msg->Msg.lParam = 0; + Msg->hwnd = NULL; + Msg->message = WM_QUIT; + Msg->wParam = ThreadQueue->QuitExitCode; + Msg->lParam = 0; if (RemoveMessages) { ThreadQueue->QuitPosted = FALSE; @@ -939,14 +938,9 @@ Window, MsgFilterMin, MsgFilterMax, - &Message )) - { - RtlCopyMemory(Msg, Message, sizeof(USER_MESSAGE)); - if (RemoveMessages) - { - MsqDestroyMessage(Message); - } - break; + Msg )) + { + return TRUE; } /* Check for hardware events. */ @@ -956,18 +950,13 @@ Window, MsgFilterMin, MsgFilterMax, - &Message )) - { - RtlCopyMemory(Msg, Message, sizeof(USER_MESSAGE)); - if (RemoveMessages) - { - MsqDestroyMessage(Message); - } - - if(!ProcessHardwareMessage(&Msg->Msg, RemoveMessages)) + Msg )) + { + + if(!ProcessHardwareMessage(Msg, RemoveMessages)) continue; - break; + return TRUE; } /* Check for sent messages again. */ @@ -979,10 +968,10 @@ MsgFilterMin, MsgFilterMax, pti, - &Msg->Msg, + Msg, RemoveMessages)) { - break; + return TRUE; } if (PostTimerMessages(Window)) @@ -1099,7 +1088,7 @@ PTHREADINFO pti; PUSER_MESSAGE_QUEUE ThreadQueue; NTSTATUS Status = STATUS_SUCCESS; - USER_MESSAGE Msg; + MSG Msg; pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; @@ -1142,7 +1131,6 @@ BOOL bGMSG ) { PWND Window; - USER_MESSAGE Msg; BOOL Present = FALSE; if ( hWnd == HWND_TOPMOST || hWnd == HWND_BROADCAST ) @@ -1170,19 +1158,15 @@ MsgFilterMax = 0; } - RtlZeroMemory(&Msg, sizeof(USER_MESSAGE)); - do { - Present = co_IntPeekMessage( &Msg, + Present = co_IntPeekMessage( pMsg, Window, MsgFilterMin, MsgFilterMax, RemoveMsg ); if (Present) { - RtlCopyMemory( pMsg, &Msg.Msg, sizeof(MSG)); - // The WH_GETMESSAGE hook enables an application to monitor messages about to // be returned by the GetMessage or PeekMessage function. @@ -2764,7 +2748,7 @@ case STATUS_WAIT_2: { - USER_MESSAGE Msg; + MSG Msg; co_IntPeekMessage( &Msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ); DPRINT1("WFII: WAIT 2\n"); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun Nov 14 09:01:17 2010 @@ -535,7 +535,7 @@ BOOL APIENTRY co_MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, PWND Window, UINT FilterLow, UINT FilterHigh, BOOL Remove, - PUSER_MESSAGE* Message) + PMSG Message) { KIRQL OldIrql; POINT ScreenPoint; @@ -587,14 +587,15 @@ DesktopWindow, &ScreenPoint, FALSE, &CurrentEntry); if (Accept) { + *Message = Current->Msg; if (Remove) { RemoveEntryList(&Current->ListEntry); + MsqDestroyMessage(Current); } IntUnLockHardwareMessageQueue(MessageQueue); IntUnLockSystemHardwareMessageQueueLock(FALSE); - *Message = Current; - + if (Desk) Desk->LastInputWasKbd = FALSE; @@ -604,13 +605,14 @@ } else { + *Message = Current->Msg; if (Remove) { RemoveEntryList(&Current->ListEntry); + MsqDestroyMessage(Current); } IntUnLockHardwareMessageQueue(MessageQueue); IntUnLockSystemHardwareMessageQueueLock(FALSE); - *Message = Current; RETURN(TRUE); } @@ -693,7 +695,12 @@ IntUnLockHardwareMessageQueue(MessageQueue); } IntUnLockSystemHardwareMessageQueueLock(FALSE); - *Message = Current; + *Message = Current->Msg; + + if (Remove) + { + MsqDestroyMessage(Current); + } RETURN(TRUE); } @@ -1325,7 +1332,7 @@ IN PWND Window, IN UINT MsgFilterLow, IN UINT MsgFilterHigh, - OUT PUSER_MESSAGE* Message) + OUT PMSG Message) { PLIST_ENTRY CurrentEntry; PUSER_MESSAGE CurrentMessage; @@ -1359,7 +1366,13 @@ RemoveEntryList(&CurrentMessage->ListEntry); } - *Message = CurrentMessage; + *Message= CurrentMessage->Msg; + + if (Remove) + { + MsqDestroyMessage(CurrentMessage); + } + return(TRUE); } CurrentEntry = CurrentEntry->Flink;

14 years, 1 month

[jimtabor] 49579: [Win32k] - Fixed WaitForInputIdle, finally!, passed all the wine tests for it. - Moved Get/Peek message to the new all in one support routine. - Foreground hook hits one out of fi...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Nov 14 00:27:38 2010 New Revision: 49579 URL: http://svn.reactos.org/svn/reactos?rev=49579&view=rev Log: [Win32k] - Fixed WaitForInputIdle, finally!, passed all the wine tests for it. - Moved Get/Peek message to the new all in one support routine. - Foreground hook hits one out of five, this needs more research. - Attempted to workout synchronizing issues with low level and regular hooks. Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sun Nov 14 00:27:38 2010 @@ -103,6 +103,8 @@ ExInitializeFastMutex(&Win32Process->DriverObjListLock); Win32Process->KeyboardLayout = W32kGetDefaultKeyLayout(); + EngCreateEvent((PEVENT *)&Win32Process->InputIdleEvent); + KeInitializeEvent(Win32Process->InputIdleEvent, NotificationEvent, FALSE); if(Process->Peb != NULL) { @@ -118,6 +120,13 @@ else { DPRINT("Destroying W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); + Win32Process->W32PF_flags |= W32PF_TERMINATED; + if (Win32Process->InputIdleEvent) + { + EngFreeMem((PVOID)Win32Process->InputIdleEvent); + Win32Process->InputIdleEvent = NULL; + } + IntCleanupMenus(Process, Win32Process); IntCleanupCurIcons(Process, Win32Process); CleanupMonitorImpl(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Nov 14 00:27:38 2010 @@ -14,6 +14,8 @@ #define NDEBUG #include <debug.h> + +BOOLEAN NTAPI PsGetProcessExitProcessCalled(PEPROCESS Process); #define PM_BADMSGFLAGS ~((QS_RAWINPUT << 16)|PM_QS_SENDMESSAGE|PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_QS_INPUT|PM_NOYIELD|PM_REMOVE) @@ -323,6 +325,52 @@ return STATUS_INVALID_PARAMETER; } +// +// Wakeup any thread/process waiting on idle input. +// +VOID FASTCALL +IdlePing(VOID) +{ + PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); + PUSER_MESSAGE_QUEUE ForegroundQueue; + PTHREADINFO pti, ptiForeground = NULL; + + ForegroundQueue = IntGetFocusMessageQueue(); + + if (ForegroundQueue) + ptiForeground = ForegroundQueue->Thread->Tcb.Win32Thread; + + pti = PsGetCurrentThreadWin32Thread(); + + if ( pti && pti->pDeskInfo && pti == ptiForeground ) + { + if ( pti->fsHooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE) || + pti->pDeskInfo->fsHooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE) ) + { + co_HOOK_CallHooks(WH_FOREGROUNDIDLE,HC_ACTION,0,0); + } + } + + DPRINT("IdlePing ppi 0x%x\n",ppi); + if ( ppi && ppi->InputIdleEvent ) + { + DPRINT("InputIdleEvent\n"); + KeSetEvent( ppi->InputIdleEvent, IO_NO_INCREMENT, FALSE); + } +} + +VOID FASTCALL +IdlePong(VOID) +{ + PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); + + DPRINT("IdlePong ppi 0x%x\n",ppi); + if ( ppi && ppi->InputIdleEvent ) + { + KeClearEvent(ppi->InputIdleEvent); + } +} + static VOID FASTCALL IntCallWndProc( PWND Window, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { @@ -856,6 +904,8 @@ RemoveMessages = RemoveMsg & PM_REMOVE; + IdlePong(); + do { KeQueryTickCount(&LargeTickCount); @@ -944,10 +994,6 @@ } while (TRUE); - // The WH_GETMESSAGE hook enables an application to monitor messages about to - // be returned by the GetMessage or PeekMessage function. - - co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)&Msg->Msg); return TRUE; } @@ -1068,6 +1114,7 @@ { return TRUE; } + /* Nothing found. Wait for new messages. */ Status = co_MsqWaitForNewMessages( ThreadQueue, Window, @@ -1094,9 +1141,9 @@ UINT RemoveMsg, BOOL bGMSG ) { - BOOL Present; PWND Window; USER_MESSAGE Msg; + BOOL Present = FALSE; if ( hWnd == HWND_TOPMOST || hWnd == HWND_BROADCAST ) hWnd = HWND_BOTTOM; @@ -1122,6 +1169,8 @@ MsgFilterMin = 0; MsgFilterMax = 0; } + + RtlZeroMemory(&Msg, sizeof(USER_MESSAGE)); do { @@ -1132,33 +1181,40 @@ RemoveMsg ); if (Present) { - RtlCopyMemory( pMsg, &Msg.Msg, sizeof(MSG)); - - if (bGMSG) - return (WM_QUIT != pMsg->message); - else - return TRUE; - } - - if ( bGMSG && !co_IntWaitMessage(Window, MsgFilterMin, MsgFilterMax) ) - { - return -1; + RtlCopyMemory( pMsg, &Msg.Msg, sizeof(MSG)); + + // The WH_GETMESSAGE hook enables an application to monitor messages about to + // be returned by the GetMessage or PeekMessage function. + + co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)pMsg); + + if ( bGMSG ) + return (WM_QUIT != pMsg->message); + } + + if ( bGMSG ) + { + if ( !co_IntWaitMessage(Window, MsgFilterMin, MsgFilterMax) ) + return -1; } else { - if (!(RemoveMsg & PM_NOYIELD)) - { - // Yield this thread! - UserLeave(); - ZwYieldExecution(); - UserEnterExclusive(); - // Fall through to fail. - } + if (!(RemoveMsg & PM_NOYIELD)) + { + IdlePing(); + // Yield this thread! + UserLeave(); + ZwYieldExecution(); + UserEnterExclusive(); + // Fall through to exit. + IdlePong(); + } + break; } } while( bGMSG && !Present ); - return FALSE; + return Present; } BOOL FASTCALL @@ -2049,49 +2105,30 @@ * retrieved. */ { - BOOL GotMessage; NTUSERGETMESSAGEINFO Info; NTSTATUS Status; /* FIXME: if initialization is removed, gcc complains that this may be used before initialization. Please review */ - PWND Window = NULL; PMSGMEMORY MsgMemoryEntry; PVOID UserMem; ULONG Size; - USER_MESSAGE Msg; - - DPRINT("Enter NtUserGetMessage\n"); + MSG Msg; + BOOL GotMessage; + + if ( (MsgFilterMin|MsgFilterMax) & ~WM_MAXIMUM ) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + UserEnterExclusive(); - /* Validate input */ - if (hWnd && !(Window = UserGetWindowObject(hWnd))) - { - UserLeave(); - return -1; - } - - // if (Window) UserRefObjectCo(Window, &Ref); - - if (MsgFilterMax < MsgFilterMin) - { - MsgFilterMin = 0; - MsgFilterMax = 0; - } - - do - { - GotMessage = co_IntPeekMessage(&Msg, Window, MsgFilterMin, MsgFilterMax, PM_REMOVE); - - if (!GotMessage && !co_IntWaitMessage(Window, MsgFilterMin, MsgFilterMax)) - { - UserLeave(); - return -1; - } - } - while (! GotMessage); + RtlZeroMemory(&Msg, sizeof(MSG)); + + GotMessage = co_IntGetPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, PM_REMOVE, TRUE); UserLeave(); - Info.Msg = Msg.Msg; + Info.Msg = Msg; //.Msg; /* See if this message type is present in the table */ MsgMemoryEntry = FindMsgMemory(Info.Msg.message); @@ -2103,7 +2140,7 @@ if (NULL == MsgMemoryEntry) { /* Not present, no copying needed */ - Info.LParamSize = 0; + UnsafeInfo->LParamSize = 0; } else { @@ -2127,8 +2164,8 @@ ProbeForWrite(UserMem, Size, 1); RtlCopyMemory(UserMem, (PVOID)Info.Msg.lParam, Size); - Info.LParamSize = Size; - Info.Msg.lParam = (LPARAM) UserMem; + UnsafeInfo->LParamSize = Size; + UnsafeInfo->Msg.lParam = (LPARAM) UserMem; } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -2144,7 +2181,7 @@ } _SEH2_END; - return (Info.Msg.message != WM_QUIT ); + return GotMessage; } @@ -2163,9 +2200,9 @@ return FALSE; } + UserEnterExclusive(); + RtlZeroMemory(&Msg, sizeof(MSG)); - - UserEnterExclusive(); Ret = co_IntGetPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, PM_REMOVE, TRUE); @@ -2197,46 +2234,30 @@ UINT RemoveMsg) { NTSTATUS Status; - BOOL Ret; NTUSERGETMESSAGEINFO Info; - PWND Window; PMSGMEMORY MsgMemoryEntry; PVOID UserMem = NULL; ULONG Size; - USER_MESSAGE Msg; + MSG Msg; + BOOL Ret; + + if ( RemoveMsg & PM_BADMSGFLAGS ) + { + SetLastWin32Error(ERROR_INVALID_FLAGS); + return FALSE; + } UserEnterExclusive(); - if (hWnd == (HWND)-1 || hWnd == (HWND)0x0000FFFF || hWnd == (HWND)0xFFFFFFFF) - hWnd = (HWND)1; - - /* Validate input */ - if (hWnd && hWnd != (HWND)1) - { - if (!(Window = UserGetWindowObject(hWnd))) - { - UserLeave(); - return -1; - } - } - else - { - Window = (PWND)hWnd; - } - - if (MsgFilterMax < MsgFilterMin) - { - MsgFilterMin = 0; - MsgFilterMax = 0; - } - - Ret = co_IntPeekMessage(&Msg, Window, MsgFilterMin, MsgFilterMax, RemoveMsg); + RtlZeroMemory(&Msg, sizeof(MSG)); + + Ret = co_IntGetPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, RemoveMsg, FALSE); UserLeave(); if (Ret) { - Info.Msg = Msg.Msg; + Info.Msg = Msg; /* See if this message type is present in the table */ MsgMemoryEntry = FindMsgMemory(Info.Msg.message); @@ -2248,7 +2269,7 @@ if (NULL == MsgMemoryEntry) { /* Not present, no copying needed */ - Info.LParamSize = 0; + UnsafeInfo->LParamSize = 0; } else { @@ -2272,8 +2293,8 @@ ProbeForWrite(UserMem, Size, 1); RtlCopyMemory(UserMem, (PVOID)Info.Msg.lParam, Size); - Info.LParamSize = Size; - Info.Msg.lParam = (LPARAM) UserMem; + UnsafeInfo->LParamSize = Size; + UnsafeInfo->Msg.lParam = (LPARAM) UserMem; } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -2308,9 +2329,9 @@ return FALSE; } + UserEnterExclusive(); + RtlZeroMemory(&Msg, sizeof(MSG)); - - UserEnterExclusive(); Ret = co_IntGetPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, RemoveMsg, FALSE); @@ -2665,10 +2686,10 @@ { PEPROCESS Process; PPROCESSINFO W32Process; + PTHREADINFO pti; NTSTATUS Status; - HANDLE Handles[2]; + HANDLE Handles[3]; LARGE_INTEGER Timeout; - ULONGLONG StartTime, Run, Elapsed = 0; UserEnterExclusive(); @@ -2686,8 +2707,13 @@ return WAIT_FAILED; } + pti = PsGetCurrentThreadWin32Thread(); + W32Process = (PPROCESSINFO)Process->Win32Process; - if (!W32Process) + + if ( PsGetProcessExitProcessCalled(Process) || + !W32Process || + pti->ppi == W32Process) { ObDereferenceObject(Process); UserLeave(); @@ -2695,10 +2721,9 @@ return WAIT_FAILED; } - EngCreateEvent((PEVENT *)&W32Process->InputIdleEvent); - Handles[0] = Process; Handles[1] = W32Process->InputIdleEvent; + Handles[2] = pti->MessageQueue->NewMessages; // pEventQueueServer; IntMsqSetWakeMask returns hEventQueueClient if (!Handles[1]) { @@ -2707,16 +2732,15 @@ return STATUS_SUCCESS; /* no event to wait on */ } - StartTime = EngGetTickCount(); - - Run = dwMilliseconds; - + if (dwMilliseconds != INFINITE) + Timeout.QuadPart = (LONGLONG) dwMilliseconds * (LONGLONG) -10000; + + DPRINT("WFII: ppi 0x%x\n",W32Process); DPRINT("WFII: waiting for %p\n", Handles[1] ); do { - Timeout.QuadPart = Run - Elapsed; UserLeave(); - Status = KeWaitForMultipleObjects( 2, + Status = KeWaitForMultipleObjects( 3, Handles, WaitAny, UserRequest, @@ -2736,21 +2760,19 @@ switch (Status) { case STATUS_WAIT_0: - Status = WAIT_FAILED; goto WaitExit; case STATUS_WAIT_2: { - USER_MESSAGE Msg; - co_IntPeekMessage( &Msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ); - break; - } - - case STATUS_USER_APC: - case STATUS_ALERTED: + USER_MESSAGE Msg; + co_IntPeekMessage( &Msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ); + DPRINT1("WFII: WAIT 2\n"); + } + break; + case STATUS_TIMEOUT: DPRINT1("WFII: timeout\n"); - Status = STATUS_TIMEOUT; + case WAIT_FAILED: goto WaitExit; default: @@ -2758,24 +2780,10 @@ Status = STATUS_SUCCESS; goto WaitExit; } - - if (dwMilliseconds != INFINITE) - { - Elapsed = EngGetTickCount() - StartTime; - - if (Elapsed > Run) - Status = STATUS_TIMEOUT; - break; - } - } - while (1); + } + while (TRUE); WaitExit: - if (W32Process->InputIdleEvent) - { - EngFreeMem((PVOID)W32Process->InputIdleEvent); - W32Process->InputIdleEvent = NULL; - } ObDereferenceObject(Process); UserLeave(); return Status; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun Nov 14 00:27:38 2010 @@ -62,32 +62,6 @@ /* FUNCTIONS *****************************************************************/ -// -// Wakeup any thread/process waiting on idle input. -// -static VOID FASTCALL -IdlePing(VOID) -{ - HWND hWnd; - PWND Window; - PPROCESSINFO W32d = PsGetCurrentProcessWin32Process(); - - hWnd = UserGetForegroundWindow(); - - Window = UserGetWindowObject(hWnd); - - if (Window && Window->head.pti) - { - if (Window->head.pti->fsHooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE)) - { - co_HOOK_CallHooks(WH_FOREGROUNDIDLE,HC_ACTION,0,0); - } - } - - if (W32d && W32d->InputIdleEvent) - KePulseEvent( W32d->InputIdleEvent, EVENT_INCREMENT, TRUE); -} - HANDLE FASTCALL IntMsqSetWakeMask(DWORD WakeMask) { @@ -578,8 +552,6 @@ WaitObjects[0] = &HardwareMessageQueueLock; do { - IdlePing(); - UserLeaveCo(); WaitStatus = KeWaitForMultipleObjects(2, WaitObjects, WaitAny, UserRequest, @@ -1185,8 +1157,6 @@ if(Block) { - IdlePing(); - UserLeaveCo(); /* don't process messages sent to the thread */ @@ -1248,8 +1218,6 @@ WaitObjects[1] = ThreadQueue->NewMessages; do { - IdlePing(); - UserLeaveCo(); WaitStatus = KeWaitForMultipleObjects(2, WaitObjects, WaitAny, UserRequest, @@ -1406,8 +1374,6 @@ { PVOID WaitObjects[2] = {MessageQueue->NewMessages, &HardwareMessageEvent}; NTSTATUS ret; - - IdlePing(); // Going to wait so send Idle ping. UserLeaveCo();

14 years, 1 month

[tkreuzer] 49578: [PSDK] Move definitions of BitScanForward and BitScanReverse out of gcc specific area

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 13 23:57:49 2010 New Revision: 49578 URL: http://svn.reactos.org/svn/reactos?rev=49578&view=rev Log: [PSDK] Move definitions of BitScanForward and BitScanReverse out of gcc specific area Modified: branches/cmake-bringup/include/psdk/winnt.h Modified: branches/cmake-bringup/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/winn… ============================================================================== --- branches/cmake-bringup/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/winnt.h [iso-8859-1] Sat Nov 13 23:57:49 2010 @@ -5209,10 +5209,10 @@ #endif } +#endif + #define BitScanForward _BitScanForward #define BitScanReverse _BitScanReverse - -#endif /* TODO: Other architectures than X86 */ #if defined(_M_IX86)

14 years, 1 month

← Newer
1
...
27
28
29
30
31
32
33
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2010