Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

by fireball＠svn.reactos.org

Author: fireball Date: Fri Feb 8 13:52:20 2008 New Revision: 32213 URL: http://svn.reactos.org/svn/reactos?rev=32213&view=rev Log: - Formatting fixes. Modified: trunk/reactos/ReactOS-arm.rbuild Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=322… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild (original) +++ trunk/reactos/ReactOS-arm.rbuild Fri Feb 8 13:52:20 2008 @@ -34,6 +34,6 @@ <compilerflag>-Wno-attributes</compilerflag> <compilerflag>-fno-strict-aliasing</compilerflag> <linkerflag>-s</linkerflag> - <linkerflag>-lgcc</linkerflag> - <linkerflag>-static</linkerflag> + <linkerflag>-lgcc</linkerflag> + <linkerflag>-static</linkerflag> </project>

16 years, 8 months

[dreimer] 32212: Bug 3043: Polish translation update (olaf_siejka@o2.pl) Bug 3044: Ukrainian translation update (temarez@yandex.ru) Part 3 of 3.

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Feb 8 13:24:02 2008 New Revision: 32212 URL: http://svn.reactos.org/svn/reactos?rev=32212&view=rev Log: Bug 3043: Polish translation update (olaf_siejka(a)o2.pl) Bug 3044: Ukrainian translation update (temarez(a)yandex.ru) Part 3 of 3. Modified: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc Fri Feb 8 13:24:02 2008 @@ -1,5 +1,5 @@ /* - * translated by Caemyr - Olaf Siejka (Jan, 2008) + * translated by Caemyr - Olaf Siejka (Jan-Feb, 2008) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -108,89 +108,89 @@ IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Save Scheme As" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Save this sound scheme as:", -1, 7, 7, 212, 9 +CAPTION "Zapisz schemat jako..." +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Zapisz bierz¹cy schemat dzwiêkowy jako:", -1, 7, 7, 212, 9 EDITTEXT 8960, 7, 17, 211, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 93, 36, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 157, 36, 60, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 157, 36, 60, 14 END IDD_SPEAKERS DIALOG 0, 0, 257, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Speakers" +CAPTION "G³oniki" FONT 8, "MS Shell Dlg" BEGIN ICON 4379, -1, 7, 8, 20, 20 - LTEXT "Select the speaker setup that is most like the setup you have on your computer.", -1, 36, 8, 215, 27 + LTEXT "Wybierz takie ustawienie g³oników, które najbardziej odpowiada rzeczywistemu.", -1, 36, 8, 215, 27 CONTROL 110, 5376, "STATIC", SS_BITMAP | SS_CENTERIMAGE, 37, 40, 209, 112, WS_EX_TRANSPARENT - LTEXT "S&peaker setup:", 8502, 53, 169, 55, 10 + LTEXT "&Ustawienie g³oników:", 8502, 53, 169, 55, 10 COMBOBOX 5401, 52, 182, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP END IDD_PERFORMANCE1 DIALOG 0, 0, 257, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Performance" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "These settings control how ReactOS plays audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 218, 23 - GROUPBOX "Audio playback", 8494, 7, 32, 243, 152 +CAPTION "Wydajnoæ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Niniejsze ustawienia maj¹ wp³yw na dwiêk, odtwarzany przez ReactOS. Mo¿esz, dziêki nim, zdiagnozowaæ niektóre problemy z dzwiêkiem.", 8492, 34, 7, 218, 23 + GROUPBOX "Odtwarzanie", 8494, 7, 32, 243, 152 ICON 4379, 8512, 8, 8, 20, 20 - LTEXT "&Hardware acceleration:", 8495, 13, 56, 111, 14 + LTEXT "&Przyspieszanie sprzêtowe:", 8495, 13, 56, 111, 14 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 54, 62, 18 - LTEXT "&Sample rate conversion quality:", 8496, 13, 123, 103, 14 + LTEXT "&Jakoæ próbkowania dwiêku:", 8496, 13, 123, 103, 14 CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 121, 62, 18 - PUSHBUTTON "&Restore Defaults", 5400, 7, 191, 110, 14 - LTEXT "None", 8497, 128, 56, 21, 10 - LTEXT "Full", 8498, 214, 56, 21, 9 - LTEXT "Good", 8499, 128, 123, 21, 10 - LTEXT "Best", 8500, 214, 123, 23, 9 - LTEXT "This string describes the hardware setting for the capture device", 5399, 13, 145, 227, 21 - LTEXT "This string describes the hardware setting for the render device", 5398, 13, 78, 227, 22 + PUSHBUTTON "&Odtwórz domylne", 5400, 7, 191, 110, 14 + LTEXT "Brak", 8497, 128, 56, 21, 10 + LTEXT "Pe³ne", 8498, 214, 56, 21, 9 + LTEXT "S³aba", 8499, 128, 123, 21, 10 + LTEXT "Najlepsza", 8500, 214, 123, 23, 9 + LTEXT "Ustawienia sprzêtowe urz¹dzenia nagrywania", 5399, 13, 145, 227, 21 + LTEXT "Ustawienia sprzêtowe urz¹dzenia odtwarzania", 5398, 13, 78, 227, 22 END IDD_PERFORMANCE2 DIALOG 0, 0, 257, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Performance" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "These settings control how ReactOS records audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 217, 20 - GROUPBOX "Audio recording", 8494, 7, 29, 242, 122 +CAPTION "Wydajnoæ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Niniejsze ustawienia maj¹ wp³yw na dwiêk, odtwarzany przez ReactOS. Mo¿esz, dziêki nim, zdiagnozowaæ niektóre problemy z dzwiêkiem.", 8492, 34, 7, 217, 20 + GROUPBOX "Nagrywanie", 8494, 7, 29, 242, 122 ICON 4380, 8512, 8, 7, 20, 20 - LTEXT "&Hardware acceleration:", 8495, 13, 46, 103, 17 + LTEXT "&Przyspieszanie sprzêtowe:", 8495, 13, 46, 103, 17 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 43, 62, 18 - LTEXT "&Sample rate conversion quality:", 8496, 13, 103, 103, 17 + LTEXT "&Jakoæ próbkowania dwiêku:", 8496, 13, 103, 103, 17 CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 101, 62, 18 - PUSHBUTTON "&Restore Defaults", 5400, 9, 158, 110, 14 - LTEXT "None", 8497, 125, 46, 24, 10 - LTEXT "Full", 8498, 217, 46, 19, 9 - LTEXT "Good", 8499, 125, 103, 24, 10 - LTEXT "Best", 8500, 217, 103, 19, 9 - LTEXT "This string describes the hardware setting for the capture device", 5399, 13, 125, 222, 21 - LTEXT "This string describes the hardware setting for the render device", 5398, 13, 68, 218, 24 + PUSHBUTTON "&Odtwórz domylne", 5400, 9, 158, 110, 14 + LTEXT "Brak", 8497, 125, 46, 24, 10 + LTEXT "Pe³ne", 8498, 217, 46, 19, 9 + LTEXT "S³aba", 8499, 125, 103, 24, 10 + LTEXT "Najlepsza", 8500, 217, 103, 19, 9 + LTEXT "Ustawienia sprzêtowe urz¹dzenia nagrywania", 5399, 13, 125, 222, 21 + LTEXT "Ustawienia sprzêtowe urz¹dzenia odtwarzania", 5398, 13, 68, 218, 24 END IDD_SETUP1 DIALOG 0, 0, 227, 206 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Setup" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "ReactOS Audio", 10243, 7, 5, 213, 192 +CAPTION "Konfiguracja" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Us³uga ReactOS Audio", 10243, 7, 5, 213, 192 ICON 4393, 10241, 26, 26, 20, 20 - LTEXT "This computer cannot play audio because the ReactOS Audio service is not enabled.", 10245, 60, 25, 150, 40 - AUTOCHECKBOX "&Enable ReactOS Audio", 10253, 60, 68, 150, 9 - LTEXT "Notes", 10246, 58, 87, 150, 11 - LTEXT "1. You must be an administrator to enable this service. If you are not logged on as administrator, you will be prompted for an administrator name and password.", 10247, 60, 100, 150, 40 - LTEXT "2. After you enable ReactOS Audio you will have to restart the computer.", 10248, 60, 140, 150, 40 + LTEXT "Ten komputer nie mo¿e odtwarzaæ dwiêku, poniewa¿ us³uga ReactOS Audio nie zosta³a w³¹czona.", 10245, 60, 25, 150, 40 + AUTOCHECKBOX "&W³¹cz ReactOS Audio", 10253, 60, 68, 150, 9 + LTEXT "Uwagi", 10246, 58, 87, 150, 11 + LTEXT "1. Musisz mieæ uprawnienia administratora, by w³¹czyæ t¹ us³ugê. Jeli nie masz uprawnieñ, konieczne bêdzie przelogowanie siê na konto administratora.", 10247, 60, 100, 150, 40 + LTEXT "2. Po w³¹czeniu us³ugi ReactOS Audio konieczne bêdzie zrestartowanie komputera.", 10248, 60, 140, 150, 40 END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Multichannel" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Description goes here.", 9506, 8, 4, 212, 24 +CAPTION "Dzwiêk wielokana³owy" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Opis ma byæ tutaj.", 9506, 8, 4, 212, 24 LTEXT "Low", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 @@ -223,20 +223,20 @@ LTEXT "", 9500, 5, 164, 55, 8 CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 LTEXT "High", 9502, 202, 164, 17, 8 - AUTOCHECKBOX "&Move all slide indicators at the same time", 9504, 5, 185, 216, 9 - PUSHBUTTON "Restore &Defaults", 9505, 110, 199, 110, 14 + AUTOCHECKBOX "&Po³¹cz wszystkie suwaki", 9504, 5, 185, 216, 9 + PUSHBUTTON "Odtwórz &domylne", 9505, 110, 199, 110, 14 END IDD_SETUP2 DIALOG 0, 0, 227, 206 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Setup" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "ReactOS Audio", 10259, 7, 5, 213, 192 +CAPTION "Konfiguracja" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Us³uga ReactOS Audio", 10259, 7, 5, 213, 192 ICON 4394, 10257, 25, 25, 20, 20 - LTEXT "The ReactOS Audio service is now enabled. However, audio may not function properly until you restart ReactOS. If you want to restart now, first save your work and close all programs.", 10261, 60, 25, 150, 50 - LTEXT "To restart ReactOS, click OK.", 10262, 60, 75, 150, 20 - LTEXT "If you Cancel, you will need to restart later for ReactOS Audio to function properly.", 10263, 60, 100, 150, 40 + LTEXT "Us³uga ReactOS Audio zosta³a pomylnie w³¹czona. Jednak¿e dwiêk mo¿e nie byæ poprawnie odtwarzany, dopóki nie zrestartujesz systemu. Przed restartem upewnij siê, czy wszystkie twoje dokumenty zosta³y zapisane.", 10261, 60, 25, 150, 50 + LTEXT "Aby zrestartowaæ ReactOS, nacinij OK.", 10262, 60, 75, 150, 20 + LTEXT "Jeli wciniesz Anuluj, konieczny bêdzie pózniejszy restart systemu aby us³uga ReactOS Audio zadzia³a³a prawid³owo.", 10263, 60, 100, 150, 40 END STRINGTABLE @@ -245,33 +245,33 @@ IDS_CPLDESCRIPTION "Zmieñ schemat dwiêkowy dla tego komputera lub skonfiguruj ustawienia g³oników i urz¹dzeñ nagrywaj¹cych." IDS_NO_SOUND "(Brak)" - 5825 "Program error" - 5826 "Close program" - 5827 "Critical Battery Alarm" - 5828 "Device Connect" - 5829 "Device Disconnect" - 5830 "Device Failed to Connect" - 5831 "Empty Recycle Bin" - 5832 "Low Battery Alarm" - 5833 "Maximize" - 5834 "Menu command" - 5835 "Menu popup" - 5836 "Minimize" - 5837 "New Mail Notification" + 5825 "B³¹d programu" + 5826 "Zamknij program" + 5827 "Krytyczny stan baterii" + 5828 "Urz¹dzenie pod³¹czone" + 5829 "Urz¹dzenie od³¹czone" + 5830 "B³¹d podczas pod³¹czania urz¹dzenia" + 5831 "Opró¿nianie kosza" + 5832 "Niski stan baterii" + 5833 "Pe³en ekran" + 5834 "Polecenie Menu" + 5835 "Wywo³anie Menu" + 5836 "Minimalizuj" + 5837 "Powiadomienie o nowej poczcie" 5838 "Start Navigation" - 5839 "Open program" - 5840 "Print Complete" + 5839 "Uruchomienie programu" + 5840 "Zakoñczenie programu" 5841 "Restore Down" 5842 "Restore Up" 5843 "Asterisk" - 5844 "Default sound" - 5845 "Exclamation" - 5846 "Exit ReactOS" - 5847 "Critical Stop" - 5848 "System Notification" - 5849 "Question" - 5850 "Start ReactOS" + 5844 "Dwiêk domylny" + 5845 "Wykrzyknik" + 5846 "Zamkniêcie ReactOS" + 5847 "B³¹d krytyczny" + 5848 "Powiadomienie systemowe" + 5849 "Znak zapytania" + 5850 "Uruchomienie ReactOS" 5851 "Start Menu" - 5852 "ReactOS Logoff" - 5853 "ReactOS Logon" -END + 5852 "Wylogowanie z ReactOS" + 5853 "Logowanie do ReactOS" +END Modified: trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc Fri Feb 8 13:24:02 2008 @@ -40,13 +40,13 @@ BEGIN IDS_DEV_NO_PROBLEM "Öåé ïðèñòð³é ïðàöþº íîðìàëüíî." IDS_DEV_NOT_CONFIGURED "Öåé ïðèñòð³é íå íàñòðîºíèé ïðàâèëüíî." - IDS_DEV_DEVLOADER_FAILED "ReactOS could not load the driver for this device because the computer is reporting two $1 bus types." - IDS_DEV_DEVLOADER_FAILED2 "The $1 device loader(s) for this device could not load the device driver." + IDS_DEV_DEVLOADER_FAILED "ReactOS íå ìîæå çàâàíòàæèòè äðàéâåð äëÿ öüîãî ïðèñòðîþ, òîìó ùî ñèñòåìà ïîâ³äîìëÿº ïðî äâà âèäè øèí òèïó $1." + IDS_DEV_DEVLOADER_FAILED2 "Ñèñòåìà çàâàíòàæåííÿ óñòàòêóâàííÿ $1 íå ìîæå çàâàíòàæèòè äðàéâåð öüîãî ïðèñòðîþ." IDS_DEV_OUT_OF_MEMORY "The driver for this device may be bad, or your system may be running low on memory or other resources." IDS_DEV_ENTRY_IS_WRONG_TYPE "This device is not working properly because one of its drivers may be bad, or your registry may be bad." IDS_DEV_LACKED_ARBITRATOR "The driver for this device requested a resource that ReactOS does not know how to handle." - IDS_DEV_BOOT_CONFIG_CONFLICT "Another device is using the resources this device needs." - IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." + IDS_DEV_BOOT_CONFIG_CONFLICT "²íøèé ïðèñòð³é âèêîðèñòîâóº ðåñóðñè, ïîòð³áí³ öüîìó ïðèñòðîþ." + IDS_DEV_FAILED_FILTER "Äðàéâåðè öüîãî ïðèñòðîþ òðåáà ïåðåóñòàíîâèòè." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." @@ -57,7 +57,7 @@ IDS_DEV_NORMAL_CONFLICT "This device cannot find any free $1 resources to use." IDS_DEV_NOT_VERIFIED "Öåé ïðèñòð³é â³äñóòí³é, ïðàöþº íåêîðåêòíî àáî íå ìàº âñ³õ âñòàíîâëåíèõ äðàéâåð³â." IDS_DEV_NEED_RESTART "Öåé ïðèñòð³é íå çìîæå êîðåêòíî ïðàöþâàòè, ïîêè âè ïåðåçàâàíòàæèòå êîìï'þòåð." - IDS_DEV_REENUMERATION "Öåé ïðèñòð³é âèêëèêàâ êîíôë³êò ðåñóðñ³â." + IDS_DEV_REENUMERATION "Öåé ïðèñòð³é ñïðè÷èíèâ êîíôë³êò ðåñóðñ³â." IDS_DEV_PARTIAL_LOG_CONF "ReactOS could not identify all the resources this device uses." IDS_DEV_UNKNOWN_RESOURCE "The driver information file $1 is telling this child device to use a resource that the parent device does not have or recognize." IDS_DEV_REINSTALL "Äðàéâåðè öüîãî ïðèñòðîþ òðåáà ïåðåóñòàíîâèòè."

