- Revert 49927 "Update to trunk" as it breaks KsStudio (again)

svn path=/branches/audio-bringup/; revision=49979

base/applications/applications.rbuild

@@ -22,9 +22,6 @@
 	<directory name="extrac32">
 		<xi:include href="extrac32/extrac32.rbuild" />
 	</directory>
-	<directory name="findstr">
-		<xi:include href="findstr/findstr.rbuild" />
-	</directory>
 	<directory name="fontview">
 		<xi:include href="fontview/fontview.rbuild" />
 	</directory>

base/applications/calc/lang/sk-SK.rc

@@ -1,6 +1,6 @@
 /* TRANSLATOR :  Mário Kaèmár /Mario Kacmar/ aka Kario (kario@szm.sk)
  * DATE OF TR.:  30-01-2008
- * LAST CHANGE:  17-09-2010
+ * LAST CHANGE:  31-05-2010
  * ---------------------------------------
  * TODO:
  * pridanie navigaèných znaèiek "&" ?
@@ -545,9 +545,9 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_ENERGY_15_C_CALORIES        "15 °C calories"
-    IDS_ENERGY_BTUS                 "Britské termálne jednotky"
+    IDS_ENERGY_BTUS                 "British Thermal Units"
     IDS_ENERGY_ERGS                 "Ergs"
-    IDS_ENERGY_EVS                  "Elektron-Volty"
+    IDS_ENERGY_EVS                  "Electron-Volts"
     IDS_ENERGY_FOOT_POUNDS          "Foot-Pounds"
     IDS_ENERGY_IT_CALORIES          "International Table calories"
     IDS_ENERGY_IT_KILOCALORIES      "International Table kilocalories"
@@ -593,7 +593,7 @@ BEGIN
     IDS_LENGTH_MILLIMETERS          "Milimetre"
     IDS_LENGTH_NAUTICAL_MILES       "Námorné míle"
     IDS_LENGTH_NIEU                 "Nieu"
-    IDS_LENGTH_PARSECS              "Parseky"
+    IDS_LENGTH_PARSECS              "Parsecy"
     IDS_LENGTH_PICAS                "Picas"
     IDS_LENGTH_RI_JAPAN             "Ri (Japonsko)"
     IDS_LENGTH_RI_KOREA             "Ri (Kórea)"
@@ -626,10 +626,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PRESSURE_ATMOSPHERES        "Atmosféry"
     IDS_PRESSURE_BARS               "Bary"
-    IDS_PRESSURE_HECTOPASCALS       "Hektopascaly"
+    IDS_PRESSURE_HECTOPASCALS       "Hektopascals"
-    IDS_PRESSURE_KILOPASCALS        "Kilopascaly"
+    IDS_PRESSURE_KILOPASCALS        "Kilopascals"
-    IDS_PRESSURE_MM_OF_MERCURY      "Milimetre ortuti"
+    IDS_PRESSURE_MM_OF_MERCURY      "Millimeters of mercury"
-    IDS_PRESSURE_PASCALS            "Pascaly"
+    IDS_PRESSURE_PASCALS            "Pascals"
     IDS_PRESSURE_PSI                "Libry na štvorcový palec"
 END
 

base/applications/network/ipconfig/ipconfig.c

@@ -25,17 +25,6 @@
 HINSTANCE hInstance;
 HANDLE ProcessHeap;
 
-int LoadStringAndOem(HINSTANCE hInst,
-		UINT uID,
-		LPTSTR szNode,
-		int Siz
-)	
-{
-  TCHAR szTmp[25];
-  int res = LoadString(hInst, uID, szTmp, sizeof(szTmp)); 
-  CharToOem(szTmp, szNode);
-  return(res);
-}
 
 LPTSTR GetNodeTypeName(UINT NodeType)
 {
@@ -44,27 +33,27 @@ LPTSTR GetNodeTypeName(UINT NodeType)
     switch (NodeType)
     {
         case 1:
-            if (!LoadStringAndOem(hInstance, IDS_BCAST, szNode,  sizeof(szNode)))
+            if (!LoadString(hInstance, IDS_BCAST, szNode, sizeof(szNode)))
                 return NULL;
             break;
 
         case 2:
-            if (!LoadStringAndOem(hInstance, IDS_P2P, szNode,  sizeof(szNode)))
+            if (!LoadString(hInstance, IDS_P2P, szNode, sizeof(szNode)))
                 return NULL;
             break;
 
         case 4:
-            if (!LoadStringAndOem(hInstance, IDS_MIXED, szNode,  sizeof(szNode)))
+            if (!LoadString(hInstance, IDS_MIXED, szNode,  sizeof(szNode)))
                 return NULL;
             break;
 
         case 8:
-            if (!LoadStringAndOem(hInstance, IDS_HYBRID, szNode,  sizeof(szNode)))
+            if (!LoadString(hInstance, IDS_HYBRID, szNode,  sizeof(szNode)))
                 return NULL;
             break;
 
         default :
-            if (!LoadStringAndOem(hInstance, IDS_UNKNOWN, szNode,  sizeof(szNode)))
+            if (!LoadString(hInstance, IDS_UNKNOWN, szNode,  sizeof(szNode)))
                 return NULL;
             break;
     }
@@ -80,42 +69,42 @@ LPTSTR GetInterfaceTypeName(UINT InterfaceType)
     switch (InterfaceType)
     {
         case MIB_IF_TYPE_OTHER:
-            if (!LoadStringAndOem(hInstance, IDS_OTHER, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_OTHER, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
 
         case MIB_IF_TYPE_ETHERNET:
-            if (!LoadStringAndOem(hInstance, IDS_ETH, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_ETH, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
 
         case MIB_IF_TYPE_TOKENRING:
-            if (!LoadStringAndOem(hInstance, IDS_TOKEN, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_TOKEN, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
 
         case MIB_IF_TYPE_FDDI:
-            if (!LoadStringAndOem(hInstance, IDS_FDDI, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_FDDI, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
 
         case MIB_IF_TYPE_PPP:
-            if (!LoadStringAndOem(hInstance, IDS_PPP, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_PPP, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
 
         case MIB_IF_TYPE_LOOPBACK:
-            if (!LoadStringAndOem(hInstance, IDS_LOOP, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_LOOP, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
 
         case MIB_IF_TYPE_SLIP:
-            if (!LoadStringAndOem(hInstance, IDS_SLIP, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_SLIP, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
 
         default:
-            if (!LoadStringAndOem(hInstance, IDS_UNKNOWN, szIntType, sizeof(szIntType)))
+            if (!LoadString(hInstance, IDS_UNKNOWN, szIntType, sizeof(szIntType)))
                 return NULL;
             break;
     }
@@ -164,7 +153,6 @@ LPTSTR GetConnectionType(LPTSTR lpClass)
 {
     HKEY hKey = NULL;
     LPTSTR ConType = NULL;
-    LPTSTR ConTypeTmp = NULL;
     TCHAR Path[256];
     LPTSTR PrePath  = _T("SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\");
     LPTSTR PostPath = _T("\\Connection");
@@ -192,34 +180,24 @@ LPTSTR GetConnectionType(LPTSTR lpClass)
                            NULL,
                            &dwDataSize) == ERROR_SUCCESS)
         {
-            ConTypeTmp = (LPTSTR)HeapAlloc(ProcessHeap,
-                                        0,
-                                        dwDataSize);
-
             ConType = (LPTSTR)HeapAlloc(ProcessHeap,
                                         0,
                                         dwDataSize);
-            if (ConType && ConTypeTmp)
+            if (ConType)
             {
                 if(RegQueryValueEx(hKey,
                                    _T("Name"),
                                    NULL,
                                    &dwType,
-                                   (PBYTE)ConTypeTmp,
+                                   (PBYTE)ConType,
                                    &dwDataSize) != ERROR_SUCCESS)
                 {
                     HeapFree(ProcessHeap,
                              0,
                              ConType);
 
-                    HeapFree(ProcessHeap,
-                             0,
-                             ConTypeTmp);
-
                     ConType = NULL;
                 }
-
-                if (ConType) CharToOem(ConTypeTmp, ConType);
             }
         }
     }
@@ -696,7 +674,7 @@ VOID Usage(VOID)
             if (lpUsage == NULL)
                 return;
 
-            if (LoadStringAndOem(hInstance,
+            if (LoadString(hInstance,
                            IDS_USAGE,
                            lpUsage,
                            Size))

base/applications/network/tracert/tracert.c

@@ -422,7 +422,7 @@ AllocateBuffers(PAPPINFO pInfo)
 
     pInfo->RecvPacket = (PIPv4_HEADER)HeapAlloc(GetProcessHeap(),
                                                 0,
-                                                MAX_PING_PACKET_SIZE);
+                                                sizeof(IPv4_HEADER) + PACKET_SIZE);
     if (!pInfo->RecvPacket)
     {
         HeapFree(GetProcessHeap(),

base/applications/rapps/rapps/7zip.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = 7-Zip
-Version = 9.20
+Version = 4.65
 Licence = LGPL
 Description = Utility to create and open 7zip, zip, tar, rar and other archive files.
-Size = 1.0M
+Size = 0.9M
 Category = 12
 URLSite = http://www.7-zip.org/
-URLDownload = http://ovh.dl.sourceforge.net/project/sevenzip/7-Zip/9.20/7z920.exe
+URLDownload = http://ovh.dl.sourceforge.net/project/sevenzip/7-Zip/4.65/7z465.exe
 CDPath = none
 
 [Section.0407]
@@ -17,8 +17,5 @@ Description = Tool zum Erstellen und Öffnen von 7zip, zip, tar, rar und andrern
 [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 та інших архівних файлів.

base/applications/rapps/rapps/abyss.txt

@@ -14,10 +14,5 @@ CDPath = none
 [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.

base/applications/rapps/rapps/comctl32ocx.txt

@@ -21,7 +21,7 @@ Description = X es necesario para varias aplicaciones.
 
 [Section.0415]
 Licence = Nieznana
-Description = Microsoft Visual Basic 6.0 Common Controls jest używany przez część aplikacji.
+Description = X jest używana przez część aplikacji.
 
 [Section.0422]
 Licence = Невідома

base/applications/rapps/rapps/dosblaster.txt

@@ -17,8 +17,5 @@ Description = DosBlaster ist eine Shell Extension, die es ermöglicht jede DOS A
 [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.

base/applications/rapps/rapps/fap.txt

@@ -14,8 +14,5 @@ CDPath = none
 [Section.0407]
 Description = Kleiner und einfacher Mediaplayer.
 
-[Section.0415]
-Description = Prosty i lekki odtwarzacz audio.
-
 [Section.0422]
 Description = Простий та маленький програвач аудіо файлів.

base/applications/rapps/rapps/firefox36.txt

@@ -2,47 +2,47 @@
 
 [Section]
 Name = Mozilla Firefox 3.6
-Version = 3.6.12
+Version = 3.6.10
 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.12/win32/en-US/Firefox%20Setup%203.6.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/en-US/Firefox%20Setup%203.6.10.exe
 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.12/win32/de/Firefox%20Setup%203.6.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/de/Firefox%20Setup%203.6.10.exe
 
 [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.12/win32/es-ES/Firefox%20Setup%203.6.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/es-ES/Firefox%20Setup%203.6.10.exe
 
 [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.12/win32/nb-NO/Firefox%20Setup%203.6.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/nb-NO/Firefox%20Setup%203.6.10.exe
 
 [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.12/win32/pl/Firefox%20Setup%203.6.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/pl/Firefox%20Setup%203.6.10.exe
 
 [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.12/win32/ru/Firefox%20Setup%203.6.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/ru/Firefox%20Setup%203.6.10.exe
 
 [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.12/win32/uk/Firefox%20Setup%203.6.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/uk/Firefox%20Setup%203.6.10.exe

base/applications/rapps/rapps/go-oo.txt

@@ -18,7 +18,7 @@ Description = Open Source Office Suite, basierend auf Open Office, aber viel bes
 Description = La suite de ofimática de código abierto.
 
 [Section.0415]
-Description = Otwarty pakiet biurowy, bazujący na Open Office, ale znacznie lepszy.
+Description = Otwarty pakiet biurowy.
 
 [Section.0422]
 Description = Відкритий офісний пакет.

base/applications/rapps/rapps/kdewin.txt

@@ -14,8 +14,5 @@ CDPath = none
 [Section.0407]
 Description = KDE für Windows.
 
-[Section.0415]
-Description = KDE dla Windows.
-
 [Section.0422]
 Description = KDE для Windows.

base/applications/rapps/rapps/libreoffice.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = LibreOffice
-Version = 3.3.0 Beta 3
+Version = 3.3.0 Beta 1
 Licence = LGPL
 Description = Former called OpenOffice. Open Source Office Suite.
-Size = 300.0MB
+Size = 138.0MB
 Category = 6
 URLSite = http://www.documentfoundation.org/
-URLDownload = http://download.documentfoundation.org/libreoffice/testing/3.3.0-beta3/win/x86/LibO_3.3.0_Win_x86_install_multi.exe
+URLDownload = http://download.documentfoundation.org/libreoffice/testing/LO_3.3.0-beta1_Win_x86_install_en-US.exe
 CDPath = none
 
 [Section.0407]

base/applications/rapps/rapps/mirandaim.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = Miranda IM
-Version = 0.9.11
+Version = 0.9.5
 Licence = GPL
 Description = Open source multiprotocol instant messaging application - May not work completely.
-Size = 3.0MB
+Size = 2.2MB
 Category = 5
 URLSite = http://www.miranda-im.org/
-URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.11-unicode.exe
+URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.5-unicode.exe
 CDPath = none
 
 [Section.0407]

base/applications/rapps/rapps/mirc.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = mIRC
-Version = 7.15
+Version = 7.1
 Licence = Shareware
 Description = The most popular client for the Internet Relay Chat (IRC).
-Size = 2.0M
+Size = 1.8M
 Category = 5
 URLSite = http://www.mirc.com/
-URLDownload = http://download.mirc.com/mirc715.exe
+URLDownload = http://download.mirc.com/mirc71.exe
 CDPath = none
 
 [Section.0407]

base/applications/rapps/rapps/mono2.txt

@@ -2,17 +2,14 @@
 
 [Section]
 Name = Mono .net Development Framework
-Version = 2.8.1
+Version = 2.6.7
 Licence = Unknown
 Description = Open Source .net Framework.
-Size = 77MB
+Size = 72MB
 Category = 14
 URLSite = http://www.mono-project.com/Main_Page
-URLDownload = http://ftp.novell.com/pub/mono/archive/2.8.1/windows-installer/3/mono-2.8.1-gtksharp-2.12.10-win32-3.exe
+URLDownload = http://ftp.novell.com/pub/mono/archive/2.6.7/windows-installer/2/mono-2.6.7-gtksharp-2.12.10-win32-2.exe
 CDPath = none
 
-[Section.0415]
-Description = Pakiet Mono .net Framework dla Programistów.
-
 [Section.0422]
 Description = Відкритий .net Фреймворк.

base/applications/rapps/rapps/mpc.txt

@@ -20,8 +20,5 @@ Description = Reproductor multimedia.
 [Section.0419]
 Description = Мультимедийный проигрыватель.
 
-[Section.0415]
-Description = Odtwarzacz multimediów.
-
 [Section.0422]
 Description = Мультимедійний програвач.

base/applications/rapps/rapps/net11.txt

@@ -10,6 +10,3 @@ Category = 14
 URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyId=262D25E3-F589-4842-8157-034D1E7CF3A3
 URLDownload = http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203e74006/dotnetfx.exe
 CDPath = none
-
-[Section.0415]
-Description = Microsoft .NET Framework Wersja 1.1 - Pakiet Dystrybucyjny.

base/applications/rapps/rapps/net20.txt

@@ -10,6 +10,3 @@ Category = 14
 URLSite = http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d-8edd-aab15c5e04f5
 URLDownload = http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-52154438565a/dotnetfx.exe
 CDPath = none
-
-[Section.0415]
-Description = Microsoft .NET Framework Wersja 2.0 - Pakiet Dystrybucyjny.

base/applications/rapps/rapps/net20sp2.txt

@@ -10,6 +10,3 @@ Category = 14
 URLSite = http://www.microsoft.com/downloads/details.aspx?familyid=5B2C0358-915B-4EB5-9B1D-10E506DA9D0F
 URLDownload = http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe
 CDPath = none
-
-[Section.0415]
-Description = Microsoft .NET Framework Wersja 2.0 Service Pack 2.

base/applications/rapps/rapps/openttd.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = OpenTTD
-Version = 1.0.5
+Version = 1.0.4
 Licence = GPL v2
 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.
 Size = 3.4MB
 Category = 4
 URLSite = http://www.openttd.org/
-URLDownload = http://cz.binaries.openttd.org/openttd/binaries/releases/1.0.5/openttd-1.0.5-windows-win32.exe
+URLDownload = http://cz.binaries.openttd.org/openttd/binaries/releases/1.0.4/openttd-1.0.4-windows-win32.exe
 CDPath = none
 
 [Section.0407]

base/applications/rapps/rapps/opera.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = Opera
-Version = 10.63
+Version = 10.62
 Licence = Freeware
 Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.
 Size = 12.7M
 Category = 5
 URLSite = http://www.opera.com/
-URLDownload = http://get4.opera.com/pub/opera/win/1063/int/Opera_1063_int_Setup.exe
+URLDownload = http://get4.opera.com/pub/opera/win/1062/int/Opera_1062_int_Setup.exe
 CDPath = none
 
 [Section.0407]

base/applications/rapps/rapps/python.txt

@@ -14,9 +14,5 @@ CDPath = none
 [Section.0407]
 Description = Eine sehr mächtige, dynamische Programmiersprache.
 
-
-[Section.0415]
-Description = Potęży i dynamiczny język programowania.
-
 [Section.0422]
 Description = Дуже потужна динамічна мова програмування.

base/applications/rapps/rapps/remood.txt

@@ -14,8 +14,5 @@ CDPath = none
 [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ą stabilnością. 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. Його метою Ñ” додати нові можливоÑ<C2BE>Ñ‚Ñ– та Ñ<>табільніÑ<E28093>Ñ‚ÑŒ до доÑ<C2BE>віду клаÑ<C2B0>ичного 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).

base/applications/rapps/rapps/scite.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = SciTE
-Version = 2.22
+Version = 2.21
 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.22/Sc222.exe
+URLDownload = http://kent.dl.sourceforge.net/project/scintilla/SciTE/2.21/Sc221.exe
 CDPath = none
 
 [Section.0407]
@@ -17,8 +17,5 @@ Description = SciTE ist ein SCIntilla basierter Text Editor. Ursprünglich wurde
 [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, але виріс до редактора загального користування з засобами збирання та запуску програм.

base/applications/rapps/rapps/scummvm.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = ScummVM
-Version = 1.2.0
+Version = 1.1.1
 Licence = GPL
 Description = Sam and Max, Day of the Tentacle, etc on ReactOS.
-Size = 3.5MB
+Size = 3.3MB
 Category = 4
 URLSite = http://scummvm.org/
-URLDownload = http://dfn.dl.sourceforge.net/project/scummvm/scummvm/1.2.0/scummvm-1.2.0-win32.exe
+URLDownload = http://dfn.dl.sourceforge.net/project/scummvm/scummvm/1.1.1/scummvm-1.1.1-win32.exe
 CDPath = none
 
 [Section.0407]

base/applications/rapps/rapps/seamonkey.txt

@@ -2,31 +2,31 @@
 
 [Section]
 Name = Mozilla SeaMonkey
-Version = 2.0.10
+Version = 2.0.8
 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.10/win32/en-US/SeaMonkey%20Setup%202.0.10.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/en-US/SeaMonkey%20Setup%202.0.8.exe
 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.10/win32/de/SeaMonkey%20Setup%202.0.10.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/de/SeaMonkey%20Setup%202.0.8.exe
 
 [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.10/win32/es-ES/SeaMonkey%20Setup%202.0.10.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/es-ES/SeaMonkey%20Setup%202.0.8.exe
 
 [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.10/win32/pl/SeaMonkey%20Setup%202.0.10.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/pl/SeaMonkey%20Setup%202.0.8.exe
 
 [Section.0419]
 Description = Продолжение Mozilla Suite. Включает браузер, почтовый клиент, IRC-клиент и HTML-редактор.
 Size = 10.4MB
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.10/win32/ru/SeaMonkey%20Setup%202.0.10.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/ru/SeaMonkey%20Setup%202.0.8.exe

base/applications/rapps/rapps/steam.txt

@@ -14,8 +14,5 @@ CDPath = none
 [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 = Ігрова платформа, що використовується багатьма іграми.

base/applications/rapps/rapps/superfinder.txt

@@ -13,6 +13,3 @@ CDPath = none
 
 [Section.0407]
 Description = Eine schnelle und effektive Suchanwendung.
-
-[Section.0415]
-Description = Szybka i bogata w opcje aplikacja szukająca.

base/applications/rapps/rapps/tahoma.txt

@@ -15,9 +15,6 @@ CDPath = none
 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).

base/applications/rapps/rapps/thunderbird.txt

@@ -2,41 +2,41 @@
 
 [Section]
 Name = Mozilla Thunderbird
-Version = 3.1.6
+Version = 3.1.4
 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.6/win32/en-US/Thunderbird%20Setup%203.1.6.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win32/en-US/Thunderbird%20Setup%203.1.4.exe
 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.6/win32/de/Thunderbird%20Setup%203.1.6.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win32/de/Thunderbird%20Setup%203.1.4.exe
 
 [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.6/win32/es-ES/Thunderbird%20Setup%203.1.6.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win32/es-ES/Thunderbird%20Setup%203.1.4.exe
 
 [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.6/win32/pl/Thunderbird%20Setup%203.1.6.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win32/pl/Thunderbird%20Setup%203.1.4.exe
 
 [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.6/win32/ru/Thunderbird%20Setup%203.1.6.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win32/ru/Thunderbird%20Setup%203.1.4.exe
 
 [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.6/win32/uk/Thunderbird%20Setup%203.1.6.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win32/uk/Thunderbird%20Setup%203.1.4.exe

base/applications/rapps/rapps/ultravnc.txt

@@ -2,20 +2,17 @@
 
 [Section]
 Name = UltraVNC
-Version = 1.0.9.1
+Version = 1.0.8.2
 Licence = GPL
 Description = Open-source VNC client/server.
-Size = 2.0MB
+Size = 1.9MB
 Category = 5
 URLSite = http://www.uvnc.com/
-URLDownload = http://support1.uvnc.com/download/109/UltraVNC_1.0.9.1_Setup.exe
+URLDownload = http://support1.uvnc.com/download/1082/UltraVNC_1.0.8.2_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 клієнт/сервер.

base/applications/rapps/rapps/utorrent.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = µTorrent
-Version = 2.2
+Version = 2.0.4
 Licence = Freeware for non-commercial uses
 Description = Small and fast BitTorrent Client.
-Size = 385K
+Size = 320K
 Category = 5
 URLSite = http://www.utorrent.com/
-URLDownload = http://download.utorrent.com/2.2/utorrent.exe
+URLDownload = http://download.utorrent.com/2.0.4/utorrent.exe
 CDPath = none
 
 

base/applications/rapps/rapps/vlc.txt

@@ -2,13 +2,13 @@
 
 [Section]
 Name = VLC media player
-Version = 1.1.5
+Version = 1.1.4
 Licence = GPL
 Description = A media player.
-Size = 19.1MB
+Size = 18.7MB
 Category = 1
 URLSite = http://www.videolan.org/vlc/
-URLDownload = http://ignum.dl.sourceforge.net/project/vlc/1.1.5/win32/vlc-1.1.5-win32.exe
+URLDownload = http://ignum.dl.sourceforge.net/project/vlc/1.1.4/win32/vlc-1.1.4-win32.exe
 CDPath = none
 
 [Section.0407]
@@ -20,8 +20,5 @@ Description = Reproductor multimedia.
 [Section.0419]
 Description = Мультимедийный проигрыватель.
 
-[Section.0415]
-Description = Odtwarzacz multimediów.
-
 [Section.0422]
 Description = Мультимедійний програвач.

base/applications/regedit/childwnd.c

@@ -67,21 +67,19 @@ static void draw_splitbar(HWND hWnd, int x)
 
 static void ResizeWnd(ChildWnd* pChildWnd, int cx, int cy)
 {
-    HDWP hdwp = BeginDeferWindowPos(3);
+    HDWP hdwp = BeginDeferWindowPos(2);
-    RECT rt, rs, rb;
+    RECT rt, rs;
-    const int tHeight = 18;
+
     SetRect(&rt, 0, 0, cx, cy);
     cy = 0;
     if (hStatusBar != NULL) {
         GetWindowRect(hStatusBar, &rs);
-        cy = rs.bottom - rs.top;
+        cy = rs.bottom - rs.top + 8;
     }
-    GetWindowRect(pChildWnd->hAddressBtnWnd, &rb);
     cx = pChildWnd->nSplitPos + SPLIT_WIDTH/2;
-    DeferWindowPos(hdwp, pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left - tHeight-2, tHeight, SWP_NOZORDER|SWP_NOACTIVATE);
+	DeferWindowPos(hdwp, pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left, 23, SWP_NOZORDER|SWP_NOACTIVATE);
-    DeferWindowPos(hdwp, pChildWnd->hAddressBtnWnd, 0, rt.right - tHeight, rt.top, tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE);
+    DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top + 25, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
-    DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top + tHeight+2, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
+    DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx  , rt.top + 25, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
-    DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx, rt.top + tHeight+2, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
     EndDeferWindowPos(hdwp);
 }
 
@@ -261,7 +259,7 @@ static void SuggestKeys(HKEY hRootKey, LPCTSTR pszKeyPath, LPTSTR pszSuggestions
 		/* Check CLSID key */
 		if (RegOpenKey(hRootKey, pszKeyPath, &hSubKey) == ERROR_SUCCESS)
 		{
-			if (QueryStringValue(hSubKey, TEXT("CLSID"), NULL, szBuffer,
+			if (QueryStringValue(hSubKey, TEXT("CLSID"), NULL, szBuffer, 
 			                     COUNT_OF(szBuffer)) == ERROR_SUCCESS)
 			{
 				lstrcpyn(pszSuggestions, TEXT("HKCR\\CLSID\\"), (int) iSuggestionsLength);
@@ -326,35 +324,29 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
         /* load "My Computer" string */
         LoadString(hInst, IDS_MY_COMPUTER, buffer, sizeof(buffer)/sizeof(TCHAR));
 
-        g_pChildWnd = pChildWnd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ChildWnd));
+	    g_pChildWnd = pChildWnd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ChildWnd));
 
         if (!pChildWnd) return 0;
         _tcsncpy(pChildWnd->szPath, buffer, MAX_PATH);
         pChildWnd->nSplitPos = 250;
         pChildWnd->hWnd = hWnd;
