Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 32217: - Update Russian translation
by dchapyshev＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: dchapyshev Date: Fri Feb 8 16:11:55 2008 New Revision: 32217 URL: http://svn.reactos.org/svn/reactos?rev=32217&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Fri Feb 8 16:11:55 2008 @@ -826,7 +826,7 @@ { 0, 0, - " ®¦ «ã©áâ , ¯®¤®¦¤¨â¥...", + " Please wait...", TEXT_STATUS }, { @@ -1568,4 +1568,31 @@ } }; +MUI_STRING ruRUStrings[] = +{ + {STRING_INSTALLCREATEPARTITION, + " ENTER = áâ ®¢¨âì C = ®§¤ âì à §¤¥« F3 = ëå®¤"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = áâ ®¢¨âì D = ¤ «¨âì à §¤¥« F3 = ëå®¤"}, + {STRING_PARTITIONSIZE, + " §¬¥à ®¢®£® à §¤¥« :"}, + {STRING_PLEASEWAIT, + " ®¦ «ã©áâ , ¯®¤®¦¤¨â¥..."}, + {STRING_CHOOSENEWPARTITION, + "ë å®â¨â¥ á®§¤ âì ®¢ë© à §¤¥« "}, + {STRING_CREATEPARTITION, + " ENTER = ®§¤ âì à §¤¥« ESC = â¬¥ F3 = ëå®¤"}, + {STRING_COPYING, + " \xB3 ®¯¨à®¢ ¨¥: %S"}, + {STRING_SETUPCOPYINGFILES, + "à®£à ¬¬ ãáâ ®¢ª¨ ª®¯¨àã¥â ä ©«ë..."}, + {STRING_PAGEDMEM, + " âà ¨ç ï"}, + {STRING_NONPAGEDMEM, + " ¥áâà ¨ç ï"}, + {STRING_FREEMEM, + "¢®¡®¤ ï ¯ ¬ïâì"}, + {0, 0} +}; + #endif

1 0

[fireball] 32216: - Implement one more hack to obtain LaskKrnlPhysAddr (not really a solution for reactos, since ntldr allows kernel+drivers+hal to not be continuous in memory), when booting via ntldr/winldr.
by fireball＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: fireball Date: Fri Feb 8 16:11:01 2008 New Revision: 32216 URL: http://svn.reactos.org/svn/reactos?rev=32216&view=rev Log: - Implement one more hack to obtain LaskKrnlPhysAddr (not really a solution for reactos, since ntldr allows kernel+drivers+hal to not be continuous in memory), when booting via ntldr/winldr. Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Fri Feb 8 16:11:01 2008 @@ -319,8 +319,31 @@ /* Get the addresses */ FirstKrnlPhysAddr = (ULONG_PTR)LdrEntry->DllBase - KSEG0_BASE; - - /* FIXME: How do we get the last address? */ + } + + /* Get the last kernel address */ + if (!LastKrnlPhysAddr) + { + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Md; + + for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; + NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; + NextEntry = NextEntry->Flink) + { + Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); + if (Md->MemoryType == LoaderBootDriver || + Md->MemoryType == LoaderSystemCode || + Md->MemoryType == LoaderHalCode) + { + if (Md->BasePage+Md->PageCount > LastKrnlPhysAddr) + LastKrnlPhysAddr = Md->BasePage+Md->PageCount; + } + } + + /* Convert to a physical address */ + LastKrnlPhysAddr = LastKrnlPhysAddr << PAGE_SHIFT; + LastKernelAddress = LastKrnlPhysAddr | KSEG0_BASE; } /* Set memory limits */

1 0