16 years, 8 months

[dreimer] 32211: Bug 3043: Polish translation update (olaf_siejka@o2.pl) Bug 3044: Ukrainian translation update (temarez@yandex.ru) Part 2 of 3.

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Feb 8 13:22:58 2008 New Revision: 32211 URL: http://svn.reactos.org/svn/reactos?rev=32211&view=rev Log: Bug 3043: Polish translation update (olaf_siejka(a)o2.pl) Bug 3044: Ukrainian translation update (temarez(a)yandex.ru) Part 2 of 3. Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/rsrc.rc Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc (added) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc Fri Feb 8 13:22:58 2008 @@ -1,0 +1,83 @@ +/* + * PROJECT: Config Tool for ReactOS Build Environment + * LICENSE: GNU General Public License v2. (see LICENSE.txt) + * FILE: tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for config + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Øëÿõ äî MinGW/GCC", 0x0, 10, 107, 100, 15 + LTEXT "Êîë³ð ôîíó", 0x0, 10, 10, 75, 12 + COMBOBOX IDC_BACK, 100, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Êîë³ð øðèôòó", 0x0, 10, 35, 75, 12 + COMBOBOX IDC_FONT, 100, 35, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nÇðàçîê òåêñòó", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 58, 125, 36 + CONTROL "Â³äîáðàæàòè ÷àñ êîìï³ëÿö³¿", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 55, 100, 12 + CONTROL "Âåñòè æóðíàë", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + CONTROL "Âèêîðèñòîâóâàòè CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 70, 100, 12 + CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 100, 12 + CONTROL "Çì³íèòè ïàïêó äëÿ OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + CONTROL "Çì³íèòè ïàïêó äëÿ OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Çáåðåãòè", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Ñêàñóâàòè", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Ëàñêàâî ïðîñèìî!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +STRINGTABLE +BEGIN + CLR0, "×îðíèé" + CLR1, "Áëàêèòíèé" + CLR2, "Çåëåíèé" + CLR3, "Ìîðñüêà õâèëÿ" + CLR4, "×åðâîíèé" + CLR5, "Ïóðïóðíèé" + CLR6, "Æîâòèé" + CLR7, "Á³ëèé" + CLR8, "Ñ³ðèé" + CLR9, "ßñíî-áëàêèòíèé" + CLR10, "ßñíî-çåëåíèé" + CLR11, "Ñâ³òëà ìîðñüêà õâèëÿ" + CLR12, "ßñíî-÷åðâîíèé" + CLR13, "ßñíî-ïóðïóðíèé" + CLR14, "ßñíî-æîâòèé" + CLR15, "ßñêðàâî-á³ëèé" + MSG_NOGCCFOUND, "Íå çíàéäåíèé MinGW/GCC! Ïåðåâ³ðòå ñâîþ ïàïêó." + MSG_FILEFAILED, "Íåìîæëèâî ñòâîðèòè ôàéë rosbe-options.cmd!" + MSG_DIREFAILED, "Íåìîæëèâî ñòâîðèòè ïàïêó!" + MSG_SETLOADSUC, "Ïîïåðåäí³ íàñòðîéêè óñï³øíî çàâàíòàæåí³." + MSG_FINDLOGDIR, "Âêàæ³òü ïàïêó äëÿ çáåðåæåííÿ ôàéë³â æóðíàëà:" + MSG_FINDMGWDIR, "Âêàæ³òü ïàïêó, äå ðîçòàøîâàíèé êîìï³ëÿòîð MinGW/GCC:" + MSG_FINDOBJDIR, "Âêàæ³òü ïàïêó äëÿ çáåðåæåííÿ îá'ºêòíèõ ôàéë³â OBJ:" + MSG_FINDOUTDIR, "Âêàæ³òü ïàïêó äëÿ çáåðåæåííÿ çêîìï³ëüîâàíèõ ôàéë³â OUT:" + MSG_WARNINGBOX, "Óâàãà!" + MSG_EXITCHANGE, "Âè âïåâíåí³, ùî õî÷åòå âèéòè áåç çáåðåæåííÿ?" + MSG_INVALIDDIR, "Ïàïêà, ÿêó âè âêàçàëè, íå ³ñíóº. Âè õî÷åòå ñòâîðèòè ¿¿?" + /* Help Strings */ + HLP_BACKCOLORC, "Âèáåð³òü êîë³ð ôîíó äëÿ DOS â³êîí RosBE." + HLP_FONTCOLORC, "Âèáåð³òü êîë³ð øðèôòó äëÿ DOS â³êîí RosBE." + HLP_SBUILDTIME, "Äîçâîëÿº áà÷èòè ïîâíèé ÷àñ çáèðàííÿ â ê³íö³ êîìï³ëÿö³¿." + HLP_CCACHEUSED, "Â³äçíà÷òå, ÿêùî âè õî÷åòå âèêîðèñòîâóâàòè ccache (êåø êîìï³ëÿòîðà)." + HLP_STRIPEDEXE, "Â³äçíà÷òå, ÿêùî âè õî÷åòå âèäàëèòè íåâæèâàíèé êîä ç âèêîíóâàíèõ ôàéë³â." + HLP_FINDMGWDIR, "Öåé ïàðàìåòð äîçâîëÿº âèçíà÷àòè ðîçòàøóâàííÿ MinGW/GCC." + HLP_FINDLOGDIR, "Öåé ïàðàìåòð äîçâîëÿº âèçíà÷àòè ì³ñöå çáåðåæåííÿ æóðíàë³â êîìï³ëÿö³¿." + HLP_FINDOBJDIR, "Öåé ïàðàìåòð äîçâîëÿº âèçíà÷àòè ì³ñöå çáåðåæåííÿ ôàéë³â îá'ºêòíèõ ìîäóë³â OBJ." + HLP_FINDOUTDIR, "Öåé ïàðàìåòð äîçâîëÿº âèçíà÷àòè ì³ñöå çáåðåæåííÿ çêîìï³ëüîâàíèõ âèêîíóâàíèõ ôàéë³â OUT." + HLP_SAVEBUTTON, "Àêòèâíèé ñòàí êíîïêè âêàçóº íà ìîæëèâ³ñòü çáåðåæåííÿ çì³íåíèõ ïàðàìåòð³â." + HLP_QUITBUTTON, "Öå êíîïêà äîçâîëÿº âèéòè ç êîíô³ãóðóâàííÿ áåç çáåðåæåííÿ çì³í." + HLP_DEFAULTMSG, "Íàâåä³òü âêàç³âíèê ìèø³ íà åëåìåíò êåðóâàííÿ, ùîá îòðèìàòè äîâ³äêó." +END Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/rsrc.rc (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/rsrc.rc Fri Feb 8 13:22:58 2008 @@ -5,3 +5,4 @@ #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc"