-        pChildWnd->hAddressBarWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Edit"), NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP,
+		pChildWnd->hAddressBarWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Edit"), NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP,
 										CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
 										hWnd, (HMENU)0, hInst, 0);
-        pChildWnd->hAddressBtnWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Button"), _T("»"), WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP | BS_DEFPUSHBUTTON,
-                                        CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
-                                        hWnd, (HMENU)0, hInst, 0);
 		pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, (HMENU) TREE_WINDOW);
         pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW/*, pChildWnd->szPath*/);
         SetFocus(pChildWnd->hTreeWnd);
 
-        /* set the address bar and button font */
+        /* set the address bar font */
-        if ((pChildWnd->hAddressBarWnd) && (pChildWnd->hAddressBtnWnd))
+        if (pChildWnd->hAddressBarWnd)
         {
             hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
             SendMessage(pChildWnd->hAddressBarWnd,
                         WM_SETFONT,
                         (WPARAM)hFont,
                         0);
-            SendMessage(pChildWnd->hAddressBtnWnd,
-                        WM_SETFONT,
-                        (WPARAM)hFont,
-                        0);
         }
+
 		/* Subclass the AddressBar */
 		oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_WNDPROC);
         SetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_USERDATA, (DWORD_PTR)oldproc);
@@ -362,10 +354,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 		break;
     }
     case WM_COMMAND:
-        if(HIWORD(wParam) == BN_CLICKED){
+        if (!_CmdWndProc(hWnd, message, wParam, lParam)) {
-            PostMessage(pChildWnd->hAddressBarWnd, WM_KEYUP, VK_RETURN, 0);
-        }
-        else if (!_CmdWndProc(hWnd, message, wParam, lParam)) {
             goto def;
         }
         break;
@@ -488,28 +477,10 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 			rootName = get_root_key_name(hRootKey);
 			fullPath = HeapAlloc(GetProcessHeap(), 0, (_tcslen(rootName) + 1 + _tcslen(keyPath) + 1) * sizeof(TCHAR));
 			if (fullPath) {
-			    /* set (correct) the address bar text */
+			    _stprintf(fullPath, _T("%s\\%s"), rootName, keyPath);
-                if(keyPath[0] != '\0')
-                    _stprintf(fullPath, _T("%s\\%s"), rootName, keyPath);
-                else
-                    fullPath = _tcscpy(fullPath, rootName);
 			    SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)fullPath);
 				SendMessage(pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath);
-                HeapFree(GetProcessHeap(), 0, fullPath);
+			    HeapFree(GetProcessHeap(), 0, fullPath);
-                /* disable hive manipulation items temporarily (enable only if necessary) */
-                EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_GRAYED);
-                EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_GRAYED);
-				/* compare the strings to see if we should enable/disable the "Load Hive" menus accordingly */
-				if (!(_tcsicmp(rootName, TEXT("HKEY_LOCAL_MACHINE")) &&
-                      _tcsicmp(rootName, TEXT("HKEY_USERS"))))
-                {
-                    // enable the unload menu item if at the root
-                    // otherwise enable the load menu item if there is no slash in keyPath (ie. immediate child selected)
-				    if(keyPath[0] == '\0')
-                        EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_ENABLED);
-				    else if(!_tcschr(keyPath, _T('\\')))
-                        EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_ENABLED);
-				}
 
 			    {
 			        HKEY hKey;

base/applications/regedit/edit.c

@@ -59,10 +59,19 @@ void error(HWND hwnd, INT resId, ...)
 
 static void error_code_messagebox(HWND hwnd, DWORD error_code)
 {
+    LPTSTR lpMsgBuf;
+    DWORD status;
     TCHAR title[256];
+    static const TCHAR fallback[] = TEXT("Error displaying error message.\n");
     if (!LoadString(hInst, IDS_ERROR, title, COUNT_OF(title)))
         lstrcpy(title, TEXT("Error"));
-    ErrorMessageBox(hwnd, title, error_code);
+    status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+                           NULL, error_code, 0, (LPTSTR)&lpMsgBuf, 0, NULL);
+    if (!status)
+        lpMsgBuf = (LPTSTR)fallback;
+    MessageBox(hwnd, lpMsgBuf, title, MB_OK | MB_ICONERROR);
+    if (lpMsgBuf != fallback)
+        LocalFree(lpMsgBuf);
 }
 
 void warning(HWND hwnd, INT resId, ...)

base/applications/regedit/error.c

@@ -1,14 +0,0 @@
-#include <regedit.h>
-void ErrorMessageBox(HWND hWnd, LPCTSTR title, DWORD code)
-{
-    LPTSTR lpMsgBuf;
-    DWORD status;
-    static const TCHAR fallback[] = TEXT("Error displaying error message.\n");
-    status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                           NULL, code, 0, (LPTSTR)&lpMsgBuf, 0, NULL);
-    if (!status)
-        lpMsgBuf = (LPTSTR)fallback;
-    MessageBox(hWnd, lpMsgBuf, title, MB_OK | MB_ICONERROR);
-    if (lpMsgBuf != fallback)
-        LocalFree(lpMsgBuf);
-}

base/applications/regedit/framewnd.c

@@ -282,105 +282,6 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME* pofn)
     return TRUE;
 }
 
