Sync with trunk (r48008)

Bets are open : will this break anything?

svn path=/branches/reactos-yarotows/; revision=48024

ReactOS-arm.rbuild

@@ -91,6 +91,9 @@
 				<xi:include href="lib/sdk/crt/crt.rbuild" />
 				<xi:include href="lib/sdk/crt/libcntpr.rbuild" />
 			</directory>
+			<directory name="ioevent">
+				<xi:include href="lib/sdk/ioevent/ioevent.rbuild" />
+			</directory>
 			<directory name="nt">
 				<xi:include href="lib/sdk/nt/nt.rbuild" />
 			</directory>

base/applications/cmdutils/reg/Ro.rc

@@ -0,0 +1,40 @@
+/*
+ * REG.EXE - Wine-compatible reg program.
+ *
+ * Copyright 2008 Andrew Riedi
+ * Copyright 2010 Claudia Cotună
+ *                Michael Stefaniuc
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "reg.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+STRINGTABLE
+{
+    STRING_USAGE, "Sintaxa acestei comenzi este:\n\nREG [ ADD | DELETE | QUERY ]\nREG comandă /?\n"
+    STRING_ADD_USAGE, "REG ADD nume_cheie [/v nume_valoare | /ve] [/t tip] [/s separator] [/d date] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE nume_cheie [/v nume_valoare | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY nume_cheie [/v nume_valoare | /ve] [/s]\n"
+    STRING_SUCCESS, "Operațiunea a fost finalizată cu succes\n"
+    STRING_INVALID_KEY, "Eroare: Nume de cheie nevalid\n"
+    STRING_INVALID_CMDLINE, "Eroare: Parametri nevalizi pentru linia de comandă\n"
+    STRING_NO_REMOTE, "Eroare: Nu se pot adăuga chei pe calculatorul de la distanță\n"
+    STRING_CANNOT_FIND, "Eroare: Sistemul nu a putut găsi cheia sau valoarea de registru specificată\n"
+}

base/applications/cmdutils/reg/rsrc.rc

@@ -13,6 +13,7 @@
 #include "Lt.rc"
 #include "No.rc"
 #include "Pt.rc"
+#include "Ro.rc"
 #include "Ru.rc"
 #include "Si.rc"
 #include "Uk.rc"

base/applications/cmdutils/xcopy/En.rc

@@ -53,8 +53,8 @@ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \n\
 Where:\n\
 \n\
-[/I]  Assume directory if destination does not exist and copying 2 or\n\
+[/I]  Assume directory if destination does not exist and copying two or\n\
-\tmore files\n\
+\      more files\n\
 [/S]  Copy directories and subdirectories\n\
 [/E]  Copy directories and subdirectories, including any empty ones\n\
 [/Q]  Do not list names during copy, ie quiet.\n\
@@ -72,7 +72,7 @@ Where:\n\
 [/C]  Continue even if an error occurs during the copy\n\
 [/A]  Only copy files with archive attribute set\n\
 [/M]  Only copy files with archive attribute set, removes\n\
-\tarchive attribute\n\
+\      archive attribute\n\
 [/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\
 \t\tIf no date is supplied, only copy if destination is older\n\
 \t\tthan source\n\n"

base/applications/cmdutils/xcopy/Ro.rc

@@ -0,0 +1,80 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ *
+ * Copyright (C) 2007 J. Edmeades
+ * Copyright (C) 2010 Claudia Cotună
+ *                    Michael Stefaniuc
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "xcopy.h"
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+STRINGTABLE
+{
+    STRING_INVPARMS, "Număr de parametri nevalid - Utilizați xcopy /? pentru ajutor\n"
+    STRING_INVPARM,  "Parametru nevalid „%s” -  Utilizați xcopy /? pentru ajutor\n"
+    STRING_PAUSE,    "Apăsați pe <enter> pentru a începe copierea\n"
+    STRING_SIMCOPY,  "%d fișier(e) ar fi copiat(e)\n"
+    STRING_COPY,     "%d fișier(e) copiat(e)\n"
+    STRING_QISDIR,   "„%s” este un nume de fișier sau un director\ndin destinație?\n(F - Fișier, D - Director)\n"
+    STRING_SRCPROMPT,"%s? (Da|Nu)\n"
+    STRING_OVERWRITE,"Se suprascrie %s? (Da|Nu|Toate)\n"
+    STRING_COPYFAIL, "Copierea „%s” în „%s” a eșuat cu cod de retur %d\n"
+    STRING_OPENFAIL, "Deschiderea „%s” a eșuat\n"
+    STRING_READFAIL, "Citirea „%s” a eșuat\n"
+    STRING_YES_CHAR, "D"
+    STRING_NO_CHAR,  "N"
+    STRING_ALL_CHAR, "T"
+    STRING_FILE_CHAR,"F"
+    STRING_DIR_CHAR, "D"
+
+    STRING_HELP,
+"XCOPY - Copiază fișiere sau arbori de directoare sursă într-o destinație\n\
+\n\
+Sintaxă:\n\
+XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
+\            [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\nCu:\n\
+\n\
+[/I]  Creează director dacă destinația nu există și se copiază două sau\n\
+\      mai multe fișiere\n\
+[/S]  Copiază directoarele și subdirectoarele\n\
+[/E]  Copiază directoarele și subdirectoarele, inclusiv pe cele goale\n\
+[/Q]  Nu afișa numele în timpul copierii.\n\
+[/F]  Arată numele întreg pentru sursă și destinație în timpul copierii\n\
+[/L]  Simulează operațiunea, afișând numele care ar fi copiate\n\
+[/W]  Solicită confirmarea înainte de a începe copierea\n\
+[/T]  Creează o structură de directoare goale, dar nu copiază fișiere\n\
+[/Y]  Nu solicita confirmarea la suprascrierea fișierelor\n\
+[/-Y] Solicită confirmarea la suprascrierea fișierelor\n\
+[/P]  Solicită confirmarea înainte de copierea fiecărui fișier sursă\n\
+[/N]  Copiază utilizând prescurtări de nume\n\
+[/U]  Copiază numai fișierele care există deja în destinație\n\
+[/R]  Suprascrie orice fișiere cu protecție la modificări\n\
+[/H]  Include în copie fișierele ascunse și de sistem\n\
+[/C]  Continuă chiar dacă apare o eroare în timpul copierii\n\
+[/A]  Copiază numai fișierele cu atributul de arhivă activat\n\
+[/M]  Copiază numai fișierele cu atributul de arhivă activat, dezactivează\n\
+\      apoi atributul\n\
+[/D | /D:m-d-y] Copiază fișierele noi sau pe cele modificate după data\n\
+\t\tspecificată. Dacă nu este specificată nici o dată, copiază\n\
+\t\tnumai dacă fișierul destinație este mai vechi decât fișierul\n\
+\t\tsursă\n\n"
+}

base/applications/cmdutils/xcopy/Ru.rc

@@ -35,7 +35,7 @@ STRINGTABLE
     STRING_INVPARM,
 "Недопустимый параметр '%s' - попробуйте 'xcopy /?' для получения подробного\n\
 описания.\n"
-    STRING_PAUSE,    "Нажмите клавишу <enter>, чтобы начать копирование.\n"
+    STRING_PAUSE,    "Нажмите клавишу <Enter>, чтобы начать копирование.\n"
     STRING_SIMCOPY,  "%d файл(ов) было бы скопировано.\n"
     STRING_COPY,     "%d файл(ов) скопировано.\n"
     STRING_QISDIR,   "'%s' является файлом или папкой?\n" \

base/applications/cmdutils/xcopy/rsrc.rc

@@ -40,6 +40,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "Ja.rc"
 #include "Lt.rc"
 #include "Nl.rc"
+#include "Ro.rc"
 #include "Ru.rc"
 #include "Si.rc"
 #include "Uk.rc"

base/applications/games/spider/lang/uk-UA.rc

@@ -3,7 +3,7 @@
  * LICENSE:    GPL - See COPYING in the top level directory
  * FILE:    base/applications/games/spider/lang/uk-UA.rc
  * PURPOSE:    Ukraianian Language File for ReactOS  Spider
- * TRANSLATOR:    Sakara Yevhen
+ * TRANSLATORS:    Sakara Yevhen, Igor Paliychuk
  */
 
  
@@ -41,9 +41,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "гâåíü"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "Ïðîñòèé: &Îäèí êîë³ð",    IDC_DIF_ONECOLOR,   8, 10, 80, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "Ïðîñòèé: &Îäèí êîë³ð",    IDC_DIF_ONECOLOR,   3, 10, 82, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "Ñåðåäí³é: &Äâà êîëüîðè", IDC_DIF_TWOCOLORS,  8, 23, 80, 10
+    AUTORADIOBUTTON "Ñåðåäí³é: &Äâà êîëüîðè", IDC_DIF_TWOCOLORS,  3, 23, 92, 10
-    AUTORADIOBUTTON "Ñêëàäíèé: &×îòèðè êîëüîðè",  IDC_DIF_FOURCOLORS, 8, 36, 80, 10
+    AUTORADIOBUTTON "Ñêëàäíèé: &×îòèðè êîëüîðè",  IDC_DIF_FOURCOLORS, 3, 36, 120, 10
 
     DEFPUSHBUTTON   "OK", IDOK, 8, 58, 40, 14
     PUSHBUTTON      "Ñêàñóâàòè", IDCANCEL, 58, 58, 40, 14
@@ -56,7 +56,7 @@ BEGIN
     IDS_SPI_NAME    "Ïàñ’ÿíñ Ïàóê"
     IDS_SPI_ABOUT   "Ïàñ’ÿíñ Ïàóê, Gregor Schneider\n\nCardLib âåðñ³¿ 1.0"
     IDS_SPI_QUIT    "Âèéòè ç ïîòî÷íî¿ ãðè?"
-    IDS_SPI_WIN     "³òàºìî, âè âèãðàòè!"
+    IDS_SPI_WIN     "³òàºìî, âè âèãðàëè!"
     IDS_SPI_DEAL    "Ñïðîáóâàòè çíîâó?"
 END
 

base/applications/games/winemine/lang/uk-UA.rc

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/applications/games/winemine/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for WineMine
- * TRANSLATOR:  Artem Reznikov
+ * TRANSLATORS:  Artem Reznikov, Igor Paliychuk
  */
 
 #include "resource.h"
@@ -56,7 +56,7 @@ BEGIN
 	LTEXT           "",              IDC_NAME2, 132,  30,  55,   8
 	LTEXT           "",              IDC_NAME3, 132,  40,  55,   8
 	DEFPUSHBUTTON   "OK",           IDOK,      127,  57,  50,  15
-	PUSHBUTTON      "&Ñêèäàííÿ ðåçóëüòàò³â", IDRESET,    18,  57,  67,  15
+	PUSHBUTTON      "&Ñêèäàííÿ ðåçóëüòàò³â", IDRESET,    18,  57,  77,  15
 END
 
 IDD_CONGRATS DIALOGEX DISCARDABLE  0, 0, 160, 60

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

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/applications/msconfig/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for msconfig
- * TRANSLATOR:  Rostislav Zabolotny, Artem Reznikov
+ * TRANSLATORS:  Rostislav Zabolotny, Artem Reznikov, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -73,12 +73,12 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
  GROUPBOX "Âàð³àíòè çàâàíòàæåííÿ", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
- CONTROL "&Çâè÷àéíå çàâàíòàæåííÿ - çàâàíòàæóâàòè âñ³ äðàéâåðè ³ ñëóæáè", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
+ CONTROL "&Çâè÷àéíå çàâàíòàæåííÿ - çàâàíòàæóâàòè âñ³ äðàéâåðè ³ ñëóæáè", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 232, 10
- CONTROL "&Ñêîðî÷åíå çàâàíòàæåííÿ - çóâàíòàæóâàòè ò³ëüêè îñíîâí³ äðàéâåðè ³ ñëóæáè", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
+ CONTROL "&Ñêîðî÷åíå çàâàíòàæåííÿ - çóâàíòàæóâàòè ò³ëüêè îñíîâí³ äðàéâåðè ³ ñëóæáè", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 275, 10
- CONTROL "Âè&á³ðêîâå çàâàíòàæåííÿ", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
+ CONTROL "Âè&á³ðêîâå çàâàíòàæåííÿ", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 95, 10
- AUTOCHECKBOX "Îá&ðîáëÿòè ôàéë SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
+ AUTOCHECKBOX "Îá&ðîáëÿòè ôàéë SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 110, 10
- AUTOCHECKBOX "Çà&âàíòàæóâàòè ñèñòåìí³ ñëóæáè", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
+ AUTOCHECKBOX "Çà&âàíòàæóâàòè ñèñòåìí³ ñëóæáè", IDC_CBX_SYSTEM_SERVICE, 30, 95, 122, 10
- AUTOCHECKBOX "Çàâàíòàæóâàòè åëåìåíòè &àâòîçàâàíòàæåííÿ", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
+ AUTOCHECKBOX "Çàâàíòàæóâàòè åëåìåíòè &àâòîçàâàíòàæåííÿ", IDC_CBX_STARTUP_ITEM, 30, 110, 175, 10
 END
 
 IDD_FREELDR_PAGE DIALOGEX DISCARDABLE  0, 0, 362, 175
@@ -86,10 +86,10 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
    CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
-   PUSHBUTTON    "&Âèáðàòè âñ³ øëÿõè çàâàíòàæåííÿ", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
+   PUSHBUTTON    "&Âèáðàòè âñ³ øëÿõè", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-   PUSHBUTTON    "&Âñòàíîâèòè çà çàìîâ÷óâàííÿì", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12
+   PUSHBUTTON    "&Âñòàíîâèòè ñòàíäàðòíî", IDC_BTN_SET_DEFAULT_BOOT, 92, 65, 88, 12
    PUSHBUTTON    "Ïåðåì³ñòèòè Ââ&åðõ", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
-   PUSHBUTTON    "Ïåðåì³ñòèòè äî &íèçó", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
+   PUSHBUTTON    "Ïåðåì³ñòèòè Â&íèç", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
    GROUPBOX "Âàð³àíòè çàâàíòàæåííÿ", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
    CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
    CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
@@ -97,7 +97,7 @@ BEGIN
    CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
    CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
    PUSHBUTTON "Ä&îäàòêîâî...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
-   LTEXT "&Çàòðèìêà:", -1, 280, 91, 30, 10
+   LTEXT "&Çàòðèìêà:", -1, 275, 91, 33, 10
    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
    LTEXT "ñåê.", -1, 340, 91, 15, 10
 END

base/applications/mscutils/eventvwr/eventvwr.c

@@ -757,6 +757,7 @@ InitInstance(HINSTANCE hInstance,
 {
     HIMAGELIST hSmall;
     LVCOLUMNW lvc = {0};
+    WCHAR szTemp[256];
 
     hInst = hInstance; // Store instance handle in our global variable
 
@@ -820,39 +821,75 @@ InitInstance(HINSTANCE hInstance,
     // Now set up the listview with its columns.
     lvc.mask = LVCF_TEXT | LVCF_WIDTH;
     lvc.cx = 90;
-    lvc.pszText = L"Type";
+    LoadStringW(hInstance,
+                IDS_COLUMNTYPE,
+                szTemp,
+                sizeof(szTemp) / sizeof(WCHAR));
+    lvc.pszText = szTemp;
     (void)ListView_InsertColumn(hwndListView, 0, &lvc);
 
     lvc.cx = 70;
-    lvc.pszText = L"Date";
+    LoadStringW(hInstance,
+                IDS_COLUMNDATE,
+                szTemp,
+                sizeof(szTemp) / sizeof(WCHAR));
+    lvc.pszText = szTemp;
     (void)ListView_InsertColumn(hwndListView, 1, &lvc);
 
     lvc.cx = 70;
-    lvc.pszText = L"Time";
+    LoadStringW(hInstance,
+                IDS_COLUMNTIME,
+                szTemp,
+                sizeof(szTemp) / sizeof(WCHAR));
+    lvc.pszText = szTemp;
     (void)ListView_InsertColumn(hwndListView, 2, &lvc);
 
     lvc.cx = 150;
-    lvc.pszText = L"Source";
+    LoadStringW(hInstance,
+                IDS_COLUMNSOURCE,
+                szTemp,
+                sizeof(szTemp) / sizeof(WCHAR));
+    lvc.pszText = szTemp;
     (void)ListView_InsertColumn(hwndListView, 3, &lvc);
 
     lvc.cx = 100;
-    lvc.pszText = L"Category";
+    LoadStringW(hInstance,
+                IDS_COLUMNCATEGORY,
+                szTemp,
+                sizeof(szTemp) / sizeof(WCHAR));
+    lvc.pszText = szTemp;
     (void)ListView_InsertColumn(hwndListView, 4, &lvc);
 
     lvc.cx = 60;
-    lvc.pszText = L"Event";
+    LoadStringW(hInstance,
+                IDS_COLUMNEVENT,
+                szTemp,
+                sizeof(szTemp) / sizeof(WCHAR));
+    lvc.pszText = szTemp;
     (void)ListView_InsertColumn(hwndListView, 5, &lvc);
 
     lvc.cx = 120;
-    lvc.pszText = L"User";
+    LoadStringW(hInstance,
+                IDS_COLUMNUSER,
+                szTemp,
+                sizeof(szTemp) / sizeof(WCHAR));
+    lvc.pszText = szTemp;
     (void)ListView_InsertColumn(hwndListView, 6, &lvc);
 
     lvc.cx = 100;
-    lvc.pszText = L"Computer";
+    LoadStringW(hInstance,
+                IDS_COLUMNCOMPUTER,
+                szTemp,
+                sizeof(szTemp) / sizeof(WCHAR));
+    lvc.pszText = szTemp;
     (void)ListView_InsertColumn(hwndListView, 7, &lvc);
 
     lvc.cx = 0;
-    lvc.pszText = L"Event Data";
+    LoadStringW(hInstance,
+                IDS_COLUMNEVENTDATA,
+                szTemp,
+                sizeof(szTemp) / sizeof(WCHAR));
+    lvc.pszText = szTemp;
     (void)ListView_InsertColumn(hwndListView, 8, &lvc);
 
     ShowWindow(hwndMainWindow, nCmdShow);

base/applications/mscutils/eventvwr/lang/bg-BG.rc

@@ -83,8 +83,21 @@ BEGIN
     CONTROL         "&Думи",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,85,194,33,10
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_APP_TITLE				      "Преглед на събития"
   	 IDC_EVENTSTRINGIDNOTFOUND	"Не е намерено описанието на събитие ( %lu ) в източник ( %s ). Възможно е местият компютър да няма нужните сведения в регистъра или DLL файловет, нужни за показване на съобщения от отдалечен компютър."
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Type"
+    IDS_COLUMNDATE      "Date"
+    IDS_COLUMNTIME      "Time"
+    IDS_COLUMNSOURCE    "Source"
+    IDS_COLUMNCATEGORY  "Category"
+    IDS_COLUMNEVENT     "Event"
+    IDS_COLUMNUSER      "User"
+    IDS_COLUMNCOMPUTER  "Computer"
+    IDS_COLUMNEVENTDATA "Event Data"
+END

base/applications/mscutils/eventvwr/lang/de-DE.rc

@@ -102,3 +102,16 @@ BEGIN
 	IDC_EVENTLOG_SUCCESS           "Erfolgreich"
 	IDC_EVENTLOG_UNKNOWN_TYPE      "Unbekanntes Ereignis"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Typ"
+    IDS_COLUMNDATE      "Datum"
+    IDS_COLUMNTIME      "Zeit"
+    IDS_COLUMNSOURCE    "Quelle"
+    IDS_COLUMNCATEGORY  "Kategorie"
+    IDS_COLUMNEVENT     "Ereignis"
+    IDS_COLUMNUSER      "Benutzer"
+    IDS_COLUMNCOMPUTER  "Computer"
+    IDS_COLUMNEVENTDATA "Ereignisdaten"
+END

base/applications/mscutils/eventvwr/lang/el-GR.rc

@@ -102,3 +102,16 @@ BEGIN
 	IDC_EVENTLOG_SUCCESS           "Επιτυχία"
 	IDC_EVENTLOG_UNKNOWN_TYPE      "’γνωστο συμβάν"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Type"
+    IDS_COLUMNDATE      "Date"
+    IDS_COLUMNTIME      "Time"
+    IDS_COLUMNSOURCE    "Source"
+    IDS_COLUMNCATEGORY  "Category"
+    IDS_COLUMNEVENT     "Event"
+    IDS_COLUMNUSER      "User"
+    IDS_COLUMNCOMPUTER  "Computer"
+    IDS_COLUMNEVENTDATA "Event Data"
+END

base/applications/mscutils/eventvwr/lang/en-US.rc

@@ -102,3 +102,16 @@ BEGIN
 	IDC_EVENTLOG_SUCCESS           "Success"
 	IDC_EVENTLOG_UNKNOWN_TYPE      "Unknown Event"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Type"
+    IDS_COLUMNDATE      "Date"
+    IDS_COLUMNTIME      "Time"
+    IDS_COLUMNSOURCE    "Source"
+    IDS_COLUMNCATEGORY  "Category"
+    IDS_COLUMNEVENT     "Event"
+    IDS_COLUMNUSER      "User"
+    IDS_COLUMNCOMPUTER  "Computer"
+    IDS_COLUMNEVENTDATA "Event Data"
+END

base/applications/mscutils/eventvwr/lang/es-ES.rc

@@ -102,3 +102,16 @@ BEGIN
 	IDC_EVENTLOG_SUCCESS           "Acierto"
 	IDC_EVENTLOG_UNKNOWN_TYPE      "Evento Desconocido"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Tipo"
+    IDS_COLUMNDATE      "Fecha"
+    IDS_COLUMNTIME      "Hora"
+    IDS_COLUMNSOURCE    "Origen"
+    IDS_COLUMNCATEGORY  "Categoría"
+    IDS_COLUMNEVENT     "Evento"
+    IDS_COLUMNUSER      "Usuario"
+    IDS_COLUMNCOMPUTER  "Computadora"
+    IDS_COLUMNEVENTDATA "Datos del evento"
+END

base/applications/mscutils/eventvwr/lang/fr-FR.rc

@@ -102,3 +102,16 @@ BEGIN
 	IDC_EVENTLOG_SUCCESS           "Succès"
 	IDC_EVENTLOG_UNKNOWN_TYPE      "Événement Inconnu"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Type"
+    IDS_COLUMNDATE      "Date"
+    IDS_COLUMNTIME      "Heure"
+    IDS_COLUMNSOURCE    "Source"
+    IDS_COLUMNCATEGORY  "Catégorie"
+    IDS_COLUMNEVENT     "Événement"
+    IDS_COLUMNUSER      "Utilisateur"
+    IDS_COLUMNCOMPUTER  "Ordinateur"
+    IDS_COLUMNEVENTDATA "Données"
+END

base/applications/mscutils/eventvwr/lang/it-IT.rc

@@ -102,3 +102,16 @@ BEGIN
 	IDC_EVENTLOG_SUCCESS           "Successo"
 	IDC_EVENTLOG_UNKNOWN_TYPE      "Evento sconosciuto"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Tipo"
+    IDS_COLUMNDATE      "Data"
+    IDS_COLUMNTIME      "Ora"
+    IDS_COLUMNSOURCE    "Origine"
+    IDS_COLUMNCATEGORY  "Categoria"
+    IDS_COLUMNEVENT     "Evento"
+    IDS_COLUMNUSER      "Utente"
+    IDS_COLUMNCOMPUTER  "Computer"
+    IDS_COLUMNEVENTDATA "Dati Evento"
+END

base/applications/mscutils/eventvwr/lang/ja-JP.rc

@@ -102,3 +102,16 @@ BEGIN
 	IDC_EVENTLOG_SUCCESS           "成功"
 	IDC_EVENTLOG_UNKNOWN_TYPE      "不明なイベント"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Type"
+    IDS_COLUMNDATE      "Date"
+    IDS_COLUMNTIME      "Time"
+    IDS_COLUMNSOURCE    "Source"
+    IDS_COLUMNCATEGORY  "Category"
+    IDS_COLUMNEVENT     "Event"
+    IDS_COLUMNUSER      "User"
+    IDS_COLUMNCOMPUTER  "Computer"
+    IDS_COLUMNEVENTDATA "Event Data"
+END

base/applications/mscutils/eventvwr/lang/ko-KR.rc

@@ -98,3 +98,16 @@ BEGIN
 	IDC_EVENTLOG_SUCCESS           "성공"
 	IDC_EVENTLOG_UNKNOWN_TYPE      "알려지지 않은 이벤트"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Type"
+    IDS_COLUMNDATE      "Date"
+    IDS_COLUMNTIME      "Time"
+    IDS_COLUMNSOURCE    "Source"
+    IDS_COLUMNCATEGORY  "Category"
+    IDS_COLUMNEVENT     "Event"
+    IDS_COLUMNUSER      "User"
+    IDS_COLUMNCOMPUTER  "Computer"
+    IDS_COLUMNEVENTDATA "Event Data"
+END

base/applications/mscutils/eventvwr/lang/no-NO.rc

@@ -102,3 +102,16 @@ BEGIN
 	IDC_EVENTLOG_SUCCESS           "Suksess"
 	IDC_EVENTLOG_UNKNOWN_TYPE      "Ukjent hendelse"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Type"
+    IDS_COLUMNDATE      "Date"
+    IDS_COLUMNTIME      "Time"
+    IDS_COLUMNSOURCE    "Source"
+    IDS_COLUMNCATEGORY  "Category"
+    IDS_COLUMNEVENT     "Event"
+    IDS_COLUMNUSER      "User"
+    IDS_COLUMNCOMPUTER  "Computer"
+    IDS_COLUMNEVENTDATA "Event Data"
+END

base/applications/mscutils/eventvwr/lang/pl-PL.rc

@@ -106,3 +106,16 @@ BEGIN
 	IDC_EVENTLOG_SUCCESS           "Sukces"
 	IDC_EVENTLOG_UNKNOWN_TYPE      "Zdarzenie nieznane"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Typ"
+    IDS_COLUMNDATE      "Data"
+    IDS_COLUMNTIME      "Czas"
+    IDS_COLUMNSOURCE    "蓤鏚這"
+    IDS_COLUMNCATEGORY  "Kategoria"
+    IDS_COLUMNEVENT     "Zdarzenie"
+    IDS_COLUMNUSER      "U篡tkownik"
+    IDS_COLUMNCOMPUTER  "Komputer"
+    IDS_COLUMNEVENTDATA "Dane zdarzenia"
+END

base/applications/mscutils/eventvwr/lang/ro-RO.rc

@@ -102,3 +102,16 @@ BEGIN
 	IDC_EVENTLOG_SUCCESS           "Succes"
 	IDC_EVENTLOG_UNKNOWN_TYPE      "Eveniment necunoscut"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Type"
+    IDS_COLUMNDATE      "Date"
+    IDS_COLUMNTIME      "Time"
+    IDS_COLUMNSOURCE    "Source"
+    IDS_COLUMNCATEGORY  "Category"
+    IDS_COLUMNEVENT     "Event"
+    IDS_COLUMNUSER      "User"
+    IDS_COLUMNCOMPUTER  "Computer"
+    IDS_COLUMNEVENTDATA "Event Data"
+END

base/applications/mscutils/eventvwr/lang/ru-RU.rc

@@ -102,3 +102,16 @@ BEGIN
 	IDC_EVENTLOG_SUCCESS           "<22><><EFBFBD><EFBFBD><EFBFBD>"
 	IDC_EVENTLOG_UNKNOWN_TYPE      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Type"
+    IDS_COLUMNDATE      "Date"
+    IDS_COLUMNTIME      "Time"
+    IDS_COLUMNSOURCE    "Source"
+    IDS_COLUMNCATEGORY  "Category"
+    IDS_COLUMNEVENT     "Event"
+    IDS_COLUMNUSER      "User"
+    IDS_COLUMNCOMPUTER  "Computer"
+    IDS_COLUMNEVENTDATA "Event Data"
+END

base/applications/mscutils/eventvwr/lang/sk-SK.rc

@@ -99,3 +99,16 @@ BEGIN
 	IDC_EVENTLOG_SUCCESS           "Úspech" //Success
 	IDC_EVENTLOG_UNKNOWN_TYPE      "Neznáma udalos<6F>"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Type"
+    IDS_COLUMNDATE      "Date"
+    IDS_COLUMNTIME      "Time"
+    IDS_COLUMNSOURCE    "Source"
+    IDS_COLUMNCATEGORY  "Category"
+    IDS_COLUMNEVENT     "Event"
+    IDS_COLUMNUSER      "User"
+    IDS_COLUMNCOMPUTER  "Computer"
+    IDS_COLUMNEVENTDATA "Event Data"
+END

base/applications/mscutils/eventvwr/lang/uk-UA.rc

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/applications/mscutils/eventvwr/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for ReactOS Event Viewer
- * TRANSLATORS: Rostislav Zabolotny, Artem Reznikov
+ * TRANSLATORS: Rostislav Zabolotny, Artem Reznikov, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -102,3 +102,16 @@ BEGIN
 	IDC_EVENTLOG_SUCCESS           "Óñï³õ"
 	IDC_EVENTLOG_UNKNOWN_TYPE      "Íåâ³äîìà ïîä³ÿ"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_COLUMNTYPE      "Òèï"
+    IDS_COLUMNDATE      "Äàòà"
+    IDS_COLUMNTIME      "×àñ"
+    IDS_COLUMNSOURCE    "Äæåðåëî"
+    IDS_COLUMNCATEGORY  "Êàòåãîð³ÿ"
+    IDS_COLUMNEVENT     "Ïîä³ÿ"
+    IDS_COLUMNUSER      "Êîðèñòóâà÷"
+    IDS_COLUMNCOMPUTER  "Êîìï'þòåð"
+    IDS_COLUMNEVENTDATA "Äàí³ ïî䳿"
+END

base/applications/mscutils/eventvwr/resource.h

@@ -1,7 +1,3 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by eventvwr.rc
-//
 #define IDC_MYICON                      2
 #define IDNEXT                          3
 #define IDD_EVENTVWR_DIALOG             102
@@ -54,14 +50,13 @@
 #define IDM_REFRESH                     32782
 #define IDC_STATIC                      -1
 
-// Next default values for new objects
+
-//
+#define IDS_COLUMNTYPE                  300
-#ifdef APSTUDIO_INVOKED
+#define IDS_COLUMNDATE                  301
-#ifndef APSTUDIO_READONLY_SYMBOLS
+#define IDS_COLUMNTIME                  302
-#define _APS_NO_MFC                     1
+#define IDS_COLUMNSOURCE                303
-#define _APS_NEXT_RESOURCE_VALUE        133
+#define IDS_COLUMNCATEGORY              304
-#define _APS_NEXT_COMMAND_VALUE         32783
+#define IDS_COLUMNEVENT                 305
-#define _APS_NEXT_CONTROL_VALUE         1012
+#define IDS_COLUMNUSER                  306
-#define _APS_NEXT_SYMED_VALUE           110
+#define IDS_COLUMNCOMPUTER              307
-#endif
+#define IDS_COLUMNEVENTDATA             308
-#endif

base/applications/mscutils/servman/lang/uk-UA.rc

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/applications/mscutils/servman/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for devmgmt
- * TRANSLATOR:  Artem Reznikov
+ * TRANSLATORS:  Artem Reznikov, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -155,6 +155,19 @@ BEGIN
   DEFPUSHBUTTON "Скасувати", IDCANCEL, 102, 129, 54, 13
 END
 
+IDD_DLG_DEPEND_STOP DIALOGEX 6,6,240,148
+CAPTION "Çóïèíêà ³íøèõ ñëóæá"
+FONT 8, "MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME
+BEGIN
+  ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22
+  LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25
+  LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL
+  LTEXT "Âè õî÷åòå çóïèíèòè ö³ ñëóæáè?",IDC_STATIC, 15, 110, 150, 10
+  DEFPUSHBUTTON "Òàê", IDOK, 60, 129, 54, 14
+  PUSHBUTTON "ͳ", IDCANCEL, 120, 129, 54, 14
+END
+
 IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150
 CAPTION "Настройки"
 FONT 8, "MS Shell Dlg",0,0
@@ -198,8 +211,8 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_NUM_SERVICES "Íîìåð ñëóæáè: %d"
+  IDS_NUM_SERVICES "Hîìåð ñëóæáè: %d"
-  IDS_STOP_DEPENDS "Êîëè %s çóïèíåòüñÿ, ³íø³ ñëóæáè òàêîæ áóäå çóïèíåíî"
+  IDS_STOP_DEPENDS "Êîëè %s çóïèíåòüñÿ, íàñòóïí³ ñëóæáè òàêîæ áóäå çóïèíåíî"
   IDS_NO_DEPENDS "<No Dependencies>"
   IDS_LICENSE "Це вільне програмне забезпечення; Ви можете розповсюджувати її та змінювати, дотримуючись умови Відкритої ліцензійної угоди GNU, опублікованої Фондом вільного програмного забезпечення; або редакції 2 Угоди, або будь-якої редакції, випущеної пізніше.\r\n\r\nЦя програма розповсюджується в надії на те, що вона виявиться корисною, але БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ, включаючи УЯВНОЮ ГАРАНТІЄЮ ЯКОСТІ або ПРИДАТНОСТІ для певних цілей. Подробиці містяться у Відкритій ліцензійній угоді GNU.\r\n\r\nРазом з цією програмою повинен поширюватися примірник Відкритої ліцензійної угоди GNU. Якщо він відсутній, повідомте про це в Фонд вільного програмного забезпечення (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END

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

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/applications/mstsc/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for mstsc
- * TRANSLATOR:  Artem Reznikov
+ * TRANSLATORS:  Artem Reznikov, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -16,8 +16,8 @@ BEGIN
     GROUPBOX        "Ïàðàìåòðè ï³äêëþ÷åííÿ",IDC_STATIC,7,103,228,65
     ICON            "", IDC_LOGONICON, 15,19,20,20
     LTEXT           "Ââåä³òü àäðåñó ñåðâåðà",IDC_STATIC,47,24,81,8
-    LTEXT           "Сервер:",IDC_STATIC,47,41,25,8
+    LTEXT           "Сервер:",IDC_STATIC,47,41,27,8
-    LTEXT           "Користувач:",IDC_STATIC,47,58,38,8
+    LTEXT           "Користувач:",IDC_STATIC,47,58,41,8
     COMBOBOX        IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Çáåðåãòè",IDC_SAVE,67,139,50,14
     PUSHBUTTON      "Çáåðåãòè ÿê...",IDC_SAVEAS,123,139,50,14
@@ -30,23 +30,23 @@ IDD_DISPLAY DIALOGEX 0, 0, 242, 175
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    GROUPBOX        "Розмір віддаленого робочого стола",IDC_STATIC,7,7,228,68
+    GROUPBOX        "Розмір віддаленого робочого столу",IDC_STATIC,7,7,228,71
     GROUPBOX        "Êîë³ðíà ïàë³òðà",IDC_STATIC,7,83,228,85
     ICON            "", IDC_REMICON, 15,19,20,20
     ICON            "", IDC_COLORSICON, 15,98,20,20
-    LTEXT           "Укажіть розмір віддаленого робочого стола. Перетягніть повзунок праворуч до кінця, щоб перейти у повноекранний режим",IDC_STATIC,53,22,175,21
+    LTEXT           "Вкажіть розмір віддаленого робочого столу. Перетягніть повзунок праворуч до кінця, щоб перейти у повноекранний режим",IDC_STATIC,53,15,175,24
-    CONTROL         "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17
+    CONTROL         "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 45, 124, 17
     COMBOBOX        IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     CONTROL         "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10
-    LTEXT           "Примітка: параметри на віддаленому комп'ютері можуть перекривати значення цього параметра.",IDC_STATIC,56,143,165,18
+    LTEXT           "Примітка: параметри на віддаленому комп'ютері можуть перекривати значення цього параметра.",IDC_STATIC,56,143,175,18
-    LTEXT           "менше",IDC_STATIC,35,42,15,8
+    LTEXT           "менше",IDC_STATIC,29,45,21,8
-    LTEXT           "більше",IDC_STATIC,189,42,17,8
+    LTEXT           "більше",IDC_STATIC,189,45,23,8
-    LTEXT           "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER
+    LTEXT           "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 65, 120, 10, SS_CENTER
 END
 
 IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 267
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Підключення до віддаленого робочого стола"
+CAPTION "Підключення до віддаленого робочого столу"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "ϳäêëþ÷èòè",IDOK,147,249,50,14
@@ -62,10 +62,10 @@ BEGIN
     IDS_256COLORS           "256 êîëüîð³â"
     IDS_HIGHCOLOR15         "32,768 êîëüîð³â (15 á³ò)"
     IDS_HIGHCOLOR16         "65,536 êîëüîð³â (16 á³ò)"
-    IDS_HIGHCOLOR24         "16,777,216 кольорів (24 біта)"
+    IDS_HIGHCOLOR24         "16,777,216 кольорів (24 біти)"
     IDS_PIXEL               "%lu íà %lu êðàïîê"
     IDS_FULLSCREEN          "Íà âåñü åêðàí"
     IDS_BROWSESERVER        "<Ïîøóê ³íøèõ...>"
-    IDS_HEADERTEXT1         "Віддалене керування робочим столом"
+    IDS_HEADERTEXT1         "Керування робочим"
-    IDS_HEADERTEXT2         "Підключення"
+    IDS_HEADERTEXT2         "Столом"
 END

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

@@ -2,6 +2,7 @@
  * Notepad (Ukrainian resources)
  *
  * Copyright 2005, 2006 Artem Reznikov
+ * Copyright 2010 Igor Paliychuk
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -49,7 +50,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Ïàðà&ìåòðè ñòîð³íêè...", CMD_PAGE_SETUP
         MENUITEM "Ä&ðóê\tCtrl+P",          CMD_PRINT
-        MENUITEM "Íàñòðîéêà &ïðèíòåðà...", CMD_PRINTER_SETUP
+        MENUITEM "Íàëàøòóâàííÿ &ïðèíòåðà...", CMD_PRINTER_SETUP
         MENUITEM SEPARATOR
         MENUITEM "Â&èõ³ä",                 CMD_EXIT
     END
@@ -127,7 +128,7 @@ BEGIN
 COMBOBOX        ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 LTEXT           "Êîäóâàííÿ:",0x155,5,2,41,12
 COMBOBOX        ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-LTEXT           "Ðîçðèâè ðÿäê³â:",0x156,5,20,41,12
+LTEXT           "ʳíåöü ðÿäêà:",0x156,5,20,47,12
 END
 
 /* Dialog 'Go To' */

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

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/applications/paint/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for Paint
- * TRANSLATORS: Artem Reznikov, Sakara Yevhen
+ * TRANSLATORS: Artem Reznikov, Sakara Yevhen, igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -49,7 +49,7 @@ BEGIN
         MENUITEM SEPARATOR
         POPUP "Ìàñøòàá"
         BEGIN
-            POPUP "Êîðèñòóâàëüíèöüêèé"
+            POPUP "Êîðèñòóâàöüêèé"
             BEGIN
                 MENUITEM "12,5%", IDM_VIEWZOOM125
                 MENUITEM "25%", IDM_VIEWZOOM25
@@ -137,22 +137,22 @@ BEGIN
     EDITTEXT IDD_ATTRIBUTESEDIT2, 110, 40, 35, 12
     LTEXT "Øèðèíà:", IDD_ATTRIBUTESTEXT1, 10, 40, 30, 10
     LTEXT "Âèñîòà:", IDD_ATTRIBUTESTEXT2, 80, 40, 30, 10
-    LTEXT "Äàòà ôàéëà:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10
+    LTEXT "Äàòà ôàéëó:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10
-    LTEXT "Ðîçì³ð ôàéëà:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10
+    LTEXT "Ðîçì³ð ôàéëó:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10
-    LTEXT "Ðîçä³ëüíà çäàòí³ñòü:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10
+    LTEXT "Ðîçøèðåííÿ:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10
-    LTEXT "Not available", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10
+    LTEXT "Íåäîñòóïíî", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10
-    LTEXT "Not available", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10
+    LTEXT "Íåäîñòóïíî", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10
-    LTEXT "Not available", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10
+    LTEXT "Íåäîñòóïíî", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10
     GROUPBOX "Îäèíèö³ âèì³ðþâàííÿ", IDD_ATTRIBUTESGROUP1, 6, 57, 139, 27
     AUTORADIOBUTTON "äþéìè", IDD_ATTRIBUTESRB1, 12, 69, 35, 10, WS_GROUP
     AUTORADIOBUTTON "ñì", IDD_ATTRIBUTESRB2, 52, 69, 35, 10
     AUTORADIOBUTTON "ï³êñåë³", IDD_ATTRIBUTESRB3, 92, 69, 35, 10
     GROUPBOX "Êîëüîðè", IDD_ATTRIBUTESGROUP2, 6, 88, 139, 27
-    AUTORADIOBUTTON "÷îðíî-á³ëà", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP
+    AUTORADIOBUTTON "÷îðíî-á³ëèé", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP
-    AUTORADIOBUTTON "êîëüîðîâà", IDD_ATTRIBUTESRB5, 92, 100, 35, 10
+    AUTORADIOBUTTON "êîëüîðè", IDD_ATTRIBUTESRB5, 92, 100, 39, 10
     DEFPUSHBUTTON "OK", IDOK, 155, 8, 48, 14
     PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 155, 24, 48, 14
-    PUSHBUTTON "Çà ïðîìîâ÷àííÿì", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14
+    PUSHBUTTON "Ñòàíäàðòíî", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14
 END
 
 IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80
@@ -160,15 +160,15 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Çì³íà ðîçì³ðó"
 BEGIN
-    GROUPBOX "Çì³íåííÿ ðîçì³ðó", IDD_CHANGESIZEGROUP, 6, 6, 142, 66
+    GROUPBOX "Çì³íà ðîçì³ðó", IDD_CHANGESIZEGROUP, 6, 6, 142, 66
     ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32
-    LTEXT "Ïî ãîðèçîíòàë³:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10
+    LTEXT "Ãîðèçîíòàëü:", IDD_CHANGESIZETEXT1, 45, 24, 45, 10
-    EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12
+    EDITTEXT IDD_CHANGESIZEEDIT1, 92, 23, 32, 12
-    LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10
+    LTEXT "%", IDD_CHANGESIZETEXT2, 127, 24, 15, 10
     ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32
-    LTEXT "Ïî âåðòèêàë³:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10
+    LTEXT "Âåðòèêàëü:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10
-    EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12
+    EDITTEXT IDD_CHANGESIZEEDIT2, 92, 48, 32, 12
-    LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10
+    LTEXT "%", IDD_CHANGESIZETEXT4, 127, 49, 15, 10
     DEFPUSHBUTTON "OK", IDOK, 155, 8, 48, 14
     PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 155, 24, 48, 14
 END
@@ -184,7 +184,7 @@ BEGIN
     IDS_MINIATURETITLE, "̳í³àòþðà"
     IDS_TOOLTIP1, "Âèä³ëåííÿ äîâ³ëüíî¿ îáëàñò³"
     IDS_TOOLTIP2, "Âèä³ëåííÿ"
-    IDS_TOOLTIP3, "Ëàñòèê"
+    IDS_TOOLTIP3, "Ãóìêà"
     IDS_TOOLTIP4, "Çàëèâêà"
     IDS_TOOLTIP5, "Âèá³ð êîëüîð³â"
     IDS_TOOLTIP6, "Ìàñøòàá"
@@ -201,5 +201,5 @@ BEGIN
     IDS_OPENFILTER, "Òî÷êîâ³ ðèñóíêè (*.bmp;*.dib)\1*.bmp;*.dib\1Óñ³ ôàéëè (*.*)\1*.*\1"
     IDS_SAVEFILTER, "24-ðîçðÿäíèé ðèñóíîê (*.bmp;*.dib)\1*.bmp;*.dib\1"
     IDS_FILESIZE, "%d áàéò"
-    IDS_PRINTRES, "%d x %d ï³êñåë³â íà ìåòð"
+    IDS_PRINTRES, "%d x %d ï³êñ. íà ìåòð"
 END

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

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/applications/rapps/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for ReactOS ReactOS Applications Manager
- * TRANSLATOR:  Sakara Yevhen
+ * TRANSLATOR:  Sakara Yevhen, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -64,7 +64,7 @@ BEGIN
 	GROUPBOX "Çàãàëüí³", -1, 4, 2, 240, 61
 	AUTOCHECKBOX "&Çáåð³ãàòè ïîëîæåííÿ â³êíà", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
 	AUTOCHECKBOX "&Îíîâëþâàòè ñïèñîê íàÿâíèõ ïðîãðàì ïðè çàïóñêó", IDC_UPDATE_AVLIST, 15, 29, 219, 12
-	AUTOCHECKBOX "&Вести лог встановлення/видалення програм", IDC_LOG_ENABLED, 15, 46, 219, 12
+	AUTOCHECKBOX "&Вести звіт встановлення/видалення програм", IDC_LOG_ENABLED, 15, 46, 219, 12
 
 	GROUPBOX "Çàâàíòàæåííÿ", -1, 4, 65, 240, 51
 	LTEXT "Òåêà äëÿ çàâàíòàæåíü:", -1, 16, 75, 100, 9
@@ -72,7 +72,7 @@ BEGIN
 	PUSHBUTTON "&Îáðàòè", IDC_CHOOSE, 187, 85, 50, 14
 	AUTOCHECKBOX "&Âèäàëÿòè ³íñòàëÿòîðè ïðîãðàì ï³ñëÿ âñòàíîâëåííÿ", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
 
-	PUSHBUTTON "За замовчуванням", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+	PUSHBUTTON "Стандартно", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
 	PUSHBUTTON "OK", IDOK, 116, 124, 60, 14
 	PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 181, 124, 60, 14
 END
@@ -98,7 +98,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
     LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER
-    PUSHBUTTON "Відмінити", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP
+    PUSHBUTTON "Скасувати", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP
 END
 
 IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
@@ -163,7 +163,7 @@ BEGIN
 	IDS_CAT_AUDIO "Àóä³î"
 	IDS_CAT_DEVEL "Ðîçðîáêà"
 	IDS_CAT_DRIVERS "Äðàéâåðè"
-	IDS_CAT_EDU "Розвиток"
+	IDS_CAT_EDU "Навчання"
 	IDS_CAT_ENGINEER "Òåõí³êà"
 	IDS_CAT_FINANCE "Ô³íàíñè "
 	IDS_CAT_GAMES "²ãðè òà ðîçâàãè"
@@ -184,11 +184,11 @@ BEGIN
 	IDS_INSTALL "Âñòàíîâèòè"
 	IDS_UNINSTALL "Âèäàëèòè"
 	IDS_MODIFY "Çì³íèòè"
-	IDS_APPS_COUNT "Кількість додатків: %d"
+	IDS_APPS_COUNT "Kількість додатків: %d"
 	IDS_WELCOME_TITLE "Ëàñêàâî ïðîñèìî â Ìåíåäæåð äîäàòê³â ReactOS!\n\n"
 	IDS_WELCOME_TEXT "Âèáåð³òü êàòåãîð³þ çë³âà, à ïîò³ì âèáåð³òü ïðîãðàìè äëÿ âñòàíîâëåííÿ ÷è âèäàëåííÿ.\nÑòîð³íêà ReactOS: "
 	IDS_WELCOME_URL "http://www.reactos.org"
-	IDS_INSTALLED "Встановлена"
+	IDS_INSTALLED "Встановлені"
 	IDS_AVAILABLEFORINST "Äîñòóïí³ äëÿ âñòàíîâëåííÿ"
 	IDS_UPDATES "Îíîâëåííÿ"
 	IDS_APPLICATIONS "Äîäàòêè"

base/applications/rapps/rapps/ac97forvirtualbox.txt

@@ -38,5 +38,5 @@ URLSite = Не указано
 [Section.0422]
 Name = Драйвер AC97 для VirtualBox
 Licence = Невідома
-Description = Разархівуйте вміст в теку "ReactOS" після чого двічі перезавантажте систему.
+Description = Розархівуйте вміст в теку "ReactOS" після чого двічі перезавантажте систему.
 URLSite = Не вказано

base/applications/rapps/rapps/fap.txt

@@ -0,0 +1,18 @@
+; UTF-8
+
+[Section]
+Name = Fox Audio Player
+Version = 0.7.2
+Licence = GPL
+Description = Simple and lightweight audio player.
+Size = 1.84MB
+Category = 1
+URLSite = http://foxaudioplayer.sourceforge.net/
+URLDownload = http://svn.reactos.org/packages/fap-0.7.2-win32-bin.exe
+CDPath = none
+
+[Section.0407]
+Description = Kleiner und einfacher Mediaplayer.
+
+[Section.0422]
+Description = Простий та маленький програвач аудіо файлів.

base/applications/rapps/rapps/firefox36.txt

@@ -2,47 +2,47 @@
 
 [Section]
 Name = Mozilla Firefox 3.6
-Version = 3.6.3
+Version = 3.6.6
 Licence = MPL/GPL/LGPL
 Description = The most popular and one of the best free Web Browsers out there.
-Size = 8.0M
+Size = 8.2M
 Category = 5
 URLSite = http://www.mozilla.com/en-US/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/en-US/Firefox%20Setup%203.6.3.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/en-US/Firefox%20Setup%203.6.6.exe
 CDPath = none
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Webbrowser.
-Size = 7.8M
+Size = 8.0M
 URLSite = http://www.mozilla-europe.org/de/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/de/Firefox%20Setup%203.6.3.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/de/Firefox%20Setup%203.6.6.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores navegadores web gratuitos que hay.
-Size = 7.8M
+Size = 8.0M
 URLSite = http://www.mozilla-europe.org/es/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/es-ES/Firefox%20Setup%203.6.3.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/es-ES/Firefox%20Setup%203.6.6.exe
 
 [Section.0414]
 Description = Mest populære og best også gratis nettleserene der ute.
-Size = 7.8M
+Size = 8.0M
 URLSite = http://www.mozilla-europe.org/no/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/nb-NO/Firefox%20Setup%203.6.3.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/nb-NO/Firefox%20Setup%203.6.6.exe
 
 [Section.0415]
 Description = Najpopularniejsza i jedna z najlepszych darmowych przeglądarek internetowych.
-Size = 8.6M
+Size = 8.9M
 URLSite = http://www.mozilla-europe.org/pl/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/pl/Firefox%20Setup%203.6.3.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/pl/Firefox%20Setup%203.6.6.exe
 
 [Section.0419]
 Description = Один из самых популярных и лучших бесплатных браузеров.
-Size = 8.2M
+Size = 8.4M
 URLSite = http://www.mozilla-europe.org/ru/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/ru/Firefox%20Setup%203.6.3.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/ru/Firefox%20Setup%203.6.6.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращих безплатних веб-браузерів.
-Size = 8.2M
+Size = 8.4M
 URLSite = http://www.mozilla-europe.org/uk/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/uk/Firefox%20Setup%203.6.3.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.6/win32/uk/Firefox%20Setup%203.6.6.exe

base/applications/rapps/rapps/mirandaim.txt

@@ -12,7 +12,7 @@ URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.26-unicode.exe
 CDPath = none
 
 [Section.0407]
-Description = Open source Multiprotocol Instant Messaging Anwendung - funktioniert möglicherweise nicht vollständig.
+Description = Open source Multiprotokoll Instant Messaging Anwendung - funktioniert möglicherweise nicht vollständig.
 
 [Section.040a]
 Description = Aplicación de mensajería instantánea multiprotocolo de código abierto - Puede no funcionar en su totalidad.

base/applications/rapps/rapps/mpc.txt

@@ -12,7 +12,7 @@ URLDownload = http://mesh.dl.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-
 CDPath = none
 
 [Section.0407]
-Description = Ein Medienplayer.
+Description = Ein Mediaplayer.
 
 [Section.040a]
 Description = Reproductor multimedia.

base/applications/rapps/rapps/sdl_runtime.txt

@@ -23,6 +23,6 @@ Description = Necesario para ejecutar varios juegos de código abierto. Necesita
 Name = Biblioteka uruchomieniowa Simple Direct Media Layer (SDL)
 Description = Wymagana przez wiele gier (głównie o otwartym źródle). Do jej rozpakowania potrzebny jest program 7-Zip lub podobny.
 
-[Section.0415]
+[Section.0422]
 Name = Бібліотека Simple Direct Media Layer (SDL)
 Description = Необхідна для роботи багатьох відкритих ігор. Вам потрібен 7-Zip або подібна утиліта щоб розпакувати її.

base/applications/rapps/rapps/superfinder.txt

@@ -0,0 +1,15 @@
+; UTF-8
+
+[Section]
+Name = Super Finder XT
+Version = 1.6.2.1
+Licence = Freeware
+Description = A fast and feature rich search Aapplication.
+Size = 4.5MB
+Category = 12
+URLSite = http://fsl.sytes.net/ssearchxt.html
+URLDownload = http://fsl.sytes.net/releases/setup_SuperFinderXT.exe
+CDPath = none
+
+[Section.0407]
+Description = Eine schnelle und effektive Suchanwendung.

base/applications/rapps/rapps/thunderbird.txt

@@ -2,41 +2,41 @@
 
 [Section]
 Name = Mozilla Thunderbird
-Version = 3.0.5
+Version = 3.1
 Licence = MPL/GPL/LGPL
 Description = The most popular and one of the best free Mail Clients out there.
-Size = 8.6M
+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.0.5/win32/en-US/Thunderbird%20Setup%203.0.5.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/en-US/Thunderbird%20Setup%203.1.exe
 CDPath = none
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Mail-Clients.
-Size = 8.5M
+Size = 8.9M
 URLSite = http://www.mozilla-europe.org/de/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win32/de/Thunderbird%20Setup%203.0.5.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/de/Thunderbird%20Setup%203.1.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores clientes mail que hay.
-Size = 8.4M
+Size = 8.8M
 URLSite = http://www.mozilla-europe.org/es/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win32/es-ES/Thunderbird%20Setup%203.0.5.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/es-ES/Thunderbird%20Setup%203.1.exe
 
 [Section.0415]
 Description = Najpopularniejszy i jeden z najlepszych darmowych klientów poczty.
-Size = 9.3M
+Size = 9.7M
 URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win32/pl/Thunderbird%20Setup%203.0.5.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/pl/Thunderbird%20Setup%203.1.exe
 
 [Section.0419]
 Description = Один из самых популярных и лучших бесплатных почтовых клиентов.
-Size = 8.8M
+Size = 9.2M
 URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win32/ru/Thunderbird%20Setup%203.0.5.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/ru/Thunderbird%20Setup%203.1.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращих поштових клієнтів.
-Size = 8.8M
+Size = 9.2M
 URLSite = http://www.mozillamessaging.com/uk/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.5/win32/uk/Thunderbird%20Setup%203.0.5.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/win32/uk/Thunderbird%20Setup%203.1.exe

base/applications/rapps/rapps/vc2005run.txt

@@ -1,7 +1,7 @@
 ; UTF-8
 
 [Section]
-Name = Visual Studio 2005 Runtime
+Name = Microsoft Visual C++ 2005 Redistributable Package
 Version = 7.0
 Licence = Unknown
 Description = Visual Studio 2005 Runtime.

base/applications/rapps/rapps/vc2005sp1run.txt

@@ -1,7 +1,7 @@
 ; UTF-8
 
 [Section]
-Name = Visual Studio 2005 Runtime SP1
+Name = Microsoft Visual C++ 2005 SP1 Redistributable Package
 Version = 7.1
 Licence = Unknown
 Description = Visual Studio 2005 Runtime SP1.

base/applications/rapps/rapps/vc2008run.txt

@@ -1,7 +1,7 @@
 ; UTF-8
 
 [Section]
-Name = Visual Studio 2008 Runtime
+Name = Microsoft Visual C++ 2008 Redistributable Package
 Version = 8.0
 Licence = Unknown
 Description = Visual Studio 2008 Runtime.

base/applications/rapps/rapps/vc2008sp1run.txt

@@ -0,0 +1,28 @@
+; UTF-8
+
+[Section]
+Name = Microsoft Visual C++ 2008 SP1 Redistributable Package
+Version = 8.0
+Licence = Unknown
+Description = Visual Studio 2008 SP1 Runtime.
+Size = 4.0MB
+Category = 14
+URLSite = http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2&displaylang=en
+URLDownload = http://download.microsoft.com/download/d/d/9/dd9a82d0-52ef-40db-8dab-795376989c03/vcredist_x86.exe
+CDPath = none
+
+[Section.0407]
+Licence = Unbekannt
+Description = Visual Studio 2008 SP1 Laufzeitsystem.
+
+[Section.040a]
+Licence = Desconocida
+Description = Librerias Visual Studio 2008 SP1.
+
+[Section.0415]
+Licence = Nieznana
+Description = Biblioteki uruchomieniowe Visual Studio 2008 SP1.
+
+[Section.0422]
+Licence = Невідома
+Description = Бібліотеки Visual Studio 2008 SP1.

base/applications/rapps/rapps/vc6run.txt

@@ -1,7 +1,7 @@
 ; UTF-8
 
 [Section]
-Name = Visual Studio 6 Runtime
+Name = Microsoft Visual C++ 6 Redistributable Package
 Version = 6.0
 Licence = Unknown
 Description = Visual Studio 6 Runtime.

base/applications/rapps/rapps/vlc.txt

@@ -12,7 +12,7 @@ URLDownload = http://ignum.dl.sourceforge.net/project/vlc/1.1.0/win32/vlc-1.1.0-
 CDPath = none
 
 [Section.0407]
-Description = Ein Medienplayer.
+Description = Ein Mediaplayer.
 
 [Section.040a]
 Description = Reproductor multimedia.

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

@@ -2,6 +2,7 @@
  * Regedit (Ukrainian resources)
  *
  * Copyright 2006,2007 Artem Reznikov
+ * Copyright 2010 Igor Paliychuk
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -79,8 +80,8 @@ BEGIN
             MENUITEM "&Ðÿäêîâå çíà÷åííÿ",             ID_EDIT_NEW_STRINGVALUE
             MENUITEM "&Äâ³éêîâå çíà÷åííÿ",            ID_EDIT_NEW_BINARYVALUE
             MENUITEM "&DWORD çíà÷åííÿ",               ID_EDIT_NEW_DWORDVALUE
-			MENUITEM "&Ìóëüòèðÿäêîâå çíà÷åííÿ",			ID_EDIT_NEW_MULTISTRINGVALUE
+			MENUITEM "&Áàãàòîðÿäêîâå çíà÷åííÿ",			ID_EDIT_NEW_MULTISTRINGVALUE
-			MENUITEM "Ðîç&øèðþâàíå ñòðîêîâå çíà÷åííÿ",	ID_EDIT_NEW_EXPANDABLESTRINGVALUE
+			MENUITEM "Ðîç&øèðþâàíå ðÿäêîâå çíà÷åííÿ",	ID_EDIT_NEW_EXPANDABLESTRINGVALUE
         END
         MENUITEM SEPARATOR
         MENUITEM "Äîçâ&îëè...",			ID_EDIT_PERMISSIONS
@@ -112,7 +113,7 @@ BEGIN
     BEGIN
         MENUITEM "&Çì³ñò\tF1",                  ID_HELP_HELPTOPICS
         MENUITEM SEPARATOR
-        MENUITEM "&Ïðî ðåäàêòîð ðåºñòðà",       ID_HELP_ABOUT
+        MENUITEM "&Ïðî ðåäàêòîð ðåºñòðó",       ID_HELP_ABOUT
     END
 END
 
@@ -136,7 +137,7 @@ BEGIN
             MENUITEM "&Äâ³éêîâå çíà÷åííÿ",          ID_EDIT_NEW_BINARYVALUE
             MENUITEM "&DWORD çíà÷åííÿ",             ID_EDIT_NEW_DWORDVALUE
             MENUITEM "&Áàãàòîðÿäêîâå çíà÷åííÿ",         ID_EDIT_NEW_MULTISTRINGVALUE
-            MENUITEM "&Ðîçøèðåíå ðÿäêîâå çíà÷åííÿ",    ID_EDIT_NEW_EXPANDABLESTRINGVALUE
+            MENUITEM "&Ðîçøèðþâàíå ðÿäêîâå çíà÷åííÿ",    ID_EDIT_NEW_EXPANDABLESTRINGVALUE
         END
   END
   POPUP ""
@@ -144,13 +145,13 @@ BEGIN
         MENUITEM "Ðîçãîðíóòè/Çãîðíóòè",             ID_TREE_EXPANDBRANCH
         POPUP "&Ñòâîðèòè"
         BEGIN
-            MENUITEM "Êë&þ÷",                       ID_EDIT_NEW_KEY
+            MENUITEM "Ðîç&ä³ë",                       ID_EDIT_NEW_KEY
             MENUITEM SEPARATOR
             MENUITEM "&Ðÿäêîâå çíà÷åííÿ",           ID_EDIT_NEW_STRINGVALUE
             MENUITEM "&Äâ³éêîâå çíà÷åííÿ",          ID_EDIT_NEW_BINARYVALUE
             MENUITEM "&DWORD çíà÷åííÿ",             ID_EDIT_NEW_DWORDVALUE
             MENUITEM "&Áàãàòîðÿäêîâå çíà÷åííÿ",         ID_EDIT_NEW_MULTISTRINGVALUE
-            MENUITEM "&Ðîçøèðåíå ðÿäêîâå çíà÷åííÿ",    ID_EDIT_NEW_EXPANDABLESTRINGVALUE
+            MENUITEM "&Ðîçøèðþâàíå ðÿäêîâå çíà÷åííÿ",    ID_EDIT_NEW_EXPANDABLESTRINGVALUE
         END
         MENUITEM "Ç&íàéòè",                         ID_EDIT_FIND
         MENUITEM SEPARATOR
@@ -186,7 +187,7 @@ END
 IDD_EDIT_MULTI_STRING DIALOGEX  32, 24, 252, 174
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
     WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Ðåäàãóâàííÿ ìóëüòèðÿäêîâîãî çíà÷åííÿ"
+CAPTION "Ðåäàãóâàííÿ áàãàòîðÿäêîâîãî çíà÷åííÿ"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Íàçâà çíà÷åííÿ:",IDC_STATIC,6,6,134,8
@@ -242,7 +243,7 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_APP_TITLE           "Ðåäàêòîð ðåºñòðà"
+    IDS_APP_TITLE           "Ðåäàêòîð ðåºñòðó"
     IDC_REGEDIT             "REGEDIT"
     IDC_REGEDIT_FRAME       "REGEDIT_FRAME"
 END
@@ -264,7 +265,7 @@ BEGIN
     ID_EDIT_NEW_STRINGVALUE "Äîäຠíîâå ðÿäêîâå çíà÷åííÿ"
     ID_EDIT_NEW_BINARYVALUE "Äîäຠíîâå äâ³éêîâå çíà÷åííÿ"
     ID_EDIT_NEW_DWORDVALUE  "Äîäຠíîâå DWORD-çíà÷åííÿ"
-    ID_REGISTRY_IMPORTREGISTRYFILE "²ìïîðòóº òåêñòîâèé ôàéë äî ðåºñòðà"
+    ID_REGISTRY_IMPORTREGISTRYFILE "²ìïîðòóº òåêñòîâèé ôàéë äî ðåºñòðó"
     ID_REGISTRY_EXPORTREGISTRYFILE
                             "Åêñïîðòóº âåñü ðåºñòð àáî éîãî ÷àñòèíó â òåêñòîâèé ôàéë"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
@@ -278,7 +279,7 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    ID_REGISTRY_EXIT        "Âèõîäèòü ç ðåäàêòîðà ðåºñòðà"
+    ID_REGISTRY_EXIT        "Âèõîäèòü ç ðåäàêòîðà ðåºñòðó"
     ID_FAVOURITES_ADDTOFAVOURITES "Äîäຠðîçä³ë äî îáðàíîãî"
     ID_FAVOURITES_REMOVEFAVOURITE "Âèäàëÿº ðîçä³ë ç îáðàíîãî"
     ID_VIEW_STATUSBAR       "³äîáðàæóº àáî õîâຠðÿäîê ñòàíó"

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

@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Ukrainian resources
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_UKR)
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 #pragma code_page(1251)
@@ -46,7 +46,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Âåëèê³ çíà÷êè",                  ID_VIEW_LARGE
         MENUITEM "&Äð³áí³ çíà÷êè",                  ID_VIEW_SMALL
-        MENUITEM "&Òàáëèöÿ",                        ID_VIEW_DETAILS, CHECKED
+        MENUITEM "Ä&åòàëüíî",                       ID_VIEW_DETAILS, CHECKED
         MENUITEM "Â&èáðàòè ñòîâïö³...",             ID_VIEW_SELECTCOLUMNS
         POPUP "&Õðîíîëîã³ÿ ÖÏ"
         BEGIN
@@ -92,7 +92,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Âåëèê³ çíà÷êè",                  ID_VIEW_LARGE
         MENUITEM "&Äð³áí³ çíà÷êè",                  ID_VIEW_SMALL
-        MENUITEM "&Òàáëèöÿ",                        ID_VIEW_DETAILS, CHECKED
+        MENUITEM "Ä&åòàëüíî",                       ID_VIEW_DETAILS, CHECKED
     END
 END
 
@@ -178,9 +178,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "List2",IDC_APPLIST,"SysListView32",LVS_REPORT |
                     LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177
-    PUSHBUTTON      "&Íîâå çàâäàííÿ...",IDC_NEWTASK,187,189,53,14
+    PUSHBUTTON      "&Íîâå çàâäàííÿ...",IDC_NEWTASK,181,189,60,14
-    PUSHBUTTON      "Ï&åðåêëþ÷èòèñÿ",IDC_SWITCHTO,131,189,53,14,WS_DISABLED
+    PUSHBUTTON      "Ï&åðåêëþ÷èòèñÿ",IDC_SWITCHTO,120,189,55,14,WS_DISABLED
-    PUSHBUTTON      "Çí&ÿòè çàâäàííÿ",IDC_ENDTASK,75,189,53,14,WS_DISABLED
+    PUSHBUTTON      "Çí&ÿòè çàâäàííÿ",IDC_ENDTASK,58,189,56,14,WS_DISABLED
 END
 
 IDD_PROCESS_PAGE DIALOGEX DISCARDABLE  0, 0, 247, 210
@@ -190,9 +190,9 @@ BEGIN
     CONTROL         "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT |
                     LVS_SINGLESEL | LVS_SHOWSELALWAYS |
                     WS_BORDER | WS_TABSTOP,7,7,233,177
-    PUSHBUTTON      "Çí&ÿòè çàâäàííÿ",IDC_ENDPROCESS,171,189,69,14
+    PUSHBUTTON      "Çí&ÿòè ïðîöåñ",IDC_ENDPROCESS,171,189,69,14
     CONTROL         "&³äîáðàæàòè ïðîöåñè âñ³õ êîðèñòóâà÷³â",IDC_SHOWALLPROCESSES,
-                    "Êíîïêà",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,147,10
 END
 
 //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210
@@ -200,13 +200,13 @@ IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE  0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX        "Âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT
+    GROUPBOX        "Âèêîðèñ. ÖÏ",IDC_CPU_USAGE_FRAME,5,5,62,54,0,WS_EX_TRANSPARENT
-    GROUPBOX        "Âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT
+    GROUPBOX        "Âèêîðèñ. ïàì'ÿò³",IDC_MEM_USAGE_FRAME,5,63,62,54,BS_LEFTTEXT, WS_EX_TRANSPARENT
     GROUPBOX        "Óñüîãî",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT
     GROUPBOX        "Âèä³ëåííÿ ïàì'ÿò³ (ÊÁ)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT
     GROUPBOX        "Ô³çè÷íà ïàì'ÿòü (ÊÁ)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT
     GROUPBOX        "Ïàì'ÿòü ÿäðà (ÊÁ)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT
-    LTEXT           "Äåñêðèïòîð³â",IDS_TOTALS_HANDLE_COUNT,12,131,27,8
+    LTEXT           "Äåñêðèïòîð³â",IDS_TOTALS_HANDLE_COUNT,12,131,47,8
     LTEXT           "Ïîòîê³â",IDS_TOTALS_THREAD_COUNT,12,140,27,8
     LTEXT           "Ïðîöåñ³â",IDS_TOTALS_PROCESS_COUNT,12,149,34,8
     EDITTEXT        IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT |
@@ -216,8 +216,8 @@ BEGIN
     EDITTEXT        IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT           "Óñüîãî",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8
-    LTEXT           "Ìåæà",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER
+    LTEXT           "Ìåæà",IDS_COMMIT_CHARGE_LIMIT,12,184,18,8,NOT WS_BORDER
-    LTEXT           "ϳê",IDS_COMMIT_CHARGE_PEAK,12,193,34,8
+    LTEXT           "ϳê",IDS_COMMIT_CHARGE_PEAK,12,193,18,8
     EDITTEXT        IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
     EDITTEXT        IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT |
@@ -225,29 +225,27 @@ BEGIN
     EDITTEXT        IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT           "Óñüîãî",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8
-    LTEXT           "Äîñòóïíî",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8
+    LTEXT           "Äîñòóïíî",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,32,8
-    LTEXT           "Ñèñòåìíèé êåø",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8
+    LTEXT           "Ñèñòåìíèé êåø",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,53,8
-    EDITTEXT        IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT |
+    EDITTEXT        IDC_PHYSICAL_MEMORY_TOTAL,188,131,45,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT        IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT |
+    EDITTEXT        IDC_PHYSICAL_MEMORY_AVAILABLE,188,140,45,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT        IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT |
+    EDITTEXT        IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,188,149,45,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
     LTEXT           "Óñüîãî",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8
-    LTEXT           "Âèâàíòàæóâàíà",IDS_KERNEL_MEMORY_PAGED,137,184,21,8
+    LTEXT           "Âèâàíòàæóâàíà",IDS_KERNEL_MEMORY_PAGED,137,184,53,8
-    LTEXT           "Íåâèâàíòàæóâàíà",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8
+    LTEXT           "Íåâèâàíòàæóâàíà",IDS_KERNEL_MEMORY_NONPAGED,137,193,61,8
-    EDITTEXT        IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT |
+    EDITTEXT        IDC_KERNEL_MEMORY_TOTAL,198,174,35,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT        IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT |
+    EDITTEXT        IDC_KERNEL_MEMORY_PAGED,198,184,35,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
-    EDITTEXT        IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT |
+    EDITTEXT        IDC_KERNEL_MEMORY_NONPAGED,198,193,35,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
     GROUPBOX        "Õðîíîëîã³ÿ âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT
     GROUPBOX        "Õðîíîëîã³ÿ âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT
-    PUSHBUTTON      "³äîáðàæåííÿ âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,
+    PUSHBUTTON      "³äîáðàæåííÿ âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE
-		    WS_EX_CLIENTEDGE
+    PUSHBUTTON      "³äîáðàæåííÿ âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE
-    PUSHBUTTON      "³äîáðàæåííÿ âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,
-                    WS_EX_CLIENTEDGE
     PUSHBUTTON      "Õðîíîëîã³ÿ âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_HISTORY_GRAPH,81,17,
                     153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE
     PUSHBUTTON      "Õðîíîëîã³ÿ âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEM_USAGE_HISTORY_GRAPH,81,75,
@@ -628,7 +626,7 @@ BEGIN
     IDS_MENU_WINDOWS              "Â&³êíà"
     IDS_MENU_LARGEICONS           "&Âåëèê³ çíà÷êè"
     IDS_MENU_SMALLICONS           "&Äð³áí³ çíà÷êè"
-    IDS_MENU_DETAILS              "&Òàáëèöÿ"
+    IDS_MENU_DETAILS              "&Äåòàëüíî"
     IDS_MENU_ONEGRAPHALLCPUS      "&Îäèí ãðàô³ê äëÿ âñ³õ ÖÏ"
     IDS_MENU_ONEGRAPHPERCPU       "Îêðåìèé &ãðàô³ê äëÿ êîæíîãî ÖÏ"
     IDS_MENU_CPUHISTORY           "&Õðîíîëîã³ÿ ÖÏ"

base/applications/winhlp32/Es.rc

@@ -42,21 +42,21 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
  POPUP "&Marcador" {
    MENUITEM "&Definir...", MNID_BKMK_DEFINE
  }
- POPUP "&Options" {
+ POPUP "&Opciones" {
-   POPUP	"Help always visible"
+   POPUP	"Ayuda siempre visible"
    BEGIN
-     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Por defecto",	MNID_OPTS_HELP_DEFAULT
      MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
-     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+     MENUITEM "No visible",	MNID_OPTS_HELP_NONVISIBLE
   END
-  MENUITEM "History",		MNID_OPTS_HISTORY
+  MENUITEM "Historial",		MNID_OPTS_HISTORY
-  POPUP    "Fonts"
+  POPUP    "Fuentes"
   BEGIN
-    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Pequeña",		MNID_OPTS_FONTS_SMALL
     MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
-    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+    MENUITEM "Grande",     	MNID_OPTS_FONTS_LARGE
   END
-  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+  MENUITEM "Usar colores del sistema",	MNID_OPTS_SYSTEM_COLORS
  }
  POPUP "A&yuda" {
    MENUITEM "&Ayuda sobre la ayuda", MNID_HELP_HELPON
@@ -69,6 +69,22 @@ MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
  }
 }
 
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Índice"
+{
+    LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
+}
+
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Buscar"
+{
+    LTEXT  "Aún no implementado", -1, 10, 10, 180, 150
+}
+
 /* Strings */
 STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 {
@@ -79,11 +95,11 @@ STID_INFO,  		"Informaci
 STID_NOT_IMPLEMENTED, 	"Aún no implementado"
 STID_HLPFILE_ERROR_s, 	"Error al leer el archivo de ayuda `%s'"
 STID_INDEX, 		"&Índice"
-STID_CONTENTS,		"Summary"
+STID_CONTENTS,		"Resumen"
 STID_BACK, 		"&Anterior"
 STID_ALL_FILES, 	"Todos los archivos (*.*)"
 STID_HELP_FILES_HLP, 	"Archivos de ayuda (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
+STID_FILE_NOT_FOUND_s	"No se pudo encontrar '%s'. ¿Desea buscar este archivo usted mismo?"
-STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_NO_RICHEDIT	"No se pudo encontrar una implementación de richedit... Abortando"
-STID_PSH_INDEX,		"Help topics: "
+STID_PSH_INDEX,		"Temas de ayuda: "
 }

base/applications/winhlp32/Nl.rc

@@ -113,7 +113,7 @@ BEGIN
 	BEGIN
 		MENUITEM "Annotering...",       MNID_CTXT_ANNOTATE
 		MENUITEM "Kopiëren",            MNID_CTXT_COPY
-		MENUITEM "Afdrukken ...",       MNID_CTXT_PRINT
+		MENUITEM "Afdrukken...",        MNID_CTXT_PRINT
 		POPUP    "Lettertype"
 		BEGIN
 			MENUITEM "Klein",       MNID_CTXT_FONTS_SMALL

base/applications/winhlp32/Pl.rc

@@ -4,6 +4,7 @@
  * Copyright 1996 Ulrich Schmid
  * Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
  * Copyright 2004 Piotr Caban
+ * Copyright 2010 £ukasz Wojni³owicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,9 +23,11 @@
 
 #include "winhelp_res.h"
 
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
 /* Menu */
 
-MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+MAIN_MENU MENU
 {
  POPUP "&Plik" {
   MENUITEM "&Otwórz", MNID_FILE_OPEN
@@ -43,20 +46,20 @@ MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
    MENUITEM "&Zdefiniuj...", MNID_BKMK_DEFINE
  }
  POPUP "&Options" {
-   POPUP	"Help always visible"
+   POPUP	"Pomoc zawsze widoczna"
    BEGIN
-     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Domyœlnie",	MNID_OPTS_HELP_DEFAULT
-     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Widoczna",	MNID_OPTS_HELP_VISIBLE
-     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+     MENUITEM "Niewidoczna",	MNID_OPTS_HELP_NONVISIBLE
   END
-  MENUITEM "History",		MNID_OPTS_HISTORY
+  MENUITEM "Historia",		MNID_OPTS_HISTORY
-  POPUP    "Fonts"
+  POPUP    "Czcionki"
   BEGIN
-    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Ma³e",		MNID_OPTS_FONTS_SMALL
-    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Normalne",    	MNID_OPTS_FONTS_NORMAL
-    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+    MENUITEM "Du¿e",     	MNID_OPTS_FONTS_LARGE
   END
-  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+  MENUITEM "U¿yj kolorów systemowych",	MNID_OPTS_SYSTEM_COLORS
  }
  POPUP "Pomo&c" {
    MENUITEM "&Pomoc", MNID_HELP_HELPON
@@ -69,7 +72,7 @@ MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
  }
 }
 
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Indeks"
@@ -77,8 +80,16 @@ CAPTION "Indeks"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Szukaj"
+{
+    LTEXT  "Nie zaimplementowane", -1, 10, 10, 180, 150
+}
+
 /* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 STID_WINE_HELP, 	"WINE - Pomoc"
 STID_WHERROR, 		"B£¥D"
@@ -92,12 +103,12 @@ STID_BACK, 		"&Wstecz"
 STID_ALL_FILES, 	"Wszystkie pliki (*.*)"
 STID_HELP_FILES_HLP, 	"Pliki pomocy (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Nie znaleziono pliku '%s'. Czy chcesz poszukaæ tego pliku samodzielnie?"
-STID_NO_RICHEDIT	"Nie uda³o siê znaleŸæ modu³u richedit... Wyœwietlenie pomocy nie jest mo¿liwe"
+STID_NO_RICHEDIT	"Nie znaleziono implementacji richedit... Wyœwietlenie pomocy nie jest mo¿liwe"
-STID_PSH_INDEX,		"Help topics: "
+STID_PSH_INDEX,		"Tematy pomocy: "
 }
 
 
-CONTEXT_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+CONTEXT_MENU MENU
 BEGIN
 	POPUP ""
 	BEGIN

base/applications/winhlp32/Ru.rc

@@ -80,6 +80,14 @@ CAPTION "Указатель"
     LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
 }
 
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Поиск"
+{
+    LTEXT  "Не реализовано", -1, 10, 10, 180, 150
+}
+
 /* Strings */
 STRINGTABLE DISCARDABLE
 {
@@ -87,7 +95,7 @@ STID_WINE_HELP, 	"Справка WINE"
 STID_WHERROR, 		"ОШИБКА"
 STID_WARNING,  		"ВНИМАНИЕ"
 STID_INFO,  		"Информация"
-STID_NOT_IMPLEMENTED, 	"Не реализованно"
+STID_NOT_IMPLEMENTED, 	"Не реализовано"
 STID_HLPFILE_ERROR_s, 	"Ошибка при чтении файла помощи `%s'"
 STID_INDEX, 		"&Содержание"
 STID_CONTENTS,		"Начало"

base/applications/winhlp32/macro.c

@@ -281,24 +281,32 @@ static void CALLBACK MACRO_CheckItem(LPCSTR str)
 static void CALLBACK MACRO_CloseSecondarys(void)
 {
     WINHELP_WINDOW *win;
+    WINHELP_WINDOW *next;
 
     WINE_TRACE("()\n");
-    for (win = Globals.win_list; win; win = win->next)
+    for (win = Globals.win_list; win; win = next)
+    {
+        next = win->next;
         if (lstrcmpi(win->info->name, "main"))
             WINHELP_ReleaseWindow(win);
+    }
 }
 
 static void CALLBACK MACRO_CloseWindow(LPCSTR lpszWindow)
 {
     WINHELP_WINDOW *win;
+    WINHELP_WINDOW *next;
 
     WINE_TRACE("(\"%s\")\n", lpszWindow);
 
     if (!lpszWindow || !lpszWindow[0]) lpszWindow = "main";
 
-    for (win = Globals.win_list; win; win = win->next)
+    for (win = Globals.win_list; win; win = next)
+    {
+        next = win->next;
         if (!lstrcmpi(win->info->name, lpszWindow))
             WINHELP_ReleaseWindow(win);
+    }
 }
 
 static void CALLBACK MACRO_Compare(LPCSTR str)
@@ -575,13 +583,17 @@ static void CALLBACK MACRO_JumpID(LPCSTR lpszPathWindow, LPCSTR topic_id)
     if ((ptr = strchr(lpszPathWindow, '>')) != NULL)
     {
         LPSTR   tmp;
-        size_t  sz = ptr - lpszPathWindow;
+        size_t  sz;
 
-        tmp = HeapAlloc(GetProcessHeap(), 0, sz + 1);
+        tmp = HeapAlloc(GetProcessHeap(), 0, strlen(lpszPathWindow) + 1);
         if (tmp)
         {
-            memcpy(tmp, lpszPathWindow, sz);
+            strcpy(tmp, lpszPathWindow);
-            tmp[sz] = '\0';
+            tmp[ptr - lpszPathWindow] = '\0';
+            ptr += tmp - lpszPathWindow; /* ptr now points to '>' in tmp buffer */
+            /* in some cases, we have a trailing space that we need to get rid of */
+            /* FIXME: check if it has to be done in lexer rather than here */
+            for (sz = strlen(ptr + 1); sz >= 1 && ptr[sz] == ' '; sz--) ptr[sz] = '\0';
             MACRO_JumpHash(tmp, ptr + 1, HLPFILE_Hash(topic_id));
             HeapFree(GetProcessHeap(), 0, tmp);
         }

base/applications/winhlp32/winhelp.c

@@ -912,7 +912,10 @@ static BOOL WINHELP_HandleTextMouse(WINHELP_WINDOW* win, UINT msg, LPARAM lParam
                 if ((hlpfile = WINHELP_LookupHelpFile(link->string)))
                 {
                     if (link->window == -1)
+                    {
                         wi = win->info;
+                        if (wi->win_style & WS_POPUP) wi = Globals.active_win->info;
+                    }
                     else if (link->window < hlpfile->numWindows)
                         wi = &hlpfile->windows[link->window];
                     else
@@ -971,9 +974,10 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam
             (HWND)lParam == Globals.active_popup->hMainWnd ||
             GetWindow((HWND)lParam, GW_OWNER) == Globals.active_win->hMainWnd)
             break;
+        /* fall through */
     case WM_LBUTTONDOWN:
-        if (WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam))
+        if (msg == WM_LBUTTONDOWN)
-            return FALSE;
+            WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam);
         /* fall through */
     case WM_MBUTTONDOWN:
     case WM_RBUTTONDOWN:

base/applications/wordpad/Hu.rc

@@ -105,151 +105,3 @@ BEGIN
         MENUITEM "&Paragraph..."      ID_PARAFORMAT
     END
 END
-
-IDM_COLOR_POPUP MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "Black",      ID_COLOR_BLACK
-        MENUITEM "Maroon",     ID_COLOR_MAROON
-        MENUITEM "Green",      ID_COLOR_GREEN
-        MENUITEM "Olive"       ID_COLOR_OLIVE
-        MENUITEM "Navy"        ID_COLOR_NAVY
-        MENUITEM "Purple"      ID_COLOR_PURPLE
-        MENUITEM "Teal"        ID_COLOR_TEAL
-        MENUITEM "Gray"        ID_COLOR_GRAY
-        MENUITEM "Silver"      ID_COLOR_SILVER
-        MENUITEM "Red"         ID_COLOR_RED
-        MENUITEM "Lime"        ID_COLOR_LIME
-        MENUITEM "Yellow"      ID_COLOR_YELLOW
-        MENUITEM "Blue"        ID_COLOR_BLUE
-        MENUITEM "Fuchsia"     ID_COLOR_FUCHSIA
-        MENUITEM "Aqua"        ID_COLOR_AQUA
-        MENUITEM "White"       ID_COLOR_WHITE
-        MENUITEM "Automatic"   ID_COLOR_AUTOMATIC
-    END
-END
-
-IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Date and time"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT        "Available formats",-1,3,2,100,15
-    LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY
-    PUSHBUTTON   "&OK",IDOK,87,12,40,12
-    PUSHBUTTON   "&Cancel",IDCANCEL,87,26,40,12
-END
-
-IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "New"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT        "New document type",-1,3,2,100,15
-    LISTBOX      IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
-    PUSHBUTTON   "&OK",IDOK,97,12,40,12
-    PUSHBUTTON   "&Cancel",IDCANCEL,97,26,40,12
-END
-
-IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Paragraph format"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "Indentation", -1, 10, 10, 120, 68
-    LTEXT "Left", -1, 15, 22, 40, 13
-    EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
-    LTEXT "Right", -1, 15, 40, 40, 13
-    EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
-    LTEXT "First line", -1, 15, 58, 40, 13
-    EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
-    LTEXT "Alignment", -1, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
-END
-
-IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Tabs"
-FONT 8, "MS SHell DLg"
-BEGIN
-    GROUPBOX "Tab stops", -1, 10, 10, 120, 90
-    COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
-    DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15
-    PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
-    PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15
-END
-
-IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110
-STYLE DS_SYSMODAL
-Caption ""
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "Line wrapping", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
-    RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15
-    RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15
-    GROUPBOX "Toolbars", -1, 150, 10, 120, 85
-    CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
-    CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
-    CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15
-    CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15
-    LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_RICHTEXT_FILES_RTF,     "Rich text format (*.rtf)"
-    STRING_TEXT_FILES_TXT,         "Text documents (*.txt)"
-    STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)"
-    STRING_ALL_FILES,              "All documents (*.*)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_ALIGN_LEFT,            "Left"
-    STRING_ALIGN_RIGHT,           "Right"
-    STRING_ALIGN_CENTER,          "Center"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Rich text document"
-    STRING_NEWFILE_TXT,          "Text document"
-    STRING_NEWFILE_TXT_UNICODE,  "Unicode text document"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PRINTER_FILES_PRN,        "Printer files (*.PRN)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_VIEWPROPS_TITLE,          "Options"
-    STRING_VIEWPROPS_TEXT,           "Text"
-    STRING_VIEWPROPS_RICHTEXT,       "Rich text"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PREVIEW_PRINT,            "Print"
-    STRING_PREVIEW_NEXTPAGE,         "Next page"
-    STRING_PREVIEW_PREVPAGE,         "Previous page"
-    STRING_PREVIEW_TWOPAGES,         "Two pages"
-    STRING_PREVIEW_ONEPAGE,          "One page"
-    STRING_PREVIEW_ZOOMIN,           "Zoom in"
-    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
-    STRING_PREVIEW_CLOSE,            "Close"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
-END

base/applications/wordpad/No.rc

@@ -247,13 +247,6 @@ BEGIN
     STRING_PREVIEW_ZOOMIN,           "Zoom in"
     STRING_PREVIEW_ZOOMOUT,          "Zoom out"
     STRING_PREVIEW_CLOSE,            "Lukk"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
 END
 
 STRINGTABLE DISCARDABLE

base/applications/wordpad/Pt.rc

@@ -2,6 +2,7 @@
  * Portuguese Language File
  *
  * Copyright 2008 Ricardo Filipe
+ * Copyright 2010 Gustavo Henrique Milaré
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +23,81 @@
 
 #pragma code_page(65001)
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDM_MAINMENU MENU DISCARDABLE
+BEGIN
+    POPUP "&Arquivo"
+    BEGIN
+        MENUITEM "&Novo...\tCtrl+N",       ID_FILE_NEW
+        MENUITEM "&Abrir...\tCtrl+O",      ID_FILE_OPEN
+        MENUITEM "&Salvar\tCtrl+S",        ID_FILE_SAVE
+        MENUITEM "Salvar &como...",        ID_FILE_SAVEAS
+        MENUITEM SEPARATOR
+        MENUITEM "&Imprimir...\tCtrl+P",   ID_PRINT
+        MENUITEM "&Pré visualizar...",     ID_PREVIEW
+        MENUITEM "C&onfigurar página...",  ID_PRINTSETUP
+        MENUITEM SEPARATOR
+        MENUITEM "&Sair",                  ID_FILE_EXIT
+    END
+    POPUP "&Editar"
+    BEGIN
+        MENUITEM "&Desfazer\tCtrl+Z",           ID_EDIT_UNDO
+        MENUITEM "&Refazer\tCtrl+Y",            ID_EDIT_REDO
+        MENUITEM SEPARATOR
+        MENUITEM "Cor&tar\tCtrl+X",             ID_EDIT_CUT
+        MENUITEM "C&opiar\tCtrl+C",             ID_EDIT_COPY
+        MENUITEM "&Colar\tCtrl+V",              ID_EDIT_PASTE
+        MENUITEM "&Limpar\tDEL",                ID_EDIT_CLEAR
+        MENUITEM "&Selecionar tudo\tCtrl+A",    ID_EDIT_SELECTALL
+        MENUITEM SEPARATOR
+        MENUITEM "Locali&zar...\tCtrl+F",       ID_FIND
+        MENUITEM "&Localizar próxima\tF3",      ID_FIND_NEXT
+        MENUITEM "Substitui&r...\tCtrl+H",      ID_REPLACE
+        MENUITEM SEPARATOR
+        MENUITEM "Some&nte leitura",            ID_EDIT_READONLY
+        MENUITEM "&Modificado",                 ID_EDIT_MODIFIED
+        MENUITEM SEPARATOR
+        POPUP "E&xtras"
+        BEGIN
+            MENUITEM "&Informação da selecção",           ID_EDIT_SELECTIONINFO
+            MENUITEM "&Formato dos caracteres",           ID_EDIT_CHARFORMAT
+            MENUITEM "&Definir formato dos caracteres",   ID_EDIT_DEFCHARFORMAT
+            MENUITEM "F&ormato dos parágrafos",           ID_EDIT_PARAFORMAT
+            MENUITEM "&Buscar texto",                     ID_EDIT_GETTEXT
+        END
+    END
+    POPUP "E&xibir"
+    BEGIN
+        MENUITEM "&Barra de Ferramentas",    ID_TOGGLE_TOOLBAR
+        MENUITEM "Barra de &Formatação",     ID_TOGGLE_FORMATBAR
+        MENUITEM "&Régua",                   ID_TOGGLE_RULER
+        MENUITEM "Barra de &Estado",         ID_TOGGLE_STATUSBAR
+        MENUITEM SEPARATOR
+        MENUITEM "&Opções...",               ID_VIEWPROPERTIES
+    END
+    POPUP "&Inserir"
+    BEGIN
+        MENUITEM "&Data e hora...",  ID_DATETIME
+    END
+    POPUP "F&ormatar"
+    BEGIN
+        MENUITEM "&Fonte...",       ID_FONTSETTINGS
+        MENUITEM "&Marcadores"      ID_BULLET
+        MENUITEM "&Parágrafo..."    ID_PARAFORMAT
+        MENUITEM "T&abulação..."    ID_TABSTOPS
+        POPUP "&Fundo"
+        BEGIN
+            MENUITEM "&Sistema\tCtrl+1",            ID_BACK_1
+            MENUITEM "&PostThat amarelo\tCtrl+2",   ID_BACK_2
+        END
+    END
+    POPUP "&Ajuda"
+    BEGIN
+        MENUITEM "&Sobre Wine Wordpad"       ID_ABOUT
+    END
+END
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 IDM_MAINMENU MENU DISCARDABLE
@@ -97,6 +173,24 @@ BEGIN
     END
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+IDM_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "&Cortar",         ID_EDIT_CUT
+        MENUITEM "C&opiar",         ID_EDIT_COPY
+        MENUITEM "Co&lar",          ID_EDIT_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "&Marcadores"      ID_BULLET
+        MENUITEM "&Parágrafo..."    ID_PARAFORMAT
+    END
+END
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 IDM_POPUP MENU DISCARDABLE
 BEGIN
     POPUP ""
@@ -110,6 +204,9 @@ BEGIN
     END
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+
 IDM_COLOR_POPUP MENU DISCARDABLE
 BEGIN
     POPUP ""
@@ -130,7 +227,7 @@ BEGIN
         MENUITEM "Fúcsia"        ID_COLOR_FUCHSIA
         MENUITEM "Azul-piscina"  ID_COLOR_AQUA
         MENUITEM "Branco"        ID_COLOR_WHITE
-        MENUITEM "Automatic"     ID_COLOR_AUTOMATIC
+        MENUITEM "Automático"    ID_COLOR_AUTOMATIC
     END
 END
 
@@ -156,22 +253,22 @@ BEGIN
     PUSHBUTTON   "&Cancelar",IDCANCEL,97,26,40,12
 END
 
-IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
+IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 220, 110
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 Caption "Parágrafo"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Identação", -1, 10, 10, 120, 68
+    GROUPBOX "Identação", -1, 10, 10, 140, 68
-    LTEXT "Esquerda", -1, 15, 22, 40, 13
+    LTEXT "Esquerda", -1, 15, 22, 60, 13
-    EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
+    EDITTEXT IDC_PARA_LEFT, 75, 20, 60, 13
-    LTEXT "Direita", -1, 15, 40, 40, 13
+    LTEXT "Direita", -1, 15, 40, 60, 13
-    EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
+    EDITTEXT IDC_PARA_RIGHT, 75, 38, 60, 13
-    LTEXT "Primeira Linha", -1, 15, 58, 40, 13
+    LTEXT "Primeira Linha", -1, 15, 58, 60, 13
-    EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
+    EDITTEXT IDC_PARA_FIRST, 75, 56, 60, 13
-    LTEXT "Alinhamento", -1, 15, 87, 40, 13
+    LTEXT "Alinhamento", -1, 15, 87, 50, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
+    COMBOBOX IDC_PARA_ALIGN, 65, 85, 70, 60, CBS_DROPDOWNLIST
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
+    PUSHBUTTON "&OK", IDOK, 157, 15, 50, 15
-    PUSHBUTTON "&Cancelar", IDCANCEL, 137, 33, 50, 15
+    PUSHBUTTON "&Cancelar", IDCANCEL, 157, 33, 50, 15
 END
 
 IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
@@ -207,12 +304,44 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_RICHTEXT_FILES_RTF,     "Rich text format (*.rtf)"
+    STRING_RICHTEXT_FILES_RTF,     "Formato rich text (*.rtf)"
     STRING_TEXT_FILES_TXT,         "Documentos de texto (*.txt)"
     STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)"
     STRING_ALL_FILES,              "Todos os documentos (*.*)"
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    STRING_ALL_FILES,              "Todos os documentos (*.*)"
+    STRING_TEXT_FILES_TXT,         "Documentos de texto (*.txt)"
+    STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)"
+    STRING_RICHTEXT_FILES_RTF,     "Formato rich text (*.rtf)"
+    STRING_NEWFILE_RICHTEXT,       "Documento rich text"
+    STRING_NEWFILE_TXT,            "Documento de texto"
+    STRING_NEWFILE_TXT_UNICODE,    "Documento de texto Unicode"
+    STRING_PRINTER_FILES_PRN,      "Arquivos de impressora (*.PRN)"
+END
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    STRING_ALL_FILES,              "Todos os documentos (*.*)"
+    STRING_TEXT_FILES_TXT,         "Documentos de texto (*.txt)"
+    STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)"
+    STRING_RICHTEXT_FILES_RTF,     "Formato rich text (*.rtf)"
+    STRING_NEWFILE_RICHTEXT,       "Documento rich text"
+    STRING_NEWFILE_TXT,            "Documento de texto"
+    STRING_NEWFILE_TXT_UNICODE,    "Documento de texto Unicode"
+    STRING_PRINTER_FILES_PRN,      "Ficheiros de impressora (*.PRN)"
+END
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_ALIGN_LEFT,            "Esquerda"
@@ -220,18 +349,6 @@ BEGIN
     STRING_ALIGN_CENTER,          "Centro"
 END
 
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Rich text document"
-    STRING_NEWFILE_TXT,          "Documento de texto"
-    STRING_NEWFILE_TXT_UNICODE,  "Documento de texto Unicode"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PRINTER_FILES_PRN,        "Ficheiros de impressora (*.PRN)"
-END
-
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_VIEWPROPS_TITLE,          "Opções"
@@ -249,15 +366,38 @@ BEGIN
     STRING_PREVIEW_ZOOMIN,           "Zoom in"
     STRING_PREVIEW_ZOOMOUT,          "Zoom out"
     STRING_PREVIEW_CLOSE,            "Fechar"
-    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGE,             "Página"
-    STRING_PREVIEW_PAGES,            "Pages"
+    STRING_PREVIEW_PAGES,            "Páginas"
+    STRING_UNITS_CM,                 "cm"
+    STRING_UNITS_IN,                 "in"
+    STRING_UNITS_INCH,               "inch"
+    STRING_UNITS_PT,                 "pt"
 END
 
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
 STRINGTABLE DISCARDABLE
 BEGIN
-    STRING_UNITS_CM,             "cm"
+    STRING_DEFAULT_FILENAME,     "Documento"
+    STRING_PROMPT_SAVE_CHANGES,  "Salvar as alterações de '%s'?"
+    STRING_SEARCH_FINISHED,      "Acabou a pesquisa do documento."
+    STRING_LOAD_RICHED_FAILED,   "Falha ao carregar a biblioteca RichEdit."
+    STRING_SAVE_LOSEFORMATTING,  "Foi escolhido salvar em formato de texto simples, " \
+                                 "o que vai anular todas as formatações. " \
+                                 "Tem a certeza que deseja fazer isto?"
+    STRING_INVALID_NUMBER,       "Formato de número inválido"
+    STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentos OLE não são suportados"
+    STRING_WRITE_FAILED,              "Não foi possível salvar o arquivo."
+    STRING_WRITE_ACCESS_DENIED,       "Não tem permissões para salvar o arquivo."
+    STRING_OPEN_FAILED,               "Não foi possível abrir o arquivo."
+    STRING_OPEN_ACCESS_DENIED,        "Não tem permissões para abrir o arquivo."
+    STRING_PRINTING_NOT_IMPLEMENTED,  "Impressão não implementada"
+    STRING_MAX_TAB_STOPS,             "Não é possível adicionar mais de 32 tabulações."
 END
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_DEFAULT_FILENAME,     "Documento"

base/applications/wordpad/Ru.rc

@@ -47,14 +47,14 @@ BEGIN
         MENUITEM "&Копировать\tCtrl+C",         ID_EDIT_COPY
         MENUITEM "&Вставить\tCtrl+V",           ID_EDIT_PASTE
         MENUITEM "&Удалить\tDEL",               ID_EDIT_CLEAR
-        MENUITEM "Выделить в&се\tCtrl+A",       ID_EDIT_SELECTALL
+        MENUITEM "Выделить в&сё\tCtrl+A",       ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "&Найти...\tCtrl+F",           ID_FIND
         MENUITEM "На&йти далее\tF3",            ID_FIND_NEXT
         MENUITEM "&Заменить...\tCtrl+H",        ID_REPLACE
         MENUITEM SEPARATOR
         MENUITEM "&Только для чтения",          ID_EDIT_READONLY
-        MENUITEM "&Изменен",                    ID_EDIT_MODIFIED
+        MENUITEM "&Изменён",                    ID_EDIT_MODIFIED
         MENUITEM SEPARATOR
         POPUP "&Дополнительно"
         BEGIN
@@ -129,7 +129,7 @@ BEGIN
         MENUITEM "Ярко-розовый"   ID_COLOR_FUCHSIA
         MENUITEM "Голубой"        ID_COLOR_AQUA
         MENUITEM "Белый"          ID_COLOR_WHITE
-        MENUITEM "Automatic"      ID_COLOR_AUTOMATIC
+        MENUITEM "Автоматически"      ID_COLOR_AUTOMATIC
     END
 END
 
@@ -193,7 +193,7 @@ Caption ""
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Перенос по словам", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
+    RADIOBUTTON "Не переносить", IDC_PAGEFMT_WN, 18, 25, 117, 15
     RADIOBUTTON "В границах &окна", IDC_PAGEFMT_WW, 18, 45, 117, 15
     RADIOBUTTON "В границах &полей", IDC_PAGEFMT_WM, 18, 65, 117, 15
     GROUPBOX "Панели", -1, 150, 10, 120, 85
@@ -241,15 +241,15 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_PREVIEW_PRINT,            "Печать"
-    STRING_PREVIEW_NEXTPAGE,         "Следующая страница"
+    STRING_PREVIEW_NEXTPAGE,         "Следующая"
-    STRING_PREVIEW_PREVPAGE,         "Предыдущая страница"
+    STRING_PREVIEW_PREVPAGE,         "Предыдущая"
-    STRING_PREVIEW_TWOPAGES,         "Две страницы"
+    STRING_PREVIEW_TWOPAGES,         "По две"
-    STRING_PREVIEW_ONEPAGE,          "Одна страница"
+    STRING_PREVIEW_ONEPAGE,          "По одной"
     STRING_PREVIEW_ZOOMIN,           "Приблизить"
     STRING_PREVIEW_ZOOMOUT,          "Отдалить"
     STRING_PREVIEW_CLOSE,            "Закрыть"
-    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGE,             "Страница"
-    STRING_PREVIEW_PAGES,            "Pages"
+    STRING_PREVIEW_PAGES,            "Страницы"
 END
 
 STRINGTABLE DISCARDABLE
@@ -263,15 +263,15 @@ BEGIN
     STRING_PROMPT_SAVE_CHANGES,  "Сохранить изменения в '%s'?"
     STRING_SEARCH_FINISHED,      "Поиск в документе завершен."
     STRING_LOAD_RICHED_FAILED,   "Ошибка загрузки библиотеки RichEdit."
-    STRING_SAVE_LOSEFORMATTING,  "Сохранение документа в виде неформатированного текста, " \
+    STRING_SAVE_LOSEFORMATTING,  "Сохранение документа в виде неформатированного текста " \
-                                 "приведет к потере форматирования. Подтверждаете выполнение" \
+                                 "приведёт к потере форматирования. Подтверждаете выполнение" \
                                  "этой операции?"
-    STRING_INVALID_NUMBER,       "Неправильный числовой формат"
+    STRING_INVALID_NUMBER,       "Неправильный числовой формат."
-    STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage документы не поддерживаются"
+    STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage документы не поддерживаются."
     STRING_WRITE_FAILED,              "Невозможно сохранить файл."
     STRING_WRITE_ACCESS_DENIED,       "Недостаточно прав для сохранения файла."
     STRING_OPEN_FAILED,               "Невозможно открыть файл."
     STRING_OPEN_ACCESS_DENIED,        "Недостаточно прав для открытия файла."
-    STRING_PRINTING_NOT_IMPLEMENTED, "Печать не поддерживается"
+    STRING_PRINTING_NOT_IMPLEMENTED,  "Печать не поддерживается."
     STRING_MAX_TAB_STOPS,             "Нельзя добавить более 32 позиций табуляции."
 END

base/applications/wordpad/Tr.rc

@@ -131,127 +131,3 @@ BEGIN
         MENUITEM "Automatic"    ID_COLOR_AUTOMATIC
     END
 END
-
-IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Date and time"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT        "Available formats",-1,3,2,100,15
-    LISTBOX      IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY
-    PUSHBUTTON   "&OK",IDOK,87,12,40,12
-    PUSHBUTTON   "&Cancel",IDCANCEL,87,26,40,12
-END
-
-IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "New"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT        "New document type",-1,3,2,100,15
-    LISTBOX      IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
-    PUSHBUTTON   "&OK",IDOK,97,12,40,12
-    PUSHBUTTON   "&Cancel",IDCANCEL,97,26,40,12
-END
-
-IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Paragraph format"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "Indentation", -1, 10, 10, 120, 68
-    LTEXT "Left", -1, 15, 22, 40, 13
-    EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
-    LTEXT "Right", -1, 15, 40, 40, 13
-    EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
-    LTEXT "First line", -1, 15, 58, 40, 13
-    EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
-    LTEXT "Alignment", -1, 15, 87, 40, 13
-    COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
-END
-
-IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-Caption "Tabs"
-FONT 8, "MS SHell DLg"
-BEGIN
-    GROUPBOX "Tab stops", -1, 10, 10, 120, 90
-    COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
-    DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15
-    PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15
-    PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
-    PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15
-    PUSHBUTTON "Remove al&l", ID_TAB_EMPTY, 137, 51, 50, 15
-END
-
-IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110
-STYLE DS_SYSMODAL
-Caption ""
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "Line wrapping", -1, 10, 10, 130, 85
-    RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15
-    RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15
-    RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15
-    GROUPBOX "Toolbars", -1, 150, 10, 120, 85
-    CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15
-    CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15
-    CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15
-    CHECKBOX "&Statusbar", IDC_PAGEFMT_SB, 160, 74, 80, 15
-    LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_RICHTEXT_FILES_RTF,     "Rich text format (*.rtf)"
-    STRING_TEXT_FILES_TXT,         "Text documents (*.txt)"
-    STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)"
-    STRING_ALL_FILES,              "All documents (*.*)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_ALIGN_LEFT,            "Left"
-    STRING_ALIGN_RIGHT,           "Right"
-    STRING_ALIGN_CENTER,          "Center"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_NEWFILE_RICHTEXT,     "Rich text document"
-    STRING_NEWFILE_TXT,          "Text document"
-    STRING_NEWFILE_TXT_UNICODE,  "Unicode text document"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PRINTER_FILES_PRN,        "Printer files (*.PRN)"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_VIEWPROPS_TITLE,          "Options"
-    STRING_VIEWPROPS_TEXT,           "Text"
-    STRING_VIEWPROPS_RICHTEXT,       "Rich text"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_PREVIEW_PRINT,            "Print"
-    STRING_PREVIEW_NEXTPAGE,         "Next page"
-    STRING_PREVIEW_PREVPAGE,         "Previous page"
-    STRING_PREVIEW_TWOPAGES,         "Two pages"
-    STRING_PREVIEW_ONEPAGE,          "One page"
-    STRING_PREVIEW_ZOOMIN,           "Zoom in"
-    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
-    STRING_PREVIEW_CLOSE,            "Close"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
-END

base/applications/wordpad/Zh.rc

@@ -111,30 +111,6 @@ BEGIN
     END
 END
 
-IDM_COLOR_POPUP MENU DISCARDABLE
-BEGIN
-    POPUP ""
-    BEGIN
-        MENUITEM "Black",      ID_COLOR_BLACK
-        MENUITEM "Maroon",     ID_COLOR_MAROON
-        MENUITEM "Green",      ID_COLOR_GREEN
-        MENUITEM "Olive"       ID_COLOR_OLIVE
-        MENUITEM "Navy"        ID_COLOR_NAVY
-        MENUITEM "Purple"      ID_COLOR_PURPLE
-        MENUITEM "Teal"        ID_COLOR_TEAL
-        MENUITEM "Gray"        ID_COLOR_GRAY
-        MENUITEM "Silver"      ID_COLOR_SILVER
-        MENUITEM "Red"         ID_COLOR_RED
-        MENUITEM "Lime"        ID_COLOR_LIME
-        MENUITEM "Yellow"      ID_COLOR_YELLOW
-        MENUITEM "Blue"        ID_COLOR_BLUE
-        MENUITEM "Fuchsia"     ID_COLOR_FUCHSIA
-        MENUITEM "Aqua"        ID_COLOR_AQUA
-        MENUITEM "White"       ID_COLOR_WHITE
-        MENUITEM "Automatic"   ID_COLOR_AUTOMATIC
-    END
-END
-
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "日期和时间"
@@ -250,13 +226,6 @@ BEGIN
     STRING_PREVIEW_ZOOMIN,           "Zoom in"
     STRING_PREVIEW_ZOOMOUT,          "Zoom out"
     STRING_PREVIEW_CLOSE,            "关闭"
-    STRING_PREVIEW_PAGE,             "Page"
-    STRING_PREVIEW_PAGES,            "Pages"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
 END
 
 STRINGTABLE DISCARDABLE
@@ -478,11 +447,6 @@ BEGIN
     STRING_PREVIEW_CLOSE,            "關閉"
 END
 
-STRINGTABLE DISCARDABLE
-BEGIN
-    STRING_UNITS_CM,             "cm"
-END
-
 STRINGTABLE DISCARDABLE
 BEGIN
     STRING_DEFAULT_FILENAME,     "Document"

base/applications/wordpad/print.c

@@ -891,7 +891,7 @@ static void update_preview_buttons(HWND hMainWnd)
     EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_ZOOMOUT), preview.zoomlevel > 0);
 }
 
-LRESULT print_preview(HWND hwndPreview)
+static LRESULT print_preview(HWND hwndPreview)
 {
     HDC hdc;
     RECT window, background;
@@ -1039,7 +1039,7 @@ static void toggle_num_pages(HWND hMainWnd)
 
 /* Returns the page shown that the point is in (1 or 2) or 0 if the point
  * isn't inside either page */
-int preview_page_hittest(POINT pt)
+static int preview_page_hittest(POINT pt)
 {
     RECT rc;
     rc.left = preview.spacing.cx;

base/applications/wordpad/wordpad.c

@@ -2435,7 +2435,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
         break;
 
     case ID_TABSTOPS:
-        DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_PARAFORMAT), hWnd, tabstops_proc);
+        DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_TABSTOPS), hWnd, tabstops_proc);
         break;
 
     case ID_ABOUT:
@@ -2546,7 +2546,7 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam )
     HWND hwndEditor = preview_isactive() ? GetDlgItem(hWnd, IDC_PREVIEW) : GetDlgItem(hWnd, IDC_EDITOR);
     HWND hwndStatusBar = GetDlgItem(hWnd, IDC_STATUSBAR);
     HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR);
-    HWND hRulerWnd = GetDlgItem(hWnd, IDC_RULER);
+    HWND hRulerWnd = GetDlgItem(hwndReBar, IDC_RULER);
     int rebarHeight = 0;
 
     if (hwndStatusBar)

base/applications/wordpad/wordpad.h

@@ -247,7 +247,6 @@ LRESULT preview_command(HWND, WPARAM);
 void init_preview(HWND, LPWSTR);
 void close_preview(HWND);
 BOOL preview_isactive(void);
-LRESULT print_preview(HWND);
 void get_default_printer_opts(void);
 void registry_set_pagemargins(HKEY);
 void registry_read_pagemargins(HKEY);

base/setup/usetup/lang/uk-UA.h

@@ -422,13 +422,13 @@ static MUI_ENTRY ukUADevicePageEntries[] =
     {
         6,
         23,
-        "Š®«¨ ¢ái ¯ à ¬¥âਠ¡ã¤ãâì ¢¨§­ ç¥­i, ¢¨¡¥àiâì \"‡ áâ®á㢠⨠¤ ­i ¯ à ¬¥âਠ¯à¨áâà®õ¢\"",
+        "Š®«¨ ¢ái ¯ à ¬¥âਠ¡ã¤ãâì ¢¨§­ ç¥­i, ¢¨¡¥àiâì",
         TEXT_STYLE_NORMAL
     },
     {
         6,
         24,
-        "i ­ â¨á­iâì ENTER.",
+        "\"‡ áâ®á㢠⨠¤ ­i ¯ à ¬¥âਠ¯à¨áâà®õ¢\" i ­ â¨á­iâì ENTER.",
         TEXT_STYLE_NORMAL
     },
     {
@@ -525,7 +525,7 @@ static MUI_ENTRY ukUAComputerPageEntries[] =
     {
         8,
         10,
-        "\x07  <20> â¨áª ©â¥ ª« ¢ièi ‚‚…<E2809A>• â  ‚<>ˆ‡ ¤«ï ¢¨¡®àã ⨯㠂 è®£® ª®¬¯'îâ¥à .",
+        "\x07  <20> â¨áª ©â¥ ª« ¢ièi ‚‚…<E2809A>• â  ‚<>ˆ‡ ¤«ï ¢¨¡®àã ⨯㠂 è®£® ª®¬¯'îâ¥à ",
         TEXT_STYLE_NORMAL
     },
     {
@@ -662,7 +662,7 @@ static MUI_ENTRY ukUADisplayPageEntries[] =
     },
     {   8,
         10,
-         "\x07  <20> â¨áª ©â¥ ª« ¢ièi ‚‚…<E2809A>• â  ‚<>ˆ‡ ¤«ï ¢¨¡®àã ¯®âài¡­®£® ⨯㠬®­iâ®àã.",
+         "\x07  <20> â¨áª ©â¥ ª« ¢ièi ‚‚…<E2809A>• â  ‚<>ˆ‡ ¤«ï ¢¨¡®àã ¯®âài¡­®£® ⨯㠬®­iâ®àã",
          TEXT_STYLE_NORMAL
     },
     {
@@ -720,7 +720,7 @@ static MUI_ENTRY ukUASuccessPageEntries[] =
     {
         10,
         9,
-        "¢áiå CD-ROM § CD-¯à¨¢®¤i¢.",
+        "¢ái CD-ROM § CD-¯à¨¢®¤i¢.",
         TEXT_STYLE_NORMAL
     },
     {
@@ -837,7 +837,7 @@ static MUI_ENTRY ukUASelectPartitionEntries[] =
     {
         0,
         0,
-        "<EFBFBD>ã¤ì-« áª  § ç¥ª ©â¥...",
+        "Please wait...",
         TEXT_TYPE_STATUS | TEXT_PADDING_BIG
     },
     {
@@ -1037,13 +1037,13 @@ static MUI_ENTRY ukUAKeyboardSettingsEntries[] =
     {
         8,
         10,
-        "\x07  <20> â¨áª ©â¥ ª« ¢ièi ‚‚…<E2809A>• â  ‚<>ˆ‡ ¤«ï ¢¨¡®àã ¯®âài¡­®£® ⨯㠪« ¢i âãà¨.",
+        "\x07  <20> â¨áª ©â¥ ª« ¢ièi ‚‚…<E2809A>• â  ‚<>ˆ‡ ¤«ï ¢¨¡®àã ¯®âài¡­®£® ⨯ã",
         TEXT_STYLE_NORMAL
     },
     {
         8,
         11,
-        "   i ­ â¨á­iâì ENTER.",
+        "   ª« ¢i âãਠi ­ â¨á­iâì ENTER.",
         TEXT_STYLE_NORMAL
     },
     {
@@ -1485,8 +1485,8 @@ MUI_ERROR ukUAErrorEntries[] =
     },
     {
         //ERROR_INSUFFICIENT_DISKSPACE,
-        "Not enough free space in the selected partition.\n"
+        "<EFBFBD>¥¤®áâ â­ì® ¢i«ì­®£® ¬iáæï ­  ®¡à ­®¬ã ஧¤i«i.\n"
-        "  * Press any key to continue.",
+        "  * <EFBFBD> â¨á­iâì ¡ã¤ì-ïªã ª« ¢ièã ¤«ï ¯à®¤®¢¦¥­­ï.",
         NULL
     },
     {

base/shell/cmd/lang/de-DE.rc

@@ -1,7 +1,8 @@
-/*
+/*
  *  German language file by Klemens Friedl <frik85> 2005-06-03
  *  Update: frik85 2005-06-06
  */
+#pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 STRINGTABLE DISCARDABLE
@@ -12,32 +13,32 @@ assoc [.erw[=[Dateityp]]]\n\
 \n\
 assoc (Gibt alle Zuordnungen aus)\n\
 assoc .erw (Gibt die spezifische Zuordnung aus)\n\
-assoc .erw= (Löscht die spezifische Zuordnung)\n\
+assoc .erw= (Löscht die spezifische Zuordnung)\n\
-assoc .erw=Dateityp (Fügt neue Zuordnung hinzu)\n"
+assoc .erw=Dateityp (Fügt neue Zuordnung hinzu)\n"
 
-STRING_ATTRIB_HELP,    "Zeigt Dateiattribute an oder ändert sie.\n\n\
+STRING_ATTRIB_HELP,    "Zeigt Dateiattribute an oder ändert sie.\n\n\
 ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] Dateiname ...\n\
        [/S [/D]]\n\n\
   +   Setzt ein Attribut\n\
-  -   Löscht ein Attribut\n\
+  -   Löscht ein Attribut\n\
-  R   Attribut für 'schreibgeschützte Datei'\n\
+  R   Attribut für 'schreibgeschützte Datei'\n\
-  A   Attribut für 'zu archivierende Datei'\n\
+  A   Attribut für 'zu archivierende Datei'\n\
-  S   Attribut für 'Systemdatei'\n\
+  S   Attribut für 'Systemdatei'\n\
-  H   Attribut für 'versteckte Datei'\n\
+  H   Attribut für 'versteckte Datei'\n\
- /S   Verarbeitet übereinstimmende Dateien im aktuellen Ordner\n\
+ /S   Verarbeitet übereinstimmende Dateien im aktuellen Ordner\n\
       und in allen Unterordnern.\n\
   /D  Verarbeitet auch die Ordner.\n\n\
 ATTRIB ohne Parameter zeigt die derzeit gesetzten Attribute aller Dateien an."
 
-STRING_ALIAS_HELP,  "Setzt, löscht oder zeigt ein Alias.\n\n\
+STRING_ALIAS_HELP,  "Setzt, löscht oder zeigt ein Alias.\n\n\
 ALIAS [alias=[command]]\n\n\
   alias    Name des Alias.\n\
-  command  Text welcher für den Alias zugeordnet wird.\n\n\
+  command  Text welcher für den Alias zugeordnet wird.\n\n\
 Listet alle Aliase auf:\n\
   ALIAS\n\n\
-Setzt ein neues oder überschreibt ein bestehendes Alias:\n\
+Setzt ein neues oder überschreibt ein bestehendes Alias:\n\
   ALIAS da=dir a:\n\n\
-Löscht ein Alias von der Alias-Liste:\n\
+Löscht ein Alias von der Alias-Liste:\n\
   ALIAS da="
 
 STRING_BEEP_HELP, "Gibt einen Piepton durch den PC-Lautsprecher aus.\n\nBEEP"
@@ -45,14 +46,14 @@ STRING_BEEP_HELP, "Gibt einen Piepton durch den PC-Lautsprecher aus.\n\nBEEP"
 STRING_CALL_HELP, "Ruft eine Batchdatei von einer anderen aus auf.\n\n\
 CALL [Laufwerk:][Pfad]Dateiname [Batch-Parameter]\n\n\
   Parameter      Bezeichnet beliebige Angaben in der Befehlszeile, die von\n\
-                 dem aufgerufenen Batchprogramm benötigt werden."
+                 dem aufgerufenen Batchprogramm benötigt werden."
 
 STRING_CD_HELP,      "Wechselt das Verzeichnis oder zeigt dessen Namen an.\n\n\
 CHDIR [Laufwerk:][Pfad]\n\
 CHDIR[..|.]\n\
 CD [Laufwerk:][Pfad]\n\
 CD[..|.]\n\n\
-  ..   übergeordnetes Verzeichnis\n\
+  ..   übergeordnetes Verzeichnis\n\
   .    vorhergehende Verzeichnis\n\n\
 Geben Sie CD-Laufwerk: ein, um das aktuelle Verzeichnis auf dem angegebenen\n\
 Laufwerk anzuzeigen.\n\
@@ -63,20 +64,20 @@ CHCP [nnn]\n\n\
   nnn   Codepage angeben.\n\n\
 Der Befehl CHCP ohne Parameter zeigt die Nummer der aktuellen Codepage an."
 
-STRING_CHOICE_HELP, "Wartet auf den Benutzer, welcher aus einer Auswahl eine Option wählen muss.\n\n\
+STRING_CHOICE_HELP, "Wartet auf den Benutzer, welcher aus einer Auswahl eine Option wählen muss.\n\n\
 CHOICE  [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\
   /C[:]choices  Die erlaubten Tasten festlegen. Standard-Tasten sind Y und N.\n\
   /N            Zeigt choices und ? am ende des Prompt-Strings NICHT an.\n\
-  /S            Groß- und Kleinschreibung wird beachtet.\n\
+  /S            Groß- und Kleinschreibung wird beachtet.\n\
   /T[:]c,nn     Standard-Auswahl wird auf c gesetzt nach nn Sekunden.\n\
   text          Zeigt eine Beschreibung an.\n\n\
-ERRORLEVEL wird auf den Offset der Taste welche der Benutzer gedrückt hat gesetzt."
+ERRORLEVEL wird auf den Offset der Taste welche der Benutzer gedrückt hat gesetzt."
 
-STRING_CLS_HELP, "Löscht den Bildschirminhalt.\n\nCLS"
+STRING_CLS_HELP, "Löscht den Bildschirminhalt.\n\nCLS"
 
-STRING_CMD_HELP1, "\nInterne Befehle verfügbar:\n"
+STRING_CMD_HELP1, "\nInterne Befehle verfügbar:\n"
 
-STRING_CMD_HELP2, "\nVerfügbare Funktionen:"
+STRING_CMD_HELP2, "\nVerfügbare Funktionen:"
 
 STRING_CMD_HELP3,"  [aliases]"
 
@@ -90,18 +91,18 @@ STRING_CMD_HELP7,"  [redirections and piping]"
 
 STRING_CMD_HELP8, "Startet eine neue Instanz des ReactOS-Befehlsinterpreters.\n\n\
 CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\
-  /C command  Führt den Befehl in der Zeichenfolge aus und schließt sich.\n\
+  /C command  Führt den Befehl in der Zeichenfolge aus und schließt sich.\n\
-  /K command  Führt den Befehl in der Zeichenfolge aus und läuft weiter.\n\
+  /K command  Führt den Befehl in der Zeichenfolge aus und läuft weiter.\n\
-  /P          CMD wird permanent und führt autoexec.bat aus\n\
+  /P          CMD wird permanent und führt autoexec.bat aus\n\
               (kann nicht beendet werden).\n\
   /T:bf       Setzt die Hintergrund- und Vordergrund-Farbe (siehe COLOR Befehl)."
 
-STRING_COLOR_HELP1, "Legt die Standardhinter- und Vordergrundfarben für die Konsole fest.\n\n\
+STRING_COLOR_HELP1, "Legt die Standardhinter- und Vordergrundfarben für die Konsole fest.\n\n\
 COLOR [attr [/F]] \n\n\
-  attr        Gibt die Farbattribute für die Konsolenausgabe an.\n\
+  attr        Gibt die Farbattribute für die Konsolenausgabe an.\n\
-  /F          Füllt die Konsolenausgabe mit dem Farbattribut\n\n\
+  /F          Füllt die Konsolenausgabe mit dem Farbattribut\n\n\
-Es gibt 3 Möglichkeiten, um die Farbe festzulegen:\n\
+Es gibt 3 Möglichkeiten, um die Farbe festzulegen:\n\
-1) [bright] name on [bright] name  (Nur die 4 ersten Buchstaben sind nötig)\n\
+1) [bright] name on [bright] name  (Nur die 4 ersten Buchstaben sind nötig)\n\
 2) decimal on decimal\n\
 3) two hex digits\n\n\
 Farben:\n\
@@ -115,21 +116,21 @@ dec  hex  name       dec  hex  name\n\
 6    6    Yellow     14   E    Bright Yellow\n\
 7    7    White      15   F    Bright White"
 
-STRING_COPY_HELP1,  " %s überschreiben (Ja/Nein/Alle)? "
+STRING_COPY_HELP1,  " %s überschreiben (Ja/Nein/Alle)? "
 
 STRING_COPY_HELP2, "Kopiert eine oder mehrere Dateien an eine andere Position.\n\n\
 COPY [/V][/Y|/-Y][/A|/B] Quelle [/A|/B]\n\
      [+ source [/A|/B] [+ ...]] [destination [/A|/B]]\n\n\
   source       Bezeichnet die zu kopierende(n) Datei(en).\n\
   /A           Weist auf eine ASCII-Textdatei hin.\n\
-  /B           Weist auf eine Binärdatei hin.\n\
+  /B           Weist auf eine Binärdatei hin.\n\
   destination  Bezeichnet das Verzeichnis und/oder Dateinamen der neuen Datei(en).\n\
-  /V           Überprüft, ob die Dateien richtig geschrieben wurden.\n\
+  /V           Überprüft, ob die Dateien richtig geschrieben wurden.\n\
-  /Y           Unterdrückt die Bestätigungsaufforderung beim Überschreiben\n\
+  /Y           Unterdrückt die Bestätigungsaufforderung beim Überschreiben\n\
                vorhandener Zieldateien.\n\
-  /-Y          Fordert beim Überschreiben vorhandener Zieldateien zum\n\
+  /-Y          Fordert beim Überschreiben vorhandener Zieldateien zum\n\
-               Bestätigen auf.\n\n\
+               Bestätigen auf.\n\n\
-Die Option /Y ist möglicherweise in der Umgebungsvariablen COPYCMD definiert.\n\
+Die Option /Y ist möglicherweise in der Umgebungsvariablen COPYCMD definiert.\n\
 ..."
 
 STRING_DATE_HELP1, "\nGeben Sie das neue Datum ein (mm%cdd%cyyyy): "
@@ -138,30 +139,30 @@ STRING_DATE_HELP2, "\nGeben Sie das neue Datum ein (dd%cmm%cyyyy): "
 
 STRING_DATE_HELP3, "\nGeben Sie das neue Datum ein (yyyy%cmm%cdd): "
 
-STRING_DATE_HELP4, "Ändert das eingestellte Datum oder zeigt es an.\n\n\
+STRING_DATE_HELP4, "Ändert das eingestellte Datum oder zeigt es an.\n\n\
 DATE [/T][date]\n\n\
   /T    nur Datum anzeigen\n\n\
 Der Befehl DATE ohne Parameter zeigt das aktuelle Datum an und fragt nach\n\
-einem neuen. Drücken Sie die EINGABETASTE, um das bisherige Datum zu behalten."
+einem neuen. Drücken Sie die EINGABETASTE, um das bisherige Datum zu behalten."
 
-STRING_DEL_HELP1,  "Löscht eine oder mehrere Dateien.\n\n\
+STRING_DEL_HELP1,  "Löscht eine oder mehrere Dateien.\n\n\
 DEL [/N /P /T /Q /W /Y /Z] Dateinamen ...\n\
 DELETE [/N /P /T /Q /W /Y /Z] Dateinamen ...\n\
 ERASE [/N /P /T /Q /W /Y /Z] Dateinamen ...\n\n\
-  file  Geben Sie die Dateinamen an, welche Sie löschen möchten\n\n\
+  file  Geben Sie die Dateinamen an, welche Sie löschen möchten\n\n\
   /N    Nichts.\n\
-  /P    Fordert Sie vor dem Löschen jeder Datei zur Bestätigung auf.\n\
+  /P    Fordert Sie vor dem Löschen jeder Datei zur Bestätigung auf.\n\
-  /T    Zeigt die Anzahl der gelöschten Dateien und deren vorherigen Speicherplatzbedarf an.\n\
+  /T    Zeigt die Anzahl der gelöschten Dateien und deren vorherigen Speicherplatzbedarf an.\n\
   /Q    Beenden.\n\
-  /W    Sicheres Löschen. Dateien werden mit Zufallszahlen überschrieben, bevor sie gelöscht werden.\n\
+  /W    Sicheres Löschen. Dateien werden mit Zufallszahlen überschrieben, bevor sie gelöscht werden.\n\
-  /Y    Löscht alles (*.*) ohne Vorwarnung.\n\
+  /Y    Löscht alles (*.*) ohne Vorwarnung.\n\
-  /Z    Löscht versteckte Dateien mit Nur-Leserechten und Systemdateien.\n"
+  /Z    Löscht versteckte Dateien mit Nur-Leserechten und Systemdateien.\n"
 
-STRING_DEL_HELP2, "Alle Dateien in diesem Verzeichnis werden gelöscht!\nSind Sie sich sicher (Y/N)?"
+STRING_DEL_HELP2, "Alle Dateien in diesem Verzeichnis werden gelöscht!\nSind Sie sich sicher (Y/N)?"
-STRING_DEL_HELP3, "    %lu Datei(en) gelöscht\n"
+STRING_DEL_HELP3, "    %lu Datei(en) gelöscht\n"
-STRING_DEL_HELP4, "    %lu Datei(en) gelöscht\n"
+STRING_DEL_HELP4, "    %lu Datei(en) gelöscht\n"
 
-STRING_DELAY_HELP, "Pause für n Sekunden oder Millisekunden\n\
+STRING_DELAY_HELP, "Pause für n Sekunden oder Millisekunden\n\
 DELAY [/m]n\n\n\
   /m          Millisekunden, ansonsten Sekunden\n"
 
@@ -171,19 +172,19 @@ DIR [Laufwerk:][Pfad][Dateiname] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\
   [Laufwerk:][path][Dateiname]\n\
               Bezeichnet Laufwerk, Verzeichnis und/oder Dateien.\n\n\
   /A          Listet Dateien mit angegebenen Attributen auf.\n\
-  attributes   D  Verzeichnisse         R  Schreibgeschützte Dateien\n\
+  attributes   D  Verzeichnisse         R  Schreibgeschützte Dateien\n\
                H  Versteckte Dateien    A  Zu archivierende Dateien\n\
                S  Systemdateien         -  vorangestellt kehrt die Bedeutung um\n\
   /B          Einfaches Format (keine Kopfdaten, keine Zusammenfassung).\n\
-  /C          Zeigt das Tausendertrennzeichen bei Dateigrößen an (Standard-\n\
+  /C          Zeigt das Tausendertrennzeichen bei Dateigrößen an (Standard-\n\
               einstellung). Verwenden Sie /-C, um das Tausendertrennzeichen\n\
               nicht anzuzeigen.\n\
   /D          Gleich wie Breitformat, jedoch nach Spalten sortiert.\n\
   /L          Verwendet Kleinschreibung.\n\
   /N          Neues, langes Listenformat (Dateinamen auf der rechten Seite).\n\
   /O          Gibt die Liste sortiert aus.\n\
-  sortorder    N  Name (alphabetisch)         S  Größe (kleinere zuerst)\n\
+  sortorder    N  Name (alphabetisch)         S  Größe (kleinere zuerst)\n\
-               E  Erweiterung (alphabetisch)  D Datum/Zeit (ältere zuerst)\n\
+               E  Erweiterung (alphabetisch)  D Datum/Zeit (ältere zuerst)\n\
                G  Verzeichnisse zuerst        - vorangestellt kehrt die\n\
   /P          Pausiert nach jeder vollen Bildschirmseite.\n\
   /Q          Gibt den Besitzer der Datei aus.\n\
@@ -192,24 +193,24 @@ DIR [Laufwerk:][Pfad][Dateiname] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\
   timefield   C  Erstellung\n\
               A  Letzter Zugriff\n\
               W  Letzter Schreibzugriff\n\
-  /W          Verwendet Breitformat für die Auflistung.\n\
+  /W          Verwendet Breitformat für die Auflistung.\n\
-  /X          Zeigt die Kurznamen für Dateien mit Nicht-8Punkt3-Namen an.\n\
+  /X          Zeigt die Kurznamen für Dateien mit Nicht-8Punkt3-Namen an.\n\
               Das Format ist das gleiche wie bei /N, wobei der Kurzname vor\n\
-              dem Langnamen eingefügt wird. Wenn kein Kurzname vorhanden ist,\n\
+              dem Langnamen eingefügt wird. Wenn kein Kurzname vorhanden ist,\n\
               werden Leerzeichen angezeigt.\n\
   /4          Zeigt das Jahr vierstellig an.\n\n\
-Optionen können in der Umgebungsvariablen DIRCMD voreingestellt werden.\n\
+Optionen können in der Umgebungsvariablen DIRCMD voreingestellt werden.\n\
-""-"" vor einer Option setzt die Voreinstellung außer Kraft, z.B. DIR /-W."
+""-"" vor einer Option setzt die Voreinstellung außer Kraft, z.B. DIR /-W."
 
-STRING_DIR_HELP2, " Datenträger in Laufwerk %c ist %s\n"
+STRING_DIR_HELP2, " Datenträger in Laufwerk %c ist %s\n"
-STRING_DIR_HELP3, " Datenträger in Laufwerk %c hat keine Bezeichnung\n"
+STRING_DIR_HELP3, " Datenträger in Laufwerk %c hat keine Bezeichnung\n"
 STRING_DIR_HELP4, " Volumeseriennummer: %04X-%04X\n"
 STRING_DIR_HELP5, "\n     Anzahl der angezeigten Dateien:\n%16i Datei(en)% 15s Bytes\n"
 STRING_DIR_HELP6, "%16i Verzeichnis(se), % 15s Bytes frei\n"
 STRING_DIR_HELP7, "\n Verzeichnis von %s\n\n"
 STRING_DIR_HELP8, "%16i Datei(en)% 14s Bytes\n"
 
-STRING_DIRSTACK_HELP1, "Speichert das aktuelle Verzeichnis für den POPD-Befehl und\n\
+STRING_DIRSTACK_HELP1, "Speichert das aktuelle Verzeichnis für den POPD-Befehl und\n\
 wechselt dann in das festgelegte Verzeichnis.\n\n\
 PUSHD [path | ..]\n\n\
   path        Legt das Verzeichnis fest, in das gewechselt werden soll"
@@ -220,14 +221,14 @@ STRING_DIRSTACK_HELP3, "Druckt den Inhalt des Verzeichnis-Stacks.\n\nDIRS"
 
 STRING_DIRSTACK_HELP4, "Verzeichnis-Stack ist leer"
 
-STRING_ECHO_HELP1,  "Sendet eine Nachricht, ohne den Zeilenvorschub und Wagenrücklauf zu betätigen.\n\n\
+STRING_ECHO_HELP1,  "Sendet eine Nachricht, ohne den Zeilenvorschub und Wagenrücklauf zu betätigen.\n\n\
   ECHOS message"
 
 STRING_ECHO_HELP2,  "Sendet eine Nachricht zur Standard-Fehlerausgabe.\n\n\
   ECHOERR Nachricht\n\
   ECHOERR.           gibt eine Leerzeile aus"
 
-STRING_ECHO_HELP3, "Sendet eine Nachricht zur Standard-Fehlerausgabe, ohne den Zeilenvorschub und Wagenrücklauf zu betätigen.\n\n\
+STRING_ECHO_HELP3, "Sendet eine Nachricht zur Standard-Fehlerausgabe, ohne den Zeilenvorschub und Wagenrücklauf zu betätigen.\n\n\
   ECHOSERR Nachricht"
 
 STRING_ECHO_HELP4, "Zeigt Meldungen an oder schaltet die Befehlsanzeige ein ""ON"" oder aus ""OFF"".\n\n\
@@ -240,78 +241,78 @@ STRING_ECHO_HELP5, "ECHO ist %s\n"
 
 STRING_EXIT_HELP, "Beendet den Befehlsinterpreter CMD.EXE oder die aktuelle Batchdatei.\n\nEXIT"
 
-STRING_FOR_HELP1, "Führt einen Befehl für jede einzelne Datei für einen Satz von Dateien aus.\n\n\
+STRING_FOR_HELP1, "Führt einen Befehl für jede einzelne Datei für einen Satz von Dateien aus.\n\n\
 FOR %Variable IN (Satz) DO Befehl [Parameter]\n\n\
   %variable  Ein ersetzbarer Parameter bestehend aus einem einzelnen\n\
               Buchstaben.\n\
-  (Satz)     Ein Satz von mindestens einer Datei. Platzhalter sind zulässig.\n\
+  (Satz)     Ein Satz von mindestens einer Datei. Platzhalter sind zulässig.\n\
-  Befehl    Befehl, der für jede Datei ausgeführt werden soll.\n\
+  Befehl    Befehl, der für jede Datei ausgeführt werden soll.\n\
-  Parameter Parameter und Optionen für den angegebenen Befehl.\n\n\
+  Parameter Parameter und Optionen für den angegebenen Befehl.\n\n\
 Um den FOR-Befehl in einem Batchprogramm zu verwenden, geben Sie %%Variable\n\
 statt %Variable an."
 
 STRING_FREE_HELP1, "\nVolume in Laufwerk %s ist %-11s\n\
  Volume-Seriennummer: %s\n\
-  %16s Byte Speicherkapazität\n\
+  %16s Byte Speicherkapazität\n\
   %16s Byte belegter Speicher\n\
   %16s Byte freier Speicher\n"
 
 STRING_FREE_HELP2, "Zeigt die Volumeinformationen an.\n\nFREE [Laufwerk: ...]"
 
-STRING_IF_HELP1, "Verarbeitet Ausdrücke in einer Batchdatei abhängig von Bedingungen.\n\n\
+STRING_IF_HELP1, "Verarbeitet Ausdrücke in einer Batchdatei abhängig von Bedingungen.\n\n\
   IF [NOT] ERRORLEVEL Nummer Befehl\n\
   IF [NOT] variable1==variable2 Befehl\n\
   IF [NOT] EXIST Dateiname Befehl\n\
   IF [NOT] DEFINED variable Befehl\n\n\
-NOT               Befehl wird nur dann ausgeführt, wenn die Bedingung nicht\n\
+NOT               Befehl wird nur dann ausgeführt, wenn die Bedingung nicht\n\
-                  erfüllt wird\n\
+                  erfüllt wird\n\
-ERRORLEVEL number Bedingung ist erfüllt, wenn das zuletzt ausgeführte\n\
+ERRORLEVEL number Bedingung ist erfüllt, wenn das zuletzt ausgeführte\n\
-                  Programm einen Code größer oder gleich der Nummer zurückgibt.\n\
+                  Programm einen Code größer oder gleich der Nummer zurückgibt.\n\
-command           Gibt den Befehl an, der bei erfüllter Bedingung ausgeführt\n\
+command           Gibt den Befehl an, der bei erfüllter Bedingung ausgeführt\n\
                   werden soll.\n\
 variable1==variable2\n\
-                  Bedingung ist erfüllt, falls die Zeichenfolgen gleich sind.\n\
+                  Bedingung ist erfüllt, falls die Zeichenfolgen gleich sind.\n\
-EXIST Dateiname   Bedingung ist erfüllt, wenn die angegebene Datei existiert.\n\
+EXIST Dateiname   Bedingung ist erfüllt, wenn die angegebene Datei existiert.\n\
-DEFINED variable  Bedingung ist erfüllt, wenn die angegebene Datei definiert\n\
+DEFINED variable  Bedingung ist erfüllt, wenn die angegebene Datei definiert\n\
                   wurde."
 
-STRING_GOTO_HELP1,  "Setzt die Ausführung eines Batchprogramms an einer Marke fort.\n\n\
+STRING_GOTO_HELP1,  "Setzt die Ausführung eines Batchprogramms an einer Marke fort.\n\n\
 GOTO Marke\n\n\
   Marke  Definiert eine Zeichenfolge als Marke in einem Batchprogramm.\n\n\
 Marken stehen am Zeilenanfang mit einem vorangestellten Doppelpunkt."
 
-STRING_LABEL_HELP1, "Erstellt, ändert oder löscht die Bezeichnung eines Volumes.\n\nLABEL [Laufwerk:][label]"
+STRING_LABEL_HELP1, "Erstellt, ändert oder löscht die Bezeichnung eines Volumes.\n\nLABEL [Laufwerk:][label]"
 
-STRING_LABEL_HELP2, "Datenträger im Laufwerk %c: ist %s\n"
+STRING_LABEL_HELP2, "Datenträger im Laufwerk %c: ist %s\n"
-STRING_LABEL_HELP3, "Datenträger im Laufwerk %c: hat keine Bezeichnung\n"
+STRING_LABEL_HELP3, "Datenträger im Laufwerk %c: hat keine Bezeichnung\n"
-STRING_LABEL_HELP4, "Datenträger-Seriennummer: %04X-%04X\n"
+STRING_LABEL_HELP4, "Datenträger-Seriennummer: %04X-%04X\n"
-STRING_LABEL_HELP5, "Laufwerksbezeichnung (max. 11 Zeichen, ENTER für keine)? "
+STRING_LABEL_HELP5, "Laufwerksbezeichnung (max. 11 Zeichen, ENTER für keine)? "
 
 STRING_LOCALE_HELP1, "Aktuelle Zeit: "
 
 STRING_MKDIR_HELP,   "Erzeugt ein Verzeichnis.\n\n\
 MKDIR [Laufwerk:]Pfad\nMD [Laufwerk:]Pfad"
 
-STRING_MKLINK_HELP, "Erzeugt eine Dateisystemverknüpfung.\n\n\
+STRING_MKLINK_HELP, "Erzeugt eine Dateisystemverknüpfung.\n\n\
 MKLINK [/D | /H | /J] Linkname Ziel\n\n\
-  /D  Gibt an, dass das Ziel der Verknüpfung ein Verzeichnis ist.\n\
+  /D  Gibt an, dass das Ziel der Verknüpfung ein Verzeichnis ist.\n\
   /H  Erzeugt einen Hardlink.\n\
   /J  Erzeugt einen Junction Point.\n\n\
-Wenn weder /H noch /J angegeben werden, wird eine symbolische Verknüpfung angelegt."
+Wenn weder /H noch /J angegeben werden, wird eine symbolische Verknüpfung angelegt."
 
-STRING_MEMMORY_HELP1, "Zeigt die Größe des Systemspeicher an.\n\nMEMORY"
+STRING_MEMMORY_HELP1, "Zeigt die Größe des Systemspeicher an.\n\nMEMORY"
 
 STRING_MEMMORY_HELP2, "\n  %12s%% Speicher geladen.\n\n\
   %13s bytes RAM (insgesamt)\n\
-  %13s bytes verfügbarer RAM\n\n\
+  %13s bytes verfügbarer RAM\n\n\
   %13s bytes Auslagerungsdatei (insgesamt)\n\
-  %13s bytes verfügbare Auslagerungsdatei\n\n\
+  %13s bytes verfügbare Auslagerungsdatei\n\n\
   %13s bytes Virtueller Speicher (insgesamt)\n\
-  %13s bytes verfügbarer virtueller Speicher\n"
+  %13s bytes verfügbarer virtueller Speicher\n"
 
-STRING_MISC_HELP1, "Drücken Sie eine beliebige Taste . . .\n"
+STRING_MISC_HELP1, "Drücken Sie eine beliebige Taste . . .\n"
 
-STRING_MOVE_HELP1, "Überschreiben %s (Ja/Nein/Alle)? "
+STRING_MOVE_HELP1, "Überschreiben %s (Ja/Nein/Alle)? "
 
 STRING_MOVE_HELP2, "Verschiebt Dateien und benennt Dateien sowie Verzeichnisse um.\n\n\
 Um eine oder mehrere Dateien zu verschieben:\n\
@@ -320,59 +321,59 @@ Um ein Verzeichnis umzubenennen:\n\
 MOVE [/N][Laufwerk:][Pfad]Verzeichnis1 Verzeichnis2\n\n\
   [Laufwerk:][Pfad]Datei1  Bezeichnet den Pfad und den Namen der zu\n\
                            verschiebenden Datei(en).\n\
-  /N                 Nichts. Tut alles außer Dateien/Verzeichnisse verschieben.\n\n\
+  /N                 Nichts. Tut alles außer Dateien/Verzeichnisse verschieben.\n\n\
-Derzeitige Einschränkung:\n\
+Derzeitige Einschränkung:\n\
-Es ist noch nicht möglich, Objekte über die Laufwerksgrenzen hinaus zu verschieben.\n"
+Es ist noch nicht möglich, Objekte über die Laufwerksgrenzen hinaus zu verschieben.\n"
 
 STRING_MSGBOX_HELP, "Zeigt ein Fenster und wartet auf eine Eingabe vom Benutzer.\n\n\
 MSGBOX type ['title'] prompt\n\n\
 type          Button anzeigen\n\
-              mögliche Werte sind: OK, OKCANCEL,\n\
+              mögliche Werte sind: OK, OKCANCEL,\n\
               YESNO, YESNOCANCEL\n\
 title         Titel des Fensters\n\
 prompt        Text der in dem Fenster angezeigt wird\n\n\n\
-ERRORLEVEL wird je nach dem gedrückten Button gesetzt:\n\n\
+ERRORLEVEL wird je nach dem gedrückten Button gesetzt:\n\n\
 YES  :  10    |  NO      :  11\n\
 OK   :  10    |  CANCEL  :  12\n"
 
-STRING_PATH_HELP1, "Legt den Suchpfad für ausführbare Dateien fest oder zeigt diesen an.\n\n\
+STRING_PATH_HELP1, "Legt den Suchpfad für ausführbare Dateien fest oder zeigt diesen an.\n\n\
 PATH [[Laufwerk:]Pfad[;...]]\nPATH ;\n\n\
-  PATH ;    Löscht den Suchpfad und lässt CMD.EXE nur in dem aktuellen\n\
+  PATH ;    Löscht den Suchpfad und lässt CMD.EXE nur in dem aktuellen\n\
             Verzeichnis suchen.\n\
   PATH      Ohne Parameter zeigt den aktuellen Pfad an.\n"
 
-STRING_PROMPT_HELP1, "Ändert die Eingabeaufforderung.\n\n\
+STRING_PROMPT_HELP1, "Ändert die Eingabeaufforderung.\n\n\
 PROMPT [Text]\n\n\
   Text    Bezeichnet die neue Eingabeaufforderung.\n\n\
 Sie kann aus normalen Zeichen und folgenden Sonderzeichen bestehen:\n\n\
-  $A   & (Kaufmännisches Und)\n\
+  $A   & (Kaufmännisches Und)\n\
   $B   | (Verkettungszeichen oder pipe)\n\
   $C   ( (Klammer auf)\n\
   $D   Aktuelles Datum\n\
   $E   Escapezeichen (ASCII-Code 27)\n\
   $F   ) (Klammer zu)\n\
-  $G   > (Größer-als-Zeichen)\n\
+  $G   > (Größer-als-Zeichen)\n\
-  $H   Rückschritt (löscht vorangehendes Zeichen)\n\
+  $H   Rückschritt (löscht vorangehendes Zeichen)\n\
   $L   < (Kleiner-als-Zeichen)\n\
   $N   Aktuelles Laufwerk\n\
   $P   Aktuelles Laufwerk und Pfad\n\
   $Q   = (Gleichheitszeichen)\n\
   $T   Aktuelle Zeit\n\
   $V   Betriebssystem-Versionsnummer\n\
-  $_   Wagenrücklauf und Zeilenvorschub\n\
+  $_   Wagenrücklauf und Zeilenvorschub\n\
   $$   $ (Dollarzeichen)"
 
-STRING_PAUSE_HELP1, "Hält die Ausführung einer Batchdatei an und zeigt folgende Meldung oder eine benutzerdefinierte Nachricht an:\n\
+STRING_PAUSE_HELP1, "Hält die Ausführung einer Batchdatei an und zeigt folgende Meldung oder eine benutzerdefinierte Nachricht an:\n\
-'Drücken Sie eine beliebige Taste . . .'.\n\n\
+'Drücken Sie eine beliebige Taste . . .'.\n\n\
 PAUSE [message]"
 
 STRING_PROMPT_HELP2, "  $+   Zeigt die aktuelle Tiefe des Verzeichnis-Stacks an"
 
-STRING_PROMPT_HELP3, "\n  'PROMPT'   setzt die Prompt auf die Standardwerte zurück."
+STRING_PROMPT_HELP3, "\n  'PROMPT'   setzt die Prompt auf die Standardwerte zurück."
 
 STRING_REM_HELP, "Leitet Kommentare in einer Batchdatei ein.\n\nREM [Kommentar]"
 
-STRING_RMDIR_HELP,   "Löscht ein Verzeichnis.\n\n\
+STRING_RMDIR_HELP,   "Löscht ein Verzeichnis.\n\n\
 RMDIR [Laufwerk:]Pfad\nRD [Laufwerk:]Pfad"
 
 STRING_REN_HELP1, "Benennt Dateien und Verzeichnisse um.\n\n\
@@ -397,21 +398,21 @@ REPLACE [Laufwerk1:][Pfad1]Dateiname [Laufwerk2:][Pfad2] [/P] [/R] [/S] [/W] [/U
   [Laufwerk1:][Pfad1]dateiname Bezeichnet die Quelldatei(en).\n\
   [Laufwerk2:][Pfad2]          Bezeichnet den Pfad in dem die Dateien ersetzt\n\
                                werden sollen.\n\
-  /A                           Fügt neue Dateien dem Zielpfad hinzu. Kann nicht\n\
+  /A                           Fügt neue Dateien dem Zielpfad hinzu. Kann nicht\n\
                                mit /S oder /U Parameter genutzt werden.\n\
-  /P                           Wartet auf Bestätigung bevor eine Datei ersetzt\n\
+  /P                           Wartet auf Bestätigung bevor eine Datei ersetzt\n\
-                               oder eine Quelldatei hinzugefügt wird.\n\
+                               oder eine Quelldatei hinzugefügt wird.\n\
-  /R                           Ersetzt schreibgeschützte Dateien.\n\
+  /R                           Ersetzt schreibgeschützte Dateien.\n\
   /S                           Ersetzt Dateien in allen Unterordnern des Ziel-\n\
                                pfades. Kann nicht mit Parameter /A genutzt\n\
                                werden.\n\
-  /W                           Wartet vor dem Start, bis ein Datenträger\n\
+  /W                           Wartet vor dem Start, bis ein Datenträger\n\
                                eingelegt wurde.\n\
-  /U                           Ersetzt (aktualisiert) nur Dateien, die älter\n\
+  /U                           Ersetzt (aktualisiert) nur Dateien, die älter\n\
                                sind als die Quelldaten. Kann nicht mit Paramater\n\
                                /A genutzt werden\n"
 
-STRING_REPLACE_HELP2, "Quellpfad benötigt\n"
+STRING_REPLACE_HELP2, "Quellpfad benötigt\n"
 
 STRING_REPLACE_HELP3, "Keine Dateien ersetzt\n"
 
@@ -421,17 +422,17 @@ STRING_REPLACE_HELP5, "Ersetze %s\n"
 
 STRING_REPLACE_HELP6, "Ersetze %s\n"
 
-STRING_REPLACE_HELP7, "Keine Dateien hinzugefügt\n"
+STRING_REPLACE_HELP7, "Keine Dateien hinzugefügt\n"
 
-STRING_REPLACE_HELP8, "%lu Datei(en) hinzugefügt\n"
+STRING_REPLACE_HELP8, "%lu Datei(en) hinzugefügt\n"
 
-STRING_REPLACE_HELP9, "Füge %s hinzu (Y/N) "
+STRING_REPLACE_HELP9, "Füge %s hinzu (Y/N) "
 
 STRING_REPLACE_HELP10, "Ersetze %s (Y/N) "
 
-STRING_REPLACE_HELP11, "Füge %s hinzu\n"
+STRING_REPLACE_HELP11, "Füge %s hinzu\n"
 
-STRING_SHIFT_HELP, "Verändert die Position ersetzbarer Parameter in einem Batchprogramm.\n\n\
+STRING_SHIFT_HELP, "Verändert die Position ersetzbarer Parameter in einem Batchprogramm.\n\n\
 SHIFT [DOWN]"
 
 STRING_SCREEN_HELP, "Bewegt den Cursor und optional die Ausgabe\n\n\
@@ -439,7 +440,7 @@ SCREEN Reihe Spalte [Text]\n\n\
   Reihe         Reihe, in die der Curser bewegt werden soll\n\
   Spalte        Spalte, in die der Curser bewegt werden soll"
 
-STRING_SET_HELP, "Setzt oder löscht Umgebungsvariablen für CMD.EXE oder zeigt diese an.\n\n\
+STRING_SET_HELP, "Setzt oder löscht Umgebungsvariablen für CMD.EXE oder zeigt diese an.\n\n\
 SET [variable[=][Zeichenfolge]]\n\n\
   Variable     Bezeichnet den Namen der Umgebungsvariablen.\n\
   Zeichenfolge Eine Zeichenfolge, die der Variable zugewiesen werden soll.\n\n\
@@ -447,10 +448,10 @@ Der Befehl SET ohne Parameter zeigt die aktuellen Umgebungsvariablen an.\n"
 
 STRING_START_HELP1, "Startet einen Befehl.\n\n\
 START Befehl\n\n\
-  Befehl     Befehl welcher ausgeführt werden soll\n\n\
+  Befehl     Befehl welcher ausgeführt werden soll\n\n\
-Achtung: Derzeit werden alle Befehle asynchron ausgeführt.\n"
+Achtung: Derzeit werden alle Befehle asynchron ausgeführt.\n"
 
-STRING_TITLE_HELP, "Legt den Fenstertitel für das Eingabeaufforderungsfenster fest.\n\n\
+STRING_TITLE_HELP, "Legt den Fenstertitel für das Eingabeaufforderungsfenster fest.\n\n\
 TITLE [string]\n\n\
   Zeichenfolge      Bezeichnet den Titel des Eingabeaufforderungsfensters."
 
@@ -458,7 +459,7 @@ STRING_TIME_HELP1, "Stellt die Systemzeit oder zeigt sie an.\n\n\
 TIME [/T][Zeit]\n\n\
   /T    nur anzeigen\n\n\
 TIME ohne Parameter zeigt die aktuelle Systemzeit an und fragt nach der neuen\n\
-Uhrzeit. Drücken Sie die EINGABETASTE, um die bisherige Zeit beizubehalten."
+Uhrzeit. Drücken Sie die EINGABETASTE, um die bisherige Zeit beizubehalten."
 
 STRING_TIME_HELP2, "Geben Sie eine neue Zeit ein: "
 
@@ -471,9 +472,9 @@ TIMER  [ON|OFF] [/S] [/n] [/Fn]\n\n\
   ON          schaltet die Stoppuhr ein\n\
   OFF         schaltet die Stoppuhr aus\n\
   /S          Teilzeit. Sende die Stoppuhr Teil-\n\
-              zeit, ohne den Wert zu verändern\n\
+              zeit, ohne den Wert zu verändern\n\
   /n          Anzahl der Stoppuhren\n\
-              gültige Stoppuhren sind 0 bis 9\n\
+              gültige Stoppuhren sind 0 bis 9\n\
               Standardwert = 1\n\
   /Fn         Ausgabeformatierung\n\
               n kann 0 oder 1 sein:\n\
@@ -486,7 +487,7 @@ STRING_TYPE_HELP1, "Zeigt den Inhalt einer oder mehrerer Textdateien an.\n\n\
 TYPE [Laufwerk:][Pfad]Dateiname"
 
 STRING_VERIFY_HELP1, "Dieser Befehl ist nur eine Atrappe!!\n\
-Legt fest, ob überwacht werden soll, ob Dateien korrekt auf den Datenträger\n\
+Legt fest, ob überwacht werden soll, ob Dateien korrekt auf den Datenträger\n\
 geschrieben werden.\n\n\
 VERIFY [ON | OFF]\n\n\
 Der Befehl VERIFY ohne Parameter zeigt die aktuelle Einstellung von VERIFY an."
@@ -499,12 +500,12 @@ STRING_VERSION_HELP1, "Zeigt Shellinformationen an.\n\n\
 VER [/C][/R][/W]\n\n\
   /C  Zeigt die Credits an.\n\
   /R  Zeigt die Weitergabeinformationen an.\n\
-  /W  Zeigt die Garantieerklärung an."
+  /W  Zeigt die Garantieerklärung an."
 
-STRING_VERSION_HELP2, " kommt mit absolut keiner Garantie; für nähere\n\
+STRING_VERSION_HELP2, " kommt mit absolut keiner Garantie; für nähere\n\
- Informationen darüber tippen Sie: `ver /W'. Das ist eine freie Software,\n\
+ Informationen darüber tippen Sie: `ver /W'. Das ist eine freie Software,\n\
- und Sie können die Software unter bestimmten Bedingungen weiter\n\
+ und Sie können die Software unter bestimmten Bedingungen weiter\n\
- vertreiben; tippen Sie `ver /R' für nähere Informationen darüber.\n\
+ vertreiben; tippen Sie `ver /R' für nähere Informationen darüber.\n\
  Tippen Sie `ver /C' um die Mitwirkenden (Credits) aufzulisten."
 
 STRING_VERSION_HELP3, "\n This program is distributed in the hope that it will be useful,\n\
@@ -518,27 +519,27 @@ STRING_VERSION_HELP4, "\n This program is free software; you can redistribute it
  (at your option) any later version."
 
 STRING_VERSION_HELP5, "\nSenden Sie Bug-Reports an <ros-dev@reactos.org>.\n\
-Updates sind auf der offiziellen ReactOS-Webseite verfügbar:\n\
+Updates sind auf der offiziellen ReactOS-Webseite verfügbar:\n\
 http://www.reactos.org"
 
 STRING_VERSION_HELP6, "\nFreeDOS-Version programmiert von:\n"
 
 STRING_VERSION_HELP7, "\nReactOS-Version programmiert von:\n"
 
-STRING_VOL_HELP1, " Datenträger im Laufwerk %c ist %s\n"
+STRING_VOL_HELP1, " Datenträger im Laufwerk %c ist %s\n"
-STRING_VOL_HELP2, " Datenträger im Laufwerk %c hat keine Bezeichnung.\n"
+STRING_VOL_HELP2, " Datenträger im Laufwerk %c hat keine Bezeichnung.\n"
-STRING_VOL_HELP3, " Datenträger-Seriennummer: %04X-%04X\n"
+STRING_VOL_HELP3, " Datenträger-Seriennummer: %04X-%04X\n"
 STRING_VOL_HELP4, "Zeigt die Laufwerksbezeichnung und die Seriennummer an, falls diese existieren.\n\nVOL [drive:]"
 
-STRING_WINDOW_HELP1, "Verändert die Größe des Konsolenfensters\n\n\
+STRING_WINDOW_HELP1, "Verändert die Größe des Konsolenfensters\n\n\
 WINDOW [/POS[=]left,top,width,heigth]\n\
               [MIN|MAX|RESTORE] ['title']\n\n\
-/POS          Gibt Position und Größe des Fensters an\n\
+/POS          Gibt Position und Größe des Fensters an\n\
 MIN           minimiert das Fenster\n\
 MAX           maximiert das Fenster\n\
 RESTORE       stellt das Fenster wieder her"
 
-STRING_WINDOW_HELP2, "Verändert die Größe des Konsolenfensters\n\n\
+STRING_WINDOW_HELP2, "Verändert die Größe des Konsolenfensters\n\n\
 ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\
               [MIN|MAX|RESTORE] ['title']\n\n\
 window        Titel des Fensters, das bearbeitet wird\n\
@@ -548,46 +549,46 @@ MAX           maximiert das Fenster\n\
 RESTORE       stellt das Fenster wieder her\n\
 title         neuer Titel"
 
-STRING_HELP1, "Übersicht aller verfügbaren Befehle und deren Kurzbeschreibungen\n\n\
+STRING_HELP1, "Übersicht aller verfügbaren Befehle und deren Kurzbeschreibungen\n\n\
-  Befehl /?     Um nähere Informationen zu einem bestimmten Befehl\n\
+  Befehl /?     Um nähere Informationen zu einem bestimmten Befehl\n\
                 zu erhalten.\n\n\
-?        Listet alle Befehle auf (ohne Erklärung).\n\
+?        Listet alle Befehle auf (ohne Erklärung).\n\
-ALIAS    Setzt, löscht oder zeigt den Alias.\n\
+ALIAS    Setzt, löscht oder zeigt den Alias.\n\
-ATTRIB   Zeigt Dateiattribute an bzw. ändert sie.\n\
+ATTRIB   Zeigt Dateiattribute an bzw. ändert sie.\n\
 BEEP     Gibt einen Piepton durch den PC-Speaker aus.\n\
 CALL     Ruft eine Batchdatei aus einer anderen Batchdatei heraus auf.\n\
-CD       Zeigt den Namen des aktuellen Verzeichnisses an bzw. ändert diesen.\n\
+CD       Zeigt den Namen des aktuellen Verzeichnisses an bzw. ändert diesen.\n\
 CHCP     Zeigt die aktive Codepagenummer an bzw. legt diese fest.\n\
 CHOICE   Wartet auf den Benutzer, welcher aus einer Auswahl eine Option\n\
-         wählen muss.\n\
+         wählen muss.\n\
-CLS      Löscht den Bildschirminhalt.\n\
+CLS      Löscht den Bildschirminhalt.\n\
 CMD      Startet eine neue Instanz des ReactOS-Befehlsinterpreters.\n\
-COLOR    Legt die Farben für Hinter- und Vordergrund der Konsole fest.\n\
+COLOR    Legt die Farben für Hinter- und Vordergrund der Konsole fest.\n\
 COPY     Kopiert eine oder mehrere Dateien an eine andere Stelle.\n\
 DATE     Zeigt das Datum an bzw. legt dieses fest.\n\
-DELETE   Löscht eine oder mehrere Dateien.\n\
+DELETE   Löscht eine oder mehrere Dateien.\n\
 DIR      Listet die Dateien und Unterverzeichnisse eines Verzeichnisses auf.\n\
 ECHO     Zeigt Meldungen an bzw. schaltet die Befehlsanzeige ein oder aus.\n\
-ERASE    Löscht eine oder mehrere Dateien.\n\
+ERASE    Löscht eine oder mehrere Dateien.\n\
 EXIT     Beendet das Programm CMD.EXE (Befehlsinterpreter).\n\
-FOR      Führt einen angegebenen Befehl für jede Datei in einem Dateiensatz\n\
+FOR      Führt einen angegebenen Befehl für jede Datei in einem Dateiensatz\n\
          aus.\n\
 FREE     Zeigt den (freien) Speicherplatz an.\n\
 GOTO     Setzt den ReactOS-Befehlsinterpreter auf eine markierte Zeile in\n\
          einem Batchprogramm.\n\
 HELP     Zeigt Hilfeinformationen zu ReactOS-Befehlen an.\n\
 HISTORY  Listet alle Befehle auf, welche sich im Speicher befinden.\n\
-IF       Verarbeitet Ausdrücke in einer Batchdatei abhängig von Bedingungen.\n\
+IF       Verarbeitet Ausdrücke in einer Batchdatei abhängig von Bedingungen.\n\
-LABEL    Erstellt, ändert oder löscht die Bezeichnung eines Volumes.\n\
+LABEL    Erstellt, ändert oder löscht die Bezeichnung eines Volumes.\n\
 MD       Erstellt ein Verzeichnis.\n\
 MKDIR    Erstellt ein Verzeichnis.\n\
-MKLINK   Erzeugt eine Dateisystemverknüpfung.\n\
+MKLINK   Erzeugt eine Dateisystemverknüpfung.\n\
 MOVE     Verschiebt eine oder mehrere Dateien von einem Verzeichnis in\n\
          ein anderes.\n\
-PATH     Legt den Suchpfad für ausführbare Dateien fest oder zeigt diesen an.\n\
+PATH     Legt den Suchpfad für ausführbare Dateien fest oder zeigt diesen an.\n\
-PAUSE    Hält die Ausführung einer Batchdatei an und zeigt eine Meldung an.\n\
+PAUSE    Hält die Ausführung einer Batchdatei an und zeigt eine Meldung an.\n\
 POPD     Wechselt zu dem Verzeichnis, das durch PUSHD gespeichert wurde.\n\
-PROMPT   Ändert die Eingabeaufforderung.\n\
+PROMPT   Ändert die Eingabeaufforderung.\n\
 PUSHD    Speichert das aktuelle Verzeichnis, und wechselt dann zu einem\n\
          anderen Verzeichnis.\n\
 RD       Entfernt ein Verzeichnis.\n\
@@ -595,104 +596,104 @@ REM      Leitet Kommentare in einer Batchdatei.\n\
 REN      Benennt eine od. mehrere Dateien um.\n\
 RENAME   Benennt eine od. mehrere Dateien um.\n\
 REPLACE  Ersetzt Dateien.\n\
-RMDIR    Löscht ein Verzeichnis.\n\
+RMDIR    Löscht ein Verzeichnis.\n\
 SCREEN   Bewegt den Cursor und optional die Ausgabe.\n\
-SET      Setzt oder löscht die Umgebungsvariablen bzw. zeigt sie an.\n\
+SET      Setzt oder löscht die Umgebungsvariablen bzw. zeigt sie an.\n\
-SHIFT    Verändert die Position ersetzbarer Parameter in Batchdateien.\n"
+SHIFT    Verändert die Position ersetzbarer Parameter in Batchdateien.\n"
 STRING_HELP2, "START    Startet ein eigenes Fenster, um ein bestimmtes Programm oder einen\n\
-         Befehl auszuführen.\n\
+         Befehl auszuführen.\n\
 TIME     Zeigt die Systemzeit an bzw. legt sie fest.\n\
 TIMER    Erlaubt die Benutzung von bis zu 10 Stoppuhren\n\
-TITLE    Legt den Fenstertitel für das Eingabeaufforderungsfenster fest.\n\
+TITLE    Legt den Fenstertitel für das Eingabeaufforderungsfenster fest.\n\
 TYPE     Zeigt den Inhalt einer Textdatei an.\n\
 VER      Zeigt die ReactOS-Version an.\n\
-VERIFY   Legt fest, ob überwacht werden soll, ob Dateien korrekt auf den\n\
+VERIFY   Legt fest, ob überwacht werden soll, ob Dateien korrekt auf den\n\
-         Datenträger geschrieben werden.\n\
+         Datenträger geschrieben werden.\n\
-VOL      Zeigt die Datenträgervolumebezeichnung und die Seriennummer an.\n"
+VOL      Zeigt die Datenträgervolumebezeichnung und die Seriennummer an.\n"
 
 STRING_CHOICE_OPTION,         "JN"
 STRING_COPY_OPTION,           "JNA"
 
 STRING_ALIAS_ERROR,          "Die Befehlszeile ist zu lange nach der Alias-Erweiterung!\n"
-STRING_ASSOC_ERROR,          "Dateizuordnung für Erweiterung %s nicht gefunden\n"
+STRING_ASSOC_ERROR,          "Dateizuordnung für Erweiterung %s nicht gefunden\n"
-STRING_BATCH_ERROR,          "Es trat ein Fehler auf, während die Batchdatei geöffnet wurde.\n"
+STRING_BATCH_ERROR,          "Es trat ein Fehler auf, während die Batchdatei geöffnet wurde.\n"
 STRING_CHCP_ERROR1,          "Aktive Codepage: %u\n"
-STRING_CHCP_ERROR4,          "Ungültige Codepage\n"
+STRING_CHCP_ERROR4,          "Ungültige Codepage\n"
-STRING_CHOICE_ERROR,         "Ungültige Option. Erwartetes Format: /C[:]options"
+STRING_CHOICE_ERROR,         "Ungültige Option. Erwartetes Format: /C[:]options"
-STRING_CHOICE_ERROR_TXT,     "Ungültige Option. Erwartetes Format: /T[:]c,nn"
+STRING_CHOICE_ERROR_TXT,     "Ungültige Option. Erwartetes Format: /T[:]c,nn"
-STRING_CHOICE_ERROR_OPTION,  "Ungültige Option: %s"
+STRING_CHOICE_ERROR_OPTION,  "Ungültige Option: %s"
 STRING_MD_ERROR,             "Unterverzeichnis oder Datei existiert bereits.\n"
 STRING_CMD_ERROR1,           "Die Eingaben konnten nicht umgeleitet werden (von der Datei) %s\n"
-STRING_CMD_ERROR2,           "Ein Fehler ist beim Erstellen der temporären Datei für Pipedaten aufgetreten\n"
+STRING_CMD_ERROR2,           "Ein Fehler ist beim Erstellen der temporären Datei für Pipedaten aufgetreten\n"
 STRING_CMD_ERROR3,           "%s kann nicht in die Datei umgeleitet werden \n"
-STRING_CMD_ERROR4,           "Ausführend %s...\n"
+STRING_CMD_ERROR4,           "Ausführend %s...\n"
-STRING_CMD_ERROR5,           "Ausführend cmdexit.bat...\n"
+STRING_CMD_ERROR5,           "Ausführend cmdexit.bat...\n"
-STRING_COLOR_ERROR1,         "Fehler: Hinter- und Vordergrund können nicht die selben Farben haben!"
+STRING_COLOR_ERROR1,         "Fehler: Hinter- und Vordergrund können nicht die selben Farben haben!"
 STRING_COLOR_ERROR2,         "Fehler in der Farbangabe"
 STRING_COLOR_ERROR3,         "Farbe %x\n"
 STRING_COLOR_ERROR4,         "Fehler: Die selben Farben!"
 STRING_CONSOLE_ERROR,        "Unbekannter Fehler: %d\n"
-STRING_COPY_ERROR1,          "Fehler: Quelle kann nicht geöffnet werden - %s!\n"
+STRING_COPY_ERROR1,          "Fehler: Quelle kann nicht geöffnet werden - %s!\n"
-STRING_COPY_ERROR2,          "Fehler: Kann nicht über sich selbst kopiert werden.\n"
+STRING_COPY_ERROR2,          "Fehler: Kann nicht über sich selbst kopiert werden.\n"
 STRING_COPY_ERROR3,          "Fehler: Schreibziel!\n"
 STRING_COPY_ERROR4,          "Fehler: Noch nicht implementiert!\n"
-STRING_DATE_ERROR,           "Ungültiges Datum."
+STRING_DATE_ERROR,           "Ungültiges Datum."
-STRING_DEL_ERROR5,           "Die Datei %s wird gelöscht! "
+STRING_DEL_ERROR5,           "Die Datei %s wird gelöscht! "
 STRING_DEL_ERROR6,           "Sind Sie sicher (J/N)?"
-STRING_DEL_ERROR7,           "Löschen: %s\n"
+STRING_DEL_ERROR7,           "Löschen: %s\n"
 STRING_ERROR_ERROR1,         "Unbekannter Fehler! Fehlernummer: 0x%lx\n"
 STRING_ERROR_ERROR2,         "Syntax-Fehler"
-STRING_FOR_ERROR1,           "'in' fehlt für ein Statement."
+STRING_FOR_ERROR1,           "'in' fehlt für ein Statement."
 STRING_FOR_ERROR2,           "Klammern nicht gefunden."
 STRING_FOR_ERROR3,           "'do' fehlt."
 STRING_FOR_ERROR4,           "kein Befehl nach 'do'."
-STRING_FREE_ERROR1,          "Ungültiges Laufwerk"
+STRING_FREE_ERROR1,          "Ungültiges Laufwerk"
 STRING_FREE_ERROR2,          "keine Bezeichnung"
-STRING_GOTO_ERROR1,          "Keine Sprungmarke für GOTO gesetzt"
+STRING_GOTO_ERROR1,          "Keine Sprungmarke für GOTO gesetzt"
 STRING_GOTO_ERROR2,          "Sprungmarke '%s' wurde nicht gefunden\n"
 STRING_MOVE_ERROR1,          "[OK]\n"
 STRING_MOVE_ERROR2,          "[FEHLER]\n"
 STRING_REN_ERROR1,           "MoveFile() ist fehlgeschlagen. Fehler: %lu\n"
 STRING_START_ERROR1,         "Derzeit noch kein Batch Support!"
-STRING_TIME_ERROR1,          "Ungültige Zeit."
+STRING_TIME_ERROR1,          "Ungültige Zeit."
-STRING_TYPE_ERROR1,          "Ungültige Option '/%s'\n"
+STRING_TYPE_ERROR1,          "Ungültige Option '/%s'\n"
 STRING_WINDOW_ERROR1,        "Fenster nicht gefunden"
 STRING_ERROR_PARAMETERF_ERROR,     "Parameterformat ist nicht korrekt - %c\n"
-STRING_ERROR_INVALID_SWITCH,       "Ungültiger Parameter - /%c\n"
+STRING_ERROR_INVALID_SWITCH,       "Ungültiger Parameter - /%c\n"
 STRING_ERROR_TOO_MANY_PARAMETERS,  "Zu viele Parameter - %s\n"
 STRING_ERROR_PATH_NOT_FOUND,       "Pfad wurde nicht gefunden\n"
 STRING_ERROR_FILE_NOT_FOUND,       "Datei wurde nicht gefunden\n"
-STRING_ERROR_REQ_PARAM_MISSING,    "Benötigter Parameter fehlt\n"
+STRING_ERROR_REQ_PARAM_MISSING,    "Benötigter Parameter fehlt\n"
-STRING_ERROR_INVALID_DRIVE,        "Ungültige Laufwerksangaben\n"
+STRING_ERROR_INVALID_DRIVE,        "Ungültige Laufwerksangaben\n"
-STRING_ERROR_INVALID_PARAM_FORMAT, "Ungültiges Parameterformat - %s\n"
+STRING_ERROR_INVALID_PARAM_FORMAT, "Ungültiges Parameterformat - %s\n"
-STRING_ERROR_BADCOMMAND,           "Ungültiger Befehl oder Dateiname - %s\n"
+STRING_ERROR_BADCOMMAND,           "Ungültiger Befehl oder Dateiname - %s\n"
-STRING_ERROR_OUT_OF_MEMORY,        "Fehler: Zu wenig Speicher verfügbar.\n"
+STRING_ERROR_OUT_OF_MEMORY,        "Fehler: Zu wenig Speicher verfügbar.\n"
-STRING_ERROR_CANNOTPIPE,           "Fehler: Cannot pipe! Temporäre Datei kann nicht geöffnet werden!\n"
+STRING_ERROR_CANNOTPIPE,           "Fehler: Cannot pipe! Temporäre Datei kann nicht geöffnet werden!\n"
-STRING_ERROR_D_PAUSEMSG,           "Drücken Sie eine beliebige Taste . . ."
+STRING_ERROR_D_PAUSEMSG,           "Drücken Sie eine beliebige Taste . . ."
 STRING_ERROR_DRIVER_NOT_READY,     "Laufwerk ist nicht bereit"
 STRING_PATH_ERROR,                 "CMD: Nicht in environment '%s'\n"
-STRING_REPLACE_ERROR1,             "Ungültiger Parameter - %s\n"
+STRING_REPLACE_ERROR1,             "Ungültiger Parameter - %s\n"
 STRING_REPLACE_ERROR2,             "Pfad wurde nicht gefunden - %s\n"
 STRING_REPLACE_ERROR3,             "Der Dateiname, Ordnername oder die Syntax der Volumenbezeichung sind inkorrekt.\n"
-STRING_REPLACE_ERROR4,             "Ungültige Parameterkombination\n"
+STRING_REPLACE_ERROR4,             "Ungültige Parameterkombination\n"
 STRING_REPLACE_ERROR5,             "Zugriff verweigert - %s\n"
 STRING_REPLACE_ERROR6,             "Keine Dateien gefunden - %s\n"
 STRING_REPLACE_ERROR7,             "Erweiterter Fehler 32\n"
 STRING_REACTOS_VERSION,            "ReactOS Operating System [Version %s-%s]\n"
 STRING_CMD_SHELLINFO,              "\nReactOS-Befehlszeileninterpreter\nVersion %s %s"
-STRING_VERSION_RUNVER,             " läuft in %s"
+STRING_VERSION_RUNVER,             " läuft in %s"
 STRING_COPY_FILE ,                 "        %d Datei(en) kopiert\n"
-STRING_DELETE_WIPE,                "sicher gelöscht"
+STRING_DELETE_WIPE,                "sicher gelöscht"
-STRING_FOR_ERROR,                  "ungültige Variablenangabe."
+STRING_FOR_ERROR,                  "ungültige Variablenangabe."
-STRING_SCREEN_COL,                 "ungültige Spalten-Angabe"
+STRING_SCREEN_COL,                 "ungültige Spalten-Angabe"
-STRING_SCREEN_ROW,                 "ungültige Zeilen-Angabe"
+STRING_SCREEN_ROW,                 "ungültige Zeilen-Angabe"
 STRING_TIMER_TIME                  "Timer %d ist %s: "
-STRING_MKLINK_CREATED_SYMBOLIC,    "Symbolische Verknüpfung erstellt für %s <<===>> %s\n"
+STRING_MKLINK_CREATED_SYMBOLIC,    "Symbolische Verknüpfung erstellt für %s <<===>> %s\n"
-STRING_MKLINK_CREATED_HARD,        "Hardlink erstellt für %s <<===>> %s\n"
+STRING_MKLINK_CREATED_HARD,        "Hardlink erstellt für %s <<===>> %s\n"
-STRING_MKLINK_CREATED_JUNCTION,    "Junction Point erstellt für %s <<===>> %s\n"
+STRING_MKLINK_CREATED_JUNCTION,    "Junction Point erstellt für %s <<===>> %s\n"
 STRING_MORE,                       "Mehr? "
-STRING_CANCEL_BATCH_FILE,          "\r\nStrg-Pause gedrückt. Batchvorgang abbrechen? (Ja/Nein/Alle) "
+STRING_CANCEL_BATCH_FILE,          "\r\nStrg-Pause gedrückt. Batchvorgang abbrechen? (Ja/Nein/Alle) "
-STRING_INVALID_OPERAND,            "Ungültiger Operand."
+STRING_INVALID_OPERAND,            "Ungültiger Operand."
 STRING_EXPECTED_CLOSE_PAREN,       "Erwartet ')'."
 STRING_EXPECTED_NUMBER_OR_VARIABLE,"Erwartet Nummer oder Variablennamen."
 STRING_SYNTAX_COMMAND_INCORRECT,   "Syntaxfehler."

base/shell/cmd/rsrc.rc

@@ -1,4 +1,3 @@
-#include "lang/de-DE.rc"
 #include "lang/el-GR.rc"
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"
@@ -6,9 +5,11 @@
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
 #include "lang/pl-PL.rc"
 #include "lang/no-NO.rc"
-#include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"
 #include "lang/uk-UA.rc"
+
+#include "lang/de-DE.rc"
+#include "lang/ja-JP.rc"
+#include "lang/ru-RU.rc"

base/shell/explorer/explorer-uk.rc

@@ -71,7 +71,7 @@ IDM_DESKTOPBAR MENU DISCARDABLE
 BEGIN
     POPUP ""
     BEGIN
-        MENUITEM "&Íàñòðîéêè...",               ID_DESKTOPBAR_SETTINGS
+        MENUITEM "&Íàëàøòóâàííÿ...",               ID_DESKTOPBAR_SETTINGS
         MENUITEM "Ä&èñïåò÷åð çàâäàíü...",       ID_TASKMGR
         MENUITEM SEPARATOR
         MENUITEM "&Ïðî Ïðîâ³äíèê...",           ID_ABOUT_EXPLORER
@@ -173,7 +173,7 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "Îáåð³òü íàéá³ëüø çðó÷íèé äëÿ âàñ àëãîðèòì âèð³âíþâàííÿ çíà÷ê³â:",
-                    IDC_STATIC,7,7,166,8
+                    IDC_STATIC,7,7,166,16
     CONTROL         "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW |
                     BS_BOTTOM | WS_TABSTOP,7,25,46,44
     CONTROL         "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW |
@@ -208,11 +208,11 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "³äîáðà&æàòè ãîäèííèê",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,152,52,10
+                    WS_TABSTOP,2,152,102,10
     CONTROL         "Ïðè&õîâóâàòè íåâèêîðèñòîâóâàí³ çíà÷êè",
                     ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,174,111,10
+                    WS_TABSTOP,2,174,151,10
-    PUSHBUTTON      "&Ñïîâ³ùåííÿ...",ID_CONFIG_NOTIFYAREA,153,173,50,14
+    PUSHBUTTON      "&Ñïîâ³ùåííÿ...",ID_CONFIG_NOTIFYAREA,153,173,52,14
 END
 
 IDD_DESKBAR_STARTMENU DIALOGEX DISCARDABLE  0, 0, 210, 194
@@ -231,25 +231,25 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CONTROL         "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES |
                     TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31
-    LTEXT           "&Òåêñò ϳäêàçêè:",IDC_LABEL1,7,44,40,8
+    LTEXT           "&Òåêñò ϳäêàçêè:",IDC_LABEL1,7,44,60,8
-    EDITTEXT        IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_NOTIFY_TOOLTIP,66,42,135,14,ES_AUTOHSCROLL
-    LTEXT           "Çàãîëîâîê Â&³êíà:",IDC_LABEL2,7,63,44,8
+    LTEXT           "Çàãîëîâîê Â&³êíà:",IDC_LABEL2,7,63,64,8
-    EDITTEXT        IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_NOTIFY_TITLE,66,60,135,14,ES_AUTOHSCROLL
-    LTEXT           "&Øëÿõ äî Ìîäóëÿ:",IDC_LABEL3,7,81,43,8
+    LTEXT           "&Øëÿõ äî Ìîäóëÿ:",IDC_LABEL3,7,81,63,8
-    EDITTEXT        IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_NOTIFY_MODULE,66,78,135,14,ES_AUTOHSCROLL
-    GROUPBOX        "&Ðåæèì ³äîáðàæåííÿ",IDC_LABEL4,7,96,157,28
+    GROUPBOX        "&Ðåæèì ³äîáðàæåííÿ",IDC_LABEL4,7,96,177,28
     CONTROL         "&ïîêàçàòè",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON |
-                    WS_TABSTOP,15,108,33,10
+                    WS_TABSTOP,15,108,44,10
     CONTROL         "&ñõîâàòè",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66,
-                    108,29,10
+                    108,40,10
     CONTROL         "à&âòîïðèõîâàííÿ",IDC_NOTIFY_AUTOHIDE,"Button",
-                    BS_AUTORADIOBUTTON,112,108,43,10
+                    BS_AUTORADIOBUTTON,112,108,69,10
     ICON            "",IDC_PICTURE,173,101,21,20
-    LTEXT           "&Îñòàííÿ çì³íà:",IDC_LABEL6,7,132,43,8
+    LTEXT           "&Îñòàííÿ çì³íà:",IDC_LABEL6,7,132,65,8
     EDITTEXT        IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL |
                     ES_READONLY
     CONTROL         "ïîêà&çàòè ïðèõîâàíå",ID_SHOW_HIDDEN_ICONS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,154,86,10
     DEFPUSHBUTTON   "&OK",IDOK,91,153,50,14,WS_GROUP
     PUSHBUTTON      "&Ñêàñóâàòè",IDCANCEL,151,153,50,14
 END
@@ -337,7 +337,7 @@ BEGIN
     IDS_DOCUMENTS           "Äîêóìåíòè"
     IDS_FAVORITES           "Îáðàíå"
     IDS_PROGRAMS            "Ïðîãðàìè"
-    IDS_SETTINGS            "Íàñòðîéêè"
+    IDS_SETTINGS            "Íàëàøòóâàííÿ"
     IDS_EXPLORE             "Îãëÿä"
     IDS_EMPTY               "(Ïîðîæíüî)"
     IDS_RECENT              "Íåäàâí³ äîêóìåíòè"
@@ -368,7 +368,7 @@ BEGIN
     IDS_CONNECTIONS         "Ìåðåæí³ ï³äêëþ÷åííÿ"
     IDS_DRIVES              "Äèñêè"
     IDS_SEARCH_COMPUTER     "Ïîøóê êîìï’þòåðà..."
-    IDS_SETTINGS_MENU       "Ìåíþ Íàñòðîéêà"
+    IDS_SETTINGS_MENU       "Ìåíþ Íàëàøòóâàíü"
     IDS_CONTROL_PANEL       "Ïàíåëü êåðóâàííÿ"
     IDS_PRINTERS            "Ïðèíòåðè"
     IDS_BROWSE              "Îãëÿä ôàéë³â"
@@ -378,7 +378,7 @@ BEGIN
     IDS_ABOUT_EXPLORER      "&Ïðî Ïðîâ³äíèê..."
     IDS_LAUNCH_MANY_PROGRAMS
                             "Âè îáðàëè á³ëüøå îäí³º¿ ïðîãðàìè.\nÂè âïåâíåí³, ùî õî÷åòå çàïóñòèòè ¿õ âñ³?"
-    IDS_DESKTOPBAR_SETTINGS "Íàñòðîéêè ðîáî÷îãî ñòîëà"
+    IDS_DESKTOPBAR_SETTINGS "Íàëàøòóâàííÿ ðîáî÷îãî ñòîëà"
     IDS_DESKTOP             "Ðîáî÷èé Ñò³ë"
     IDS_TASKBAR             "Ïàíåëü çàâäàíü"
     IDS_NAMECOLUMN          "²ì'ÿ"

base/system/winlogon/wlx.c

@@ -1032,7 +1032,7 @@ CreateWindowStationAndDesktops(
 	Session->InteractiveWindowStation = CreateWindowStationW(
 		Session->InteractiveWindowStationName,
 		0,
-		WINSTA_CREATEDESKTOP,
+		GENERIC_ALL,
 		&DefaultSecurity);
 	if (!Session->InteractiveWindowStation)
 	{

baseaddress.rbuild

@@ -188,8 +188,8 @@
 	<property name="BASEADDRESS_RPCRT4"		value="0x76000000" />
 	<property name="BASEADDRESS_SHLWAPI"		value="0x76100000" />
 	<property name="BASEADDRESS_INETCOMM"		value="0x76140000" />
-	<property name="BASEADDRESS_COMCTL32"		value="0x76160000" />
+	<property name="BASEADDRESS_COMCTL32"		value="0x76170000" />
-	<property name="BASEADDRESS_COMDLG32"		value="0x76220000" />
+	<property name="BASEADDRESS_COMDLG32"		value="0x76230000" />
 	<property name="BASEADDRESS_WINSTA"		value="0x762f0000" />
 	<property name="BASEADDRESS_IMM32"		value="0x76320000" />
 	<property name="BASEADDRESS_D3D8THK"		value="0x76340000" />
@@ -203,15 +203,15 @@
 	<property name="BASEADDRESS_WAVEMAP"		value="0x76610000" />
 	<property name="BASEADDRESS_MPR"		value="0x76620000" />
 	<property name="BASEADDRESS_MSHTML"		value="0x76650000" />
-	<property name="BASEADDRESS_ODBC32"		value="0x76660000" />
+	<property name="BASEADDRESS_ODBC32"		value="0x76710000" />
-	<property name="BASEADDRESS_SETUPAPI"		value="0x76660000" />
+	<property name="BASEADDRESS_SETUPAPI"		value="0x76730000" />
-	<property name="BASEADDRESS_CRYPTDLL"		value="0x76740000" />
+	<property name="BASEADDRESS_CRYPTDLL"		value="0x768f0000" />
-	<property name="BASEADDRESS_SHFOLDER"		value="0x76760000" />
+	<property name="BASEADDRESS_SHFOLDER"		value="0x76900000" />
-	<property name="BASEADDRESS_NTDSAPI"		value="0x76780000" />
+	<property name="BASEADDRESS_NTDSAPI"		value="0x76910000" />
-	<property name="BASEADDRESS_NTMARTA"		value="0x768a0000" />
+	<property name="BASEADDRESS_NTMARTA"		value="0x76920000" />
-	<property name="BASEADDRESS_RASDLG"		value="0x768d0000" />
+	<property name="BASEADDRESS_RASDLG"		value="0x76930000" />
-	<property name="BASEADDRESS_GDIPLUS"		value="0x76a00000" />
+	<property name="BASEADDRESS_GDIPLUS"		value="0x76a70000" />
-	<property name="BASEADDRESS_ATL"		value="0x76a80000" />
+	<property name="BASEADDRESS_ATL"		value="0x76ac0000" />
 	<property name="BASEADDRESS_SFC"		value="0x76b50000" />
 	<property name="BASEADDRESS_CREDUI"		value="0x76bf0000" />
 	<property name="BASEADDRESS_SFC_OS"		value="0x76c10000" />
@@ -242,7 +242,7 @@
 	<property name="BASEADDRESS_WSHIRDA"		value="0x777f0000" />
 	<property name="BASEADDRESS_VERSION"		value="0x77a40000" />
 	<property name="BASEADDRESS_OLE32"		value="0x77a50000" />
-	<property name="BASEADDRESS_OLEPRO32"		value="0x77b10000" />
+	<property name="BASEADDRESS_OLEPRO32"		value="0x77b20000" />
 	<property name="BASEADDRESS_ACTIVEDS"		value="0x77cb0000" />
 	<property name="BASEADDRESS_ADVAPI32"		value="0x77dc0000" />
 	<property name="BASEADDRESS_USER32"		value="0x77e50000" />

boot/bootdata/hivesys_i386.inf

@@ -1163,6 +1163,190 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ImagePath",0x00020000,"system32
 HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Start",0x00010001,0x00000004
 HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Type",0x00010001,0x00000001
 
+; PCI Bus driver
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus 
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Tag",0x00010001,0x00000002
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C621",0x00030003,04,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950640",0x00030003,04,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80861230",0x00030003,04,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867010",0x00030003,04,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","104B0140",0x00030003,08,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11790603",0x00030003,08,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867113",0x00030003,08,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","497884C5",0x00030003,08,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11063040",0x00030003,08,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","0E111000",0x00030003,10,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","0E112000",0x00030003,10,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10390406",0x00030003,10,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80860482",0x00030003,00,40,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80860008",0x00030003,10,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10140002",0x00030003,10,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10800600",0x00030003,20,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10131100",0x00030003,40,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10B95219",0x00030003,80,00,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1C1C0001",0x00030003,00,01,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10970038",0x00030003,00,01,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","100BD001",0x00030003,00,04,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","808604A3",0x00030003,00,08,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10AA0000",0x00030003,00,08,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","533388D1",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11790605",0x00030003,00,10,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10131110",0x00030003,00,20,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11800478",0x00030003,00,20,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11800475",0x00030003,00,20,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11800476",0x00030003,00,20,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10040101",0x00030003,00,40,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10421000",0x00030003,00,40,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","104CAC12",0x00030003,00,00,01,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11800466",0x00030003,00,00,01,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10140095",0x00030003,00,00,04,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80862418",0x00030003,00,00,04,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80862428",0x00030003,00,00,04,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","8086244E",0x00030003,00,00,04,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80862448",0x00030003,00,00,04,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","8086122E",0x00030003,00,00,08,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867000",0x00030003,00,00,08,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867110",0x00030003,00,00,08,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867600",0x00030003,00,00,08,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024747",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024754",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338901",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","101300D6",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","104CAC15",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","110B0004",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1000000F",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","104CAC17",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10239397",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024742",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024744",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024749",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024750",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024751",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024755",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024757",0x00030003,00,00,40,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024759",0x00030003,00,00,40,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C42",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C44",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C47",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C49",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C50",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C51",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10025654",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10025655",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10025656",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","121A0003",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C861107B9300",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C8611045C861",0x00030003,00,00,40,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80861231",0x00030003,00,00,00,01,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","12730002",0x00030003,00,00,00,01,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1014007D",0x00030003,00,00,00,01,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","12850100",0x00030003,00,00,00,01,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","12176836",0x00030003,00,00,00,08,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","12176832",0x00030003,00,00,00,08,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","109107A0",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867800",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10c88005",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10c88006",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10c80005",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10c80006",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","102B1001",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DD0100",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950646",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950670",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950648",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10110026",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","8086B154",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338904",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11068598",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11068605",0x00030003,00,00,00,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","11790609",0x00030003,00,00,00,40,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10140047",0x00030003,00,00,00,40,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","102B051B",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","102B0520",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","102B0521",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","102B1025",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","102B0525",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867121",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867123",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80867125",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80861132",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","90050050",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","9005005F",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024752",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1002474F",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1002474D",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024753",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1002474C",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1002474E",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C4D",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C4E",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C52",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C53",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10239880",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE00A0",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE00A1",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE00A3",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE00B0",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE00B1",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE00B3",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0100",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0101",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0102",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0103",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0120",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0121",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0122",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0123",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0150",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0151",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0152",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0153",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0200",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0201",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0202",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0203",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","12D20018",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","12D20019",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10136003",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","3D3D000A",0x00030003,00,00,00,80,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024158",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024354",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024358",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024554",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024758",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024C54",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338810",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338811",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338812",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338814",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338880",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","533388B0",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","533388C0",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","533388C1",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","533388D0",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","533388F0",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","53338902",0x00030003,00,00,00,00,01,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","0E11B109",0x00030003,00,00,00,00,02,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","100C3202",0x00030003,00,8a,00,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10668002",0x00030003,00,00,30,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10660002",0x00030003,00,00,30,00,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10040102",0x00030003,00,40,00,02,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C814",0x00030003,00,00,40,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10024756",0x00030003,00,00,40,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1002475A",0x00030003,00,00,40,20,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1000000B",0x00030003,00,00,00,a0,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0020",0x00030003,00,00,00,a0,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0028",0x00030003,00,00,00,a0,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE0029",0x00030003,00,00,00,a0,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE002A",0x00030003,00,00,00,a0,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE002B",0x00030003,00,00,00,a0,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE002C",0x00030003,00,00,00,a0,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE002D",0x00030003,00,00,00,a0,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE002E",0x00030003,00,00,00,a0,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10DE002F",0x00030003,00,00,00,a0,00,00,00,00
+HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","101300D6101880D6",0x00030003,00,00,00,00,00,00,00,00
+
 ; Plug and Play manager
 HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","DisplayName",0x00000000,"Plug and Play"
 HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Description",0x00000000,"Detects hardware changes and installs needed software if possible"

boot/bootdata/packages/reactos.dff

@@ -764,46 +764,77 @@ modules\rostests\drivers\kmtest\kmtestassist.sys                           2   o
 modules\rostests\tests\pseh2\pseh2_test.exe                                7   optional
 modules\rostests\winetests\advapi32\advapi32_winetest.exe                  7   optional
 modules\rostests\winetests\advpack\advpack_winetest.exe                    7   optional
+modules\rostests\winetests\amstream\amstream_winetest.exe                  7   optional
+modules\rostests\winetests\atl\atl_winetest.exe                            7   optional
+modules\rostests\winetests\avifil32\avifil32_winetest.exe                  7   optional
 modules\rostests\winetests\browseui\browseui_winetest.exe                  7   optional
 modules\rostests\winetests\cabinet\cabinet_winetest.exe                    7   optional
 modules\rostests\winetests\comcat\comcat_winetest.exe                      7   optional
 modules\rostests\winetests\comctl32\comctl32_winetest.exe                  7   optional
 modules\rostests\winetests\comdlg32\comdlg32_winetest.exe                  7   optional
+modules\rostests\winetests\credui\credui_winetest.exe                      7   optional
 modules\rostests\winetests\crypt32\crypt32_winetest.exe                    7   optional
 modules\rostests\winetests\cryptnet\cryptnet_winetest.exe                  7   optional
+modules\rostests\winetests\cryptui\cryptui_winetest.exe                    7   optional
+modules\rostests\winetests\dnsapi\dnsapi_winetest.exe                      7   optional
 modules\rostests\winetests\dsound\dsound_winetest.exe                      7   optional
+modules\rostests\winetests\fusion\fusion_winetest.exe                      7   optional
 modules\rostests\winetests\gdi32\gdi32_winetest.exe                        7   optional
 modules\rostests\winetests\gdiplus\gdiplus_winetest.exe                    7   optional
 modules\rostests\winetests\hlink\hlink_winetest.exe                        7   optional
 modules\rostests\winetests\icmp\icmp_winetest.exe                          7   optional
+modules\rostests\winetests\imm32\imm32_winetest.exe                        7   optional
+modules\rostests\winetests\inetcomm\inetcomm_winetest.exe                  7   optional
+modules\rostests\winetests\inetmib1\inetmib1_winetest.exe                  7   optional
 modules\rostests\winetests\iphlpapi\iphlpapi_winetest.exe                  7   optional
+modules\rostests\winetests\itss\itss_winetest.exe                          7   optional
 modules\rostests\winetests\jscript\jscript_winetest.exe                    7   optional
 modules\rostests\winetests\kernel32\kernel32_winetest.exe                  7   optional
+modules\rostests\winetests\localspl\localspl_winetest.exe                  7   optional
+modules\rostests\winetests\localui\localui_winetest.exe                    7   optional
 modules\rostests\winetests\lz32\lz32_winetest.exe                          7   optional
 modules\rostests\winetests\mapi32\mapi32_winetest.exe                      7   optional
 modules\rostests\winetests\mlang\mlang_winetest.exe                        7   optional
+modules\rostests\winetests\msacm32\msacm32_winetest.exe                    7   optional
+modules\rostests\winetests\mscms\mscms_winetest.exe                        7   optional
+modules\rostests\winetests\msctf\msctf_winetest.exe                        7   optional
 modules\rostests\winetests\mshtml\mshtml_winetest.exe                      7   optional
 modules\rostests\winetests\msi\msi_winetest.exe                            7   optional
 modules\rostests\winetests\mstask\mstask_winetest.exe                      7   optional
 modules\rostests\winetests\msvcrt\msvcrt_winetest.exe                      7   optional
+modules\rostests\winetests\msvcrtd\msvcrtd_winetest.exe                    7   optional
+modules\rostests\winetests\msvfw32\msvfw32_winetest.exe                    7   optional
 modules\rostests\winetests\msxml3\msxml3_winetest.exe                      7   optional
 modules\rostests\winetests\netapi32\netapi32_winetest.exe                  7   optional
 modules\rostests\winetests\ntdll\ntdll_winetest.exe                        7   optional
+modules\rostests\winetests\ntdsapi\ntdsapi_winetest.exe                    7   optional
+modules\rostests\winetests\ntprint\ntprint_winetest.exe                    7   optional
 modules\rostests\winetests\odbccp32\odbccp32_winetest.exe                  7   optional
 modules\rostests\winetests\ole32\ole32_winetest.exe                        7   optional
+modules\rostests\winetests\oleacc\oleacc_winetest.exe                      7   optional
 modules\rostests\winetests\oleaut32\oleaut32_winetest.exe                  7   optional
+modules\rostests\winetests\opengl32\opengl32_winetest.exe                  7   optional
+modules\rostests\winetests\pdh\pdh_winetest.exe                            7   optional
 modules\rostests\winetests\powrprof\powrprof_winetest.exe                  7   optional
 modules\rostests\winetests\psapi\psapi_winetest.exe                        7   optional
+modules\rostests\winetests\qmgr\qmgr_winetest.exe                          7   optional
+modules\rostests\winetests\quartz\quartz_winetest.exe                      7   optional
+modules\rostests\winetests\rasapi32\rasapi32_winetest.exe                  7   optional
 modules\rostests\winetests\riched20\riched20_winetest.exe                  7   optional
+modules\rostests\winetests\riched32\riched32_winetest.exe                  7   optional
 modules\rostests\winetests\rpcrt4\rpcrt4_winetest.exe                      7   optional
 modules\rostests\winetests\rsabase\rsabase_winetest.exe                    7   optional
 modules\rostests\winetests\rsaenh\rsaenh_winetest.exe                      7   optional
 modules\rostests\winetests\schannel\schannel_winetest.exe                  7   optional
 modules\rostests\winetests\secur32\secur32_winetest.exe                    7   optional
+modules\rostests\winetests\serialui\serialui_winetest.exe                  7   optional
 modules\rostests\winetests\setupapi\setupapi_winetest.exe                  7   optional
 modules\rostests\winetests\shdocvw\shdocvw_winetest.exe                    7   optional
 modules\rostests\winetests\shell32\shell32_winetest.exe                    7   optional
 modules\rostests\winetests\shlwapi\shlwapi_winetest.exe                    7   optional
+modules\rostests\winetests\snmpapi\snmpapi_winetest.exe                    7   optional
+modules\rostests\winetests\spoolss\spoolss_winetest.exe                    7   optional
+modules\rostests\winetests\twain_32\twain_32_winetest.exe                  7   optional
 modules\rostests\winetests\urlmon\urlmon_winetest.exe                      7   optional
 modules\rostests\winetests\user32\user32_winetest.exe                      7   optional
 modules\rostests\winetests\usp10\usp10_winetest.exe                        7   optional
@@ -814,6 +845,7 @@ modules\rostests\winetests\wininet\wininet_winetest.exe                    7   o
 modules\rostests\winetests\winmm\winmm_winetest.exe                        7   optional
 modules\rostests\winetests\wintrust\wintrust_winetest.exe                  7   optional
 modules\rostests\winetests\wlanapi\wlanapi_winetest.exe                    7   optional
+modules\rostests\winetests\wldap32\wldap32_winetest.exe                    7   optional
 modules\rostests\winetests\ws2_32\ws2_32_winetest.exe                      7   optional
 modules\rostests\winetests\xmllite\xmllite_winetest.exe                    7   optional
 

boot/freeldr/freeldr/arch/i386/hwpci.c

@@ -23,49 +23,6 @@
 #define NDEBUG
 #include <debug.h>
 
-#include <pshpack1.h>
-
-typedef struct _ROUTING_SLOT
-{
-  UCHAR  BusNumber;
-  UCHAR  DeviceNumber;
-  UCHAR  LinkA;
-  USHORT BitmapA;
-  UCHAR  LinkB;
-  USHORT BitmapB;
-  UCHAR  LinkC;
-  USHORT BitmapC;
-  UCHAR  LinkD;
-  USHORT BitmapD;
-  UCHAR  SlotNumber;
-  UCHAR  Reserved;
-} ROUTING_SLOT, *PROUTING_SLOT;
-
-typedef struct _PCI_IRQ_ROUTING_TABLE
-{
-  ULONG Signature;
-  USHORT Version;
-  USHORT Size;
-  UCHAR  RouterBus;
-  UCHAR  RouterSlot;
-  USHORT ExclusiveIRQs;
-  ULONG CompatibleRouter;
-  ULONG MiniportData;
-  UCHAR  Reserved[11];
-  UCHAR  Checksum;
-  ROUTING_SLOT Slot[1];
-} PCI_IRQ_ROUTING_TABLE, *PPCI_IRQ_ROUTING_TABLE;
-
-#include <poppack.h>
-
-typedef struct _PCI_REGISTRY_INFO
-{
-    UCHAR MajorRevision;
-    UCHAR MinorRevision;
-    UCHAR NoBuses;
-    UCHAR HardwareMechanism;
-} PCI_REGISTRY_INFO, *PPCI_REGISTRY_INFO;
-
 static PPCI_IRQ_ROUTING_TABLE
 GetPciIrqRoutingTable(VOID)
 {
@@ -77,14 +34,14 @@ GetPciIrqRoutingTable(VOID)
   Table = (PPCI_IRQ_ROUTING_TABLE)0xF0000;
   while ((ULONG_PTR)Table < 0x100000)
     {
-      if (Table->Signature == 0x52495024)
+      if (Table->Signature == 'RIP$')
 	{
 	  DPRINTM(DPRINT_HWDETECT,
 		    "Found signature\n");
 
 	  Ptr = (PUCHAR)Table;
 	  Sum = 0;
-	  for (i = 0; i < Table->Size; i++)
+	  for (i = 0; i < Table->TableSize; i++)
 	    {
 	      Sum += Ptr[i];
 	    }
@@ -156,11 +113,11 @@ DetectPciIrqRoutingTable(PCONFIGURATION_COMPONENT_DATA BusKey)
   Table = GetPciIrqRoutingTable();
   if (Table != NULL)
     {
-      DPRINTM(DPRINT_HWDETECT, "Table size: %u\n", Table->Size);
+      DPRINTM(DPRINT_HWDETECT, "Table size: %u\n", Table->TableSize);
 
       /* Set 'Configuration Data' value */
       Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors) +
-         2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + Table->Size;
+         2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + Table->TableSize;
       PartialResourceList = MmHeapAlloc(Size);
       if (PartialResourceList == NULL)
       {
@@ -184,10 +141,10 @@ DetectPciIrqRoutingTable(PCONFIGURATION_COMPONENT_DATA BusKey)
       PartialDescriptor = &PartialResourceList->PartialDescriptors[1];
       PartialDescriptor->Type = CmResourceTypeDeviceSpecific;
       PartialDescriptor->ShareDisposition = CmResourceShareUndetermined;
-      PartialDescriptor->u.DeviceSpecificData.DataSize = Table->Size;
+      PartialDescriptor->u.DeviceSpecificData.DataSize = Table->TableSize;
 
       memcpy(&PartialResourceList->PartialDescriptors[2],
-          Table, Table->Size);
+          Table, Table->TableSize);
 
       FldrCreateComponentKey(BusKey,
                              PeripheralClass,

boot/freeldr/freeldr/include/freeldr.h

@@ -112,6 +112,8 @@
 #include <comm.h>
 /* Swap */
 #include <bytesex.h>
+/* Internal shared PCI header */
+#include <drivers/pci/pci.h>
 
 VOID BootMain(LPSTR CmdLine);
 VOID RunLoader(VOID);

dll/cpl/access/lang/uk-UA.rc

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        dll/cpl/access/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for Accessibility Control Panel Applet
- * TRANSLATOR:  Rostislav Zabolotny
+ * TRANSLATORS:  Rostislav Zabolotny, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -17,19 +17,19 @@ BEGIN
   GROUPBOX "Çàëèïàííÿ êëàâ³ø",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
   LTEXT "Ââåäåííÿ êîìá³íàö³é ç êëàâ³øàìè Shift, Ctrl ÷è Alt, íàòèñêàþ÷è êëàâ³ø³ ïîñë³äîâíî.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
   AUTOCHECKBOX "&Çàëèïàííÿ êëàâ³ø",IDC_STICKY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+6,PROPSHEETWIDTH-PROPSHEETPADDING(20),14
-  PUSHBUTTON "&Íàñòðîéêà",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(5)+6,PROPSHEETPADDING(15)-5,14
+  PUSHBUTTON "&Íàëàøòóâàííÿ",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(5)+6,PROPSHEETPADDING(15)-5,14
 
   GROUPBOX "Ô³ëüòðàö³ÿ ââîäó",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
   LTEXT "²ãíîðóâàííÿ âèïàäêîâèõ êîðîòêî÷àñíèõ àáî ïîâòîðþâàíèõ çàòèñêàíü êëàâ³ø.",-1,PROPSHEETPADDING(2),LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
-  AUTOCHECKBOX "Âèêîðèñòîâóâàòè &ô³ëüòðàö³þ ââîäó",IDC_FILTER_BOX,PROPSHEETPADDING(2),LABELLINE(13)+6,PROPSHEETWIDTH-PROPSHEETPADDING(20),14
+  AUTOCHECKBOX "Âèêîðèñòîâóâàòè &ô³ëüòðàö³þ ââîäó",IDC_FILTER_BOX,PROPSHEETPADDING(2),LABELLINE(13)+6,PROPSHEETWIDTH-PROPSHEETPADDING(16),14
-  PUSHBUTTON "Í&àñòðîéêà",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(13)+6,PROPSHEETPADDING(15)-5,14
+  PUSHBUTTON "Í&àëàøòóâàííÿ",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(13)+6,PROPSHEETPADDING(15)-5,14
 
   GROUPBOX "Îçâó÷óâàííÿ ïåðåêëþ÷åííÿ ðåæèì³â",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
   LTEXT "Ïðè çì³í³ ñòàíó êëàâ³ø Caps Lock, Num Lock ³ Scroll Lock çâó÷èòü ñèãíàë.",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
   AUTOCHECKBOX "&Îçâó÷óâàííÿ",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(20),14
-  PUSHBUTTON "Íà&ñòðîéêà",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(20)+6,PROPSHEETPADDING(15)-5,14
+  PUSHBUTTON "Íà&ëàøòóâàííÿ",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(20)+6,PROPSHEETPADDING(15)-5,14
 
-  AUTOCHECKBOX "&Äîäàòêîâ³ â³äîìîñò³ ïðî ðîáîòó ³ç êëàâ³àòóðîþ",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14
+  AUTOCHECKBOX "&Äîäàòêîâ³ â³äîìîñò³ ïðî ðîáîòó ³ç êëàâ³àòóðîþ â ïðîãðàìàõ",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14
 END
 
 
@@ -38,9 +38,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Çâóê"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "³çóàëüíå ³íôîðìóâàííÿ",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1)
+  GROUPBOX "³çóàëüíå ñïîâ³ùåííÿ",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1)
   LTEXT "Çâóêîâ³ ñèãíàëè ñèñòåìè ñóïðîâîäæóþòüñÿ â³çóàëüíîþ ³íôîðìàö³ºþ.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
-  AUTOCHECKBOX "Â&³çóàëüíå ³íôîðìóâàííÿ",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15)+2,14
+  AUTOCHECKBOX "³ç&óàëüíå ñïîâ³ùåííÿ",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15)+2,14
   LTEXT "²íôîðìóâàòè êîðèñòóâà÷à:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
   COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
@@ -58,7 +58,7 @@ BEGIN
   GROUPBOX "Âèñîêà êîíòðàñòí³ñòü",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
   LTEXT "Âèêîðèñòàííÿ ñèñòåìè êîëüîð³â ³ øðèôò³â, ÿê³ ïîëåêøóþòü çîðîâå ñïðèéíÿòòÿ òåêñòó.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
   AUTOCHECKBOX "&Âèñîêà êîíòðàñòí³ñòü",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14
-  PUSHBUTTON "Í&àñòðîéêà",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  PUSHBUTTON "Í&àëàøòóâàííÿ",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
 
   GROUPBOX "Ïàðàìåòðè êóðñîðó",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13)
   LTEXT "Íàëàøòóâàííÿ ÷àñòîòè ìèãîò³ííÿ ³ òîâùèíè êóðñîðó.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
@@ -82,7 +82,7 @@ BEGIN
   GROUPBOX "Êåðóâàííÿ âêàç³âíèêîì ìèø³ ç êëàâ³àòóðè",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
   LTEXT "Êåðóâàííÿ ìèøåþ ³ç öèôðîâî¿ ïàíåë³ êëàâ³àòóðè.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
   AUTOCHECKBOX "&Êåðóâàííÿ ç êëàâ³àòóðè",IDC_MOUSE_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14
-  PUSHBUTTON "Í&àñòðîéêà",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  PUSHBUTTON "Í&àëàøòóâàííÿ",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
 END
 
 
@@ -97,13 +97,13 @@ BEGIN
            CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   GROUPBOX "Ñïîâ³ùåííÿ",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  AUTOCHECKBOX "&Ïîêàçóâàòè ïîïåðåäæåííÿ ïðè ââ³ìêíåííÿ ðåæèìó",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14
+  AUTOCHECKBOX "&Ïîêàçóâàòè ïîïåðåäæåííÿ ïðè ââ³ìêíåíí³ ðåæèìó",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14
   AUTOCHECKBOX "Ï&îäàâàòè çâóêîâèé ñèãíàë ïðè çì³í³ ðåæèìó",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14
 
   GROUPBOX "Àëüòðåðíàòèâí³ ïðèñòðî¿ ââîäó",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
   LTEXT "Âèêîðèñòàííÿ àëüòåðíàòèâíèõ ïðèñòðî¿â ââîäó, ÿê³ çàì³íÿþòü ìèøó ³ êëàâ³àòóðó.",-1,PROPSHEETPADDING(2),LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
   AUTOCHECKBOX "&Àëüòåðíàòèâí³ ïðèñòðî¿ ââîäó",IDC_SERIAL_BOX,PROPSHEETPADDING(2),LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(20),14
-  PUSHBUTTON "&Íàñòðîéêà",IDC_SERIAL_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(16)-4,PROPSHEETPADDING(15),14
+  PUSHBUTTON "&Íàëàøòóâàííÿ",IDC_SERIAL_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(16)-4,PROPSHEETPADDING(15),14
 
   GROUPBOX "Àäì³í³ñòðàòèâí³ ïàðàìåòðè",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
   AUTOCHECKBOX "Çàñ&òîñóâàòè äî ðîáî÷îãî ñòîëà âõîäó äî ñèñòåìè",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14
@@ -122,7 +122,7 @@ BEGIN
 
   GROUPBOX "Ïàðàìåòðè",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1)
   AUTOCHECKBOX "&Ùîá çàáëîêóâàòè ñëóæáîâó êëàâ³øó, íàòèñí³òü ¿¿ äâ³÷³",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14
-  AUTOCHECKBOX "&Âèìèêàòè çàëèïàííÿ êëàâ³ø íàòèñíåííÿì äâîõ êëàâ³ø îäíî÷àñíî",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(12),PROPSHEETWIDTH-PROPSHEETPADDING(4),14
+  AUTOCHECKBOX "&Âèìèêàòè çàëèïàííÿ íàòèñíåííÿì äâîõ êëàâ³ø îäíî÷àñíî",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(12),PROPSHEETWIDTH-PROPSHEETPADDING(4),14
 
   GROUPBOX "²íôîðìóâàííÿ",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1)
   AUTOCHECKBOX "&Çâóêîâèé ñèãíàë ïðè íàòèñêàíñíåíí³ ñëóæáîâî¿ êëàâ³ø³",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14
@@ -140,13 +140,13 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Óâ³ìêíåííÿ ðåæèìó",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
   LTEXT "Âèêëèêîì ç êëàâ³àòóðè º \nÓòðèìóâàííÿ ïðàâî¿ êëàâ³ø³ <Shift> âïðîäîâæ 8 ñåêóíä",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
-  AUTOCHECKBOX "&Âèêîðèñòîâóâàòè òàêèé øâèäêèé âèêëèê",IDC_FILTER_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14
+  AUTOCHECKBOX "&Âèêîðèñòîâóâàòè øâèäêèé âèêëèê",IDC_FILTER_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14
 
   GROUPBOX "Íàëàøòóâàííÿ ô³ëüòðó",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(8)+5
-  AUTORADIOBUTTON "&²ãíîðóâàòè ïîâòîðí³ íàòèñêàííÿ êëàâ³ø",IDC_FILTER_BOUNCE_RADIO,PROPSHEETPADDING(2),LABELLINE(9)+7,PROPSHEETPADDING(20),LABELLINE(1),WS_GROUP|WS_TABSTOP
+  AUTORADIOBUTTON "&²ãíîðóâàòè ïîâòîðí³ íàòèñêàííÿ",IDC_FILTER_BOUNCE_RADIO,PROPSHEETPADDING(2),LABELLINE(9)+7,PROPSHEETPADDING(21),LABELLINE(1),WS_GROUP|WS_TABSTOP
-  AUTORADIOBUTTON "²ãíîðóâàòè &êîðîòêî÷àñí³ íàòèñíåííÿ ³ çìåíøèòè ÷àñòîòó ïîâòîðåííÿ",IDC_FILTER_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(11)+5,PROPSHEETPADDING(20),LABELLINE(2),BS_TOP|BS_MULTILINE
+  AUTORADIOBUTTON "²ãíîðóâàòè &êîðîòêî÷àñí³ íàòèñ-\níåííÿ ³ çìåíøèòè ¿õ ÷àñòîòó",IDC_FILTER_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(11)+5,PROPSHEETPADDING(20),LABELLINE(2),BS_TOP|BS_MULTILINE
-  PUSHBUTTON "&Íàñòðîéêà",IDC_FILTER_BOUNCE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(9)+5,PROPSHEETPADDING(15),14,WS_GROUP
+  PUSHBUTTON "&Íàëàøòóâàííÿ",IDC_FILTER_BOUNCE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(9)+5,PROPSHEETPADDING(15),14,WS_GROUP
-  PUSHBUTTON "Íà&ñòðîéêà",IDC_FILTER_REPEAT_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(11)+5,PROPSHEETPADDING(15),14,WS_GROUP
+  PUSHBUTTON "Íà&ëàøòóâàííÿ",IDC_FILTER_REPEAT_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(11)+5,PROPSHEETPADDING(15),14,WS_GROUP
   LTEXT "Í&àòèñí³òü òóò ùîá ïåðåâ³ðèòè íàëàøòóâàííÿ:",-1,PROPSHEETPADDING(2),LABELLINE(14)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
   EDITTEXT IDC_FILTER_TEST_EDIT,PROPSHEETPADDING(2),LABELLINE(15)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),14,WS_GROUP|ES_AUTOHSCROLL
 
@@ -161,7 +161,7 @@ END
 
 IDD_TOGGLEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Îçâó÷óâàííÿ ïåðåêëþ÷åííÿ ðåæèì³â"
+CAPTION "Îçâó÷óâàííÿ ïåðåìèêàííÿ ðåæèì³â"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Óâ³ìêíåííÿ ðåæèìó",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
@@ -179,10 +179,10 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Óâ³ìêíåííÿ ðåæèìó",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Äëÿ àêòèâàö³¿ \níàòèñí³òü <ALT çë³âà+SHIFT çë³âà +PRINT SCREEN>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
+  LTEXT "Äëÿ àêòèâàö³¿ \níàòèñí³òü <ALT_çë³âà+SHIFT_çë³âà +PRINT SCREEN>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
   AUTOCHECKBOX "&Âèêîðèñòîâóâàòè òàêèé ñïîñ³á óâ³ìêíåííÿ",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14
 
-  GROUPBOX "êîíòðàñòíà ñõåìà îôîðìëåííÿ",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1)
+  GROUPBOX "Êîíòðàñòíà ñõåìà îôîðìëåííÿ",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1)
   LTEXT "Ïîòî÷íà êîíòðàñòíà ñõåìà îôîðìëåííÿ:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
   COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6),
            CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
@@ -194,30 +194,30 @@ END
 
 IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Íàñòðîéêà êåðóâàííÿ âêàç³âíèêîì ³ç êëàâ³àòóðè"
+CAPTION "Íàëàøòóâàííÿ êåðóâàííÿ âêàç³âíèêîì ³ç êëàâ³àòóðè"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Óâ³ìêíåííÿ ðåæèìó",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Ùîá óâ³ìêíóòè ðåæèì êåðóâàííÿ âêàç³âíèêîì ³ç êëàâ³àòóðè:  \nÍàòèñí³òü êëàâ³ø³ <ALT çë³âà+SHIFT çë³âà + NUM LOCK>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
+  LTEXT "Ùîá óâ³ìêíóòè ðåæèì êåðóâàííÿ âêàç³âíèêîì ³ç êëàâ³àòóðè:  \nÍàòèñí³òü êëàâ³ø³ <ALT_çë³âà+SHIFT_çë³âà + NUM LOCK>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
   AUTOCHECKBOX "&Âèêîðèñòîâóâàòè òàêèé ñïîñ³á óâ³ìêíåííÿ",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14
 
   GROUPBOX "Øâèäê³ñòü ðóõó âêàç³âíèêà",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9)
 
   LTEXT "&Íàéá³ëüøà:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1)
-  LTEXT "íèæ÷å",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1)
+  LTEXT "íèæ÷å",-1,PROPSHEETPADDING(11),LABELLINE(10)+4,PROPSHEETPADDING(4),LABELLINE(1)
   CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2)
   LTEXT "âèùå",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1)
 
   LTEXT "&Ïðèñêîðåííÿ:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1)
-  LTEXT "íèæ÷å",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1)
+  LTEXT "íèæ÷å",-1,PROPSHEETPADDING(11),LABELLINE(13)+4,PROPSHEETPADDING(4),LABELLINE(1)
   CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(22),LABELLINE(2)
   LTEXT "âèùå",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1)
 
   AUTOCHECKBOX "CTRL - ïðèñ&êîðåííÿ, SHIFT - óïîâ³ëüåííÿ",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14
 
-  LTEXT "Âèêîðèñòîâóâàòè êåðóâàííÿ ç êëàâ³àòóðè, ÿêùî NumLock:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1)
+  LTEXT "Âèêîðèñòîâóâàòè, ÿêùî NumLock:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1)
-  AUTORADIOBUTTON "Óâ³&ìêíóòî",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1)
+  AUTORADIOBUTTON "Óâ³&ìê",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1)
-  AUTORADIOBUTTON "â&èìêíåíî",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1)
+  AUTORADIOBUTTON "Â&èìê",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1)
 
   AUTOCHECKBOX "Ï&îêàçóâàòè ñòàí êåðóâàííÿ âêàç³âíèêîì íà åêðàí³",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14
 

dll/cpl/desk/advappdlg.c

@@ -5,15 +5,55 @@
  * FILE:            dll/cpl/desk/advappdlg.c
  * PURPOSE:         Advanced appearance dialog
  *
- * PROGRAMMER:     Timo Kreuzer (timo[dot]kreuzer[at]web[dot]de)
+ * PROGRAMMER:      Timo Kreuzer (timo[dot]kreuzer[at]web[dot]de)
  *
  */
 
 #include "desk.h"
+#include "theme.h"
 #include "appearance.h"
 #include "preview.h"
 
+/******************************************************************************/
 
+typedef struct
+{
+	int Size;
+	int Size2;
+	int Color1;
+	int Color2;
+	int Font;
+	int FontColor;
+} ASSIGNMENT;
+
+/* This const assigns the color and metric numbers to the elements from the elements list */
+
+/* Size 1 (width)	Size 2 (height)	Color 1					Color 2							Font			Fontcolor */
+const ASSIGNMENT g_Assignment[NUM_ELEMENTS] =
+{ {-1,				-1,				COLOR_DESKTOP,			-1,								-1,				-1},				/* -Desktop */
+  {SIZE_CAPTION_Y,	-1,				COLOR_INACTIVECAPTION,	COLOR_GRADIENTINACTIVECAPTION,	FONT_CAPTION,	-1},				/* inactive window caption */
+  {SIZE_BORDER_X,	SIZE_BORDER_Y,	COLOR_INACTIVEBORDER,	-1,								-1,				-1},  				/* inactive window border */
+  {SIZE_CAPTION_Y,	-1,				COLOR_ACTIVECAPTION,	COLOR_GRADIENTACTIVECAPTION,	FONT_CAPTION,	COLOR_CAPTIONTEXT},	/* -active window caption */
+  {SIZE_BORDER_X,	SIZE_BORDER_Y,	COLOR_ACTIVEBORDER,		-1,								-1,				-1},				/* active window border */
+  {SIZE_MENU_SIZE_X,SIZE_MENU_Y,	COLOR_MENU,				-1, 							FONT_MENU,		COLOR_MENUTEXT},	/* menu */
+  {SIZE_MENU_SIZE_X,SIZE_MENU_Y,	COLOR_HIGHLIGHT,		-1,								FONT_HILIGHT,	COLOR_HIGHLIGHTTEXT},/* marked element */
+  {-1,				-1,				COLOR_WINDOW,			-1 /*COLOR_WINDOWFRAME*/,				-1,				COLOR_WINDOWTEXT},	/* window */
+  {SIZE_SCROLL_X,	SIZE_SCROLL_Y,	COLOR_SCROLLBAR,		-1,								-1,				-1},				/* scroll bar */
+  {-1,				-1,				COLOR_3DFACE,			-1,								-1,				COLOR_BTNTEXT},		/* 3d objects */
+  {SIZE_SMCAPTION_Y,-1,				-1,						-1,								FONT_SMCAPTION,	-1},				/* palette window caption */
+  {-1,				-1,				-1,						-1,								-1,				-1},				/* symbol caption FIXME: Access? */
+  {SIZE_CAPTION_Y,	-1,				-1,						-1,								-1,				-1},				/* caption bar */
+  {-1,				-1,				-1,						-1,								-1,				COLOR_GRAYTEXT},	/* inactive menu item FIXME: Access? */
+  {-1,				-1,				-1,						-1,								FONT_DIALOG,	COLOR_WINDOWTEXT},	/* dialog */
+  {-1,				-1,				-1,						-1,								-1,				-1},				/* scrollbar controls FIXME: Access? */
+  {-1,				-1,				COLOR_APPWORKSPACE,		-1,								-1,				-1},				/* application background */
+  {-1,				-1,				-1,						-1,								-1,				-1},				/* small caption bar FIXME: Access? */
+  {SIZE_ICON_SPC_X,	-1,				-1,						-1,								-1,				-1},				/* symbol distance horiz. */
+  {SIZE_ICON_SPC_Y,	-1,				-1,						-1,								-1,				-1},				/* symbol distance vert. */
+  {-1,				-1,				COLOR_INFOBK,			-1,								FONT_INFO,		COLOR_INFOTEXT},	/* quickinfo */
+  {SIZE_ICON_X,		SIZE_ICON_Y,	-1,						-1,								FONT_ICON,		-1}};				/* symbol */
+
+/******************************************************************************/
 
 /* Draw the current color on the color picker buttons */
 static VOID
@@ -71,6 +111,7 @@ InitColorButtons(HWND hwndDlg, GLOBALS* g)
 	HPEN hPen;
 	HWND hwndColorButton;
 	HGDIOBJ hgdiTemp;
+    THEME *theme = &g->ThemeAdv;
 
 	const POINT Points[3] = {{29,6},{33,6},{31,8}};
 
@@ -92,7 +133,7 @@ InitColorButtons(HWND hwndDlg, GLOBALS* g)
 		rect.top = 0;
 		rect.right = 36;
 		rect.bottom = 15;
-		hbrush = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
+		hbrush = CreateSolidBrush(theme->crColor[COLOR_BTNFACE]);
 		FillRect(hdcCompat, &rect, hbrush);
 		DeleteObject(hbrush);
 
@@ -101,12 +142,12 @@ InitColorButtons(HWND hwndDlg, GLOBALS* g)
 		rect.top = 1;
 		rect.right = 23;
 		rect.bottom = 14;
-		hbrush = CreateSolidBrush(GetSysColor(COLOR_BTNTEXT));
+		hbrush = CreateSolidBrush(theme->crColor[COLOR_BTNTEXT]);
 		FillRect(hdcCompat, &rect, hbrush);
 		DeleteObject(hbrush);
 
 		/* Draw left side of line */
-		hPen = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_BTNSHADOW));
+		hPen = CreatePen(PS_SOLID, 1, theme->crColor[COLOR_BTNSHADOW]);
 		SelectObject(hdcCompat, hPen);
 		MoveToEx(hdcCompat, 26, 1, NULL);
 		LineTo(hdcCompat, 26, 14);
@@ -114,7 +155,7 @@ InitColorButtons(HWND hwndDlg, GLOBALS* g)
 		DeleteObject(hPen);
 
 		/* Draw right side of line */
-		hPen = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_BTNHIGHLIGHT));
+		hPen = CreatePen(PS_SOLID, 1, theme->crColor[COLOR_BTNHIGHLIGHT]);
 		SelectObject(hdcCompat,hPen);
 		MoveToEx(hdcCompat, 27, 1, NULL);
 		LineTo(hdcCompat, 27, 14);
@@ -122,8 +163,8 @@ InitColorButtons(HWND hwndDlg, GLOBALS* g)
 		DeleteObject(hPen);
 
 		/* Draw triangle */
-		hPen = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_BTNTEXT));
+		hPen = CreatePen(PS_SOLID, 1, theme->crColor[COLOR_BTNTEXT]);
-		hbrush = CreateSolidBrush(GetSysColor(COLOR_BTNTEXT));
+		hbrush = CreateSolidBrush(theme->crColor[COLOR_BTNTEXT]);
 		SelectObject(hdcCompat, hPen);
 		SelectObject(hdcCompat, hbrush);
 		SetPolyFillMode(hdcCompat, WINDING);
@@ -293,7 +334,7 @@ GetColor(HWND hwndDlg, GLOBALS* g, INT nButton)
 		if (crColor != cc.rgbResult)
 		{
 			UpdateButtonColor(hwndDlg, g, ID, nButton, ColorIndex);
-			SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCOLOR, ColorIndex, cc.rgbResult);
+			SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
 			return TRUE;
 		}
 	}
@@ -317,6 +358,9 @@ AdvAppearanceDlg_Init(HWND hwndDlg, GLOBALS *g)
 	/* Copy the current theme values */
 	g->ThemeAdv = g->Theme;
 
+	SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
+	
+
 	/* Add the elements to the combo */
 	for (iElement = 0; iElement < NUM_ELEMENTS; iElement++)
 	{
@@ -338,12 +382,6 @@ AdvAppearanceDlg_Init(HWND hwndDlg, GLOBALS *g)
 
 	SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_SETCURSEL, iDeskIndex, 0);
 
-	/* Set colors for the color buttons */
-	g->crCOLOR_BTNFACE = g->Theme.crColor[COLOR_BTNFACE];
-	g->crCOLOR_BTNTEXT = g->Theme.crColor[COLOR_BTNTEXT];
-	g->crCOLOR_BTNSHADOW = g->Theme.crColor[COLOR_BTNSHADOW];
-	g->crCOLOR_BTNHIGHLIGHT = g->Theme.crColor[COLOR_BTNHIGHLIGHT];
-
 	/* Create font for bold button */
 	lfButtonFont = g->Theme.lfFont[FONT_DIALOG];
 	lfButtonFont.lfWeight = FW_BOLD;
@@ -377,7 +415,7 @@ AdvAppearanceDlg_Init(HWND hwndDlg, GLOBALS *g)
 	InitColorButtons(hwndDlg, g);
 
 	/* Make the UpDown control count correctly */
-	SendMessage (GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_UD), UDM_SETRANGE, 0L, MAKELONG (200, 1));
+	SendMessage(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_UD), UDM_SETRANGE, 0L, MAKELONG (200, 1));
 
 	/* Fill font selection combo */
 	lfFont.lfCharSet = DEFAULT_CHARSET;
@@ -508,12 +546,12 @@ AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 			{
 				case IDOK:
 					SaveCurrentValues(hwndDlg, g);
-					EndDialog(hwndDlg, 0);
+					EndDialog(hwndDlg, IDOK);
 					break;
 
 				case IDCANCEL:
 					g->ThemeAdv = g->Theme;
-					EndDialog(hwndDlg, 0);
+					EndDialog(hwndDlg, IDCANCEL);
 					break;
 
 				case IDC_APPEARANCE_PREVIEW:
@@ -571,22 +609,19 @@ AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 							case IDX_ACTIVE_CAPTION:
 								GetSelectedComboText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C,
 									g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfFaceName);
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCAPTIONFONT, 0,
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 
 							case IDX_MENU:
 								GetSelectedComboText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C,
 									g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfFaceName);
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETMENUFONT, 0,
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 
 							case IDX_DIALOG:
 								GetSelectedComboText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C,
 									g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfFaceName);
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETDIALOGFONT, 0,
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 						}
 					}
@@ -605,24 +640,21 @@ AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 								i = GetSelectedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E);
 								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight =
 									-MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72);
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCAPTIONFONT, 0,
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 
 							case IDX_MENU:
 								i = GetSelectedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E);
 								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight =
 									-MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72);
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETMENUFONT, 0,
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 
 							case IDX_DIALOG:
 								i = GetSelectedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E);
 								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight =
 									-MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72);
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETDIALOGFONT, 0,
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 						}
 
@@ -640,24 +672,21 @@ AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 								i = GetEditedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E);
 								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight =
 									-MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72);
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCAPTIONFONT, 0,
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 
 							case IDX_MENU:
 								i = GetEditedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E);
 								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight =
 									-MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72);
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETMENUFONT, 0,
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 
 							case IDX_DIALOG:
 								i = GetEditedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E);
 								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight =
 									-MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72);
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETDIALOGFONT, 0,
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 						}
 
@@ -677,9 +706,7 @@ AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 								i = (INT)SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, BM_GETCHECK, 0, 0);
 								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfWeight =
 									(i == BST_CHECKED) ? FW_BOLD : FW_NORMAL;
-
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCAPTIONFONT, 0,
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 
 							case IDX_MENU:
@@ -687,18 +714,14 @@ AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfWeight =
 									(i == BST_CHECKED) ? FW_BOLD : FW_NORMAL;
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETMENUFONT, 0,
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 
 							case IDX_DIALOG:
 								i = (INT)SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, BM_GETCHECK, 0, 0);
-
 								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfWeight =
 									(i == BST_CHECKED) ? FW_BOLD : FW_NORMAL;
-
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETDIALOGFONT, 0,
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 						}
 					}
@@ -714,32 +737,23 @@ AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 							case IDX_INACTIVE_CAPTION:
 							case IDX_ACTIVE_CAPTION:
 								i = (INT)SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_GETCHECK, 0, 0);
-
 								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfItalic =
 									(i == BST_CHECKED) ? TRUE : FALSE;
-
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCAPTIONFONT, 0,
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 
 							case IDX_MENU:
 								i = (INT)SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_GETCHECK, 0, 0);
-
 								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfItalic =
 									(i == BST_CHECKED) ? TRUE : FALSE;
-
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETMENUFONT, 0,
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 
 							case IDX_DIALOG:
 								i = (INT)SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_GETCHECK, 0, 0);
-
 								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfItalic =
 									(i == BST_CHECKED) ? TRUE : FALSE;
-
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->ThemeAdv);
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETDIALOGFONT, 0,
-									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
 								break;
 						}
 					}

dll/cpl/desk/appearance.c

@@ -9,488 +9,70 @@
  */
 
 #include "desk.h"
+#include "theme.h"
+#include "preview.h"
 #include "appearance.h"
 
 /******************************************************************************/
 
-/* This const assigns the color and metric numbers to the elements from the elements list */
-
-/* Size 1 (width)	Size 2 (height)	Color 1					Color 2							Font			Fontcolor */
-const ASSIGNMENT g_Assignment[NUM_ELEMENTS] =
-{ {-1,				-1,				COLOR_DESKTOP,			-1,								-1,				-1},				/* -Desktop */
-  {SIZE_CAPTION_Y,	-1,				COLOR_INACTIVECAPTION,	COLOR_GRADIENTINACTIVECAPTION,	FONT_CAPTION,	-1},				/* inactive window caption */
-  {SIZE_BORDER_X,	SIZE_BORDER_Y,	COLOR_INACTIVEBORDER,	-1,								-1,				-1},  				/* inactive window border */
-  {SIZE_CAPTION_Y,	-1,				COLOR_ACTIVECAPTION,	COLOR_GRADIENTACTIVECAPTION,	FONT_CAPTION,	COLOR_CAPTIONTEXT},	/* -active window caption */
-  {SIZE_BORDER_X,	SIZE_BORDER_Y,	COLOR_ACTIVEBORDER,		-1,								-1,				-1},				/* active window border */
-  {SIZE_MENU_X,		SIZE_MENU_Y,	COLOR_MENU,				-1, 							FONT_MENU,		COLOR_MENUTEXT},	/* menu */
-  {SIZE_MENU_X,		SIZE_MENU_Y,	COLOR_HIGHLIGHT,		-1,								FONT_HILIGHT,	COLOR_HIGHLIGHTTEXT},/* marked element */
-  {-1,				-1,				COLOR_WINDOW,			-1 /*COLOR_WINDOWFRAME*/,				-1,				COLOR_WINDOWTEXT},	/* window */
-  {SIZE_SCROLL_X,	SIZE_SCROLL_Y,	COLOR_SCROLLBAR,		-1,								-1,				-1},				/* scroll bar */
-  {-1,				-1,				COLOR_3DFACE,			-1,								-1,				COLOR_BTNTEXT},		/* 3d objects */
-  {SIZE_SMCAPTION_Y,-1,				-1,						-1,								FONT_SMCAPTION,	-1},				/* palette window caption */
-  {-1,				-1,				-1,						-1,								-1,				-1},				/* symbol caption FIXME: Access? */
-  {SIZE_CAPTION_Y,	-1,				-1,						-1,								-1,				-1},				/* caption bar */
-  {-1,				-1,				-1,						-1,								-1,				COLOR_GRAYTEXT},	/* inactive menu item FIXME: Access? */
-  {-1,				-1,				-1,						-1,								FONT_DIALOG,	COLOR_WINDOWTEXT},	/* dialog */
-  {-1,				-1,				-1,						-1,								-1,				-1},				/* scrollbar controls FIXME: Access? */
-  {-1,				-1,				COLOR_APPWORKSPACE,		-1,								-1,				-1},				/* application background */
-  {-1,				-1,				-1,						-1,								-1,				-1},				/* small caption bar FIXME: Access? */
-  {SIZE_ICON_SPC_X,	-1,				-1,						-1,								-1,				-1},				/* symbol distance horiz. */
-  {SIZE_ICON_SPC_Y,	-1,				-1,						-1,								-1,				-1},				/* symbol distance vert. */
-  {-1,				-1,				COLOR_INFOBK,			-1,								FONT_INFO,		COLOR_INFOTEXT},	/* quickinfo */
-  {SIZE_ICON_X,		SIZE_ICON_Y,	-1,						-1,								FONT_ICON,		-1}};				/* symbol */
-
-/* This is the list of names for the colors stored in the registry */
-const TCHAR g_RegColorNames[NUM_COLORS][MAX_COLORNAMELENGTH] =
-	{TEXT("Scrollbar"),				/* 00 = COLOR_SCROLLBAR */
-	TEXT("Background"),				/* 01 = COLOR_DESKTOP */
-	TEXT("ActiveTitle"),			/* 02 = COLOR_ACTIVECAPTION  */
-	TEXT("InactiveTitle"),			/* 03 = COLOR_INACTIVECAPTION */
-	TEXT("Menu"),					/* 04 = COLOR_MENU */
-	TEXT("Window"),					/* 05 = COLOR_WINDOW */
-	TEXT("WindowFrame"),			/* 06 = COLOR_WINDOWFRAME */
-	TEXT("MenuText"), 				/* 07 = COLOR_MENUTEXT */
-	TEXT("WindowText"), 			/* 08 = COLOR_WINDOWTEXT */
-	TEXT("TitleText"), 				/* 09 = COLOR_CAPTIONTEXT */
-	TEXT("ActiveBorder"), 			/* 10 = COLOR_ACTIVEBORDER */
-	TEXT("InactiveBorder"), 		/* 11 = COLOR_INACTIVEBORDER */
-	TEXT("AppWorkSpace"), 			/* 12 = COLOR_APPWORKSPACE */
-	TEXT("Hilight"), 				/* 13 = COLOR_HIGHLIGHT */
-	TEXT("HilightText"), 			/* 14 = COLOR_HIGHLIGHTTEXT */
-	TEXT("ButtonFace"), 			/* 15 = COLOR_BTNFACE */
-	TEXT("ButtonShadow"), 			/* 16 = COLOR_BTNSHADOW */
-	TEXT("GrayText"), 				/* 17 = COLOR_GRAYTEXT */
-	TEXT("ButtonText"), 			/* 18 = COLOR_BTNTEXT */
-	TEXT("InactiveTitleText"), 		/* 19 = COLOR_INACTIVECAPTIONTEXT */
-	TEXT("ButtonHilight"), 			/* 20 = COLOR_BTNHIGHLIGHT */
-	TEXT("ButtonDkShadow"), 		/* 21 = COLOR_3DDKSHADOW */
-	TEXT("ButtonLight"), 			/* 22 = COLOR_3DLIGHT */
-	TEXT("InfoText"), 				/* 23 = COLOR_INFOTEXT */
-	TEXT("InfoWindow"), 			/* 24 = COLOR_INFOBK */
-	TEXT("ButtonAlternateFace"),	/* 25 = COLOR_ALTERNATEBTNFACE */
-	TEXT("HotTrackingColor"), 		/* 26 = COLOR_HOTLIGHT */
-	TEXT("GradientActiveTitle"),	/* 27 = COLOR_GRADIENTACTIVECAPTION */
-	TEXT("GradientInactiveTitle"),	/* 28 = COLOR_GRADIENTINACTIVECAPTION */
-	TEXT("MenuHilight"), 			/* 29 = COLOR_MENUHILIGHT */
-	TEXT("MenuBar"), 				/* 30 = COLOR_MENUBAR */
-};
-
-/* This is the list of used metrics and their numbers */
-const int g_SizeMetric[NUM_SIZES] =
-{
-	SM_CXBORDER,
-	SM_CYBORDER,
-	SM_CYCAPTION,
-	SM_CXICON,
-	SM_CYICON,
-	SM_CXICONSPACING,
-	SM_CYICONSPACING,
-	SM_CXMENUSIZE,
-	SM_CYMENU,
-	SM_CXVSCROLL,
-	SM_CYHSCROLL,
-	SM_CYSMCAPTION
-};
-
-/******************************************************************************/
-
-static VOID
-LoadCurrentTheme(GLOBALS* g)
-{
-	INT i;
-	NONCLIENTMETRICS NonClientMetrics;
-
-	g->Theme.bHasChanged = FALSE;
-	/* FIXME: it may be custom! */
-	g->Theme.bIsCustom = FALSE;
-
-	/* Load colors */
-	for (i = 0; i <= 30; i++)
-	{
-		g->ColorList[i] = i;
-		g->Theme.crColor[i] = (COLORREF)GetSysColor(i);
-	}
-
-	/* Load sizes */
-	for (i = 0; i <= 11; i++)
-	{
-		g->Theme.Size[i] = GetSystemMetrics(g_SizeMetric[i]);
-	}
-
-	/* Load fonts */
-	NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS);
-	SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0);
-	g->Theme.lfFont[FONT_CAPTION] = NonClientMetrics.lfCaptionFont;
-	g->Theme.lfFont[FONT_SMCAPTION] = NonClientMetrics.lfSmCaptionFont;
-	g->Theme.lfFont[FONT_MENU] = NonClientMetrics.lfMenuFont;
-	g->Theme.lfFont[FONT_INFO] = NonClientMetrics.lfStatusFont;
-	g->Theme.lfFont[FONT_DIALOG] = NonClientMetrics.lfMessageFont;
-	SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(LOGFONT), &g->Theme.lfFont[FONT_ICON], 0);
-
-    /* Effects */
-   /* "Use the following transition effect for menus and tooltips" */
-    SystemParametersInfo(SPI_GETMENUANIMATION, sizeof(BOOL), &g->Theme.Effects.bMenuAnimation, 0);
-    SystemParametersInfo(SPI_GETMENUFADE, sizeof(BOOL), &g->Theme.Effects.bMenuFade, 0);
-    /* FIXME: XP seems to use grayed checkboxes to reflect differences between menu and tooltips settings
-     * Just keep them in sync for now:
-     */
-    g->Theme.Effects.bTooltipAnimation  = g->Theme.Effects.bMenuAnimation;
-    g->Theme.Effects.bTooltipFade       = g->Theme.Effects.bMenuFade;
-
-    /* show content of windows during dragging */
-    //SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, g->Theme.Effects.bDragFullWindows, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
-    SystemParametersInfoW(SPI_GETDRAGFULLWINDOWS, 0, &g->Theme.Effects.bDragFullWindows, 0);
-
-    /* "Hide underlined letters for keyboard navigation until I press the Alt key" */
-    SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &g->Theme.Effects.bKeyboardCues, 0);
-}
-
-
-static BOOL
-LoadThemeFromReg(GLOBALS* g)
-{
-	INT i;
-	TCHAR strSizeName[20] = {TEXT("Sizes\\0")};
-	TCHAR strValueName[10];
-	HKEY hkNewSchemes, hkScheme, hkSize;
-	DWORD dwType, dwLength;
-	BOOL Ret = FALSE;
-	INT iPreset = g->Theme.Id;
-
-	if(RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance\\New Schemes"),
-		0, KEY_READ, &hkNewSchemes) == ERROR_SUCCESS)
-	{
-		if(RegOpenKeyEx(hkNewSchemes, g->ThemeTemplates[iPreset].strKeyName, 0, KEY_READ, &hkScheme) == ERROR_SUCCESS)
-		{
-			lstrcpyn(&strSizeName[6],g->ThemeTemplates[iPreset].strSizeName, 3);
-			if(RegOpenKeyEx(hkScheme, strSizeName, 0, KEY_READ, &hkSize) == ERROR_SUCCESS)
-			{
-				Ret = TRUE;
-
-				dwLength = sizeof(DWORD);
-				if (RegQueryValueEx(hkSize, TEXT("FlatMenus"), NULL, &dwType, (LPBYTE)&g->Theme.bFlatMenus, &dwLength) != ERROR_SUCCESS ||
-				    dwType != REG_DWORD || dwLength != sizeof(DWORD))
-				{
-					/* Failed to read registry value */
-					g->Theme.bFlatMenus = FALSE;
-					Ret = FALSE;
-				}
-
-				for (i = 0; i <= 30; i++)
-				{
-					wsprintf(strValueName, TEXT("Color #%d"), i);
-					dwLength = sizeof(COLORREF);
-					if (RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.crColor[i], &dwLength) != ERROR_SUCCESS ||
-					    dwType != REG_DWORD || dwLength != sizeof(COLORREF))
-					{
-						/* Failed to read registry value, initialize with current setting for now */
-						g->Theme.crColor[i] = GetSysColor(i);
-						Ret = FALSE;
-					}
-				}
-				for (i = 0; i <= 5; i++)
-				{
-					wsprintf(strValueName, TEXT("Font #%d"), i);
-					dwLength = sizeof(LOGFONT);
-					g->Theme.lfFont[i].lfFaceName[0] = 'x';
-					if (RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.lfFont[i], &dwLength) != ERROR_SUCCESS ||
-					    dwType != REG_BINARY || dwLength != sizeof(LOGFONT))
-					{
-						/* Failed to read registry value */
-						Ret = FALSE;
-					}
-				}
-				for (i = 0; i <= 8; i++)
-				{
-					wsprintf(strValueName, TEXT("Size #%d"), i);
-					dwLength = sizeof(UINT64);
-					if (RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.Size[i], &dwLength) != ERROR_SUCCESS ||
-					    dwType != REG_QWORD || dwLength != sizeof(UINT64))
-					{
-						/* Failed to read registry value, initialize with current setting for now */
-						g->Theme.Size[i] = GetSystemMetrics(g_SizeMetric[i]);
-						Ret = FALSE;
-					}
-				}
-				RegCloseKey(hkScheme);
-			}
-			RegCloseKey(hkScheme);
-		}
-		RegCloseKey(hkNewSchemes);
-	}
-
-	return Ret;
-}
-
-static VOID
-_UpdateUserPref(UINT SpiGet,UINT SpiSet,BOOL *pbFlag)
-{
-    SystemParametersInfo(SpiSet, 0, (PVOID)pbFlag, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE);
-}
-#define UPDATE_USERPREF(NAME,pbFlag) _UpdateUserPref(SPI_GET ## NAME, SPI_SET ## NAME, pbFlag)
-
-static VOID
-ApplyTheme(GLOBALS* g)
-{
-	INT i, Result;
-	HKEY hKey;
-	DWORD dwDisposition = 0;
-	TCHAR clText[16] = {0};
-	NONCLIENTMETRICS NonClientMetrics;
-	HFONT hMyFont;
-	LOGFONT lfButtonFont;
-
-	if (!g->Theme.bHasChanged)
-		return;
-
-	/* Update some globals */
-	g->crCOLOR_BTNFACE = g->Theme.crColor[COLOR_BTNFACE];
-	g->crCOLOR_BTNTEXT = g->Theme.crColor[COLOR_BTNTEXT];
-	g->crCOLOR_BTNSHADOW = g->Theme.crColor[COLOR_BTNSHADOW];
-	g->crCOLOR_BTNHIGHLIGHT = g->Theme.crColor[COLOR_BTNHIGHLIGHT];
-	lfButtonFont = g->Theme.lfFont[FONT_DIALOG];
-
-	/* Create new font for bold button */
-	lfButtonFont.lfWeight = FW_BOLD;
-	lfButtonFont.lfItalic = FALSE;
-	hMyFont = CreateFontIndirect(&lfButtonFont);
-	if (hMyFont)
-	{
-		if (g->hBoldFont)
-			DeleteObject(g->hBoldFont);
-		g->hBoldFont = hMyFont;
-	}
-
-	/* Create new font for italic button */
-	lfButtonFont.lfWeight = FW_REGULAR;
-	lfButtonFont.lfItalic = TRUE;
-	hMyFont = CreateFontIndirect(&lfButtonFont);
-	if (hMyFont)
-	{
-		if (g->hItalicFont)
-			DeleteObject(g->hItalicFont);
-		g->hItalicFont = hMyFont;
-	}
-
-	/* Apply Colors from global variable */
-	SetSysColors(30, &g->ColorList[0], &g->Theme.crColor[0]);
-
-	/* Save colors to registry */
-	Result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, KEY_ALL_ACCESS, &hKey);
-	if (Result != ERROR_SUCCESS)
-	{
-		/* Could not open the key, try to create it */
-		Result = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, NULL, 0, KEY_ALL_ACCESS, NULL,&hKey, &dwDisposition);
-	}
-
-	if (Result == ERROR_SUCCESS)
-	{
-		for (i = 0; i <= 30; i++)
-		{
-			DWORD red   = GetRValue(g->Theme.crColor[i]);
-			DWORD green = GetGValue(g->Theme.crColor[i]);
-			DWORD blue  = GetBValue(g->Theme.crColor[i]);
-			wsprintf(clText, TEXT("%d %d %d"), red, green, blue);
-			RegSetValueEx(hKey, g_RegColorNames[i], 0, REG_SZ, (BYTE *)clText, lstrlen( clText )*sizeof(TCHAR) + sizeof(TCHAR));
-		}
-
-		RegCloseKey(hKey);
-	}
-
-	/* Apply the fonts */
-	NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS);
-	SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0);
-	NonClientMetrics.lfCaptionFont = g->Theme.lfFont[FONT_CAPTION];
-	NonClientMetrics.lfSmCaptionFont = g->Theme.lfFont[FONT_SMCAPTION];
-	NonClientMetrics.lfMenuFont = g->Theme.lfFont[FONT_MENU];
-	NonClientMetrics.lfStatusFont = g->Theme.lfFont[FONT_INFO];
-	NonClientMetrics.lfMessageFont = g->Theme.lfFont[FONT_DIALOG];
-	SystemParametersInfo(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0);
-	SystemParametersInfo(SPI_SETICONTITLELOGFONT, sizeof(LOGFONT), &g->Theme.lfFont[FONT_ICON], 0);
-
-	/* FIXME: Apply size metrics */
-
-	/* Save fonts and size metrics to registry */
-	Result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, KEY_ALL_ACCESS, &hKey);
-	if (Result != ERROR_SUCCESS)
-	{
-		/* Could not open the key, try to create it */
-		Result = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, NULL, 0, KEY_ALL_ACCESS, NULL,&hKey, &dwDisposition);
-	}
-
-	if (Result == ERROR_SUCCESS)
-	{
-		RegSetValueEx(hKey, TEXT("CaptionFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_CAPTION], sizeof(LOGFONT));
-		RegSetValueEx(hKey, TEXT("SmCaptionFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_SMCAPTION], sizeof(LOGFONT));
-		RegSetValueEx(hKey, TEXT("IconFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_ICON], sizeof(LOGFONT));
-		RegSetValueEx(hKey, TEXT("MenuFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_MENU], sizeof(LOGFONT));
-		RegSetValueEx(hKey, TEXT("StatusFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_INFO], sizeof(LOGFONT));
-		RegSetValueEx(hKey, TEXT("MessageFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_DIALOG], sizeof(LOGFONT));
-
-		/* Save size metrics to registry */
-		wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_BORDER_X]);
-		RegSetValueEx(hKey, TEXT("BorderWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
-		wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_CAPTION_Y]);
-		RegSetValueEx(hKey, TEXT("CaptionWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
-		wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_CAPTION_Y]);
-		RegSetValueEx(hKey, TEXT("CaptionHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
-		wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SMCAPTION_Y]);
-		RegSetValueEx(hKey, TEXT("SmCaptionWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
-		wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SMCAPTION_Y]);
-		RegSetValueEx(hKey, TEXT("SmCaptionHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
-		wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_ICON_SPC_X]);
-		RegSetValueEx(hKey, TEXT("IconSpacing"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
-		wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_ICON_SPC_Y]);
-		RegSetValueEx(hKey, TEXT("IconVerticalSpacing"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
-		wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_MENU_X]);
-		RegSetValueEx(hKey, TEXT("MenuWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
-		wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_MENU_Y]);
-		RegSetValueEx(hKey, TEXT("MenuHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
-		wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SCROLL_X]);
-		RegSetValueEx(hKey, TEXT("ScrollWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
-		wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SCROLL_Y]);
-		RegSetValueEx(hKey, TEXT("ScrollHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
-		wsprintf(clText, TEXT("%d"), g->Theme.Size[SIZE_ICON_X]);
-		RegSetValueEx(hKey, TEXT("Shell Icon Sizet"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
-
-		RegCloseKey(hKey);
-	}
-
-    /* Effects, save only when needed: */
-    /* FIXME: XP seems to use grayed checkboxes to reflect differences between menu and tooltips settings
-     * Just keep them in sync for now.
-     */
-    g->Theme.Effects.bTooltipAnimation  = g->Theme.Effects.bMenuAnimation;
-    g->Theme.Effects.bTooltipFade       = g->Theme.Effects.bMenuFade;
-    SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, g->Theme.Effects.bDragFullWindows, NULL, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE);
-    //UPDATE_USERPREF(KEYBOARDCUES, &g->Theme.Effects.bKeyboardCues);
-    //UPDATE_USERPREF(ACTIVEWINDOWTRACKING, &g->Theme.Effects.bActiveWindowTracking);
-    //UPDATE_USERPREF(MENUANIMATION, &g->Theme.Effects.bMenuAnimation);
-    //UPDATE_USERPREF(COMBOBOXANIMATION, &g->Theme.Effects.bComboBoxAnimation);
-    //UPDATE_USERPREF(LISTBOXSMOOTHSCROLLING, &g->Theme.Effects.bListBoxSmoothScrolling);
-    //UPDATE_USERPREF(GRADIENTCAPTIONS, &g->Theme.Effects.bGradientCaptions);
-    //UPDATE_USERPREF(ACTIVEWNDTRKZORDER, &g->Theme.Effects.bActiveWndTrkZorder);
-    //UPDATE_USERPREF(HOTTRACKING, &g->Theme.Effects.bHotTracking);
-    UPDATE_USERPREF(MENUFADE, &g->Theme.Effects.bMenuFade);
-    //UPDATE_USERPREF(SELECTIONFADE, &g->Theme.Effects.bSelectionFade);
-    UPDATE_USERPREF(TOOLTIPANIMATION, &g->Theme.Effects.bTooltipAnimation);
-    UPDATE_USERPREF(TOOLTIPFADE, &g->Theme.Effects.bTooltipFade);
-    //UPDATE_USERPREF(CURSORSHADOW, &g->Theme.Effects.bCursorShadow);
-    //UPDATE_USERPREF(UIEFFECTS, &g->Theme.Effects.bUiEffects);
-	/* Save ThemeId */
-	Result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance\\New Schemes"), 0, KEY_ALL_ACCESS, &hKey);
-	if (Result == ERROR_SUCCESS)
-	{
-		lstrcpy(clText, g->ThemeTemplates[g->Theme.Id].strKeyName);
-		RegSetValueEx(hKey, TEXT("SelectedStyle"), 0, REG_SZ, (BYTE *)clText, (lstrlen(clText)+1) * sizeof (TCHAR));
-		RegCloseKey(hKey);
-	}
-}
-
-
 static INT_PTR
-AppearancePage_OnInit(HWND hwndDlg, GLOBALS *g)
+AppearancePage_OnInit(HWND hwndDlg)
 {
-	HKEY hkNewSchemes, hkScheme, hkSizes, hkSize;
-	FILETIME ftLastWriteTime;
 	TCHAR strSelectedStyle[4];
-	DWORD dwLength, dwType;
+	INT i, TemplateCount, iListIndex;
-	DWORD dwDisposition = 0;
+	HWND hwndCombo;
-	INT iStyle, iSize, iTemplateIndex, iListIndex = 0;
+	GLOBALS *g;
-	INT Result;
 
-	g = (GLOBALS*)malloc(sizeof(GLOBALS));
+	g = (GLOBALS*)LocalAlloc(LPTR, sizeof(GLOBALS));
 	if (g == NULL)
-	{
 		return FALSE;
-	}
 
 	SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)g);
 
-	LoadCurrentTheme(g);
+	LoadCurrentTheme(&g->Theme);
+	g->ThemeAdv = g->Theme;
+	g->bHasChanged = FALSE;
+	g->hBoldFont = g->hItalicFont = NULL;
+	g->hbmpColor[0] = g->hbmpColor[1] = g->hbmpColor[2] = NULL;
+	g->bInitializing = FALSE;
 
-	/* Fill color schemes combo */
+	TemplateCount = LoadThemeTemplates(strSelectedStyle);
-	Result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance\\New Schemes"),
+
-		0, KEY_READ, &hkNewSchemes);
+	hwndCombo = GetDlgItem(hwndDlg, IDC_APPEARANCE_COLORSCHEME);
-	if (Result != ERROR_SUCCESS)
+	g->ThemeId = -1;
+	g->bInitializing = TRUE;
+	for(i = 0; i < TemplateCount; i++)
 	{
-		/* Could not open the key, try to create it */
+		iListIndex = SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)g_ThemeTemplates[i].strLegacyName);
-		Result = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance\\New Schemes"), 0, NULL, 0, KEY_ALL_ACCESS, NULL,&hkNewSchemes, &dwDisposition);
+		SendMessage(hwndCombo, CB_SETITEMDATA, iListIndex, i);
-		if (Result == ERROR_SUCCESS)
+		if (lstrcmp(g_ThemeTemplates[i].strKeyName, strSelectedStyle) == 0)
 		{
-			/* FIXME: We have created it new, so let's put somethig there */
+			g->ThemeId = i;
+			SendMessage(hwndCombo, CB_SETCURSEL, (WPARAM)iListIndex, 0);
 		}
 	}
-	if (Result == ERROR_SUCCESS)
+	g->bInitializing = FALSE;
-	{
-		/* First find out the currently selected template */
-		dwLength = 8;
-		RegQueryValueEx(hkNewSchemes, TEXT("SelectedStyle"), NULL, &dwType, (LPBYTE)&strSelectedStyle, &dwLength);
-		iTemplateIndex = 0;
-		iStyle = 0;
-		dwLength = MAX_TEMPLATENAMELENTGH;
-		while((RegEnumKeyEx(hkNewSchemes, iStyle, g->ThemeTemplates[iTemplateIndex].strKeyName, &dwLength,
-			NULL, NULL, NULL, &ftLastWriteTime) == ERROR_SUCCESS) && (iTemplateIndex < MAX_TEMPLATES))
-		{
-			/* is it really a template or one of the other entries */
-			if (dwLength < 5)
-			{
-				if (RegOpenKeyEx(hkNewSchemes, g->ThemeTemplates[iTemplateIndex].strKeyName, 0, KEY_READ, &hkScheme) == ERROR_SUCCESS)
-				{
-					if(RegOpenKeyEx(hkScheme, TEXT("Sizes"), 0, KEY_READ, &hkSizes) == ERROR_SUCCESS)
-					{
-						iSize = 0;
-						dwLength = 3;
-						while((RegEnumKeyEx(hkSizes, iSize, g->ThemeTemplates[iTemplateIndex].strSizeName, &dwLength,
-							NULL, NULL, NULL, &ftLastWriteTime) == ERROR_SUCCESS) && (iSize <= 4))
-						{
-							if(RegOpenKeyEx(hkSizes, g->ThemeTemplates[iTemplateIndex].strSizeName, 0, KEY_READ, &hkSize) == ERROR_SUCCESS)
-							{
-								dwLength = MAX_TEMPLATENAMELENTGH;
-								RegQueryValueEx(hkSize, TEXT("DisplayName"), NULL, &dwType, (LPBYTE)&g->ThemeTemplates[iTemplateIndex].strDisplayName, &dwLength);
-								dwLength = MAX_TEMPLATENAMELENTGH;
-								RegQueryValueEx(hkSize, TEXT("LegacyName"), NULL, &dwType, (LPBYTE)&g->ThemeTemplates[iTemplateIndex].strLegacyName, &dwLength);
-								RegCloseKey(hkSize);
-							}
-							iListIndex = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_ADDSTRING, 0, (LPARAM)g->ThemeTemplates[iTemplateIndex].strLegacyName);
-							SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_SETITEMDATA, iListIndex, iTemplateIndex);
-							if (lstrcmp(g->ThemeTemplates[iTemplateIndex].strKeyName, strSelectedStyle) == 0)
-							{
-								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_SETCURSEL, (WPARAM)iListIndex, 0);
-							}
-							iSize++;
-							iTemplateIndex++;
-							dwLength = 3;
-						}
-						RegCloseKey(hkSizes);
-					}
-					RegCloseKey(hkScheme);
-				}
-			}
-			iStyle++;
-			dwLength = MAX_TEMPLATENAMELENTGH;
-		}
-		RegCloseKey(hkNewSchemes);
-	}
-	SendMessage(GetDlgItem(hwndDlg, IDC_APPEARANCE_COLORSCHEME), LB_SETCURSEL, 0, 0);
 
 	return FALSE;
 }
 
-
+static VOID
-static INT_PTR
 AppearancePage_OnDestroy(HWND hwndDlg, GLOBALS *g)
 {
-	free(g);
+	LocalFree(g);
-	return TRUE;
 }
 
-static void
+static INT
-UpdateSelectedThemeId(HWND hwndDlg, GLOBALS *g)
+GetSelectedThemeId(HWND hwndDlg)
 {
-	int sel;
+	HWND hwndCombo;
-	sel = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_GETCURSEL, 0, 0);
+	INT sel;
-	g->Theme.Id = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_GETITEMDATA, (WPARAM)sel, 0);
+
+	hwndCombo = GetDlgItem(hwndDlg, IDC_APPEARANCE_COLORSCHEME);
+	sel = SendMessage(hwndCombo, CB_GETCURSEL, 0, 0);
+	if (sel == CB_ERR)
+		return -1;
+	return (INT)SendMessage(hwndCombo, CB_GETITEMDATA, (WPARAM)sel, 0);
 }
 
 INT_PTR CALLBACK
@@ -504,76 +86,83 @@ AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	switch (uMsg)
 	{
 		case WM_INITDIALOG:
-			return AppearancePage_OnInit(hwndDlg, g);
+			return AppearancePage_OnInit(hwndDlg);
 
 		case WM_DESTROY:
-			return AppearancePage_OnDestroy(hwndDlg, g);
+			AppearancePage_OnDestroy(hwndDlg, g);
+			break;
 
 		case WM_COMMAND:
 			switch (LOWORD(wParam))
 			{
 				case IDC_APPEARANCE_EFFECTS:
-					DialogBoxParam(hApplet, (LPCTSTR)IDD_EFFAPPEARANCE,
+					if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_EFFAPPEARANCE),
-						hwndDlg, EffAppearanceDlgProc, (LPARAM)g);
+									   hwndDlg, EffAppearanceDlgProc, (LPARAM)g) == IDOK)
-
-					/* Was anything changed in the effects appearance dialog? */
-					if (memcmp(&g->Theme, &g->ThemeAdv, sizeof(THEME)) != 0)
 					{
 						PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
 						g->Theme = g->ThemeAdv;
-						g->Theme.bHasChanged = TRUE;
+						g->bHasChanged = TRUE;
+						g->ThemeId = -1;	/* Customized */
+						SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_SETCURSEL, (WPARAM)-1, 0);
+						SetDlgItemText(hwndDlg, IDC_APPEARANCE_COLORSCHEME, TEXT(""));
+						/* SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->Theme); */
 					}
 					break;
 
 				case IDC_APPEARANCE_ADVANCED:
-					DialogBoxParam(hApplet, (LPCTSTR)IDD_ADVAPPEARANCE,
+					if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_ADVAPPEARANCE),
-						hwndDlg, AdvAppearanceDlgProc, (LPARAM)g);
+									   hwndDlg, AdvAppearanceDlgProc, (LPARAM)g) == IDOK)
-
-					/* Was anything changed in the advanced appearance dialog? */
-					if (memcmp(&g->Theme, &g->ThemeAdv, sizeof(THEME)) != 0)
 					{
 						PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
 						g->Theme = g->ThemeAdv;
-						g->Theme.bHasChanged = TRUE;
+						g->bHasChanged = TRUE;
+						g->ThemeId = -1;	/* Customized */
+						SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_SETCURSEL, (WPARAM)-1, 0);
+						SetDlgItemText(hwndDlg, IDC_APPEARANCE_COLORSCHEME, TEXT(""));
+						/* SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->Theme); */
 					}
 					break;
 
 				case IDC_APPEARANCE_COLORSCHEME:
-					if(HIWORD(wParam) == CBN_SELCHANGE)
+					if (HIWORD(wParam) == CBN_SELCHANGE && !g->bInitializing)
 					{
+						THEME Theme;
+						INT ThemeId = GetSelectedThemeId(hwndDlg);
 						PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
-						g->Theme.bHasChanged = TRUE;
+						g->bHasChanged = TRUE;
-						UpdateSelectedThemeId(hwndDlg, g);
+						if (ThemeId != -1 && LoadThemeFromReg(&Theme, ThemeId))
-						LoadThemeFromReg(g);
+						{
-						//SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, WM_PAINT, 0, 0);
+							g->Theme = Theme;
+							g->ThemeId = ThemeId;
+							/* SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&Theme); */
+						}
 					}
 					break;
-
-				default:
-					return FALSE;
 			}
-			return TRUE;
+			break;
 
 		case WM_NOTIFY:
 			lpnm = (LPNMHDR)lParam;
 			switch (lpnm->code)
 			{
 				case PSN_APPLY:
-					if (g->Theme.bHasChanged)
+					if (g->bHasChanged)
 					{
-						UpdateSelectedThemeId(hwndDlg, g);
+						INT ThemeId = GetSelectedThemeId(hwndDlg);
-						ApplyTheme(g);
+						ApplyTheme(&g->Theme, ThemeId);
+						g->ThemeId = ThemeId;
+						SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->Theme);
+						g->bHasChanged = FALSE;
 					}
+					SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, (LONG_PTR)PSNRET_NOERROR);
 					return TRUE;
 
-				default:
+				case PSN_KILLACTIVE:
-					return FALSE;
+					SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, (LONG_PTR)FALSE);
+					return TRUE;
 			}
-			return TRUE;
+			break;
-
-		default:
-			return FALSE;
 	}
 
-	return TRUE;
+	return FALSE;
 }

dll/cpl/desk/appearance.h

@@ -1,113 +1,21 @@
-
-/* Some definitions for appearance page */
-#define SIZE_BORDER_X 0
-#define SIZE_BORDER_Y 1
-#define SIZE_CAPTION_Y 2
-#define SIZE_ICON_X 3
-#define SIZE_ICON_Y 4
-#define SIZE_ICON_SPC_X 5
-#define SIZE_ICON_SPC_Y 6
-#define SIZE_MENU_X 7
-#define SIZE_MENU_Y 8
-#define SIZE_SCROLL_X 9
-#define SIZE_SCROLL_Y 10
-#define SIZE_SMCAPTION_Y 11
-
-#define FONT_CAPTION 0
-#define FONT_SMCAPTION 1
-#define FONT_HILIGHT 2
-#define FONT_MENU 2
-#define FONT_ICON 3
-#define FONT_INFO 4
-#define FONT_DIALOG 5
-
-#define NUM_ELEMENTS 22
-#define NUM_FONTS 6
-#define NUM_SIZES 13
-#define NUM_COLORS 31
-#define MAX_TEMPLATES 50
-#define MAX_COLORNAMELENGTH 30
-#define MAX_TEMPLATENAMELENTGH 80
-
 /* Some typedefs for appearance */
 
-/* Most (but not all) fields below correspond to HKCU\Control Panel\Desktop\UserPreferencesMask */
-typedef struct
-{
-	BOOL bActiveWindowTracking;
-	BOOL bMenuAnimation;
-	BOOL bComboBoxAnimation;
-	BOOL bListBoxSmoothScrolling;
-	BOOL bGradientCaptions;
-	BOOL bKeyboardCues;
-	BOOL bActiveWndTrkZorder;
-	BOOL bHotTracking;
-	BOOL bMenuFade;
-	BOOL bSelectionFade;
-	BOOL bTooltipAnimation;
-	BOOL bTooltipFade;
-	BOOL bCursorShadow;
-	BOOL bUiEffects;
-	BOOL bFontSmoothing;
-	BOOL bDragFullWindows;
-	UINT uiFontSmoothingType;
-} EFFECTS;
-
-typedef struct
-{
-	COLORREF crColor[NUM_COLORS];
-	LOGFONT lfFont[NUM_FONTS];
-	UINT64 Size[NUM_SIZES];
-	INT Id;
-	BOOL bFlatMenus;
-	BOOL bHasChanged;
-	BOOL bIsCustom;
-	EFFECTS Effects;
-} THEME;
-
-typedef struct
-{
-	TCHAR strKeyName[4];
-	TCHAR strSizeName[4];
-	TCHAR strDisplayName[MAX_TEMPLATENAMELENTGH];
-	TCHAR strLegacyName[MAX_TEMPLATENAMELENTGH];
-	INT NumSizes;
-} THEME_PRESET;
-
-typedef struct
-{
-	int Size;
-	int Size2;
-	int Color1;
-	int Color2;
-	int Font;
-	int FontColor;
-} ASSIGNMENT;
-
 /* This is the global structure used to store the current values.
    A pointer of this get's passed to the functions either directly
    or by passing hwnd and getting the pointer by GetWindowLongPtr */
 typedef struct tagGLOBALS
 {
-	THEME_PRESET ThemeTemplates[MAX_TEMPLATES];
+	INT ThemeId;	/* Theme is customized if ThemeId == -1 */
 	THEME Theme;
 	THEME ThemeAdv;
-	INT ColorList[NUM_COLORS];
+	BOOL bHasChanged;
 	HBITMAP hbmpColor[3];
 	INT CurrentElement;
-	COLORREF crCOLOR_BTNFACE;
-	COLORREF crCOLOR_BTNSHADOW;
-	COLORREF crCOLOR_BTNTEXT;
-	COLORREF crCOLOR_BTNHIGHLIGHT;
 	HFONT hBoldFont;
 	HFONT hItalicFont;
+    BOOL bInitializing;
 } GLOBALS;
 
-
-extern const ASSIGNMENT g_Assignment[NUM_ELEMENTS];
-extern const TCHAR g_RegColorNames[NUM_COLORS][MAX_COLORNAMELENGTH];
-extern const INT g_SizeMetric[NUM_SIZES];
-
 /* prototypes for appearance.c */
 INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 

dll/cpl/desk/desk.rbuild

@@ -31,4 +31,6 @@
 	<file>monslctl.c</file>
 	<file>general.c</file>
 	<file>desk.rc</file>
+	<file>draw.c</file>
+	<file>theme.c</file>
 </module>

dll/cpl/desk/draw.c

@@ -0,0 +1,423 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS Display Control Panel
+ * FILE:            lib/cpl/desk/draw.c
+ * PURPOSE:         Providing drawing functions
+ *
+ * PROGRAMMERS:     Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
+ */
+
+/* #define NTOS_MODE_USER */
+/* #define WIN32_NO_STATUS */
+#include "desk.h"
+#include "theme.h"
+#include "draw.h"
+/* #include <ndk/ntndk.h> */
+/* #include <win32k/ntuser.h> */
+
+/******************************************************************************/
+
+static const signed char LTInnerNormal[] = {
+    -1,        -1,                  -1,                 -1,
+    -1,        COLOR_BTNHIGHLIGHT,  COLOR_BTNHIGHLIGHT, -1,
+    -1,        COLOR_3DDKSHADOW,    COLOR_3DDKSHADOW,   -1,
+    -1,        -1,                  -1,                 -1
+};
+
+static const signed char LTOuterNormal[] = {
+    -1,                 COLOR_3DLIGHT,   COLOR_BTNSHADOW, -1,
+    COLOR_BTNHIGHLIGHT, COLOR_3DLIGHT,   COLOR_BTNSHADOW, -1,
+    COLOR_3DDKSHADOW,   COLOR_3DLIGHT,   COLOR_BTNSHADOW, -1,
+    -1,                 COLOR_3DLIGHT,   COLOR_BTNSHADOW, -1
+};
+
+static const signed char RBInnerNormal[] = {
+    -1,        -1,              -1,                 -1,
+    -1,        COLOR_BTNSHADOW, COLOR_BTNSHADOW,    -1,
+    -1,        COLOR_3DLIGHT,   COLOR_3DLIGHT,      -1,
+    -1,        -1,              -1,                 -1
+};
+
+static const signed char RBOuterNormal[] = {
+    -1,                 COLOR_3DDKSHADOW,  COLOR_BTNHIGHLIGHT, -1,
+    COLOR_BTNSHADOW,    COLOR_3DDKSHADOW,  COLOR_BTNHIGHLIGHT, -1,
+    COLOR_3DLIGHT,      COLOR_3DDKSHADOW,  COLOR_BTNHIGHLIGHT, -1,
+    -1,                 COLOR_3DDKSHADOW,  COLOR_BTNHIGHLIGHT, -1
+};
+
+static BOOL
+MyIntDrawRectEdge(HDC hdc, LPRECT rc, UINT uType, UINT uFlags, THEME *theme)
+{
+	signed char LTInnerI, LTOuterI;
+	signed char RBInnerI, RBOuterI;
+	HPEN LTInnerPen, LTOuterPen;
+	HPEN RBInnerPen, RBOuterPen;
+	RECT InnerRect = *rc;
+	POINT SavePoint;
+	HPEN SavePen;
+	int LBpenplus = 0;
+	int LTpenplus = 0;
+	int RTpenplus = 0;
+	int RBpenplus = 0;
+	/* Init some vars */
+	LTInnerPen = LTOuterPen = RBInnerPen = RBOuterPen = (HPEN)GetStockObject(NULL_PEN);
+	SavePen = (HPEN)SelectObject(hdc, LTInnerPen);
+
+	/* Determine the colors of the edges */
+	LTInnerI = LTInnerNormal[uType & (BDR_INNER|BDR_OUTER)];
+	LTOuterI = LTOuterNormal[uType & (BDR_INNER|BDR_OUTER)];
+	RBInnerI = RBInnerNormal[uType & (BDR_INNER|BDR_OUTER)];
+	RBOuterI = RBOuterNormal[uType & (BDR_INNER|BDR_OUTER)];
+
+	if((uFlags & BF_BOTTOMLEFT) == BF_BOTTOMLEFT)
+		LBpenplus = 1;
+	if((uFlags & BF_TOPRIGHT) == BF_TOPRIGHT)
+		RTpenplus = 1;
+	if((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT)
+		RBpenplus = 1;
+	if((uFlags & BF_TOPLEFT) == BF_TOPLEFT)
+		LTpenplus = 1;
+
+	if(LTInnerI != -1)
+		LTInnerPen = GetStockObject(DC_PEN);
+	if(LTOuterI != -1)
+		LTOuterPen = GetStockObject(DC_PEN);
+	if(RBInnerI != -1)
+		RBInnerPen = GetStockObject(DC_PEN);
+	if(RBOuterI != -1)
+		RBOuterPen = GetStockObject(DC_PEN);
+	{
+		HBRUSH hbr;
+		hbr = CreateSolidBrush(theme->crColor[COLOR_BTNFACE]);
+		FillRect(hdc, &InnerRect, hbr);
+		DeleteObject(hbr);
+	}
+	MoveToEx(hdc, 0, 0, &SavePoint);
+
+	/* Draw the outer edge */
+	SelectObject(hdc, LTOuterPen);
+	SetDCPenColor(hdc, theme->crColor[LTOuterI]);
+	if(uFlags & BF_TOP)
+	{
+		MoveToEx(hdc, InnerRect.left, InnerRect.top, NULL);
+		LineTo(hdc, InnerRect.right, InnerRect.top);
+	}
+	if(uFlags & BF_LEFT)
+	{
+		MoveToEx(hdc, InnerRect.left, InnerRect.top, NULL);
+		LineTo(hdc, InnerRect.left, InnerRect.bottom);
+	}
+	SelectObject(hdc, RBOuterPen);
+	SetDCPenColor(hdc, theme->crColor[RBOuterI]);
+	if(uFlags & BF_BOTTOM)
+	{
+		MoveToEx(hdc, InnerRect.left, InnerRect.bottom-1, NULL);
+		LineTo(hdc, InnerRect.right, InnerRect.bottom-1);
+	}
+	if(uFlags & BF_RIGHT)
+	{
+		MoveToEx(hdc, InnerRect.right-1, InnerRect.top, NULL);
+		LineTo(hdc, InnerRect.right-1, InnerRect.bottom);
+	}
+
+	/* Draw the inner edge */
+	SelectObject(hdc, LTInnerPen);
+	SetDCPenColor(hdc, theme->crColor[LTInnerI]);
+	if(uFlags & BF_TOP)
+	{
+		MoveToEx(hdc, InnerRect.left+LTpenplus, InnerRect.top+1, NULL);
+		LineTo(hdc, InnerRect.right-RTpenplus, InnerRect.top+1);
+	}
+	if(uFlags & BF_LEFT)
+	{
+		MoveToEx(hdc, InnerRect.left+1, InnerRect.top+LTpenplus, NULL);
+		LineTo(hdc, InnerRect.left+1, InnerRect.bottom-LBpenplus);
+	}
+	SelectObject(hdc, RBInnerPen);
+	SetDCPenColor(hdc, theme->crColor[RBInnerI]);
+	if(uFlags & BF_BOTTOM)
+	{
+		MoveToEx(hdc, InnerRect.left+LBpenplus, InnerRect.bottom-2, NULL);
+		LineTo(hdc, InnerRect.right-RBpenplus, InnerRect.bottom-2);
+	}
+	if(uFlags & BF_RIGHT)
+	{
+		MoveToEx(hdc, InnerRect.right-2, InnerRect.top+RTpenplus, NULL);
+		LineTo(hdc, InnerRect.right-2, InnerRect.bottom-RBpenplus);
+	}
+
+	/* Cleanup */
+	SelectObject(hdc, SavePen);
+	MoveToEx(hdc, SavePoint.x, SavePoint.y, NULL);
+	return TRUE;
+}
+
+static BOOL
+MyDrawFrameButton(HDC hdc, LPRECT rc, UINT uState, THEME *theme)
+{
+	UINT edge;
+	if(uState & (DFCS_PUSHED | DFCS_CHECKED | DFCS_FLAT))
+		edge = EDGE_SUNKEN;
+	else
+		edge = EDGE_RAISED;
+	return MyIntDrawRectEdge(hdc, rc, edge, (uState & DFCS_FLAT) | BF_RECT | BF_SOFT, theme);
+}
+
+static int
+MyMakeSquareRect(LPRECT src, LPRECT dst)
+{
+	int Width  = src->right - src->left;
+	int Height = src->bottom - src->top;
+	int SmallDiam = Width > Height ? Height : Width;
+
+	*dst = *src;
+
+	/* Make it a square box */
+	if (Width < Height)	  /* SmallDiam == Width */
+	{
+		dst->top += (Height-Width)/2;
+		dst->bottom = dst->top + SmallDiam;
+	}
+	else if(Width > Height) /* SmallDiam == Height */
+	{
+		dst->left += (Width-Height)/2;
+		dst->right = dst->left + SmallDiam;
+	}
+
+	return SmallDiam;
+}
+
+static BOOL
+MyDrawFrameCaption(HDC dc, LPRECT r, UINT uFlags, THEME *theme)
+{
+	LOGFONT lf;
+	HFONT hFont, hOldFont;
+	COLORREF clrsave;
+	RECT myr;
+	INT bkmode;
+	TCHAR Symbol;
+	switch(uFlags & 0xff)
+	{
+	case DFCS_CAPTIONCLOSE:
+		Symbol = 'r';
+		break;
+	case DFCS_CAPTIONHELP:
+		Symbol = 's';
+		break;
+	case DFCS_CAPTIONMIN:
+		Symbol = '0';
+		break;
+	case DFCS_CAPTIONMAX:
+		Symbol = '1';
+		break;
+	case DFCS_CAPTIONRESTORE:
+		Symbol = '2';
+		break;
+	}
+	MyIntDrawRectEdge(dc, r, (uFlags & DFCS_PUSHED) ? EDGE_SUNKEN : EDGE_RAISED, BF_RECT | BF_MIDDLE | BF_SOFT, theme);
+	ZeroMemory(&lf, sizeof(LOGFONT));
+	MyMakeSquareRect(r, &myr);
+	myr.left += 1;
+	myr.top += 1;
+	myr.right -= 1;
+	myr.bottom -= 1;
+	if(uFlags & DFCS_PUSHED)
+	   OffsetRect(&myr,1,1);
+	lf.lfHeight = myr.bottom - myr.top;
+	lf.lfWidth = 0;
+	lf.lfWeight = FW_NORMAL;
+	lf.lfCharSet = DEFAULT_CHARSET;
+	lstrcpy(lf.lfFaceName, TEXT("Marlett"));
+	hFont = CreateFontIndirect(&lf);
+	/* save font and text color */
+	hOldFont = SelectObject(dc, hFont);
+	clrsave = GetTextColor(dc);
+	bkmode = GetBkMode(dc);
+	/* set color and drawing mode */
+	SetBkMode(dc, TRANSPARENT);
+	if(uFlags & DFCS_INACTIVE)
+	{
+		/* draw shadow */
+		SetTextColor(dc, theme->crColor[COLOR_BTNHIGHLIGHT]);
+		TextOut(dc, myr.left + 1, myr.top + 1, &Symbol, 1);
+	}
+	SetTextColor(dc, theme->crColor[(uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT]);
+	/* draw selected symbol */
+	TextOut(dc, myr.left, myr.top, &Symbol, 1);
+	/* restore previous settings */
+	SetTextColor(dc, clrsave);
+	SelectObject(dc, hOldFont);
+	SetBkMode(dc, bkmode);
+	DeleteObject(hFont);
+	return TRUE;
+}
+
+/******************************************************************************/
+
+static BOOL
+MyDrawFrameScroll(HDC dc, LPRECT r, UINT uFlags, THEME *theme)
+{
+	LOGFONT lf;
+	HFONT hFont, hOldFont;
+	COLORREF clrsave;
+	RECT myr;
+	INT bkmode;
+	TCHAR Symbol;
+	switch(uFlags & 0xff)
+	{
+	case DFCS_SCROLLCOMBOBOX:
+	case DFCS_SCROLLDOWN:
+		Symbol = '6';
+		break;
+
+	case DFCS_SCROLLUP:
+		Symbol = '5';
+		break;
+
+	case DFCS_SCROLLLEFT:
+		Symbol = '3';
+		break;
+
+	case DFCS_SCROLLRIGHT:
+		Symbol = '4';
+		break;
+	}
+	MyIntDrawRectEdge(dc, r, (uFlags & DFCS_PUSHED) ? EDGE_SUNKEN : EDGE_RAISED, (uFlags&DFCS_FLAT) | BF_MIDDLE | BF_RECT, theme);
+	ZeroMemory(&lf, sizeof(LOGFONT));
+	MyMakeSquareRect(r, &myr);
+	myr.left += 1;
+	myr.top += 1;
+	myr.right -= 1;
+	myr.bottom -= 1;
+	if(uFlags & DFCS_PUSHED)
+	   OffsetRect(&myr,1,1);
+	lf.lfHeight = myr.bottom - myr.top;
+	lf.lfWidth = 0;
+	lf.lfWeight = FW_NORMAL;
+	lf.lfCharSet = DEFAULT_CHARSET;
+	lstrcpy(lf.lfFaceName, TEXT("Marlett"));
+	hFont = CreateFontIndirect(&lf);
+	/* save font and text color */
+	hOldFont = SelectObject(dc, hFont);
+	clrsave = GetTextColor(dc);
+	bkmode = GetBkMode(dc);
+	/* set color and drawing mode */
+	SetBkMode(dc, TRANSPARENT);
+	if(uFlags & DFCS_INACTIVE)
+	{
+		/* draw shadow */
+		SetTextColor(dc, theme->crColor[COLOR_BTNHIGHLIGHT]);
+		TextOut(dc, myr.left + 1, myr.top + 1, &Symbol, 1);
+	}
+	SetTextColor(dc, theme->crColor[(uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT]);
+	/* draw selected symbol */
+	TextOut(dc, myr.left, myr.top, &Symbol, 1);
+	/* restore previous settings */
+	SetTextColor(dc, clrsave);
+	SelectObject(dc, hOldFont);
+	SetBkMode(dc, bkmode);
+	DeleteObject(hFont);
+	return TRUE;
+}
+
+BOOL
+MyDrawFrameControl(HDC hDC, LPRECT rc, UINT uType, UINT uState, THEME *theme)
+{
+	switch(uType)
+	{
+	case DFC_BUTTON:
+		return MyDrawFrameButton(hDC, rc, uState, theme);
+	case DFC_CAPTION:
+		return MyDrawFrameCaption(hDC, rc, uState, theme);
+	case DFC_SCROLL:
+		return MyDrawFrameScroll(hDC, rc, uState, theme);
+	}
+	return FALSE;
+}
+
+BOOL
+MyDrawEdge(HDC hDC, LPRECT rc, UINT edge, UINT flags, THEME *theme)
+{
+	return MyIntDrawRectEdge(hDC, rc, edge, flags, theme);
+}
+
+VOID
+MyDrawCaptionButtons(HDC hdc, LPRECT lpRect, BOOL bMinMax, int x, THEME *theme)
+{
+	RECT rc3;
+	RECT rc4;
+	RECT rc5;
+
+	rc3.left = lpRect->right - 2 - x;
+	rc3.top = lpRect->top + 2;
+	rc3.right = lpRect->right - 2;
+	rc3.bottom = lpRect->bottom - 2;
+
+	MyDrawFrameControl(hdc, &rc3, DFC_CAPTION, DFCS_CAPTIONCLOSE, theme);
+
+	if (bMinMax)
+	{
+		rc4.left = rc3.left - x - 2;
+		rc4.top = rc3.top;
+		rc4.right = rc3.right - x - 2;
+		rc4.bottom = rc3.bottom;
+
+		MyDrawFrameControl(hdc, &rc4, DFC_CAPTION, DFCS_CAPTIONMAX, theme);
+
+		rc5.left = rc4.left - x;
+		rc5.top = rc4.top;
+		rc5.right = rc4.right - x;
+		rc5.bottom = rc4.bottom;
+
+		MyDrawFrameControl(hdc, &rc5, DFC_CAPTION, DFCS_CAPTIONMIN, theme);
+	}
+}
+
+VOID
+MyDrawScrollbar(HDC hdc, LPRECT rc, HBRUSH hbrScrollbar, THEME *theme)
+{
+	RECT rcTop;
+	RECT rcBottom;
+	RECT rcMiddle;
+	int width;
+
+	width = rc->right - rc->left;
+
+	rcTop.left = rc->left;
+	rcTop.right = rc->right;
+	rcTop.top = rc->top;
+	rcTop.bottom = rc->top + width;
+
+	rcMiddle.left = rc->left;
+	rcMiddle.right = rc->right;
+	rcMiddle.top = rc->top + width;
+	rcMiddle.bottom = rc->bottom - width;
+
+	rcBottom.left = rc->left;
+	rcBottom.right = rc->right;
+	rcBottom.top = rc->bottom - width;
+	rcBottom.bottom = rc->bottom;
+
+	MyDrawFrameControl(hdc, &rcTop, DFC_SCROLL, DFCS_SCROLLUP, theme);
+	MyDrawFrameControl(hdc, &rcBottom, DFC_SCROLL, DFCS_SCROLLDOWN, theme);
+
+	FillRect(hdc, &rcMiddle, hbrScrollbar);
+}
+
+/******************************************************************************/
+
+BOOL
+MyDrawCaptionTemp(HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, HICON hIcon, LPCWSTR str, UINT uFlags, THEME *theme)
+{
+	/* FIXME */
+	return DrawCaptionTemp(hwnd, hdc, rect, hFont, hIcon, str, uFlags);
+}
+
+/******************************************************************************/
+
+DWORD
+MyDrawMenuBarTemp(HWND Wnd, HDC DC, LPRECT Rect, HMENU Menu, HFONT Font, THEME *theme)
+{
+	/* FIXME */
+	return DrawMenuBarTemp(Wnd, DC, Rect, Menu, Font);
+}

dll/cpl/desk/draw.h

@@ -0,0 +1,12 @@
+BOOL
+MyDrawFrameControl(HDC hDC, LPRECT rc, UINT uType, UINT uState, THEME *theme);
+BOOL
+MyDrawEdge(HDC hDC, LPRECT rc, UINT edge, UINT flags, THEME *theme);
+VOID
+MyDrawCaptionButtons(HDC hdc, LPRECT lpRect, BOOL bMinMax, int x, THEME *theme);
+VOID
+MyDrawScrollbar(HDC hdc, LPRECT rc, HBRUSH hbrScrollbar, THEME *theme);
+BOOL
+MyDrawCaptionTemp(HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, HICON hIcon, LPCWSTR str, UINT uFlags, THEME *theme);
+DWORD
+MyDrawMenuBarTemp(HWND Wnd, HDC DC, LPRECT Rect, HMENU Menu, HFONT Font, THEME *theme);

dll/cpl/desk/effappdlg.c

@@ -4,11 +4,12 @@
  * FILE:            dll/cpl/desk/effappdlg.c
  * PURPOSE:         Effects appearance dialog
  *
- * PROGRAMMER:     Jan Roeloffzen (jroeloffzen[at]hotmail[dot]com)
+ * PROGRAMMER:      Jan Roeloffzen (jroeloffzen[at]hotmail[dot]com)
  *
  */
 
 #include "desk.h"
+#include "theme.h"
 #include "appearance.h"
 
 /* Update all the controls with the current values for the selected screen element */

dll/cpl/desk/lang/uk-UA.rc

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        dll/cpl/desk/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for Display Control Panel Applet
- * TRANSLATOR:  Artem Reznikov, Sakara Yevhen 
+ * TRANSLATOR:  Artem Reznikov, Sakara Yevhen, Igor Paliychuk 
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -22,7 +22,7 @@ BEGIN
                     IDC_STATIC, 8, 103, 180, 9
     PUSHBUTTON      "&Îãëÿä...", IDC_BROWSE_BUTTON, 188, 114, 50, 15
     PUSHBUTTON      "&Êîë³ð...", IDC_COLOR_BUTTON, 188, 177, 50, 15
-    LTEXT           "Ðîçòàøóâàííÿ:", IDC_STATIC, 188, 138, 36, 9
+    LTEXT           "Ðîçòàøóâàííÿ:", IDC_STATIC, 188, 138, 51, 9
     COMBOBOX        IDC_PLACEMENT_COMBO, 188, 149, 50, 54,
                     CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
@@ -38,12 +38,12 @@ BEGIN
     COMBOBOX        IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Ï&àðàìåòðè",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP
     PUSHBUTTON      "&Ïåðåãëÿä",IDC_SCREENS_TESTSC, 175, 103, 50, 13
-    LTEXT           "&²íòåðâàë",IDC_WAITTEXT, 14, 125, 16, 9
+    LTEXT           "&²íòåðâàë",IDC_WAITTEXT, 14, 125, 30, 9
-    EDITTEXT        IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP
+    EDITTEXT        IDC_SCREENS_TIMEDELAY, 48, 123, 32, 13, ES_RIGHT | WS_GROUP
     CONTROL         "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 54, 123, 12, 13
-    LTEXT           "õâ", IDC_MINTEXT, 70, 125, 26, 9
+    LTEXT           "õâ", IDC_MINTEXT, 84, 125, 26, 9
     CONTROL         "Çà&õèñò ïàðîëåì",IDC_SCREENS_USEPASSCHK,"button",
                     BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19
     GROUPBOX        "&Åíåðãîçáåðåæåííÿ", IDC_SCREENS_DUMMY2, 6, 155, 232, 41
@@ -132,15 +132,15 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ïàðàìåòðè"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "Ðîçòàøóéòå çíà÷êè ìîí³òîð³â â³äïîâ³äíî äî ôàêòè÷íîãî ðîçòàøóâàííÿ ìîí³òîð³â.",-1,3,3,240,10
+    LTEXT           "Ðîçòàøóéòå çíà÷êè ìîí³òîð³â â³äïîâ³äíî äî ôàêòè÷íîãî ðîçòàøóâàííÿ ìîí³òîð³â.",-1,3,1,240,16
     CONTROL         "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE
     LTEXT           "&Äèñïëåé:",1820,3,100,30,8
     LTEXT           "<íåìàº>",IDC_SETTINGS_DEVICE,9,109,224,8
     GROUPBOX        "&Îáëàñòü åêðàíó",1818,3,120,115,43
     CONTROL         "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,
                     30,130,58,17
-    LTEXT           "Ìåíøå",1815,9,130,15,8,NOT WS_GROUP
+    LTEXT           "Ìåíøå",1815,6,130,24,8,NOT WS_GROUP
-    LTEXT           "Á³ëüøå",1816,93,130,21,8,NOT WS_GROUP
+    LTEXT           "Á³ëüøå",1816,90,130,24,8,NOT WS_GROUP
     LTEXT           "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10, NOT WS_GROUP | SS_CENTER
     GROUPBOX        "&ßê³ñòü êîëüîðîïåðåäà÷³",1817,125,120,115,43
     COMBOBOX        IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL |

dll/cpl/desk/preview.c

@@ -7,7 +7,9 @@
  */
 
 #include "desk.h"
+#include "theme.h"
 #include "preview.h"
+#include "draw.h"
 
 static const TCHAR szPreviewWndClass[] = TEXT("PreviewWndClass");
 
@@ -15,7 +17,7 @@ typedef struct _PREVIEW_DATA
 {
     HWND hwndParent;
 
-    DWORD clrSysColor[COLOR_MENUBAR];
+    THEME Theme;
 
     HBRUSH hbrScrollbar;
     HBRUSH hbrDesktop;
@@ -58,10 +60,6 @@ typedef struct _PREVIEW_DATA
     LPTSTR lpMessText;
     LPTSTR lpButText;
 
-    LOGFONT lfCaptionFont;
-    LOGFONT lfMenuFont;
-    LOGFONT lfMessageFont;
-
     HFONT hCaptionFont;
     HFONT hMenuFont;
     HFONT hMessageFont;
@@ -71,109 +69,48 @@ typedef struct _PREVIEW_DATA
 } PREVIEW_DATA, *PPREVIEW_DATA;
 
 
-
+static VOID UpdatePreviewTheme(HWND hwnd, PPREVIEW_DATA pPreviewData, THEME *theme)
-static VOID
-DrawCaptionButtons(HDC hdc, LPRECT lpRect, BOOL bMinMax, int x)
 {
-    RECT rc3;
+    if (pPreviewData->hbrScrollbar != NULL)
-    RECT rc4;
+        DeleteObject(pPreviewData->hbrScrollbar);
-    RECT rc5;
+    pPreviewData->hbrScrollbar = CreateSolidBrush(theme->crColor[COLOR_SCROLLBAR]);
+    if (pPreviewData->hbrDesktop != NULL)
+        DeleteObject(pPreviewData->hbrDesktop);
+    pPreviewData->hbrDesktop = CreateSolidBrush(theme->crColor[COLOR_DESKTOP]);
+    if (pPreviewData->hbrWindow != NULL)
+        DeleteObject(pPreviewData->hbrWindow);
+    pPreviewData->hbrWindow = CreateSolidBrush(theme->crColor[COLOR_WINDOW]);
 
-    rc3.left = lpRect->right - 2 - x;
+    pPreviewData->cxEdge = theme->Size[SIZE_EDGE_X] - 2;        /* SM_CXEDGE */
-    rc3.top = lpRect->top + 2;
+    pPreviewData->cyEdge = theme->Size[SIZE_EDGE_Y] - 2;        /* SM_CYEDGE */
-    rc3.right = lpRect->right - 2;
-    rc3.bottom = lpRect->bottom - 2;
 
-    DrawFrameControl(hdc, &rc3, DFC_CAPTION, DFCS_CAPTIONCLOSE);
+    pPreviewData->cySizeFrame = theme->Size[SIZE_FRAME_Y] - 1;  /* SM_CYSIZEFRAME */
 
-    if (bMinMax)
+    pPreviewData->cyCaption = theme->Size[SIZE_CAPTION_Y];      /* SM_CYCAPTION */
-    {
+    pPreviewData->cyMenu = theme->Size[SIZE_MENU_Y];            /* SM_CYMENU */
-        rc4.left = rc3.left - x - 2;
+    pPreviewData->cxScrollbar = theme->Size[SIZE_SCROLL_X];     /* SM_CXVSCROLL */
-        rc4.top = rc3.top;
+    pPreviewData->cyBorder = theme->Size[SIZE_BORDER_Y];        /* SM_CYBORDER */
-        rc4.right = rc3.right - x - 2;
-        rc4.bottom = rc3.bottom;
 
-        DrawFrameControl(hdc, &rc4, DFC_CAPTION, DFCS_CAPTIONMAX);
+    if (pPreviewData->hCaptionFont != NULL)
+        DeleteObject(pPreviewData->hCaptionFont);
+    pPreviewData->hCaptionFont = CreateFontIndirect(&theme->lfFont[FONT_CAPTION]);
 
-        rc5.left = rc4.left - x;
+    if (pPreviewData->hMenuFont != NULL)
-        rc5.top = rc4.top;
+        DeleteObject(pPreviewData->hMenuFont);
-        rc5.right = rc4.right - x;
+    pPreviewData->hMenuFont = CreateFontIndirect(&theme->lfFont[FONT_MENU]);
-        rc5.bottom = rc4.bottom;
 
-        DrawFrameControl(hdc, &rc5, DFC_CAPTION, DFCS_CAPTIONMIN);
+    if (pPreviewData->hMessageFont != NULL)
-    }
+        DeleteObject(pPreviewData->hMessageFont);
+    pPreviewData->hMessageFont = CreateFontIndirect(&theme->lfFont[FONT_DIALOG]);
+
+    pPreviewData->Theme = *theme;
+    InvalidateRect(hwnd, NULL, FALSE);
 }
 
-
-static VOID
-DrawScrollbar(HDC hdc, LPRECT rc, HBRUSH hbrScrollbar)
-{
-    RECT rcTop;
-    RECT rcBottom;
-    RECT rcMiddle;
-    int width;
-
-    width = rc->right - rc->left;
-
-    rcTop.left = rc->left;
-    rcTop.right = rc->right;
-    rcTop.top = rc->top;
-    rcTop.bottom = rc->top + width;
-
-    rcMiddle.left = rc->left;
-    rcMiddle.right = rc->right;
-    rcMiddle.top = rc->top + width;
-    rcMiddle.bottom = rc->bottom - width;
-
-    rcBottom.left = rc->left;
-    rcBottom.right = rc->right;
-    rcBottom.top = rc->bottom - width;
-    rcBottom.bottom = rc->bottom;
-
-    DrawFrameControl(hdc, &rcTop, DFC_SCROLL, DFCS_SCROLLUP);
-    DrawFrameControl(hdc, &rcBottom, DFC_SCROLL, DFCS_SCROLLDOWN);
-
-    FillRect(hdc, &rcMiddle, hbrScrollbar);
-}
-
-
 static VOID
 OnCreate(HWND hwnd, PPREVIEW_DATA pPreviewData)
 {
-    NONCLIENTMETRICS NonClientMetrics;
+    THEME *theme;
-    INT i;
-
-    for (i = 0; i < COLOR_MENUBAR + 1; i++)
-    {
-        pPreviewData->clrSysColor[i] = GetSysColor(i);
-    }
-
-    pPreviewData->hbrScrollbar = CreateSolidBrush(pPreviewData->clrSysColor[COLOR_SCROLLBAR]);
-    pPreviewData->hbrDesktop = CreateSolidBrush(pPreviewData->clrSysColor[COLOR_DESKTOP]);
-    pPreviewData->hbrWindow = CreateSolidBrush(pPreviewData->clrSysColor[COLOR_WINDOW]);
-
-    pPreviewData->cxEdge = GetSystemMetrics(SM_CXEDGE) - 2;
-    pPreviewData->cyEdge = GetSystemMetrics(SM_CXEDGE) - 2;
-
-    pPreviewData->cySizeFrame = GetSystemMetrics(SM_CYSIZEFRAME) - 1;
-
-    pPreviewData->cyCaption = GetSystemMetrics(SM_CYCAPTION);
-    pPreviewData->cyMenu = GetSystemMetrics(SM_CYMENU);
-    pPreviewData->cxScrollbar = GetSystemMetrics(SM_CXVSCROLL);
-    pPreviewData->cyBorder = GetSystemMetrics(SM_CYBORDER);
-
-    /* load font info */
-    NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS);
-    SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0);
-
-    pPreviewData->lfCaptionFont = NonClientMetrics.lfCaptionFont;
-    pPreviewData->hCaptionFont = CreateFontIndirect(&pPreviewData->lfCaptionFont);
-
-    pPreviewData->lfMenuFont = NonClientMetrics.lfMenuFont;
-    pPreviewData->hMenuFont = CreateFontIndirect(&pPreviewData->lfMenuFont);
-
-    pPreviewData->lfMessageFont = NonClientMetrics.lfMessageFont;
-    pPreviewData->hMessageFont = CreateFontIndirect(&pPreviewData->lfMessageFont);
 
     /* Load and modify the menu */
     pPreviewData->hMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDR_PREVIEW_MENU));
@@ -191,6 +128,11 @@ OnCreate(HWND hwnd, PPREVIEW_DATA pPreviewData)
     AllocAndLoadString(&pPreviewData->lpMessBox, hApplet, IDS_MESSBOX);
     AllocAndLoadString(&pPreviewData->lpMessText, hApplet, IDS_MESSTEXT);
     AllocAndLoadString(&pPreviewData->lpButText, hApplet, IDS_BUTTEXT);
+
+    theme = &pPreviewData->Theme;
+    LoadCurrentTheme(theme);
+
+    UpdatePreviewTheme(hwnd, pPreviewData, theme);
 }
 
 
@@ -302,21 +244,6 @@ OnSize(INT cx, INT cy, PPREVIEW_DATA pPreviewData)
     CalculateItemSize(pPreviewData);
 }
 
-#ifdef _MSC_VER
-
-#if _UNICODE
-typedef BOOL (WINAPI * DCT_PROC)(HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, HICON hIcon, LPCWSTR str, UINT uFlags);
-#define DCT_ORD 178
-#else
-typedef BOOL (WINAPI * DCT_PROC)(HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, HICON hIcon, LPCSTR str, UINT uFlags);
-#define DCT_ORD 177
-#endif
-
-typedef DWORD (WINAPI * DMBT_PROC)(HWND hwnd, HDC hDC, LPRECT lprect, HMENU hMenu, HFONT hFont);
-#define DMBT_ORD 186
-
-#endif
-
 static VOID
 OnPaint(HWND hwnd, PPREVIEW_DATA pPreviewData)
 {
@@ -324,19 +251,9 @@ OnPaint(HWND hwnd, PPREVIEW_DATA pPreviewData)
     HFONT hOldFont;
     HDC hdc;
     RECT rc;
+    THEME *theme;
 
-#ifdef _MSC_VER
+    theme = &pPreviewData->Theme;
-    DCT_PROC DrawCaptionTemp;
-    DMBT_PROC DrawMenuBarTemp;
-    HMODULE hUser32;
-
-    hUser32 = LoadLibrary(_T("user32.dll"));
-    if(hUser32 == NULL)
-        return;
-
-    DrawCaptionTemp = (DCT_PROC)GetProcAddress(hUser32, (LPCSTR)DCT_ORD);
-    DrawMenuBarTemp = (DMBT_PROC)GetProcAddress(hUser32, (LPCSTR)DMBT_ORD);
-#endif
 
     hdc = BeginPaint(hwnd, &ps);
 
@@ -344,47 +261,47 @@ OnPaint(HWND hwnd, PPREVIEW_DATA pPreviewData)
     FillRect(hdc, &pPreviewData->rcDesktop, pPreviewData->hbrDesktop);
 
     /* Inactive Window */
-    DrawEdge(hdc, &pPreviewData->rcInactiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE);
+    MyDrawEdge(hdc, &pPreviewData->rcInactiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE, theme);
-    SetTextColor(hdc, pPreviewData->clrSysColor[COLOR_INACTIVECAPTIONTEXT]);
+    SetTextColor(hdc, theme->crColor[COLOR_INACTIVECAPTIONTEXT]);
     DrawCaptionTemp(NULL, hdc, &pPreviewData->rcInactiveCaption,  pPreviewData->hCaptionFont,
                     NULL, pPreviewData->lpInAct, DC_GRADIENT | DC_ICON | DC_TEXT);
-    DrawCaptionButtons(hdc, &pPreviewData->rcInactiveCaption, TRUE, pPreviewData->cyCaption - 2);
+    MyDrawCaptionButtons(hdc, &pPreviewData->rcInactiveCaption, TRUE, pPreviewData->cyCaption - 2, theme);
 
     /* Active Window */
-    DrawEdge(hdc, &pPreviewData->rcActiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE);
+    MyDrawEdge(hdc, &pPreviewData->rcActiveFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE, theme);
-    SetTextColor(hdc, pPreviewData->clrSysColor[COLOR_CAPTIONTEXT]);
+    SetTextColor(hdc, theme->crColor[COLOR_CAPTIONTEXT]);
-    DrawCaptionTemp(NULL, hdc, &pPreviewData->rcActiveCaption, pPreviewData->hCaptionFont,
+    MyDrawCaptionTemp(NULL, hdc, &pPreviewData->rcActiveCaption, pPreviewData->hCaptionFont,
-                    NULL, pPreviewData->lpAct, DC_ACTIVE | DC_GRADIENT | DC_ICON | DC_TEXT);
+                      NULL, pPreviewData->lpAct, DC_ACTIVE | DC_GRADIENT | DC_ICON | DC_TEXT, theme);
-    DrawCaptionButtons(hdc, &pPreviewData->rcActiveCaption, TRUE, pPreviewData->cyCaption - 2);
+    MyDrawCaptionButtons(hdc, &pPreviewData->rcActiveCaption, TRUE, pPreviewData->cyCaption - 2, theme);
 
     /* Draw the menu bar */
-    DrawMenuBarTemp(hwnd, hdc, &pPreviewData->rcActiveMenuBar,
+    MyDrawMenuBarTemp(hwnd, hdc, &pPreviewData->rcActiveMenuBar,
-                    pPreviewData->hMenu,
+                      pPreviewData->hMenu,
-                    pPreviewData->hMenuFont);
+                      pPreviewData->hMenuFont, theme);
 
     /* Draw the client area */
     CopyRect(&rc, &pPreviewData->rcActiveClient);
-    DrawEdge(hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
+    MyDrawEdge(hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_ADJUST, theme);
     FillRect(hdc, &rc, pPreviewData->hbrWindow);
 
     /* Draw the client text */
     CopyRect(&rc, &pPreviewData->rcActiveClient);
     rc.left += 4;
     rc.top += 2;
-    SetTextColor(hdc, pPreviewData->clrSysColor[COLOR_WINDOWTEXT]);
+    SetTextColor(hdc, theme->crColor[COLOR_WINDOWTEXT]);
-    hOldFont = SelectObject(hdc, pPreviewData->hCaptionFont);
+    hOldFont = SelectObject(hdc, pPreviewData->hCaptionFont);   /* FIXME: client text is not caption text */
     DrawText(hdc, pPreviewData->lpWinTxt, lstrlen(pPreviewData->lpWinTxt), &rc, DT_LEFT);
     SelectObject(hdc, hOldFont);
 
     /* Draw the scroll bar */
-    DrawScrollbar(hdc, &pPreviewData->rcActiveScroll, pPreviewData->hbrScrollbar);
+    MyDrawScrollbar(hdc, &pPreviewData->rcActiveScroll, pPreviewData->hbrScrollbar, theme);
 
     /* Dialog Window */
-    DrawEdge(hdc, &pPreviewData->rcDialogFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE);
+    MyDrawEdge(hdc, &pPreviewData->rcDialogFrame, EDGE_RAISED, BF_RECT | BF_MIDDLE, theme);
-    SetTextColor(hdc, pPreviewData->clrSysColor[COLOR_WINDOW]);
+    SetTextColor(hdc, theme->crColor[COLOR_WINDOW]);
-    DrawCaptionTemp(NULL, hdc, &pPreviewData->rcDialogCaption, pPreviewData->hCaptionFont,
+    MyDrawCaptionTemp(NULL, hdc, &pPreviewData->rcDialogCaption, pPreviewData->hCaptionFont,
-                    NULL, pPreviewData->lpMessBox, DC_ACTIVE | DC_GRADIENT | DC_ICON | DC_TEXT);
+                      NULL, pPreviewData->lpMessBox, DC_ACTIVE | DC_GRADIENT | DC_ICON | DC_TEXT, theme);
-    DrawCaptionButtons(hdc, &pPreviewData->rcDialogCaption, FALSE, pPreviewData->cyCaption - 2);
+    MyDrawCaptionButtons(hdc, &pPreviewData->rcDialogCaption, FALSE, pPreviewData->cyCaption - 2, theme);
 
     /* Draw the dialog text */
     CopyRect(&rc, &pPreviewData->rcDialogClient);
@@ -396,9 +313,9 @@ OnPaint(HWND hwnd, PPREVIEW_DATA pPreviewData)
     SelectObject(hdc, hOldFont);
 
     /* Draw Button */
-    DrawFrameControl(hdc, &pPreviewData->rcDialogButton, DFC_BUTTON, DFCS_BUTTONPUSH);
+    MyDrawFrameControl(hdc, &pPreviewData->rcDialogButton, DFC_BUTTON, DFCS_BUTTONPUSH, theme);
     CopyRect(&rc, &pPreviewData->rcDialogButton);
-    SetTextColor(hdc, pPreviewData->clrSysColor[COLOR_BTNTEXT]);
+    SetTextColor(hdc, theme->crColor[COLOR_BTNTEXT]);
     hOldFont = SelectObject(hdc, pPreviewData->hMessageFont);
     DrawText(hdc, pPreviewData->lpButText, lstrlen(pPreviewData->lpButText), &rc, DT_VCENTER | DT_CENTER | DT_SINGLELINE);
     SelectObject(hdc, hOldFont);
@@ -575,60 +492,14 @@ PreviewWndProc(HWND hwnd,
             }
             break;
 
-        case PVM_SETCAPTIONFONT:
+        case PVM_UPDATETHEME:
-            CopyMemory(&pPreviewData->lfCaptionFont, (LOGFONT*)lParam, sizeof(LOGFONT));
+            UpdatePreviewTheme(hwnd, pPreviewData, (THEME *)lParam);
-            DeleteObject(pPreviewData->hCaptionFont);
-            pPreviewData->hCaptionFont = CreateFontIndirect(&pPreviewData->lfCaptionFont);
-            CalculateItemSize(pPreviewData);
-            InvalidateRect(hwnd, NULL, FALSE);
-            break;
-
-        case PVM_SETMENUFONT:
-            CopyMemory(&pPreviewData->lfMenuFont, (LOGFONT*)lParam, sizeof(LOGFONT));
-            DeleteObject(pPreviewData->hMenuFont);
-            pPreviewData->hMenuFont = CreateFontIndirect(&pPreviewData->lfMenuFont);
-            CalculateItemSize(pPreviewData);
-            InvalidateRect(hwnd, NULL, FALSE);
-            break;
-
-        case PVM_SETDIALOGFONT:
-            CopyMemory(&pPreviewData->lfMessageFont, (LOGFONT*)lParam, sizeof(LOGFONT));
-            DeleteObject(pPreviewData->hMessageFont);
-            pPreviewData->hMessageFont = CreateFontIndirect(&pPreviewData->lfMessageFont);
-            CalculateItemSize(pPreviewData);
-            InvalidateRect(hwnd, NULL, FALSE);
-            break;
-
-        case PVM_SETCOLOR:
-            pPreviewData->clrSysColor[(INT)wParam] = (DWORD)lParam;
-            switch((INT)wParam)
-            {
-                case COLOR_SCROLLBAR:
-                    DeleteObject(pPreviewData->hbrScrollbar);
-                    pPreviewData->hbrScrollbar = CreateSolidBrush(pPreviewData->clrSysColor[COLOR_SCROLLBAR]);
-                    break;
-
-                case COLOR_DESKTOP:
-                    DeleteObject(pPreviewData->hbrDesktop);
-                    pPreviewData->hbrDesktop = CreateSolidBrush(pPreviewData->clrSysColor[COLOR_DESKTOP]);
-                    break;
-
-                case COLOR_WINDOW:
-                    DeleteObject(pPreviewData->hbrWindow);
-                    pPreviewData->hbrWindow = CreateSolidBrush(pPreviewData->clrSysColor[COLOR_WINDOW]);
-                    break;
-            }
-            InvalidateRect(hwnd, NULL, FALSE);
             break;
 
         default:
-            DefWindowProc(hwnd,
+            return DefWindowProc(hwnd, uMsg, wParam, lParam);
-                          uMsg,
-                          wParam,
-                          lParam);
     }
-
+    return FALSE;
-    return TRUE;
 }
 
 
@@ -651,6 +522,5 @@ RegisterPreviewControl(IN HINSTANCE hInstance)
 VOID
 UnregisterPreviewControl(IN HINSTANCE hInstance)
 {
-    UnregisterClass(szPreviewWndClass,
+    UnregisterClass(szPreviewWndClass, hInstance);
-                    hInstance);
 }

dll/cpl/desk/preview.h

@@ -35,11 +35,7 @@
 #define PVM_GETCYSIZEFRAME   (WM_USER+7)
 #define PVM_SETCYSIZEFRAME   (WM_USER+8)
 
-#define PVM_SETCAPTIONFONT   (WM_USER+9)
+#define PVM_UPDATETHEME      (WM_USER+13)
-#define PVM_SETMENUFONT      (WM_USER+10)
-#define PVM_SETDIALOGFONT    (WM_USER+11)
-
-#define PVM_SETCOLOR         (WM_USER+12)
 
 BOOL RegisterPreviewControl(IN HINSTANCE hInstance);
 VOID UnregisterPreviewControl(IN HINSTANCE hInstance);

dll/cpl/desk/theme.c

@@ -0,0 +1,413 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS Display Control Panel
+ * FILE:            lib/cpl/desk/theme.c
+ * PURPOSE:         Handling themes
+ *
+ * PROGRAMMERS:     Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
+ */
+
+#include "desk.h"
+#include "theme.h"
+
+static BOOL g_TemplateLoaded = FALSE;
+static INT g_TemplateCount = 0;
+
+static INT g_ColorList[NUM_COLORS];
+
+static const TCHAR g_CPColors[] = TEXT("Control Panel\\Colors");
+static const TCHAR g_CPANewSchemes[] = TEXT("Control Panel\\Appearance\\New Schemes");
+static const TCHAR g_SelectedStyle[] = TEXT("SelectedStyle");
+
+/******************************************************************************/
+
+THEME_PRESET g_ThemeTemplates[MAX_TEMPLATES];
+
+/* This is the list of names for the colors stored in the registry */
+const TCHAR g_RegColorNames[NUM_COLORS][MAX_COLORNAMELENGTH] =
+	{TEXT("Scrollbar"),				/* 00 = COLOR_SCROLLBAR */
+	TEXT("Background"),				/* 01 = COLOR_DESKTOP */
+	TEXT("ActiveTitle"),			/* 02 = COLOR_ACTIVECAPTION  */
+	TEXT("InactiveTitle"),			/* 03 = COLOR_INACTIVECAPTION */
+	TEXT("Menu"),					/* 04 = COLOR_MENU */
+	TEXT("Window"),					/* 05 = COLOR_WINDOW */
+	TEXT("WindowFrame"),			/* 06 = COLOR_WINDOWFRAME */
+	TEXT("MenuText"), 				/* 07 = COLOR_MENUTEXT */
+	TEXT("WindowText"), 			/* 08 = COLOR_WINDOWTEXT */
+	TEXT("TitleText"), 				/* 09 = COLOR_CAPTIONTEXT */
+	TEXT("ActiveBorder"), 			/* 10 = COLOR_ACTIVEBORDER */
+	TEXT("InactiveBorder"), 		/* 11 = COLOR_INACTIVEBORDER */
+	TEXT("AppWorkSpace"), 			/* 12 = COLOR_APPWORKSPACE */
+	TEXT("Hilight"), 				/* 13 = COLOR_HIGHLIGHT */
+	TEXT("HilightText"), 			/* 14 = COLOR_HIGHLIGHTTEXT */
+	TEXT("ButtonFace"), 			/* 15 = COLOR_BTNFACE */
+	TEXT("ButtonShadow"), 			/* 16 = COLOR_BTNSHADOW */
+	TEXT("GrayText"), 				/* 17 = COLOR_GRAYTEXT */
+	TEXT("ButtonText"), 			/* 18 = COLOR_BTNTEXT */
+	TEXT("InactiveTitleText"), 		/* 19 = COLOR_INACTIVECAPTIONTEXT */
+	TEXT("ButtonHilight"), 			/* 20 = COLOR_BTNHIGHLIGHT */
+	TEXT("ButtonDkShadow"), 		/* 21 = COLOR_3DDKSHADOW */
+	TEXT("ButtonLight"), 			/* 22 = COLOR_3DLIGHT */
+	TEXT("InfoText"), 				/* 23 = COLOR_INFOTEXT */
+	TEXT("InfoWindow"), 			/* 24 = COLOR_INFOBK */
+	TEXT("ButtonAlternateFace"),	/* 25 = COLOR_ALTERNATEBTNFACE */
+	TEXT("HotTrackingColor"), 		/* 26 = COLOR_HOTLIGHT */
+	TEXT("GradientActiveTitle"),	/* 27 = COLOR_GRADIENTACTIVECAPTION */
+	TEXT("GradientInactiveTitle"),	/* 28 = COLOR_GRADIENTINACTIVECAPTION */
+	TEXT("MenuHilight"), 			/* 29 = COLOR_MENUHILIGHT */
+	TEXT("MenuBar"), 				/* 30 = COLOR_MENUBAR */
+};
+
+/* This is the list of used metrics and their numbers */
+const int g_SizeMetric[NUM_SIZES] =
+{
+	SM_CXBORDER,        /* 00: SIZE_BORDER_X */
+	SM_CYBORDER,        /* 01: SIZE_BORDER_Y */
+	SM_CYCAPTION,       /* 02: SIZE_CAPTION_Y */
+	SM_CXICON,          /* 03: SIZE_ICON_X */
+	SM_CYICON,          /* 04: SIZE_ICON_Y */
+	SM_CXICONSPACING,   /* 05: SIZE_ICON_SPC_X */
+	SM_CYICONSPACING,   /* 06: SIZE_ICON_SPC_Y */
+	SM_CXMENUSIZE,      /* 07: SIZE_MENU_SIZE_X */
+	SM_CYMENU,          /* 08: SIZE_MENU_Y */
+	SM_CXVSCROLL,       /* 09: SIZE_SCROLL_X */
+	SM_CYHSCROLL,       /* 10: SIZE_SCROLL_Y */
+	SM_CYSMCAPTION,     /* 11: SIZE_SMCAPTION_Y */
+	SM_CXEDGE,          /* 12: SIZE_EDGE_X */
+	SM_CYEDGE,          /* 13: SIZE_EDGE_Y */
+	SM_CYSIZEFRAME,     /* 14: SIZE_FRAME_Y */
+	SM_CXMENUCHECK,     /* 15: SIZE_MENU_CHECK_X */
+	SM_CYMENUCHECK,     /* 16: SIZE_MENU_CHECK_Y */
+	SM_CYMENUSIZE,      /* 17: SIZE_MENU_SIZE_Y */
+	SM_CXSIZE,          /* 18: SIZE_SIZE_X */
+	SM_CYSIZE           /* 19: SIZE_SIZE_Y */
+};
+
+/******************************************************************************/
+
+VOID LoadCurrentTheme(THEME* theme)
+{
+	INT i;
+	NONCLIENTMETRICS NonClientMetrics;
+
+	/* Load colors */
+	for (i = 0; i < NUM_COLORS; i++)
+	{
+		g_ColorList[i] = i;
+		theme->crColor[i] = (COLORREF)GetSysColor(i);
+	}
+
+	/* Load sizes */
+	for (i = 0; i < NUM_SIZES; i++)
+	{
+		theme->Size[i] = GetSystemMetrics(g_SizeMetric[i]);
+	}
+
+	/* Load fonts */
+	NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS);
+	SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0);
+	theme->lfFont[FONT_CAPTION] = NonClientMetrics.lfCaptionFont;
+	theme->lfFont[FONT_SMCAPTION] = NonClientMetrics.lfSmCaptionFont;
+	theme->lfFont[FONT_MENU] = NonClientMetrics.lfMenuFont;
+	theme->lfFont[FONT_INFO] = NonClientMetrics.lfStatusFont;
+	theme->lfFont[FONT_DIALOG] = NonClientMetrics.lfMessageFont;
+	SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(LOGFONT), &theme->lfFont[FONT_ICON], 0);
+
+	/* Effects */
+	/* "Use the following transition effect for menus and tooltips" */
+	SystemParametersInfo(SPI_GETMENUANIMATION, sizeof(BOOL), &theme->Effects.bMenuAnimation, 0);
+	SystemParametersInfo(SPI_GETMENUFADE, sizeof(BOOL), &theme->Effects.bMenuFade, 0);
+	/* FIXME: XP seems to use grayed checkboxes to reflect differences between menu and tooltips settings
+	 * Just keep them in sync for now:
+	 */
+	theme->Effects.bTooltipAnimation  = theme->Effects.bMenuAnimation;
+	theme->Effects.bTooltipFade	   = theme->Effects.bMenuFade;
+
+	/* show content of windows during dragging */
+	//SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, theme->Effects.bDragFullWindows, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
+	SystemParametersInfoW(SPI_GETDRAGFULLWINDOWS, 0, &theme->Effects.bDragFullWindows, 0);
+
+	/* "Hide underlined letters for keyboard navigation until I press the Alt key" */
+	SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &theme->Effects.bKeyboardCues, 0);
+}
+
+BOOL LoadThemeFromReg(THEME* theme, INT ThemeId)
+{
+	INT i;
+	TCHAR strSelectedStyle[4];
+	TCHAR strSizeName[20] = {TEXT("Sizes\\0")};
+	TCHAR strValueName[10];
+	HKEY hkNewSchemes, hkScheme, hkSize;
+	DWORD dwType, dwLength;
+	BOOL Ret = FALSE;
+
+	if (!g_TemplateLoaded)
+		LoadThemeTemplates(strSelectedStyle);
+
+	if (ThemeId == -1)
+		return FALSE;
+
+	if (RegOpenKeyEx(HKEY_CURRENT_USER, g_CPANewSchemes, 0, KEY_READ, &hkNewSchemes) == ERROR_SUCCESS)
+	{
+		if (RegOpenKeyEx(hkNewSchemes, g_ThemeTemplates[ThemeId].strKeyName, 0, KEY_READ, &hkScheme) == ERROR_SUCCESS)
+		{
+			lstrcpyn(&strSizeName[6], g_ThemeTemplates[ThemeId].strSizeName, 3);
+			if (RegOpenKeyEx(hkScheme, strSizeName, 0, KEY_READ, &hkSize) == ERROR_SUCCESS)
+			{
+				Ret = TRUE;
+
+				dwLength = sizeof(DWORD);
+				if (RegQueryValueEx(hkSize, TEXT("FlatMenus"), NULL, &dwType, (LPBYTE)&theme->bFlatMenus, &dwLength) != ERROR_SUCCESS ||
+					dwType != REG_DWORD)
+				{
+					/* Failed to read registry value */
+					theme->bFlatMenus = FALSE;
+				}
+
+				for (i = 0; i < NUM_COLORS; i++)
+				{
+					wsprintf(strValueName, TEXT("Color #%d"), i);
+					dwLength = sizeof(COLORREF);
+					if (RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&theme->crColor[i], &dwLength) != ERROR_SUCCESS ||
+						dwType != REG_DWORD)
+					{
+						/* Failed to read registry value, initialize with current setting for now */
+						theme->crColor[i] = GetSysColor(i);
+					}
+				}
+
+				for (i = 0; i < NUM_FONTS; i++)
+				{
+					wsprintf(strValueName, TEXT("Font #%d"), i);
+					dwLength = sizeof(LOGFONT);
+					if (RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&theme->lfFont[i], &dwLength) != ERROR_SUCCESS ||
+						dwType != REG_BINARY || dwLength != sizeof(LOGFONT))
+					{
+						/* Failed to read registry value */
+						Ret = FALSE;
+					}
+				}
+
+				for (i = 0; i < NUM_SIZES; i++)
+				{
+					wsprintf(strValueName, TEXT("Size #%d"), i);
+					dwLength = sizeof(UINT64);
+					if (RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&theme->Size[i], &dwLength) != ERROR_SUCCESS ||
+						dwType != REG_QWORD || dwLength != sizeof(UINT64))
+					{
+						/* Failed to read registry value, initialize with current setting for now */
+						theme->Size[i] = GetSystemMetrics(g_SizeMetric[i]);
+					}
+				}
+				RegCloseKey(hkScheme);
+			}
+			RegCloseKey(hkScheme);
+		}
+		RegCloseKey(hkNewSchemes);
+	}
+
+	return Ret;
+}
+
+static VOID
+_UpdateUserPref(UINT SpiGet, UINT SpiSet, BOOL *pbFlag)
+{
+	SystemParametersInfo(SpiSet, 0, (PVOID)pbFlag, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE);
+}
+#define UPDATE_USERPREF(NAME,pbFlag) _UpdateUserPref(SPI_GET ## NAME, SPI_SET ## NAME, pbFlag)
+
+VOID ApplyTheme(THEME* theme, INT ThemeId)
+{
+	INT i, Result;
+	HKEY hKey;
+	DWORD dwDisposition;
+	TCHAR clText[16];
+	NONCLIENTMETRICS NonClientMetrics;
+
+	/* Apply Colors from global variable */
+	SetSysColors(NUM_COLORS, g_ColorList, theme->crColor);
+
+	/* Save colors to registry */
+	Result = RegOpenKeyEx(HKEY_CURRENT_USER, g_CPColors, 0, KEY_ALL_ACCESS, &hKey);
+	if (Result != ERROR_SUCCESS)
+	{
+		/* Could not open the key, try to create it */
+		Result = RegCreateKeyEx(HKEY_CURRENT_USER, g_CPColors, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition);
+	}
+
+	if (Result == ERROR_SUCCESS)
+	{
+		for (i = 0; i < NUM_COLORS; i++)
+		{
+			DWORD red   = GetRValue(theme->crColor[i]);
+			DWORD green = GetGValue(theme->crColor[i]);
+			DWORD blue  = GetBValue(theme->crColor[i]);
+			wsprintf(clText, TEXT("%d %d %d"), red, green, blue);
+			RegSetValueEx(hKey, g_RegColorNames[i], 0, REG_SZ, (BYTE *)clText, (lstrlen(clText) + 1) * sizeof(TCHAR));
+		}
+		RegCloseKey(hKey);
+	}
+
+	/* Apply the fonts */
+	NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS);
+	SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0);
+	NonClientMetrics.lfCaptionFont = theme->lfFont[FONT_CAPTION];
+	NonClientMetrics.lfSmCaptionFont = theme->lfFont[FONT_SMCAPTION];
+	NonClientMetrics.lfMenuFont = theme->lfFont[FONT_MENU];
+	NonClientMetrics.lfStatusFont = theme->lfFont[FONT_INFO];
+	NonClientMetrics.lfMessageFont = theme->lfFont[FONT_DIALOG];
+	SystemParametersInfo(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0);
+	SystemParametersInfo(SPI_SETICONTITLELOGFONT, sizeof(LOGFONT), &theme->lfFont[FONT_ICON], 0);
+
+	/* FIXME: Apply size metrics */
+
+	/* Save fonts and size metrics to registry */
+	Result = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition);
+	if (Result == ERROR_SUCCESS)
+	{
+		RegSetValueEx(hKey, TEXT("CaptionFont"), 0, REG_BINARY, (BYTE *)&theme->lfFont[FONT_CAPTION], sizeof(LOGFONT));
+		RegSetValueEx(hKey, TEXT("SmCaptionFont"), 0, REG_BINARY, (BYTE *)&theme->lfFont[FONT_SMCAPTION], sizeof(LOGFONT));
+		RegSetValueEx(hKey, TEXT("IconFont"), 0, REG_BINARY, (BYTE *)&theme->lfFont[FONT_ICON], sizeof(LOGFONT));
+		RegSetValueEx(hKey, TEXT("MenuFont"), 0, REG_BINARY, (BYTE *)&theme->lfFont[FONT_MENU], sizeof(LOGFONT));
+		RegSetValueEx(hKey, TEXT("StatusFont"), 0, REG_BINARY, (BYTE *)&theme->lfFont[FONT_INFO], sizeof(LOGFONT));
+		RegSetValueEx(hKey, TEXT("MessageFont"), 0, REG_BINARY, (BYTE *)&theme->lfFont[FONT_DIALOG], sizeof(LOGFONT));
+
+		/* Save size metrics to registry */
+		wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_BORDER_X]);
+		RegSetValueEx(hKey, TEXT("BorderWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
+		wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_CAPTION_Y]);
+		RegSetValueEx(hKey, TEXT("CaptionWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
+		wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_CAPTION_Y]);
+		RegSetValueEx(hKey, TEXT("CaptionHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
+		wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_SMCAPTION_Y]);
+		RegSetValueEx(hKey, TEXT("SmCaptionWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
+		wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_SMCAPTION_Y]);
+		RegSetValueEx(hKey, TEXT("SmCaptionHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
+		wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_ICON_SPC_X]);
+		RegSetValueEx(hKey, TEXT("IconSpacing"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
+		wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_ICON_SPC_Y]);
+		RegSetValueEx(hKey, TEXT("IconVerticalSpacing"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
+		wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_MENU_SIZE_X]);
+		RegSetValueEx(hKey, TEXT("MenuWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
+		wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_MENU_Y]);
+		RegSetValueEx(hKey, TEXT("MenuHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
+		wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_SCROLL_X]);
+		RegSetValueEx(hKey, TEXT("ScrollWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
+		wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_SCROLL_Y]);
+		RegSetValueEx(hKey, TEXT("ScrollHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
+		wsprintf(clText, TEXT("%d"), theme->Size[SIZE_ICON_X]);
+		RegSetValueEx(hKey, TEXT("Shell Icon Size"), 0, REG_SZ, (BYTE *)clText, sizeof(clText));
+
+		RegCloseKey(hKey);
+	}
+
+	/* Effects, save only when needed: */
+	/* FIXME: XP seems to use grayed checkboxes to reflect differences between menu and tooltips settings
+	 * Just keep them in sync for now.
+	 */
+	theme->Effects.bTooltipAnimation  = theme->Effects.bMenuAnimation;
+	theme->Effects.bTooltipFade	   = theme->Effects.bMenuFade;
+	SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, theme->Effects.bDragFullWindows, NULL, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE);
+	UPDATE_USERPREF(KEYBOARDCUES, &theme->Effects.bKeyboardCues);
+	//UPDATE_USERPREF(ACTIVEWINDOWTRACKING, &theme->Effects.bActiveWindowTracking);
+	//UPDATE_USERPREF(MENUANIMATION, &theme->Effects.bMenuAnimation);
+	//UPDATE_USERPREF(COMBOBOXANIMATION, &theme->Effects.bComboBoxAnimation);
+	//UPDATE_USERPREF(LISTBOXSMOOTHSCROLLING, &theme->Effects.bListBoxSmoothScrolling);
+	//UPDATE_USERPREF(GRADIENTCAPTIONS, &theme->Effects.bGradientCaptions);
+	//UPDATE_USERPREF(ACTIVEWNDTRKZORDER, &theme->Effects.bActiveWndTrkZorder);
+	//UPDATE_USERPREF(HOTTRACKING, &theme->Effects.bHotTracking);
+	UPDATE_USERPREF(MENUFADE, &theme->Effects.bMenuFade);
+	//UPDATE_USERPREF(SELECTIONFADE, &theme->Effects.bSelectionFade);
+	UPDATE_USERPREF(TOOLTIPANIMATION, &theme->Effects.bTooltipAnimation);
+	UPDATE_USERPREF(TOOLTIPFADE, &theme->Effects.bTooltipFade);
+	//UPDATE_USERPREF(CURSORSHADOW, &theme->Effects.bCursorShadow);
+	//UPDATE_USERPREF(UIEFFECTS, &theme->Effects.bUiEffects);
+
+	/* Save ThemeId */
+	Result = RegOpenKeyEx(HKEY_CURRENT_USER, g_CPANewSchemes, 0, KEY_ALL_ACCESS, &hKey);
+	if (Result == ERROR_SUCCESS)
+	{
+		if (ThemeId == -1)
+			clText[0] = TEXT('\0');
+		else
+			lstrcpy(clText, g_ThemeTemplates[ThemeId].strKeyName);
+		RegSetValueEx(hKey, g_SelectedStyle, 0, REG_SZ, (BYTE *)clText, (lstrlen(clText) + 1) * sizeof(TCHAR));
+		RegCloseKey(hKey);
+	}
+}
+
+BOOL SaveTheme(THEME* theme, LPCTSTR strLegacyName)
+{
+	/* FIXME: implement */
+	return FALSE;
+}
+
+INT LoadThemeTemplates(LPTSTR pszSelectedStyle)
+{
+	HKEY hkNewSchemes, hkScheme, hkSizes, hkSize;
+	FILETIME ftLastWriteTime;
+	DWORD dwLength, dwType;
+	DWORD dwDisposition;
+	INT iStyle, iSize, iTemplateIndex;
+	INT Result;
+
+	lstrcpy(pszSelectedStyle, TEXT(""));
+
+	iTemplateIndex = 0;
+	Result = RegCreateKeyEx(HKEY_CURRENT_USER, g_CPANewSchemes, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkNewSchemes, &dwDisposition);
+	if (Result == ERROR_SUCCESS)
+	{
+		/* First find out the currently selected template */
+		dwLength = 4 * sizeof(TCHAR);
+		RegQueryValueEx(hkNewSchemes, g_SelectedStyle, NULL, &dwType, (LPBYTE)pszSelectedStyle, &dwLength);
+
+		/* Check if already loaded */
+		if (g_TemplateLoaded)
+		{
+			RegCloseKey(hkNewSchemes);
+			return g_TemplateCount;
+		}
+
+		iStyle = 0;
+		dwLength = MAX_TEMPLATENAMELENTGH;
+		while((RegEnumKeyEx(hkNewSchemes, iStyle, g_ThemeTemplates[iTemplateIndex].strKeyName, &dwLength,
+							NULL, NULL, NULL, &ftLastWriteTime) == ERROR_SUCCESS) && (iTemplateIndex < MAX_TEMPLATES))
+		{
+			/* is it really a template or one of the other entries */
+			if (dwLength <= 4)
+			{
+				if (RegOpenKeyEx(hkNewSchemes, g_ThemeTemplates[iTemplateIndex].strKeyName, 0, KEY_READ, &hkScheme) == ERROR_SUCCESS)
+				{
+					if (RegOpenKeyEx(hkScheme, TEXT("Sizes"), 0, KEY_READ, &hkSizes) == ERROR_SUCCESS)
+					{
+						iSize = 0;
+						dwLength = 3;
+						while((RegEnumKeyEx(hkSizes, iSize, g_ThemeTemplates[iTemplateIndex].strSizeName, &dwLength,
+											NULL, NULL, NULL, &ftLastWriteTime) == ERROR_SUCCESS) && (iSize <= 4))
+						{
+							if(RegOpenKeyEx(hkSizes, g_ThemeTemplates[iTemplateIndex].strSizeName, 0, KEY_READ, &hkSize) == ERROR_SUCCESS)
+							{
+								dwLength = MAX_TEMPLATENAMELENTGH;
+								RegQueryValueEx(hkSize, TEXT("DisplayName"), NULL, &dwType, (LPBYTE)&g_ThemeTemplates[iTemplateIndex].strDisplayName, &dwLength);
+								dwLength = MAX_TEMPLATENAMELENTGH;
+								RegQueryValueEx(hkSize, TEXT("LegacyName"), NULL, &dwType, (LPBYTE)&g_ThemeTemplates[iTemplateIndex].strLegacyName, &dwLength);
+								RegCloseKey(hkSize);
+							}
+							iSize++;
+							iTemplateIndex++;
+							dwLength = 3;
+						}
+						RegCloseKey(hkSizes);
+					}
+					RegCloseKey(hkScheme);
+				}
+			}
+			iStyle++;
+			dwLength = MAX_TEMPLATENAMELENTGH;
+		}
+		RegCloseKey(hkNewSchemes);
+		g_TemplateLoaded = TRUE;
+		g_TemplateCount = iTemplateIndex;
+	}
+	return iTemplateIndex;
+}

dll/cpl/desk/theme.h

@@ -0,0 +1,89 @@
+/* Some definitions for theme */
+#define SIZE_BORDER_X 0
+#define SIZE_BORDER_Y 1
+#define SIZE_CAPTION_Y 2
+#define SIZE_ICON_X 3
+#define SIZE_ICON_Y 4
+#define SIZE_ICON_SPC_X 5
+#define SIZE_ICON_SPC_Y 6
+#define SIZE_MENU_SIZE_X 7
+#define SIZE_MENU_Y 8
+#define SIZE_SCROLL_X 9
+#define SIZE_SCROLL_Y 10
+#define SIZE_SMCAPTION_Y 11
+#define SIZE_EDGE_X 12
+#define SIZE_EDGE_Y 13
+#define SIZE_FRAME_Y 14
+#define SIZE_MENU_CHECK_X 15
+#define SIZE_MENU_CHECK_Y 16
+#define SIZE_MENU_SIZE_Y 17
+#define SIZE_SIZE_X 18
+#define SIZE_SIZE_Y 19
+
+#define FONT_CAPTION 0
+#define FONT_SMCAPTION 1
+#define FONT_HILIGHT 2
+#define FONT_MENU 2
+#define FONT_ICON 3
+#define FONT_INFO 4
+#define FONT_DIALOG 5
+
+#define NUM_ELEMENTS 22
+#define NUM_FONTS 6
+#define NUM_SIZES 20
+#define NUM_COLORS 31
+#define MAX_TEMPLATES 50
+#define MAX_COLORNAMELENGTH 30
+#define MAX_TEMPLATENAMELENTGH 80
+
+/* Some typedefs for theme */
+
+/* Most (but not all) fields below correspond to HKCU\Control Panel\Desktop\UserPreferencesMask */
+typedef struct
+{
+	BOOL bActiveWindowTracking;
+	BOOL bMenuAnimation;
+	BOOL bComboBoxAnimation;
+	BOOL bListBoxSmoothScrolling;
+	BOOL bGradientCaptions;
+	BOOL bKeyboardCues;
+	BOOL bActiveWndTrkZorder;
+	BOOL bHotTracking;
+	BOOL bMenuFade;
+	BOOL bSelectionFade;
+	BOOL bTooltipAnimation;
+	BOOL bTooltipFade;
+	BOOL bCursorShadow;
+	BOOL bUiEffects;
+	BOOL bFontSmoothing;
+	BOOL bDragFullWindows;
+	UINT uiFontSmoothingType;
+} EFFECTS;
+
+typedef struct
+{
+	COLORREF crColor[NUM_COLORS];
+	LOGFONT lfFont[NUM_FONTS];
+	UINT64 Size[NUM_SIZES];
+	BOOL bFlatMenus;
+	EFFECTS Effects;
+} THEME;
+
+typedef struct
+{
+	TCHAR strKeyName[4];
+	TCHAR strSizeName[4];
+	TCHAR strDisplayName[MAX_TEMPLATENAMELENTGH];
+	TCHAR strLegacyName[MAX_TEMPLATENAMELENTGH];
+} THEME_PRESET;
+
+extern const TCHAR g_RegColorNames[NUM_COLORS][MAX_COLORNAMELENGTH];
+extern const INT g_SizeMetric[NUM_SIZES];
+extern THEME_PRESET g_ThemeTemplates[MAX_TEMPLATES];
+
+/* prototypes for theme.c */
+VOID LoadCurrentTheme(THEME* theme);
+BOOL LoadThemeFromReg(THEME* theme, INT ThemeId);
+VOID ApplyTheme(THEME* theme, INT ThemeId);
+BOOL SaveTheme(THEME* theme, LPCTSTR strLegacyName);
+INT LoadThemeTemplates(LPTSTR pszSelectedStyle);

dll/cpl/hdwwiz/lang/uk-UA.rc

@@ -3,28 +3,28 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        dll/cpl/hdwwiz/Uk.rc
  * PURPOSE:     Ukraianian Language File for Add Hardware Control Panel Applet
- * PROGRAMMERS: Artem Reznikov
+ * TRANSLATORS: Artem Reznikov, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Hardware Wizard"
+CAPTION "Майстер встановлення обладнання"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "Welcome to the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24
+	LTEXT "Вас вітає майстер встановлення обладнання", IDC_FINISHTITLE, 114, 8, 203, 24
-	LTEXT "This wizard helps you:", -1, 114, 40, 182, 8
+	LTEXT "Цей майстер допомагає:", -1, 114, 40, 182, 8
-	LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16
+	LTEXT "1) Встановлювати драйвери для нових пристроїв вашого комп'ютера.", -1, 121, 56, 184, 16
-	LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16
+	LTEXT "2) Проводити діагностику неполадок наявного обладнання.", -1, 121, 78, 185, 16
 	ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20
-	LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50
+	LTEXT "Якщо до пристрою додається установочний диск, рекомендується натиснути кнопку ""Скасувати"" для закриття цього майстра та використати диск від виробника для встановлення цього пристрою.", 503, 150, 106, 155, 50
-	LTEXT "To continue, click Next.", -1, 114, 166, 193, 8
+	LTEXT "Для продовження натисніть кнопку ""Далі"".", -1, 114, 166, 193, 8
 END
 
 IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Hardware Wizard"
+CAPTION "Майстер встановлення обладнання"
 FONT 8, "MS Shell Dlg"
 BEGIN
 	LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32
@@ -33,63 +33,63 @@ END
 
 IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Hardware Wizard"
+CAPTION "Майстер встановлення обладнання"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8
+	LTEXT "Цей пристрій вже під'єднано до комп'ютера?", -1, 20, 11, 275, 8
-	AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP
+	AUTORADIOBUTTON "&Так, пристрій вже під'єднано", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP
-	AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8
+	AUTORADIOBUTTON "&Ні, цей пристрій ще не під'єднано", IDC_NOTCONNECTED, 29, 35, 266, 8
 END
 
 IDD_PROBELISTPAGE DIALOG DISCARDABLE 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Hardware Wizard"
+CAPTION "Майстер встановлення обладнання"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22
+	LTEXT "Виберіть пристрій зі списку та натисніть кнопку ""Далі"" для перевірки його властивостей чи виконання діагностики неполадок.", -1, 21, 8, 275, 22
-	LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24
+	LTEXT "Щоб додати пристрій, відсутній в цьому списку, натисніть ""Додати новий пристрій"".", -1, 21, 32, 275, 24
-	LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8
+	LTEXT "В&становлене обладнання:", -1, 21, 62, 140, 8
 	CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66
 END
 
 IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Hardware Wizard"
+CAPTION "Майстер встановлення обладнання"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "The wizard can search for other hardware and automatically install it for you. Or, if you know exactly which hardware model you want to install, you can select it from a list.", -1, 21, 8, 280, 24
+	LTEXT "Майстер може виконати пошук іншого обладнання та встановити його автоматично. Якщо ж ви точно знаєте виробника та модель обладнання, яке треба встановити, ви можете вибрати його зі списку вручну.", -1, 21, 8, 280, 24
-	LTEXT "What do you want the wizard to do?", -1, 23, 40, 275, 8
+	LTEXT "Виберіть дію, яку треба виконати", -1, 23, 40, 275, 8
-	AUTORADIOBUTTON "&Search for and install the hardware automatically (Recommended)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP
+	AUTORADIOBUTTON "&Пошук і автоматичне встановлення обладнання (Рекомендовано)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP
-	AUTORADIOBUTTON "Install the hardware that I &manually select from a list (Advanced)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP
+	AUTORADIOBUTTON "Встановлення обладнання, що вибрано зі спику в&ручну", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP
 END
 
 IDD_DETECTEDHWPAGE DIALOG DISCARDABLE 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Hardware Wizard"
+CAPTION "Майстер встановлення обладнання"
 FONT 8, "MS Shell Dlg"
 BEGIN
 	LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40
-	LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8
+	LTEXT "Знайдені пристрої:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8
 	CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70
 END
 
 IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Hardware Wizard"
+CAPTION "Майстер встановлення обладнання"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18
+	LTEXT "Якщо потрібний вам тип обладнання відсутній, натисніть елемент списку ""Показати всі пристрої"".", IDC_STATUSTEXT, 21, 9, 275, 18
-	LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8
+	LTEXT "&Стандартні типи обладнання:", IDC_HWTYPESTEXT, 21, 31, 180, 8
 	CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92
 END
 
 IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Hardware Wizard"
+CAPTION "Майстер встановлення обладнання"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "It may take several minutes to search for hardware.", -1, 21, 8, 275, 15
+	LTEXT "Процес пошуку обладнання може зайняти декілька хвилин.", -1, 21, 8, 275, 15
-	LTEXT "Total progress:", IDC_TPROGRESSTEXT, 21, 25, 275, 8
+	LTEXT "Загальний індикатор виконання:", IDC_TPROGRESSTEXT, 21, 25, 275, 8
 	CONTROL "", IDC_TPROGRESSBAR, "msctls_progress32", 0, 21, 37, 275, 14
 	LTEXT "", IDC_PROGRESSTEXT, 58, 58, 200, 8, SS_NOPREFIX
 	CONTROL "", IDC_PROGRESSBAR, "msctls_progress32", 0, 58, 70, 200, 8
@@ -97,59 +97,59 @@ END
 
 IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Hardware Wizard"
+CAPTION "Майстер встановлення обладнання"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24
+	LTEXT "Завершення роботи майстра встановлення обладнання", IDC_FINISHTITLE, 114, 8, 203, 24
-	LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19
+	LTEXT "Робота майстра встановлення обладнання успішно завершена.", -1, 114, 32, 193, 19
 	LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92
-	LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8
+	LTEXT "Для закриття майстра натисніть кнопку ""Завершити"".", -1, 114, 166, 132, 8
 END
 
 IDD_ISFOUNDPAGE DIALOG DISCARDABLE 0, 0, 317, 186
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Hardware Wizard"
+CAPTION "Майстер встановлення обладнання"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24
+	LTEXT "Завершення роботи майстра встановлення обладнання", IDC_FINISHTITLE, 114, 8, 203, 24
-	LTEXT "The wizard found the following hardware connected to your computer:", -1, 114, 32, 193, 19
+	LTEXT "Майстер знайшов наступне обладнання, під'єднане до цього комп'ютера:", -1, 114, 32, 193, 19
-	LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8
+	LTEXT "Для закриття майстра натисніть кнопку ""Завершити"".", -1, 114, 166, 132, 8
 	CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78
 END
 
 IDD_HWSTATUSPAGE DIALOG DISCARDABLE 0, 0, 317, 186
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Hardware Wizard"
+CAPTION "Майстер встановлення обладнання"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 195, 28
+	LTEXT "Завершення роботи майстра встановлення обладнання", IDC_FINISHTITLE, 114, 8, 195, 28
-	LTEXT "Here is the current status of the hardware you selected:", -1, 114, 40, 193, 19
+	LTEXT "Поточний стан вибраного пристрою:", -1, 114, 40, 193, 19
 	EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP
-	LTEXT "To start a troubleshooter that can help you resolve any problems you might be having, click Finish.", -1, 114, 136, 193, 16
+	LTEXT "Для запуску діагностики та отримання допомоги щодо усунення неполадок натисніть ""Завршити"".", -1, 114, 136, 193, 16
-	LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8
+	LTEXT "Для припинення роботи майстра натисніть кнопку ""Скасувати"".", IDC_STATUSTEXT, 114, 166, 170, 16
 END
 
 IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Add Hardware Wizard"
+CAPTION "Майстер встановлення обладнання"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28
+	LTEXT "Майстер встановлення обладнання не може продовжити роботу", IDC_FINISHTITLE, 114, 8, 203, 28
-	LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16
+	LTEXT "Для продовження під'єднайте цей пристрій до комп'ютера.", -1, 114, 40, 193, 16
-	AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE
+	AUTOCHECKBOX "&Вимкнути комп'ютер після натиснення кнопки ""Завершити"" щоб можна було відкрити комп'ютер та під'єднати пристрій.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 25, BS_TOP | BS_MULTILINE
-	LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32
+	LTEXT "В більшості випадків ReactOS автоматично встановить нове обладнання після його під'єднання. Якщо ReactOS його не знайде, запустіть цього майстра знов для встановлення програмної підтримки.", -1, 114, 98, 193, 32
-	LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8
+	LTEXT "Для закриття майстра натисніть кпопку ""Завершити"".", IDC_STATUSTEXT, 114, 166, 193, 8
 END
 
 STRINGTABLE
 BEGIN
-	IDS_CPLNAME "Äîäàòè óñòàòêóâàííÿ"
+	IDS_CPLNAME "Додати обладнання"
-	IDS_CPLDESCRIPTION "Äîäàòè óñòàòêóâàííÿ äî âàøîãî êîìï'þòåðà."
+	IDS_CPLDESCRIPTION "Встановлення обладнання в вашому комп'ютері."
-	IDS_SEARCHTITLE "Please wait while the wizard searches..."
+	IDS_SEARCHTITLE "Зачекайте, виконується пошук..."
-	IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed."
+	IDS_SEARCHTEXT "Цей майстер виконує пошук обладнання, яке недавно було під'єднано до комп'ютера, але ще не було встановлене."
-	IDS_ISCONNECTED "Is the hardware connected?"
+	IDS_ISCONNECTED "Пристрій під'єднаний?"
-	IDS_PROBELISTTITLE "The following hardware is already installed on your computer"
+	IDS_PROBELISTTITLE "На цьому комп'ютері вже встановлене наступне обладнання"
-	IDS_ADDNEWDEVICE "Add a new hardware device"
+	IDS_ADDNEWDEVICE "Додати новий пристрій"
-	IDS_SELECTWAYTITLE "The wizard can help you install other hardware"
+	IDS_SELECTWAYTITLE "Цей майстер допоможе встановити інше обладнання"
-	IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing"
+	IDS_HDTYPESTITLE "Виберіть тип встановлюваного обладнання зі списку"
 END

dll/cpl/input/lang/uk-UA.rc

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        dll/cpl/input/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for input.dll
- * PROGRAMMERS: Artem Reznikov
+ * TRANSLATORS: Artem Reznikov, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -19,7 +19,7 @@ BEGIN
     PUSHBUTTON "&Äîäàòè...", IDC_ADD_BUTTON, 27, 142, 70, 14
     PUSHBUTTON "Â&èäàëèòè...", IDC_REMOVE_BUTTON, 101, 142, 70, 14
     PUSHBUTTON "Â&ëàñòèâîñò³...", IDC_PROP_BUTTON, 175, 142, 70, 14
-    GROUPBOX "Íàñòðîéêà", -1, 7, 185, 240, 36
+    GROUPBOX "Íàëàøòóâàííÿ", -1, 7, 185, 240, 36
     PUSHBUTTON "&Ïàðàìåòðè êëàâ³àòóðè...", IDC_KEY_SET_BTN, 14, 198, 110, 14
 END
 
@@ -29,7 +29,7 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Âèìêíåííÿ ðåæèìó Caps Lock", -1, 7, 7, 258, 26
-    AUTORADIOBUTTON "&ïðè íàòèñíåíí³ êëàâ³ø³ CAPS LOCK", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP
+    AUTORADIOBUTTON "&ïðè íàòèñíåíí³ êëàâ³ø³ CAPS LOCK", IDC_PRESS_CL_KEY_RB, 10, 17, 130, 11, WS_GROUP
     AUTORADIOBUTTON "ïðè &íàòèñíåíí³ êëàâ³ø³ SHIFT", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP
     GROUPBOX "Ñïîëó÷åííÿ êëàâ³ø äëÿ ìîâ ââîäó", -1, 7, 37, 258, 95
     LTEXT "ijÿ", -1, 14, 47, 60, 9
@@ -47,7 +47,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10
     COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
-    LTEXT "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", -1, 7, 36, 110, 10
+    LTEXT "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", -1, 7, 36, 140, 10
     COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 68, 50, 14
@@ -59,12 +59,12 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "", -1, 9, 5, 155, 110
-    AUTOCHECKBOX "&Ïåðåêëþ÷àòè ìîâè ââîä", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12
+    AUTOCHECKBOX "&Ïåðåìèêàòè ìîâè ââîäó", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12
     LTEXT "Shift", -1, 73, 37, 27, 12
     CTEXT "+", -1, 62, 37, 8, 9
     AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11
     AUTORADIOBUTTON "ALT ç&ë³âà", IDC_LEFT_ALT_LANG, 29, 45, 46, 12
-    AUTOCHECKBOX "Ïåðå&êëþ÷àòè ðîçêëàäêè êëàâ³àòóðè", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12
+    AUTOCHECKBOX "Ïåðåìè&êàòè ðîçêëàäêè êëàâ³àòóðè", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12
     LTEXT "Shift", -1, 74, 87, 27, 12
     CTEXT "+", -1, 63, 87, 8, 9
     AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11
@@ -80,7 +80,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Ìîâà ââîäó:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
-    LTEXT "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", -1, 7, 21, 110, 10
+    LTEXT "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", -1, 7, 21, 150, 10
     COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 53, 52, 14
@@ -104,7 +104,7 @@ BEGIN
     IDS_LAYOUT_EXISTS2       "Öÿ ðîçêëàäêà âæå ³ñíóº ³ íå ìîæå áóòè äîäàíà."
     IDS_CTRL_SHIFT           "Ctrl+Shift"
     IDS_LEFT_ALT_SHIFT       "Alt çë³âà+Shift"
-    IDS_SWITCH_BET_INLANG    "Ïåðåêëþ÷åííÿ ìîâ ââîäó"
+    IDS_SWITCH_BET_INLANG    "Ïåðåìèêàííÿ ìîâ ââîäó"
 END
 
 STRINGTABLE

dll/cpl/intl/lang/uk-UA.rc

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        dll/cpl/intl/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for International Control Panel Applet
- * PROGRAMMERS: Artem Reznikov
+ * TRANSLATORS: Artem Reznikov, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -15,9 +15,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Ìîâí³ ñòàíäàðòè é ôîðìàòè", -1, 5, 5, 234, 162
     LTEXT "Öåé ïàðàìåòð âïëèâຠíà â³äîáðàæåííÿ ÷èñåë, ãðîøîâèõ ñóì, äàòè é ÷àñó â äåÿêèõ ïðîãðàìàõ.", -1, 14, 17, 220, 25
-    LTEXT "&Виберіть зі списку найбільш підхожий елемент або натисніть кнопку ""Настройка"", щоб указати формати самостійно:", -1, 14, 37, 220, 22
+    LTEXT "&Виберіть зі списку найбільш прийнятний елемент або натисніть кнопку ""Налаштування"", щоб указати формати самостійно:", -1, 14, 37, 220, 22
     COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
-    PUSHBUTTON "Настро&йка...", IDC_SETUP_BUTTON, 178, 56, 52, 13
+    PUSHBUTTON "Налашту&вання...", IDC_SETUP_BUTTON, 175, 56, 60, 13
     LTEXT "Çðàçêè", -1, 14, 73, 70, 10
     LTEXT "×èñëî:", -1, 16, 86, 48, 10
     LTEXT "Ñóìà ãðîøåé:", -1, 16, 101, 48, 10
@@ -143,7 +143,7 @@ BEGIN
 h = ãîäèíà    m = õâèëèíà    s = ñåêóíäà    t = ÀÌ àáî ÐÌ\n\n\
 h = 12-ãîäèííèé ôîðìàò äîáè   H = 24-ãîäèííèé ôîðìàò äîáè\n\
 hh, mm, ss = ç âèâîäîì íóë³â íà ïî÷àòêó   h, m, s = áåç âèâîäó íóë³â",
-        -1, 13, 150, 214, 50, WS_CHILD |WS_VISIBLE | WS_GROUP
+        -1, 13, 150, 214, 55, WS_CHILD |WS_VISIBLE | WS_GROUP
 END
 
 
@@ -153,7 +153,7 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Êàëåíäàð", -1, 7, 7, 230, 74
-    LTEXT "Якщо рік введено двома цифрами, інтерпретувати його як рік між:", -1, 13, 18, 215, 8
+    LTEXT "Якщо рік введено двома цифрами, інтерпретувати його як рік між:", -1, 9, 18, 226, 8
     EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED
     LTEXT "³", -1, 55, 32, 17, 8
     EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP
@@ -195,14 +195,14 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_CUSTOMIZE_TITLE "Настройка регіональних параметрів"
+    IDS_CUSTOMIZE_TITLE "Налаштування регіональних параметрів"
     IDS_SPAIN "²ñïàíñüêà (²ñïàí³ÿ)"
-    IDS_METRIC "Metric"
+    IDS_METRIC "Метрична"
-    IDS_IMPERIAL "Imperial"
+    IDS_IMPERIAL "Американська"
 END
 
 STRINGTABLE
 BEGIN
     IDS_CPLNAME "Ðåã³îíàëüí³ ñòàíäàðòè"
-    IDS_CPLDESCRIPTION "Настройка мовних параметрів і формату чисел, грошових одиниць, часу й дат."
+    IDS_CPLDESCRIPTION "Налаштування мовних параметрів і формату чисел, грошових одиниць, часу й дат."
 END

dll/cpl/joy/lang/uk-UA.rc

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        dll/cpl/joy/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for joy.cpl
- * TRANSLATOR:  Artem Reznikov
+ * TRANSLATORS:  Artem Reznikov, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -53,9 +53,9 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Îñîáëèâîñò³", -1, 7, 7, 245, 52
     AUTORADIOBUTTON "Äæî&éñòèê", IDC_JOYSTICK_RADIO, 17, 23, 55, 10
-    AUTORADIOBUTTON "&Øòóðâàë àáî ðó÷êà êåðóâàííÿ", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10
+    AUTORADIOBUTTON "&Øòóðâàë àáî ðó÷êà êåðóâàííÿ", IDC_FLIGHT_YOKE_RADIO, 125, 23, 116, 10
-    AUTORADIOBUTTON "²&ãðîâèé ïëàíøåò", IDC_GAME_PAD_RADIO, 17, 40, 65, 10
+    AUTORADIOBUTTON "²&ãðîâèé ïëàíøåò", IDC_GAME_PAD_RADIO, 17, 40, 70, 10
-    AUTORADIOBUTTON "Êåðóâàííÿ ïåðåãîíîâèì &àâòîìîá³ëåì", IDC_RACE_CAR_RADIO, 147, 40, 93, 10
+    AUTORADIOBUTTON "Êåðóâàííÿ ïåðåãîí. &àâòîìîá³ëåì", IDC_RACE_CAR_RADIO, 125, 40, 125, 10
     GROUPBOX "&Ñòåïåí³ â³ëüíîñò³", -1, 7, 67, 116, 44, WS_GROUP
     COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
     AUTORADIOBUTTON "Ðóëü àáî ïåäàë³", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE
@@ -78,7 +78,7 @@ BEGIN
     ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20
     DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14
     PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 163, 65, 50, 14
-    LTEXT "Âèáåð³òü ïðèñòð³é, ÿêèé ñë³ä âèêîðèñòîâóâàòè ç³ ñòàðèìè ïðîãðàìàìè.", -1, 7, 7, 208, 10
+    LTEXT "Âèáåð³òü ïðèñòð³é, ÿêèé ñë³ä âèêîðèñòîâóâàòè ç³ ñòàðèìè ïðîãðàìàìè.", -1, 7, 7, 190, 18
     LTEXT "&Êðàùèé ïðèñòð³é:", -1, 34, 24, 70, 10
     COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
 END

dll/cpl/liccpa/liccpa.rbuild

@@ -3,7 +3,6 @@
 <module name="liccpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_LICCPA}"  installbase="system32" installname="liccpa.cpl" unicode="yes">
 	<importlibrary definition="liccpa.def" />
 	<include base="liccpa">.</include>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>comctl32</library>

dll/cpl/main/lang/uk-UA.rc

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        dll/cpl/main/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for ReactOS Main Control Panel Applet
- * TRANSLATOR:  Artem Reznikov
+ * TRANSLATORS:  Artem Reznikov, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -15,13 +15,13 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Ïîâòîð ñèìâîëó, ùî ââîäèòüñÿ", -1, 5, 5, 230, 130
   ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15
-  LTEXT "&Затримка перед початком повтору символу", -1, 40, 15, 50, 10
+  LTEXT "&Затримка перед початком повтору символу", -1, 40, 15, 170, 10
-  LTEXT "Довше", -1, 40, 30, 20, 10
+  LTEXT "Довше", -1, 40, 30, 23, 10
-  LTEXT "Коротше", -1, 200, 30, 20, 10
+  LTEXT "Коротше", -1, 200, 30, 29, 10
   CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17
   ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15
-  LTEXT "&Швидкість повтору", -1, 40, 70, 50, 10
+  LTEXT "&Швидкість повтору", -1, 40, 70, 80, 10
-  LTEXT "Нижче", -1, 40, 85, 20, 10
+  LTEXT "Нижче", -1, 40, 85, 22, 10
   LTEXT "Âèùå", -1, 200, 85, 20, 10
   CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17
   LTEXT "Çàòèñí³òü êëàâ³øó â ïîë³ äëÿ &ïåðåâ³ðêè øâèäêîñò³ ïîâòîðó:", -1, 15, 105, 150, 10
@@ -35,14 +35,14 @@ END
 
 IDD_HARDWARE DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Устаткування"
+CAPTION "Обладнання"
 FONT 8, "MS Shell Dlg"
 BEGIN
 END
 
 IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100
 STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU
-CAPTION "Заліпанія"
+CAPTION "Залипання"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Êîðîòøå", -1, 35,  50, 30, 10
@@ -50,7 +50,7 @@ BEGIN
   CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17
   PUSHBUTTON "&OK", IDOK, 120, 75, 50, 15
   PUSHBUTTON "&Ñêàñóâàòè", IDCANCEL, 175, 75, 50, 15
-  LTEXT "&Виберіть, як довго слід утримувати натиснуту кнопку миші або трекбола перед спрацьовуванням заліпанія",-1,60,15,170,30
+  LTEXT "&Виберіть, як довго слід утримувати натиснуту кнопку миші або трекбола перед спрацьовуванням залипання",-1,60,15,170,30
   ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15
 END
 
@@ -64,15 +64,15 @@ BEGIN
   CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE
   LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü, ùîá ïðèçíà÷èòè ïðàâó êíîïêó äëÿ âèêîíàííÿ òàêèõ îñíîâíèõ ôóíêö³é, ÿê âèá³ð ³ ïåðåòÿãóâàííÿ", -1, 10, 30, 150, 30
   GROUPBOX "Øâèäê³ñòü ïîäâ³éíîãî êëàöàííÿ", -1, 5, 75, 230, 70
-  LTEXT "Двічі клацніть по цій папці. Якщо папка не відкривається або не закривається, виберіть нижчу швидкість.", -1, 10, 85, 150, 30
+  LTEXT "Двічі клацніть по цій теці. Якщо тека не відкривається або не закривається, виберіть меншу швидкість.", -1, 10, 85, 150, 30
-  LTEXT "&Швидкість:   Нижче", -1, 10, 120, 90, 8
+  LTEXT "&Швидкість: Нижче", -1, 10, 120, 90, 8
-  LTEXT "Вище", -1, 140, 120, 30, 8
+  LTEXT "Вище", -1, 142, 120, 30, 8
-  CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17
+  CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 72, 120, 70, 17
   CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE
   GROUPBOX "Çàëèïàííÿ êíîïêè ìèø³", -1, 5, 150, 230, 70
-  CHECKBOX "&Увімкнути залипання", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20
+  CHECKBOX "&Увімкнути залипання", IDC_CHECK_CLICK_LOCK, 10, 160, 87, 35
   PUSHBUTTON "&Ïàðàìåòðè...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10
-  LTEXT "Дозволяє виконувати виділення й перетягування, не утримуючи кнопку миші натиснутою. Щоб увімкнути цей режим, ненадовго натисніть кнопку миші. Щоб вимкнути цей режим, натисніть кнопку миші ще раз.", -1, 10, 180, 190, 30
+  LTEXT "Дозволяє виконувати виділення й перетягування, не утримуючи кнопку миші натиснутою. Щоб увімкнути цей режим, ненадовго натисніть кнопку миші. Щоб вимкнути цей режим, натисніть кнопку миші ще раз.", -1, 10, 180, 190, 33
 END
 
 IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228
@@ -88,7 +88,7 @@ BEGIN
   LTEXT "&Íàñòðîéêà", -1, 5, 60, 40, 10
   LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY
   CHECKBOX "Óâ³ìêíóòè &ò³íü âêàç³âíèêà", IDC_CHECK_CURSOR_SHADOW, 5, 200, 100, 10
-  PUSHBUTTON "&За замовчуванням", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15
+  PUSHBUTTON "&Стандартно", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15
   PUSHBUTTON "&Îãëÿä", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15
 END
 
@@ -110,22 +110,22 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Ïåðåì³ùåííÿ", -1, 5, 5, 230, 60
-  LTEXT "&Виберіть швидкість руху вказівника:", -1, 60, 15, 110, 10
+  LTEXT "&Виберіть швидкість руху вказівника:", -1, 60, 15, 150, 10
-  LTEXT "Нижче", -1, 60, 30, 20, 10
+  LTEXT "Нижче", -1, 60, 30, 23, 10
   CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17
   LTEXT "Âèùå", -1, 170, 30, 20, 10
   ICON IDI_MOUSE_SPEED, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15
-  CHECKBOX "&Підвищена точність вказівника", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10
+  CHECKBOX "&Підвищена точність вказівника", IDC_CHECK_POINTER_PRECISION, 60, 50, 118, 10
   GROUPBOX "Ïðèâ'ÿçêà äî", -1, 5, 65, 230, 40
   CHECKBOX "Êíîïêè, ùî &âèáèðàíà çà çàìîâ÷óâàííÿì â ä³àëîãîâîìó â³êí³",
            IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP
   ICON IDI_MOUSE_BUTTON, IDC_ICON_SNAP_TO, 15, 75, 15, 15
   GROUPBOX "Âèäèì³ñòü", -1, 5, 105, 230, 95
-  CHECKBOX "&Відображати слід вказівника", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10
+  CHECKBOX "&Відображати слід вказівника", IDC_CHECK_POINTER_TRAIL, 60, 115, 110, 10
   LTEXT "Êîðîòøå", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10
   LTEXT "Äîâøå", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10
   ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15
-  CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17
+  CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 130, 70, 17
   CHECKBOX "Ï&ðèõîâóâàòè âêàç³âíèê ï³ä ÷àñ ââåäåííÿ ç êëàâ³àòóðè", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10
   ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15
   CHECKBOX "Ïîêàçóâàòè ðî&çòàøóâàííÿ âêàç³âíèêà ïðè íàòèñíåíí³ CTRL",
@@ -140,7 +140,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Ïðîêðóòêà", -1, 5, 5, 230, 80
   ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32
-  LTEXT "Поворот колисчатка на одне клацання прокручує", -1, 60, 15, 150, 10
+  LTEXT "Поворот коліщатка на одне клацання прокручує", -1, 60, 15, 150, 10
   RADIOBUTTON "Íà âêàçàíó ê³ëüê³ñòü &ðÿäê³â:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
   RADIOBUTTON "Íà îäèí &åêðàí", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10
   EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP

dll/cpl/mmsys/lang/uk-UA.rc

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        dll/cpl/mmsys/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for Multimedia Control Panel Applet
- * PROGRAMMERS: Artem Reznikov
+ * TRANSLATORS: Artem Reznikov, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -23,7 +23,7 @@ BEGIN
     CHECKBOX "&Âèìêíóòè çâóê", IDC_MUTE_CHECKBOX, 50, 78, 140, 10
     CHECKBOX "Ïîêà&çóâàòè çíà÷îê ãó÷íîñò³ íà ïàíåë³ çàâäàíü", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10
     PUSHBUTTON "&Äîäàòêîâî...", IDC_ADVANCED_BTN, 150,105,75,15
-    GROUPBOX "Настройка динаміків", IDC_SPEAKER_SET_BTN, 7,140,230,80
+    GROUPBOX "Налаштування динаміків", IDC_SPEAKER_SET_BTN, 7,140,230,80
     CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70
     LTEXT "Çà äîïîìîãîþ ðîçòàøîâàíèõ íèæ÷å êíîïîê ìîæíà âèêîíàòè ³íäèâ³äóàëüíó íàñòðîéêó ãó÷íîñò³ äèíàì³ê³â òà ³íøèõ ïàðàìåòð³â.",-1,70,155,150,36
     PUSHBUTTON "&Ãó÷í³ñòü äèíàì³ê³â...", IDC_SPEAKER_VOL_BTN, 70,195,75,15
@@ -56,19 +56,19 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "³äòâîðåííÿ çâóêó", -1, 7,7,230,60
     ICON IDI_CPLICON, IDI_CPLICON, 15,20,32,32
-    LTEXT "&Пристрій за замовчуванням:",-1,50,20,80,17
+    LTEXT "&Пристрій за замовчуванням:",-1,50,20,140,17
     COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST
     PUSHBUTTON "&Ãó÷í³ñòü...", IDC_VOLUME1_BTN, 85,47,70,15
-    PUSHBUTTON "&Настройка...", IDC_ADV2_BTN, 160,47,70,15
+    PUSHBUTTON "&Додатково...", IDC_ADV2_BTN, 160,47,70,15
     GROUPBOX "Çàïèñ çâóêó", -1, 7,75,230,60
     ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,88,32,32
-    LTEXT "Пр&истрій за замовчуванням:",-1,50,88,80,17
+    LTEXT "Пр&истрій за замовчуванням:",-1,50,88,140,17
     COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST
     PUSHBUTTON "Ãó&÷í³ñòü...", IDC_VOLUME2_BTN, 85,115,70,15
-    PUSHBUTTON "Н&астройка...", IDC_ADV1_BTN, 160,115,70,15
+    PUSHBUTTON "Д&одатково...", IDC_ADV1_BTN, 160,115,70,15
     GROUPBOX "³äòâîðåííÿ MIDI", -1, 7,145,230,60
     ICON IDI_MIDICON, IDI_MIDICON, 15,158,32,32
-    LTEXT "При&стрій за замовчуванням:",-1,50,158,80,17
+    LTEXT "При&стрій за замовчуванням:",-1,50,158,140,17
     COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST
     PUSHBUTTON "Ãó÷í³ñò&ü...", IDC_VOLUME3_BTN, 85,185,70,15
     PUSHBUTTON "&³äîìîñò³...", IDC_ADV3_BTN, 160,185,70,15
@@ -83,13 +83,13 @@ BEGIN
     LTEXT "Ö³ ïàðàìåòðè êåðóþòü ãó÷í³ñòþ òà äîäàòêîâîþ íàñòðîéêîþ âèáðàíèõ ïðèñòðî¿â â³äòâîðåííÿ àáî çàïèñó ìîâëåííÿ.",-1,8,7,230,40
     GROUPBOX "³äòâîðåííÿ ìîâëåííÿ", -1, 7,37,230,60
     ICON IDI_CPLICON, IDI_CPLICON, 15,50,32,32
-    LTEXT "Пристрій &за замовчуванням:",-1,50,50,80,17
+    LTEXT "Пристрій &за замовчуванням:",-1,50,50,140,17
     COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST
     PUSHBUTTON "&Ãó÷í³ñòü...", IDC_VOLUME4_BTN, 85,77,70,15
     PUSHBUTTON "&Äîäàòêîâî...", IDC_ADV4_BTN, 160,77,70,15
     GROUPBOX "Çàïèñ ìîâëåííÿ", -1, 7,105,230,60
     ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,118,32,32
-    LTEXT "Пр&истрій за замовчуванням:",-1,50,118,80,17
+    LTEXT "Пр&истрій за замовчуванням:",-1,50,118,140,17
     COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST
     PUSHBUTTON "Ãó&÷í³ñòü...", IDC_VOLUME5_BTN, 85,145,70,15
     PUSHBUTTON "Äîä&àòêîâî...", IDC_ADV5_BTN, 160,145,70,15
@@ -98,7 +98,7 @@ END
 
 IDD_HARDWARE DIALOGEX 0, 0, 246, 228
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Устаткування"
+CAPTION "Обладнання"
 FONT 8, "MS Shell Dlg"
 BEGIN
 

dll/cpl/powercfg/lang/uk-UA.rc

@@ -3,41 +3,41 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        dll/cpl/powercfg/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for powercfg
- * PROGRAMMERS: Artem Reznikov
+ * TRANSLATORS: Artem Reznikov, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 252, 237
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ñõåìè êåðóâàííÿ æèâëåííÿì"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  ICON IDI_ACDC, IDI_ACDC, 7,7,28,22
+  ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-  LTEXT "Âèáåð³òü ñõåìó êåðóâàííÿ æèâëåííÿì ³ç íàéá³ëüø ï³äõîæèìè äëÿ öüîãî êîìï'þòåðà ïàðàìåòðàìè. ßêùî çì³íèòè íèæ÷åíàâåäåí³ ïàðàìåòðè, âèáðàíà ñõåìà òàêîæ çì³íèòüñÿ.",
+  LTEXT "Âèáåð³òü ñõåìó êåðóâàííÿ æèâëåííÿì ³ç íàéá³ëüø ïðèéíÿòíèìè äëÿ öüîãî êîìï'þòåðà ïàðàìåòðàìè. ßêùî çì³íèòè íèæ÷åíàâåäåí³ ïàðàìåòðè, âèáðàíà ñõåìà òàêîæ çì³íèòüñÿ.",
-	-1,45,13,194,36
+	-1,37, 6, 209, 36
-  GROUPBOX "&Ñõåìè êåðóâàííÿ æèâëåííÿì", -1, 7,57,240,46
+  GROUPBOX "&Ñõåìè êåðóâàííÿ æèâëåííÿì", -1, 6, 43, 240, 50
-  COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-  PUSHBUTTON "Çáåðåãòè &ÿê...", IDC_SAVEAS_BTN, 100,85,75,15,WS_DISABLED
+  PUSHBUTTON "Çáåðåãòè &ÿê...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED
-  PUSHBUTTON "Â&èäàëèòè", IDC_DELETE_BTN, 180,85,55,15,WS_DISABLED
+  PUSHBUTTON "Â&èäàëèòè", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED
-  GROUPBOX "Íåìຠäàíèõ", IDC_GRPDETAIL, 7,108,240,105
+  GROUPBOX "Íåìຠäàíèõ", IDC_GRPDETAIL, 6, 95, 240, 136
-  LTEXT "Ïðè æèâëåíí³:",IDC_SAT,15,120,60,10
+  LTEXT "Ïðè æèâëåíí³:",IDC_SAT, 12, 109, 60, 12
-  LTEXT "â³ä ìåðåæ³",IDC_SAC,100,120,45,15
+  LTEXT "â³ä ìåðåæ³",IDC_SAC, 123, 110, 45, 15
-  ICON IDI_AC, IDC_IAC, 75,115,25,15
+  ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-  LTEXT "â³ä áàòàðåé",IDC_SDC,197,120,45,15
+  LTEXT "â³ä áàòàðåé",IDC_SDC, 195, 110, 45, 15
-  ICON IDI_DC, IDC_IDC, 165,115,25,15
+  ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-  LTEXT "Âèìêíåííÿ äèñï&ëåÿ:",IDC_MONITOR,15,145,80,10
+  LTEXT "Âèìêíåííÿ äèñï&ëåÿ:",IDC_MONITOR, 13, 148, 84, 10
-  COMBOBOX IDC_MONITORACLIST, 100,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-  COMBOBOX IDC_MONITORDCLIST, 175,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-  LTEXT "&Âèìêíåííÿ äèñê³â:",IDC_DISK,15,160,80,10
+  LTEXT "&Âèìêíåííÿ äèñê³â:",IDC_DISK, 13, 171, 84, 10
-  COMBOBOX IDC_DISKACLIST, 100,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-  COMBOBOX IDC_DISKDCLIST, 175,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-  LTEXT "Ðå&æèì î÷³êóâàííÿ ÷åðåç:",IDC_STANDBY,15,180,80,10
+  LTEXT "Ðå&æèì î÷³êóâàííÿ:",IDC_STANDBY, 13, 191, 84, 10
-  COMBOBOX IDC_STANDBYACLIST, 100,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-  COMBOBOX IDC_STANDBYDCLIST, 175,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-  LTEXT "Ñ&ïëÿ÷èé ðåæèì ÷åðåç:",IDC_HYBERNATE,15,195,80,10
+  LTEXT "Ñ&ïëÿ÷èé ðåæèì:",IDC_HYBERNATE, 13, 212, 84, 10
-  COMBOBOX IDC_HYBERNATEACLIST, 100,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-  COMBOBOX IDC_HYBERNATEDCLIST, 175,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_PROPPAGEALARMS DIALOGEX DISCARDABLE  0, 0, 250, 220
@@ -126,12 +126,12 @@ END
 STRINGTABLE
 BEGIN
   IDS_CPLNAME_1 "Åëåêòðîæèâëåííÿ"
-  IDS_CPLDESCRIPTION_1 "Íàñòðîéêà ïàðàìåòð³â åíåðãîçáåðåæåííÿ äëÿ êîìï'þòåðà."
+  IDS_CPLDESCRIPTION_1 "Íàëàøòóâàííÿ ïàðàìåòð³â åíåðãîçáåðåæåííÿ äëÿ êîìï'þòåðà."
   IDS_PROCENT "%i%%"
   IDS_SOUND "Çâóê"
   IDS_TEXT "Òåêñò"
-  IDS_CONFIG1 "Íàñòðîéêà ñõåìè æèâëåííÿ ""%1"""
+  IDS_CONFIG1 "Íàëàøòóâàííÿ ñõåìè æèâëåííÿ %1"
-  IDS_CONFIG2 "Äîäàòêîâà íàñòðîéêà äëÿ %1"
+  IDS_CONFIG2 "Äîäàòêîâ³ íàëàøòóâàííÿ äëÿ %1"
 
   IDS_SIZEBYTS "%i áàéò"
   IDS_SIZEMB "%i ÌÁ"

dll/cpl/sysdm/lang/uk-UA.rc

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        dll/cpl/sysdm/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for System Applet
- * TRANSLATOR:  Artem Reznikov
+ * TRANSLATORS:  Artem Reznikov, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -14,52 +14,41 @@ CAPTION "
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL     "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111
-    LTEXT       "Îïåðàö³éíà ñèñòåìà:", IDC_STATIC, 4, 132, 32, 9
+    LTEXT       "Îïåðàö³éíà ñèñòåìà:", IDC_STATIC, 4, 132, 82, 9
     LTEXT       REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9
     LTEXT       "Âåðñ³ÿ ", IDC_STATIC, 10, 153, 25, 9
     LTEXT       REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9
     LTEXT       REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9
-    LTEXT       "Êîìï'þòåð:", IDC_STATIC, 124, 132, 34, 9
+    LTEXT       "Êîìï'þòåð:", IDC_STATIC, 124, 132, 36, 9
     LTEXT       "", IDC_MACHINELINE1, 130, 144, 118, 9
     LTEXT       "", IDC_MACHINELINE2, 130, 153, 118, 9
     LTEXT       "", IDC_MACHINELINE3, 130, 162, 118, 9
     LTEXT       "", IDC_MACHINELINE4, 130, 171, 118, 9
     LTEXT       "", IDC_MACHINELINE5, 130, 180, 118, 9
-    CONTROL     "³äâ³äàºòå <A HREF=""http://www.reactos.org/"">äîìàøíþ ñòîð³íêó ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 93, 8
+    CONTROL     "³äâ³äàºòå <A HREF=""http://www.reactos.org/"">äîìàøíþ ñòîð³íêó ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 150, 8
     PUSHBUTTON  "&˳öåíç³ÿ...", IDC_LICENCE, 170, 199, 78, 14
 END
 
 
 IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Óñòàòêóâàííÿ"
+CAPTION "Îáëàäíàííÿ"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX    "Äèñïåò÷åð ïðèñòðî¿â", IDC_STATIC, 6, 7, 244, 61
     ICON        IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON
-    LTEXT       "Äèñïåò÷åð ïðèñòðî¿â ïåðåë³÷óº âñå óñòàòêóâàííÿ, óñòàíîâëåíå íà öüîìó êîìï'þòåð³. Çà éîãî äîïîìîãîþ ìîæíà çì³íèòè âëàñòèâîñò³ áóäü-ÿêîãî ïðèñòðîþ.", IDC_STATIC, 42, 18, 204, 24
+    LTEXT       "Äèñïåò÷åð ïðèñòðî¿â ïåðåë³÷óº âñå îáëàäíàííÿ, óñòàíîâëåíå íà öüîìó êîìï'þòåð³. Çà éîãî äîïîìîãîþ ìîæíà çì³íèòè âëàñòèâîñò³ áóäü-ÿêîãî ïðèñòðîþ.", IDC_STATIC, 42, 18, 204, 24
     PUSHBUTTON  "&Äèñïåò÷åð ïðèñòðî¿â...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 14
 
-    GROUPBOX    "Óñòàíîâêà óñòàòêóâàííÿ", IDC_STATIC, 6, 79, 244, 61
+    GROUPBOX    "Óñòàíîâêà îáëàäíàííÿ", IDC_STATIC, 6, 79, 244, 61
     ICON        IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON
-    LTEXT       "Ìàéñòåð óñòàíîâêè óñòàòêóâàííÿ äîïîìàãຠóñòàíîâèòè, â³äêëþ÷èòè, â³äíîâèòè, âèòÿãíóòè, òà íàëàøòóâàòè âàøå óñòàòêóâàííÿ.", IDC_STATIC, 42, 90, 204, 24
+    LTEXT       "Ìàéñòåð óñòàíîâêè îáëàäíàííÿ äîïîìàãຠóñòàíîâèòè, â³äêëþ÷èòè, â³äíîâèòè, âèòÿãíóòè, òà íàëàøòóâàòè âàøå îáëàäíàííÿ.", IDC_STATIC, 42, 90, 204, 24
-    PUSHBUTTON  "&Óñòàíîâêà óñòàòêóâàííÿ...", IDC_HARDWARE_WIZARD, 154, 120, 90, 14
+    PUSHBUTTON  "&Óñòàíîâêà îáëàäíàííÿ...", IDC_HARDWARE_WIZARD, 154, 120, 90, 14
 
-    GROUPBOX    "Ïðîô³ë³ óñòàòêóâàííÿ", IDC_STATIC, 6, 149, 244, 61
+    GROUPBOX    "Ïðîô³ë³ îáëàäíàííÿ", IDC_STATIC, 6, 149, 244, 61
     ICON        IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON
-    LTEXT       "Ïðîô³ë³ óñòàòêóâàííÿ äàþòü çìîãó óñòàíîâëþâàòè é çáåð³ãàòè ð³çí³ êîíô³ãóðàö³¿ óñòàòêóâàííÿ.", IDC_STATIC, 42, 160, 204, 24
+    LTEXT       "Ïðîô³ë³ îáëàäíàííÿ äàþòü çìîãó óñòàíîâëþâàòè é çáåð³ãàòè ð³çí³ êîíô³ãóðàö³¿ îáëàäíàííÿ.", IDC_STATIC, 42, 160, 204, 24
-    PUSHBUTTON  "&Ïðîô³ë³ óñòàòêóâàííÿ...", IDC_HARDWARE_PROFILE, 154, 190, 90, 14
+    PUSHBUTTON  "&Ïðîô³ë³ îáëàäíàííÿ...", IDC_HARDWARE_PROFILE, 154, 190, 90, 14
-END
-
-IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "Íàëàøòóâàííÿ ñèñòåìè"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "²íôîðìàö³ÿ ïðî âåðñ³þ",IDC_STATIC,6,3,210,73
-    CONTROL         "Ïîçíà÷èòè ÿê ðîáî÷ó ñòàíö³þ",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10
-    LTEXT           "ReactOS áóäóºòüñÿ ÿê ñåðâåðíà ÎÑ. Îáðàòè ïðàïîðåöü, ùîá çì³íèòè ëèøå öåé äîäàòîê.",IDC_STATIC,15,15,183,41
-    PUSHBUTTON      "OK",IDOK,166,83,50,14
 END
 
 IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218
@@ -73,38 +62,49 @@ BEGIN
     PUSHBUTTON  "Ïàðàìåòðè", IDC_PERFOR, 194, 48, 50, 14
 
     GROUPBOX    "Ïðîô³ë³ êîðèñòóâà÷³â", IDC_STATIC, 6,75,244,48
-    LTEXT       "Ïàðàìåòðè ðîáî÷îãî ñòîëà, ÿê³ ñòîñóþòüñÿ âõîäó äî ñèñòåìè", IDC_STATIC, 16, 88, 210, 20
+    LTEXT       "Ïàðàìåòðè ðîáî÷îãî ñòîëà, ÿê³ ñòîñóþòüñÿ âõîäó äî ñèñòåìè.", IDC_STATIC, 16, 88, 210, 20
     PUSHBUTTON  "Ïàðàìåòðè", IDC_USERPROFILE, 194, 103, 50, 14
 
     GROUPBOX    "Çàâàíòàæåííÿ é â³äíîâëåííÿ", IDC_STATIC, 6, 131, 244, 52
-    LTEXT       "Çàâàíòàæåííÿ é â³äíîâëåííÿ ñèñòåìè, íàëàãîäæóâàëüíà ³íôîðìàö³ÿ", IDC_STATIC, 16, 144, 210, 19
+    LTEXT       "Çàâàíòàæåííÿ é â³äíîâëåííÿ ñèñòåìè, íàëàãîäæóâàëüíà ³íôîðìàö³ÿ.", IDC_STATIC, 16, 144, 210, 19
     PUSHBUTTON  "Ïàðàìåòðè", IDC_STAREC, 194, 162, 50, 14
 
+	PUSHBUTTON  "Íàëàøòóâàííÿ ñèñòåìè", IDC_SYSSETTINGS, 2, 192, 80, 15
     PUSHBUTTON  "Çì³íí³ îòî÷åííÿ", IDC_ENVVAR, 84, 192, 80, 14
     PUSHBUTTON  "Çâ³ò ïðî ïîìèëêè", IDC_ERRORREPORT, 170, 192, 80, 14
 END
 
+IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Íàëàøòóâàííÿ ñèñòåìè"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    GROUPBOX        "²íôîðìàö³ÿ ïðî âåðñ³þ",IDC_STATIC,6,3,210,73
+    CONTROL         "Ïîçíà÷èòè ÿê ðîáî÷ó ñòàíö³þ",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,118,10
+    LTEXT           "ReactOS ïîâóäîâàíà ÿê ñåðâåðíà ÎÑ, ³ òàê ñàìî ïðî ñåáå ïîâ³äîìëÿº. Îáðàòè ïðàïîðåöü, ùîá çì³íèòè öå ëèøå äëÿ ïðîãðàì.",IDC_STATIC,15,15,183,41
+    PUSHBUTTON      "OK",IDOK,166,83,50,14
+END
 
 IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Ïðîô³ë³ óñòàòêóâàííÿ"
+CAPTION "Ïðîô³ë³ îáëàäíàííÿ"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON        IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON
     LTEXT       "Ìîæíà ñòâîðèòè äåê³ëüêà ïðîô³ë³â äëÿ ð³çíèõ êîíô³ãóðàö³é óñòàòêóâàííÿ é âèáèðàòè ïîòð³áíèé ïðîô³ëü ï³ä ÷àñ çàâàíòàæåííÿ ñèñòåìè.", IDC_STATIC, 46, 11, 188, 25
-    LTEXT       "Íàÿâí³ ïðîô³ë³ óñòàòêóâàííÿ:", IDC_STATIC, 8, 41, 120, 8
+    LTEXT       "Íàÿâí³ ïðîô³ë³ îáëàäíàííÿ:", IDC_STATIC, 8, 41, 120, 8
     LISTBOX     IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY
     PUSHBUTTON  "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON
     PUSHBUTTON  "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON
     PUSHBUTTON  "Â&ëàñòèâîñò³", IDC_HRDPROFPROP, 8, 106, 50, 14
     PUSHBUTTON  "&Êîï³þâàòè", IDC_HRDPROFCOPY, 63, 106, 50, 14
-    PUSHBUTTON  "Ïåðåé&ìåíóâàòè", IDC_HRDPROFRENAME, 118, 106, 50, 14
+    PUSHBUTTON  "Ïåðå³&ìåíóâàòè", IDC_HRDPROFRENAME, 116, 106, 54, 14
     PUSHBUTTON  "Â&èäàëèòè", IDC_HRDPROFDEL, 173, 106, 50, 14
 
     GROUPBOX    "Âèá³ð ïðîô³ëþ óñòàòêóâàííÿ", IDC_STATIC, 7, 130, 240, 75
     LTEXT       "ϳä ÷àñ çàâàíòàæåííÿ ReactOS ñë³ä:", IDC_STATIC, 14, 142, 210, 8
-    AUTORADIOBUTTON "çà÷åêàòè, ï&îêè êîðèñòóâà÷ íå âèáåðå ïðîô³ëü", IDC_HRDPROFWAIT, 14, 158, 133, 8, WS_GROUP
+    AUTORADIOBUTTON "çà÷åêàòè, ï&îêè êîðèñòóâà÷ íå âèáåðå ïðîô³ëü", IDC_HRDPROFWAIT, 14, 158, 185, 8, WS_GROUP
-    AUTORADIOBUTTON "âè&áðàòè ïåðøèé ïðîô³ëü ó ñïèñêó, ÿêùî âèá³ð íå çðîáëåíî çà", IDC_HRDPROFSELECT, 14, 173, 190, 8
+    AUTORADIOBUTTON "âè&áðàòè ïåðøèé ïðîô³ëü ó ñïèñêó, ÿêùî âèá³ð íå çðîáëåíî çà", IDC_HRDPROFSELECT, 14, 173, 230, 8
     LTEXT       "ñåê", IDC_STATIC, 65, 187, 35, 8
     EDITTEXT    IDC_HRDPROFEDIT, 25, 185, 35, 12
     CONTROL     "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10
@@ -136,7 +136,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON        IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON
     LTEXT       "Ïðîô³ë³ êîðèñòóâà÷³â ì³ñòÿòü ïàðàìåòðè ðîáî÷îãî ñòîëà òà ³íø³ â³äîìîñò³ ñòîñîâíî îáë³êîâèõ çàïèñ³â êîðèñòóâà÷³â. Âè ìîæåòå ñòâîðèòè îêðåì³ ïðîô³ë³ äëÿ êîæíîãî ç êîìï'þòåð³â, íà ÿêèõ âè ïðàöþºòå, àáî âèêîðèñòîâóâàòè îäèí ñï³ëüíèé ïðîô³ëü äëÿ âñ³õ êîìï'þòåð³â.",
-                    IDC_STATIC, 40, 11, 204, 35
+                    IDC_STATIC, 40, 11, 204, 39
     LTEXT       "Ïðîô³ë³, ÿê³ çáåð³ãàþòüñÿ íà öüîìó êîìï'þòåð³:", IDC_STATIC, 16, 51, 204, 9
     CONTROL     "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,
                     6, 66, 244, 85, WS_EX_CLIENTEDGE
@@ -199,22 +199,22 @@ BEGIN
     LTEXT       "", IDC_DRIVE, 88, 81, 100, 9
     LTEXT       "Äîñòóïíî:", IDC_STATIC, 20, 92, 56, 9
     LTEXT       "", IDC_SPACEAVAIL, 88, 92, 104, 9
-    LTEXT       "&Âèõ³äíèé ðîçì³ð (ÌÁ):", -1, 22, 118, 54, 9
+    LTEXT       "&Âèõ³äíèé ðîçì³ð (ÌÁ):", -1, 22, 118, 75, 9
-    LTEXT       "&Ìàêñèìàëüíèé ðîçì³ð (ÌÁ):", -1, 22, 131, 64, 9
+    LTEXT       "&Ìàêñèìàëüíèé ðîçì³ð (ÌÁ):", -1, 22, 131, 92, 9
-    AUTORADIOBUTTON "&Îñîáëèâèé ðîçì³ð", IDC_CUSTOM, 20, 105, 54, 9, WS_GROUP
+    AUTORADIOBUTTON "&Îñîáëèâèé ðîçì³ð", IDC_CUSTOM, 20, 105, 79, 9, WS_GROUP
-    AUTORADIOBUTTON "&Ðîçì³ð, óñòàíîâëþâàíèé ñèñòåìîþ", IDC_SYSMANSIZE, 20, 145, 88, 9
+    AUTORADIOBUTTON "&Ðîçì³ð, óñòàíîâëþâàíèé ñèñòåìîþ", IDC_SYSMANSIZE, 20, 145, 143, 9
-    AUTORADIOBUTTON "&Áåç ôàéëó äîâàíòàæåííÿ", IDC_NOPAGEFILE, 20, 158, 78,9
+    AUTORADIOBUTTON "&Áåç ôàéëó äîâàíòàæåííÿ", IDC_NOPAGEFILE, 20, 158, 103,9
-    EDITTEXT    IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE
+    EDITTEXT    IDC_INITIALSIZE, 115, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE
-    EDITTEXT    IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE
+    EDITTEXT    IDC_MAXSIZE, 115, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE
     PUSHBUTTON  "Óñòàíîâèòè", IDC_SET, 158, 155, 50, 14
 
     GROUPBOX    "Çàãàëüíèé ðîçì³ð ôàéëó äîâàíòàæåííÿ äëÿ âñ³õ äèñê³â", IDC_TOTALGROUP, 10, 177, 204, 46
-    LTEXT       "̳í³ìàëüíèé ðîçì³ð:", IDC_STATIC, 18, 188, 58, 9
+    LTEXT       "̳í³ìàëüíèé ðîçì³ð:", IDC_STATIC, 18, 188, 88, 9
-    LTEXT       "", IDC_MINIMUM, 88, 188, 100, 9
+    LTEXT       "", IDC_MINIMUM, 93, 188, 100, 9
-    LTEXT       "Ðåêîìåíäîâàíî:", IDC_STATIC, 18, 199, 52, 9
+    LTEXT       "Ðåêîìåíäîâàíî:", IDC_STATIC, 18, 199, 55, 9
-    LTEXT       "", IDC_RECOMMENDED, 88, 197, 100, 9
+    LTEXT       "", IDC_RECOMMENDED, 93, 199, 100, 9
     LTEXT       "Ïîòî÷íèé ðîçì³ð:", IDC_STATIC, 18, 210, 66, 9
-    LTEXT       "", IDC_CURRENT, 88, 208, 100, 9
+    LTEXT       "", IDC_CURRENT, 93, 210, 100, 9
 
     DEFPUSHBUTTON  "OK", IDOK, 114, 232, 48, 14
     PUSHBUTTON  "Ñêàñóâàòè", IDCANCEL, 168, 232, 48, 14
@@ -243,7 +243,7 @@ BEGIN
     PUSHBUTTON  "&Çì³íèòè...", IDC_SYSTEM_VARIABLE_EDIT, 134, 194, 50, 14
     PUSHBUTTON  "Â&èäàëèòè", IDC_SYSTEM_VARIABLE_DELETE, 188, 194, 50, 14
     DEFPUSHBUTTON  "OK", IDOK, 141, 224, 50, 14, WS_GROUP
-    PUSHBUTTON  "Ñèñòåìí³ çì³íí³", IDCANCEL, 195, 224, 50, 14
+    PUSHBUTTON  "Ñêàñóâàòè", IDCANCEL, 195, 224, 50, 14
 END
 
 
@@ -254,7 +254,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT       "&²ì'ÿ çì³ííî¿:", IDC_STATIC, 7, 14, 50, 8
     EDITTEXT    IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL
-    LTEXT       "&Çíà÷åííÿ çì³ííî¿:", IDC_STATIC, 7, 32, 50, 8
+    LTEXT       "&Çíà÷åííÿ çì³ííî¿:", IDC_STATIC, 7, 32, 87, 8
     EDITTEXT    IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL
     DEFPUSHBUTTON  "OK", IDOK, 116, 50, 50, 14
     PUSHBUTTON  "Ñêàñóâàòè", IDCANCEL, 170, 50, 50, 14
@@ -274,7 +274,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_CPLSYSTEMNAME "Ñèñòåìà"
-    IDS_CPLSYSTEMDESCRIPTION "Ïåðåãëÿä â³äîìîñòåé ïðî ñèñòåìó êîìï'þòåðà òà çì³íà ïàðàìåòð³â óñòàòêóâàííÿ, øâèäêî䳿, àâòîìàòè÷íèõ îíîâëåíü."
+    IDS_CPLSYSTEMDESCRIPTION "Ïåðåãëÿä â³äîìîñòåé ïðî ñèñòåìó êîìï'þòåðà òà çì³íà ïàðàìåòð³â îáëàäíàííÿ, øâèäêî䳿, àâòîìàòè÷íèõ îíîâëåíü."
     IDS_MEGABYTE "Ìá ÎÇÏ"
     IDS_GIGABYTE "Ãá ÎÇÏ"
     IDS_TERABYTE "Òá ÎÇÏ"
@@ -291,8 +291,9 @@ BEGIN
     IDS_USERPROFILE_STATUS "Ñòàí"
     IDS_USERPROFILE_MODIFIED "Çì³íåíî"
     IDS_MESSAGEBOXTITLE "System control panel applet"
-    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNINITIALSIZE "Ââåä³òü ÷èñëîâå çíà÷åííÿ äëÿ ïî÷àòêîâîãî ðîçì³ðó ôàéëó äîâàíòàæåííÿ."
-    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Ââåä³òü ÷èñëîâå çíà÷åííÿ äëÿ ìàêñèìàëüíîãî ðîçì³ðó ôàéëó äîâàíòàæåííÿ."
-    IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive."
+    IDS_WARNINITIALRANGE "Ïî÷àòêîâèé ðîçì³ð ôàéëó äîâàíòàæåííÿ íå ïîâèíåí áóòè ìåíøèì 2 Ìá ³ íå ïîâèíåí ïåðåâèùóâàòè îá'ºì â³ëüíîãî ì³ñöÿ íà îáðàíîìó äèñêó."
-    IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive."
+    IDS_WARNMAXIMUMRANGE "Ìàêñèìàëüíèé ðîçì³ð ôàéëó äîâàíòàæåííÿ íå ïîâèíåí áóòè ìåíøèì â³ä ïî÷àòêîâîãî òà íå ïîâèíåí ïåðåâèùóâàòè îá'ºì â³ëüíîãî ì³ñöÿ íà îáðàíîìó äèñêó."
+    IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n"
 END

dll/directx/bdaplgin/bdaplgin.rbuild

@@ -6,7 +6,6 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<include base="bdaplgin">.</include>
 	<library>ntdll</library>
-	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>ole32</library>
 	<library>advapi32</library>

dll/directx/devenum/createdevenum.c

@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * NOTES ON THIS FILE:
  * - Implements ICreateDevEnum interface which creates an IEnumMoniker
@@ -26,29 +26,12 @@
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
 
-
-#define DUMMYSTRUCTNAME   s
-#define DUMMYSTRUCTNAME1  s1
-#define DUMMYSTRUCTNAME2  s2
-#define DUMMYSTRUCTNAME3  s3
-#define DUMMYSTRUCTNAME4  s4
-#define DUMMYSTRUCTNAME5  s5
-
-#define DUMMYUNIONNAME   u
-#define DUMMYUNIONNAME1  u1
-#define DUMMYUNIONNAME2  u2
-#define DUMMYUNIONNAME3  u3
-#define DUMMYUNIONNAME4  u4
-#define DUMMYUNIONNAME5  u5
-#define DUMMYUNIONNAME6  u6
-#define DUMMYUNIONNAME7  u7
-#define DUMMYUNIONNAME8  u8
-
 #include "devenum_private.h"
+#include "vfw.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 #include "mmddk.h"
-#include <regstr.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(devenum);
 
@@ -61,6 +44,14 @@ static const WCHAR wszActiveMovieKey[] = {'S','o','f','t','w','a','r','e','\\',
                                    'M','i','c','r','o','s','o','f','t','\\',
                                    'A','c','t','i','v','e','M','o','v','i','e','\\',
                                    'd','e','v','e','n','u','m','\\',0};
+static const WCHAR wszFilterKeyName[] = {'F','i','l','t','e','r',0};
+static const WCHAR wszMeritName[] = {'M','e','r','i','t',0};
+static const WCHAR wszPins[] = {'P','i','n','s',0};
+static const WCHAR wszAllowedMany[] = {'A','l','l','o','w','e','d','M','a','n','y',0};
+static const WCHAR wszAllowedZero[] = {'A','l','l','o','w','e','d','Z','e','r','o',0};
+static const WCHAR wszDirection[] = {'D','i','r','e','c','t','i','o','n',0};
+static const WCHAR wszIsRendered[] = {'I','s','R','e','n','d','e','r','e','d',0};
+static const WCHAR wszTypes[] = {'T','y','p','e','s',0};
 
 static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface);
 static HRESULT DEVENUM_CreateSpecialCategories(void);
@@ -80,12 +71,12 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface(
     if (IsEqualGUID(riid, &IID_IUnknown) ||
 	IsEqualGUID(riid, &IID_ICreateDevEnum))
     {
-	*ppvObj = (LPVOID)iface;
+        *ppvObj = iface;
 	DEVENUM_ICreateDevEnum_AddRef(iface);
 	return S_OK;
     }
 
-    FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid));
+    FIXME("- no interface IID: %s\n", debugstr_guid(riid));
     return E_NOINTERFACE;
 }
 
@@ -113,10 +104,356 @@ static ULONG WINAPI DEVENUM_ICreateDevEnum_Release(ICreateDevEnum * iface)
     return 1; /* non-heap based object */
 }
 
+HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR *wszRegKeyName, UINT maxLen)
+{
+    if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) ||
+        IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) ||
+        IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) ||
+        IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory))
+    {
+        *pBaseKey = HKEY_CURRENT_USER;
+        strcpyW(wszRegKeyName, wszActiveMovieKey);
+
+        if (!StringFromGUID2(clsidDeviceClass, wszRegKeyName + strlenW(wszRegKeyName), maxLen - strlenW(wszRegKeyName)))
+            return E_OUTOFMEMORY;
+    }
+    else
+    {
+        *pBaseKey = HKEY_CLASSES_ROOT;
+        strcpyW(wszRegKeyName, clsid_keyname);
+        strcatW(wszRegKeyName, wszRegSeparator);
+
+        if (!StringFromGUID2(clsidDeviceClass, wszRegKeyName + CLSID_STR_LEN, maxLen - CLSID_STR_LEN))
+            return E_OUTOFMEMORY;
+
+        strcatW(wszRegKeyName, wszRegSeparator);
+        strcatW(wszRegKeyName, wszInstanceKeyName);
+    }
+
+    return S_OK;
+}
+
+static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS *rgPin)
+{
+    HKEY hkeyTypes = NULL;
+    DWORD dwMajorTypes, i;
+    REGPINTYPES *lpMediaType = NULL;
+    DWORD dwMediaTypeSize = 0;
+
+    if (RegOpenKeyExW(hkeyPinKey, wszTypes, 0, KEY_READ, &hkeyTypes) != ERROR_SUCCESS)
+        return ;
+
+    if (RegQueryInfoKeyW(hkeyTypes, NULL, NULL, NULL, &dwMajorTypes, NULL, NULL, NULL, NULL, NULL, NULL, NULL)
+                != ERROR_SUCCESS)
+    {
+        RegCloseKey(hkeyTypes);
+        return ;
+    }
+
+    for (i = 0; i < dwMajorTypes; i++)
+    {
+        HKEY hkeyMajorType = NULL;
+        WCHAR wszMajorTypeName[64];
+        DWORD cName = sizeof(wszMajorTypeName) / sizeof(WCHAR);
+        DWORD dwMinorTypes, i1;
+
+        if (RegEnumKeyExW(hkeyTypes, i, wszMajorTypeName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue;
+
+        if (RegOpenKeyExW(hkeyTypes, wszMajorTypeName, 0, KEY_READ, &hkeyMajorType) != ERROR_SUCCESS) continue;
+
+        if (RegQueryInfoKeyW(hkeyMajorType, NULL, NULL, NULL, &dwMinorTypes, NULL, NULL, NULL, NULL, NULL, NULL, NULL)
+                    != ERROR_SUCCESS)
+        {
+            RegCloseKey(hkeyMajorType);
+            continue;
+        }
+
+        for (i1 = 0; i1 < dwMinorTypes; i1++)
+        {
+            WCHAR wszMinorTypeName[64];
+            DWORD cName = sizeof(wszMinorTypeName) / sizeof(WCHAR);
+            CLSID *clsMajorType = NULL, *clsMinorType = NULL;
+            HRESULT hr;
+
+            if (RegEnumKeyExW(hkeyMajorType, i1, wszMinorTypeName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue;
+
+            clsMinorType = CoTaskMemAlloc(sizeof(CLSID));
+            if (!clsMinorType) continue;
+
+            clsMajorType = CoTaskMemAlloc(sizeof(CLSID));
+            if (!clsMajorType) goto error_cleanup_types;
+
+            hr = CLSIDFromString(wszMinorTypeName, clsMinorType);
+            if (FAILED(hr)) goto error_cleanup_types;
+
+            hr = CLSIDFromString(wszMajorTypeName, clsMajorType);
+            if (FAILED(hr)) goto error_cleanup_types;
+
+            if (rgPin->nMediaTypes == dwMediaTypeSize)
+            {
+                DWORD dwNewSize = dwMediaTypeSize + (dwMediaTypeSize < 2 ? 1 : dwMediaTypeSize / 2);
+                REGPINTYPES *lpNewMediaType;
+
+                lpNewMediaType = CoTaskMemRealloc(lpMediaType, sizeof(REGPINTYPES) * dwNewSize);
+                if (!lpNewMediaType) goto error_cleanup_types;
+
+                lpMediaType = lpNewMediaType;
+                dwMediaTypeSize = dwNewSize;
+             }
+
+            lpMediaType[rgPin->nMediaTypes].clsMajorType = clsMajorType;
+            lpMediaType[rgPin->nMediaTypes].clsMinorType = clsMinorType;
+            rgPin->nMediaTypes++;
+            continue;
+
+            error_cleanup_types:
+
+            if (clsMajorType) CoTaskMemFree(clsMajorType);
+            if (clsMinorType) CoTaskMemFree(clsMinorType);
+        }
+
+        RegCloseKey(hkeyMajorType);
+    }
+
+    RegCloseKey(hkeyTypes);
+
+    if (lpMediaType && !rgPin->nMediaTypes)
+    {
+        CoTaskMemFree(lpMediaType);
+        lpMediaType = NULL;
+    }
+
+    rgPin->lpMediaType = lpMediaType;
+}
+
+static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2)
+{
+    HKEY hkeyPins = NULL;
+    DWORD dwPinsSubkeys, i;
+    REGFILTERPINS *rgPins = NULL;
+
+    if (RegOpenKeyExW(hkeyFilterClass, wszPins, 0, KEY_READ, &hkeyPins) != ERROR_SUCCESS)
+        return ;
+
+    if (RegQueryInfoKeyW(hkeyPins, NULL, NULL, NULL, &dwPinsSubkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL)
+                != ERROR_SUCCESS)
+    {
+        RegCloseKey(hkeyPins);
+        return ;
+    }
+
+    if (dwPinsSubkeys)
+    {
+        rgPins = CoTaskMemAlloc(sizeof(REGFILTERPINS) * dwPinsSubkeys);
+        if (!rgPins)
+        {
+            RegCloseKey(hkeyPins);
+            return ;
+        }
+    }
+
+    for (i = 0; i < dwPinsSubkeys; i++)
+    {
+        HKEY hkeyPinKey = NULL;
+        WCHAR wszPinName[MAX_PATH];
+        DWORD cName = sizeof(wszPinName) / sizeof(WCHAR);
+        DWORD Type, cbData;
+        REGFILTERPINS *rgPin = &rgPins[rgf2->u.s.cPins];
+        LONG lRet;
+
+        rgPin->strName = NULL;
+        rgPin->clsConnectsToFilter = &GUID_NULL;
+        rgPin->strConnectsToPin = NULL;
+        rgPin->nMediaTypes = 0;
+        rgPin->lpMediaType = NULL;
+
+        if (RegEnumKeyExW(hkeyPins, i, wszPinName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue;
+
+        if (RegOpenKeyExW(hkeyPins, wszPinName, 0, KEY_READ, &hkeyPinKey) != ERROR_SUCCESS) continue;
+
+        rgPin->strName = CoTaskMemAlloc((strlenW(wszPinName) + 1) * sizeof(WCHAR));
+        if (!rgPin->strName) goto error_cleanup;
+
+        strcpyW(rgPin->strName, wszPinName);
+
+        cbData = sizeof(rgPin->bMany);
+        lRet = RegQueryValueExW(hkeyPinKey, wszAllowedMany, NULL, &Type, (LPBYTE)&rgPin->bMany, &cbData);
+        if (lRet != ERROR_SUCCESS || Type != REG_DWORD)
+            goto error_cleanup;
+
+        cbData = sizeof(rgPin->bZero);
+        lRet = RegQueryValueExW(hkeyPinKey, wszAllowedZero, NULL, &Type, (LPBYTE)&rgPin->bZero, &cbData);
+        if (lRet != ERROR_SUCCESS || Type != REG_DWORD)
+            goto error_cleanup;
+
+        cbData = sizeof(rgPin->bOutput);
+        lRet = RegQueryValueExW(hkeyPinKey, wszDirection, NULL, &Type, (LPBYTE)&rgPin->bOutput, &cbData);
+        if (lRet != ERROR_SUCCESS || Type != REG_DWORD)
+            goto error_cleanup;
+
+        cbData = sizeof(rgPin->bRendered);
+        lRet = RegQueryValueExW(hkeyPinKey, wszIsRendered, NULL, &Type, (LPBYTE)&rgPin->bRendered, &cbData);
+        if (lRet != ERROR_SUCCESS || Type != REG_DWORD)
+            goto error_cleanup;
+
+        DEVENUM_ReadPinTypes(hkeyPinKey, rgPin);
+
+        ++rgf2->u.s.cPins;
+        continue;
+
+        error_cleanup:
+
+        RegCloseKey(hkeyPinKey);
+        if (rgPin->strName) CoTaskMemFree(rgPin->strName);
+    }
+
+    RegCloseKey(hkeyPins);
+
+    if (rgPins && !rgf2->u.s.cPins)
+    {
+        CoTaskMemFree(rgPins);
+        rgPins = NULL;
+    }
+
+    rgf2->u.s.rgPins = rgPins;
+}
+
+static HRESULT DEVENUM_RegisterLegacyAmFilters(void)
+{
+    HKEY hkeyFilter = NULL;
+    DWORD dwFilterSubkeys, i;
+    LONG lRet;
+    IFilterMapper2 *pMapper = NULL;
+    HRESULT hr;
+
+    hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC,
+                           &IID_IFilterMapper2, (void **) &pMapper);
+    if (SUCCEEDED(hr))
+    {
+        lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszFilterKeyName, 0, KEY_READ, &hkeyFilter);
+        hr = HRESULT_FROM_WIN32(lRet);
+    }
+
+    if (SUCCEEDED(hr))
+    {
+        lRet = RegQueryInfoKeyW(hkeyFilter, NULL, NULL, NULL, &dwFilterSubkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+        hr = HRESULT_FROM_WIN32(lRet);
+    }
+
+    if (SUCCEEDED(hr))
+    {
+        for (i = 0; i < dwFilterSubkeys; i++)
+        {
+            WCHAR wszFilterSubkeyName[64];
+            DWORD cName = sizeof(wszFilterSubkeyName) / sizeof(WCHAR);
+            HKEY hkeyCategoryBaseKey;
+            WCHAR wszRegKey[MAX_PATH];
+            HKEY hkeyInstance = NULL;
+            HRESULT hr;
+
+            if (RegEnumKeyExW(hkeyFilter, i, wszFilterSubkeyName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue;
+
+            hr = DEVENUM_GetCategoryKey(&CLSID_LegacyAmFilterCategory, &hkeyCategoryBaseKey, wszRegKey, MAX_PATH);
+            if (FAILED(hr)) continue;
+
+            strcatW(wszRegKey, wszRegSeparator);
+            strcatW(wszRegKey, wszFilterSubkeyName);
+
+            if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszRegKey, 0, KEY_READ, &hkeyInstance) == ERROR_SUCCESS)
+            {
+                RegCloseKey(hkeyInstance);
+            }
+            else
+            {
+                /* Filter is registered the IFilterMapper(1)-way in HKCR\Filter. Needs to be added to
+                 * legacy am filter category. */
+                HKEY hkeyFilterClass = NULL;
+                REGFILTER2 rgf2;
+                CLSID clsidFilter;
+                WCHAR wszFilterName[MAX_PATH];
+                DWORD Type;
+                DWORD cbData;
+                HRESULT res;
+                IMoniker *pMoniker = NULL;
+
+                TRACE("Registering %s\n", debugstr_w(wszFilterSubkeyName));
+
+                strcpyW(wszRegKey, clsid_keyname);
+                strcatW(wszRegKey, wszRegSeparator);
+                strcatW(wszRegKey, wszFilterSubkeyName);
+
+                if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszRegKey, 0, KEY_READ, &hkeyFilterClass) != ERROR_SUCCESS)
+                    continue;
+
+                rgf2.dwVersion = 1;
+                rgf2.dwMerit = 0;
+                rgf2.u.s.cPins = 0;
+                rgf2.u.s.rgPins = NULL;
+
+                cbData = sizeof(wszFilterName);
+                if (RegQueryValueExW(hkeyFilterClass, NULL, NULL, &Type, (LPBYTE)wszFilterName, &cbData) != ERROR_SUCCESS ||
+                    Type != REG_SZ)
+                    goto cleanup;
+
+                cbData = sizeof(rgf2.dwMerit);
+                if (RegQueryValueExW(hkeyFilterClass, wszMeritName, NULL, &Type, (LPBYTE)&rgf2.dwMerit, &cbData) != ERROR_SUCCESS ||
+                    Type != REG_DWORD)
+                    goto cleanup;
+
+                DEVENUM_ReadPins(hkeyFilterClass, &rgf2);
+
+                res = CLSIDFromString(wszFilterSubkeyName, &clsidFilter);
+                if (FAILED(res)) goto cleanup;
+
+                IFilterMapper2_RegisterFilter(pMapper, &clsidFilter, wszFilterName, &pMoniker, NULL, NULL, &rgf2);
+
+                if (pMoniker)
+                    IMoniker_Release(pMoniker);
+
+                cleanup:
+
+                if (hkeyFilterClass) RegCloseKey(hkeyFilterClass);
+
+                if (rgf2.u.s.rgPins)
+                {
+                    UINT iPin;
+
+                    for (iPin = 0; iPin < rgf2.u.s.cPins; iPin++)
+                    {
+                        CoTaskMemFree(rgf2.u.s.rgPins[iPin].strName);
+
+                        if (rgf2.u.s.rgPins[iPin].lpMediaType)
+                        {
+                            UINT iType;
+
+                            for (iType = 0; iType < rgf2.u.s.rgPins[iPin].nMediaTypes; iType++)
+                            {
+                                CoTaskMemFree((void*)rgf2.u.s.rgPins[iPin].lpMediaType[iType].clsMajorType);
+                                CoTaskMemFree((void*)rgf2.u.s.rgPins[iPin].lpMediaType[iType].clsMinorType);
+                            }
+
+                            CoTaskMemFree((void*)rgf2.u.s.rgPins[iPin].lpMediaType);
+                        }
+                    }
+
+                    CoTaskMemFree((void*)rgf2.u.s.rgPins);
+                }
+            }
+        }
+    }
+
+    if (hkeyFilter) RegCloseKey(hkeyFilter);
+
+    if (pMapper)
+        IFilterMapper2_Release(pMapper);
+
+    return S_OK;
+}
+
 /**********************************************************************
  * DEVENUM_ICreateDevEnum_CreateClassEnumerator
  */
-HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator(
+static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator(
     ICreateDevEnum * iface,
     REFCLSID clsidDeviceClass,
     IEnumMoniker **ppEnumMoniker,
@@ -125,80 +462,53 @@ HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator(
     WCHAR wszRegKey[MAX_PATH];
     HKEY hkey;
     HKEY hbasekey;
-    BOOL bInterface = FALSE;
+    HRESULT hr;
     CreateDevEnumImpl *This = (CreateDevEnumImpl *)iface;
 
-    TRACE("(%p)->(%s, %p, %lx)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass));
+    TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass));
 
     if (!ppEnumMoniker)
         return E_POINTER;
 
     *ppEnumMoniker = NULL;
 
+    if (IsEqualGUID(clsidDeviceClass, &CLSID_LegacyAmFilterCategory))
+    {
+        DEVENUM_RegisterLegacyAmFilters();
+    }
+
+    hr = DEVENUM_GetCategoryKey(clsidDeviceClass, &hbasekey, wszRegKey, MAX_PATH);
+    if (FAILED(hr))
+        return hr;
+
     if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) ||
         IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) ||
+        IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) ||
         IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory))
     {
-        hbasekey = HKEY_CURRENT_USER;
+         hr = DEVENUM_CreateSpecialCategories();
-        strcpyW(wszRegKey, wszActiveMovieKey);
+         if (FAILED(hr))
-
+             return hr;
-        if (!StringFromGUID2(clsidDeviceClass, wszRegKey + strlenW(wszRegKey), MAX_PATH - strlenW(wszRegKey)))
+         if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS)
-            return E_OUTOFMEMORY;
+         {
+             ERR("Couldn't open registry key for special device: %s\n",
+                 debugstr_guid(clsidDeviceClass));
+             return S_FALSE;
+         }
     }
-    else
+    else if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS)
     {
-        hbasekey = HKEY_CLASSES_ROOT;
+        FIXME("Category %s not found\n", debugstr_guid(clsidDeviceClass));
-        strcpyW(wszRegKey, clsid_keyname);
+        return S_FALSE;
-        strcatW(wszRegKey, wszRegSeparator);
-
-        if (!StringFromGUID2(clsidDeviceClass, wszRegKey + CLSID_STR_LEN, MAX_PATH - CLSID_STR_LEN))
-            return E_OUTOFMEMORY;
-
-        strcatW(wszRegKey, wszRegSeparator);
-        strcatW(wszRegKey, wszInstanceKeyName);
     }
 
-    if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS)
+    return DEVENUM_IEnumMoniker_Construct(hkey, ppEnumMoniker);
-    {
-        if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) ||
-            IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) ||
-            IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory))
-        {
-             HRESULT hr = DEVENUM_CreateSpecialCategories();
-             if (FAILED(hr))
-                 return hr;
-             if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS)
-             {
-                 ERR("Couldn't open registry key for special device: %s\n",
-                     debugstr_guid(clsidDeviceClass));
-                 return S_FALSE;
-             }
-        }
-        else
-        {
-             wcscpy(wszRegKey, REGSTR_PATH_DEVICE_CLASSES);
-             wcscat(wszRegKey, L"\\");
-
-            if (!StringFromGUID2(clsidDeviceClass, wszRegKey + wcslen(wszRegKey), MAX_PATH - CLSID_STR_LEN))
-                return E_OUTOFMEMORY;
-
-            if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRegKey, 0, KEY_READ, &hkey) != ERROR_SUCCESS)
-            {
-                FIXME("Category %s not found\n", debugstr_guid(clsidDeviceClass));
-                return S_FALSE;
-            }
-
-            bInterface = TRUE;
-        }
-    }
-
-    return DEVENUM_IEnumMoniker_Construct(hkey, ppEnumMoniker, bInterface);
 }
 
 /**********************************************************************
  * ICreateDevEnum_Vtbl
  */
-static ICreateDevEnumVtbl ICreateDevEnum_Vtbl =
+static const ICreateDevEnumVtbl ICreateDevEnum_Vtbl =
 {
     DEVENUM_ICreateDevEnum_QueryInterface,
     DEVENUM_ICreateDevEnum_AddRef,
@@ -229,8 +539,10 @@ static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory)
         res = E_INVALIDARG;
 
     if (SUCCEEDED(res))
-        res = HRESULT_FROM_WIN32(
+    {
-            RegCreateKeyW(HKEY_CURRENT_USER, wszRegKey, &hkeyDummy));
+        LONG lRes = RegCreateKeyW(HKEY_CURRENT_USER, wszRegKey, &hkeyDummy);
+        res = HRESULT_FROM_WIN32(lRes);
+    }
 
     if (hkeyDummy)
         RegCloseKey(hkeyDummy);
@@ -241,12 +553,18 @@ static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory)
     return res;
 }
 
+static HANDLE DEVENUM_populate_handle;
+static const WCHAR DEVENUM_populate_handle_nameW[] =
+    {'_','_','W','I','N','E','_',
+     'D','e','v','e','n','u','m','_',
+     'P','o','p','u','l','a','t','e',0};
+
 /**********************************************************************
  * DEVENUM_CreateSpecialCategories (INTERNAL)
  *
  * Creates the keys in the registry for the dynamic categories
  */
-static HRESULT DEVENUM_CreateSpecialCategories()
+static HRESULT DEVENUM_CreateSpecialCategories(void)
 {
     HRESULT res;
     WCHAR szDSoundNameFormat[MAX_PATH + 1];
@@ -256,12 +574,40 @@ static HRESULT DEVENUM_CreateSpecialCategories()
     IFilterMapper2 * pMapper = NULL;
     REGFILTER2 rf2;
     REGFILTERPINS2 rfp2;
+    WCHAR path[MAX_PATH];
+    HKEY basekey;
+
+    if (DEVENUM_populate_handle)
+        return S_OK;
+    DEVENUM_populate_handle = CreateEventW(NULL, TRUE, FALSE, DEVENUM_populate_handle_nameW);
+    if (GetLastError() == ERROR_ALREADY_EXISTS)
+    {
+        /* Webcams can take some time to scan if the driver is badly written and it enables them,
+         * so have a 10 s timeout here
+         */
+        if (WaitForSingleObject(DEVENUM_populate_handle, 10000) == WAIT_TIMEOUT)
+            WARN("Waiting for object timed out\n");
+        TRACE("No need to rescan\n");
+        return S_OK;
+    }
+    TRACE("Scanning for devices\n");
+
+    /* Since devices can change between session, for example because you just plugged in a webcam
+     * or switched from pulseaudio to alsa, delete all old devices first
+     */
+    if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioRendererCategory, &basekey, path, MAX_PATH)))
+        RegDeleteTreeW(basekey, path);
+    if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioInputDeviceCategory, &basekey, path, MAX_PATH)))
+        RegDeleteTreeW(basekey, path);
+    if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoInputDeviceCategory, &basekey, path, MAX_PATH)))
+        RegDeleteTreeW(basekey, path);
+    if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_MidiRendererCategory, &basekey, path, MAX_PATH)))
+        RegDeleteTreeW(basekey, path);
 
     rf2.dwVersion = 2;
     rf2.dwMerit = MERIT_PREFERRED;
     rf2.u.s1.cPins2 = 1;
     rf2.u.s1.rgPins2 = &rfp2;
-    rfp2.dwFlags = REG_PINFLAG_B_RENDERER;
     rfp2.cInstances = 1;
     rfp2.nMediums = 0;
     rfp2.lpMedium = NULL;
@@ -269,7 +615,7 @@ static HRESULT DEVENUM_CreateSpecialCategories()
 
     if (!LoadStringW(DEVENUM_hInstance, IDS_DEVENUM_DS, szDSoundNameFormat, sizeof(szDSoundNameFormat)/sizeof(szDSoundNameFormat[0])-1))
     {
-        ERR("Couldn't get string resource (GetLastError() is %ld)\n", GetLastError());
+        ERR("Couldn't get string resource (GetLastError() is %d)\n", GetLastError());
         return HRESULT_FROM_WIN32(GetLastError());
     }
 
@@ -292,6 +638,7 @@ static HRESULT DEVENUM_CreateSpecialCategories()
         if (FAILED(res)) /* can't register any devices in this category */
             numDevs = 0;
 
+	rfp2.dwFlags = REG_PINFLAG_B_RENDERER;
 	for (i = 0; i < numDevs; i++)
 	{
 	    if (waveOutGetDevCapsW(i, &wocaps, sizeof(WAVEOUTCAPSW))
@@ -355,6 +702,7 @@ static HRESULT DEVENUM_CreateSpecialCategories()
         if (FAILED(res)) /* can't register any devices in this category */
             numDevs = 0;
 
+	rfp2.dwFlags = REG_PINFLAG_B_OUTPUT;
         for (i = 0; i < numDevs; i++)
         {
             if (waveInGetDevCapsW(i, &wicaps, sizeof(WAVEINCAPSW))
@@ -399,6 +747,7 @@ static HRESULT DEVENUM_CreateSpecialCategories()
         if (FAILED(res)) /* can't register any devices in this category */
             numDevs = 0;
 
+	rfp2.dwFlags = REG_PINFLAG_B_RENDERER;
 	for (i = 0; i < numDevs; i++)
 	{
 	    if (midiOutGetDevCapsW(i, &mocaps, sizeof(MIDIOUTCAPSW))
@@ -442,9 +791,61 @@ static HRESULT DEVENUM_CreateSpecialCategories()
                 CoTaskMemFree(pTypes);
 	    }
 	}
+        res = DEVENUM_CreateAMCategoryKey(&CLSID_VideoInputDeviceCategory);
+        if (SUCCEEDED(res))
+            for (i = 0; i < 10; i++)
+            {
+                WCHAR szDeviceName[32], szDeviceVersion[32], szDevicePath[10];
+
+                if (capGetDriverDescriptionW ((WORD) i,
+                                              szDeviceName, sizeof(szDeviceName)/sizeof(WCHAR),
+                                              szDeviceVersion, sizeof(szDeviceVersion)/sizeof(WCHAR)))
+                {
+                    IMoniker * pMoniker = NULL;
+                    IPropertyBag * pPropBag = NULL;
+                    WCHAR dprintf[] = { 'v','i','d','e','o','%','d',0 };
+                    snprintfW(szDevicePath, sizeof(szDevicePath)/sizeof(WCHAR), dprintf, i);
+                    /* The above code prevents 1 device with a different ID overwriting another */
+
+                    rfp2.nMediaTypes = 1;
+                    pTypes = CoTaskMemAlloc(rfp2.nMediaTypes * sizeof(REGPINTYPES));
+                    if (!pTypes) {
+                        IFilterMapper2_Release(pMapper);
+                        return E_OUTOFMEMORY;
+                    }
+
+                    pTypes[0].clsMajorType = &MEDIATYPE_Video;
+                    pTypes[0].clsMinorType = &MEDIASUBTYPE_None;
+
+                    rfp2.lpMediaType = pTypes;
+
+                    res = IFilterMapper2_RegisterFilter(pMapper,
+                                                        &CLSID_VfwCapture,
+                                                        szDeviceName,
+                                                        &pMoniker,
+                                                        &CLSID_VideoInputDeviceCategory,
+                                                        szDevicePath,
+                                                        &rf2);
+
+                    if (pMoniker) {
+                       OLECHAR wszVfwIndex[] = { 'V','F','W','I','n','d','e','x',0 };
+                       VARIANT var;
+                       V_VT(&var) = VT_I4;
+                       V_UNION(&var, ulVal) = i;
+                       res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag);
+                       if (SUCCEEDED(res))
+                          res = IPropertyBag_Write(pPropBag, wszVfwIndex, &var);
+                       IMoniker_Release(pMoniker);
+                    }
+
+                    if (i == iDefaultDevice) FIXME("Default device\n");
+                    CoTaskMemFree(pTypes);
+                }
+            }
     }
 
     if (pMapper)
         IFilterMapper2_Release(pMapper);
+    SetEvent(DEVENUM_populate_handle);
     return res;
 }