16 years, 8 months

[dreimer] 32210: Bug 3043: Polish translation update (olaf_siejka@o2.pl) Bug 3044: Ukrainian translation update (temarez@yandex.ru) Part 1 of 3.

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Feb 8 13:22:50 2008 New Revision: 32210 URL: http://svn.reactos.org/svn/reactos?rev=32210&view=rev Log: Bug 3043: Polish translation update (olaf_siejka(a)o2.pl) Bug 3044: Ukrainian translation update (temarez(a)yandex.ru) Part 1 of 3. Modified: trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc Modified: trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc Fri Feb 8 13:22:50 2008 @@ -15,7 +15,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 - LTEXT "Edytor czczionek VGA dla ReactOS", IDC_STATIC, 37, 10, 93, 10 + LTEXT "Edytor czcionek VGA dla ReactOS", IDC_STATIC, 37, 10, 93, 10 LTEXT "Copyright 2008 Colin Finck", IDC_STATIC, 37, 20, 93, 10 DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END @@ -74,8 +74,8 @@ IDS_UNSUPPORTEDPSF, "Nieobs³ugiwana wersja PSF! Edytor obs³uguje wy³¹cznie czcionki rozmiaru 8x8, bez dodatków." IDS_DOCNAME, "Czcionka %1!u!" IDS_SAVEPROMPT, "Plik ""%1"" zosta³ zmieniony, ale nie zapisany.\n\nCzy chcesz zapisaæ zmiany?" - IDS_APPTITLE, "ReactOS VGA Font Editor" - IDS_CLOSEEDIT, "Please close all open Edit windows first!" + IDS_APPTITLE, "Edytor czcionek VGA dla ReactOS" + IDS_CLOSEEDIT, "Proszê najpierw zamkn¹æ wszystkie okna Edycji!" IDS_TOOLTIP_NEW, "Nowy" IDS_TOOLTIP_OPEN, "Otwórz" Modified: trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc Fri Feb 8 13:22:50 2008 @@ -22,7 +22,7 @@ IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Edit Glyph" +CAPTION "Ðåäàãóâàííÿ ñèìâîëà" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 @@ -75,7 +75,7 @@ IDS_DOCNAME, "Øðèôò %1!u!" IDS_SAVEPROMPT, "Ôàéë ""%1"" áóâ çì³íåíèé, àëå íå çáåðåæåíèé.\n\nÇáåðåãòè éîãî?" IDS_APPTITLE, "Ðåäàêòîð VGA-øðèôò³â ReactOS" - IDS_CLOSEEDIT, "Please close all open Edit windows first!" + IDS_CLOSEEDIT, "Áóäü ëàñêà çàêðèéòå âñ³ â³äêðèò³ â³êíà Ðåäàãóâàííÿ ñïî÷àòêó!" IDS_TOOLTIP_NEW, "Ñòâîðèòè" IDS_TOOLTIP_OPEN, "Â³äêðèòè"

16 years, 8 months