[dchapyshev] 32215: - Start implement Advanced General page - Update Russian translation
by dchapyshev＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: dchapyshev Date: Fri Feb 8 16:07:37 2008 New Revision: 32215 URL: http://svn.reactos.org/svn/reactos?rev=32215&view=rev Log: - Start implement Advanced General page - Update Russian translation Added: trunk/reactos/dll/cpl/desk/general.c (with props) Modified: trunk/reactos/dll/cpl/desk/advmon.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/resource.h Modified: trunk/reactos/dll/cpl/desk/advmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advmon.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/advmon.c (original) +++ trunk/reactos/dll/cpl/desk/advmon.c Fri Feb 8 16:07:37 2008 @@ -46,31 +46,6 @@ } return FALSE; -} - -static INT_PTR CALLBACK -AdvGeneralPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - PDISPLAY_DEVICE_ENTRY DispDevice = NULL; - INT_PTR Ret = 0; - - if (uMsg != WM_INITDIALOG) - DispDevice = (PDISPLAY_DEVICE_ENTRY)GetWindowLongPtr(hwndDlg, DWLP_USER); - - switch (uMsg) - { - case WM_INITDIALOG: - DispDevice = (PDISPLAY_DEVICE_ENTRY)(((LPPROPSHEETPAGE)lParam)->lParam); - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)DispDevice); - - Ret = TRUE; - break; - } - - return Ret; } static VOID Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=32… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.h (original) +++ trunk/reactos/dll/cpl/desk/desk.h Fri Feb 8 16:07:37 2008 @@ -93,5 +93,8 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*); +INT_PTR CALLBACK +AdvGeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + #endif /* __CPL_DESK_H__ */ Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rbuild (original) +++ trunk/reactos/dll/cpl/desk/desk.rbuild Fri Feb 8 16:07:37 2008 @@ -33,5 +33,6 @@ <file>advappdlg.c</file> <file>settings.c</file> <file>monslctl.c</file> + <file>general.c</file> <file>desk.rc</file> </module> Added: trunk/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/general.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/general.c (added) +++ trunk/reactos/dll/cpl/desk/general.c Fri Feb 8 16:07:37 2008 @@ -1,0 +1,140 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Display Control Panel + * FILE: dll/cpl/desk/general.c + * PURPOSE: Advanced General settings + */ + +#include "desk.h" + +static VOID +InitFontSizeList(HWND hWnd) +{ + HINF hInf; + HKEY hKey; + HWND hFontSize; + INFCONTEXT Context; + int i, ci = 0; + + hFontSize = GetDlgItem(hWnd, IDC_FONTSIZE_COMBO); + + hInf = SetupOpenInfFile(L"font.inf", NULL, + INF_STYLE_WIN4, NULL); + + if (hInf != INVALID_HANDLE_VALUE) + { + if (SetupFindFirstLine(hInf, L"Font Sizes", NULL, &Context)) + { + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\FontDPI", + 0, KEY_READ, &hKey) == ERROR_SUCCESS) + for (;;) + { + TCHAR Desc[LINE_LEN]; + + if (SetupGetStringField(&Context, 0, Desc, sizeof(Desc), NULL) && + SetupGetIntField(&Context, 1, &ci)) + { + _stprintf(Desc, L"%s (%d DPI)", Desc, ci); + i = SendMessage(hFontSize, CB_ADDSTRING, 0, (LPARAM)Desc); + if (i != CB_ERR) + SendMessage(hFontSize, CB_SETITEMDATA, (WPARAM)i, (LPARAM)ci); + + DWORD dwSize = MAX_PATH, dwValue, dwType = REG_DWORD; + + if (RegQueryValueEx(hKey, L"LogPixels", NULL, + &dwType, (LPBYTE)&dwValue, &dwSize) == ERROR_SUCCESS) + { + if ((int)dwValue == ci) + { + SendMessage(hFontSize, CB_SETCURSEL, (WPARAM)i, 0); + SetWindowText(GetDlgItem(hWnd, IDC_FONTSIZE_COSTOM), Desc); + } + } + } + + if (!SetupFindNextLine(&Context, &Context)) + { + RegCloseKey(hKey); + break; + } + } + } + } + + SetupCloseInfFile(hInf); +} + +static VOID +InitRadioButtons(HWND hWnd) +{ + HKEY hKey; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\Display", + 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + TCHAR szBuf[64]; + DWORD dwSize = 64; + + if (RegQueryValueEx(hKey, L"DynaSettingsChange", 0, NULL, + (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS); + + switch (_ttoi(szBuf)) + { + case 0: + SendDlgItemMessage(hWnd, IDC_RESTART_RB, BM_SETCHECK, 1, 1); + break; + case 1: + SendDlgItemMessage(hWnd, IDC_WITHOUTREBOOT_RB, BM_SETCHECK, 1, 1); + break; + case 3: + SendDlgItemMessage(hWnd, IDC_ASKME_RB, BM_SETCHECK, 1, 1); + break; + } + + RegCloseKey(hKey); + } +} + +INT_PTR CALLBACK +AdvGeneralPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PDISPLAY_DEVICE_ENTRY DispDevice = NULL; + INT_PTR Ret = 0; + + if (uMsg != WM_INITDIALOG) + DispDevice = (PDISPLAY_DEVICE_ENTRY)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + DispDevice = (PDISPLAY_DEVICE_ENTRY)(((LPPROPSHEETPAGE)lParam)->lParam); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)DispDevice); + + InitFontSizeList(hwndDlg); + InitRadioButtons(hwndDlg); + + Ret = TRUE; + break; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_FONTSIZE_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + case IDC_RESTART_RB: + case IDC_WITHOUTREBOOT_RB: + case IDC_ASKME_RB: + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + break; + } + + return Ret; +} Propchange: trunk/reactos/dll/cpl/desk/general.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc Fri Feb 8 16:07:37 2008 @@ -120,11 +120,20 @@ PUSHBUTTON "Ðàç&øèðåíè...",IDC_SETTINGS_ADVANCED,306,165,56,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Îáùè" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc Fri Feb 8 16:07:37 2008 @@ -117,11 +117,20 @@ PUSHBUTTON "R&ozíøené nastavení...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Allgemein" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/el-GR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "Ãéá &ðñï÷ùñçìÝíïõò...",IDC_SETTINGS_ADVANCED,166,173,74,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "ÃåíéêÜ" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc Fri Feb 8 16:07:37 2008 @@ -118,11 +118,20 @@ PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc Fri Feb 8 16:07:37 2008 @@ -124,11 +124,20 @@ PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc Fri Feb 8 16:07:37 2008 @@ -119,11 +119,20 @@ PUSHBUTTON "A&vancé...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Général" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc Fri Feb 8 16:07:37 2008 @@ -117,11 +117,20 @@ PUSHBUTTON "&Haladóknak...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "&Lanjutan...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "A&vanzate...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Generale" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "Ú×Ýè(&V)...",IDC_SETTINGS_ADVANCED,170,205,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" -FONT 9, "MS UI Gothic" -BEGIN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc Fri Feb 8 16:07:37 2008 @@ -118,11 +118,20 @@ PUSHBUTTON "&Geavanceerd...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc Fri Feb 8 16:07:37 2008 @@ -126,11 +126,20 @@ PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ogólne" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc Fri Feb 8 16:07:37 2008 @@ -28,20 +28,20 @@ 70, 10, 105, 70, WS_EX_STATICEDGE GROUPBOX "&Çàñòàâêà",IDC_SCREENS_DUMMY, 7, 92, 231, 52 COMBOBOX IDC_SCREENS_LIST, 14, 104, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Ïàðàìåòðû",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP - PUSHBUTTON "Ï&ðîñìîòð",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "È&íòåðâàë:",IDC_WAITTEXT, 14, 125, 36, 9 + PUSHBUTTON "&Ïàðàìåòðû",IDC_SCREENS_SETTINGS, 120, 104, 50, 14, WS_GROUP + PUSHBUTTON "Ï&ðîñìîòð",IDC_SCREENS_TESTSC, 175, 104, 50, 14 + LTEXT "È&íòåðâàë:",IDC_WAITTEXT, 14, 124, 40, 10 EDITTEXT IDC_SCREENS_TIMEDELAY, 55, 121, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 - LTEXT "ìèí.", IDC_MINTEXT, 90, 125, 20, 9 + LTEXT "ìèí.", IDC_MINTEXT, 90, 124, 19, 10 CONTROL "Íà&÷èíàòü ñ ýêðàíà ïðèâåòñòâèÿ",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 109, 118, 122, 23 - GROUPBOX "&Ýíåðãîñáåðåæåíèå", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + BS_AUTOCHECKBOX | WS_TABSTOP, 110, 124, 124, 12 + GROUPBOX "&Ýíåðãîñáåðåæåíèå", IDC_SCREENS_DUMMY2, 6, 155, 232, 37 LTEXT "Äëÿ èçìåíåíèÿ ïàðàìåòðîâ ïèòàíèÿ ìîíèòîðà íàæìèòå êíîïêó ""Ïèòàíèå"".", IDC_STATIC, 14, 166, 146 ,20 - PUSHBUTTON "Ï&èòàíèå...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 + PUSHBUTTON "Ï&èòàíèå...", IDC_SCREENS_POWER_BUTTON, 171, 168, 55, 14 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -51,9 +51,9 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Öâåòîâàÿ ñõåìà", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Äîïîëíèòåëüíî", IDC_APPEARANCE_ADVANCED, 178, 150, 60, 15 + LTEXT "Öâåòîâàÿ ñõåìà:", IDC_STATIC, 7, 139, 154, 10 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 155, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Äîïîëíèòåëüíî", IDC_APPEARANCE_ADVANCED, 168, 150, 70, 14 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -94,33 +94,42 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 249, 197 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ïàðàìåòðû" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 - CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE - LTEXT "&Äèñïëåé:",1820,3,100,30,8 - LTEXT "<íåò>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Ðàçðåøåíèå ýêðàíà",1818,3,120,119,43 + LTEXT "Ðàçìåñòèòå çíà÷êè ìîíèòîðîâ â ñîîòâåòñòâèè ñ èõ ðàñïîëîæåíèåì.",-1,3,7,244,17 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,21,240,82,WS_EX_CLIENTEDGE + LTEXT "&Äèñïëåé:",1820,3,105,40,8 + LTEXT "<íåò>",IDC_SETTINGS_DEVICE,9,115,224,8 + GROUPBOX "&Ðàçðåøåíèå ýêðàíà",1818,3,129,119,46 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", - TBS_AUTOTICKS | WS_TABSTOP,33,130,58,17 - LTEXT "Ìåíüøå",1815,6,130,29,8,NOT WS_GROUP - LTEXT "Áîëüøå",1816,91,130,27,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Êà÷åñòâî öâåòîïåðåäà÷è",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + TBS_AUTOTICKS | WS_TABSTOP,33,141,58,17 + LTEXT "ìåí.",1815,12,146,21,8,NOT WS_GROUP + LTEXT "áîë.",1816,94,146,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,161,105,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Êà÷åñòâî öâåòîïåðåäà÷è",1817,129,129,115,46 + COMBOBOX IDC_SETTINGS_BPP,135,141,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 - PUSHBUTTON "Äî&ïîëíèòåëüíî",IDC_SETTINGS_ADVANCED,170,165,70,14 -END - -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,135,161,103,9 + PUSHBUTTON "Äî&ïîëíèòåëüíî",IDC_SETTINGS_ADVANCED,173,182,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Îáùèå" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ýêðàí", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Ðàçìåð øðèôòà:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Ñîâìåñòèìîñòü", -1, 7, 67, 237, 97 + LTEXT "Íåêîòîðûå ïðîãðàììû ìîãóò ðàáîòàòü íåïðàâèëüíî, åñëè âû íå ïåðåçàãðóçèòå êîìïüþòåð ïîñëå èçìåíåíèÿ ïàðàìåòðîâ ýêðàíà.\r\n\nÏîñëå èçìåíåíèÿ ïàðàìåòðîâ ýêðàíà ñëåäóåò:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "Ïåðå&çàãðóçèòü êîìïüþòåð ñ íîâûìè ïàðàìåòðàìè ýêðàíà", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "&Ïðèìåíèòü íîâûå ïàðàìåòðû ýêðàíà áåç ïåðåçàãðóçêè", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ç&àïðîñèòü ïåðåä ïðèìåíåíèåì íîâûõ ïàðàìåòðîâ ýêðàíà", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU @@ -138,15 +147,15 @@ MENUITEM "&Primary", ID_MENU_PRIMARY MENUITEM SEPARATOR MENUITEM "&Identify", ID_MENU_IDENTIFY - MENUITEM "P&roperties", ID_MENU_PROPERTIES + MENUITEM "&Ñâîéñòâà", ID_MENU_PROPERTIES END END STRINGTABLE BEGIN - IDS_MULTIPLEMONITORS "(Multiple Monitors)" - IDS_UNKNOWNMONITOR "(Unknown Monitor)" - IDS_ADVANCEDTITLEFMT "%s and %s" + IDS_MULTIPLEMONITORS "(Íåñêîëüêî ýêðàíîâ)" + IDS_UNKNOWNMONITOR "(Íåèçâåñòíûé ýêðàí)" + IDS_ADVANCEDTITLEFMT "%s è %s" END STRINGTABLE @@ -171,7 +180,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Êàðòèíêè (*.bmp;*.dib)\000*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Èçîáðàæåíèÿ (*.bmp;*.dib)\000*.bmp;*.dib" IDS_SUPPORTED_EXT "*.bmp;*.dib" END Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc Fri Feb 8 16:07:37 2008 @@ -125,11 +125,20 @@ PUSHBUTTON "&Spresni...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Veobecné" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc Fri Feb 8 16:07:37 2008 @@ -119,11 +119,20 @@ PUSHBUTTON "&Avancerat...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc Fri Feb 8 16:07:37 2008 @@ -124,11 +124,20 @@ PUSHBUTTON "Äîä&àòêîâî...",IDC_SETTINGS_ADVANCED,170,165,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Çàãàëüí³" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Fri Feb 8 16:07:37 2008 @@ -2,14 +2,14 @@ #define __CPL_DESK_RESOURCE_H__ /* metrics */ -#define PROPSHEETWIDTH 246 -#define PROPSHEETHEIGHT 228 -#define PROPSHEETPADDING 6 +#define PROPSHEETWIDTH 246 +#define PROPSHEETHEIGHT 228 +#define PROPSHEETPADDING 6 -#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) -#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) +#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) +#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) -#define ICONSIZE 16 +#define ICONSIZE 16 /* ids */ #define IDC_DESK_ICON 40 @@ -17,6 +17,7 @@ #define IDC_STATIC -1 +/* Dialogs */ #define IDD_BACKGROUND 100 #define IDD_SCREENSAVER 101 #define IDD_APPEARANCE 102 @@ -34,7 +35,6 @@ #define IDS_BACKGROUND_COMDLG_FILTER 1006 #define IDS_SUPPORTED_EXT 1007 - /* Screensaver Page */ #define IDC_SCREENS_PREVIEW 1010 #define IDC_SCREENS_LIST 1011 @@ -51,116 +51,118 @@ #define IDC_SCREENS_CHOICES -1 -#define IDS_CPLNAME 2000 -#define IDS_CPLDESCRIPTION 2001 +#define IDS_CPLNAME 2000 +#define IDS_CPLDESCRIPTION 2001 -#define IDS_NONE 2002 -#define IDS_CENTER 2003 -#define IDS_STRETCH 2004 -#define IDS_TILE 2005 +#define IDS_NONE 2002 +#define IDS_CENTER 2003 +#define IDS_STRETCH 2004 +#define IDS_TILE 2005 -#define IDC_SETTINGS_DEVICE 201 -#define IDC_SETTINGS_BPP 202 -#define IDC_SETTINGS_RESOLUTION 203 -#define IDC_SETTINGS_RESOLUTION_TEXT 204 -#define IDC_SETTINGS_ADVANCED 205 -#define IDC_SETTINGS_MONSEL 206 -#define IDC_SETTINGS_SPECTRUM 207 +#define IDC_SETTINGS_DEVICE 201 +#define IDC_SETTINGS_BPP 202 +#define IDC_SETTINGS_RESOLUTION 203 +#define IDC_SETTINGS_RESOLUTION_TEXT 204 +#define IDC_SETTINGS_ADVANCED 205 +#define IDC_SETTINGS_MONSEL 206 +#define IDC_SETTINGS_SPECTRUM 207 -#define IDB_SPECTRUM_4 208 -#define IDB_SPECTRUM_8 209 -#define IDB_SPECTRUM_16 210 +#define IDB_SPECTRUM_4 208 +#define IDB_SPECTRUM_8 209 +#define IDB_SPECTRUM_16 210 -#define IDR_PREVIEW_MENU 2100 -#define ID_MENU_NORMAL 2101 -#define ID_MENU_DISABLED 2102 -#define ID_MENU_SELECTED 2103 +#define IDR_PREVIEW_MENU 2100 +#define ID_MENU_NORMAL 2101 +#define ID_MENU_DISABLED 2102 +#define ID_MENU_SELECTED 2103 -#define IDM_MONITOR_MENU 2110 -#define ID_MENU_ATTACHED 2111 -#define ID_MENU_PRIMARY 2112 -#define ID_MENU_IDENTIFY 2113 -#define ID_MENU_PROPERTIES 2114 +#define IDM_MONITOR_MENU 2110 +#define ID_MENU_ATTACHED 2111 +#define ID_MENU_PRIMARY 2112 +#define ID_MENU_IDENTIFY 2113 +#define ID_MENU_PROPERTIES 2114 /* Settings Page */ - -#define IDS_PIXEL 2301 - -#define IDS_COLOR_4BIT 2904 -#define IDS_COLOR_8BIT 2908 -#define IDS_COLOR_16BIT 2916 -#define IDS_COLOR_24BIT 2924 -#define IDS_COLOR_32BIT 2932 - +#define IDS_PIXEL 2301 +#define IDS_COLOR_4BIT 2904 +#define IDS_COLOR_8BIT 2908 +#define IDS_COLOR_16BIT 2916 +#define IDS_COLOR_24BIT 2924 +#define IDS_COLOR_32BIT 2932 /* Appearance Page */ -#define IDC_APPEARANCE_PREVIEW 1500 -#define IDC_APPEARANCE_UI_ITEM 1501 -#define IDC_APPEARANCE_COLORSCHEME 1502 -#define IDC_APPEARANCE_FONTSIZE 1503 -#define IDC_APPEARANCE_EFFECTS 1504 -#define IDC_APPEARANCE_ADVANCED 1505 +#define IDC_APPEARANCE_PREVIEW 1500 +#define IDC_APPEARANCE_UI_ITEM 1501 +#define IDC_APPEARANCE_COLORSCHEME 1502 +#define IDC_APPEARANCE_FONTSIZE 1503 +#define IDC_APPEARANCE_EFFECTS 1504 +#define IDC_APPEARANCE_ADVANCED 1505 -#define IDS_INACTWIN 1510 -#define IDS_ACTWIN 1511 -#define IDS_WINTEXT 1512 -#define IDS_MESSBOX 1513 -#define IDS_MESSTEXT 1514 -#define IDS_BUTTEXT 1515 +#define IDS_INACTWIN 1510 +#define IDS_ACTWIN 1511 +#define IDS_WINTEXT 1512 +#define IDS_MESSBOX 1513 +#define IDS_MESSTEXT 1514 +#define IDS_BUTTEXT 1515 /* Update these IDs when you change the string id list */ -#define IDS_ITEM_FIRST (IDS_ITEM_3D_OBJECTS) -#define IDS_ITEM_LAST (IDS_ITEM_CAPTION_BUTTONS + 1) +#define IDS_ITEM_FIRST (IDS_ITEM_3D_OBJECTS) +#define IDS_ITEM_LAST (IDS_ITEM_CAPTION_BUTTONS + 1) +/* Advanced Appearance Dialog */ +#define IDC_ADVAPPEARANCE_PREVIEW 3101 +#define IDC_ADVAPPEARANCE_ELEMENT 3102 +#define IDC_ADVAPPEARANCE_SIZE_T 3103 +#define IDC_ADVAPPEARANCE_SIZE_E 3104 +#define IDC_ADVAPPEARANCE_SIZE_UD 3105 +#define IDC_ADVAPPEARANCE_COLOR1_T 3106 +#define IDC_ADVAPPEARANCE_COLOR1_B 3107 +#define IDC_ADVAPPEARANCE_COLOR2_T 3108 +#define IDC_ADVAPPEARANCE_COLOR2_B 3109 +#define IDC_ADVAPPEARANCE_FONT_T 3110 +#define IDC_ADVAPPEARANCE_FONT_C 3111 +#define IDC_ADVAPPEARANCE_FONTSIZE_T 3112 +#define IDC_ADVAPPEARANCE_FONTSIZE_E 3113 +#define IDC_ADVAPPEARANCE_FONTCOLOR_T 3114 +#define IDC_ADVAPPEARANCE_FONTCOLOR_B 3115 +#define IDC_ADVAPPEARANCE_FONTBOLD 3116 +#define IDC_ADVAPPEARANCE_FONTITALIC 3117 -/* Advanced Appearance Dialog */# +#define IDS_ELEMENT_0 3200 +#define IDS_ELEMENT_1 3201 +#define IDS_ELEMENT_2 3202 +#define IDS_ELEMENT_3 3203 +#define IDS_ELEMENT_4 3204 +#define IDS_ELEMENT_5 3205 +#define IDS_ELEMENT_6 3206 +#define IDS_ELEMENT_7 3207 +#define IDS_ELEMENT_8 3208 +#define IDS_ELEMENT_9 3209 +#define IDS_ELEMENT_10 3210 +#define IDS_ELEMENT_11 3211 +#define IDS_ELEMENT_12 3212 +#define IDS_ELEMENT_13 3213 +#define IDS_ELEMENT_14 3214 +#define IDS_ELEMENT_15 3215 +#define IDS_ELEMENT_16 3216 +#define IDS_ELEMENT_17 3217 +#define IDS_ELEMENT_18 3218 +#define IDS_ELEMENT_19 3219 +#define IDS_ELEMENT_20 3220 +#define IDS_ELEMENT_21 3221 +#define IDS_ELEMENT_22 3222 +#define IDS_ELEMENT_23 3223 -#define IDC_ADVAPPEARANCE_PREVIEW 3101 -#define IDC_ADVAPPEARANCE_ELEMENT 3102 -#define IDC_ADVAPPEARANCE_SIZE_T 3103 -#define IDC_ADVAPPEARANCE_SIZE_E 3104 -#define IDC_ADVAPPEARANCE_SIZE_UD 3105 -#define IDC_ADVAPPEARANCE_COLOR1_T 3106 -#define IDC_ADVAPPEARANCE_COLOR1_B 3107 -#define IDC_ADVAPPEARANCE_COLOR2_T 3108 -#define IDC_ADVAPPEARANCE_COLOR2_B 3109 -#define IDC_ADVAPPEARANCE_FONT_T 3110 -#define IDC_ADVAPPEARANCE_FONT_C 3111 -#define IDC_ADVAPPEARANCE_FONTSIZE_T 3112 -#define IDC_ADVAPPEARANCE_FONTSIZE_E 3113 -#define IDC_ADVAPPEARANCE_FONTCOLOR_T 3114 -#define IDC_ADVAPPEARANCE_FONTCOLOR_B 3115 -#define IDC_ADVAPPEARANCE_FONTBOLD 3116 -#define IDC_ADVAPPEARANCE_FONTITALIC 3117 +#define IDS_MULTIPLEMONITORS 3300 +#define IDS_UNKNOWNMONITOR 3301 +#define IDS_ADVANCEDTITLEFMT 3302 -#define IDS_ELEMENT_0 3200 -#define IDS_ELEMENT_1 3201 -#define IDS_ELEMENT_2 3202 -#define IDS_ELEMENT_3 3203 -#define IDS_ELEMENT_4 3204 -#define IDS_ELEMENT_5 3205 -#define IDS_ELEMENT_6 3206 -#define IDS_ELEMENT_7 3207 -#define IDS_ELEMENT_8 3208 -#define IDS_ELEMENT_9 3209 -#define IDS_ELEMENT_10 3210 -#define IDS_ELEMENT_11 3211 -#define IDS_ELEMENT_12 3212 -#define IDS_ELEMENT_13 3213 -#define IDS_ELEMENT_14 3214 -#define IDS_ELEMENT_15 3215 -#define IDS_ELEMENT_16 3216 -#define IDS_ELEMENT_17 3217 -#define IDS_ELEMENT_18 3218 -#define IDS_ELEMENT_19 3219 -#define IDS_ELEMENT_20 3220 -#define IDS_ELEMENT_21 3221 -#define IDS_ELEMENT_22 3222 -#define IDS_ELEMENT_23 3223 - -#define IDS_MULTIPLEMONITORS 3300 -#define IDS_UNKNOWNMONITOR 3301 -#define IDS_ADVANCEDTITLEFMT 3302 +/* Advanced General Dialog */ +#define IDC_FONTSIZE_COMBO 5000 +#define IDC_FONTSIZE_COSTOM 5001 +#define IDC_RESTART_RB 5002 +#define IDC_WITHOUTREBOOT_RB 5003 +#define IDC_ASKME_RB 5004 #endif /* __CPL_DESK_RESOURCE_H__ */