-static INT_PTR CALLBACK LoadHive_KeyNameInHookProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    static LPTSTR sKey = NULL;
-    static INT sLength = 0;
-    switch(uMsg)
-    {
-     case WM_INITDIALOG:
-        sKey = (LPTSTR)lParam;
-        sLength = 128; /* FIXME: Ugly hack! */
-     case WM_COMMAND:
-        switch(LOWORD(wParam))
-        {
-         case IDOK:
-            if(GetDlgItemText(hWndDlg, IDC_EDIT_KEY, sKey, sLength))
-                return EndDialog(hWndDlg, -1);
-            else
-                return EndDialog(hWndDlg, 0);
-         case IDCANCEL:
-            return EndDialog(hWndDlg, 0);
-        }
-        break;
-    }
-    return FALSE;
-}
-
-static BOOL LoadHive(HWND hWnd)
-{
-    OPENFILENAME ofn;
-    TCHAR Caption[128];
-    LPCTSTR pszKeyPath;
-    TCHAR xPath[128];
-    HKEY hRootKey;
-    TCHAR Filter[1024];
-    FILTERPAIR filter;
-    /* get the item key to load the hive in */
-    pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey);
-    /* initialize the "open file" dialog */
-    InitOpenFileName(hWnd, &ofn);
-    /* build the "All Files" filter up */
-    filter.DisplayID = IDS_FLT_ALLFILES;
-    filter.FilterID = IDS_FLT_ALLFILES_FLT;
-    BuildFilterStrings(Filter, &filter, sizeof(filter));
-    ofn.lpstrFilter = Filter;
-    /* load and set the caption and flags for dialog */
-    LoadString(hInst, IDS_LOAD_HIVE, Caption, COUNT_OF(Caption));
-    ofn.lpstrTitle = Caption;
-    ofn.Flags |= OFN_ENABLESIZING;
-    /*    ofn.lCustData = ;*/
-    /* now load the hive */
-    if (GetOpenFileName(&ofn))
-    {
-        if(DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_LOADHIVE), hWnd, &LoadHive_KeyNameInHookProc, (LPARAM)xPath))
-        {
-            LONG regLoadResult = RegLoadKey(hRootKey, xPath, ofn.lpstrFile);
-            if(regLoadResult == ERROR_SUCCESS)
-            {
-                /* refresh tree and list views */
-                RefreshTreeView(g_pChildWnd->hTreeWnd);
-                pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey);
-                RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath);
-            }
-            else
-            {
-                ErrorMessageBox(hWnd, Caption, regLoadResult);
-                return FALSE;
-            }
-        }
-    } else {
-        CheckCommDlgError(hWnd);
-    }
-    return TRUE;
-}
-
-static BOOL UnloadHive(HWND hWnd)
-{
-    TCHAR Caption[128];
-    LPCTSTR pszKeyPath;
-    HKEY hRootKey;
-    /* get the item key to unload */
-    pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey);
-    /* load and set the caption and flags for dialog */
-    LoadString(hInst, IDS_UNLOAD_HIVE, Caption, COUNT_OF(Caption));
-    /* now unload the hive */
-    LONG regUnloadResult = RegUnLoadKey(hRootKey, pszKeyPath);
-    if(regUnloadResult == ERROR_SUCCESS)
-    {
-        /* refresh tree and list views */
-        RefreshTreeView(g_pChildWnd->hTreeWnd);
-        pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey);
-        RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath);
-    }
-    else
-    {
-        ErrorMessageBox(hWnd, Caption, regUnloadResult);
-        return FALSE;
-    }
-    return TRUE;
-}
-
 static BOOL ImportRegistryFile(HWND hWnd)
 {
     OPENFILENAME ofn;
@@ -415,6 +316,7 @@ static BOOL ImportRegistryFile(HWND hWnd)
     return TRUE;
 }
 
+
 static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)
 {
     HWND hwndExportAll;
@@ -495,7 +397,7 @@ BOOL ExportRegistryFile(HWND hWnd)
     if (GetSaveFileName(&ofn)) {
         BOOL result;
         DWORD format;
-
+ 
         if (ofn.nFilterIndex == 1)
             format = REG_FORMAT_5;
         else
@@ -856,12 +758,6 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     UNREFERENCED_PARAMETER(message);
 
     switch (LOWORD(wParam)) {
-    case ID_REGISTRY_LOADHIVE:
-        LoadHive(hWnd);
-        return TRUE;
-    case ID_REGISTRY_UNLOADHIVE:
-        UnloadHive(hWnd);
-        return TRUE;
     case ID_REGISTRY_IMPORTREGISTRYFILE:
         ImportRegistryFile(hWnd);
         return TRUE;

base/applications/regedit/lang/bg-BG.rc

@@ -177,16 +177,6 @@ END
 /*
  * 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 |
@@ -286,10 +276,6 @@ BEGIN
     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
@@ -346,8 +332,6 @@ BEGIN
     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
 

base/applications/regedit/lang/cs-CZ.rc

@@ -175,16 +175,6 @@ END
 /*
  * 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 |
@@ -284,10 +274,6 @@ BEGIN
     ID_REGISTRY_IMPORTREGISTRYFILE "Importuje textový soubor do registru"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Exportuje všechny čá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
@@ -344,8 +330,6 @@ BEGIN
     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
 

base/applications/regedit/lang/de-DE.rc

@@ -177,16 +177,6 @@ END
 /*
  * 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 |
@@ -286,10 +276,6 @@ BEGIN
     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
@@ -346,8 +332,6 @@ BEGIN
     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
 

base/applications/regedit/lang/el-GR.rc

@@ -177,16 +177,6 @@ END
 /*
  * 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 |
@@ -286,10 +276,6 @@ BEGIN
     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
@@ -346,8 +332,6 @@ BEGIN
     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
 

base/applications/regedit/lang/en-US.rc

@@ -274,10 +274,6 @@ BEGIN
     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
@@ -334,8 +330,6 @@ BEGIN
     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
 
@@ -398,20 +392,6 @@ BEGIN
    EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12
 END
 
-//
-// Dialog resources
-//
-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_ADDFAVORITES DIALOGEX DISCARDABLE  0, 0, 186, 46
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Add to Favorites"

base/applications/regedit/lang/es-ES.rc

@@ -180,16 +180,6 @@ END
 /*
  * 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 |
@@ -289,10 +279,6 @@ BEGIN
     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
@@ -349,8 +335,6 @@ BEGIN
     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
 

base/applications/regedit/lang/fr-FR.rc

@@ -180,16 +180,6 @@ END
 /*
  * 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 |
@@ -289,10 +279,6 @@ BEGIN
     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
@@ -349,8 +335,6 @@ BEGIN
     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
 

base/applications/regedit/lang/hu-HU.rc

@@ -178,16 +178,6 @@ END
 /*
  * 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 |
@@ -287,10 +277,6 @@ BEGIN
     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
@@ -347,8 +333,6 @@ BEGIN
     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
 

base/applications/regedit/lang/id-ID.rc

@@ -177,16 +177,6 @@ END
 /*
  * 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 |
@@ -286,10 +276,6 @@ BEGIN
     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
@@ -346,8 +332,6 @@ BEGIN
     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
 

base/applications/regedit/lang/it-IT.rc

@@ -180,16 +180,6 @@ END
 /*
  * 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 |
@@ -291,10 +281,6 @@ BEGIN
     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
@@ -351,8 +337,6 @@ BEGIN
     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
 

base/applications/regedit/lang/ja-JP.rc

@@ -175,16 +175,6 @@ END
 /*
  * 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 |
@@ -284,10 +274,6 @@ BEGIN
     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
@@ -344,8 +330,6 @@ BEGIN
     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
 

base/applications/regedit/lang/ko-KR.rc

@@ -162,16 +162,6 @@ END
 /*
  * 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 |
@@ -271,10 +261,6 @@ BEGIN
     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
@@ -331,8 +317,6 @@ BEGIN
     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
 

base/applications/regedit/lang/nl-NL.rc

@@ -177,16 +177,6 @@ END
 /*
  * 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 |
@@ -286,10 +276,6 @@ BEGIN
     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
@@ -346,8 +332,6 @@ BEGIN
     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
 

base/applications/regedit/lang/no-NO.rc

@@ -177,16 +177,6 @@ END
 /*
  * 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 | 
@@ -286,10 +276,6 @@ BEGIN
     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
@@ -346,8 +332,6 @@ BEGIN
     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
 

base/applications/regedit/lang/pl-PL.rc

@@ -182,16 +182,6 @@ END
 /*
  * 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 |
@@ -291,10 +281,6 @@ BEGIN
     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
@@ -351,8 +337,6 @@ BEGIN
     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³aœciwa wartoœæ DWORD)"
 END
 

base/applications/regedit/lang/pt-BR.rc

@@ -178,16 +178,6 @@ END
 /*
  * 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 |
@@ -287,10 +277,6 @@ BEGIN
     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
@@ -347,8 +333,6 @@ BEGIN
     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
 

base/applications/regedit/lang/pt-PT.rc

@@ -277,10 +277,6 @@ BEGIN
     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
@@ -337,8 +333,6 @@ BEGIN
     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
 
@@ -390,16 +384,6 @@ END
 /*
  * 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 |

base/applications/regedit/lang/ru-RU.rc

@@ -177,16 +177,6 @@ END
 /*
  * 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
@@ -285,8 +275,6 @@ BEGIN
     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    "Подключается к реестру удалённого компьютера"
 
@@ -344,8 +332,6 @@ BEGIN
     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
 

base/applications/regedit/lang/sk-SK.rc

@@ -162,16 +162,6 @@ END
 /*
  * 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 |
@@ -271,10 +261,6 @@ BEGIN
     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
@@ -331,8 +317,6 @@ BEGIN
     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
 

base/applications/regedit/lang/sl-SI.rc

@@ -177,16 +177,6 @@ END
 /*
  * 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 |
@@ -286,10 +276,6 @@ BEGIN
     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
@@ -346,8 +332,6 @@ BEGIN
     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
 

base/applications/regedit/lang/sv-SE.rc

@@ -175,16 +175,6 @@ END
 /*
  * 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 |
@@ -284,10 +274,6 @@ BEGIN
     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
@@ -344,8 +330,6 @@ BEGIN
     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
 

base/applications/regedit/lang/th-TH.rc

@@ -177,16 +177,6 @@ END
 /*
  * 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 |
@@ -286,10 +276,6 @@ BEGIN
     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
@@ -346,8 +332,6 @@ BEGIN
     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
 

base/applications/regedit/lang/uk-UA.rc

@@ -178,16 +178,6 @@ END
 /*
  * 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 |
@@ -287,10 +277,6 @@ BEGIN
     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
@@ -347,8 +333,6 @@ BEGIN
     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
 

base/applications/regedit/lang/zh-CN.rc

@@ -177,16 +177,6 @@ END
 /*
  * 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 |
@@ -286,10 +276,6 @@ BEGIN
     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
@@ -346,8 +332,6 @@ BEGIN
     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
 

base/applications/regedit/listview.c

@@ -556,12 +556,18 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCTSTR keyPath)
         /*                } */
         /*                dwValSize = max_val_size; */
         while (RegEnumValue(hNewKey, dwIndex, ValName, &dwValNameLen, NULL, &dwValType, ValBuf, &dwValSize) == ERROR_SUCCESS) {
+            /* Remove unwanted path from key name */
+            TCHAR *pLastBl = _tcsrchr(ValName, TEXT('\\'));
+            if (pLastBl != NULL)
+                ++pLastBl;
+            else
+                pLastBl = ValName;
             /* Add a terminating 0 character. Usually this is only necessary for strings. */
             ValBuf[dwValSize] = 0;
 #ifdef UNICODE
             ValBuf[dwValSize + 1] = 0;
 #endif
-            AddEntryToList(hwndLV, ValName, dwValType, ValBuf, dwValSize, -1, TRUE);
+            AddEntryToList(hwndLV, pLastBl, dwValType, ValBuf, dwValSize, -1, TRUE);
             dwValNameLen = max_val_name_len;
             dwValSize = max_val_size;
             dwValType = 0L;

base/applications/regedit/main.h

@@ -58,7 +58,6 @@ typedef struct {
     HWND    hTreeWnd;
     HWND    hListWnd;
 	HWND    hAddressBarWnd;
-	HWND    hAddressBtnWnd;
     int     nFocusPanel;      /* 0: left  1: right */
     int	    nSplitPos;
     WINDOWPLACEMENT pos;
@@ -89,9 +88,6 @@ extern void ShowAboutBox(HWND hWnd);
 /* childwnd.c */
 extern LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM);
 
-/* error.c */
-extern void ErrorMessageBox(HWND hWnd, LPCTSTR title, DWORD code);
-
 /* find.c */
 extern void FindDialog(HWND hWnd);
 extern BOOL FindNext(HWND hWnd);

base/applications/regedit/regedit.rbuild

@@ -23,7 +23,6 @@
 	<file>hexedit.c</file>
 	<file>listview.c</file>
 	<file>main.c</file>
-	<file>error.c</file>
 	<file>regedit.c</file>
 	<file>regproc.c</file>
 	<file>security.c</file>

base/applications/regedit/resource.h

@@ -137,11 +137,9 @@
 #define IDS_ERR_RENVAL_CAPTION		32856
 #define IDS_ERR_RENVAL_TOEMPTY		32857
 #define IDS_BAD_KEY                     32858
-#define IDS_LOAD_HIVE           32859
-#define IDS_UNLOAD_HIVE         32860
 
-#define ID_EDIT_NEW_MULTISTRINGVALUE		32861
+#define ID_EDIT_NEW_MULTISTRINGVALUE		32860
-#define ID_EDIT_NEW_EXPANDABLESTRINGVALUE	32862
+#define ID_EDIT_NEW_EXPANDABLESTRINGVALUE	32861
 
 #define ID_SWITCH_PANELS                32871
 #define ID_EDIT_PERMISSIONS		32872
@@ -201,8 +199,6 @@
 #define IDC_EXPORT_BRANCH       2009
 #define IDC_EXPORT_BRANCH_TEXT  2010
 
-#define IDD_LOADHIVE				2500
-#define IDC_EDIT_KEY				2501
 
 #define IDC_FAVORITENAME                2011
 #define IDC_FAVORITESLIST               2012

base/applications/regedit/treeview.c

@@ -633,7 +633,7 @@ BOOL SelectNode(HWND hwndTV, LPCTSTR keyPath)
 	TVITEM tvi;
 
     /* Total no-good hack */
-    if (!_tcsnicmp(keyPath, _T("My Computer\\"), 12))
+    if (!_tcsncmp(keyPath, _T("My Computer\\"), 12))
         keyPath += 12;
 
 	hRoot = TreeView_GetRoot(hwndTV);
@@ -647,17 +647,17 @@ BOOL SelectNode(HWND hwndTV, LPCTSTR keyPath)
 		/* Special case for root to expand root key abbreviations */
 		if (hItem == hRoot)
 		{
-			if (!_tcsicmp(szPathPart, TEXT("HKCR")))
+			if (!_tcscmp(szPathPart, TEXT("HKCR")))
 				_tcscpy(szPathPart, TEXT("HKEY_CLASSES_ROOT"));
-			else if (!_tcsicmp(szPathPart, TEXT("HKCU")))
+			else if (!_tcscmp(szPathPart, TEXT("HKCU")))
 				_tcscpy(szPathPart, TEXT("HKEY_CURRENT_USER"));
-			else if (!_tcsicmp(szPathPart, TEXT("HKLM")))
+			else if (!_tcscmp(szPathPart, TEXT("HKLM")))
 				_tcscpy(szPathPart, TEXT("HKEY_LOCAL_MACHINE"));
-			else if (!_tcsicmp(szPathPart, TEXT("HKU")))
+			else if (!_tcscmp(szPathPart, TEXT("HKU")))
 				_tcscpy(szPathPart, TEXT("HKEY_USERS"));
-			else if (!_tcsicmp(szPathPart, TEXT("HKCC")))
+			else if (!_tcscmp(szPathPart, TEXT("HKCC")))
 				_tcscpy(szPathPart, TEXT("HKEY_CURRENT_CONFIG"));
-			else if (!_tcsicmp(szPathPart, TEXT("HKDD")))
+			else if (!_tcscmp(szPathPart, TEXT("HKDD")))
 				_tcscpy(szPathPart, TEXT("HKEY_DYN_DATA"));
 		}
 
@@ -672,7 +672,7 @@ BOOL SelectNode(HWND hwndTV, LPCTSTR keyPath)
 
 			(void)TreeView_GetItem(hwndTV, &tvi);
 
-			if (!_tcsicmp(szBuffer, szPathPart))
+			if (!_tcscmp(szBuffer, szPathPart))
 				break;
 		}
 

base/applications/taskmgr/lang/ru-RU.rc

@@ -641,10 +641,10 @@ BEGIN
     IDS_MSG_UNABLEDEBUGPROCESS    "Отладка процесса невозможна"
     IDS_MSG_WARNINGDEBUG          "ВНИМАНИЕ: Отладка этого процесса может закончиться потерей данных.\nВы уверены, что можно продолжать?"
     IDS_MSG_TASKMGRWARNING        "Ошибка Менеджера задач"
-    IDS_MSG_WARNINGTERMINATING    "ВНИМАНИЕ: Завершение процесса может повлечь неустойчивую работу системы и потерю данных\nСохраните важные данные перед продолжением.\nПродолжить завершение процесса?"
+    IDS_MSG_WARNINGTERMINATING    "ВНИМАНИЕ: Завершение процесса может повлеч неустойчивую работу системы и потерю данных\nСохраните важные данные перед продолжением.\nПродолжить завершение процесса?"
     IDS_MSG_UNABLETERMINATEPRO    "Не удалось завершить процесс"
     IDS_MSG_UNABLECHANGEPRIORITY  "Не удалось изменить приоритет"
-    IDS_MSG_WARNINGCHANGEPRIORITY "ВНИМАНИЕ: Изменение приоритета может повлечь неустойчивую работу и потерю данных.\nВы уверены, что можно продолжать?"
+    IDS_MSG_WARNINGCHANGEPRIORITY "ВНИМАНИЕ: Изменение приоритета может повлеч неустойчивую работу и потерю данных.\nВы уверены, что можно продолжать?"
     IDS_MSG_TRAYICONCPUUSAGE      "Загрузка ЦП: %d%%"
     IDS_STATUS_MEMUSAGE           "Выделение памяти: %dK / %dK"
     IDS_STATUS_CPUUSAGE           "Загрузка ЦП: %3d%%"

base/setup/usetup/lang/sk-SK.h

@@ -1,7 +1,7 @@
 /* TRANSLATOR:  M rio KaŸm r /Mario Kacmar/ aka Kario (kario@szm.sk)
  * DATE OF TR:  22-01-2008
  * Encoding  :  Latin II (852)
- * LastChange:  05-09-2010
+ * LastChange:  31-05-2010
  */
 
 #pragma once
@@ -993,13 +993,13 @@ static MUI_ENTRY skSKBootLoaderEntries[] =
     {
         8,
         12,
-        "Nainçtalovaś zav dzaź syst‚mu na pevně disk (MBR a VBR).",
+        "Install bootloader on the harddisk (MBR and VBR).",
         TEXT_STYLE_NORMAL
     },
     {
         8,
         13,
-        "Nainçtalovaś zav dzaź syst‚mu na pevně disk (iba VBR).",
+        "Install bootloader on the harddisk (VBR only).",
         TEXT_STYLE_NORMAL
     },
     {

base/shell/cmd/cmd.c

@@ -180,7 +180,7 @@ WORD wDefColor;           /* default color */
  * insert commas into a number
  */
 INT
-ConvertULargeInteger(ULONGLONG num, LPTSTR des, UINT len, BOOL bPutSeperator)
+ConvertULargeInteger(ULONGLONG num, LPTSTR des, INT len, BOOL bPutSeperator)
 {
 	TCHAR temp[39];   /* maximum length with nNumberGroups == 1 */
 	UINT  n, iTarget;

base/shell/cmd/cmd.h

@@ -99,7 +99,7 @@ INT cmd_cls (LPTSTR);
 
 
 /* Prototypes for CMD.C */
-INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, UINT len, BOOL bPutSeperator);
+INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, INT len, BOOL bPutSeperator);
 HANDLE RunFile(DWORD, LPTSTR, LPTSTR, LPTSTR, INT);
 INT ParseCommandLine(LPTSTR);
 struct _PARSED_COMMAND;

base/shell/cmd/console.c

@@ -131,7 +131,7 @@ static VOID ConWrite(TCHAR *str, DWORD len, DWORD nStdHandle)
 			error_out_of_memory();
 			return;
 		}
-		len = MultiByteToWideChar(OutputCodePage, 0, str, len, buffer, len);
+		len = MultiByteToWideChar(OutputCodePage, 0, str, len, buffer, len, NULL, NULL);
 		str = (PVOID)buffer;
 #endif
 		WriteFile(hOutput, str, len * sizeof(WCHAR), &dwWritten, NULL);

base/shell/cmd/lang/sk-SK.rc

@@ -1,9 +1,9 @@
 /* Slovak translation for CMD
  * TRANSLATOR:  Mário Kaèmár /Mario Kacmar/ aka Kario (kario@szm.sk)
  * DATE OF TR:  21-03-2009
- * LastChange:  10-08-2010
+ * LastChange:  21-06-2009
  * _________________________________________________________________
- * NOTE      :  this file is not fully translated
+ * NOTE      :  this file is not really translated (only scrap yet)
  */
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
@@ -118,7 +118,7 @@ dec  hex  name       dec  hex  name\n\
 6    6    Yellow     14   E    Bright Yellow\n\
 7    7    White      15   F    Bright White\n"
 
-STRING_COPY_HELP1,  "Prepísa<EFBFBD> %s (Yes/No/All)? "
+STRING_COPY_HELP1,  "Overwrite %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_HELP2, "\nZadajte nov
 
 STRING_DATE_HELP3, "\nZadajte nový dátum (rrrr%cmm%cdd): "
 
-STRING_DATE_HELP4, "Zobrazí alebo nastaví dátum.\n\n\
+STRING_DATE_HELP4, "Displays or sets the date.\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 @@ STRING_TITLE_HELP, "Sets the window title for the command prompt window.\n\n\
 TITLE [string]\n\n\
 string       Specifies the title for the command prompt window.\n"
 
-STRING_TIME_HELP1, "Zobrazí alebo nastaví systémový èas.\n\n\
+STRING_TIME_HELP1, "Displays or sets the system time.\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 @@ STRING_WINDOW_HELP1, "change console window aspect\n\n\
 WINDOW [/POS[=]left,top,width,heigth]\n\
               [MIN|MAX|RESTORE] ['title']\n\n\
 /POS          specify window placement and dimensions\n\
-MIN           minimalizova<EFBFBD> okno\n\
+MIN           minimize the window\n\
-MAX           maximalizujte okno\n\
+MAX           maximize the window\n\
-RESTORE       obnovi<EFBFBD> okno"
+RESTORE       restore the window"
 
 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           minimalizova<EFBFBD> okno\n\
+MIN           minimize the window\n\
-MAX           maximalizujte okno\n\
+MAX           maximize the window\n\
-RESTORE       obnovi<EFBFBD> okno\n\
+RESTORE       restore the window\n\
 title         new title\n"
 
 
@@ -576,7 +576,7 @@ CLS      Vyma
 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     Zobrazí alebo nastaví dátum.\n\
+DATE     Displays or sets the date.\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 @@ HELP     Provides Help information for ReactOS commands.\n\
 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       Vytvorí adresár.\n\
+MD       Creates a directory.\n\
-MKDIR    Vytvorí adresár.\n\
+MKDIR    Creates a directory.\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 @@ PROMPT   Changes the command prompt.\n\
 PUSHD    Saves the current directory then changes it.\n\
 RD       Removes a directory.\n\
 REM      Records comments (remarks) in batch files.\n\
-REN      Premenuje súbor alebo súbory.\n\
+REN      Renames a file or files.\n\
-RENAME   Premenuje súbor alebo súbory.\n\
+RENAME   Renames a file or files.\n\
 REPLACE  Replaces files.\n\
 RMDIR    Removes a directory.\n\
 SCREEN   Move cursor and optionally print text.\n\
@@ -612,7 +612,7 @@ SET      Displays, sets, or removes ReactOS environment variables.\n\
 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     Zobrazí alebo nastaví systémový èas.\n\
+TIME     Displays or sets the system time.\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_ERROR3,          "Error writing destination!\n"
 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,           "Ste si istý (Y/N)?"
+STRING_DEL_ERROR6,           "Are you sure (Y/N)?"
 STRING_DEL_ERROR7,           "Deleting: %s\n"
-STRING_ERROR_ERROR1,         "Neznáma chyba! Kód chyby: 0x%lx\n"
+STRING_ERROR_ERROR1,         "Unknown error! Error code: 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_TIME_ERROR1,          "Neplatn
 
 STRING_TYPE_ERROR1,          "Invalid option '/%s'\n"
 
-STRING_WINDOW_ERROR1,        "okno sa nenašlo"
+STRING_WINDOW_ERROR1,        "window not found"
 
 
 STRING_ERROR_PARAMETERF_ERROR,     "Parameter format not correct - %c\n"
-STRING_ERROR_INVALID_SWITCH,       "Neplatný prepínaè - /%c\n"
+STRING_ERROR_INVALID_SWITCH,       "Invalid switch - /%c\n"
 STRING_ERROR_TOO_MANY_PARAMETERS,  "Príliš ve¾a parametrov - %s\n"
-STRING_ERROR_PATH_NOT_FOUND,       "Cesta sa nenašla\n"
+STRING_ERROR_PATH_NOT_FOUND,       "Path not found\n"
-STRING_ERROR_FILE_NOT_FOUND,       "Súbor sa nenašiel\n"
+STRING_ERROR_FILE_NOT_FOUND,       "File not found\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,           "Chybný príkaz alebo názov súboru - %s\n"
+STRING_ERROR_BADCOMMAND,           "Bad command or filename - %s\n"
 STRING_ERROR_OUT_OF_MEMORY,        "Chyba (z) nedostatku pamäte.\n" //Out of memory error.
-STRING_ERROR_CANNOTPIPE,           "Chyba!  Cannot pipe!  Cannot open temporary file!\n"
+STRING_ERROR_CANNOTPIPE,           "Error!  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,     "Jednotka nie je pripravená"
+STRING_ERROR_DRIVER_NOT_READY,     "Drive not ready"
 
 STRING_PATH_ERROR,                 "CMD: Not in environment '%s'\n"
 
-STRING_REPLACE_ERROR1, "Neplatný prepínaè - %s\n"
+STRING_REPLACE_ERROR1, "Invalid switch - %s\n"
-STRING_REPLACE_ERROR2, "Cesta sa nenašla - %s\n"
+STRING_REPLACE_ERROR2, "Path not found - %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, "Prístup zamietnutý - %s\n"
+STRING_REPLACE_ERROR5, "Access denied - %s\n"
-STRING_REPLACE_ERROR6, "Žiadne súbory sa nenašli - %s\n"
+STRING_REPLACE_ERROR6, "No files found - %s\n"
 STRING_REPLACE_ERROR7, "Extended Error 32\n"
 
 STRING_REACTOS_VERSION,            "Operaèný systém ReactOS [Verzia %s-%s]\n"
-STRING_CMD_SHELLINFO,              "\nInterpréter príkazového riadku systému ReactOS\nVerzia %s %s"
+STRING_CMD_SHELLINFO,              "\nReactOS Command Line Interpreter\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,                 "neplatná hodnota pre ståpec"
+STRING_SCREEN_COL,                 "invalid value for col"
-STRING_SCREEN_ROW,                 "neplatná hodnota pre riadok"
+STRING_SCREEN_ROW,                 "invalid value for row"
 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\nStlaèené Ctrl-Break.  Cancel batch file? (Yes/No/All) "
+STRING_CANCEL_BATCH_FILE,          "\r\nCtrl-Break pressed.  Cancel batch file? (Yes/No/All) "
 
 STRING_INVALID_OPERAND,            "Invalid operand."
 STRING_EXPECTED_CLOSE_PAREN,       "Oèakávaná ')'."

base/shell/cmd/precomp.h

@@ -23,7 +23,6 @@
 #include <stdarg.h>
 #include <math.h>
 #include <time.h>
-#include <assert.h>
 
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>

base/shell/explorer/desktop/desktop.cpp

@@ -435,12 +435,6 @@ LRESULT DesktopWindow::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
 		explorer_show_frame(SW_SHOWNORMAL);
 		break;
 
-      case WM_DISPLAYCHANGE:
-        MoveWindow(_hwnd, 0, 0, LOWORD(lparam), HIWORD(lparam), TRUE);
-        MoveWindow(g_Globals._hwndShellView, 0, 0, LOWORD(lparam), HIWORD(lparam), TRUE);
-        MoveWindow(_desktopBar, 0, HIWORD(lparam) - DESKTOPBARBAR_HEIGHT, LOWORD(lparam), DESKTOPBARBAR_HEIGHT, TRUE);
-        break;
-
 	  case WM_GETISHELLBROWSER:
 		return (LRESULT)static_cast<IShellBrowser*>(this);
 

base/system/format/format.c

@@ -48,19 +48,6 @@ SIZEDEFINITION LegalSizes[] = {
 };
 
 
-int LoadStringAndOem(HINSTANCE hInst,
-		UINT uID,
-		LPTSTR szStr,
-		int Siz
-)	
-{
-  TCHAR szTmp[RC_STRING_MAX_SIZE];
-  int res = LoadString(hInst, uID, szTmp, sizeof(szTmp)); 
-  CharToOem(szTmp, szStr);
-  return(res);
-}
-
-
 //----------------------------------------------------------------------
 //
 // PrintWin32Error
@@ -184,7 +171,7 @@ FormatExCallback (
 
 	case PROGRESS:
 		percent = (PDWORD) Argument;
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf(szMsg, *percent);
 		break;
 
@@ -197,7 +184,7 @@ FormatExCallback (
 		status = (PBOOLEAN) Argument;
 		if( *status == FALSE ) {
 
-			LoadStringAndOem( GetModuleHandle(NULL), STRING_FORMAT_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+			LoadString( GetModuleHandle(NULL), STRING_FORMAT_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 			_tprintf("%s", szMsg);
 			Error = TRUE;
 		}
@@ -216,7 +203,7 @@ FormatExCallback (
 	case UNKNOWND:
 	case STRUCTUREPROGRESS:
 	case CLUSTERSIZETOOSMALL:
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf("%s", szMsg);
 		return FALSE;
 	}
@@ -274,7 +261,7 @@ static VOID Usage( LPTSTR ProgramName )
 	BYTE dummy;
 	BOOLEAN lastestVersion;
 
-	LoadStringAndOem( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+	LoadString( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 	if (!LoadFMIFSEntryPoints())
 	{
 		_tprintf(szMsg, ProgramName, _T(""));
@@ -332,7 +319,7 @@ _tmain(int argc, TCHAR *argv[])
 	// Get function pointers
 	//
 	if( !LoadFMIFSEntryPoints()) {
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_FMIFS_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_FMIFS_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf("%s", szMsg);
 		return -1;
 	}
@@ -342,7 +329,7 @@ _tmain(int argc, TCHAR *argv[])
 	//
 	if( (badArg = ParseCommandLine( argc, argv ))) {
 
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_UNKNOW_ARG, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_UNKNOW_ARG, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf(szMsg, argv[badArg] );
 
 		Usage(argv[0]);
@@ -354,7 +341,7 @@ _tmain(int argc, TCHAR *argv[])
 	//
 	if( !Drive ) {
 
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_DRIVE_PARM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_DRIVE_PARM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf(szMsg);
 		Usage( argv[0] );
 		return -1;
@@ -372,7 +359,7 @@ _tmain(int argc, TCHAR *argv[])
 	driveType = GetDriveType( RootDirectory );
 
 	if( driveType == 0 ) {
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		PrintWin32Error( szMsg, GetLastError());
 		return -1;
 	}
@@ -384,7 +371,7 @@ _tmain(int argc, TCHAR *argv[])
 	}
 
 	if( driveType != DRIVE_FIXED ) {
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_INSERT_DISK, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_INSERT_DISK, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf(szMsg, RootDirectory[0] );
 		_fgetts( input, sizeof(input)/2, stdin );
 
@@ -399,7 +386,7 @@ _tmain(int argc, TCHAR *argv[])
 						&serialNumber, &maxComponent, &flags,
 						fileSystem, sizeof(fileSystem)/2)) {
 
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		PrintWin32Error( szMsg, GetLastError());
 		return -1;
 	}
@@ -409,11 +396,11 @@ _tmain(int argc, TCHAR *argv[])
 			&totalNumberOfBytes,
 			&totalNumberOfFreeBytes )) {
 
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		PrintWin32Error( szMsg, GetLastError());
 		return -1;
 	}
-	LoadStringAndOem( GetModuleHandle(NULL), STRING_FILESYSTEM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+	LoadString( GetModuleHandle(NULL), STRING_FILESYSTEM, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 	_tprintf(szMsg, fileSystem );
 
 	//
@@ -425,7 +412,7 @@ _tmain(int argc, TCHAR *argv[])
 
 			while(1 ) {
 
-				LoadStringAndOem( GetModuleHandle(NULL), STRING_LABEL_NAME_EDIT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+				LoadString( GetModuleHandle(NULL), STRING_LABEL_NAME_EDIT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 				_tprintf(szMsg, RootDirectory[0] );
 				_fgetts( input, sizeof(input)/2, stdin );
 				input[ _tcslen( input ) - 1] = 0;
@@ -434,15 +421,15 @@ _tmain(int argc, TCHAR *argv[])
 
 					break;
 				}
-				LoadStringAndOem( GetModuleHandle(NULL), STRING_ERROR_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+				LoadString( GetModuleHandle(NULL), STRING_ERROR_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 				_tprintf("%s", szMsg);
 			}
 		}
 
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf(szMsg, RootDirectory[0] );
 
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 
 		while( 1 ) {
 			_fgetts( input, sizeof(input)/2, stdin );
@@ -473,7 +460,7 @@ _tmain(int argc, TCHAR *argv[])
 		}
 	} else {
 
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_FAST_FMT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_FAST_FMT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		if( totalNumberOfBytes.QuadPart > 1024*1024*10 ) {
 
 			_tprintf(_T("%s %luM\n"),szMsg, (DWORD) (totalNumberOfBytes.QuadPart/(1024*1024)));
@@ -483,7 +470,7 @@ _tmain(int argc, TCHAR *argv[])
 			_tprintf(_T("%s %.2fM\n"),szMsg,
 				((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0));
 		}
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_CREATE_FSYS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_CREATE_FSYS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		_tprintf("%s", szMsg);
 	}
 
@@ -501,7 +488,7 @@ _tmain(int argc, TCHAR *argv[])
 			ClusterSize, FormatExCallback );
 #endif
 	if( Error ) return -1;
-	LoadStringAndOem( GetModuleHandle(NULL), STRING_FMT_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+	LoadString( GetModuleHandle(NULL), STRING_FMT_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 	_tprintf("%s", szMsg);
 
 	//
@@ -516,7 +503,7 @@ _tmain(int argc, TCHAR *argv[])
 		if( !EnableVolumeCompression( RootDirectory, TRUE )) {
 #endif
 
-			LoadStringAndOem( GetModuleHandle(NULL), STRING_VOL_COMPRESS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+			LoadString( GetModuleHandle(NULL), STRING_VOL_COMPRESS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 			_tprintf("%s", szMsg);
 		}
 	}
@@ -533,7 +520,7 @@ _tmain(int argc, TCHAR *argv[])
 		input[ _tcslen(input)-1] = 0;
 		if( !SetVolumeLabel( RootDirectory, input )) {
 
-			LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+			LoadString( GetModuleHandle(NULL), STRING_NO_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 			PrintWin32Error(szMsg, GetLastError());
 			return -1;
 		}
@@ -544,7 +531,7 @@ _tmain(int argc, TCHAR *argv[])
 						&serialNumber, &maxComponent, &flags,
 						fileSystem, sizeof(fileSystem)/2)) {
 
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		PrintWin32Error( szMsg, GetLastError());
 		return -1;
 	}
@@ -557,12 +544,12 @@ _tmain(int argc, TCHAR *argv[])
 			&totalNumberOfBytes,
 			&totalNumberOfFreeBytes )) {
 
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME_SIZE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		PrintWin32Error(szMsg, GetLastError());
 		return -1;
 	}
 
-	LoadStringAndOem( GetModuleHandle(NULL), STRING_FREE_SPACE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+	LoadString( GetModuleHandle(NULL), STRING_FREE_SPACE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 	_tprintf(szMsg, totalNumberOfBytes.QuadPart, totalNumberOfFreeBytes.QuadPart );
 
 	//
@@ -573,11 +560,11 @@ _tmain(int argc, TCHAR *argv[])
 						&serialNumber, &maxComponent, &flags,
 						fileSystem, sizeof(fileSystem)/2)) {
 
-		LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 		PrintWin32Error( szMsg, GetLastError());
 		return -1;
 	}
-	LoadStringAndOem( GetModuleHandle(NULL), STRING_SERIAL_NUMBER, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+	LoadString( GetModuleHandle(NULL), STRING_SERIAL_NUMBER, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
 	_tprintf(szMsg, (unsigned int)(serialNumber >> 16),
 					(unsigned int)(serialNumber & 0xFFFF) );
 

base/system/format/lang/sk-SK.rc

@@ -1,6 +1,6 @@
 /* TRANSLATOR :  M rio KaŸm r /Mario Kacmar/ aka Kario (kario@szm.sk)
  * DATE OF TR.:  15-02-2008
- * LAST CHANGE:  10-08-2010
+ * LAST CHANGE:  08-08-2008
  */
 
 #include "resource.h"
@@ -14,14 +14,14 @@ STRING_HELP,  "Pou
   -FS:syst‚m s£borov  UrŸuje typ s£borov‚ho syst‚mu (%s).\n\
   -V:menovka          UrŸuje menovku zv„zku.\n\
   -Q                  Vykon va rìchle form tovanie.\n\
-  -A:ve–kosś          Prepˇçe predvolenŁ ve–kosś alokaźnej jednotky. Pre vçeobecn‚\n\
+  -A:ve–kosœ          Overrides the default allocation unit size. Default settings\n\
-                      pou§itie sŁ d“razne odporŁźan‚ predvolen‚ nastavenia\n\
+                      are strongly recommended for general use\n\
-                      NTFS podporuje 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\
+                      NTFS supports 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\
-                      FAT podporuje 8192, 16K, 32K, 64K, 128K, 256K.\n\
+                      FAT supports 8192, 16K, 32K, 64K, 128K, 256K.\n\
-                      NTFS kompresia nie je podporovan  pre ve–kosti alokaźnej\n\
+                      NTFS compression is not supported for allocation unit sizes\n\
-                      jednotky nad 4096.\n\
+                      above 4096.\n\
-  -C                  SŁbory vytvoren‚ na novom zv„zku budŁ automaticky\n\
+  -C                  Files created on the new volume will be compressed by\n\
-                      komprimovan‚.\n\n"
+                      default.\n\n"
 
 STRING_COMPLETE   "DokonŸen‚ na %lu percent.\r"
 
@@ -29,19 +29,19 @@ STRING_FORMAT_FAIL "FormatEx nebol schopn
 
 STRING_NO_SUPPORT  "Oper cia nie je podporovan "
 
-STRING_FMIFS_FAIL  "Nepodarilo sa lokalizovaś vstupn‚ body FMIFS.\n\n"
+STRING_FMIFS_FAIL  "Could not located FMIFS entry points.\n\n"
 
 STRING_UNKNOW_ARG  "Nezn my argument: %s\n"
 
 STRING_DRIVE_PARM  "Chìba nevyhnutnì parameter jednotky.\n\n"
 
-STRING_ERROR_DRIVE_TYPE  "Nemo§no zˇskaś typ jednotky"
+STRING_ERROR_DRIVE_TYPE  "Could not get drive type"
 
 STRING_INSERT_DISK       "Vlo§te nov£ disketu do jednotky %C:\na potom stlaŸte ENTER..."
 
-STRING_NO_VOLUME         "Nemo§no dotazovaś zv„zok"
+STRING_NO_VOLUME         "Could not query volume"
 
-STRING_NO_VOLUME_SIZE    "Nemo§no dotazovaś ve–kosś zv„zku"
+STRING_NO_VOLUME_SIZE    "Could not query volume size"
 
 STRING_FILESYSTEM        "Typ syst‚mu s£borov je %s.\n"
 
@@ -49,8 +49,8 @@ STRING_LABEL_NAME_EDIT  "Vlo
 
 STRING_ERROR_LABEL     "Bola zadan  nespr vna menovka zv„zku pre t£to jednotku.\n"
 
-STRING_YN_FORMAT       "\nUPOZORNENIE: VćETKY éDAJE NA NIE_VYMENITE•NEJ DISKOVEJ\n\
+STRING_YN_FORMAT       "\nWARNING, ALL DATA ON NON_REMOVABLE DISK\n\
-JEDNOTKE %C: BUDé STRATEN<45>!\nPokraźovaś s form tovanˇm (A/N)? "
+DRIVE %C: WILL BE LOST!\nProceed with Format (A/N)? "
 
 STRING_YES_NO_FAQ      "AN"
 

base/system/services/rpcserver.c

@@ -24,6 +24,7 @@
 typedef struct _SCMGR_HANDLE
 {
     DWORD Tag;
+    DWORD RefCount;
     DWORD DesiredAccess;
 } SCMGR_HANDLE;
 
@@ -31,6 +32,9 @@ typedef struct _SCMGR_HANDLE
 typedef struct _MANAGER_HANDLE
 {
     SCMGR_HANDLE Handle;
+
+    /* FIXME: Insert more data here */
+
     WCHAR DatabaseName[1];
 } MANAGER_HANDLE, *PMANAGER_HANDLE;
 
@@ -38,7 +42,12 @@ typedef struct _MANAGER_HANDLE
 typedef struct _SERVICE_HANDLE
 {
     SCMGR_HANDLE Handle;
+
+    DWORD DesiredAccess;
     PSERVICE ServiceEntry;
+
+    /* FIXME: Insert more data here */
+
 } SERVICE_HANDLE, *PSERVICE_HANDLE;
 
 
@@ -142,7 +151,7 @@ ScmCreateManagerHandle(LPWSTR lpDatabaseName,
     if (lpDatabaseName == NULL)
         lpDatabaseName = SERVICES_ACTIVE_DATABASEW;
 
-    if (_wcsicmp(lpDatabaseName, SERVICES_FAILED_DATABASEW) == 0)
+    if (_wcsicmp(lpDatabaseName,SERVICES_FAILED_DATABASEW)==0)
     {
         DPRINT("Database %S, does not exist\n",lpDatabaseName);
         return ERROR_DATABASE_DOES_NOT_EXIST;
@@ -160,6 +169,9 @@ ScmCreateManagerHandle(LPWSTR lpDatabaseName,
         return ERROR_NOT_ENOUGH_MEMORY;
 
     Ptr->Handle.Tag = MANAGER_TAG;
+    Ptr->Handle.RefCount = 1;
+
+    /* FIXME: initialize more data here */
 
     wcscpy(Ptr->DatabaseName, lpDatabaseName);
 
@@ -182,7 +194,9 @@ ScmCreateServiceHandle(PSERVICE lpServiceEntry,
         return ERROR_NOT_ENOUGH_MEMORY;
 
     Ptr->Handle.Tag = SERVICE_TAG;
+    Ptr->Handle.RefCount = 1;
 
+    /* FIXME: initialize more data here */
     Ptr->ServiceEntry = lpServiceEntry;
 
     *Handle = (SC_HANDLE)Ptr;
@@ -191,46 +205,6 @@ ScmCreateServiceHandle(PSERVICE lpServiceEntry,
 }
 
 
-static PMANAGER_HANDLE
-ScmGetServiceManagerFromHandle(SC_RPC_HANDLE Handle)
-{
-    PMANAGER_HANDLE pManager = NULL;
-
-    _SEH2_TRY
-    {
-        if (((PMANAGER_HANDLE)Handle)->Handle.Tag == MANAGER_TAG)
-            pManager = (PMANAGER_HANDLE)Handle;
-    }
-    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-    {
-        DPRINT1("Exception: Invalid Service Manager handle!\n");
-    }
-    _SEH2_END;
-
-    return pManager;
-}
-
-
-static PSERVICE_HANDLE
-ScmGetServiceFromHandle(SC_RPC_HANDLE Handle)
-{
-    PSERVICE_HANDLE pService = NULL;
-
-    _SEH2_TRY
-    {
-        if (((PSERVICE_HANDLE)Handle)->Handle.Tag == SERVICE_TAG)
-            pService = (PSERVICE_HANDLE)Handle;
-    }
-    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-    {
-        DPRINT1("Exception: Invalid Service handle!\n");
-    }
-    _SEH2_END;
-
-    return pService;
-}
-
-
 static DWORD
 ScmCheckAccess(SC_HANDLE Handle,
                DWORD dwDesiredAccess)
@@ -443,33 +417,42 @@ DWORD RCloseServiceHandle(
     if (*hSCObject == 0)
         return ERROR_INVALID_HANDLE;
 
-    hManager = ScmGetServiceManagerFromHandle(*hSCObject);
+    hManager = (PMANAGER_HANDLE)*hSCObject;
-    hService = ScmGetServiceFromHandle(*hSCObject);
+    hService = (PSERVICE_HANDLE)*hSCObject;
-
+    if (hManager->Handle.Tag == MANAGER_TAG)
-    if (hManager != NULL)
     {
         DPRINT("Found manager handle\n");
 
-        /* FIXME: add handle cleanup code */
+        hManager->Handle.RefCount--;
+        if (hManager->Handle.RefCount == 0)
+        {
+            /* FIXME: add handle cleanup code */
 
-        HeapFree(GetProcessHeap(), 0, hManager);
+            HeapFree(GetProcessHeap(), 0, hManager);
-        hManager = NULL;
+            hManager = NULL;
+        }
 
         DPRINT("RCloseServiceHandle() done\n");
         return ERROR_SUCCESS;
     }
-    else if (hService != NULL)
+    else if (hService->Handle.Tag == SERVICE_TAG)
     {
         DPRINT("Found service handle\n");
 
         /* Get the pointer to the service record */
         lpService = hService->ServiceEntry;
 
-        /* FIXME: add handle cleanup code */
+        ASSERT(hService->Handle.RefCount > 0);
 
-        /* Free the handle */
+        hService->Handle.RefCount--;
-        HeapFree(GetProcessHeap(), 0, hService);
+        if (hService->Handle.RefCount == 0)
-        hService = NULL;
+        {
+            /* FIXME: add handle cleanup code */
+
+            /* Free the handle */
+            HeapFree(GetProcessHeap(), 0, hService);
+            hService = NULL;
+        }
 
         ASSERT(lpService->dwRefCount > 0);
 
@@ -552,8 +535,6 @@ DWORD RControlService(
     DWORD dwError = ERROR_SUCCESS;
     DWORD pcbBytesNeeded = 0;
     DWORD dwServicesReturned = 0;
-    DWORD dwControlsAccepted;
-    DWORD dwCurrentState;
     HKEY hServicesKey = NULL;
 
     DPRINT("RControlService() called\n");
@@ -562,19 +543,18 @@ DWORD RControlService(
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
     /* Check the service handle */
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
-
     /* Check the service entry point */
     lpService = hSvc->ServiceEntry;
     if (lpService == NULL)
     {
-        DPRINT1("lpService == NULL!\n"); 
+        DPRINT("lpService == NULL!\n"); 
         return ERROR_INVALID_HANDLE;
     }
 
@@ -655,49 +635,6 @@ DWORD RControlService(
     }
     else
     {
-        dwControlsAccepted = lpService->Status.dwControlsAccepted;
-        dwCurrentState = lpService->Status.dwCurrentState;
-
-        /* Check the current state before sending a control request */
-        switch (dwCurrentState)
-        {
-            case SERVICE_STOP_PENDING:
-            case SERVICE_STOPPED:
-                return ERROR_SERVICE_CANNOT_ACCEPT_CTRL;
-
-            case SERVICE_START_PENDING:
-                switch (dwControl)
-                {
-                    case SERVICE_CONTROL_STOP:
-                        break;
-
-                    case SERVICE_CONTROL_INTERROGATE:
-                        RtlCopyMemory(lpServiceStatus,
-                                      &lpService->Status,
-                                      sizeof(SERVICE_STATUS));
-                        return ERROR_SUCCESS;
-
-                    default:
-                        return ERROR_SERVICE_CANNOT_ACCEPT_CTRL;
-                }
-                break;
-        }
-
-        /* Check if the control code is acceptable to the service */
-        switch (dwControl)
-        {
-            case SERVICE_CONTROL_STOP:
-                if ((dwControlsAccepted & SERVICE_ACCEPT_STOP) == 0)
-                    return ERROR_INVALID_SERVICE_CONTROL;
-                break;
-
-            case SERVICE_CONTROL_PAUSE:
-            case SERVICE_CONTROL_CONTINUE:
-                if ((dwControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE) == 0)
-                    return ERROR_INVALID_SERVICE_CONTROL;
-                break;
-        }
-
         /* Send control code to the service */
         dwError = ScmControlService(lpService,
                                     dwControl);
@@ -737,12 +674,9 @@ DWORD RDeleteService(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
-    {
-        DPRINT1("Invalid service handle!\n");
         return ERROR_INVALID_HANDLE;
-    }
 
     if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess,
                                   DELETE))
@@ -787,12 +721,9 @@ DWORD RLockServiceDatabase(
 
     *lpLock = 0;
 
-    hMgr = ScmGetServiceManagerFromHandle(hSCManager);
+    hMgr = (PMANAGER_HANDLE)hSCManager;
-    if (hMgr == NULL)
+    if (!hMgr || hMgr->Handle.Tag != MANAGER_TAG)
-    {
-        DPRINT1("Invalid service manager handle!\n");
         return ERROR_INVALID_HANDLE;
-    }
 
     if (!RtlAreAllAccessesGranted(hMgr->Handle.DesiredAccess,
                                   SC_MANAGER_LOCK))
@@ -827,15 +758,15 @@ DWORD RQueryServiceObjectSecurity(
 
     DPRINT("RQueryServiceObjectSecurity() called\n");
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
-    if (dwSecurityInformation & (DACL_SECURITY_INFORMATION |
+    if (dwSecurityInformation & (DACL_SECURITY_INFORMATION ||
-                                 GROUP_SECURITY_INFORMATION |
+                                 GROUP_SECURITY_INFORMATION ||
                                  OWNER_SECURITY_INFORMATION))
         DesiredAccess |= READ_CONTROL;
 
@@ -909,10 +840,10 @@ DWORD RSetServiceObjectSecurity(
 
     DPRINT("RSetServiceObjectSecurity() called\n");
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -1026,10 +957,10 @@ DWORD RQueryServiceStatus(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -1212,10 +1143,10 @@ DWORD RChangeServiceConfigW(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -1832,10 +1763,10 @@ DWORD RCreateServiceW(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hManager = ScmGetServiceManagerFromHandle(hSCManager);
+    hManager = (PMANAGER_HANDLE)hSCManager;
-    if (hManager == NULL)
+    if (!hManager || hManager->Handle.Tag != MANAGER_TAG)
     {
-        DPRINT1("Invalid service manager handle!\n");
+        DPRINT("Invalid manager handle!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -2142,6 +2073,7 @@ DWORD REnumDependentServicesW(
     DWORD dwServicesReturned = 0;
     DWORD dwServiceCount;
     HKEY hServicesKey = NULL;
+    LPSC_RPC_HANDLE hSCObject;
     PSERVICE_HANDLE hSvc;
     PSERVICE lpService = NULL;
     PSERVICE *lpServicesArray = NULL;
@@ -2153,13 +2085,8 @@ DWORD REnumDependentServicesW(
 
     DPRINT("REnumDependentServicesW() called\n");
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSCObject = &hService;
-    if (hSvc == NULL)
+    hSvc = (PSERVICE_HANDLE) *hSCObject;
-    {
-        DPRINT1("Invalid service handle!\n");
-        return ERROR_INVALID_HANDLE;
-    }
-
     lpService = hSvc->ServiceEntry;
 
     /* Check access rights */
@@ -2291,14 +2218,13 @@ DWORD REnumServicesStatusW(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hManager = ScmGetServiceManagerFromHandle(hSCManager);
+    hManager = (PMANAGER_HANDLE)hSCManager;
-    if (hManager == NULL)
+    if (!hManager || hManager->Handle.Tag != MANAGER_TAG)
     {
-        DPRINT1("Invalid service manager handle!\n");
+        DPRINT("Invalid manager handle!\n");
         return ERROR_INVALID_HANDLE;
     }
 
-
     *pcbBytesNeeded = 0;
     *lpServicesReturned = 0;
 
@@ -2543,10 +2469,10 @@ DWORD ROpenServiceW(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hManager = ScmGetServiceManagerFromHandle(hSCManager);
+    hManager = (PMANAGER_HANDLE)hSCManager;
-    if (hManager == NULL)
+    if (!hManager || hManager->Handle.Tag != MANAGER_TAG)
     {
-        DPRINT1("Invalid service manager handle!\n");
+        DPRINT("Invalid manager handle!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -2623,10 +2549,10 @@ DWORD RQueryServiceConfigW(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -2831,10 +2757,10 @@ DWORD RStartServiceW(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -3057,10 +2983,10 @@ DWORD RChangeServiceConfigA(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -3475,6 +3401,7 @@ DWORD REnumDependentServicesA(
     DWORD dwServicesReturned = 0;
     DWORD dwServiceCount;
     HKEY hServicesKey = NULL;
+    LPSC_RPC_HANDLE hSCObject;
     PSERVICE_HANDLE hSvc;
     PSERVICE lpService = NULL;
     PSERVICE *lpServicesArray = NULL;
@@ -3486,13 +3413,8 @@ DWORD REnumDependentServicesA(
 
     DPRINT("REnumDependentServicesA() called\n");
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSCObject = &hService;
-    if (hSvc == NULL)
+    hSvc = (PSERVICE_HANDLE) *hSCObject;
-    {
-        DPRINT1("Invalid service handle!\n");
-        return ERROR_INVALID_HANDLE;
-    }
-
     lpService = hSvc->ServiceEntry;
 
     /* Check access rights */
@@ -3801,10 +3723,10 @@ DWORD RQueryServiceConfigA(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -4042,10 +3964,10 @@ DWORD RStartServiceA(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -4423,10 +4345,10 @@ DWORD RChangeServiceConfig2W(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -4524,10 +4446,10 @@ DWORD RQueryServiceConfig2A(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -4644,10 +4566,10 @@ DWORD RQueryServiceConfig2W(
     if (ScmShutdown)
         return ERROR_SHUTDOWN_IN_PROGRESS;
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -4797,10 +4719,10 @@ DWORD RQueryServiceStatusEx(
     if (cbBufSize < sizeof(SERVICE_STATUS_PROCESS))
         return ERROR_INSUFFICIENT_BUFFER;
 
-    hSvc = ScmGetServiceFromHandle(hService);
+    hSvc = (PSERVICE_HANDLE)hService;
-    if (hSvc == NULL)
+    if (!hSvc || hSvc->Handle.Tag != SERVICE_TAG)
     {
-        DPRINT1("Invalid service handle!\n");
+        DPRINT("Invalid handle tag!\n");
         return ERROR_INVALID_HANDLE;
     }
 
@@ -4990,10 +4912,10 @@ DWORD REnumServicesStatusExW(
     if (InfoLevel != SC_ENUM_PROCESS_INFO)
         return ERROR_INVALID_LEVEL;
 
-    hManager = ScmGetServiceManagerFromHandle(hSCManager);
+    hManager = (PMANAGER_HANDLE)hSCManager;
-    if (hManager == NULL)
+    if (!hManager || hManager->Handle.Tag != MANAGER_TAG)
     {
-        DPRINT1("Invalid service manager handle!\n");
+        DPRINT("Invalid manager handle!\n");
         return ERROR_INVALID_HANDLE;
     }
 

boot/armllb/armllb.rbuild

@@ -1,25 +1,17 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
-<module name="armllb" type="kernel" entrypoint="_start" installbase=".." installname="armllb.bin">
+<module name="armllb" type="bootloader" installbase=".." installname="armllb.bin">
 	<bootstrap installbase="loader" />
 	<library>libcntpr</library>
 	<library>rtl</library>
 	<include base="armllb">./inc</include>
-	<if property="SARCH" value="omap3-beagle">
+	<if property="SARCH" value="omap3">
 		<define name="_OMAP3_" />
-		<define name="_BEAGLE_" />
 		<group linkerset="ld">
 			<linkerflag>-Wl,--image-base=0x401FEFF8</linkerflag>
 		</group>
 	</if>
-	<if property="SARCH" value="omap3-zoom2">
-		<define name="_OMAP3_" />
-		<define name="_ZOOM2_" />
-		<group linkerset="ld">
-			<linkerflag>--image-base=0x80FFF000</linkerflag>
-		</group>
-	</if>
 	<if property="SARCH" value="versatile">
 		<define name="_VERSATILE_" />
 		<group linkerset="ld">
@@ -33,26 +25,17 @@
 	<file>fw.c</file>
 	<directory name="hw">
 		<file>keyboard.c</file>
-		<file>matrix.c</file>
 		<file>serial.c</file>
 		<file>time.c</file>
 		<file>video.c</file>
-		<if property="SARCH" value="omap3-zoom2">
+		<if property="SARCH" value="omap3">
-			<directory name="omap3-zoom2">
+			<directory name="omap3">
-				<file>hwinfo.c</file>
+				<file>hwdata.c</file>
-				<file>hwinit.c</file>
+				<file>hwdss.c</file>
-				<file>hwlcd.c</file>
-				<file>hwsynkp.c</file>
-				<file>hwtwl40x.c</file>
-				<file>hwuart.c</file>
-			</directory>
-		</if>
-		<if property="SARCH" value="omap3-beagle">
-			<directory name="omap3-beagle">
 				<file>hwuart.c</file>
 				<file>hwinfo.c</file>
 				<file>hwinit.c</file>
-			</directory>
+				</directory>
 		</if>
 		<if property="SARCH" value="versatile">
 			<directory name="versatile">
@@ -76,5 +59,8 @@
 		<compilerflag>-Os</compilerflag>
 		
 	</group>
+	<group linkerset="ld">
+		<linkerflag>-lgcc</linkerflag>
+	</group>
 </module>
 </group>

boot/armllb/boot.s

@@ -13,47 +13,15 @@
     NESTED_ENTRY _start
     PROLOG_END _start
     
-#ifdef _BEAGLE_ // This is only used for TI BootROM on Beagle/Emulator for now
+#ifdef _OMAP3_
     /*
-     * On Beagle, the boot is directly from TI BootROM that reads NAND flash.
+     * On OMAP3, the boot is directly from TI BootROM that reads NAND flash.
      * First word is size of program to load.
      * Second word is load address of program. Since DDR is not initialized,
      * we load to SDRAM at 40200000h. Max 64K.
      */
     .word 0x8000
     .word 0x40200000
-#elif _ZOOM2_
-	/*
-	 * On ZOOM2, we currently load from u-boot to make bring-up easier.
-	 *
-	 * In order to get ATAG and all that goodness, we have to fool u-boot into
-	 * thinking we are a Linux ARM kernel.
-	 *
-	 * So this is a 'fake' uImage-format header, which will make u-boot grok our
-	 * image and correctly execute it.
-	 *
-	 * Note that a data checksum is in the header, but thankfully we can disable
-	 * the check.
-	 *
-	 * There's also a header checksum, but as long as there's no need to modify
-	 * this header, we can leave it static.
-	 *
-	 * Finally, note that the "Image String" is sized as a 32-byte array in the
-	 * uImage header format. The string chosen below is not only accurate, but
-	 * also happens to fit exactly in 32 bytes, meaning we don't need to pad.
-	 */
-	.word 0x56190527 // Header Magic
-	.word 0x5E4B8444 // Checksum
-	.word 0x483BE54C // Timestamp
-	.word 0x0CA10000 // Image size (64K)
-	.word 0x00000081 // Load address
-	.word 0x40000081 // Entrypoint
-	.word 0x90873DD8 // Data Checksum ('setenv verify n' must be set!)
-	.byte 5 		 // Linux OS
-	.byte 2 		 // ARM
-	.byte 2 		 // Kernel
-	.byte 0 		 // No compression
-	.ascii "ReactOS ARM Low-Level Bootloader" 
 #endif
 
     /* Load C entrypoint and setup LLB stack */
@@ -63,14 +31,8 @@
     ENTRY_END _start
 
 L_BootStackEnd:
-#ifdef _BEAGLE_ // This is only used for TI BootROM on Beagle/Emulator for now
     .long 0x00010000
-#elif _ZOOM2_ // On ZOOM2 RAM starts at 0x80000000, not 0
+        
-	.long 0x81014000
-#else
-#error Stack Address Not Defined
-#endif
-
 L_LlbStartup:
     .long LlbStartup
 

boot/armllb/crtsupp.c

@@ -40,7 +40,7 @@ int printf(const char *fmt, ...)
     return puts(printbuffer);
 }
 
-ULONG
+VOID
 DbgPrint(const char *fmt, ...)
 {
     va_list args;
@@ -52,7 +52,6 @@ DbgPrint(const char *fmt, ...)
     va_end(args);
     
     for (j = 0; j < i; j++) LlbSerialPutChar(Buffer[j]);
-    return 0;
 }
 
 /* EOF */

boot/armllb/envir.c

@@ -9,11 +9,10 @@
 #include "precomp.h"
 
 ULONG LlbEnvHwPageSize;
-ULONG LlbEnvHwMemStart = 0;
+ULONG LlbEnvHwMemStart;
-ULONG LlbEnvHwMemSize = 0;
+ULONG LlbEnvHwMemSize;
-ULONG LlbEnvRamDiskStart = 0;
+ULONG LlbEnvRamDiskStart;
-ULONG LlbEnvRamDiskSize = 0;
+ULONG LlbEnvRamDiskSize;
-ULONG LlbEnvHwRevision;
 CHAR LlbEnvCmdLine[256];
 CHAR LlbValueData[32];
     
@@ -36,17 +35,11 @@ LlbEnvParseArguments(IN PATAG Arguments)
                 LlbEnvHwPageSize = Atag->u.Core.PageSize;
                 break;
                 
-            case ATAG_REVISION:
-
-                /* Save page size */
-                LlbEnvHwRevision = Atag->u.Revision.Rev;
-                break;
-                
             case ATAG_MEM:
             
                 /* Save RAM start and size */
-                if (!LlbEnvHwMemStart) LlbEnvHwMemStart = Atag->u.Mem.Start;
+                LlbEnvHwMemStart = Atag->u.Mem.Start;
-                LlbEnvHwMemSize += Atag->u.Mem.Size;
+                LlbEnvHwMemSize = Atag->u.Mem.Size;
                 break;
                 
             case ATAG_INITRD2:
@@ -55,7 +48,6 @@ LlbEnvParseArguments(IN PATAG Arguments)
                 LlbEnvRamDiskStart = Atag->u.InitRd2.Start;
                 LlbEnvRamDiskSize = Atag->u.InitRd2.Size;
                 
-#ifdef _BEAGLE_
                 /* Make sure it's 16MB-aligned */
                 LlbEnvRamDiskSize = (LlbEnvRamDiskSize + (16 * 1024 * 1024) - 1) 
                                     &~ ((16 * 1024 * 1024) - 1);
@@ -63,7 +55,6 @@ LlbEnvParseArguments(IN PATAG Arguments)
                 /* The RAMDISK actually starts 16MB later */
                 LlbEnvRamDiskStart += 16 * 1024 * 1024;
                 LlbEnvRamDiskSize  -= 16 * 1024 * 1024;
-#endif
                 break;
                 
             case ATAG_CMDLINE:
@@ -77,7 +68,7 @@ LlbEnvParseArguments(IN PATAG Arguments)
             /* Nothing left to handle */
             case ATAG_NONE:
             default:
-                break;
+                return;
         }
         
         /* Next tag */
@@ -85,11 +76,8 @@ LlbEnvParseArguments(IN PATAG Arguments)
     }
     
     /* For debugging */
-    DbgPrint("[BOOTROM] Board Revision: %lx PageSize: %dKB RAM: %dMB CMDLINE: %s\n"
+    DbgPrint("[BOOTROM] PageSize: %dKB RAM: %dMB CMDLINE: %s\n",
-             "[RAMDISK] Base: %lx Size: %dMB\n",
+             LlbEnvHwPageSize / 1024, LlbEnvHwMemSize / 1024 / 1024, LlbEnvCmdLine);
-             LlbEnvHwRevision,
-             LlbEnvHwPageSize / 1024, LlbEnvHwMemSize / 1024 / 1024, LlbEnvCmdLine,
-             LlbEnvRamDiskStart, LlbEnvRamDiskSize / 1024 / 1024);
 }
 
 VOID

boot/armllb/fw.c

@@ -49,11 +49,7 @@ INT
 LlbFwGetCh(VOID)
 {
     /* Return the key pressed */
-#ifdef _ZOOM2_
-    return LlbKeypadGetChar();
-#else
     return LlbKeyboardGetChar();
-#endif
 }
 
 ULONG

boot/armllb/hw/matrix.c

@@ -1,42 +0,0 @@
-/*
- * PROJECT:         ReactOS Boot Loader
- * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            boot/armllb/hw/matrix.c
- * PURPOSE:         LLB Matrix Keypad Routines
- * PROGRAMMERS:     ReactOS Portable Systems Group
- */
-
-#include "precomp.h"
-
-/* SYNPATICS KEYPAD MATRIX ****************************************************/
-
-UCHAR KeyMatrix[8][8] =
-{
-    {'e', 'r', 't', KEY_HOME, 0, 0, 'i', KEY_LEFTSHIFT},
-    {'d', 'f', 'g', KEY_SEND, 0, 0, 'k', KEY_ENTER},
-    {'x', 'c', 'v', KEY_END, 0, 0, '.', KEY_CAPS_LOCK},
-    {'z', '+', 'b', KEY_F1, 0, 0, 'o', KEY_SPACE},
-    {'w', 'y', 'u', KEY_F2, 0, 0, 'l', KEY_LEFT},
-    {'s', 'h', 'j', KEY_F3, 0, 0, 'm', KEY_RIGHT},
-    {'q', 'a', 'n', KEY_BACKSPACE, 0, 0, 'p', KEY_UP},
-    {0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_DOWN}
-};
-
-/* FUNCTIONS ******************************************************************/
- 
-CHAR
-NTAPI
-LlbKeypadGetChar(VOID)
-{
-    UCHAR ScanCode;
-    UCHAR Col, Row;
-    
-    ScanCode = LlbHwKbdRead();
-    Col = ScanCode >> 4;
-    Row = ScanCode & 0xF;
-    
-    /* Return the ASCII character */
-    return KeyMatrix[Col][Row];
-}
-
-/* EOF */

boot/armllb/hw/omap3-beagle/hwinfo.c

@@ -1,137 +0,0 @@
-/*
- * PROJECT:         ReactOS Boot Loader
- * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            boot/armllb/hw/omap3-beagle/hwinfo.c
- * PURPOSE:         LLB Hardware Info Routines for OMAP3 Beagle
- * PROGRAMMERS:     ReactOS Portable Systems Group
- */
-
-#include "precomp.h"
-
-ULONG
-NTAPI
-LlbHwGetBoardType(VOID)
-{
-    return MACH_TYPE_OMAP3_BEAGLE;
-}
-
-ULONG
-NTAPI
-LlbHwGetPClk(VOID)
-{
-    return 48000000;
-}
-
-ULONG
-NTAPI
-LlbHwGetTmr0Base(VOID)
-{
-    return 0x48318000;
-}
-
-ULONG
-NTAPI
-LlbHwGetSerialUart(VOID)
-{
-    return 3;
-} 
-
-VOID
-NTAPI
-LlbHwKbdSend(IN ULONG Value)
-{
-
-}
-
-BOOLEAN
-NTAPI
-LlbHwKbdReady(VOID)
-{
-    return FALSE;
-}
-
-INT
-NTAPI
-LlbHwKbdRead(VOID)
-{
-    return 0;
-}
-
-ULONG
-NTAPI
-LlbHwGetScreenWidth(VOID)
-{
-    return 1280;
-}
-
-ULONG
-NTAPI
-LlbHwGetScreenHeight(VOID)
-{
-     return 720;
-}
- 
-PVOID
-NTAPI
-LlbHwGetFrameBuffer(VOID)
-{
-    return (PVOID)0x80500000;
-}
-
-ULONG
-NTAPI
-LlbHwVideoCreateColor(IN ULONG Red,
-                      IN ULONG Green,
-                      IN ULONG Blue)
-{
-    return 0;
-}
-
-
-//
-// OMAP3 Memory Map
-//
-BIOS_MEMORY_MAP LlbHwOmap3MemoryMap[] =
-{
-    {0, 0, 0, 0}
-};
-
-VOID
-NTAPI
-LlbHwBuildMemoryMap(IN PBIOS_MEMORY_MAP MemoryMap)
-{
-    PBIOS_MEMORY_MAP MapEntry;
-    ULONG Base, Size, FsBase, FsSize;
-    
-    /* Parse hardware memory map */
-    MapEntry = LlbHwOmap3MemoryMap;
-    while (MapEntry->Length)
-    {
-        /* Add this entry */
-        LlbAllocateMemoryEntry(MapEntry->Type, MapEntry->BaseAddress, MapEntry->Length);
-        
-        /* Move to the next one */
-        MapEntry++;
-    }
-    
-    /* Query memory and RAMDISK information */
-    LlbEnvGetMemoryInformation(&Base, &Size);
-    LlbEnvGetRamDiskInformation(&FsBase, &FsSize);
-    
-    /* Add-in the size of the ramdisk */
-    Base = FsBase + FsSize;
-    
-    /* Subtract size of ramdisk and anything else before it */
-    Size -= Base;
-    
-    /* Allocate an entry for it */
-    LlbAllocateMemoryEntry(BiosMemoryUsable, Base, Size);
-}
-
-ULONG
-LlbHwRtcRead(VOID)
-{
-    return 0;
-}
-
-/* EOF */

boot/armllb/hw/omap3-beagle/hwuart.c

@@ -1,54 +0,0 @@
-/*
- * PROJECT:         ReactOS Boot Loader
- * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            boot/armllb/hw/omap3-beagle/hwuart.c
- * PURPOSE:         LLB UART Initialization Routines for OMAP3 Beagle
- * PROGRAMMERS:     ReactOS Portable Systems Group
- */
-
-#include "precomp.h"
-
-/* FUNCTIONS ******************************************************************/
-
-VOID
-NTAPI
-LlbHwOmap3UartInitialize(VOID)
-{
-
-}
-
-VOID
-NTAPI
-LlbHwUartSendChar(IN CHAR Char)
-{
-
-}
-
-BOOLEAN
-NTAPI
-LlbHwUartTxReady(VOID)
-{
-    return FALSE;
-}
-
-ULONG
-NTAPI
-LlbHwGetUartBase(IN ULONG Port)
-{
-    if (Port == 1)
-    {
-        return 0x4806A000;
-    }
-    else if (Port == 2)
-    {
-        return 0x4806C000;        
-    }
-    else if (Port == 3)
-    {
-        return 0x49020000;        
-    }
-    
-    return 0;
-}
-
-/* EOF */

boot/armllb/hw/omap3-zoom2/hwinfo.c

@@ -1,60 +0,0 @@
-/*
- * PROJECT:         ReactOS Boot Loader
- * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            boot/armllb/hw/omap3-zoom2/hwuart.c
- * PURPOSE:         LLB Hardware Info Routines for OMAP3 ZOOM2
- * PROGRAMMERS:     ReactOS Portable Systems Group
- */
-
-#include "precomp.h"
-
-TIMEINFO LlbTime;
-
-#define BCD_INT(bcd) (((bcd & 0xf0) >> 4) * 10 + (bcd &0x0f))
-
-ULONG
-NTAPI
-LlbHwGetBoardType(VOID)
-{
-    return MACH_TYPE_OMAP_ZOOM2;
-}
-
-ULONG
-NTAPI
-LlbHwGetPClk(VOID)
-{
-    return 48000000;
-}
-
-ULONG
-NTAPI
-LlbHwGetTmr0Base(VOID)
-{
-    return 0x48318000;
-}
-
-ULONG
-NTAPI
-LlbHwGetSerialUart(VOID)
-{
-    return 0;
-} 
-
-ULONG
-LlbHwRtcRead(VOID)
-{
-    /* Issue the GET_TIME request on the RTC control register */
-    LlbHwOmap3TwlWrite1(0x4B, 0x29, 0x41);
-    
-    /* Read the BCD registers and convert them */
-    LlbTime.Second = BCD_INT(LlbHwOmap3TwlRead1(0x4B, 0x1C));
-    LlbTime.Minute = BCD_INT(LlbHwOmap3TwlRead1(0x4B, 0x1D));
-    LlbTime.Hour = BCD_INT(LlbHwOmap3TwlRead1(0x4B, 0x1E));
-    LlbTime.Day = BCD_INT(LlbHwOmap3TwlRead1(0x4B, 0x1F));
-    LlbTime.Month = BCD_INT(LlbHwOmap3TwlRead1(0x4B, 0x20));
-    LlbTime.Year = BCD_INT(LlbHwOmap3TwlRead1(0x4B, 0x21));
-    LlbTime.Year += (LlbTime.Year > 80) ? 1900 : 2000;
-    return 0;
-}
-
-/* EOF */

boot/armllb/hw/omap3-zoom2/hwinit.c

@@ -1,106 +0,0 @@
-/*
- * PROJECT:         ReactOS Boot Loader
- * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            boot/armllb/hw/omap3-zoom2/hwinit.c
- * PURPOSE:         LLB UART Initialization Routines for OMAP3 ZOOM2
- * PROGRAMMERS:     ReactOS Portable Systems Group
- */
-
-#include "precomp.h"
-
-//
-// OMAP3 Memory Map
-//
-// 0x00000000 - 0x3FFFFFFF GPMC                                     [  1 GB]
-// 0x40000000 - 0x47FFFFFF On-Chip Memory (ROM/SRAM Address Space)  [128 MB]
-// 0x48000000 - 0x4FFFFFFF L4 Interconnects (All system peripherals)[128 MB]
-// 0x50000000 - 0x53FFFFFF SGX Graphics Accelerator Slave Port      [ 64 MB]
-// 0x54000000 - 0x57FFFFFF L4 Emulation                             [128 MB]
-// 0x58000000 - 0x58FFFFFF Reserved                                 [ 64 MB]
-// 0x5C000000 - 0x5FFFFFFF IVA2.2 Subsystem                         [ 64 MB]
-// 0x60000000 - 0x67FFFFFF Reserved                                 [128 MB]
-// 0x68000000 - 0x6FFFFFFF L3 Interconnect (Control Registers)      [128 MB]
-// 0x70000000 - 0x7FFFFFFF SDRC/SMS Virtual Address Space 0         [256 MB]
-// 0x80000000 - 0x9FFFFFFF SDRC/SMS CS0 SDRAM                       [512 MB]
-    // 0x80000000 - 0x80FFFFFF KERNEL, HAL, BOOT DRIVERS            [ 16 MB]
-// THIS IS THE x86-STYLE "LOW 1MB" THAT IS IDENTITY MAPPED
-    // 0x81000000 - 0x8100FFFF ARM LLB                              [ 64 KB]
-    // 0x81010000 - 0x81013FFF ARM BOOT STACK                       [ 16 KB]
-    // 0x81014000 - 0x81073FFF ARM FRAMEBUFFER                      [384 KB]
-    // 0x81070000 - 0x81093FFF ARM OS LOADER                        [128 KB]
-    // 0x81094000 - 0x810FFFFF RESERVED FOR BOOT LOADER EXPANSION   [432 KB]
-// END OF THE x86-STYLE "LOW 1MB" THAT IS IDENTITY MAPPED
-    // 0x81100000 - 0x8FFFFFFF FREE RAM                             [ 15 MB]
-    // 0x82000000 - 0x83FFFFFF ARM RAMDISK                          [ 32 MB]
-    // 0x84000000 - 0x8FFFFFFF FREE RAM                             [192 MB]
-    // 0x90000000 - 0x9FFFFFFF FREE RAM IF > 256MB INSTALLED        [256 MB]
-// 0xA0000000 - 0xBFFFFFFF SDRC/SMS CS1 SDRAM                       [512 MB]
-    // 0xA0000000 - 0xAFFFFFFF FREE RAM IF > 512MB INSTALLED        [256 MB]
-    // 0xB0000000 - 0xBFFFFFFF FREE RAM IF > 768MB INSTALLED        [256 MB]
-// 0xC0000000 - 0xDFFFFFFF Reserved                                 [512 MB]
-// 0xE0000000 - 0xFFFFFFFF SDRC/SMS Virtual Address Space 1         [512 MB]
-BIOS_MEMORY_MAP LlbHwOmap3MemoryMap[] =
-{
-    {0x00000000, 0x80000000, BiosMemoryReserved,   0}, /* Device Registers */
-    {0x80000000, 0x01000000, BiosMemoryUsable,     0}, /* 16 MB RAM for Kernel map */
-    {0x81000000, 0x00010000, BiosMemoryBootLoader, 0}, /* Arm LLB */
-    {0x81010000, 0x00004000, BiosMemoryBootStrap,  0}, // LLB Stack
-    {0x81014000, 0x00060000, BiosMemoryBootLoader, 0}, /* Kernel Framebuffer */
-    {0x81070000, 0x00020000, BiosMemoryBootStrap,  0}, /* ARM OS Loader */
-    {0x81094000, 0x0006C000, BiosMemoryBootStrap,  0}, /* ARM OS Loader Expansion */
-    {0x81100000, 0x00F00000, BiosMemoryUsable,     0}, /* 15 MB Free RAM */
-    {0x82000000, 0x02000000, BiosMemoryBootStrap,  0}, /* 32MB RAMDISK */
-    {0x84000000, 0x0C000000, BiosMemoryUsable,     0}, /* 192 MB Free RAM */
-    {0x90000000, 0x70000000, BiosMemoryReserved,   0},
-    {0, 0, 0, 0}
-};
-
-VOID
-NTAPI
-LlbHwBuildMemoryMap(IN PBIOS_MEMORY_MAP MemoryMap)
-{
-    PBIOS_MEMORY_MAP MapEntry;
-    ULONG Base, Size, FsBase, FsSize;
-    
-    /* Parse hardware memory map */
-    MapEntry = LlbHwOmap3MemoryMap;
-    while (MapEntry->Length)
-    {
-        /* Add this entry */
-        LlbAllocateMemoryEntry(MapEntry->Type, MapEntry->BaseAddress, MapEntry->Length);
-        
-        /* Move to the next one */
-        MapEntry++;
-    }
-    
-    /* Query memory and RAMDISK information */
-    LlbEnvGetMemoryInformation(&Base, &Size);
-    LlbEnvGetRamDiskInformation(&FsBase, &FsSize);
-    if (!FsSize) return;
-#ifdef _BEAGLE_
-    /* Add-in the size of the ramdisk */
-    Base = FsBase + FsSize;
-    
-    /* Subtract size of ramdisk and anything else before it */
-    Size -= Base;
-    
-    /* Allocate an entry for it */
-    LlbAllocateMemoryEntry(BiosMemoryUsable, Base, Size);
-#endif
-}
-
-VOID
-NTAPI
-LlbHwInitialize(VOID)
-{
-    /* Setup the UART (NS16550) */
-    LlbHwOmap3UartInitialize();
-    
-    /* Setup the NEC WVGA LCD Panel and the Display Controller */
-    LlbHwOmap3LcdInitialize();
-    
-    /* Setup the keyboard */
-    LlbHwOmap3SynKpdInitialize();
-}
-
-/* EOF */

boot/armllb/hw/omap3-zoom2/hwlcd.c

@@ -1,129 +0,0 @@
-/*
- * PROJECT:         ReactOS Boot Loader
- * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            boot/armllb/hw/omap3-zoom2/hwlcd.c
- * PURPOSE:         LLB LCD Routines for OMAP3 ZOOM2
- * PROGRAMMERS:     ReactOS Portable Systems Group
- */
-
-#include "precomp.h"
-
-PUSHORT LlbHwVideoBuffer;
-
-VOID
-NTAPI
-LlbHwOmap3LcdInitialize(VOID)
-{
-    /*
-     * N.B. The following initialization sequence took about 12 months to figure
-     *      out.
-     *      This means if you are glancing at it and have no idea what on Earth
-     *      could possibly be going on, this is *normal*.
-     *      Just trust that this turns on the LCD.
-     *      And be thankful all you ever have to worry about is Java and HTML.
-     */
-
-    /* Turn on the functional and interface clocks in the entire PER domain */
-    WRITE_REGISTER_ULONG(0x48005000, 0x3ffff);  /* Functional clocks */
-    WRITE_REGISTER_ULONG(0x48005010, 0x3ffff);  /* Interface clocks */
-
-    /* Now that GPIO Module 3 is on, send a reset to the LCD panel on GPIO 96 */
-    WRITE_REGISTER_ULONG(0x49054034, 0);             /* FIXME: Enable all as output */
-    WRITE_REGISTER_ULONG(0x49054094, 0xffffffff);    /* FIXME: Output on all gpios */
-
-    /* Now turn on the functional and interface clocks in the CORE domain */
-    WRITE_REGISTER_ULONG(0x48004a00, 0x03fffe29); /* Functional clocks */
-    WRITE_REGISTER_ULONG(0x48004a10, 0x3ffffffb); /* Interface clocks */
-    
-    /* The HS I2C interface is now on, configure it */
-    WRITE_REGISTER_USHORT(0x48070024, 0x0);    /* Disable I2c */
-    WRITE_REGISTER_USHORT(0x48070030, 0x17);   /* Configure clock divider */
-    WRITE_REGISTER_USHORT(0x48070034, 0xd);    /* Configure clock scaler */
-    WRITE_REGISTER_USHORT(0x48070038, 0xf);    /* Configure clock scaler */
-    WRITE_REGISTER_USHORT(0x48070020, 0x215);  /* Configure clocks and idle */
-    WRITE_REGISTER_USHORT(0x4807000c, 0x636f); /* Select wakeup bits */
-    WRITE_REGISTER_USHORT(0x48070014, 0x4343); /* Disable DMA */
-    WRITE_REGISTER_USHORT(0x48070024, 0x8000); /* Enable I2C */
-    
-    /*
-     * Set the VPLL2 to cover all device groups instead of just P3.
-     * This essentially enables the VRRTC to power up the LCD panel.
-     */
-    LlbHwOmap3TwlWrite1(0x4B, 0x8E, 0xE0);
-
-    /* VPLL2 runs at 1.2V by default, so we need to reprogram to 1.8V for DVI */
-    LlbHwOmap3TwlWrite1(0x4B, 0x91, 0x05);
-
-    /* Set GPIO pin 7 on the TWL4030 as an output pin */
-    LlbHwOmap3TwlWrite1(0x49, 0x9B, 0x80);
-
-    /* Set GPIO pin 7 signal on the TWL4030 ON. This powers the LCD backlight */
-    LlbHwOmap3TwlWrite1(0x49, 0xA4, 0x80);
-   
-    /* Now go on the McSPI interface and program it on for the channel */
-    WRITE_REGISTER_ULONG(0x48098010, 0x15);
-    WRITE_REGISTER_ULONG(0x48098020, 0x1);
-    WRITE_REGISTER_ULONG(0x48098028, 0x1);
-    WRITE_REGISTER_ULONG(0x4809802c, 0x112fdc);
-
-    /* Send the reset signal (R2 = 00h) to the NEC WVGA LCD Panel */
-    WRITE_REGISTER_ULONG(0x48098034, 0x1);
-    WRITE_REGISTER_ULONG(0x48098038, 0x20100);
-    WRITE_REGISTER_ULONG(0x48098034, 0x0);
-
-    /* Turn on the functional and interface clocks in the DSS domain */
-    WRITE_REGISTER_ULONG(0x48004e00, 0x5);
-    WRITE_REGISTER_ULONG(0x48004e10, 0x1);
-
-    /* Reset the Display Controller (DISPC) */
-    WRITE_REGISTER_ULONG(0x48050410, 0x00000005); // DISPC_SYSCONFIG
-    
-    /* Set the frame buffer address */
-	WRITE_REGISTER_ULONG(0x48050480, 0x800A0000); // DISPC_GFX_BA0
-
-	/* Set resolution and RGB16 color mode */
-	WRITE_REGISTER_ULONG(0x4805048c, 0x01df031f); // DISPC_GFX_SIZE
-	WRITE_REGISTER_ULONG(0x480504a0, 0x0000000d); // DISPC_GFX_ATTRIBUTES
-
-    /* Set LCD timings (VSync and HSync), pixel clock, and LCD size */
-	WRITE_REGISTER_ULONG(0x4805046c, 0x00003000); // DISPC_POL_FREQ
-	WRITE_REGISTER_ULONG(0x48050470, 0x00010004); // DISPC_DIVISOR
-	WRITE_REGISTER_ULONG(0x48050464, 0x00300500); // DISPC_TIMING_H
-	WRITE_REGISTER_ULONG(0x48050468, 0x00400300); // DISPC_TIMING_V
-	WRITE_REGISTER_ULONG(0x4805047c, 0x01df031f); // DISPC_SIZE_LCD
-
-    /* Turn the LCD on */
-	WRITE_REGISTER_ULONG(0x48050440, 0x00018309); // DISPC_CONTROL
-}
-
-ULONG
-NTAPI
-LlbHwGetScreenWidth(VOID)
-{
-    return 800;
-}
- 
-ULONG
-NTAPI
-LlbHwGetScreenHeight(VOID)
-{
-    return 480;
-}
-
-PVOID
-NTAPI
-LlbHwGetFrameBuffer(VOID)
-{
-    return (PVOID)0x800A0000;
-}
-
-ULONG
-NTAPI
-LlbHwVideoCreateColor(IN ULONG Red,
-                      IN ULONG Green,
-                      IN ULONG Blue)
-{
-    return (((Red >> 3) << 11)| ((Green >> 2) << 5)| ((Blue >> 3) << 0));
-}
-
-/* EOF */

boot/armllb/hw/omap3-zoom2/hwsynkp.c

@@ -1,83 +0,0 @@
-/*
- * PROJECT:         ReactOS Boot Loader
- * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            boot/armllb/hw/omap3-zoom2/hwsynkpd.c
- * PURPOSE:         LLB Synpatics Keypad Support for OMAP3 ZOOM 2
- * PROGRAMMERS:     ReactOS Portable Systems Group
- */
-
-#include "precomp.h"
-
-/* FUNCTIONS ******************************************************************/
-
-VOID
-NTAPI
-LlbHwOmap3SynKpdInitialize(VOID)
-{
-    /* Set GPIO pin 8 on the TWL4030 as an output pin */
-    LlbHwOmap3TwlWrite1(0x49, 0x9B, 0xC0);
-
-    /* Set GPIO pin 8 signal on the TWL4030 ON. This powers the keypad backlight */
-    LlbHwOmap3TwlWrite1(0x49, 0xA4, 0xC0);
-    
-    /* Set PENDDIS and COR on the the keypad interrupt controller */
-    LlbHwOmap3TwlWrite1(0x4A, 0xE9, 0x06);
-
-    /* Only falling edge detection for key pressed */
-    LlbHwOmap3TwlWrite1(0x4A, 0xE8, 0x01);
-    
-    /* Unmask key-pressed events */
-    LlbHwOmap3TwlWrite1(0x4A, 0xE4, 0x0E);
-
-    /* Set the keypad control register to turn hardware sequencing and turn it on */
-    LlbHwOmap3TwlWrite1(0x4A, 0xD2, 0x0);
-    LlbHwOmap3TwlRead1(0x4A, 0xE3);
-    LlbHwOmap3TwlWrite1(0x4A, 0xD2, 0x43);
-}
-
-UCHAR KeyboardMatrixStatus[8];
-BOOLEAN LastState = FALSE;
-
-BOOLEAN
-NTAPI
-LlbHwKbdReady(VOID)
-{
-    UCHAR Value;
-
-    Value = LlbHwOmap3TwlRead1(0x4A, 0xE3);
-    if (!Value) return FALSE;
-    
-    LastState ^= 1;
-    if (!LastState) return FALSE;
-    
-    /* Return whether or not an interrupt is pending */
-    return TRUE;
-}
-
-INT
-NTAPI
-LlbHwKbdRead(VOID)
-{
-    UCHAR ActiveCol = 0, ActiveRow = 0, col, coldata, row;
-    
-    for (col = 0; col < 8; col++)
-    {
-        coldata = LlbHwOmap3TwlRead1(0x4A, 0xDB + col);
-        if (coldata)
-        {
-            for (row = 0; row < 8; row++)
-            {
-                if (coldata == (1 << row))
-                {
-                    ActiveRow = row;
-                    ActiveCol = col;
-                    break;
-                }
-            }
-        }
-    }
-    
-    return ((ActiveCol << 4) | ActiveRow);
-}
-
-/* EOF */

boot/armllb/hw/omap3-zoom2/hwtwl40x.c

@@ -1,69 +0,0 @@
-/*
- * PROJECT:         ReactOS Boot Loader
- * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            boot/armllb/hw/omap3-zoom2/hwsynkpd.c
- * PURPOSE:         LLB Synpatics Keypad Support for OMAP3 ZOOM 2
- * PROGRAMMERS:     ReactOS Portable Systems Group
- */
-
-#include "precomp.h"
-
-/* FUNCTIONS ******************************************************************/
-
-UCHAR
-NTAPI
-LlbHwOmap3TwlRead1(IN UCHAR ChipAddress,
-                   IN UCHAR RegisterAddress)
-{
-    volatile int i = 1000;
-        
-    /* Select the register */
-    LlbHwOmap3TwlWrite(ChipAddress, RegisterAddress, 0, NULL);
-
-    /* Now read it */
-    WRITE_REGISTER_USHORT(0x48070024, 0x8401);
-    for (i = 1000; i > 0; i--);
-    return READ_REGISTER_USHORT(0x4807001c);
-}
-
-VOID
-NTAPI
-LlbHwOmap3TwlWrite(IN UCHAR ChipAddress,
-                   IN UCHAR RegisterAddress,
-                   IN UCHAR Length,
-                   IN PUCHAR Values)
-{
-    volatile int i = 1000;
-    ULONG j;
-
-    /* Select chip address */
-    WRITE_REGISTER_USHORT(0x4807002c, ChipAddress);
-    WRITE_REGISTER_USHORT(0x48070018, Length + 1);
-
-    /* Enable master transmit mode */
-    WRITE_REGISTER_USHORT(0x48070024, 0x8601);
-    WRITE_REGISTER_USHORT(0x4807001c, RegisterAddress);
-    
-    /* Loop each byte */
-    for (j = 0; j < Length; j++)
-    {
-        /* Write the data */
-        WRITE_REGISTER_USHORT(0x4807001c, Values[j]);
-    }
-
-    /* Issue stop command */
-    WRITE_REGISTER_USHORT(0x48070024, 0x8602);
-    for (i = 1000; i > 0; i--);
-}
-
-VOID
-NTAPI
-LlbHwOmap3TwlWrite1(IN UCHAR ChipAddress,
-                    IN UCHAR RegisterAddress,
-                    IN UCHAR Value)
-{
-    /* Do the actual write */
-    LlbHwOmap3TwlWrite(ChipAddress, RegisterAddress, 1, &Value);
-}
-
-/* EOF */

boot/armllb/hw/omap3-zoom2/hwuart.c

@@ -1,62 +0,0 @@
-/*
- * PROJECT:         ReactOS Boot Loader
- * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            boot/armllb/hw/omap3-zoom2/hwuart.c
- * PURPOSE:         LLB UART Initialization Routines for OMAP3 ZOOM2
- * PROGRAMMERS:     ReactOS Portable Systems Group
- */
-
-#include "precomp.h"
-#define SERIAL_REGISTER_STRIDE 2
-#include "lib/cportlib/cport.c"
-
-/* GLOBALS ********************************************************************/
-
-#define SERIAL_TL16CP754C_QUAD0_BASE (PVOID)0x10000000
-
-CPPORT LlbHwOmap3UartPorts[4] =
-{
-    {NULL, 0, 0},
-    {NULL, 0, 0},
-    {NULL, 0, 0},
-    {NULL, 0, 0}
-};
-
-/* FUNCTIONS ******************************************************************/
-
-VOID
-NTAPI
-LlbHwOmap3UartInitialize(VOID)
-{
-    CpInitialize(&LlbHwOmap3UartPorts[0], SERIAL_TL16CP754C_QUAD0_BASE, 115200);
-}
-
-VOID
-NTAPI
-LlbHwUartSendChar(IN CHAR Char)
-{
-    /* Send the character */
-    CpPutByte(&LlbHwOmap3UartPorts[0], Char);
-}
-
-BOOLEAN
-NTAPI
-LlbHwUartTxReady(VOID)
-{
-    /* TX output buffer is ready? */
-    return TRUE;
-}
-
-ULONG
-NTAPI
-LlbHwGetUartBase(IN ULONG Port)
-{
-    if (Port == 0)
-    {
-        return 0x10000000;
-    }
-    
-    return 0;
-}
-
-/* EOF */

boot/armllb/hw/omap3/hwinfo.c

@@ -0,0 +1,78 @@
+/*
+ * PROJECT:         ReactOS Boot Loader
+ * LICENSE:         BSD - See COPYING.ARM in the top level directory
+ * FILE:            boot/armllb/hw/omap3/hwinfo.c
+ * PURPOSE:         LLB Hardware Info Routines for OMAP3
+ * PROGRAMMERS:     ReactOS Portable Systems Group
+ */
+
+#include "precomp.h"
+
+ULONG
+NTAPI
+LlbHwGetScreenWidth(VOID)
+{
+    return 1280;
+}
+
+ULONG
+NTAPI
+LlbHwGetScreenHeight(VOID)
+{
+     return 720;
+}
+ 
+PVOID
+NTAPI
+LlbHwGetFrameBuffer(VOID)
+{
+    return (PVOID)0x80500000;
+}
+
+ULONG
+NTAPI
+LlbHwGetBoardType(VOID)
+{
+    return MACH_TYPE_OMAP3_BEAGLE;
+}
+
+ULONG
+NTAPI
+LlbHwGetPClk(VOID)
+{
+    return 48000000;
+}
+
+ULONG
+NTAPI
+LlbHwGetTmr0Base(VOID)
+{
+    return 0x48318000;
+}
+
+ULONG
+NTAPI
+LlbHwGetUartBase(IN ULONG Port)
+{
+    if (Port == 1)
+    {
+        return 0x4806A000;
+    }
+    else if (Port == 2)
+    {
+        return 0x4806C000;        
+    }
+    else if (Port == 3)
+    {
+        return 0x49020000;        
+    }
+}
+
+ULONG
+NTAPI
+LlbHwGetSerialUart(VOID)
+{
+    return 3;
+} 
+
+/* EOF */

boot/armllb/hw/omap3/hwinit.c

@@ -1,8 +1,8 @@
 /*
  * PROJECT:         ReactOS Boot Loader
  * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            boot/armllb/hw/omap3-beagle/hwinit.c
+ * FILE:            boot/armllb/hw/omap3/hwinit.c
- * PURPOSE:         LLB Hardware Initialization Routines for OMAP3 Beagle
+ * PURPOSE:         LLB Hardware Initialization Routines for OMAP3
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
 
@@ -12,7 +12,7 @@ VOID
 NTAPI
 LlbHwInitialize(VOID)
 {
-    while (TRUE);
+    
 }
 
 /* EOF */

boot/armllb/hw/time.c

@@ -11,12 +11,7 @@
 #define LEAPS_THRU_END_OF(y) ((y)/4 - (y)/100 + (y)/400)
 
 UCHAR LlbDaysInMonth[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-#ifndef _ZOOM2_
 TIMEINFO LlbTime;
-#else
-extern TIMEINFO LlbTime;
-#endif
 
 BOOLEAN
 NTAPI
@@ -87,10 +82,9 @@ LlbGetTime(VOID)
 
     /* Read RTC time */
     RtcTime = LlbHwRtcRead();
-#ifndef _ZOOM2_
+
     /* Convert it */
     LlbConvertRtcTime(RtcTime, &LlbTime);
-#endif
     return &LlbTime;
 }
 

boot/armllb/hw/video.c

@@ -326,11 +326,7 @@ LlbVideoClearScreen(IN BOOLEAN OsLoader)
     else
     {
         /* Deep blue */
-#ifdef BLUE_SCREEN
         BackColor = LlbHwVideoCreateColor(14, 0, 82);
-#else
-        BackColor = LlbHwVideoCreateColor(0, 0, 0);
-#endif
         BackColor = (BackColor << 16) | BackColor;
     }
     
@@ -350,12 +346,8 @@ LlbVideoPutChar(IN UCHAR c)
 {
     ULONG cx, cy, CharsPerLine, BackColor, ScreenWidth;
     
-    /* Backcolor on this machine */
+    /* Forecolor on this machine */
-#ifdef BLUE_SCREEN
+    BackColor = LlbHwVideoCreateColor(14, 0, 82);
-      BackColor = LlbHwVideoCreateColor(14, 0, 82);
-#else
-      BackColor = LlbHwVideoCreateColor(0, 0, 0);
-#endif
     
     /* Amount of characters in a line */
     ScreenWidth = LlbHwGetScreenWidth();

boot/armllb/inc/envir.h

@@ -25,11 +25,6 @@ typedef struct _ATAG_MEM
     ULONG Start;
 } ATAG_MEM, *PATAG_MEM;
 
-typedef struct _ATAG_REVISION
-{
-    ULONG Rev;
-} ATAG_REVISION, *PATAG_REVISION;
-
 typedef struct _ATAG_INITRD2
 {
     ULONG Start;
@@ -48,7 +43,6 @@ typedef struct _ATAG
     {
         ATAG_CORE Core;
         ATAG_MEM Mem;
-        ATAG_REVISION Revision;
         ATAG_INITRD2 InitRd2;
         ATAG_CMDLINE CmdLine;
     } u;

boot/armllb/inc/keyboard.h

@@ -12,10 +12,4 @@ LlbKeyboardGetChar(
     VOID
 );
 
-CHAR
-NTAPI
-LlbKeypadGetChar(
-    VOID
-);
-
 /* EOF */

boot/armllb/inc/machtype.h

@@ -24,9 +24,4 @@
 //
 #define MACH_TYPE_OMAP3_BEAGLE 1546
 
-//
-// LogicPD ZOOM-II MDK Board, OMAP3530 SoC
-//
-#define MACH_TYPE_OMAP_ZOOM2   1967
-
 /* EOF */

boot/armllb/inc/omap3.h

@@ -1,51 +0,0 @@
-/*
- * PROJECT:         ReactOS Boot Loader
- * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            boot/armllb/inc/omap3.h
- * PURPOSE:         LLB Board-Specific Hardware Functions for OMAP3
- * PROGRAMMERS:     ReactOS Portable Systems Group
- */
-
-VOID
-NTAPI
-LlbHwOmap3UartInitialize(
-    VOID
-);
-
-VOID
-NTAPI
-LlbHwOmap3LcdInitialize(
-    VOID
-);
-
-UCHAR
-NTAPI
-LlbHwOmap3TwlRead1(
-    IN UCHAR ChipAddress,
-    IN UCHAR RegisterAddress
-);
-
-VOID
-NTAPI
-LlbHwOmap3TwlWrite(
-    IN UCHAR ChipAddress,
-    IN UCHAR RegisterAddress,
-    IN UCHAR Length,
-    IN PUCHAR Values
-);
-
-VOID
-NTAPI
-LlbHwOmap3TwlWrite1(
-    IN UCHAR ChipAddress,
-    IN UCHAR RegisterAddress,
-    IN UCHAR Value
-);
-
-VOID
-NTAPI
-LlbHwOmap3SynKpdInitialize(
-    VOID
-);
-
-/* EOF */