[dreimer] 32209: Bug 3040: add some functionality to mmsys.cpl by Kamil Hornicek (tykef at atlas dot cz) irc nick Pigglesworth I updated all rc files according to the changes in the english one and removed DS_3DLOOK.

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Feb 8 13:08:26 2008 New Revision: 32209 URL: http://svn.reactos.org/svn/reactos?rev=32209&view=rev Log: Bug 3040: add some functionality to mmsys.cpl by Kamil Hornicek (tykef at atlas dot cz) irc nick Pigglesworth I updated all rc files according to the changes in the english one and removed DS_3DLOOK. Modified: trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc trunk/reactos/dll/cpl/mmsys/lang/en-US.rc trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/mmsys/resource.h trunk/reactos/dll/cpl/mmsys/volume.c Modified: trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc Fri Feb 8 13:08:26 2008 @@ -8,7 +8,7 @@ ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Ñèëà íà óñòðîéñòâîòî", -1, 7,30,230,100 - ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Ñëàáî",-1,62,66,30,17 LTEXT "Ñèëíî",-1,195,66,30,17 @@ -97,7 +97,7 @@ END IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Save Scheme As" FONT 8, "MS Shell Dlg" BEGIN @@ -162,7 +162,7 @@ END IDD_SETUP1 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN @@ -176,7 +176,7 @@ END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Multichannel" FONT 8, "MS Shell Dlg" BEGIN @@ -218,7 +218,7 @@ END IDD_SETUP2 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc Fri Feb 8 13:08:26 2008 @@ -8,7 +8,7 @@ ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 - ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 @@ -97,7 +97,7 @@ END IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Save Scheme As" FONT 8, "MS Shell Dlg" BEGIN @@ -162,7 +162,7 @@ END IDD_SETUP1 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN @@ -176,7 +176,7 @@ END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Multichannel" FONT 8, "MS Shell Dlg" BEGIN @@ -218,7 +218,7 @@ END IDD_SETUP2 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc Fri Feb 8 13:08:26 2008 @@ -8,7 +8,7 @@ ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Gerätelautstärke", -1, 7,30,230,100 - ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Niedrig",-1,62,66,30,17 LTEXT "Hoch",-1,195,66,30,17 @@ -97,7 +97,7 @@ END IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Schema speichern unter" FONT 8, "MS Shell Dlg" BEGIN @@ -162,7 +162,7 @@ END IDD_SETUP1 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN @@ -176,7 +176,7 @@ END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Multichannel" FONT 8, "MS Shell Dlg" BEGIN @@ -218,7 +218,7 @@ END IDD_SETUP2 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc Fri Feb 8 13:08:26 2008 @@ -8,7 +8,7 @@ ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 - ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 @@ -97,7 +97,7 @@ END IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Save Scheme As" FONT 8, "MS Shell Dlg" BEGIN @@ -162,7 +162,7 @@ END IDD_SETUP1 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN @@ -176,7 +176,7 @@ END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Multichannel" FONT 8, "MS Shell Dlg" BEGIN @@ -218,7 +218,7 @@ END IDD_SETUP2 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/mmsys/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/en-US.rc Fri Feb 8 13:08:26 2008 @@ -8,7 +8,7 @@ ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 - ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 @@ -97,7 +97,7 @@ END IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Save Scheme As" FONT 8, "MS Shell Dlg" BEGIN @@ -162,7 +162,7 @@ END IDD_SETUP1 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN @@ -176,7 +176,7 @@ END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Multichannel" FONT 8, "MS Shell Dlg" BEGIN @@ -218,7 +218,7 @@ END IDD_SETUP2 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc Fri Feb 8 13:08:26 2008 @@ -8,7 +8,7 @@ ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Volumen del dispositivo", -1, 7,30,230,100 - ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Bajo",-1,62,66,30,17 LTEXT "Alto",-1,195,66,30,17 @@ -97,7 +97,7 @@ END IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Save Scheme As" FONT 8, "MS Shell Dlg" BEGIN @@ -162,7 +162,7 @@ END IDD_SETUP1 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN @@ -176,7 +176,7 @@ END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Multichannel" FONT 8, "MS Shell Dlg" BEGIN @@ -218,7 +218,7 @@ END IDD_SETUP2 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc Fri Feb 8 13:08:26 2008 @@ -8,7 +8,7 @@ ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Volume du périphérique", -1, 7,30,230,100 - ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Faible",-1,62,66,30,17 LTEXT "Élevé",-1,195,66,30,17 @@ -97,7 +97,7 @@ END IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Save Scheme As" FONT 8, "MS Shell Dlg" BEGIN @@ -162,7 +162,7 @@ END IDD_SETUP1 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN @@ -176,7 +176,7 @@ END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Multichannel" FONT 8, "MS Shell Dlg" BEGIN @@ -218,7 +218,7 @@ END IDD_SETUP2 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc Fri Feb 8 13:08:26 2008 @@ -8,7 +8,7 @@ ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 - ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 @@ -97,7 +97,7 @@ END IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Save Scheme As" FONT 8, "MS Shell Dlg" BEGIN @@ -162,7 +162,7 @@ END IDD_SETUP1 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN @@ -176,7 +176,7 @@ END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Multichannel" FONT 8, "MS Shell Dlg" BEGIN @@ -218,7 +218,7 @@ END IDD_SETUP2 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc Fri Feb 8 13:08:26 2008 @@ -8,7 +8,7 @@ ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Volume del dispositivo", -1, 7,30,230,100 - ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Basso",-1,62,66,30,17 LTEXT "Alto",-1,195,66,30,17 @@ -97,7 +97,7 @@ END IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Save Scheme As" FONT 8, "MS Shell Dlg" BEGIN @@ -162,7 +162,7 @@ END IDD_SETUP1 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN @@ -176,7 +176,7 @@ END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Multichannel" FONT 8, "MS Shell Dlg" BEGIN @@ -218,7 +218,7 @@ END IDD_SETUP2 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc Fri Feb 8 13:08:26 2008 @@ -8,7 +8,7 @@ ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 - ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 @@ -97,7 +97,7 @@ END IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Save Scheme As" FONT 8, "MS Shell Dlg" BEGIN @@ -162,7 +162,7 @@ END IDD_SETUP1 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN @@ -176,7 +176,7 @@ END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Multichannel" FONT 8, "MS Shell Dlg" BEGIN @@ -218,7 +218,7 @@ END IDD_SETUP2 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc Fri Feb 8 13:08:26 2008 @@ -18,7 +18,7 @@ ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "G³onoæ urz¹dzenia", -1, 7,30,230,100 - ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Ma³a",-1,62,66,30,17 LTEXT "Du¿a",-1,195,66,30,17 @@ -107,7 +107,7 @@ END IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Save Scheme As" FONT 8, "MS Shell Dlg" BEGIN @@ -172,7 +172,7 @@ END IDD_SETUP1 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN @@ -186,7 +186,7 @@ END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Multichannel" FONT 8, "MS Shell Dlg" BEGIN @@ -228,7 +228,7 @@ END IDD_SETUP2 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pt-BR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc Fri Feb 8 13:08:26 2008 @@ -8,7 +8,7 @@ ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 - ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 @@ -97,7 +97,7 @@ END IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Save Scheme As" FONT 8, "MS Shell Dlg" BEGIN @@ -162,7 +162,7 @@ END IDD_SETUP1 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN @@ -176,7 +176,7 @@ END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Multichannel" FONT 8, "MS Shell Dlg" BEGIN @@ -218,7 +218,7 @@ END IDD_SETUP2 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc Fri Feb 8 13:08:26 2008 @@ -8,7 +8,7 @@ ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Ãðîìêîñòü ìèêøåðà", -1, 7,30,230,100 - ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "íèæå",-1,62,66,30,17 LTEXT "âûøå",-1,195,66,30,17 @@ -96,7 +96,7 @@ END IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Save Scheme As" FONT 8, "MS Shell Dlg" BEGIN @@ -161,7 +161,7 @@ END IDD_SETUP1 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN @@ -175,7 +175,7 @@ END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Multichannel" FONT 8, "MS Shell Dlg" BEGIN @@ -217,7 +217,7 @@ END IDD_SETUP2 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Setup" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc Fri Feb 8 13:08:26 2008 @@ -16,7 +16,7 @@ ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Ãó÷í³ñòü ì³êøåðà", -1, 7,30,230,100 - ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 + CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "íèæ÷å",-1,62,66,30,17 LTEXT "âèùå",-1,195,66,30,17 @@ -105,7 +105,7 @@ END IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Çáåðåæåííÿ ñõåìè" FONT 8, "MS Shell Dlg" BEGIN @@ -170,7 +170,7 @@ END IDD_SETUP1 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Óñòàíîâêà" FONT 8, "MS Shell Dlg" BEGIN @@ -184,7 +184,7 @@ END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Áàãàòîêàíàëüíèé" FONT 8, "MS Shell Dlg" BEGIN @@ -226,7 +226,7 @@ END IDD_SETUP2 DIALOG 0, 0, 227, 206 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Óñòàíîâêà" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild Fri Feb 8 13:08:26 2008 @@ -13,6 +13,7 @@ <library>gdi32</library> <library>winmm</library> <library>advapi32</library> + <library>shell32</library> <file>mmsys.c</file> <file>sounds.c</file> <file>volume.c</file> Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/resource.h (original) +++ trunk/reactos/dll/cpl/mmsys/resource.h Fri Feb 8 13:08:26 2008 @@ -63,6 +63,7 @@ #define IDB_SPEAKIMG 4624 #define IDC_SPEAKIMG 4625 +#define IDC_MUTE_ICON 4626 /* Strings */ #define IDS_CPLNAME 1000 Modified: trunk/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/volume.c (original) +++ trunk/reactos/dll/cpl/mmsys/volume.c Fri Feb 8 13:08:26 2008 @@ -17,12 +17,31 @@ #include "mmsys.h" #include "resource.h" +#define VOLUME_DIVIDER 0xFFF + typedef struct _IMGINFO { HBITMAP hBitmap; INT cxSource; INT cySource; } IMGINFO, *PIMGINFO; + + +typedef struct _GLOBAL_DATA +{ + HMIXER hMixer; + HICON hIconMuted; + HICON hIconUnMuted; + + LONG muteVal; + DWORD muteControlID; + + DWORD volumeControlID; + DWORD volumeMinimum; + DWORD volumeMaximum; + DWORD volumeValue; + +} GLOBAL_DATA, *PGLOBAL_DATA; static VOID @@ -48,17 +67,165 @@ } } -void -InitVolumeControls(HWND hwndDlg) -{ - UINT NumWavOut; - WAVEOUTCAPS woc; - MMRESULT errcode; - DWORD dwDeviceID; - DWORD dwStatus; - - NumWavOut = waveOutGetNumDevs(); - if (!NumWavOut) +VOID +GetMuteControl(PGLOBAL_DATA pGlobalData) +{ + MIXERLINE mxln; + MIXERCONTROL mxc; + MIXERLINECONTROLS mxlctrl; + + if (pGlobalData->hMixer == NULL) + return; + + mxln.cbStruct = sizeof(MIXERLINE); + mxln.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_SPEAKERS; + + if (mixerGetLineInfo((HMIXEROBJ)pGlobalData->hMixer, &mxln, MIXER_OBJECTF_HMIXER | MIXER_GETLINEINFOF_COMPONENTTYPE) + != MMSYSERR_NOERROR) return; + + mxlctrl.cbStruct = sizeof(MIXERLINECONTROLS); + mxlctrl.dwLineID = mxln.dwLineID; + mxlctrl.dwControlType = MIXERCONTROL_CONTROLTYPE_MUTE; + mxlctrl.cControls = 1; + mxlctrl.cbmxctrl = sizeof(MIXERCONTROL); + mxlctrl.pamxctrl = &mxc; + + if (mixerGetLineControls((HMIXEROBJ)pGlobalData->hMixer, &mxlctrl, MIXER_OBJECTF_HMIXER | MIXER_GETLINECONTROLSF_ONEBYTYPE) + != MMSYSERR_NOERROR) return; + + pGlobalData->muteControlID = mxc.dwControlID; +} + +VOID +GetMuteState(PGLOBAL_DATA pGlobalData) +{ + MIXERCONTROLDETAILS_BOOLEAN mxcdMute; + MIXERCONTROLDETAILS mxcd; + + if (pGlobalData->hMixer == NULL) + return; + + mxcd.cbStruct = sizeof(MIXERCONTROLDETAILS); + mxcd.dwControlID = pGlobalData->muteControlID; + mxcd.cChannels = 1; + mxcd.cMultipleItems = 0; + mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_BOOLEAN); + mxcd.paDetails = &mxcdMute; + + if (mixerGetControlDetails((HMIXEROBJ)pGlobalData->hMixer, &mxcd, MIXER_OBJECTF_HMIXER | MIXER_GETCONTROLDETAILSF_VALUE) + != MMSYSERR_NOERROR) + return; + + pGlobalData->muteVal = mxcdMute.fValue; +} + +VOID +SwitchMuteState(PGLOBAL_DATA pGlobalData) +{ + MIXERCONTROLDETAILS_BOOLEAN mxcdMute; + MIXERCONTROLDETAILS mxcd; + + mxcd.cbStruct = sizeof(MIXERCONTROLDETAILS); + mxcd.dwControlID = pGlobalData->muteControlID; + mxcd.cChannels = 1; + mxcd.cMultipleItems = 0; + mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_BOOLEAN); + mxcd.paDetails = &mxcdMute; + + mxcdMute.fValue = !pGlobalData->muteVal; + if (mixerSetControlDetails((HMIXEROBJ)pGlobalData->hMixer, &mxcd, MIXER_OBJECTF_HMIXER | MIXER_SETCONTROLDETAILSF_VALUE) + != MMSYSERR_NOERROR) + return; + + pGlobalData->muteVal = mxcdMute.fValue; +} + +VOID +GetVolumeControl(PGLOBAL_DATA pGlobalData) +{ + MIXERLINE mxln; + MIXERCONTROL mxc; + MIXERLINECONTROLS mxlc; + + if (pGlobalData->hMixer == NULL) + return; + + mxln.cbStruct = sizeof(MIXERLINE); + mxln.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_SPEAKERS; + if (mixerGetLineInfo((HMIXEROBJ)pGlobalData->hMixer, &mxln, MIXER_OBJECTF_HMIXER | MIXER_GETLINEINFOF_COMPONENTTYPE) + != MMSYSERR_NOERROR) + return; + + mxlc.cbStruct = sizeof(MIXERLINECONTROLS); + mxlc.dwLineID = mxln.dwLineID; + mxlc.dwControlType = MIXERCONTROL_CONTROLTYPE_VOLUME; + mxlc.cControls = 1; + mxlc.cbmxctrl = sizeof(MIXERCONTROL); + mxlc.pamxctrl = &mxc; + if (mixerGetLineControls((HMIXEROBJ)pGlobalData->hMixer, &mxlc, MIXER_OBJECTF_HMIXER | MIXER_GETLINECONTROLSF_ONEBYTYPE) + != MMSYSERR_NOERROR) + return; + + pGlobalData->volumeMinimum = mxc.Bounds.dwMinimum; + pGlobalData->volumeMaximum = mxc.Bounds.dwMaximum; + pGlobalData->volumeControlID = mxc.dwControlID; +} + +VOID +GetVolumeValue(PGLOBAL_DATA pGlobalData) +{ + MIXERCONTROLDETAILS_UNSIGNED mxcdVolume; + MIXERCONTROLDETAILS mxcd; + + if (pGlobalData->hMixer == NULL) + return; + + mxcd.cbStruct = sizeof(MIXERCONTROLDETAILS); + mxcd.dwControlID = pGlobalData->volumeControlID; + mxcd.cChannels = 1; + mxcd.cMultipleItems = 0; + mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED); + mxcd.paDetails = &mxcdVolume; + + if (mixerGetControlDetails((HMIXEROBJ)pGlobalData->hMixer, &mxcd, MIXER_OBJECTF_HMIXER | MIXER_GETCONTROLDETAILSF_VALUE) + != MMSYSERR_NOERROR) + return; + + pGlobalData->volumeValue = mxcdVolume.dwValue; +} + +VOID +SetVolumeValue(PGLOBAL_DATA pGlobalData){ + MIXERCONTROLDETAILS_UNSIGNED mxcdVolume; + MIXERCONTROLDETAILS mxcd; + + if (pGlobalData->hMixer == NULL) + return; + + mxcdVolume.dwValue = pGlobalData->volumeValue; + mxcd.cbStruct = sizeof(MIXERCONTROLDETAILS); + mxcd.dwControlID = pGlobalData->volumeControlID; + mxcd.cChannels = 1; + mxcd.cMultipleItems = 0; + mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED); + mxcd.paDetails = &mxcdVolume; + + if (mixerSetControlDetails((HMIXEROBJ)pGlobalData->hMixer, &mxcd, MIXER_OBJECTF_HMIXER | MIXER_SETCONTROLDETAILSF_VALUE) + != MMSYSERR_NOERROR) + return; + + pGlobalData->volumeValue = mxcdVolume.dwValue; +} + + +VOID +InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +{ + UINT NumMixers; + MIXERCAPS mxc; + + NumMixers = mixerGetNumDevs(); + if (!NumMixers) { EnableWindow(GetDlgItem(hwndDlg, IDC_VOLUME_TRACKBAR), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_MUTE_CHECKBOX), FALSE); @@ -70,56 +237,82 @@ return; } - errcode = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&dwDeviceID, (DWORD_PTR)&dwStatus); - if (errcode != MMSYSERR_NOERROR) - { - MessageBox(hwndDlg, _T("Failed to enumerate default device"), NULL, MB_OK); - return; - } - - if (waveOutGetDevCaps(dwDeviceID, &woc, sizeof(WAVEOUTCAPS)) != MMSYSERR_NOERROR) - { - MessageBox(hwndDlg, _T("waveOutGetDevCaps failed"), NULL, MB_OK); - return; - } - - SendDlgItemMessage(hwndDlg, IDC_DEVICE_NAME, WM_SETTEXT, (WPARAM)0, (LPARAM)woc.szPname); - - if (!(woc.dwSupport & WAVECAPS_VOLUME)) - { - /// the device does not support volume changes - /// disable volume control - EnableWindow(GetDlgItem(hwndDlg, IDC_VOLUME_TRACKBAR), FALSE); + if (mixerOpen(&pGlobalData->hMixer, 0, (DWORD)hwndDlg, 0, MIXER_OBJECTF_MIXER | CALLBACK_WINDOW) != MMSYSERR_NOERROR) + { + MessageBox(hwndDlg, _T("Cannot open mixer"), NULL, MB_OK); + return; + } + + ZeroMemory(&mxc, sizeof(MIXERCAPS)); + if (mixerGetDevCaps((UINT)pGlobalData->hMixer, &mxc, sizeof(MIXERCAPS)) != MMSYSERR_NOERROR) + { + MessageBox(hwndDlg, _T("mixerGetDevCaps failed"), NULL, MB_OK); + return; + } + + GetMuteControl(pGlobalData); + GetMuteState(pGlobalData); + if (pGlobalData->muteVal) + { + SendDlgItemMessage(hwndDlg, IDC_MUTE_CHECKBOX, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconMuted); } else { - SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 10)); - SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPAGESIZE, (WPARAM)FALSE, (LPARAM)1); - SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETSEL, (WPARAM)FALSE, (LPARAM)MAKELONG(0, 10)); - SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)4); - } + SendDlgItemMessage(hwndDlg, IDC_MUTE_CHECKBOX, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconUnMuted); + } + + GetVolumeControl(pGlobalData); + GetVolumeValue(pGlobalData); + + SendDlgItemMessage(hwndDlg, IDC_DEVICE_NAME, WM_SETTEXT, 0, (LPARAM)mxc.szPname); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETRANGE, (WPARAM)TRUE, + (LPARAM)MAKELONG(pGlobalData->volumeMinimum, pGlobalData->volumeMaximum/VOLUME_DIVIDER)); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPAGESIZE, (WPARAM)FALSE, (LPARAM)1); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETSEL, (WPARAM)FALSE, + (LPARAM)MAKELONG(pGlobalData->volumeMinimum, pGlobalData->volumeValue/VOLUME_DIVIDER)); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pGlobalData->volumeValue/VOLUME_DIVIDER); +} + +VOID +LaunchSoundControl(HWND hwndDlg) +{ + if ((INT)ShellExecuteW(NULL, L"open", L"sndvol32.exe", NULL, NULL, SW_SHOWNORMAL) > 32) + return; + MessageBox(hwndDlg, _T("Cannot run sndvol32.exe"), NULL, MB_OK); } /* Volume property page dialog callback */ //static INT_PTR CALLBACK INT_PTR CALLBACK VolumeDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { static IMGINFO ImgInfo; UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); + PGLOBAL_DATA pGlobalData; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch(uMsg) { case WM_INITDIALOG: { + pGlobalData = (GLOBAL_DATA*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + pGlobalData->hIconUnMuted = LoadImage(hApplet, MAKEINTRESOURCE(IDI_CPLICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + pGlobalData->hIconMuted = LoadImage(hApplet, MAKEINTRESOURCE(IDI_MUTED_ICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + InitImageInfo(&ImgInfo); - InitVolumeControls(hwndDlg); + InitVolumeControls(hwndDlg, pGlobalData); break; } + case WM_DRAWITEM: { LPDRAWITEMSTRUCT lpDrawItem; @@ -148,8 +341,52 @@ DeleteDC(hdcMem); } } - return TRUE; + break; } + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_MUTE_CHECKBOX: + SwitchMuteState(pGlobalData); + if (pGlobalData->muteVal) + { + SendDlgItemMessage(hwndDlg, IDC_MUTE_CHECKBOX, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconMuted); + } + else + { + SendDlgItemMessage(hwndDlg, IDC_MUTE_CHECKBOX, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconUnMuted); + } + break; + case IDC_ADVANCED_BTN: + LaunchSoundControl(hwndDlg); + break; + } + break; + } + + case WM_HSCROLL: + { + HWND hVolumeTrackbar = GetDlgItem(hwndDlg, IDC_VOLUME_TRACKBAR); + if (hVolumeTrackbar == (HWND)lParam) + { + pGlobalData->volumeValue = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_GETPOS, 0, 0)*VOLUME_DIVIDER; + SetVolumeValue(pGlobalData); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETSEL, (WPARAM)TRUE, + (LPARAM)MAKELONG(pGlobalData->volumeMinimum, pGlobalData->volumeValue/VOLUME_DIVIDER)); + } + break; + } + + case WM_DESTROY: + mixerClose(pGlobalData->hMixer); + DestroyIcon(pGlobalData->hIconMuted); + DestroyIcon(pGlobalData->hIconUnMuted); + HeapFree(GetProcessHeap(), 0, pGlobalData); + break; } return FALSE;

16 years, 8 months

[dreimer] 32208: Apply r32184 for Slovak Translation too.

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Feb 8 11:21:12 2008 New Revision: 32208 URL: http://svn.reactos.org/svn/reactos?rev=32208&view=rev Log: Apply r32184 for Slovak Translation too. Modified: trunk/reactos/base/applications/msconfig/lang/sk-SK.rc Modified: trunk/reactos/base/applications/msconfig/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/sk-SK.rc Fri Feb 8 11:21:12 2008 @@ -161,7 +161,7 @@ IDS_TOOLS_SYSDM_NAME "Vlastnosti systému" IDS_TOOLS_SYSDM_DESCR "Zobrazí informácie o tomto poèítaèi." - IDS_TOOLS_SYSDM_CMD "control" + IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element"

16 years, 8 months

[ros-arm-bringup] 32207: We now also implement InterlockedExchange (Fixes rtl build). We now set -lgcc for all builds (to get built-in division helpers), and also -static (not to import libgcc.dll -- it seems -static isn't needed on x86, but it is on ARM). We hackfix kdcom to use the FeroUart base address -- this driver won't be used for a while, but we need to have it built. Now binaries are being created properly (previously kernel was 15MB and importing .DLL files...). FreeLDR output: FreeLoa

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Fri Feb 8 11:20:06 2008 New Revision: 32207 URL: http://svn.reactos.org/svn/reactos?rev=32207&view=rev Log: We now also implement InterlockedExchange (Fixes rtl build). We now set -lgcc for all builds (to get built-in division helpers), and also -static (not to import libgcc.dll -- it seems -static isn't needed on x86, but it is on ARM). We hackfix kdcom to use the FeroUart base address -- this driver won't be used for a while, but we need to have it built. Now binaries are being created properly (previously kernel was 15MB and importing .DLL files...). FreeLDR output: FreeLoader v3.0 for ARM Bootargs: rdbase=0x2000000 rdsize=0x1400000 Detecting Hardware... Loading... Reading NTOSKRNL.EXE Reading BOOTVID.DLL Reading HAL.DLL Reading HAL.DLL Reading c_1252.nls Reading c_437.nls Reading l_intl.nls Reading scsiport.sys Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/drivers/base/kdcom/kdbg.c trunk/reactos/include/psdk/intrin_arm.h Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=322… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild (original) +++ trunk/reactos/ReactOS-arm.rbuild Fri Feb 8 11:20:06 2008 @@ -33,4 +33,7 @@ <compilerflag>-Wno-attributes</compilerflag> <compilerflag>-fno-strict-aliasing</compilerflag> + <linkerflag>-s</linkerflag> + <linkerflag>-lgcc</linkerflag> + <linkerflag>-static</linkerflag> </project> Modified: trunk/reactos/drivers/base/kdcom/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdbg.c?… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdbg.c (original) +++ trunk/reactos/drivers/base/kdcom/kdbg.c Fri Feb 8 11:20:06 2008 @@ -59,6 +59,8 @@ const ULONG BaseArray[2] = {0, 0x800003f8}; #elif defined(_M_MIPS) const ULONG BaseArray[3] = {0, 0x80006000, 0x80007000}; +#elif defined(_M_ARM) +const ULONG BaseArray[2] = {0, 0xF1012000}; #else #error Unknown architecture #endif Modified: trunk/reactos/include/psdk/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_arm.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_arm.h (original) +++ trunk/reactos/include/psdk/intrin_arm.h Fri Feb 8 11:20:06 2008 @@ -72,6 +72,17 @@ return a; } +static __inline__ __attribute__((always_inline)) long _InterlockedExchange(volatile long * const dest, const long exch) +{ + long a; + + __asm__ __volatile__ ( "swp %0, %2, [%1]" + : "=&r" (a) + : "r" (dest), "r" (exch)); + + return a; +} + static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * const value, const char mask) { char x;

16 years, 8 months

[ros-arm-bringup] 32206: We now have the correct intrinsics for ARM. The ARM linkerscript is now created (copy of the x86 linker script). The kernel can now be linked.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Fri Feb 8 10:51:01 2008 New Revision: 32206 URL: http://svn.reactos.org/svn/reactos?rev=32206&view=rev Log: We now have the correct intrinsics for ARM. The ARM linkerscript is now created (copy of the x86 linker script). The kernel can now be linked. Modified: trunk/reactos/include/psdk/intrin_arm.h trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk Modified: trunk/reactos/include/psdk/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_arm.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_arm.h (original) +++ trunk/reactos/include/psdk/intrin_arm.h Fri Feb 8 10:51:01 2008 @@ -34,98 +34,195 @@ #define _ReadWriteBarrier() __sync_synchronize() -FORCEINLINE char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -FORCEINLINE short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -FORCEINLINE long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -FORCEINLINE long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -FORCEINLINE void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -FORCEINLINE long _InterlockedExchange(volatile long * const Target, const long Value) -{ - /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ - __sync_synchronize(); - return __sync_lock_test_and_set(Target, Value); -} - -FORCEINLINE void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) -{ - /* NOTE: ditto */ - __sync_synchronize(); - return __sync_lock_test_and_set(Target, Value); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) -{ - return __sync_fetch_and_add(Addend, Value); -} - -FORCEINLINE long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) -{ - return __sync_fetch_and_add(Addend, Value); -} - -FORCEINLINE char _InterlockedAnd8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_and(value, mask); -} - -FORCEINLINE short _InterlockedAnd16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_and(value, mask); -} - -FORCEINLINE long _InterlockedAnd(volatile long * const value, const long mask) -{ - return __sync_fetch_and_and(value, mask); -} - -FORCEINLINE char _InterlockedOr8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_or(value, mask); -} - -FORCEINLINE short _InterlockedOr16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_or(value, mask); -} - -FORCEINLINE long _InterlockedOr(volatile long * const value, const long mask) -{ - return __sync_fetch_and_or(value, mask); -} - -FORCEINLINE char _InterlockedXor8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_xor(value, mask); -} - -FORCEINLINE short _InterlockedXor16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_xor(value, mask); -} - -FORCEINLINE long _InterlockedXor(volatile long * const value, const long mask) -{ - return __sync_fetch_and_xor(value, mask); +static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * const dest, const long exch, const long comp) +{ + long a, b; + + __asm__ __volatile__ ( "0:\n\t" + "ldr %1, [%2]\n\t" + "cmp %1, %4\n\t" + "bne 1f\n\t" + "swp %0, %3, [%2]\n\t" + "cmp %0, %1\n\t" + "swpne %3, %0, [%2]\n\t" + "bne 0b\n\t" + "1:" + : "=&r" (a), "=&r" (b) + : "r" (dest), "r" (exch), "r" (comp) + : "cc", "memory"); + + return a; +} + +static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const dest, const long add) +{ + long a, b, c; + + __asm__ __volatile__ ( "0:\n\t" + "ldr %0, [%3]\n\t" + "add %1, %0, %4\n\t" + "swp %2, %1, [%3]\n\t" + "cmp %0, %2\n\t" + "swpne %1, %2, [%3]\n\t" + "bne 0b" + : "=&r" (a), "=&r" (b), "=&r" (c) + : "r" (dest), "r" (add) + : "cc", "memory"); + + return a; +} + +static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * const value, const char mask) +{ + char x; + char y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange8(value, x & mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) short _InterlockedAnd16(volatile short * const value, const short mask) +{ + short x; + short y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange16(value, x & mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) long _InterlockedAnd(volatile long * const value, const long mask) +{ + long x; + long y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange(value, x & mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) char _InterlockedOr8(volatile char * const value, const char mask) +{ + char x; + char y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange8(value, x | mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) short _InterlockedOr16(volatile short * const value, const short mask) +{ + short x; + short y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange16(value, x | mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) long _InterlockedOr(volatile long * const value, const long mask) +{ + long x; + long y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange(value, x | mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) char _InterlockedXor8(volatile char * const value, const char mask) +{ + char x; + char y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange8(value, x ^ mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) short _InterlockedXor16(volatile short * const value, const short mask) +{ + short x; + short y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange16(value, x ^ mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) long _InterlockedXor(volatile long * const value, const long mask) +{ + long x; + long y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange(value, x ^ mask, x); + } + while(y != x); + + return y; } static __inline__ __attribute__((always_inline)) long _InterlockedDecrement(volatile long * const lpAddend) Modified: trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk?… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk Fri Feb 8 10:51:01 2008 @@ -1,0 +1,105 @@ +OUTPUT_FORMAT(pei-arm-wince-little) +ENTRY(_mainCRTStartup) +SECTIONS +{ + .text __image_base__ + __section_alignment__ : + { + __text_start__ = .; + *(.init) + *(.text) + *(SORT(.text$*)) + *(.glue_7t) + *(.glue_7) + ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; + LONG (-1); *(.ctors); *(.ctor); LONG (0); + ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; + LONG (-1); *(.dtors); *(.dtor); LONG (0); + *(.fini) + /* ??? Why is .gcc_exc here? */ + *(.gcc_exc) + __text_end__ = .; + *(.gcc_except_table) + } + init BLOCK(__section_alignment__) : + { + __init_start__ = . ; + *(init) + __init_end__ = . ; + } + /* The Cygwin32 library uses a section to avoid copying certain data + on fork. This used to be named ".data". The linker used + to include this between __data_start__ and __data_end__, but that + breaks building the cygwin32 dll. Instead, we name the section + ".data_cygwin_nocopy" and explictly include it after __data_end__. */ + .data BLOCK(__section_alignment__) : + { + __data_start__ = . ; + *(.data) + *(.data2) + *(SORT(.data$*)) + __data_end__ = . ; + *(.data_cygwin_nocopy) + } + .rdata BLOCK(__section_alignment__) : + { + *(.rdata) + *(SORT(.rdata$*)) + *(.eh_frame) + } + .edata BLOCK(__section_alignment__) : + { + *(.edata) + } + /DISCARD/ : + { + *(.debug$S) + *(.debug$T) + *(.debug$F) + *(.drectve) + } + + .idata BLOCK(__section_alignment__) : + { + /* This cannot currently be handled with grouped sections. + See pe.em:sort_sections. */ + SORT(*)(.idata$2) + SORT(*)(.idata$3) + /* These zeroes mark the end of the import list. */ + LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); + SORT(*)(.idata$4) + SORT(*)(.idata$5) + SORT(*)(.idata$6) + SORT(*)(.idata$7) + } + .CRT BLOCK(__section_alignment__) : + { + *(SORT(.CRT$*)) + } + .rsrc BLOCK(__section_alignment__) : + { + *(.rsrc) + *(SORT(.rsrc$*)) + } + .bss BLOCK(__section_alignment__) : + { + __bss_start__ = . ; + *(.bss) + *(COMMON) + __bss_end__ = . ; + } + .reloc BLOCK(__section_alignment__) : + { + *(.reloc) + /* These zeroes mark the end of the reloc section. */ + LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); + } + .stab BLOCK(__section_alignment__) (NOLOAD) : + { + [ .stab ] + } + .stabstr BLOCK(__section_alignment__) (NOLOAD) : + { + [ .stabstr ] + } +} +

16 years, 8 months

[ros-arm-bringup] 32205: We no longer generate broken kernel-mode system call stubs. We now have per-architecture definition files, since stdcall differences between the architectures cannot be fixed (tried a combination of --kill-at, which is ignored, and -add-stdcall-alias and --enable-stdcall-fixup. This is the same problem that breaks MSVC builds, according to Alex.) Fixed KeRaiseIrqlToSynchLevel. Added an arm directory in /ke where we have all the stubs for non-implemented ARM routines. We

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Fri Feb 8 09:07:47 2008 New Revision: 32205 URL: http://svn.reactos.org/svn/reactos?rev=32205&view=rev Log: We no longer generate broken kernel-mode system call stubs. We now have per-architecture definition files, since stdcall differences between the architectures cannot be fixed (tried a combination of --kill-at, which is ignored, and -add-stdcall-alias and --enable-stdcall-fixup. This is the same problem that breaks MSVC builds, according to Alex.) Fixed KeRaiseIrqlToSynchLevel. Added an arm directory in /ke where we have all the stubs for non-implemented ARM routines. We can now build almost the entire kernel and link it. We now use intrinsics to export the Interlocked* APIs, for the ARM build. Recommend doing this for x86 too. Hal and bootvid build and link. Added: trunk/reactos/drivers/base/bootvid/bootvid_arm.def (with props) trunk/reactos/drivers/base/bootvid/bootvid_i386.def - copied unchanged from r32201, trunk/reactos/drivers/base/bootvid/bootvid.def trunk/reactos/hal/hal/hal_arm.def (with props) trunk/reactos/hal/hal/hal_i386.def - copied unchanged from r32201, trunk/reactos/hal/hal/hal.def trunk/reactos/ntoskrnl/include/internal/arm/asmmacro.S (with props) trunk/reactos/ntoskrnl/ke/arm/ trunk/reactos/ntoskrnl/ke/arm/stubs.c (with props) trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s (with props) trunk/reactos/ntoskrnl/ntoskrnl_arm.def (with props) trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk (with props) trunk/reactos/ntoskrnl/ntoskrnl_i386.def - copied unchanged from r32201, trunk/reactos/ntoskrnl/ntoskrnl.def Removed: trunk/reactos/drivers/base/bootvid/bootvid.def trunk/reactos/hal/hal/hal.def trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild trunk/reactos/hal/hal/hal.rbuild trunk/reactos/hal/halx86/directory.rbuild trunk/reactos/include/reactos/armddk.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/tools/nci/ncitool.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/drivers/base/bootvid/bootvid.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Added: trunk/reactos/drivers/base/bootvid/bootvid_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Removed: trunk/reactos/hal/hal/hal.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.def?rev=32204&… Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=322… Added: trunk/reactos/hal/hal/hal_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal_arm.def?rev=32… Modified: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuil… Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… Added: trunk/reactos/ntoskrnl/include/internal/arm/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Added: trunk/reactos/ntoskrnl/ke/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs.c?re… Added: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… Removed: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… Added: trunk/reactos/ntoskrnl/ntoskrnl_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm.def?… Added: trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk?… Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?rev=32…

16 years, 8 months

[tkreuzer] 32204: - allow translation of strings in usetup - so far most strings are still hardcoded, but the needed functionality is in place

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Feb 8 07:14:09 2008 New Revision: 32204 URL: http://svn.reactos.org/svn/reactos?rev=32204&view=rev Log: - allow translation of strings in usetup - so far most strings are still hardcoded, but the needed functionality is in place Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Fri Feb 8 07:14:09 2008 @@ -1370,11 +1370,11 @@ if (PartitionList->CurrentPartition == NULL || PartitionList->CurrentPartition->Unpartitioned == TRUE) { - CONSOLE_SetStatusText (" ENTER = Install C = Create Partition F3 = Quit"); + CONSOLE_SetStatusText (MUIGetString(STRING_INSTALLCREATEPARTITION)); } else { - CONSOLE_SetStatusText (" ENTER = Install D = Delete Partition F3 = Quit"); + CONSOLE_SetStatusText (MUIGetString(STRING_INSTALLDELETEPARTITION)); } CONSOLE_ConInKey(Ir); @@ -1495,7 +1495,7 @@ /* Print message */ coPos.X = Left + 2; coPos.Y = Top + 2; - strcpy (Buffer, "Size of new partition:"); + strcpy (Buffer, MUIGetString(STRING_PARTITIONSIZE)); iLeft = coPos.X + strlen (Buffer) + 1; iTop = coPos.Y; @@ -1604,9 +1604,9 @@ DiskEntry = PartitionList->CurrentDisk; PartEntry = PartitionList->CurrentPartition; - CONSOLE_SetStatusText (" Please wait..."); - - CONSOLE_SetTextXY (6, 8, "You have chosen to create a new partition on"); + CONSOLE_SetStatusText (MUIGetString(STRING_PLEASEWAIT)); + + CONSOLE_SetTextXY (6, 8, MUIGetString(STRING_CHOOSENEWPARTITION)); #if 0 if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ @@ -1656,7 +1656,7 @@ PartitionList->CurrentPartition->UnpartitionedLength / (1024*1024)); #endif - CONSOLE_SetStatusText (" ENTER = Create Partition ESC = Cancel F3 = Quit"); + CONSOLE_SetStatusText (MUIGetString(STRING_CREATEPARTITION)); PartEntry = PartitionList->CurrentPartition; while (TRUE) @@ -2785,7 +2785,7 @@ { MUIDisplayError(ERROR_TXTSETUP_SECTION, Ir, POPUP_WAIT_ENTER); } - + return FALSE; } @@ -2979,7 +2979,7 @@ case SPFILENOTIFY_STARTCOPY: /* Display copy message */ - CONSOLE_SetStatusText(" \xB3 Copying file: %S", (PWSTR)Param1); + CONSOLE_SetStatusText(MUIGetString(STRING_COPYING), (PWSTR)Param1); SetupUpdateMemoryInfo(CopyContext, FALSE); break; @@ -3015,7 +3015,7 @@ 10, 24, TRUE, - "Setup is copying files..."); + MUIGetString(STRING_SETUPCOPYINGFILES)); /* Create the paged pool progress bar */ CopyContext.MemoryBars[0] = CreateProgressBar(13, @@ -3025,7 +3025,7 @@ 10, 44, FALSE, - "Paged Memory"); + MUIGetString(STRING_PAGEDMEM)); /* Create the non paged pool progress bar */ CopyContext.MemoryBars[1] = CreateProgressBar(28, @@ -3035,7 +3035,7 @@ 24, 44, FALSE, - "Nonpaged Memory"); + MUIGetString(STRING_NONPAGEDMEM)); /* Create the global memory progress bar */ CopyContext.MemoryBars[2] = CreateProgressBar(43, @@ -3045,7 +3045,7 @@ 40, 44, FALSE, - "Free Memory"); + MUIGetString(STRING_FREEMEM)); /* Do the file copying */ SetupCommitFileQueueW(NULL, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Fri Feb 8 07:14:09 2008 @@ -1574,4 +1574,31 @@ } }; +MUI_STRING deDEStrings[] = +{ + {STRING_INSTALLCREATEPARTITION, + " ENTER = Installieren C = Partition erstellen F3 = Beenden"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Installieren D = Partition löschen F3 = Beenden"}, + {STRING_PARTITIONSIZE, + "Größe der neuen Partition:"}, + {STRING_PLEASEWAIT, + " Bitte warten..."}, + {STRING_CHOOSENEWPARTITION, + "Sie haben beschlossen eine neue Partition zu erstellen auf"}, + {STRING_CREATEPARTITION, + " ENTER = Partition erstelln ESC = Abbruch F3 = Beenden"}, + {STRING_COPYING, + " \xB3 Kopiere Datei: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup kopiert Dateien..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Fri Feb 8 07:14:09 2008 @@ -1568,4 +1568,31 @@ } }; +MUI_STRING enUSStrings[] = +{ + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new partition on"}, + {STRING_CREATEPARTITION, + " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_COPYING, + " \xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Fri Feb 8 07:14:09 2008 @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/mui.c * PURPOSE: Text-mode setup - * PROGRAMMER: + * PROGRAMMER: */ #include "usetup.h" @@ -48,32 +48,32 @@ static const MUI_LANGUAGE LanguageList[] = { /* Lang ID, DefKbdLayout,ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings */ - {L"00000409", L"00000409", L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries }, - {L"00000402", L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries }, - {L"00000403", L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries }, - {L"00000804", L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries }, - {L"00000406", L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries }, - {L"00000413", L"00000813", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries }, - {L"0000040B", L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries }, - {L"0000040C", L"0000040C", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries }, - {L"00000407", L"00000407", L"1252", L"850", L"10000", L"German", deDEPages, deDEErrorEntries }, - {L"00000408", L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries }, - {L"0000040D", L"0000040D", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries }, - {L"0000040E", L"0000040E", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries }, - {L"00000410", L"00000410", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries }, - {L"00000411", L"00000411", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries }, - {L"00000412", L"00000412", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries }, - {L"00000427", L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries }, - {L"00000414", L"00000414", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries }, - {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries }, - {L"0000041B", L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries }, - {L"0000040A", L"0000040A", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries }, - {L"00000415", L"00000415", L"1250", L"852", L"10029", L"Polish", plPLPages, plPLErrorEntries }, - {L"00000816", L"00000816", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries }, - {L"0000041D", L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries }, - {L"0000041E", L"0000041E", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries }, - {L"0000041F", L"0000041F", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries }, - {L"00000422", L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries }, + {L"00000409", L"00000409", L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000402", L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, enUSStrings }, + {L"00000403", L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000804", L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000406", L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000413", L"00000813", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040B", L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040C", L"0000040C", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, enUSStrings }, + {L"00000407", L"00000407", L"1252", L"850", L"10000", L"German", deDEPages, deDEErrorEntries, deDEStrings }, + {L"00000408", L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, enUSStrings }, + {L"0000040D", L"0000040D", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040E", L"0000040E", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000410", L"00000410", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, enUSStrings }, + {L"00000411", L"00000411", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000412", L"00000412", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000427", L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, enUSStrings }, + {L"00000414", L"00000414", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries, enUSStrings }, + {L"0000041B", L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, enUSStrings }, + {L"0000040A", L"0000040A", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, enUSStrings }, + {L"00000415", L"00000415", L"1250", L"852", L"10029", L"Polish", plPLPages, plPLErrorEntries, enUSStrings }, + {L"00000816", L"00000816", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041D", L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, enUSStrings }, + {L"0000041E", L"0000041E", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041F", L"0000041F", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000422", L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, enUSStrings }, {NULL, NULL, NULL, NULL, NULL} }; @@ -131,6 +131,28 @@ { /* Get all available error messages for this language */ return LanguageList[lngIndex].MuiErrors; + } + + lngIndex++; + } + while (LanguageList[lngIndex].MuiPages != NULL); + + return NULL; +} + +static +const MUI_STRING * +FindMUIStringEntries(VOID) +{ + ULONG lngIndex = 0; + + do + { + /* First we search the language list till we find current selected language messages */ + if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + { + /* Get all available strings for this language */ + return LanguageList[lngIndex].MuiStrings; } lngIndex++; @@ -234,6 +256,32 @@ WaitEvent); } +LPSTR +MUIGetString(ULONG Number) +{ + ULONG i; + const MUI_STRING * entry; + + entry = FindMUIStringEntries(); + if (entry) + { + for (i = 0; entry[i].Number != 0; i++) + { + if (entry[i].Number == Number) + { + return entry[i].String; + } + } + } + + PopupError("Error: Failed to find translated string", + NULL, + NULL, + POPUP_WAIT_NONE); + + return "<nostring>"; +} + static BOOLEAN AddCodepageToRegistry(IN LPCWSTR ACPage, IN LPCWSTR OEMCPage, IN LPCWSTR MACCPage) { Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Fri Feb 8 07:14:09 2008 @@ -23,6 +23,12 @@ typedef struct { + LONG Number; + LPSTR String; +} MUI_STRING; + +typedef struct +{ PWCHAR LanguageID; PWCHAR LanguageKeyboardLayoutID; PWCHAR ACPage; @@ -31,6 +37,7 @@ PWCHAR LanguageDescriptor; const MUI_PAGE * MuiPages; const MUI_ERROR * MuiErrors; + const MUI_STRING * MuiStrings; }MUI_LANGUAGE; @@ -59,4 +66,20 @@ VOID SetConsoleCodePage(VOID); +LPSTR +MUIGetString(ULONG Number); + +#define STRING_INSTALLCREATEPARTITION 1 +#define STRING_INSTALLDELETEPARTITION 2 +#define STRING_CREATEPARTITION 3 +#define STRING_PARTITIONSIZE 4 +#define STRING_PLEASEWAIT 5 +#define STRING_CHOOSENEWPARTITION 6 +#define STRING_COPYING 7 +#define STRING_SETUPCOPYINGFILES 8 +#define STRING_PAGEDMEM 9 +#define STRING_NONPAGEDMEM 10 +#define STRING_FREEMEM 11 + + #endif

16 years, 8 months

← Newer
1
...
30
31
32
33
34
35
36
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2008