1 0

[fireball] 32214: - Implement MiCountFreePagesInLoaderBlock() to correctly count free pages (instead of using a variable introduced somewhere below r2000 (MemHigher), and later converted to MmFreeLdrMemHigher). - Get rid of MmFreeLdrMemHigher and MmFreeLdrMemLower (they were not actually used for anything except getting number of free pages).
by fireball＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: fireball Date: Fri Feb 8 13:55:40 2008 New Revision: 32214 URL: http://svn.reactos.org/svn/reactos?rev=32214&view=rev Log: - Implement MiCountFreePagesInLoaderBlock() to correctly count free pages (instead of using a variable introduced somewhere below r2000 (MemHigher), and later converted to MmFreeLdrMemHigher). - Get rid of MmFreeLdrMemHigher and MmFreeLdrMemLower (they were not actually used for anything except getting number of free pages). Modified: trunk/reactos/include/reactos/rosldr.h trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/include/reactos/rosldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/rosldr.h?r… ============================================================================== --- trunk/reactos/include/reactos/rosldr.h (original) +++ trunk/reactos/include/reactos/rosldr.h Fri Feb 8 13:55:40 2008 @@ -45,7 +45,6 @@ ULONG ArchExtra; } ROS_LOADER_PARAMETER_BLOCK, *PROS_LOADER_PARAMETER_BLOCK; -extern ULONG MmFreeLdrMemHigher, MmFreeLdrMemLower; extern BOOLEAN AcpiTableDetected; extern ULONG MmFreeLdrPageDirectoryStart, MmFreeLdrPageDirectoryEnd; Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Fri Feb 8 13:55:40 2008 @@ -32,7 +32,6 @@ /* FreeLDR Memory Data */ ULONG_PTR MmFreeLdrFirstKrnlPhysAddr, MmFreeLdrLastKrnlPhysAddr; ULONG_PTR MmFreeLdrLastKernelAddress; -ULONG MmFreeLdrMemHigher; ULONG MmFreeLdrPageDirectoryEnd; /* FreeLDR Loader Data */ @@ -926,7 +925,6 @@ /* First get some kernel-loader globals */ AcpiTableDetected = (RosLoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE : FALSE; - MmFreeLdrMemHigher = RosLoaderBlock->MemHigher; MmFreeLdrPageDirectoryEnd = RosLoaderBlock->PageDirectoryEnd; if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Fri Feb 8 13:55:40 2008 @@ -203,6 +203,35 @@ * */ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); +} + +ULONG +NTAPI +MiCountFreePagesInLoaderBlock(PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Md; + ULONG TotalPages = 0; + + for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; + NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; + NextEntry = NextEntry->Flink) + { + Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); + + if (Md->MemoryType == LoaderBad || + Md->MemoryType == LoaderFirmwarePermanent || + Md->MemoryType == LoaderSpecialMemory || + Md->MemoryType == LoaderBBTMemory) + { + /* Don't count these blocks */ + continue; + } + + TotalPages += Md->PageCount; + } + + return TotalPages; } PCHAR @@ -247,7 +276,6 @@ * FUNCTION: Initalize memory managment */ { - ULONG i; ULONG kernel_len; ULONG_PTR MappingAddress; PLDR_DATA_TABLE_ENTRY LdrEntry; @@ -280,26 +308,7 @@ DPRINT("CurrentProcess: %x\n", PsGetCurrentProcess()); PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart = (ULONG)MmGetPageDirectory(); - if ((BIOSMemoryMap != NULL) && (AddressRangeCount > 0)) - { - // If we have a bios memory map, recalulate the memory size - ULONG last = 0; - for (i = 0; i < AddressRangeCount; i++) - { - if (BIOSMemoryMap[i].Type == 1 - && (BIOSMemoryMap[i].BaseAddrLow + BIOSMemoryMap[i].LengthLow + PAGE_SIZE -1) / PAGE_SIZE > last) - { - last = (BIOSMemoryMap[i].BaseAddrLow + BIOSMemoryMap[i].LengthLow + PAGE_SIZE -1) / PAGE_SIZE; - } - } - if ((last - 256) * 4 > MmFreeLdrMemHigher) - { - MmFreeLdrMemHigher = (last - 256) * 4; - } - } - /* NTLDR Hacks */ - if (!MmFreeLdrMemHigher) MmFreeLdrMemHigher = 65536; if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; if (!FirstKrnlPhysAddr) { @@ -312,11 +321,6 @@ FirstKrnlPhysAddr = (ULONG_PTR)LdrEntry->DllBase - KSEG0_BASE; /* FIXME: How do we get the last address? */ - } - - if (MmFreeLdrMemHigher >= (MaxMem - 1) * 1024) - { - MmFreeLdrMemHigher = (MaxMem - 1) * 1024; } /* Set memory limits */ @@ -346,13 +350,13 @@ * (we assume the kernel occupies a continuous range of physical * memory) */ - DPRINT("first krnl %x\nlast krnl %x\n",FirstKrnlPhysAddr, + DPRINT("first krnl %x, last krnl %x\n",FirstKrnlPhysAddr, LastKrnlPhysAddr); /* * Free physical memory not used by the kernel */ - MmStats.NrTotalPages = MmFreeLdrMemHigher/4; + MmStats.NrTotalPages = MiCountFreePagesInLoaderBlock(KeLoaderBlock); MmNumberOfPhysicalPages = MmStats.NrTotalPages; if (!MmStats.NrTotalPages) { @@ -361,12 +365,9 @@ } else { - /* add 1MB for standard memory (not extended) */ + /* HACK: add 1MB for standard memory (not extended). Why? */ MmStats.NrTotalPages += 256; } -#ifdef BIOS_MEM_FIX - MmStats.NrTotalPages += 16; -#endif /* * Initialize the kernel address space

1 0

[fireball] 32213: - Formatting fixes.
by fireball＠svn.reactos.org 08 Feb '08

08 Feb '08

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>

1 0

[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 08 Feb '08

08 Feb '08

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 "Äðàéâåðè öüîãî ïðèñòðîþ òðåáà ïåðåóñòàíîâèòè."

1 0

[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 08 Feb '08

08 Feb '08

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"

1 0

[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 08 Feb '08

08 Feb '08

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, "Â³äêðèòè"

1 0

[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 08 Feb '08

08 Feb '08

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;

1 0

[dreimer] 32208: Apply r32184 for Slovak Translation too.
by dreimer＠svn.reactos.org 08 Feb '08

08 Feb '08

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"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs