Ros-diffs October 2023

ros-diffs@reactos.org

21 participants
140 discussions

[reactos] 01/01: [TASKMGR] Get rid of cplusplus extern c (#5808)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ddd1d19b3fbf6731eb533… commit ddd1d19b3fbf6731eb5339d5834f7f519caeae39 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Fri Oct 20 13:03:59 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 20 13:03:59 2023 +0200 [TASKMGR] Get rid of cplusplus extern c (#5808) The others in graphctrl.h and graph.h are being handled in the yet-uncommitted PR #5343. --- base/applications/taskmgr/perfdata.h | 15 +++------------ base/applications/taskmgr/perfpage.h | 10 +--------- base/applications/taskmgr/taskmgr.h | 23 +---------------------- 3 files changed, 5 insertions(+), 43 deletions(-) diff --git a/base/applications/taskmgr/perfdata.h b/base/applications/taskmgr/perfdata.h index 3da4a0fef2b..0a06c4d5cf2 100644 --- a/base/applications/taskmgr/perfdata.h +++ b/base/applications/taskmgr/perfdata.h @@ -1,17 +1,13 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Performance Counters. + * PURPOSE: Performance Counters * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> * Copyright 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> */ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #define Li2Double(x) ((double)((x).HighPart) * 4.294967296E9 + (double)((x).LowPart)) typedef struct _PERFDATA @@ -43,9 +39,9 @@ typedef struct _PERFDATA typedef struct _CMD_LINE_CACHE { - DWORD idx; + DWORD idx; LPWSTR str; - ULONG len; + ULONG len; struct _CMD_LINE_CACHE* pnext; } CMD_LINE_CACHE, *PCMD_LINE_CACHE; @@ -99,8 +95,3 @@ ULONG PerfDataGetPhysicalMemorySystemCacheK(void); ULONG PerfDataGetSystemHandleCount(void); ULONG PerfDataGetTotalThreadCount(void); - - -#ifdef __cplusplus -}; -#endif diff --git a/base/applications/taskmgr/perfpage.h b/base/applications/taskmgr/perfpage.h index e581bd39c3e..fcf270eece3 100644 --- a/base/applications/taskmgr/perfpage.h +++ b/base/applications/taskmgr/perfpage.h @@ -1,16 +1,12 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Performance Page. + * PURPOSE: Performance Page * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - extern HWND hPerformancePage; /* Performance Property Page */ INT_PTR CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); @@ -18,7 +14,3 @@ void RefreshPerformancePage(void); void PerformancePage_OnViewShowKernelTimes(void); void PerformancePage_OnViewCPUHistoryOneGraphAll(void); void PerformancePage_OnViewCPUHistoryOneGraphPerCPU(void); - -#ifdef __cplusplus -}; -#endif diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h index e65ef30221f..fe387718c40 100644 --- a/base/applications/taskmgr/taskmgr.h +++ b/base/applications/taskmgr/taskmgr.h @@ -1,29 +1,12 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Main Header. + * PURPOSE: Main Header * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef _MSC_VER -/*MF -typedef struct _IO_COUNTERS { - ULONGLONG ReadOperationCount; - ULONGLONG WriteOperationCount; - ULONGLONG OtherOperationCount; - ULONGLONG ReadTransferCount; - ULONGLONG WriteTransferCount; - ULONGLONG OtherTransferCount; -} IO_COUNTERS, *PIO_COUNTERS; -*/ -#endif /* _MSC_VER */ - #include "resource.h" #define RUN_APPS_PAGE @@ -100,7 +83,3 @@ void TaskManager_OnTabWndSelChange(void); VOID ShowWin32Error(DWORD dwError); LPTSTR GetLastErrorText( LPTSTR lpszBuf, DWORD dwSize ); DWORD EndLocalThread(HANDLE *hThread, DWORD dwThread); - -#ifdef __cplusplus -} -#endif

11 months

[reactos] 01/01: [SHELL32] Enable Apply button when shortcut show mode is changed (#5807)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ded91e310a570323182df… commit ded91e310a570323182df18325af29b62b2d0810 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Fri Oct 20 13:02:14 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 20 13:02:14 2023 +0200 [SHELL32] Enable Apply button when shortcut show mode is changed (#5807) Basically this happens when the combobox selection changes. --- dll/win32/shell32/CShellLink.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index d8951860328..bdd1b617082 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -2886,7 +2886,7 @@ void CShellLink::OnCommand(HWND hwndDlg, int id, HWND hwndCtl, UINT codeNotify) return; } } - if (codeNotify == EN_CHANGE) + if (codeNotify == EN_CHANGE || codeNotify == CBN_SELCHANGE) { if (!m_bInInit) PropSheet_Changed(GetParent(hwndDlg), hwndDlg);

11 months

[reactos] 01/01: [TASKMGR] *.rc Deduplicate dynamic menu strings (#5772)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63eaf2bd529f5bf94cde6… commit 63eaf2bd529f5bf94cde65afc26944e98b47850b Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Thu Oct 19 12:19:20 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 19 10:19:20 2023 +0000 [TASKMGR] *.rc Deduplicate dynamic menu strings (#5772) Some of the Menu-controls are just dummies in the RC, because those controls are dynamically replaced at runtime based on which tab/propsheet is active in taskmgr. They are replaced by the IDS_MENU_* strings then. Deduplicating them has many advantages: 1.) It shrinks binary size: master taskmgr.exe RosBEWin2.2.2 GCC8.4.0dbg 708.608 -> 696.832 bytes 2.) Translators don't get lured into translating dead stuff, assuming they translated the menu properly, while in fact they did not. This is *real*. Happened even to me multiple times already, although I am actually aware of the design. 3.) Some of them were offsync already between the dummy and the real thing. 4.) It reduces diff between en-US and other rc's. * Aside of that improve alignment in some languages rcs in the "Shutdown"-menu-section, * and improve a translation in de-DE, sq-AL, and zh-CN. * [TASKMGR] id-ID.rc 2 accelerators in the same string is definitely wrong * [TASKMGR] *.rc, make sure that warning is in all 30 langs, especially in en-US.rc * [TASKMGR] for several translations add FIXME-comments regarding accelerator collisions --- base/applications/taskmgr/lang/bg-BG.rc | 52 +++++++++--------- base/applications/taskmgr/lang/cs-CZ.rc | 50 ++++++++--------- base/applications/taskmgr/lang/da-DK.rc | 52 +++++++++--------- base/applications/taskmgr/lang/de-DE.rc | 40 +++++++------- base/applications/taskmgr/lang/el-GR.rc | 52 +++++++++--------- base/applications/taskmgr/lang/en-US.rc | 54 ++++++++++--------- base/applications/taskmgr/lang/es-ES.rc | 96 ++++++++++++++++----------------- base/applications/taskmgr/lang/et-EE.rc | 54 ++++++++++--------- base/applications/taskmgr/lang/fr-FR.rc | 52 +++++++++--------- base/applications/taskmgr/lang/he-IL.rc | 52 +++++++++--------- base/applications/taskmgr/lang/hu-HU.rc | 72 ++++++++++++------------- base/applications/taskmgr/lang/id-ID.rc | 36 ++++++------- base/applications/taskmgr/lang/it-IT.rc | 52 +++++++++--------- base/applications/taskmgr/lang/ja-JP.rc | 52 +++++++++--------- base/applications/taskmgr/lang/ko-KR.rc | 52 +++++++++--------- base/applications/taskmgr/lang/nl-NL.rc | 56 +++++++++---------- base/applications/taskmgr/lang/no-NO.rc | 78 +++++++++++++-------------- base/applications/taskmgr/lang/pl-PL.rc | 52 +++++++++--------- base/applications/taskmgr/lang/pt-BR.rc | 52 +++++++++--------- base/applications/taskmgr/lang/pt-PT.rc | 60 ++++++++++----------- base/applications/taskmgr/lang/ro-RO.rc | 48 ++++++++--------- base/applications/taskmgr/lang/ru-RU.rc | 50 ++++++++--------- base/applications/taskmgr/lang/sk-SK.rc | 52 +++++++++--------- base/applications/taskmgr/lang/sq-AL.rc | 56 +++++++++---------- base/applications/taskmgr/lang/sv-SE.rc | 56 +++++++++---------- base/applications/taskmgr/lang/tr-TR.rc | 50 ++++++++--------- base/applications/taskmgr/lang/uk-UA.rc | 52 +++++++++--------- base/applications/taskmgr/lang/zh-CN.rc | 54 +++++++++---------- base/applications/taskmgr/lang/zh-HK.rc | 52 +++++++++--------- base/applications/taskmgr/lang/zh-TW.rc | 52 +++++++++--------- 30 files changed, 823 insertions(+), 815 deletions(-) diff --git a/base/applications/taskmgr/lang/bg-BG.rc b/base/applications/taskmgr/lang/bg-BG.rc index 69bbd1ab122..b41a49d2b2a 100644 --- a/base/applications/taskmgr/lang/bg-BG.rc +++ b/base/applications/taskmgr/lang/bg-BG.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Винаги отгоре", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "С&маляване при употреба", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Скриване при смаляване", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Показване на 16-битово задачи", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "Из&глед" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Задържане", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Големи значета", ID_VIEW_LARGE - MENUITEM "&Малки значета", ID_VIEW_SMALL - MENUITEM "&Подробен", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Избор на стълбове...", ID_VIEW_SELECTCOLUMNS - POPUP "Дневник на &ЦПУ" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Една графика за всички ЦПУ", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "По графика за &всеки ЦПУ", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Показване на времената на ядрото", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Прозорци" + POPUP "" BEGIN MENUITEM "Водоравно настелване", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "&Отвесно настелване", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Помо&щ" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Нова задача (Изпълнение...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Превключване на", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "Изваждане &отпред ", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Възстановяване", ID_RESTORE MENUITEM "&Затваряне", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Прекратяването на действието", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "&Прекратяването на дърво от действия", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Задачен управител" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Прекратяване на задача", IDC_ENDTASK, 7, 189, 95, 14, WS_DISABLED PUSHBUTTON "Пре&включване на...", IDC_SWITCHTO, 102, 189, 75, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Показване на действията на всички потребители", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 190, 10 diff --git a/base/applications/taskmgr/lang/cs-CZ.rc b/base/applications/taskmgr/lang/cs-CZ.rc index 280d0e6aa3a..63f2119ee40 100644 --- a/base/applications/taskmgr/lang/cs-CZ.rc +++ b/base/applications/taskmgr/lang/cs-CZ.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Vždy navrchu", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimalizovat při použití", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Skrýt při minimalizaci", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Zobrazit 16-bitové úlohy", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Zobrazit" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Zastavit", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Velké ikony", ID_VIEW_LARGE - MENUITEM "&Malé ikony", ID_VIEW_SMALL - MENUITEM "&Detaily", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Vybrat sloupce...", ID_VIEW_SELECTCOLUMNS - POPUP "&Historie CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Jeden graf, všechny procesory", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "&Jeden graf, jeden procesor", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Zobrazit časy jádra", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Okna" + POPUP "" BEGIN MENUITEM "Vyrovnat &horizontálně", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Vyrovnat &vertikálně", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Vy&pnout" BEGIN - MENUITEM "Režim &spánku", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernace", ID_SHUTDOWN_HIBERNATE - MENUITEM "&Vypnout", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restartovat", ID_SHUTDOWN_REBOOT - MENUITEM "&Odhlásit uživatele %s", ID_SHUTDOWN_LOGOFF + MENUITEM "Režim &spánku", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernace", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Vypnout", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restartovat", ID_SHUTDOWN_REBOOT + MENUITEM "&Odhlásit uživatele %s", ID_SHUTDOWN_LOGOFF MENUITEM "&Přepnout uživatele\tWin+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "&Zamknout počítač\tWin+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "O&dpojit se", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "Vy&jmout počítač", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "&Zamknout počítač\tWin+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "O&dpojit se", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "Vy&jmout počítač", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Nápověda" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Nová úloha (Spustit...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Přepnout do", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Přenést do popředí", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Obnovit", ID_RESTORE MENUITEM "&Uzavřít", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Ukončit proces", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Ukončit &strom procesu", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Správce úloh" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Ukončit úlohu", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Přepnout", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Zobrazit procesy všech uživatelů", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 153, 10 diff --git a/base/applications/taskmgr/lang/da-DK.rc b/base/applications/taskmgr/lang/da-DK.rc index 7af08f234b9..ae1f26bf3f5 100644 --- a/base/applications/taskmgr/lang/da-DK.rc +++ b/base/applications/taskmgr/lang/da-DK.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Altid Øverst", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimere Ved Brug", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Skjul Når Minimeret", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Vis 16-bit Opgaver", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Vis" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Pauset", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "St&ore Ikoner", ID_VIEW_LARGE - MENUITEM "S&må Ikoner", ID_VIEW_SMALL - MENUITEM "&Detaljer", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Vælg Kolonner...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU Historie" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&En Graf, Alle CPUer", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "En Graf &Pr CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Vis Kernel Tider", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Vinduer" + POPUP "" BEGIN MENUITEM "Tile &Horisontalt", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Tile &Verticalt", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Hjælp" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Ny Opgave (Kør...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Skift Til", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Bring til front", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Gendan", ID_RESTORE MENUITEM "&Luk", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Afslut Process", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Afslut Process &Træ", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Opgavestyring" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Afslut Opgave", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Skift Til", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Vis Processor fra alle brugere", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc index 519d3097edb..f914ee914aa 100644 --- a/base/applications/taskmgr/lang/de-DE.rc +++ b/base/applications/taskmgr/lang/de-DE.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "&Immer im Vordergrund", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Nach Programmstart minimieren", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Ausblenden, wenn minimiert", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&16-Bit-Tasks anzeigen", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Ansicht" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "Ang&ehalten", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Große Symbole", ID_VIEW_LARGE - MENUITEM "K&leine Symbole", ID_VIEW_SMALL - MENUITEM "&Details", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Spalten auswählen...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU-Verlauf" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Alle CPUs in einem Diagramm", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "&Ein Diagramm pro CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "K&ernel-Zeiten anzeigen", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Fenster" + POPUP "" BEGIN MENUITEM "&Untereinander", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "&Nebeneinander", ID_WINDOWS_TILEVERTICALLY @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Neuer Task (Ausführen...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Wechseln zu", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&In Vordergrund", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Wiederherstellen", ID_RESTORE MENUITEM "S&chließen", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Prozess beenden", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Pr&ozessstruktur beenden", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Task-Manager" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Task beenden", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Wechseln zu", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "Prozesse aller &Benutzer anzeigen", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 120, 10 @@ -285,7 +285,7 @@ BEGIN LTEXT "Wählen Sie die Spalten aus, die auf der Registerkarte Prozesse angezeigt werden sollen.", IDC_STATIC, 7, 7, 221, 17 CONTROL "&Name", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 CONTROL "&PID (Prozess-ID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 88, 10 - CONTROL "&CPU %", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 80, 10 + CONTROL "&CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 80, 10 CONTROL "CP&U-Zeit", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 48, 10 CONTROL "&Speicherlast", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 90, 10 CONTROL "&Delta Speicherlast", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10 @@ -326,7 +326,7 @@ BEGIN ID_OPTIONS_ALWAYSONTOP "Task-Manager bleibt im Vordergrund, wenn nicht minimiert." ID_OPTIONS_MINIMIZEONUSE "Task-Manager wird minimiert, wenn ein SwitchTo-Vorgang durchgeführt wird." ID_OPTIONS_HIDEWHENMINIMIZED "Blendet den Task-Manager aus, wenn er minimiert ist." - ID_VIEW_REFRESH "Veranlasst den Task-Manager zur sofortigen Aktualisierung, unabhängig von der Geschwindigkeitseinstellung." + ID_VIEW_REFRESH "Veranlasst den Task-Manager zur sofortigen Aktualisierung." ID_VIEW_LARGE "Zeigt Tasks als große Symbole an." ID_VIEW_SMALL "Zeigt Tasks als kleine Symbole an." ID_VIEW_DETAILS "Zeigt Informationen über jeden Task an." @@ -385,7 +385,7 @@ BEGIN IDS_TAB_PID "PID" IDS_TAB_USERNAME "Benutzername" IDS_TAB_SESSIONID "Sitzungskennung" - IDS_TAB_CPU "CPU %" + IDS_TAB_CPU "CPU" IDS_TAB_CPUTIME "CPU-Zeit" IDS_TAB_MEMUSAGE "Speicherlast" IDS_TAB_PEAKMEMUSAGE "Maximale Speicherlast" diff --git a/base/applications/taskmgr/lang/el-GR.rc b/base/applications/taskmgr/lang/el-GR.rc index 0d9068e83f4..8b0a0db89d4 100644 --- a/base/applications/taskmgr/lang/el-GR.rc +++ b/base/applications/taskmgr/lang/el-GR.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "&Πάντα Μπροστά", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Σμίκρυνση κατά τη Χρήση", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Απόκρυψη όταν είναι σε Σμίκρυνση", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Εμφάνιση 16-bit διεργασιών", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Εμφάνιση" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&Σε Διακοπή", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Με&γάλα Εικονίδια", ID_VIEW_LARGE - MENUITEM "Μι&κρά Εικονίδια", ID_VIEW_SMALL - MENUITEM "&Λεπτομέρειες", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Επιλογή Στηλών...", ID_VIEW_SELECTCOLUMNS - POPUP "&Ιστορικό Επεξεργαστή" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&One Graph, All CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "One Graph &Per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Εμφάνιση Χρόνων Επεξεργαστή", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Παράθυρα" + POPUP "" BEGIN MENUITEM "Tile &Horizontally", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Tile &Vertically", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Βοήθεια" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&New Task (Run...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Switch To", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restore", ID_RESTORE MENUITEM "&Close", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&End Process", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "End Process &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Task Manager" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&End Task", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Switch To", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Show processes from all users", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 diff --git a/base/applications/taskmgr/lang/en-US.rc b/base/applications/taskmgr/lang/en-US.rc index 8f7e588b6e2..6c12067e84f 100644 --- a/base/applications/taskmgr/lang/en-US.rc +++ b/base/applications/taskmgr/lang/en-US.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Always On Top", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimize On Use", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Hide When Minimized", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Show 16-bit tasks", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&View" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Paused", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Lar&ge Icons", ID_VIEW_LARGE - MENUITEM "S&mall Icons", ID_VIEW_SMALL - MENUITEM "&Details", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Select Columns...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU History" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&One Graph, All CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "One Graph &Per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Show Kernel Times", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Windows" + POPUP "" BEGIN MENUITEM "Tile &Horizontally", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Tile &Vertically", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Help" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&New Task (Run...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Switch To", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Bring To Front", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restore", ID_RESTORE MENUITEM "&Close", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&End Process", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "End Process &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -143,6 +143,8 @@ END /* Dialogs */ +/* TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened */ + IDD_TASKMGR_DIALOG DIALOGEX 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME @@ -150,14 +152,14 @@ CAPTION "Task Manager" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&End Task", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Switch To", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -168,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Show processes from all users", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 diff --git a/base/applications/taskmgr/lang/es-ES.rc b/base/applications/taskmgr/lang/es-ES.rc index 35cce6c9f33..233085d876e 100644 --- a/base/applications/taskmgr/lang/es-ES.rc +++ b/base/applications/taskmgr/lang/es-ES.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "Siempre &visible", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimizar al abrir", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Ocultar al estar minimizado", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "Mo&strar tareas de 16-bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Ver" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&Pausar", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Iconos &grandes", ID_VIEW_LARGE - MENUITEM "Iconos &pequeños", ID_VIEW_SMALL - MENUITEM "&Detalles", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Seleccionar columnas...", ID_VIEW_SELECTCOLUMNS - POPUP "Historial de &CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Un gráfico de todas las CPU", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Un gráfico &por cada CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END MENUITEM "&Mostrar cronología del kernel", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Ventanas" + POPUP "" BEGIN MENUITEM "Mosaico &horizontal", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Mosaico &vertical", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "Apaga&r" BEGIN - MENUITEM "&Suspender", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernar", ID_SHUTDOWN_HIBERNATE - MENUITEM "&Apagar", ID_SHUTDOWN_POWEROFF - MENUITEM "&Reiniciar", ID_SHUTDOWN_REBOOT - MENUITEM "&Cerrar sesión de %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Cambiar usuario\tWin+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "&Suspender", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernar", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Apagar", ID_SHUTDOWN_POWEROFF + MENUITEM "&Reiniciar", ID_SHUTDOWN_REBOOT + MENUITEM "&Cerrar sesión de %s", ID_SHUTDOWN_LOGOFF //FIXME: accelerator collision + MENUITEM "&Cambiar usuario\tWin+L", ID_SHUTDOWN_SWITCHUSER, GRAYED //FIXME: accelerator collision MENUITEM "&Bloquear equipo\tWin+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Desconectar", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Expulsar equipo", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "&Desconectar", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Expulsar equipo", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Ay&uda" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Nueva tarea (Ejecutar...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Cambiar a", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Traer al frente", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restaurar", ID_RESTORE MENUITEM "&Cerrar", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Terminar proceso", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Finalizar el ár&bol de procesos", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Administrador de tareas" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Finalizar tarea", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Cambiar a", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Mostrar procesos de todos los usuarios", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 160, 10 @@ -275,37 +275,37 @@ BEGIN CONTROL "CPU 31", IDC_CPU31, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 175, 119, 41, 10 END -IDD_COLUMNS_DIALOG DIALOGEX 0, 0, 245, 199 // 0, 0, 195, 199 +IDD_COLUMNS_DIALOG DIALOGEX 0, 0, 245, 199 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Seleccionar columnas" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Aceptar", IDOK, 126, 178, 50, 14 // 84 - PUSHBUTTON "Cancelar", IDCANCEL, 180, 178, 50, 14 // 138 - LTEXT "Seleccione las columnas que aparecerán en la página de Procesos del Administrador de tareas.", IDC_STATIC, 7, 7, 221, 17 // 181 - CONTROL "Nombre de ruta de la &imagen", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 105, 10 // 56 - CONTROL "Identificador de proceso (&PID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 120, 10 // 88 + DEFPUSHBUTTON "Aceptar", IDOK, 126, 178, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 180, 178, 50, 14 + LTEXT "Seleccione las columnas que aparecerán en la página de Procesos del Administrador de tareas.", IDC_STATIC, 7, 7, 221, 17 + CONTROL "Nombre de ruta de la &imagen", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 105, 10 + CONTROL "Identificador de proceso (&PID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 120, 10 CONTROL "Uso de &CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 - CONTROL "Ti&empo de CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 65, 10 // 48 + CONTROL "Ti&empo de CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 65, 10 CONTROL "Uso de &memoria", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10 - CONTROL "Di&ferencia de uso de memoria", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10 // 82 - CONTROL "Uso má&ximo de la memoria", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 120, 10 // 82 - CONTROL "Err&ores de página", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 80, 10 // 53 - CONTROL "O&bjetos de USUARIO", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 80, 10 // 62 - CONTROL "Lecturas de E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 70, 10 // 49 + CONTROL "Di&ferencia de uso de memoria", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10 + CONTROL "Uso má&ximo de la memoria", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 120, 10 + CONTROL "Err&ores de página", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 80, 10 + CONTROL "O&bjetos de USUARIO", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 80, 10 + CONTROL "Lecturas de E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 70, 10 CONTROL "Bytes de lectura de E/S", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 90, 10 - CONTROL "I&d. de sesión", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 65, 10 // 50 - CONTROL "&Nombre de usuario", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 75, 10 // 51 - CONTROL "Diferencia de erro&res de página", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 115, 10 // 107, 60 - CONTROL "Tamaño de la memoria &virtual", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 115, 10 // 107, 60 - CONTROL "B&loque paginado", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 67, 10 // 107, 53 - CONTROL "Blo&que no paginado", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10 // 107 - CONTROL "P&rioridad base", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10 // 107 - CONTROL "&Recuento de identificadores", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 105, 10 // 107 - CONTROL "Nú&mero de subprocesos", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 105, 10 // 107 - CONTROL "Objetos &GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 55, 10 // 107 - CONTROL "Escrituras de E/S", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 90, 10 // 107 - CONTROL "Bytes de escritura de E/S", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 105, 10 // 107 + CONTROL "I&d. de sesión", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 65, 10 + CONTROL "&Nombre de usuario", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 75, 10 + CONTROL "Diferencia de erro&res de página", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 115, 10 + CONTROL "Tamaño de la memoria &virtual", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 115, 10 + CONTROL "B&loque paginado", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 67, 10 + CONTROL "Blo&que no paginado", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10 + CONTROL "P&rioridad base", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10 + CONTROL "&Recuento de identificadores", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 105, 10 + CONTROL "Nú&mero de subprocesos", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 105, 10 + CONTROL "Objetos &GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 55, 10 + CONTROL "Escrituras de E/S", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 90, 10 + CONTROL "Bytes de escritura de E/S", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 105, 10 CONTROL "Otros de E/S", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 138, 60, 10 CONTROL "Otros bytes de E/S", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 149, 75, 10 CONTROL "&Línea de comandos", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 75, 10 diff --git a/base/applications/taskmgr/lang/et-EE.rc b/base/applications/taskmgr/lang/et-EE.rc index 5f2af96aedd..0d0a6d3c89c 100644 --- a/base/applications/taskmgr/lang/et-EE.rc +++ b/base/applications/taskmgr/lang/et-EE.rc @@ -19,7 +19,7 @@ BEGIN MENUITEM "&Alati pealmiseks", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimeeri kasutamisel", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "Minmeerimisel &peida", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Näita 16-bitiseid tegumeid", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Vaade" BEGIN @@ -32,18 +32,18 @@ BEGIN MENUITEM "&Peatatud", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "S&uured ikoonid", ID_VIEW_LARGE - MENUITEM "Vä&ikesed ikoonid", ID_VIEW_SMALL - MENUITEM "&Detailid", ID_VIEW_DETAILS, CHECKED - MENUITEM "Va&li veerud...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU Ajalugu" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Üks diagramm kõigile protsessoritele", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Üks diagramm protsessori kohta", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Kuva tuumaajad", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Aknad" + POPUP "" BEGIN MENUITEM "Paani &horisontaalselt", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Paani &vertikaalselt", ID_WINDOWS_TILEVERTICALLY @@ -54,15 +54,15 @@ BEGIN END POPUP "S&ulgemine" BEGIN - MENUITEM "&Puhkerežiim", ID_SHUTDOWN_STANDBY - MENUITEM "&Talveuni", ID_SHUTDOWN_HIBERNATE - MENUITEM "Lül&ita välja", ID_SHUTDOWN_POWEROFF - MENUITEM "T&aaskäivita", ID_SHUTDOWN_REBOOT - MENUITEM "&Logi välja %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Vaheta kasutajat\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Lu&kusta arvuti\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "Katkesta &ühendus", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eemalda arvuti", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "&Puhkerežiim", ID_SHUTDOWN_STANDBY + MENUITEM "&Talveuni", ID_SHUTDOWN_HIBERNATE + MENUITEM "Lül&ita välja", ID_SHUTDOWN_POWEROFF + MENUITEM "T&aaskäivita", ID_SHUTDOWN_REBOOT + MENUITEM "&Logi välja %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Vaheta kasutajat\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Lu&kusta arvuti\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "Katkesta &ühendus", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eemalda arvuti", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "S&pikker" BEGIN @@ -84,7 +84,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Uus tegum (käivita...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -96,7 +96,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Aktiveeri", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Too kõige ette", ID_WINDOWS_BRINGTOFRONT @@ -114,7 +114,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Taasta", ID_RESTORE MENUITEM "&Sule", ID_FILE_EXIT @@ -125,7 +125,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Lõpeta protsess", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Lõpeta protsessi&puu", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -149,6 +149,8 @@ END /* Dialogs */ +/* TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened */ + IDD_TASKMGR_DIALOG DIALOGEX 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME @@ -156,14 +158,14 @@ CAPTION "Tegumihaldur" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Lõpeta tegum", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Aktiveeri", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -174,7 +176,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Näita protsesse kõigilt kasutajatelt", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 diff --git a/base/applications/taskmgr/lang/fr-FR.rc b/base/applications/taskmgr/lang/fr-FR.rc index d86362f1fec..409ec1e6856 100644 --- a/base/applications/taskmgr/lang/fr-FR.rc +++ b/base/applications/taskmgr/lang/fr-FR.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "&Toujours visible", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Réduire à l'exécution", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Masquer l'icône réduite", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "Afficher les &tâches 16-bits", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Affichage" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&En pause", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Grandes icônes", ID_VIEW_LARGE - MENUITEM "&Petites icônes", ID_VIEW_SMALL - MENUITEM "&Détails", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Sélectionner les colonnes...", ID_VIEW_SELECTCOLUMNS - POPUP "&Historique du processeur" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Un graphique pour tous les UC", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Un graphique &par UC", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "Aff&icher les temps du noyau", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Fenêtres" + POPUP "" BEGIN MENUITEM "Mosaïque &horizontale", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Mosaïque &verticale", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "É&teindre" BEGIN - MENUITEM "&Mettre en veille", ID_SHUTDOWN_STANDBY - MENUITEM "&Hiberner", ID_SHUTDOWN_HIBERNATE - MENUITEM "É&teindre", ID_SHUTDOWN_POWEROFF - MENUITEM "&Redémarrer", ID_SHUTDOWN_REBOOT - MENUITEM "&Femer la session %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Changer d'utilisateur\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "&Verrouiller l'ordinateur\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Déconnecter", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "Libér&er l'ordinateur de la station", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "&Mettre en veille", ID_SHUTDOWN_STANDBY + MENUITEM "&Hiberner", ID_SHUTDOWN_HIBERNATE + MENUITEM "É&teindre", ID_SHUTDOWN_POWEROFF + MENUITEM "&Redémarrer", ID_SHUTDOWN_REBOOT + MENUITEM "&Femer la session %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Changer d'utilisateur\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "&Verrouiller l'ordinateur\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Déconnecter", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "Libér&er l'ordinateur de la station", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Aide" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Nouvelle tâche (Exécuter...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Basculer vers", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "Mettre au &premier plan", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restaurer", ID_RESTORE MENUITEM "&Fermer", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Terminer le processus", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "T&erminer l'arborescence du processus", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Gestionnaire des tâches" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "F&in de tâche", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Basculer vers", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "Aff&icher les processus de tous les utilisateurs", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 155, 10 diff --git a/base/applications/taskmgr/lang/he-IL.rc b/base/applications/taskmgr/lang/he-IL.rc index 49dc0ff2ec1..c6ae88bee4e 100644 --- a/base/applications/taskmgr/lang/he-IL.rc +++ b/base/applications/taskmgr/lang/he-IL.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "תמיד &עליון", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&מזער בעת שימוש", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&הסתר בעת שימוש", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "הצג משימות של 16 &סיביות", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "ת&צוגה" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&מושהה", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "סמלים ג&דולים", ID_VIEW_LARGE - MENUITEM "סמלים ק&טנים", ID_VIEW_SMALL - MENUITEM "מ&אפיינים", ID_VIEW_DETAILS, CHECKED - MENUITEM "ב&חירת עמודות...", ID_VIEW_SELECTCOLUMNS - POPUP "&היסטורית מעבד" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&עמודה אחת עבור כל המעבדים", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "עמ&ודה אחת לכל מעבד", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "הראה זמני &ליבה", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&חלונות" + POPUP "" BEGIN MENUITEM "חלונות מוערמים", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "חלונות זה לצד זה", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "&כיבוי" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&עזרה" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "משימה &חדשה", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&עבור אל", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "ה&בא לפנים", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&שחזר", ID_RESTORE MENUITEM "&סגור", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&סיים תהליך", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "סיים &עץ תהליכים", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "מנהל המשימות" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&סיים משימה", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&עבור אל", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&הראה תהליכים מכל המשתמשים", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 126, 10 diff --git a/base/applications/taskmgr/lang/hu-HU.rc b/base/applications/taskmgr/lang/hu-HU.rc index 0f240685e7b..0c811e384b7 100644 --- a/base/applications/taskmgr/lang/hu-HU.rc +++ b/base/applications/taskmgr/lang/hu-HU.rc @@ -15,12 +15,12 @@ BEGIN MENUITEM "&Mindig látható", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Indításkor kis méret", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Elrejtés kis méretnél", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&16 bites feladatok megjelenítése", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Nézet" BEGIN - MENUITEM "&Frissítés most", ID_VIEW_REFRESH - POPUP "&Frissítés gyakorisága" + MENUITEM "&Frissítés most", ID_VIEW_REFRESH //FIXME: accelerator collision + POPUP "&Frissítés gyakorisága" //FIXME: accelerator collision BEGIN MENUITEM "&Gyakran", ID_VIEW_UPDATESPEED_HIGH MENUITEM "&Normál", ID_VIEW_UPDATESPEED_NORMAL, CHECKED @@ -28,18 +28,18 @@ BEGIN MENUITEM "&Felfüggesztve", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Nagy ikonok", ID_VIEW_LARGE - MENUITEM "&Kis ikonok", ID_VIEW_SMALL - MENUITEM "Rés&zletek", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Oszlopok kiválasztása...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU használat" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "Minden CPU &egy grafikonon", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Külön grafikon &minden CPU-hoz", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Kernel idő megjelenítése", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Ablak" + POPUP "" BEGIN MENUITEM "&Vízszintes rendezés", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "&Függőleges rendezés", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "&Leállítás" BEGIN - MENUITEM "Készen&léti állapot", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernálás", ID_SHUTDOWN_HIBERNATE - MENUITEM "&Kikapcsolás", ID_SHUTDOWN_POWEROFF - MENUITEM "&Újraindítás", ID_SHUTDOWN_REBOOT - MENUITEM "Ki&jelentkezés - %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Felhasználóváltás\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Készen&léti állapot", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernálás", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Kikapcsolás", ID_SHUTDOWN_POWEROFF + MENUITEM "&Újraindítás", ID_SHUTDOWN_REBOOT + MENUITEM "Ki&jelentkezés - %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Felhasználóváltás\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED MENUITEM "Számítógép &zárolása\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Szétkapcsolódás", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Dokkolóról leválasztás", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "&Szétkapcsolódás", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Dokkolóról leválasztás", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Súgó" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Új feladat (Futtatás...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Váltás", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Előtérbe helyezés", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Visszaállít", ID_RESTORE MENUITEM "&Bezárás", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Folyamat befejezése", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Folyamat&struktúra leállítása", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Feladatkezelő" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "Fela&dat befejezése", IDC_ENDTASK, 28, 188, 68, 14, WS_DISABLED PUSHBUTTON "&Váltás", IDC_SWITCHTO, 100, 188, 68, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "Minden felhasználó folya&matait jelenítse meg", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 155, 10 @@ -283,32 +283,32 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 129, 178, 50, 14 PUSHBUTTON "Mégse", IDCANCEL, 183, 178, 50, 14 LTEXT "Válassza ki azokat az oszlopokat amelyeket szeretne látni a feladatkezelőben.", IDC_STATIC, 7, 7, 226, 17 - CONTROL "&Program neve", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 - CONTROL "&PID (Folyamatazonosító)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 100, 10 + CONTROL "&Program neve", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 //FIXME: accelerator collision + CONTROL "&PID (Folyamatazonosító)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 100, 10 //FIXME: accelerator collision CONTROL "&CPU használat", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 100, 10 CONTROL "CPU idő", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 48, 10 CONTROL "&Memóriahasználat", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 100, 10 - CONTROL "Memóriahasználat &változása", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 110, 10 + CONTROL "Memóriahasználat &változása", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 110, 10 //FIXME: accelerator collision CONTROL "Memóriahasználat &csúcsértéke", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 110, 10 - CONTROL "&Laphibák", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10 + CONTROL "&Laphibák", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10 //FIXME: accelerator collision CONTROL "&USER objektumok", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 72, 10 CONTROL "I/O olvasások", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 100, 10 CONTROL "I/O olvasott bájtok", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 100, 10 CONTROL "&Munkamenet-azonosító", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 100, 10 CONTROL "&Felhasználónév", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 71, 10 CONTROL "Lap&hibaszám változása", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 110, 10 - CONTROL "&Virtuális memória mérete", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 110, 10 - CONTROL "&Lapozható készlet", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 110, 10 + CONTROL "&Virtuális memória mérete", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 110, 10 //FIXME: accelerator collision + CONTROL "&Lapozható készlet", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 110, 10 //FIXME: accelerator collision CONTROL "&Nem lapozható készlet", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 110, 10 - CONTROL "&Prioritás", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 55, 10 - CONTROL "&Leírók száma", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 59, 10 + CONTROL "&Prioritás", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 55, 10 //FIXME: accelerator collision + CONTROL "&Leírók száma", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 59, 10 //FIXME: accelerator collision CONTROL "&Szálak száma", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 59, 10 CONTROL "GDI Objektumok", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 85, 10 CONTROL "I/O írások", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 49, 10 CONTROL "I/O írott bájtok", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 65, 10 CONTROL "Egyéb I/O műveletek", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 138, 85, 10 CONTROL "Egyéb I/O műveletek bájtjai", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 149, 110, 10 - CONTROL "&Parancssor", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 65, 10 + CONTROL "&Parancssor", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 65, 10 //FIXME: accelerator collision END /* String Tables */ diff --git a/base/applications/taskmgr/lang/id-ID.rc b/base/applications/taskmgr/lang/id-ID.rc index d9c8a1eda13..388742c4f2d 100644 --- a/base/applications/taskmgr/lang/id-ID.rc +++ b/base/applications/taskmgr/lang/id-ID.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "Sel&alu di atas", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "Per&kecil Saat Digunakan", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "Se&mbunyikan Saat Diperkecil", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Tampilkan tugas 16-bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Tampilan" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&Jeda", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Ikon &Besar", ID_VIEW_LARGE - MENUITEM "Ikon K&ecil", ID_VIEW_SMALL - MENUITEM "&Rinci", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Pilih Kolom...", ID_VIEW_SELECTCOLUMNS - POPUP "Riwayat &CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Satu Grafik Semua CPU", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Satu Grafik &Per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Tampilkan Waktu Kernel", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Jendela" + POPUP "" BEGIN MENUITEM "Ubin secara &Horisontal", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Ubin secara &Vertikal", ID_WINDOWS_TILEVERTICALLY @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Tugas Baru (Jalankan...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "B&erpindah Ke", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Bawa ke Depan", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Kembalikan", ID_RESTORE MENUITEM "&Tutup", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Akhiri Proses", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "A&khiri Pohon Proses", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Manajer Tugas" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Akhiri Tugas", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Berpindah ke", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Tunjukkan proses dari semua pengguna", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 138, 10 @@ -302,7 +302,7 @@ BEGIN CONTROL "N&on-paged Pool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 61, 95, 10 CONTROL "P&rioritas Dasar", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 72, 95, 10 CONTROL "&Jumlah Tuas", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 83, 95, 10 - CONTROL "&Jumlah U&tas", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 94, 95, 10 + CONTROL "Jumlah U&tas", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 94, 95, 10 CONTROL "Obyek GDI", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 105, 95, 10 CONTROL "I/O Tulis", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 116, 95, 10 CONTROL "I/O Byte Tulis", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 110, 127, 95, 10 diff --git a/base/applications/taskmgr/lang/it-IT.rc b/base/applications/taskmgr/lang/it-IT.rc index 57d40137744..b8623d046b4 100644 --- a/base/applications/taskmgr/lang/it-IT.rc +++ b/base/applications/taskmgr/lang/it-IT.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Sempre in primo piano", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Riduci a icona in esecuzione", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Nascondi se ridotto a icona", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Mostra operazioni a 16 bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Visualizza" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Pausa", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Icone &Grandi", ID_VIEW_LARGE - MENUITEM "Icone &Piccole", ID_VIEW_SMALL - MENUITEM "&Dettagli", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Seleziona colonne...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Un grafico, Tutte le CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Un grafico &per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Mostra Kernel Times", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Finestre" + POPUP "" BEGIN MENUITEM "Affianca &Orizontalmente", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Affianca &Verticalmente", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Aiuto" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Nuova operazione (Esegui...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Passa a", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Porta in primo piano", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Ripristina", ID_RESTORE MENUITEM "&Chiudi", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Termina processo", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Termina processo e &Albero", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Task Manager" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Termina processo", IDC_ENDTASK, 28, 188, 68, 14, WS_DISABLED PUSHBUTTON "&Passa a", IDC_SWITCHTO, 100, 188, 68, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Mostra i processi di tutti gli utenti", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 117, 10 diff --git a/base/applications/taskmgr/lang/ja-JP.rc b/base/applications/taskmgr/lang/ja-JP.rc index d545e88c677..6b8eb9ad8d0 100644 --- a/base/applications/taskmgr/lang/ja-JP.rc +++ b/base/applications/taskmgr/lang/ja-JP.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "常に手前に表示(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "未使用時に最小化(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "最小化時に隠す(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "16 ビットタスクの表示(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "表示(&V)" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "一時停止(&P)", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "大きいアイコン(&G)", ID_VIEW_LARGE - MENUITEM "小さいアイコン(&M)", ID_VIEW_SMALL - MENUITEM "詳細(&D)", ID_VIEW_DETAILS, CHECKED - MENUITEM "列の選択(&S)...", ID_VIEW_SELECTCOLUMNS - POPUP "CPU の履歴(&C)" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "すべての CPU で 1 グラフ(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "CPU ごとに 1 グラフ(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "カーネル時間を表示する(&S)", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "ウィンドウ(&W)" + POPUP "" BEGIN MENUITEM "上下に並べて表示(&H)", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "左右に並べて表示(&V)", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "ヘルプ(&H)" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "新しいタスクの実行(&N)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "切り替え(&S)", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "手前に表示(&B)", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "元のサイズに戻す(&R)", ID_RESTORE MENUITEM "閉じる(&C)", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "プロセスの終了(&E)", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "プロセスツリーの終了(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "タスクマネージャ" MENU IDR_TASKMANAGER FONT 9, "MS UI Gothic" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS UI Gothic" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "タスクの終了(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "切り替え(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS UI Gothic" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "全ユーザーのプロセスを表示する(&S)", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 diff --git a/base/applications/taskmgr/lang/ko-KR.rc b/base/applications/taskmgr/lang/ko-KR.rc index d2dd50f36a1..42dd47883d4 100644 --- a/base/applications/taskmgr/lang/ko-KR.rc +++ b/base/applications/taskmgr/lang/ko-KR.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "항상 위(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "사용중일때 최소화(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "최소화일때 숨기기(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "16비트 작업 표시(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "보기(&V)" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "일시 정지(&P)", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "큰 아이콘(&G)", ID_VIEW_LARGE - MENUITEM "작은 아이콘(&M)", ID_VIEW_SMALL - MENUITEM "자세히(&D)", ID_VIEW_DETAILS, CHECKED - MENUITEM "열 선택(&S)", ID_VIEW_SELECTCOLUMNS - POPUP "CPU 히스토리(&C)" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "그래프 하나, 모든 CPU(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "CPU 하나 당 그래프 하나(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "커널 시간 보이기(&S)", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "윈도우(&S)" + POPUP "" BEGIN MENUITEM "가로 바둑판식 창 배열(&H)", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "세로 바둑판식 창 배열(&V)", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "도움말(&H)" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "새 작업 (실행...)(&N)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "전환(&S)", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "맨 앞으로 가져오기(&B)", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "복원(&R)", ID_RESTORE MENUITEM "닫기(&C)", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "프로세스 종료(&E)", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "프로세스 트리 종료(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "작업 관리자" MENU IDR_TASKMANAGER FONT 9, "굴림" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "굴림" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "작업 끝내기(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "전환(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "굴림" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "모든 유저의 프로세스 보이기(&S)", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 120, 10 diff --git a/base/applications/taskmgr/lang/nl-NL.rc b/base/applications/taskmgr/lang/nl-NL.rc index 19838770442..f5b939d798e 100644 --- a/base/applications/taskmgr/lang/nl-NL.rc +++ b/base/applications/taskmgr/lang/nl-NL.rc @@ -11,9 +11,9 @@ BEGIN POPUP "&Opties" BEGIN MENUITEM "&Altijd op voorgrond", ID_OPTIONS_ALWAYSONTOP, CHECKED - MENUITEM "Minimaliseren &bij gebruik", ID_OPTIONS_MINIMIZEONUSE, CHECKED + MENUITEM "Minimaliseren &bij gebruik", ID_OPTIONS_MINIMIZEONUSE, CHECKED //FIXME: accelerator collision &b with IDS_MENU_16BITTASK MENUITEM "&Verbergen indien geminimaliseerd", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "16-&bits taken weergeven", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "B&eeld" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Onderbroken", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Grote pictogrammen", ID_VIEW_LARGE - MENUITEM "&Kleine pictogrammen", ID_VIEW_SMALL - MENUITEM "&Details", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Kolommen selecteren...", ID_VIEW_SELECTCOLUMNS - POPUP "&Geschiedenis van CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Eén grafiek, alle CPU's", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Eén grafiek &per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Kerneltijden weergeven", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Vensters" + POPUP "" BEGIN MENUITEM "&Onder elkaar", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "N&aast elkaar", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Afsl&uiten" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "&Uitzetten", ID_SHUTDOWN_POWEROFF - MENUITEM "&Opnieuw Opstarten", ID_SHUTDOWN_REBOOT - MENUITEM "%s &afmelden", ID_SHUTDOWN_LOGOFF - MENUITEM "&Verander van gebruiker\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Uitzetten", ID_SHUTDOWN_POWEROFF + MENUITEM "&Opnieuw Opstarten", ID_SHUTDOWN_REBOOT + MENUITEM "%s &afmelden", ID_SHUTDOWN_LOGOFF + MENUITEM "&Verander van gebruiker\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Help" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Nieuwe taak (Uitvoeren...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Activeren", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "Naar &voorgrond", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Vorig formaat", ID_RESTORE MENUITEM "&Sluiten", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "Pro&ces beëindigen", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Process&tructuur beëindigen", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Taakbeheer" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "Taa&k beëindigen", IDC_ENDTASK, 28, 188, 68, 14, WS_DISABLED PUSHBUTTON "&Activeren", IDC_SWITCHTO, 100, 188, 68, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "Processen van &alle gebruikers weergeven", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 151, 10 @@ -406,7 +406,7 @@ BEGIN IDS_TAB_IOOTHERBYTES "I/O: overige bytes" IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&Kolommen selecteren..." - IDS_MENU_16BITTASK "16-&bits taken weergeven" + IDS_MENU_16BITTASK "16-&bits taken weergeven" //FIXME: accelerator collision &b with ID_OPTIONS_MINIMIZEONUSE IDS_MENU_WINDOWS "&Vensters" IDS_MENU_LARGEICONS "&Grote pictogrammen" IDS_MENU_SMALLICONS "&Kleine pictogrammen" diff --git a/base/applications/taskmgr/lang/no-NO.rc b/base/applications/taskmgr/lang/no-NO.rc index 31b01b6d973..45f9d9d8b9a 100644 --- a/base/applications/taskmgr/lang/no-NO.rc +++ b/base/applications/taskmgr/lang/no-NO.rc @@ -13,12 +13,12 @@ BEGIN MENUITEM "&Alltid øverst", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimer ved bruk", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Skjul når Minimert", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Vis 16-bites oppgaver", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Vis" BEGIN - MENUITEM "&Oppdater nå", ID_VIEW_REFRESH - POPUP "&Oppdateringshastighet" + MENUITEM "&Oppdater nå", ID_VIEW_REFRESH //FIXME: accelerator collision + POPUP "&Oppdateringshastighet" //FIXME: accelerator collision BEGIN MENUITEM "&Høy", ID_VIEW_UPDATESPEED_HIGH MENUITEM "&Normal", ID_VIEW_UPDATESPEED_NORMAL, CHECKED @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Midlertidig stanset", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "St&ore Ikoner", ID_VIEW_LARGE - MENUITEM "S&må Ikoner", ID_VIEW_SMALL - MENUITEM "&Detaljer", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Velg tospaltet...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU Historie" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&En graf, per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "EN graf &per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Vis Kjernetider", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Vindu" + POPUP "" BEGIN MENUITEM "Sorter &horisontalt", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Sorter &vertikalt", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Hjelp" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Ny oppgave (Kjør...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Bytt til", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Plasser lengst frem", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Få tilbake", ID_RESTORE MENUITEM "&Avslutt", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Avslutt Prosess", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Avslutt Prosess&tre", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Oppgavebehandling" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Avslutt oppgave", IDC_ENDTASK, 60, 189, 65, 14, WS_DISABLED PUSHBUTTON "&Bytt til", IDC_SWITCHTO, 129, 189, 53, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Vis prosesser fra alle brukere", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 @@ -281,22 +281,22 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 84, 178, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 138, 178, 50, 14 LTEXT "Velg kolonnene som skal vises på prosesssiden i Oppgavebehandling.", IDC_STATIC, 7, 7, 181, 17 - CONTROL "&Bildenavn", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 - CONTROL "&PID (prosessidentifikator)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 93, 10 - CONTROL "&Prosessorbruk", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 60, 10 - CONTROL "Prosessorti&d", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 52, 10 - CONTROL "&Minne brukt", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10 - CONTROL "Minne brukt &Delta", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 82, 10 + CONTROL "&Bildenavn", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 //FIXME: accelerator collision + CONTROL "&PID (prosessidentifikator)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 93, 10 //FIXME: accelerator collision + CONTROL "&Prosessorbruk", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 60, 10 //FIXME: accelerator collision + CONTROL "Prosessorti&d", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 52, 10 //FIXME: accelerator collision + CONTROL "&Minne brukt", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10 //FIXME: accelerator collision + CONTROL "Minne brukt &Delta", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 82, 10 //FIXME: accelerator collision CONTROL "Ma&ks minne bruk", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 82, 10 - CONTROL "Side &mangeler", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 56, 10 - CONTROL "&Bruker objekt", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10 + CONTROL "Side &mangeler", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 56, 10 //FIXME: accelerator collision + CONTROL "&Bruker objekt", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 62, 10 //FIXME: accelerator collision CONTROL "I/O Lest", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 49, 10 CONTROL "I/O skrevet", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 65, 10 CONTROL "&Økt ID", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 50, 10 - CONTROL "Bruker&navn", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10 - CONTROL "Side &mangel Delta", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 72, 10 + CONTROL "Bruker&navn", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10 //FIXME: accelerator collision + CONTROL "Side &mangel Delta", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 72, 10 //FIXME: accelerator collision CONTROL "&Virtuelt minne størrelse", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 86, 10 - CONTROL "Si&de innsats", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 53, 10 + CONTROL "Si&de innsats", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 53, 10 //FIXME: accelerator collision CONTROL "I&ngen-side innsats", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 61, 72, 10 CONTROL "Basisp&rioritet", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 72, 55, 10 CONTROL "&Handle regne", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 83, 59, 10 diff --git a/base/applications/taskmgr/lang/pl-PL.rc b/base/applications/taskmgr/lang/pl-PL.rc index ae4b327ea71..7b3b49eb5ad 100644 --- a/base/applications/taskmgr/lang/pl-PL.rc +++ b/base/applications/taskmgr/lang/pl-PL.rc @@ -20,7 +20,7 @@ BEGIN MENUITEM "Za&wsze na wierzchu", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimalizuj podczas użytkowania", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Ukryj, gdy zminimalizowane", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "Pokazuj 16-&bitowe zadania", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Widok" BEGIN @@ -33,18 +33,18 @@ BEGIN MENUITEM "&Wstrzymana", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "D&uże ikony", ID_VIEW_LARGE - MENUITEM "&Małe ikony", ID_VIEW_SMALL - MENUITEM "&Szczegóły", ID_VIEW_DETAILS, CHECKED - MENUITEM "Wybierz &kolumny...", ID_VIEW_SELECTCOLUMNS - POPUP "H&istoria użycia procesora CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "Jeden &wykres dla wszystkich procesorów CPU", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Jeden w&ykres dla każdego procesora CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "Pokaż &czas jądra", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "O&kna" + POPUP "" BEGIN MENUITEM "&Sąsiadująco w poziomie", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Sąsi&adująco w pionie", ID_WINDOWS_TILEVERTICALLY @@ -55,15 +55,15 @@ BEGIN END POPUP "&Zamknij" BEGIN - MENUITEM "Przejdź w &stan gotowości", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernuj", ID_SHUTDOWN_HIBERNATE - MENUITEM "Wyłą&cz", ID_SHUTDOWN_POWEROFF - MENUITEM "&Uruchom ponownie", ID_SHUTDOWN_REBOOT - MENUITEM "&Wyloguj: %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Przełącz użytkownika\tLogo Win+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "&Zablokuj komputer\tLogo Win+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Rozłącz", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Wysuń komputer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED //FIXME ? + MENUITEM "Przejdź w &stan gotowości", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernuj", ID_SHUTDOWN_HIBERNATE + MENUITEM "Wyłą&cz", ID_SHUTDOWN_POWEROFF + MENUITEM "&Uruchom ponownie", ID_SHUTDOWN_REBOOT + MENUITEM "&Wyloguj: %s", ID_SHUTDOWN_LOGOFF //FIXME: accelerator collision + MENUITEM "&Przełącz użytkownika\tLogo Win+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "&Zablokuj komputer\tLogo Win+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Rozłącz", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Wysuń komputer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED //FIXME: accelerator collision END POPUP "Pomo&c" BEGIN @@ -85,7 +85,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Nowe zadanie (Uruchom...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -97,7 +97,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "P&rzełącz na", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Przesuń na wierzch", ID_WINDOWS_BRINGTOFRONT @@ -115,7 +115,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Przywróć", ID_RESTORE MENUITEM "&Zamknij", ID_FILE_EXIT @@ -126,7 +126,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Zakończ proces", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Zamknij &drzewo procesów", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -159,14 +159,14 @@ CAPTION "Menedżer zadań" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Zakończ zadanie", IDC_ENDTASK, 39, 189, 65, 14, WS_DISABLED PUSHBUTTON "P&rzełącz na", IDC_SWITCHTO, 107, 189, 65, 14, WS_DISABLED @@ -177,7 +177,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "Po&każ procesy wszystkich użytkowników", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 153, 10 diff --git a/base/applications/taskmgr/lang/pt-BR.rc b/base/applications/taskmgr/lang/pt-BR.rc index ca351367f6a..ec47a6598c3 100644 --- a/base/applications/taskmgr/lang/pt-BR.rc +++ b/base/applications/taskmgr/lang/pt-BR.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Sempre visível", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimizar durante o uso", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Ocultar ao minimizar", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Exibir tarefas de 16-bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "E&xibir" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "Em &pausa", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Íco&nes grandes", ID_VIEW_LARGE - MENUITEM "Ícones &pequenos", ID_VIEW_SMALL - MENUITEM "Detal&hes", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Selecionar colunas...", ID_VIEW_SELECTCOLUMNS - POPUP "&Historico do CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "Um gráfico para &todas as CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Um gráfico &por CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Mostrar tempos do núcleo", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Janelas" + POPUP "" BEGIN MENUITEM "Lado a lado &horizontalmente", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Lado a lado &verticalmente", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Aj&uda" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Executar nova tarefa...", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "A&lternar para", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Trazer para a frente", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restaurar", ID_RESTORE MENUITEM "&Fechar", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Finalizar processo", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "F&inalizar árvore de processos", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Gerenciador de tarefas" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Finalizar tarefa", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "A&lternar para", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Mostrar processos de todos os usuários", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 140, 10 diff --git a/base/applications/taskmgr/lang/pt-PT.rc b/base/applications/taskmgr/lang/pt-PT.rc index 3ffd856374e..3cf81bfce57 100644 --- a/base/applications/taskmgr/lang/pt-PT.rc +++ b/base/applications/taskmgr/lang/pt-PT.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "&Sempre visível", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimizar durante utilização", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Ocultar ao minimizar", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Mostrar tarefas de 16-bit", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Ver" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "Em &pausa", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Íco&nes grandes", ID_VIEW_LARGE - MENUITEM "Ícones &pequenos", ID_VIEW_SMALL - MENUITEM "Detal&hes", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Seleccionar colunas...", ID_VIEW_SELECTCOLUMNS - POPUP "&Histórico do CPU" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "Um gráfico para &todas as CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Um gráfico &por CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Mostrar tempos do núcleo", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Janelas" + POPUP "" BEGIN MENUITEM "Lado a lado &horizontalmente", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Lado a lado &verticalmente", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "&Desligar" BEGIN - MENUITEM "&Suspender", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernar", ID_SHUTDOWN_HIBERNATE - MENUITEM "&Desligar", ID_SHUTDOWN_POWEROFF - MENUITEM "&Reiniciar", ID_SHUTDOWN_REBOOT - MENUITEM "&Terminar sessão %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Mudar de utilizador\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "&Bloquear\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Desligar", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Ejectar", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "&Suspender", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernar", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Desligar", ID_SHUTDOWN_POWEROFF //FIXME: accelerator collision + MENUITEM "&Reiniciar", ID_SHUTDOWN_REBOOT + MENUITEM "&Terminar sessão %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Mudar de utilizador\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "&Bloquear\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Desligar", ID_SHUTDOWN_DISCONNECT, GRAYED //FIXME: accelerator collision + MENUITEM "&Ejectar", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Aj&uda" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Executar nova tarefa...", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "A&lternar para", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Trazer para a frente", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restaurar", ID_RESTORE MENUITEM "&Fechar", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Finalizar processo", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "F&inalizar árvore de processos", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -136,10 +136,10 @@ BEGIN MENUITEM "Abai&xo do normal", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL MENUITEM "&Baixa", ID_PROCESS_PAGE_SETPRIORITY_LOW END - MENUITEM "Definir &afinidade...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "Definir &afinidade...", ID_PROCESS_PAGE_SETAFFINITY //FIXME: accelerator collision MENUITEM SEPARATOR MENUITEM "P&ropriedades", ID_PROCESS_PAGE_PROPERTIES - MENUITEM "&Abrir localização do ficheiro", ID_PROCESS_PAGE_OPENFILELOCATION + MENUITEM "&Abrir localização do ficheiro", ID_PROCESS_PAGE_OPENFILELOCATION //FIXME: accelerator collision END END @@ -154,14 +154,14 @@ CAPTION "Gestor de tarefas" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Terminar tarefa", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "A&lternar para", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Mostrar processos de todos os utilizadores", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 140, 10 @@ -285,7 +285,7 @@ BEGIN LTEXT "Seleccione as colunas que aparecerão na página de processos do 'Gestor de tarefas.", IDC_STATIC, 7, 7, 181, 17 CONTROL "Nome da ima&gem", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 66, 10 CONTROL "&Identificação do processo (PID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 113, 10 - CONTROL "&Uso de CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 + CONTROL "&Uso de CPU", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 53, 10 //FIXME: accelerator collision CONTROL "&Tempo de CPU", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 61, 10 CONTROL "U&so de memória", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 63, 10 CONTROL "Inter&valo de uso de memória", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 110, 10 @@ -295,7 +295,7 @@ BEGIN CONTROL "Leituras de E/S", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 61, 10 CONTROL "Bytes de leitura de E/S", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 86, 10 CONTROL "Ide&ntificação de sessão", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 90, 10 - CONTROL "Nome de &utilizador", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 65, 10 + CONTROL "Nome de &utilizador", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 65, 10 //FIXME: accelerator collision CONTROL "Intervalo de fal&has de página", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 28, 110, 10 CONTROL "Tamanho da &memória virtual", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 39, 110, 10 CONTROL "&Reserva de memória paginável", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 50, 110, 10 diff --git a/base/applications/taskmgr/lang/ro-RO.rc b/base/applications/taskmgr/lang/ro-RO.rc index 84573a284c9..3c6c747f93f 100644 --- a/base/applications/taskmgr/lang/ro-RO.rc +++ b/base/applications/taskmgr/lang/ro-RO.rc @@ -18,7 +18,7 @@ BEGIN MENUITEM "Mereu &deasupra", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimizează la comutare", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Ascunde la minimizare", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "Afișează activități pe 16 &biți", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Afișare" BEGIN @@ -31,18 +31,18 @@ BEGIN MENUITEM "St&agnantă", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "D&ale", ID_VIEW_LARGE - MENUITEM "&Pictograme", ID_VIEW_SMALL - MENUITEM "&Detalii", ID_VIEW_DETAILS, CHECKED - MENUITEM "Selectare &coloane…", ID_VIEW_SELECTCOLUMNS - POPUP "Ist&oric procesor" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "Grafic general &comun", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Grafice indi&viduale", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "Afișea&ză timpi nucleu", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "Fe&restre" + POPUP "" BEGIN MENUITEM "Aranjări &orizontale", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Aranjări &verticale", ID_WINDOWS_TILEVERTICALLY @@ -53,15 +53,15 @@ BEGIN END POPUP "Î&nchidere calculator" BEGIN - MENUITEM "Intră în starea de &veche", ID_SHUTDOWN_STANDBY - MENUITEM "Intră în &hibernare", ID_SHUTDOWN_HIBERNATE - MENUITEM "Î&nchide calculatorul", ID_SHUTDOWN_POWEROFF - MENUITEM "&Repornește calculatorul", ID_SHUTDOWN_REBOOT - MENUITEM "&Deautentifică-mă (%s)", ID_SHUTDOWN_LOGOFF + MENUITEM "Intră în starea de &veche", ID_SHUTDOWN_STANDBY + MENUITEM "Intră în &hibernare", ID_SHUTDOWN_HIBERNATE + MENUITEM "Î&nchide calculatorul", ID_SHUTDOWN_POWEROFF + MENUITEM "&Repornește calculatorul", ID_SHUTDOWN_REBOOT + MENUITEM "&Deautentifică-mă (%s)", ID_SHUTDOWN_LOGOFF MENUITEM "&Comută utilizator\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED MENUITEM "&Blochează calculatorul\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "Deconectea&ză", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Elimină calculator", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Deconectea&ză", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Elimină calculator", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Aj&utor" BEGIN @@ -83,7 +83,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "Activitate nouă (E&xecutare…)", ID_FILE_NEW MENUITEM SEPARATOR @@ -95,7 +95,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Comută la", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "Ad&uce în prim-plan", ID_WINDOWS_BRINGTOFRONT @@ -113,7 +113,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restabilește", ID_RESTORE MENUITEM "Î&nchide", ID_FILE_EXIT @@ -124,7 +124,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "Opr&ește procesul", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Oprește &arborele de procese", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -157,14 +157,14 @@ CAPTION "Gestionar de activități" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "Închid&e", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Comută la", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -175,7 +175,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "Afișea&ză procesele tuturor utilizatorilor", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 150, 10 diff --git a/base/applications/taskmgr/lang/ru-RU.rc b/base/applications/taskmgr/lang/ru-RU.rc index 989dec8a6c1..777e4747259 100644 --- a/base/applications/taskmgr/lang/ru-RU.rc +++ b/base/applications/taskmgr/lang/ru-RU.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "Пове&рх остальных окон", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Сворачивать после обращения", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "С&крывать свернутое", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Отображать 16-разрядные задачи", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Вид" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&Приостановить", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Крупные значки", ID_VIEW_LARGE - MENUITEM "&Мелкие значки", ID_VIEW_SMALL - MENUITEM "&Таблица", ID_VIEW_DETAILS, CHECKED - MENUITEM "В&ыбрать столбцы...", ID_VIEW_SELECTCOLUMNS - POPUP "&Загрузка ЦП" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Один график на все ЦП", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "&По графику на каждый ЦП", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Вывод времени ядра", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Окна" + POPUP "" BEGIN MENUITEM "С&верху вниз", ID_WINDOWS_TILEVERTICALLY MENUITEM "С&лева направо", ID_WINDOWS_TILEHORIZONTALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "Завер&шение работы" BEGIN - MENUITEM "Переход в &ждущий режим", ID_SHUTDOWN_STANDBY - MENUITEM "Переход в &спящий режим", ID_SHUTDOWN_HIBERNATE - MENUITEM "В&ыключение", ID_SHUTDOWN_POWEROFF - MENUITEM "&Перезагрузка", ID_SHUTDOWN_REBOOT - MENUITEM "&Завершение сеанса %s", ID_SHUTDOWN_LOGOFF + MENUITEM "Переход в &ждущий режим", ID_SHUTDOWN_STANDBY + MENUITEM "Переход в &спящий режим", ID_SHUTDOWN_HIBERNATE + MENUITEM "В&ыключение", ID_SHUTDOWN_POWEROFF + MENUITEM "&Перезагрузка", ID_SHUTDOWN_REBOOT + MENUITEM "&Завершение сеанса %s", ID_SHUTDOWN_LOGOFF MENUITEM "С&мена пользователя\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Заб&локировать компьютер\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Отключить", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "С&нять компьютер с док-станции", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Заб&локировать компьютер\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Отключить", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "С&нять компьютер с док-станции", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Справка" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Новая задача (Выполнить...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Переключиться", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&На передний план", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Востановить", ID_RESTORE MENUITEM "&Закрыть", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Завершить процесс", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Завершить &дерево процессов", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Диспетчер задач" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "Завершить &задачу", IDC_ENDTASK, 12, 189, 73, 14, WS_DISABLED PUSHBUTTON "&Переключиться", IDC_SWITCHTO, 89, 189, 73, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Отображать процессы всех пользователей", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 158, 10 diff --git a/base/applications/taskmgr/lang/sk-SK.rc b/base/applications/taskmgr/lang/sk-SK.rc index 67afcebfda8..5f5e88bd5bb 100644 --- a/base/applications/taskmgr/lang/sk-SK.rc +++ b/base/applications/taskmgr/lang/sk-SK.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "&Vždy navrchu", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimalizovať pri použití", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Skryť pri minimalizovaní", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Zobraziť 16-bitové úlohy", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Zobraziť" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&Pozastavené", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Veľké ikony", ID_VIEW_LARGE - MENUITEM "&Malé ikony", ID_VIEW_SMALL - MENUITEM "&Podrobnosti", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Vybrať stĺpce...", ID_VIEW_SELECTCOLUMNS - POPUP "&História procesora" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Jeden graf pre všetky procesory", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Jeden graf pre &každý procesor", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Zobraziť časy jadra", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Okna" + POPUP "" BEGIN MENUITEM "&Pod seba", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "&Vedľa seba", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Pomocník" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Nová úloha (Spustiť...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "P&repnúť", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "Presunúť d&opredu", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Obnoviť", ID_RESTORE MENUITEM "&Zavrieť", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Ukončiť proces", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Ukončiť stro&m procesu", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Správca úloh systému" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "Ukončiť úlo&hu", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "&Prepnúť", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Zobraziť procesy všetkých používateľov", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 144, 10 diff --git a/base/applications/taskmgr/lang/sq-AL.rc b/base/applications/taskmgr/lang/sq-AL.rc index a22ff20f7ba..9823efa67c4 100644 --- a/base/applications/taskmgr/lang/sq-AL.rc +++ b/base/applications/taskmgr/lang/sq-AL.rc @@ -16,7 +16,7 @@ BEGIN MENUITEM "Perhere lart", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimizo ne perdorim", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "Fshehe gjate minimizimit", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Shfaq 16-bit detyre", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Vezhgo" BEGIN @@ -29,18 +29,18 @@ BEGIN MENUITEM "&Pushim", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "Ikona te medha", ID_VIEW_LARGE - MENUITEM "Ikona te vogla", ID_VIEW_SMALL - MENUITEM "&Detaje", ID_VIEW_DETAILS, CHECKED - MENUITEM "Perzgjedh kolone...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU Histori" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "Nje grafik, Te gjith CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Nje grafik &Per CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Shfaq oren e Kernelit", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "Dritare" + POPUP "" BEGIN MENUITEM "Shfaq &Horizontalisht", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Shfaq &Vertikalisht", ID_WINDOWS_TILEVERTICALLY @@ -51,15 +51,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Ndihme" BEGIN @@ -81,7 +81,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "Detyre e re (Run...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -93,7 +93,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "Ndrysho ne", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "Sjelle para", ID_WINDOWS_BRINGTOFRONT @@ -111,7 +111,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Restauro", ID_RESTORE MENUITEM "Mbyll", ID_FILE_EXIT @@ -122,7 +122,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "Mbyll procesin", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Mbyll procesin &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -146,6 +146,8 @@ END /* Dialogs */ +/* TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened */ + IDD_TASKMGR_DIALOG DIALOGEX 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME @@ -153,14 +155,14 @@ CAPTION "Task Manager" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "Mbyll", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "Kalo tek", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -171,7 +173,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Shfaq proceset nga te gjith perdoruesit", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 140, 10 @@ -430,7 +432,7 @@ BEGIN IDS_MSG_UNABLECHANGEPRIORITY "E pamundur ndryshimi i prioritetit" IDS_MSG_WARNINGCHANGEPRIORITY "KUJDES: Ndryshimi i klases se prioritetit te ketij procesi mund te\nsjell rrezultate te padeshirushme ne stabilitetin e sistemit. Jeni i sigurt\nper ndryshimin e klases se prioriteteve?" IDS_MSG_TRAYICONCPUUSAGE "Perdorimi i CPU: %d%%" - IDS_STATUS_MEMUSAGE "Perdorimi i Mem: %s / %s (%d%%)" + IDS_STATUS_MEMUSAGE "Perdorimi i Mem: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "Perdorimi i CPU: %3d%%" IDS_STATUS_PROCESSES "Proceset: %d" IDS_NOT_RESPONDING "Nuk pergjigjet" diff --git a/base/applications/taskmgr/lang/sv-SE.rc b/base/applications/taskmgr/lang/sv-SE.rc index aefb89ba2e4..4541fdd7875 100644 --- a/base/applications/taskmgr/lang/sv-SE.rc +++ b/base/applications/taskmgr/lang/sv-SE.rc @@ -4,18 +4,18 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDR_TASKMANAGER MENU BEGIN - POPUP "&Arkiv" + POPUP "&Arkiv" //FIXME: accelerator collision &A BEGIN MENUITEM "&Ny Aktivitet (Kör...)", ID_FILE_NEW MENUITEM SEPARATOR MENUITEM "&Avsluta Aktivitetshanteraren", ID_FILE_EXIT END - POPUP "&Alternativ" + POPUP "&Alternativ" //FIXME: accelerator collision &A BEGIN MENUITEM "&Alltid överst", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Minimera vid användning", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Göm minimerad", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Visa 16-bitarsaktiviteter", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Visa" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "&Fryst", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Stora ikoner", ID_VIEW_LARGE - MENUITEM "S&må ikoner", ID_VIEW_SMALL - MENUITEM "&Detaljer", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Välj kolumner...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU Historik" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "En visare för &alla processorer", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "&En visare per processor", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Visa kernel-tider", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Fönster" + POPUP "" BEGIN MENUITEM "Ordna &horizontellt", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Ordna &vertikalt", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Hjälp" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Ny aktivitet (Kör...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Växla till", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&För till förgrunden", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Återställ", ID_RESTORE MENUITEM "&Stäng", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Avsluta process", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Avsluta process&träd", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -154,14 +154,14 @@ CAPTION "Aktivitetshanteraren" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "&Avsluta aktiviteten", IDC_ENDTASK, 34, 189, 83, 14, WS_DISABLED PUSHBUTTON "&Växla till", IDC_SWITCHTO, 120, 189, 53, 14, WS_DISABLED @@ -172,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Visa processer från alla användare", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 156, 10 diff --git a/base/applications/taskmgr/lang/tr-TR.rc b/base/applications/taskmgr/lang/tr-TR.rc index d55c1118996..e8335de8a0e 100644 --- a/base/applications/taskmgr/lang/tr-TR.rc +++ b/base/applications/taskmgr/lang/tr-TR.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "&Her Zaman Üstte", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Kullanımda Simge Durumuna Küçült", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Simge Durumuna Küçültüldüğünde Gizle", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "16 &Bitlik Görevleri Göster", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Görünüm" BEGIN @@ -28,18 +28,18 @@ BEGIN MENUITEM "D&uraklatılmış", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Büyük Simgeler", ID_VIEW_LARGE - MENUITEM "&Küçük Simgeler", ID_VIEW_SMALL - MENUITEM "&Ayrıntılar", ID_VIEW_DETAILS, CHECKED - MENUITEM "&Sütunları Seç...", ID_VIEW_SELECTCOLUMNS - POPUP "&CPU Geçmişi" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Tek Grafik, Tüm CPU'lar", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "&CPU Başına Bir Grafik", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "Ç&ekirdek Sürelerini Göster", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "&Pencereler" + POPUP "" BEGIN MENUITEM "&Yatay Olarak Döşe", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "&Dikey Olarak Döşe", ID_WINDOWS_TILEVERTICALLY @@ -50,15 +50,15 @@ BEGIN END POPUP "&Bilgisayarı Kapat" BEGIN - MENUITEM "&Uykuya Geçir", ID_SHUTDOWN_STANDBY - MENUITEM "&Hazırda Beklet", ID_SHUTDOWN_HIBERNATE - MENUITEM "&Kapat", ID_SHUTDOWN_POWEROFF - MENUITEM "&Yeniden Başlat", ID_SHUTDOWN_REBOOT - MENUITEM """%s"" &Oturumunu Kapat", ID_SHUTDOWN_LOGOFF + MENUITEM "&Uykuya Geçir", ID_SHUTDOWN_STANDBY + MENUITEM "&Hazırda Beklet", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Kapat", ID_SHUTDOWN_POWEROFF + MENUITEM "&Yeniden Başlat", ID_SHUTDOWN_REBOOT + MENUITEM """%s"" &Oturumunu Kapat", ID_SHUTDOWN_LOGOFF MENUITEM "Ku&llanıcı Değiştir\tROS+L", ID_SHUTDOWN_SWITCHUSER, GRAYED MENUITEM "&Bilgisayarı Kilitle\tROS+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "B&ağlantıyı Kes", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "B&ilgisayarı Çıkar", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "B&ağlantıyı Kes", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "B&ilgisayarı Çıkar", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Yardım" BEGIN @@ -80,7 +80,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Yeni Görev (Çalıştır...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -92,7 +92,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Geç", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Öne Getir", ID_WINDOWS_BRINGTOFRONT @@ -110,7 +110,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Eski Durumuna Getir", ID_RESTORE MENUITEM "&Kapat", ID_FILE_EXIT @@ -121,7 +121,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&İşlemi Sonlandır", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "İ&şlem Ağacını Sonlandır", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -145,6 +145,8 @@ END /* Dialogs */ +/* TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened */ + IDD_TASKMGR_DIALOG DIALOGEX 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME @@ -152,14 +154,14 @@ CAPTION "Görev Yöneticisi" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "G&örevi Sonlandır", IDC_ENDTASK, 60, 189, 68, 14, WS_DISABLED PUSHBUTTON "&Geç", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -170,7 +172,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Tüm Kullanıcıların İşlemlerini Göster", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 140, 10 diff --git a/base/applications/taskmgr/lang/uk-UA.rc b/base/applications/taskmgr/lang/uk-UA.rc index 340e631ce8f..57d5620a65e 100644 --- a/base/applications/taskmgr/lang/uk-UA.rc +++ b/base/applications/taskmgr/lang/uk-UA.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM "&Поверх інших вікон", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Згортати після звернення", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "При&ховувати згорнуте", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&Відображати 16-розрядні завдання", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Вигляд" BEGIN @@ -26,18 +26,18 @@ BEGIN MENUITEM "&Призупинити", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "&Великі значки", ID_VIEW_LARGE - MENUITEM "&Дрібні значки", ID_VIEW_SMALL - MENUITEM "Д&етально", ID_VIEW_DETAILS, CHECKED - MENUITEM "В&ибрати стовпці...", ID_VIEW_SELECTCOLUMNS - POPUP "&Хронологія ЦП" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "&Один графік для всіх ЦП", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "Окремий &графік для кожного ЦП", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "&Вивід часу ядра", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "В&ікна" + POPUP "" BEGIN MENUITEM "З&ліва направо", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Згори до&низу", ID_WINDOWS_TILEVERTICALLY @@ -48,15 +48,15 @@ BEGIN END POPUP "&Завершення роботи" BEGIN - MENUITEM "Перехід до режиму &очікування", ID_SHUTDOWN_STANDBY - MENUITEM "Перехід до &сну", ID_SHUTDOWN_HIBERNATE - MENUITEM "Ви&мкнення", ID_SHUTDOWN_POWEROFF - MENUITEM "&Перезавантаження", ID_SHUTDOWN_REBOOT - MENUITEM "&Завершення сеансу %s", ID_SHUTDOWN_LOGOFF - MENUITEM "Змінити &користувача\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "За&блокувати комп'ютер\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Від'єднатися", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "Зняти комп'ютер з &док-станції", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Перехід до режиму &очікування", ID_SHUTDOWN_STANDBY + MENUITEM "Перехід до &сну", ID_SHUTDOWN_HIBERNATE + MENUITEM "Ви&мкнення", ID_SHUTDOWN_POWEROFF + MENUITEM "&Перезавантаження", ID_SHUTDOWN_REBOOT + MENUITEM "&Завершення сеансу %s", ID_SHUTDOWN_LOGOFF + MENUITEM "Змінити &користувача\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "За&блокувати комп'ютер\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Від'єднатися", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "Зняти комп'ютер з &док-станції", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Довідка" BEGIN @@ -78,7 +78,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Нове завдання (Виконати...)", ID_FILE_NEW MENUITEM SEPARATOR @@ -90,7 +90,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "П&ереключитися", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "На передні&й план", ID_WINDOWS_BRINGTOFRONT @@ -108,7 +108,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Відновити", ID_RESTORE MENUITEM "&Закрити", ID_FILE_EXIT @@ -119,7 +119,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "&Завершити процес", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Завершити &дерево процесів", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -152,14 +152,14 @@ CAPTION "Диспетчер завдань" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "Зн&яти завдання", IDC_ENDTASK, 55, 189, 60, 14, WS_DISABLED PUSHBUTTON "П&ереключитися", IDC_SWITCHTO, 118, 189, 60, 14, WS_DISABLED @@ -170,7 +170,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "&Відображати процеси всіх користувачів", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 147, 10 diff --git a/base/applications/taskmgr/lang/zh-CN.rc b/base/applications/taskmgr/lang/zh-CN.rc index 5be7e478ead..6038833ee17 100644 --- a/base/applications/taskmgr/lang/zh-CN.rc +++ b/base/applications/taskmgr/lang/zh-CN.rc @@ -20,7 +20,7 @@ BEGIN MENUITEM "总在最前(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "使用时自动最小化(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "最小化时隐藏(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "显示 16 位任务(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "查看(&V)" BEGIN @@ -33,18 +33,18 @@ BEGIN MENUITEM "暂停(&P)", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "大图标(&G)", ID_VIEW_LARGE - MENUITEM "小图标(&M)", ID_VIEW_SMALL - MENUITEM "详细信息(&D)", ID_VIEW_DETAILS, CHECKED - MENUITEM "选择列(&S)...", ID_VIEW_SELECTCOLUMNS - POPUP "CPU 记录(&C)" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "所有 CPU 一张图表(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "每个 CPU 一张图表(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "显示内核时间(&S)", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "窗口(&W)" + POPUP "" BEGIN MENUITEM "横向平铺(&H)", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "纵向平铺(&V)", ID_WINDOWS_TILEVERTICALLY @@ -55,15 +55,15 @@ BEGIN END POPUP "关机(&U)" BEGIN - MENUITEM "待机(&B)", ID_SHUTDOWN_STANDBY - MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE - MENUITEM "关闭电源(&U)", ID_SHUTDOWN_POWEROFF - MENUITEM "重新启动(&R)", ID_SHUTDOWN_REBOOT - MENUITEM "退出用户(&L) %s", ID_SHUTDOWN_LOGOFF - MENUITEM "切换用户(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "锁定计算机(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "断开连接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "弹出计算机(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "待机(&B)", ID_SHUTDOWN_STANDBY + MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE + MENUITEM "关闭电源(&U)", ID_SHUTDOWN_POWEROFF + MENUITEM "重新启动(&R)", ID_SHUTDOWN_REBOOT + MENUITEM "退出用户(&L) %s", ID_SHUTDOWN_LOGOFF + MENUITEM "切换用户(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "锁定计算机(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "断开连接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "弹出计算机(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "帮助(&H)" BEGIN @@ -85,7 +85,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "新建任务(运行...)(&N)", ID_FILE_NEW MENUITEM SEPARATOR @@ -97,7 +97,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "切换至(&S)", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "前置(&B)", ID_WINDOWS_BRINGTOFRONT @@ -115,7 +115,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "还原(&R)", ID_RESTORE MENUITEM "关闭(&C)", ID_FILE_EXIT @@ -126,7 +126,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "结束进程(&E)", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "结束进程树(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -159,14 +159,14 @@ CAPTION "任务管理器" MENU IDR_TASKMANAGER FONT 9, "宋体" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "宋体" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "结束任务(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "切换至(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -177,7 +177,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "宋体" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "显示所有用户的进程(&S)", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 @@ -430,7 +430,7 @@ BEGIN IDS_MSG_UNABLEDEBUGPROCESS "无法调试进程" IDS_MSG_WARNINGDEBUG "警告：调试该进程可能会导致数据丢失。\n你确定想要附加调试器？" IDS_MSG_TASKMGRWARNING "任务管理器警告" - IDS_MSG_WARNINGTERMINATING "警告: 终止进程会导致意外的结果，包括丢失数据和系统不稳定。\n 在被终止前，这一进程将不会获得机会保存其状态或数据。\n 您确定想终止该进程吗？" + IDS_MSG_WARNINGTERMINATING "警告: 终止进程会导致意外的结果，包括丢失数据和系统不稳定。\n在被终止前，这一进程将不会获得机会保存其状态或数据。\n您确定想终止该进程吗？" IDS_MSG_UNABLETERMINATEPRO "无法终止进程" IDS_MSG_CLOSESYSTEMPROCESS "这是一个至关重要的系统进程。任务管理器不会结束这一进程。" IDS_MSG_UNABLECHANGEPRIORITY "无法更改优先级" diff --git a/base/applications/taskmgr/lang/zh-HK.rc b/base/applications/taskmgr/lang/zh-HK.rc index 65a336bc9f0..f12447626ae 100644 --- a/base/applications/taskmgr/lang/zh-HK.rc +++ b/base/applications/taskmgr/lang/zh-HK.rc @@ -21,7 +21,7 @@ BEGIN MENUITEM "前端顯示(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "使用時自動最小化(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "最小化時隱藏(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "顯示 16 位元工作(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "檢視(&V)" BEGIN @@ -34,18 +34,18 @@ BEGIN MENUITEM "暫停(&P)", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "大圖示(&G)", ID_VIEW_LARGE - MENUITEM "小圖示(&M)", ID_VIEW_SMALL - MENUITEM "詳細資料(&D)", ID_VIEW_DETAILS, CHECKED - MENUITEM "選擇欄位(&S)...", ID_VIEW_SELECTCOLUMNS - POPUP "CPU 記錄(&C)" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "所有 CPU 處理成一個圖形(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "每個 CPU 處理成一個圖形(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "顯示核心程式時間(&S)", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "窗口(&W)" + POPUP "" BEGIN MENUITEM "橫向平鋪(&H)", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "縱向平鋪(&V)", ID_WINDOWS_TILEVERTICALLY @@ -56,15 +56,15 @@ BEGIN END POPUP "關閉(&U)" BEGIN - MENUITEM "待機(&B)", ID_SHUTDOWN_STANDBY - MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE - MENUITEM "關閉電源(&U)", ID_SHUTDOWN_POWEROFF - MENUITEM "重新啟動(&R)", ID_SHUTDOWN_REBOOT - MENUITEM "登出 %s (&L)", ID_SHUTDOWN_LOGOFF - MENUITEM "切換使用者(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "鎖定電腦(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "斷開連接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "退出電腦(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "待機(&B)", ID_SHUTDOWN_STANDBY + MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE + MENUITEM "關閉電源(&U)", ID_SHUTDOWN_POWEROFF + MENUITEM "重新啟動(&R)", ID_SHUTDOWN_REBOOT + MENUITEM "登出 %s (&L)", ID_SHUTDOWN_LOGOFF + MENUITEM "切換使用者(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "鎖定電腦(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "斷開連接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "退出電腦(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "説明(&H)" BEGIN @@ -86,7 +86,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "新工作（執行...）(&N)", ID_FILE_NEW MENUITEM SEPARATOR @@ -98,7 +98,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "切換至(&S)", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "前置(&B)", ID_WINDOWS_BRINGTOFRONT @@ -116,7 +116,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "還原(&R)", ID_RESTORE MENUITEM "關閉(&C)", ID_FILE_EXIT @@ -127,7 +127,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "結束處理程序(&E)", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "結束處理程序樹狀目錄(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -160,14 +160,14 @@ CAPTION "工作管理員" MENU IDR_TASKMANAGER FONT 9, "新細明體" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "新細明體" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "結束工作(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "切換至(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -178,7 +178,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "新細明體" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "顯示所有使用者的處理程序(&S)", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10 diff --git a/base/applications/taskmgr/lang/zh-TW.rc b/base/applications/taskmgr/lang/zh-TW.rc index dad1b8ae772..eeaa0b72f36 100644 --- a/base/applications/taskmgr/lang/zh-TW.rc +++ b/base/applications/taskmgr/lang/zh-TW.rc @@ -21,7 +21,7 @@ BEGIN MENUITEM "前端顯示(&A)", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "使用時自動最小化(&M)", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "最小化時隱藏(&H)", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "顯示 16 位元工作(&S)", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "檢視(&V)" BEGIN @@ -34,18 +34,18 @@ BEGIN MENUITEM "暫停(&P)", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "大圖示(&G)", ID_VIEW_LARGE - MENUITEM "小圖示(&M)", ID_VIEW_SMALL - MENUITEM "詳細資料(&D)", ID_VIEW_DETAILS, CHECKED - MENUITEM "選擇欄位(&S)...", ID_VIEW_SELECTCOLUMNS - POPUP "CPU 記錄(&C)" + MENUITEM "", ID_VIEW_LARGE + MENUITEM "", ID_VIEW_SMALL + MENUITEM "", ID_VIEW_DETAILS, CHECKED + MENUITEM "", ID_VIEW_SELECTCOLUMNS + POPUP "" BEGIN - MENUITEM "所有 CPU 處理成一個圖形(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL - MENUITEM "每個 CPU 處理成一個圖形(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHALL + MENUITEM "", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED END - MENUITEM "顯示核心程式時間(&S)", ID_VIEW_SHOWKERNELTIMES + MENUITEM "", ID_VIEW_SHOWKERNELTIMES END - POPUP "視窗(&W)" + POPUP "" BEGIN MENUITEM "橫向平鋪(&H)", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "縱向平鋪(&V)", ID_WINDOWS_TILEVERTICALLY @@ -56,15 +56,15 @@ BEGIN END POPUP "關閉(&U)" BEGIN - MENUITEM "待機(&B)", ID_SHUTDOWN_STANDBY - MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE - MENUITEM "關閉電源(&U)", ID_SHUTDOWN_POWEROFF - MENUITEM "重新啟動(&R)", ID_SHUTDOWN_REBOOT - MENUITEM "登出 %s (&L)", ID_SHUTDOWN_LOGOFF - MENUITEM "切換使用者(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "鎖定電腦(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "斷開連接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "退出電腦(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "待機(&B)", ID_SHUTDOWN_STANDBY + MENUITEM "休眠(&H)", ID_SHUTDOWN_HIBERNATE + MENUITEM "關閉電源(&U)", ID_SHUTDOWN_POWEROFF + MENUITEM "重新啟動(&R)", ID_SHUTDOWN_REBOOT + MENUITEM "登出 %s (&L)", ID_SHUTDOWN_LOGOFF + MENUITEM "切換使用者(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "鎖定電腦(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "斷開連接(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "退出電腦(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "說明(&H)" BEGIN @@ -86,7 +86,7 @@ END IDR_APPLICATION_PAGE_CONTEXT1 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "執行新工作(&N)...", ID_FILE_NEW MENUITEM SEPARATOR @@ -98,7 +98,7 @@ END IDR_APPLICATION_PAGE_CONTEXT2 MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "切換至(&S)", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "前置(&B)", ID_WINDOWS_BRINGTOFRONT @@ -116,7 +116,7 @@ END IDR_TRAY_POPUP MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "還原(&R)", ID_RESTORE MENUITEM "關閉(&C)", ID_FILE_EXIT @@ -127,7 +127,7 @@ END IDR_PROCESS_PAGE_CONTEXT MENU BEGIN - POPUP "DUMMY" + POPUP "" BEGIN MENUITEM "結束處理程序(&E)", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "結束處理程序樹狀目錄(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE @@ -160,14 +160,14 @@ CAPTION "工作管理員" MENU IDR_TASKMANAGER FONT 9, "新細明體" BEGIN - CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 + CONTROL "", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "新細明體" BEGIN - CONTROL "List1", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | + CONTROL "", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 PUSHBUTTON "結束工作(&E)", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED PUSHBUTTON "切換至(&S)", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED @@ -178,7 +178,7 @@ IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "新細明體" BEGIN - CONTROL "List1", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + CONTROL "", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 7, 235, 177 CONTROL "顯示所有使用者的處理程序(&S)", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 191, 111, 10

11 months

[reactos] 03/03: [DESK] Add the current screensaver in the list if it isn't already present (#5766)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=171941ad185893f848bf9… commit 171941ad185893f848bf915e869d5d3622695489 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 16 20:52:31 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 18 21:46:15 2023 +0200 [DESK] Add the current screensaver in the list if it isn't already present (#5766) - Introduce AddScreenSaver[Item] helpers for adding screensavers in the list (either given by file path or by item structure). - Rename "AddScreenSavers" to "EnumScreenSavers", and "ScreenSaverItem" type to "SCREEN_SAVER_ITEM". - Ensure the stored "SCRNSAVE.EXE" value is NULL-terminated. - Add the current screensaver, specified by the "SCRNSAVE.EXE" registry value, in the list if it isn't already present; otherwise select it in the list. - Make the filename comparison case-insensitive. --- dll/cpl/desk/screensaver.c | 339 ++++++++++++++++++++++----------------------- 1 file changed, 166 insertions(+), 173 deletions(-) diff --git a/dll/cpl/desk/screensaver.c b/dll/cpl/desk/screensaver.c index 549422e5492..b99b35b5827 100644 --- a/dll/cpl/desk/screensaver.c +++ b/dll/cpl/desk/screensaver.c @@ -16,15 +16,15 @@ static const TCHAR szPreviewWndClass[] = TEXT("SSDemoParent"); typedef struct { - BOOL bIsScreenSaver; /* Is this background a wallpaper */ + BOOL bIsScreenSaver; /* Is this a valid screensaver */ TCHAR szFilename[MAX_PATH]; TCHAR szDisplayName[256]; -} ScreenSaverItem; +} SCREEN_SAVER_ITEM; typedef struct _DATA { - ScreenSaverItem ScreenSaverItems[MAX_SCREENSAVERS]; + SCREEN_SAVER_ITEM ScreenSaverItems[MAX_SCREENSAVERS]; PROCESS_INFORMATION PrevWindowPi; int Selection; WNDPROC OldPreviewProc; @@ -411,136 +411,149 @@ CheckRegScreenSaverIsSecure(HWND hwndDlg) } -static VOID -SearchScreenSavers(HWND hwndScreenSavers, - LPCTSTR pszSearchPath, - PDATA pData) +static BOOL +AddScreenSaverItem( + _In_ HWND hwndScreenSavers, + _In_ PDATA pData, + _In_ SCREEN_SAVER_ITEM* ScreenSaverItem) { - WIN32_FIND_DATA fd; - TCHAR szSearchPath[MAX_PATH]; - HANDLE hFind; - ScreenSaverItem *ScreenSaverItem; - HANDLE hModule; - UINT i, ScreenSaverCount; - HRESULT hr; + UINT i; - ScreenSaverCount = pData->ScreenSaverCount; + if (pData->ScreenSaverCount >= MAX_SCREENSAVERS) + return FALSE; - hr = StringCbCopy(szSearchPath, sizeof(szSearchPath), pszSearchPath); - if (FAILED(hr)) - return; - hr = StringCbCat(szSearchPath, sizeof(szSearchPath), TEXT("\\*.scr")); - if (FAILED(hr)) - return; + i = SendMessage(hwndScreenSavers, + CB_ADDSTRING, + 0, + (LPARAM)ScreenSaverItem->szDisplayName); + if ((i == CB_ERR) || (i == CB_ERRSPACE)) + return FALSE; - hFind = FindFirstFile(szSearchPath, &fd); + SendMessage(hwndScreenSavers, + CB_SETITEMDATA, + i, + (LPARAM)pData->ScreenSaverCount); - if (hFind == INVALID_HANDLE_VALUE) - return; + pData->ScreenSaverCount++; + return TRUE; +} + +static BOOL +AddScreenSaver( + _In_ HWND hwndScreenSavers, + _In_ PDATA pData, + _In_ LPCTSTR pszFilePath, + _In_ LPCTSTR pszFileName) +{ + SCREEN_SAVER_ITEM* ScreenSaverItem; + HANDLE hModule; + HRESULT hr; + + if (pData->ScreenSaverCount >= MAX_SCREENSAVERS) + return FALSE; - while (ScreenSaverCount < MAX_SCREENSAVERS) + ScreenSaverItem = pData->ScreenSaverItems + pData->ScreenSaverCount; + + ScreenSaverItem->bIsScreenSaver = TRUE; + + hModule = LoadLibraryEx(pszFilePath, + NULL, + DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); + if (hModule) { - /* Don't add any hidden screensavers */ - if ((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) + if (LoadString(hModule, + 1, + ScreenSaverItem->szDisplayName, + _countof(ScreenSaverItem->szDisplayName)) == 0) { - TCHAR filename[MAX_PATH]; - - hr = StringCbCopy(filename, sizeof(filename), pszSearchPath); + /* If the string does not exist, copy the file name */ + hr = StringCbCopy(ScreenSaverItem->szDisplayName, + sizeof(ScreenSaverItem->szDisplayName), + pszFileName); if (FAILED(hr)) { - FindClose(hFind); - return; - } - hr = StringCbCat(filename, sizeof(filename), _T("\\")); - if (FAILED(hr)) - { - FindClose(hFind); - return; - } - hr = StringCbCat(filename, sizeof(filename), fd.cFileName); - if (FAILED(hr)) - { - FindClose(hFind); - return; + FreeLibrary(hModule); + return FALSE; } + /* Remove the .scr extension */ + ScreenSaverItem->szDisplayName[_tcslen(pszFileName)-4] = _T('\0'); + } + FreeLibrary(hModule); + } + else + { + hr = StringCbCopy(ScreenSaverItem->szDisplayName, + sizeof(ScreenSaverItem->szDisplayName), + _T("Unknown")); + if (FAILED(hr)) + return FALSE; + } - ScreenSaverItem = pData->ScreenSaverItems + ScreenSaverCount; + hr = StringCbCopy(ScreenSaverItem->szFilename, + sizeof(ScreenSaverItem->szFilename), + pszFilePath); + if (FAILED(hr)) + return FALSE; - ScreenSaverItem->bIsScreenSaver = TRUE; + return AddScreenSaverItem(hwndScreenSavers, pData, ScreenSaverItem); +} - hModule = LoadLibraryEx(filename, - NULL, - DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); - if (hModule) - { - if (0 == LoadString(hModule, - 1, - ScreenSaverItem->szDisplayName, - sizeof(ScreenSaverItem->szDisplayName) / sizeof(TCHAR))) - { - // If the string does not exists, copy the name of the file - hr = StringCbCopy(ScreenSaverItem->szDisplayName, sizeof(ScreenSaverItem->szDisplayName), fd.cFileName); - if (FAILED(hr)) - { - FreeLibrary(hModule); - FindClose(hFind); - return; - } - ScreenSaverItem->szDisplayName[_tcslen(fd.cFileName)-4] = '\0'; - } - FreeLibrary(hModule); - } - else - { - hr = StringCbCopy(ScreenSaverItem->szDisplayName, sizeof(ScreenSaverItem->szDisplayName), _T("Unknown")); - if (FAILED(hr)) - { - FindClose(hFind); - return; - } - } +static VOID +SearchScreenSavers( + _In_ HWND hwndScreenSavers, + _In_ PDATA pData, + _In_ LPCTSTR pszSearchPath) +{ + HRESULT hr; + WIN32_FIND_DATA fd; + HANDLE hFind; + TCHAR szFilePath[MAX_PATH]; - hr = StringCbCopy(ScreenSaverItem->szFilename, sizeof(ScreenSaverItem->szFilename), filename); - if (FAILED(hr)) - { - FindClose(hFind); - return; - } + hr = StringCbPrintf(szFilePath, sizeof(szFilePath), + TEXT("%s\\*.scr"), pszSearchPath); + if (FAILED(hr)) + return; - i = SendMessage(hwndScreenSavers, - CB_ADDSTRING, - 0, - (LPARAM)ScreenSaverItem->szDisplayName); + hFind = FindFirstFile(szFilePath, &fd); + if (hFind == INVALID_HANDLE_VALUE) + return; - SendMessage(hwndScreenSavers, - CB_SETITEMDATA, - i, - (LPARAM)ScreenSaverCount); + do + { + /* Don't add any hidden screensavers */ + if (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + continue; - ScreenSaverCount++; - } + if (pData->ScreenSaverCount >= MAX_SCREENSAVERS) + break; - if (!FindNextFile(hFind, &fd)) + hr = StringCbPrintf(szFilePath, sizeof(szFilePath), + TEXT("%s\\%s"), pszSearchPath, fd.cFileName); + if (FAILED(hr)) break; - } - FindClose(hFind); + if (!AddScreenSaver(hwndScreenSavers, pData, szFilePath, fd.cFileName)) + break; - pData->ScreenSaverCount = ScreenSaverCount; -} + } while (FindNextFile(hFind, &fd)); + FindClose(hFind); +} static VOID -AddScreenSavers(HWND hwndDlg, PDATA pData) +EnumScreenSavers( + _In_ HWND hwndScreenSavers, + _In_ PDATA pData) { - HWND hwndScreenSavers = GetDlgItem(hwndDlg, IDC_SCREENS_LIST); + SCREEN_SAVER_ITEM* ScreenSaverItem; + PTCHAR pBackSlash; TCHAR szSearchPath[MAX_PATH]; TCHAR szLocalPath[MAX_PATH]; - INT i; - ScreenSaverItem *ScreenSaverItem = NULL; - LPTSTR lpBackSlash; - /* Add the "None" item */ + /* Initialize the number of list items */ + pData->ScreenSaverCount = 0; + + /* Add the "(None)" item */ ScreenSaverItem = pData->ScreenSaverItems; ScreenSaverItem->bIsScreenSaver = FALSE; @@ -548,39 +561,28 @@ AddScreenSavers(HWND hwndDlg, PDATA pData) LoadString(hApplet, IDS_NONE, ScreenSaverItem->szDisplayName, - sizeof(ScreenSaverItem->szDisplayName) / sizeof(TCHAR)); + _countof(ScreenSaverItem->szDisplayName)); - i = SendMessage(hwndScreenSavers, - CB_ADDSTRING, - 0, - (LPARAM)ScreenSaverItem->szDisplayName); - - SendMessage(hwndScreenSavers, - CB_SETITEMDATA, - i, - (LPARAM)0); + AddScreenSaverItem(hwndScreenSavers, pData, ScreenSaverItem); - // Initialize number of items into the list - pData->ScreenSaverCount = 1; - - // Add all the screensavers where the applet is stored. - GetModuleFileName(hApplet, szLocalPath, MAX_PATH); - lpBackSlash = _tcsrchr(szLocalPath, _T('\\')); - if (lpBackSlash != NULL) + /* Add all the screensavers where the applet is stored */ + GetModuleFileName(hApplet, szLocalPath, _countof(szLocalPath)); + pBackSlash = _tcsrchr(szLocalPath, _T('\\')); + if (pBackSlash != NULL) { - *lpBackSlash = '\0'; - SearchScreenSavers(hwndScreenSavers, szLocalPath, pData); + *pBackSlash = _T('\0'); + SearchScreenSavers(hwndScreenSavers, pData, szLocalPath); } - // Add all the screensavers in the C:\ReactOS\System32 directory. - GetSystemDirectory(szSearchPath, MAX_PATH); - if (lpBackSlash != NULL && _tcsicmp(szSearchPath, szLocalPath) != 0) - SearchScreenSavers(hwndScreenSavers, szSearchPath, pData); + /* Add all the screensavers in the C:\ReactOS\System32 directory */ + GetSystemDirectory(szSearchPath, _countof(szSearchPath)); + if (pBackSlash != NULL && _tcsicmp(szSearchPath, szLocalPath) != 0) + SearchScreenSavers(hwndScreenSavers, pData, szSearchPath); - // Add all the screensavers in the C:\ReactOS directory. - GetWindowsDirectory(szSearchPath, MAX_PATH); - if (lpBackSlash != NULL && _tcsicmp(szSearchPath, szLocalPath) != 0) - SearchScreenSavers(hwndScreenSavers, szSearchPath, pData); + /* Add all the screensavers in the C:\ReactOS directory */ + GetWindowsDirectory(szSearchPath, _countof(szSearchPath)); + if (pBackSlash != NULL && _tcsicmp(szSearchPath, szLocalPath) != 0) + SearchScreenSavers(hwndScreenSavers, pData, szSearchPath); } @@ -606,7 +608,7 @@ SetScreenSaver(HWND hwndDlg, PDATA pData) /* Set the screensaver */ if (pData->ScreenSaverItems[pData->Selection].bIsScreenSaver) { - SIZE_T Length = _tcslen(pData->ScreenSaverItems[pData->Selection].szFilename) * sizeof(TCHAR); + SIZE_T Length = (_tcslen(pData->ScreenSaverItems[pData->Selection].szFilename) + 1) * sizeof(TCHAR); RegSetValueEx(regKey, _T("SCRNSAVE.EXE"), 0, @@ -658,9 +660,9 @@ SetScreenSaver(HWND hwndDlg, PDATA pData) static BOOL OnInitDialog(HWND hwndDlg, PDATA pData) { - LPTSTR lpCurSs; HWND hwndSSCombo = GetDlgItem(hwndDlg, IDC_SCREENS_LIST); - INT Num; + LPTSTR pSsValue; + INT iCurSs; WNDCLASS wc = {0}; pData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DATA)); @@ -712,76 +714,67 @@ OnInitDialog(HWND hwndDlg, PDATA pData) IDC_SCREENS_TIME, UDM_SETRANGE, 0, - MAKELONG - ((short) 240, (short) 1)); + MAKELONG(240, 1)); - AddScreenSavers(hwndDlg, - pData); + EnumScreenSavers(hwndSSCombo, pData); CheckRegScreenSaverIsSecure(hwndDlg); /* Set the current screensaver in the combo box */ - lpCurSs = GetCurrentScreenSaverValue(_T("SCRNSAVE.EXE")); - if (lpCurSs) + iCurSs = 0; // Default to "(None)" + pSsValue = GetCurrentScreenSaverValue(_T("SCRNSAVE.EXE")); + if (pSsValue) { BOOL bFound = FALSE; INT i; - for (i = 0; i < MAX_SCREENSAVERS; i++) + /* Find whether the current screensaver is in the list */ + for (i = 0; i < pData->ScreenSaverCount; i++) { - if (!_tcscmp(lpCurSs, pData->ScreenSaverItems[i].szFilename)) + if (!_tcsicmp(pSsValue, pData->ScreenSaverItems[i].szFilename)) { bFound = TRUE; break; } } - if (bFound) + if (!bFound) { - Num = SendMessage(hwndSSCombo, - CB_FINDSTRINGEXACT, - -1, - (LPARAM)pData->ScreenSaverItems[i].szDisplayName); - if (Num != CB_ERR) - SendMessage(hwndSSCombo, - CB_SETCURSEL, - Num, - 0); + /* The current screensaver is not in the list: add it */ + // i = pData->ScreenSaverCount; + bFound = AddScreenSaver(hwndSSCombo, pData, pSsValue, _T("SCRNSAVE.EXE")); + if (bFound) + i = pData->ScreenSaverCount - 1; } - else + + HeapFree(GetProcessHeap(), 0, pSsValue); + + if (bFound) { - SendMessage(hwndSSCombo, - CB_SETCURSEL, - 0, - 0); + /* The current screensaver should be in the list: select it */ + iCurSs = SendMessage(hwndSSCombo, + CB_FINDSTRINGEXACT, + -1, + (LPARAM)pData->ScreenSaverItems[i].szDisplayName); + if (iCurSs == CB_ERR) + iCurSs = 0; // Default to "(None)" } - - HeapFree(GetProcessHeap(), 0, lpCurSs); - } - else - { - /* Set screensaver to (none) */ - SendMessage(hwndSSCombo, - CB_SETCURSEL, - 0, - 0); } + SendMessage(hwndSSCombo, CB_SETCURSEL, iCurSs, 0); /* Set the current timeout */ - lpCurSs = GetCurrentScreenSaverValue(_T("ScreenSaveTimeOut")); - if (lpCurSs) + pSsValue = GetCurrentScreenSaverValue(_T("ScreenSaveTimeOut")); + if (pSsValue) { - UINT Time = _ttoi(lpCurSs); + UINT Time = _ttoi(pSsValue) / 60; - Time /= 60; + HeapFree(GetProcessHeap(), 0, pSsValue); SendDlgItemMessage(hwndDlg, IDC_SCREENS_TIME, UDM_SETPOS32, 0, Time); - - HeapFree(GetProcessHeap(), 0, lpCurSs); } SelectionChanged(hwndDlg, pData);

11 months

[reactos] 02/03: [DESK] Reimplement InstallScreenSaverW to behave similarly to Windows' one (#5766)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3a25bcf8bdebb4fde966… commit b3a25bcf8bdebb4fde966449032777857a08dcd1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Oct 5 22:42:17 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 18 21:45:39 2023 +0200 [DESK] Reimplement InstallScreenSaverW to behave similarly to Windows' one (#5766) CORE-6812 ; see also commit ff0951356 (r66688) This function "just" changes the per-user SCRNSAVE.EXE registry value to point to the new specified file, changes the SPI values and opens the desk.cpl "Screensaver" property tab for letting the user change the new selected screensaver properties. In particular, it does *NOT* copy the specified file to System32 or anything else (and doesn't verify that it is a valid PE executable). Our previous implementation did none of that, and was also relying on some private setupapi functions. We now behave closer to Windows' desk.cpl. Additionally: - ReactOS-specific feature (compile-time define) disabled by default: Verify that the specified file actually exists, before changing the screensaver. - Use NDEBUG, disabling DPRINT by default; - Improve InstallScreenSaver[A,W] spec entries; - Remove NUM_APPLETS define and use _countof() instead. --- dll/cpl/desk/desk.c | 129 ++++++++++++++++++++++++++++++++++--------------- dll/cpl/desk/desk.spec | 5 +- 2 files changed, 94 insertions(+), 40 deletions(-) diff --git a/dll/cpl/desk/desk.c b/dll/cpl/desk/desk.c index 0bbfc7a4a0e..ce780332d91 100644 --- a/dll/cpl/desk/desk.c +++ b/dll/cpl/desk/desk.c @@ -13,9 +13,17 @@ #include <cplext.h> #include <winnls.h> +#define NDEBUG #include <debug.h> -#define NUM_APPLETS (1) + +/* Enable this for InstallScreenSaverW() to determine a possible full path + * to the specified screensaver file, verify its existence and use it. + * (NOTE: This is not Windows desk.cpl-compatible.) */ +// #define CHECK_SCR_FULL_PATH + + +VOID WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); static LONG APIENTRY DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); @@ -26,11 +34,11 @@ INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR INT_PTR CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); UINT CALLBACK SettingsPageCallbackProc(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp); -HINSTANCE hApplet = 0; -HWND hCPLWindow; +HINSTANCE hApplet = NULL; +HWND hCPLWindow = NULL; /* Applets */ -APPLET Applets[NUM_APPLETS] = +APPLET Applets[] = { { IDC_DESK_ICON, @@ -211,8 +219,8 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) g_GlobalData.bmMonHeight = bitmap.bmHeight; } - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); + ZeroMemory(&psh, sizeof(psh)); + psh.dwSize = sizeof(psh); psh.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE | PSH_USEICONID; psh.hwndParent = hCPLWindow; psh.hInstance = hApplet; @@ -226,7 +234,7 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) /* Allow shell extensions to replace the background page */ hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Desk"), MAX_DESK_PAGES - psh.nPages); - for (i = 0; i != sizeof(PropPages) / sizeof(PropPages[0]); i++) + for (i = 0; i < _countof(PropPages); i++) { if (pwszSelectedTab && wcsicmp(pwszSelectedTab, PropPages[i].Name) == 0) psh.nStartPage = i; @@ -276,10 +284,10 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) return TRUE; case CPL_GETCOUNT: - return NUM_APPLETS; + return _countof(Applets); case CPL_INQUIRE: - if (i < NUM_APPLETS) + if (i < _countof(Applets)) { CPLINFO *CPlInfo = (CPLINFO*)lParam2; CPlInfo->lData = 0; @@ -294,14 +302,14 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) break; case CPL_DBLCLK: - if (i < NUM_APPLETS) + if (i < _countof(Applets)) Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); else return TRUE; break; case CPL_STARTWPARMSW: - if (i < NUM_APPLETS) + if (i < _countof(Applets)) return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); break; } @@ -317,45 +325,90 @@ InstallScreenSaverW( IN LPCWSTR pszFile, IN UINT nCmdShow) { - WCHAR pszSystemDir[MAX_PATH]; - WCHAR pszDrive[3]; - WCHAR pszPath[MAX_PATH]; - WCHAR pszFilename[MAX_PATH]; - WCHAR pszExt[MAX_PATH]; - LPWSTR pszOutName; - UINT uCompressionType=FILE_COMPRESSION_NONE; - DWORD dwSourceSize; - DWORD dwTargetSize; - DWORD rc; + LRESULT rc; + HKEY regKey; + INT Timeout; +#ifdef CHECK_SCR_FULL_PATH + HANDLE hFile; + WIN32_FIND_DATAW fdFile; +#endif + DWORD dwLen; + WCHAR szFullPath[MAX_PATH]; if (!pszFile) { - DPRINT("InstallScreenSaver() null file\n"); + DPRINT1("InstallScreenSaver() null file\n"); SetLastError(ERROR_INVALID_PARAMETER); return; } DPRINT("InstallScreenSaver() Installing screensaver %ls\n", pszFile); - rc = SetupGetFileCompressionInfoW(pszFile, &pszOutName, &dwSourceSize, &dwTargetSize, &uCompressionType); - if (ERROR_SUCCESS != rc) +#ifdef CHECK_SCR_FULL_PATH + /* Retrieve the actual path to the file and verify whether it exists */ + dwLen = GetFullPathNameW(pszFile, _countof(szFullPath), szFullPath, NULL); + if (dwLen == 0 || dwLen > _countof(szFullPath)) { - DPRINT("InstallScreenSaver() SetupGetFileCompressionInfo failed with error 0x%lx\n", rc); - SetLastError(rc); + DPRINT1("InstallScreenSaver() File %ls not accessible\n", pszFile); return; } - if (!GetSystemDirectoryW((LPWSTR)pszSystemDir, sizeof(pszSystemDir)/sizeof(WCHAR))) + hFile = FindFirstFile(szFullPath, &fdFile); + if (hFile == INVALID_HANDLE_VALUE) { - MyFree(pszOutName); - DPRINT("InstallScreenSaver() GetSystemDirectory failed with error 0x%lx\n", GetLastError()); + DPRINT1("InstallScreenSaver() File %ls not found\n", pszFile); return; } - _wsplitpath(pszOutName, pszDrive, pszPath, pszFilename, pszExt); - MyFree(pszOutName); - StringCbCatW(pszSystemDir, sizeof(pszSystemDir), L"\\"); - StringCbCatW(pszSystemDir, sizeof(pszSystemDir), pszFilename); - StringCbCatW(pszSystemDir, sizeof(pszSystemDir), pszExt); - rc = SetupDecompressOrCopyFileW(pszFile, pszSystemDir, &uCompressionType); - DPRINT("InstallScreenSaver() Copying to %ls, compression type %d return 0x%lx\n", pszFile, uCompressionType, rc); + FindClose(hFile); + /* Use the full file path from now on */ + pszFile = szFullPath; +#endif + + rc = RegOpenKeyExW(HKEY_CURRENT_USER, + L"Control Panel\\Desktop", + 0, + KEY_SET_VALUE, + &regKey); + if (rc == ERROR_SUCCESS) + { + /* Set the screensaver */ + SIZE_T Length = (wcslen(pszFile) + 1) * sizeof(WCHAR); + rc = RegSetValueExW(regKey, + L"SCRNSAVE.EXE", + 0, + REG_SZ, + (PBYTE)pszFile, + (DWORD)Length); + RegCloseKey(regKey); + } + if (rc != ERROR_SUCCESS) + { + DPRINT1("InstallScreenSaver() Could not change the current screensaver\n"); + return; + } + + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, 0, SPIF_UPDATEINIFILE); + + /* If no screensaver timeout is present, default to 10 minutes (600 seconds) */ + Timeout = 0; + if (!SystemParametersInfoW(SPI_GETSCREENSAVETIMEOUT, 0, &Timeout, 0) || (Timeout <= 0)) + SystemParametersInfoW(SPI_SETSCREENSAVETIMEOUT, 600, 0, SPIF_UPDATEINIFILE); + + /* Retrieve the name of this current instance of desk.cpl */ + dwLen = GetModuleFileNameW(hApplet, szFullPath, _countof(szFullPath)); + if ((dwLen == 0) || (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) + { + /* We failed, copy the default value */ + StringCchCopyW(szFullPath, _countof(szFullPath), L"desk.cpl"); + } + + /* Build the desk.cpl command-line to start the ScreenSaver page. + * Equivalent to: "desk.cpl,ScreenSaver,@ScreenSaver" */ + rc = StringCchCatW(szFullPath, _countof(szFullPath), L",,1"); + if (FAILED(rc)) + return; + + /* Open the ScreenSaver page in this desk.cpl instance */ + DPRINT("InstallScreenSaver() Starting '%ls'\n", szFullPath); + Control_RunDLLW(hWindow, hInstance, szFullPath, nCmdShow); } void @@ -371,7 +424,7 @@ InstallScreenSaverA( if (!pszFile) { - DPRINT("InstallScreenSaver() null file\n"); + DPRINT1("InstallScreenSaver() null file\n"); SetLastError(ERROR_INVALID_PARAMETER); return; } @@ -393,7 +446,7 @@ InstallScreenSaverA( } if (!lpwString) { - DPRINT("InstallScreenSaver() not enough memory to convert string to unicode\n"); + DPRINT1("InstallScreenSaver() not enough memory to convert string to unicode\n"); return; } diff --git a/dll/cpl/desk/desk.spec b/dll/cpl/desk/desk.spec index ab028545161..b108c44825f 100644 --- a/dll/cpl/desk/desk.spec +++ b/dll/cpl/desk/desk.spec @@ -1,6 +1,7 @@ @ stdcall CPlApplet(ptr long ptr ptr) @ stdcall DisplayClassInstaller(long ptr ptr) @ stdcall DisplaySaveSettings(ptr ptr) -@ stdcall InstallScreenSaverW(long long ptr long) -@ stdcall InstallScreenSaverA(long long ptr long) +@ stdcall InstallScreenSaver(ptr ptr str long) InstallScreenSaverA +@ stdcall InstallScreenSaverA(ptr ptr str long) +@ stdcall InstallScreenSaverW(ptr ptr wstr long) @ stdcall MonitorClassInstaller(long ptr ptr)

11 months

[reactos] 01/03: [DESK] Cleanup some functions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd1e5d53a5d8ec138db56… commit fd1e5d53a5d8ec138db56b534bfb16fbb3104665 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 16 21:11:09 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 18 21:30:10 2023 +0200 [DESK] Cleanup some functions. --- dll/cpl/desk/screensaver.c | 177 +++++++++++++++++++++------------------------ 1 file changed, 84 insertions(+), 93 deletions(-) diff --git a/dll/cpl/desk/screensaver.c b/dll/cpl/desk/screensaver.c index 5c310f8d692..549422e5492 100644 --- a/dll/cpl/desk/screensaver.c +++ b/dll/cpl/desk/screensaver.c @@ -57,9 +57,7 @@ GetCurrentScreenSaverValue(LPTSTR lpValue) &BufSize); if (Ret == ERROR_SUCCESS) { - lpBuf = HeapAlloc(GetProcessHeap(), - 0, - BufSize); + lpBuf = HeapAlloc(GetProcessHeap(), 0, BufSize); if (lpBuf) { Ret = RegQueryValueEx(hKey, @@ -173,10 +171,14 @@ ShowScreenSaverPreview(IN LPDRAWITEMSTRUCT draw, IN PDATA pData) } +/* + * /p:<hwnd> Run preview, hwnd is handle of calling window + */ static VOID SetScreenSaverPreviewBox(HWND hwndDlg, PDATA pData) { HWND hPreview = pData->ScreenSaverPreviewParent; + HRESULT hr; STARTUPINFO si; TCHAR szCmdline[2048]; @@ -190,32 +192,34 @@ SetScreenSaverPreviewBox(HWND hwndDlg, PDATA pData) } ShowWindow(pData->ScreenSaverPreviewParent, SW_HIDE); - if (pData->Selection > 0) + if (pData->Selection < 1) + return; + + hr = StringCbPrintf(szCmdline, sizeof(szCmdline), + TEXT("%s /p %Iu"), + pData->ScreenSaverItems[pData->Selection].szFilename, + (ULONG_PTR)hPreview); + if (FAILED(hr)) + return; + + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + ZeroMemory(&pData->PrevWindowPi, sizeof(pData->PrevWindowPi)); + + ShowWindow(pData->ScreenSaverPreviewParent, SW_SHOW); + + if (!CreateProcess(NULL, + szCmdline, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &si, + &pData->PrevWindowPi)) { - _stprintf(szCmdline, - _T("%s /p %Iu"), - pData->ScreenSaverItems[pData->Selection].szFilename, - (ULONG_PTR)hPreview); - - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - ZeroMemory(&pData->PrevWindowPi, sizeof(pData->PrevWindowPi)); - - ShowWindow(pData->ScreenSaverPreviewParent, SW_SHOW); - - if (!CreateProcess(NULL, - szCmdline, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &si, - &pData->PrevWindowPi)) - { - pData->PrevWindowPi.hThread = pData->PrevWindowPi.hProcess = NULL; - } + pData->PrevWindowPi.hThread = pData->PrevWindowPi.hProcess = NULL; } } @@ -260,38 +264,40 @@ WaitForSettingsDialog(HWND hwndDlg, } +/* + * /c:<hwnd> Run configuration, hwnd is handle of calling window + */ static VOID -ScreensaverConfig(HWND hwndDlg, PDATA pData) +ScreenSaverConfig(HWND hwndDlg, PDATA pData) { - /* - * /c:<hwnd> Run configuration, hwnd is handle of calling window - */ - - TCHAR szCmdline[2048]; + HRESULT hr; STARTUPINFO si; PROCESS_INFORMATION pi; + TCHAR szCmdline[2048]; if (pData->Selection < 1) return; - _stprintf(szCmdline, - _T("%s /c:%Iu"), - pData->ScreenSaverItems[pData->Selection].szFilename, - (ULONG_PTR)hwndDlg); + hr = StringCbPrintf(szCmdline, sizeof(szCmdline), + TEXT("%s /c:%Iu"), + pData->ScreenSaverItems[pData->Selection].szFilename, + (ULONG_PTR)hwndDlg); + if (FAILED(hr)) + return; ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); ZeroMemory(&pi, sizeof(pi)); if (CreateProcess(NULL, - szCmdline, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &si, - &pi)) + szCmdline, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &si, + &pi)) { /* Kill off the previous preview process */ if (pData->PrevWindowPi.hProcess) @@ -310,17 +316,16 @@ ScreensaverConfig(HWND hwndDlg, PDATA pData) } } - +/* + * /s Run normal + */ static VOID -ScreensaverPreview(HWND hwndDlg, PDATA pData) +ScreenSaverPreview(HWND hwndDlg, PDATA pData) { - /* - /s Run normal - */ - - TCHAR szCmdline[2048]; + HRESULT hr; STARTUPINFO si; PROCESS_INFORMATION pi; + TCHAR szCmdline[2048]; if (pData->Selection < 1) return; @@ -334,23 +339,25 @@ ScreensaverPreview(HWND hwndDlg, PDATA pData) pData->PrevWindowPi.hThread = pData->PrevWindowPi.hProcess = NULL; } - _stprintf(szCmdline, - _T("%s /s"), - pData->ScreenSaverItems[pData->Selection].szFilename); + hr = StringCbPrintf(szCmdline, sizeof(szCmdline), + TEXT("%s /s"), + pData->ScreenSaverItems[pData->Selection].szFilename); + if (FAILED(hr)) + return; ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); ZeroMemory(&pi, sizeof(pi)); if (CreateProcess(NULL, - szCmdline, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &si, - &pi)) + szCmdline, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &si, + &pi)) { WaitForSingleObject(pi.hProcess, INFINITE); CloseHandle(pi.hProcess); @@ -638,9 +645,8 @@ SetScreenSaver(HWND hwndDlg, PDATA pData) &bRet, FALSE); if (Time == 0) - Time = 60; - else - Time *= 60; + Time = 1; + Time *= 60; // Convert to seconds SystemParametersInfoW(SPI_SETSCREENSAVETIMEOUT, Time, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); @@ -657,9 +663,7 @@ OnInitDialog(HWND hwndDlg, PDATA pData) INT Num; WNDCLASS wc = {0}; - pData = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(DATA)); + pData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DATA)); if (!pData) { EndDialog(hwndDlg, -1); @@ -700,9 +704,7 @@ OnInitDialog(HWND hwndDlg, PDATA pData) pData->ScreenSaverPreviewParent = hChild; } - SetWindowLongPtr(hwndDlg, - DWLP_USER, - (LONG_PTR)pData); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pData); pData->Selection = -1; @@ -754,9 +756,7 @@ OnInitDialog(HWND hwndDlg, PDATA pData) 0); } - HeapFree(GetProcessHeap(), - 0, - lpCurSs); + HeapFree(GetProcessHeap(), 0, lpCurSs); } else { @@ -781,14 +781,10 @@ OnInitDialog(HWND hwndDlg, PDATA pData) 0, Time); - HeapFree(GetProcessHeap(), - 0, - lpCurSs); - + HeapFree(GetProcessHeap(), 0, lpCurSs); } - SelectionChanged(hwndDlg, - pData); + SelectionChanged(hwndDlg, pData); return TRUE; } @@ -829,16 +825,13 @@ ScreenSaverPageProc(HWND hwndDlg, CloseHandle(pData->PrevWindowPi.hProcess); CloseHandle(pData->PrevWindowPi.hThread); } - HeapFree(GetProcessHeap(), - 0, - pData); + HeapFree(GetProcessHeap(), 0, pData); break; } case WM_ENDSESSION: { - SetScreenSaverPreviewBox(hwndDlg, - pData); + SetScreenSaverPreviewBox(hwndDlg, pData); break; } @@ -888,7 +881,7 @@ ScreenSaverPageProc(HWND hwndDlg, { if (command == BN_CLICKED) { - ScreensaverPreview(hwndDlg, pData); + ScreenSaverPreview(hwndDlg, pData); SetScreenSaverPreviewBox(hwndDlg, pData); } break; @@ -897,16 +890,14 @@ ScreenSaverPageProc(HWND hwndDlg, case IDC_SCREENS_SETTINGS: // Screensaver Settings { if (command == BN_CLICKED) - ScreensaverConfig(hwndDlg, pData); + ScreenSaverConfig(hwndDlg, pData); break; } case IDC_SCREENS_USEPASSCHK: // Screensaver Is Secure { if (command == BN_CLICKED) - { PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } break; } }

11 months

[reactos] 01/01: [NVNET] Remove NdisEqualMemory hack by linking with memcmp library

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0af84ce12d2f11274b808… commit 0af84ce12d2f11274b8084cf0b3573501de9d692 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Oct 12 21:50:12 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Oct 18 20:18:02 2023 +0300 [NVNET] Remove NdisEqualMemory hack by linking with memcmp library Fix suggested by Hermès Bélusca-Maïto. CORE-15872 --- drivers/network/dd/nvnet/CMakeLists.txt | 1 + drivers/network/dd/nvnet/requests.c | 24 ------------------------ 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/drivers/network/dd/nvnet/CMakeLists.txt b/drivers/network/dd/nvnet/CMakeLists.txt index 81d38fe1c6e..666e29a3003 100644 --- a/drivers/network/dd/nvnet/CMakeLists.txt +++ b/drivers/network/dd/nvnet/CMakeLists.txt @@ -18,6 +18,7 @@ list(APPEND SOURCE send.c) add_library(nvnet MODULE ${SOURCE} nvnet.rc) +target_link_libraries(nvnet memcmp) add_pch(nvnet nvnet.h SOURCE) set_module_type(nvnet kernelmodedriver) add_importlibs(nvnet ndis ntoskrnl hal) diff --git a/drivers/network/dd/nvnet/requests.c b/drivers/network/dd/nvnet/requests.c index 4cf57fed230..f8f041274a2 100644 --- a/drivers/network/dd/nvnet/requests.c +++ b/drivers/network/dd/nvnet/requests.c @@ -692,30 +692,6 @@ NvNetAddWakeUpPattern( return NDIS_STATUS_SUCCESS; } -static -BOOLEAN -NvEqualMemory( - _In_reads_bytes_(Length) PVOID Destination, - _In_reads_bytes_(Length) PVOID Source, - _In_ ULONG Length) -{ - ULONG i; - PUCHAR Src, Dest; - - Src = Source; - Dest = Destination; - for (i = 0; i < Length; ++i) - { - if (Src[i] != Dest[i]) - return FALSE; - } - - return TRUE; -} -/* 'memcmp' is unavailable for some reason */ -#undef NdisEqualMemory -#define NdisEqualMemory NvEqualMemory - static NDIS_STATUS NvNetRemoveWakeUpPattern(

11 months

[reactos] 01/01: [DC21X4] Add driver for DECchip 21x4-compatible network adapters (#5614)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=59d8a77df6a7245654bdd… commit 59d8a77df6a7245654bdd4f31ebc5825282411bf Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Wed Oct 18 23:12:36 2023 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 18 20:12:36 2023 +0300 [DC21X4] Add driver for DECchip 21x4-compatible network adapters (#5614) These adapters were common in DEC Alpha boxes and they are really rare nowadays. The 21140 chip is emulated in Connectix / Microsoft Virtual PC and Hyper-V Gen 1 VM. This is an experimental driver, not yet tested on real hardware. CORE-8724 --- boot/bootdata/packages/reactos.dff.in | 2 - drivers/network/dd/CMakeLists.txt | 1 + drivers/network/dd/dc21x4/CMakeLists.txt | 40 + drivers/network/dd/dc21x4/dc21x4.c | 401 ++++++++ drivers/network/dd/dc21x4/dc21x4.h | 541 +++++++++++ drivers/network/dd/dc21x4/dc21x4.rc | 5 + drivers/network/dd/dc21x4/dc21x4hw.h | 597 ++++++++++++ drivers/network/dd/dc21x4/debug.c | 70 ++ drivers/network/dd/dc21x4/debug.h | 96 ++ drivers/network/dd/dc21x4/eeprom.c | 1525 ++++++++++++++++++++++++++++++ drivers/network/dd/dc21x4/eeprom.h | 108 +++ drivers/network/dd/dc21x4/eeprom_data.c | 219 +++++ drivers/network/dd/dc21x4/hardware.c | 585 ++++++++++++ drivers/network/dd/dc21x4/init.c | 1321 ++++++++++++++++++++++++++ drivers/network/dd/dc21x4/interrupt.c | 625 ++++++++++++ drivers/network/dd/dc21x4/media.c | 634 +++++++++++++ drivers/network/dd/dc21x4/media.h | 127 +++ drivers/network/dd/dc21x4/media040.c | 143 +++ drivers/network/dd/dc21x4/media041.c | 222 +++++ drivers/network/dd/dc21x4/media140.c | 136 +++ drivers/network/dd/dc21x4/media143.c | 510 ++++++++++ drivers/network/dd/dc21x4/net21x4.inf | 158 ++++ drivers/network/dd/dc21x4/phy.c | 263 ++++++ drivers/network/dd/dc21x4/power.c | 252 +++++ drivers/network/dd/dc21x4/requests.c | 660 +++++++++++++ drivers/network/dd/dc21x4/send.c | 313 ++++++ drivers/network/dd/dc21x4/sendrcv.h | 115 +++ drivers/network/dd/dc21x4/util.h | 84 ++ 28 files changed, 9751 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index dbf0737ff83..04ad4dc83a0 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -138,8 +138,6 @@ Signature = "$Windows NT$" "modules/optional/bcmwl5.sys" 3 optional "modules/optional/alcxwdm.inf" 6 optional "modules/optional/alcxwdm.sys" 3 optional -"modules/optional/net21x4.inf" 6 optional -"modules/optional/dc21x4.sys" 3 optional "modules/optional/mfc42.dll" 2 optional "modules/optional/mfc42u.dll" 2 optional "modules/optional/mfc71.dll" 2 optional diff --git a/drivers/network/dd/CMakeLists.txt b/drivers/network/dd/CMakeLists.txt index f8b967412a3..122b82823f7 100644 --- a/drivers/network/dd/CMakeLists.txt +++ b/drivers/network/dd/CMakeLists.txt @@ -1,4 +1,5 @@ +add_subdirectory(dc21x4) add_subdirectory(e1000) add_subdirectory(ne2000) add_subdirectory(netkvm) diff --git a/drivers/network/dd/dc21x4/CMakeLists.txt b/drivers/network/dd/dc21x4/CMakeLists.txt new file mode 100644 index 00000000000..74f6927076f --- /dev/null +++ b/drivers/network/dd/dc21x4/CMakeLists.txt @@ -0,0 +1,40 @@ + +add_definitions( + -DNDIS_MINIPORT_DRIVER + -DNDIS51_MINIPORT=1) + +list(APPEND SOURCE + dc21x4.c + dc21x4.h + dc21x4hw.h + debug.h + eeprom.c + eeprom.h + eeprom_data.c + hardware.c + init.c + interrupt.c + media.c + media040.c + media041.c + media140.c + media143.c + phy.c + power.c + requests.c + send.c + util.h) + +if(DBG) + list(APPEND SOURCE debug.c) +endif() + +add_library(dc21x4 MODULE ${SOURCE} dc21x4.rc) +if(DBG) + target_link_libraries(dc21x4 memcmp) +endif() +add_pch(dc21x4 dc21x4.h SOURCE) +set_module_type(dc21x4 kernelmodedriver) +add_importlibs(dc21x4 ndis ntoskrnl hal) +add_cd_file(TARGET dc21x4 DESTINATION reactos/system32/drivers FOR all) +add_driver_inf(dc21x4 net21x4.inf) diff --git a/drivers/network/dd/dc21x4/dc21x4.c b/drivers/network/dd/dc21x4/dc21x4.c new file mode 100644 index 00000000000..f061c7f5fd5 --- /dev/null +++ b/drivers/network/dd/dc21x4/dc21x4.c @@ -0,0 +1,401 @@ +/* + * PROJECT: ReactOS DC21x4 Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Miniport driver entry + * COPYRIGHT: Copyright 2023 Dmitry Borisov <di.sean(a)protonmail.com> + */ + +/* INCLUDES *******************************************************************/ + +#include "dc21x4.h" + +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +ULONG +DcEthernetCrc( + _In_reads_bytes_(Size) const VOID* Buffer, + _In_ ULONG Size) +{ + ULONG i, j, Crc; + const UCHAR* Data = Buffer; + + Crc = 0xFFFFFFFF; + for (i = 0; i < Size; ++i) + { + Crc ^= Data[i]; + for (j = 8; j > 0; j--) + { + /* CRC-32 polynomial little-endian */ + Crc = (Crc >> 1) ^ (-(LONG)(Crc & 1) & 0xEDB88320); + } + } + + return Crc; +} + +static +VOID +DcFlushTransmitQueue( + _In_ PDC21X4_ADAPTER Adapter) +{ + LIST_ENTRY DoneList; + PLIST_ENTRY Entry; + PNDIS_PACKET Packet; + PDC_TCB Tcb; + + InitializeListHead(&DoneList); + + NdisAcquireSpinLock(&Adapter->SendLock); + + /* Remove pending transmissions from the transmit ring */ + for (Tcb = Adapter->LastTcb; + Tcb != Adapter->CurrentTcb; + Tcb = DC_NEXT_TCB(Adapter, Tcb)) + { + Packet = Tcb->Packet; + + if (!Packet) + continue; + + InsertTailList(&DoneList, DC_LIST_ENTRY_FROM_PACKET(Packet)); + + DC_RELEASE_TCB(Adapter, Tcb); + } + Adapter->CurrentTcb = Tcb; + + /* Remove pending transmissions from the internal queue */ + while (!IsListEmpty(&Adapter->SendQueueList)) + { + Entry = RemoveHeadList(&Adapter->SendQueueList); + + InsertTailList(&DoneList, Entry); + } + + NdisReleaseSpinLock(&Adapter->SendLock); + + while (!IsListEmpty(&DoneList)) + { + Entry = RemoveHeadList(&DoneList); + + NdisMSendComplete(Adapter->AdapterHandle, + DC_PACKET_FROM_LIST_ENTRY(Entry), + NDIS_STATUS_FAILURE); + } +} + +static +VOID +DcStopReceivePath( + _In_ PDC21X4_ADAPTER Adapter) +{ + BOOLEAN RxStopped; + + ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); + +#if DBG + NdisAcquireSpinLock(&Adapter->ReceiveLock); + if (Adapter->RcbFree != Adapter->RcbCount) + { + INFO("RX packets: %u/%u\n", Adapter->RcbFree, Adapter->RcbCount); + } + NdisReleaseSpinLock(&Adapter->ReceiveLock); +#endif + + while (TRUE) + { + NdisAcquireSpinLock(&Adapter->ReceiveLock); + + RxStopped = (Adapter->RcbFree == Adapter->RcbCount); + + NdisReleaseSpinLock(&Adapter->ReceiveLock); + + if (RxStopped) + break; + + NdisMSleep(10); + } +} + +DECLSPEC_NOINLINE /* Called from pageable code */ +VOID +DcStopAdapter( + _In_ PDC21X4_ADAPTER Adapter, + _In_ BOOLEAN WaitForPackets) +{ + BOOLEAN TimerCancelled; + + /* Attempt to disable interrupts to complete more quickly */ + DC_WRITE(Adapter, DcCsr7_IrqMask, 0); + + /* Prevent DPCs from executing and stop accepting incoming packets */ + NdisAcquireSpinLock(&Adapter->SendLock); + Adapter->Flags &= ~DC_ACTIVE; + NdisReleaseSpinLock(&Adapter->SendLock); + + NdisMCancelTimer(&Adapter->MediaMonitorTimer, &TimerCancelled); + + /* Wait for any DPCs to complete */ + KeFlushQueuedDpcs(); + + /* Disable interrupts */ + DC_WRITE(Adapter, DcCsr7_IrqMask, 0); + + /* Wait for completion of TX/RX and stop the DMA engine inside the NIC */ + DcStopTxRxProcess(Adapter); + Adapter->OpMode &= ~(DC_OPMODE_RX_ENABLE | DC_OPMODE_TX_ENABLE); + + DcFlushTransmitQueue(Adapter); + + /* Wait for the packets to be returned to the driver */ + if (WaitForPackets) + { + DcStopReceivePath(Adapter); + } + + /* Make sure there is no pending OID request */ + if (Adapter->OidPending) + { + NdisMSetInformationComplete(Adapter->AdapterHandle, NDIS_STATUS_SUCCESS); + + Adapter->OidPending = FALSE; + } +} + +CODE_SEG("PAGE") +VOID +DcStartAdapter( + _In_ PDC21X4_ADAPTER Adapter) +{ + PAGED_CODE(); + + /* Enable interrupts */ + _InterlockedExchange((PLONG)&Adapter->CurrentInterruptMask, Adapter->InterruptMask); + DC_WRITE(Adapter, DcCsr7_IrqMask, Adapter->InterruptMask); + + Adapter->Flags |= DC_ACTIVE; + + /* Start the RX process */ + Adapter->OpMode |= DC_OPMODE_RX_ENABLE; + DC_WRITE(Adapter, DcCsr6_OpMode, Adapter->OpMode); + + /* Start the media monitor, wait the selected media to become ready */ + NdisMSetTimer(&Adapter->MediaMonitorTimer, 2400); +} + +CODE_SEG("PAGE") +VOID +NTAPI +DcResetWorker( + _In_ PNDIS_WORK_ITEM WorkItem, + _In_opt_ PVOID Context) +{ + PDC21X4_ADAPTER Adapter = Context; + NDIS_STATUS Status; + ULONG InterruptStatus; + LONG ResetReason; + + UNREFERENCED_PARAMETER(WorkItem); + + PAGED_CODE(); + + Status = NDIS_STATUS_SUCCESS; + + /* Check if the device is present */ + InterruptStatus = DC_READ(Adapter, DcCsr5_Status); + if (InterruptStatus == 0xFFFFFFFF) + { + ERR("Hardware is gone...\n"); + + /* Remove this adapter */ + NdisMRemoveMiniport(Adapter->AdapterHandle); + + Status = NDIS_STATUS_HARD_ERRORS; + goto Done; + } + + DcStopAdapter(Adapter, FALSE); + + if (Adapter->LinkUp) + { + Adapter->LinkUp = FALSE; + + NdisMIndicateStatus(Adapter->AdapterHandle, + NDIS_STATUS_MEDIA_DISCONNECT, + NULL, + 0); + NdisMIndicateStatusComplete(Adapter->AdapterHandle); + } + + DcSetupAdapter(Adapter); + + DcStartAdapter(Adapter); + +Done: + ResetReason = _InterlockedExchange(&Adapter->ResetLock, 0); + + /* Complete the pending reset request */ + if (ResetReason == 1) + { + NdisMResetComplete(Adapter->AdapterHandle, Status, FALSE); + } +} + +VOID +NTAPI +DcTransmitTimeoutRecoveryWorker( + _In_ PNDIS_WORK_ITEM WorkItem, + _In_opt_ PVOID Context) +{ + PDC21X4_ADAPTER Adapter = Context; + + UNREFERENCED_PARAMETER(WorkItem); + + NdisAcquireSpinLock(&Adapter->ModeLock); + + DcStopTxRxProcess(Adapter); + DC_WRITE(Adapter, DcCsr6_OpMode, Adapter->OpMode); + + NdisDprAcquireSpinLock(&Adapter->SendLock); + + DC_WRITE(Adapter, DcCsr1_TxPoll, DC_TX_POLL_DOORBELL); + + NdisDprReleaseSpinLock(&Adapter->SendLock); + + NdisReleaseSpinLock(&Adapter->ModeLock); +} + +static +BOOLEAN +NTAPI +DcCheckForHang( + _In_ NDIS_HANDLE MiniportAdapterContext) +{ + PDC21X4_ADAPTER Adapter = (PDC21X4_ADAPTER)MiniportAdapterContext; + ULONG TcbCompleted; + BOOLEAN TxHang = FALSE; + + if (!(Adapter->Flags & DC_ACTIVE)) + return FALSE; + + NdisDprAcquireSpinLock(&Adapter->SendLock); + + if (Adapter->TcbSlots != (DC_TRANSMIT_BLOCKS - DC_TCB_RESERVE)) + { + TcbCompleted = Adapter->TcbCompleted; + TxHang = (TcbCompleted == Adapter->LastTcbCompleted); + Adapter->LastTcbCompleted = TcbCompleted; + } + + NdisDprReleaseSpinLock(&Adapter->SendLock); + + if (TxHang) + { + WARN("Transmit timeout, CSR12 %08lx, CSR5 %08lx\n", + DC_READ(Adapter, DcCsr12_SiaStatus), + DC_READ(Adapter, DcCsr5_Status)); + + NdisScheduleWorkItem(&Adapter->TxRecoveryWorkItem); + } + + return FALSE; +} + +static +NDIS_STATUS +NTAPI +DcReset( + _Out_ PBOOLEAN AddressingReset, + _In_ NDIS_HANDLE MiniportAdapterContext) +{ + PDC21X4_ADAPTER Adapter = (PDC21X4_ADAPTER)MiniportAdapterContext; + + WARN("Called\n"); + + if (_InterlockedCompareExchange(&Adapter->ResetLock, 1, 0)) + { + return NDIS_STATUS_RESET_IN_PROGRESS; + } + + NdisScheduleWorkItem(&Adapter->ResetWorkItem); + + return NDIS_STATUS_PENDING; +} + +static +CODE_SEG("PAGE") +VOID +NTAPI +DcHalt( + _In_ NDIS_HANDLE MiniportAdapterContext) +{ + PDC21X4_ADAPTER Adapter = (PDC21X4_ADAPTER)MiniportAdapterContext; + + PAGED_CODE(); + + INFO("Called\n"); + + DcStopAdapter(Adapter, TRUE); + + DcDisableHw(Adapter); + + DcFreeAdapter(Adapter); +} + +static +VOID +NTAPI +DcShutdown( + _In_ NDIS_HANDLE MiniportAdapterContext) +{ + PDC21X4_ADAPTER Adapter = (PDC21X4_ADAPTER)MiniportAdapterContext; + + INFO("Called\n"); + + DcDisableHw(Adapter); +} + +CODE_SEG("INIT") +NTSTATUS +NTAPI +DriverEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath) +{ + NDIS_HANDLE WrapperHandle; + NDIS_STATUS Status; + NDIS_MINIPORT_CHARACTERISTICS Characteristics = { 0 }; + + INFO("Called\n"); + + NdisMInitializeWrapper(&WrapperHandle, DriverObject, RegistryPath, NULL); + if (!WrapperHandle) + return NDIS_STATUS_FAILURE; + + Characteristics.MajorNdisVersion = NDIS_MINIPORT_MAJOR_VERSION; + Characteristics.MinorNdisVersion = NDIS_MINIPORT_MINOR_VERSION; + Characteristics.CheckForHangHandler = DcCheckForHang; + Characteristics.HaltHandler = DcHalt; + Characteristics.HandleInterruptHandler = DcHandleInterrupt; + Characteristics.InitializeHandler = DcInitialize; + Characteristics.ISRHandler = DcIsr; + Characteristics.QueryInformationHandler = DcQueryInformation; + Characteristics.ResetHandler = DcReset; + Characteristics.SetInformationHandler = DcSetInformation; + Characteristics.ReturnPacketHandler = DcReturnPacket; + Characteristics.SendPacketsHandler = DcSendPackets; + Characteristics.CancelSendPacketsHandler = DcCancelSendPackets; + Characteristics.AdapterShutdownHandler = DcShutdown; + + Status = NdisMRegisterMiniport(WrapperHandle, &Characteristics, sizeof(Characteristics)); + if (Status != NDIS_STATUS_SUCCESS) + { + NdisTerminateWrapper(WrapperHandle, NULL); + return Status; + } + + InitializeListHead(&SRompAdapterList); + + return NDIS_STATUS_SUCCESS; +} diff --git a/drivers/network/dd/dc21x4/dc21x4.h b/drivers/network/dd/dc21x4/dc21x4.h new file mode 100644 index 00000000000..20d62fc15ae --- /dev/null +++ b/drivers/network/dd/dc21x4/dc21x4.h @@ -0,0 +1,541 @@ +/* + * PROJECT: ReactOS DC21x4 Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Main header file + * COPYRIGHT: Copyright 2023 Dmitry Borisov <di.sean(a)protonmail.com> + */ + +#pragma once + +#if !DBG +#define NO_KERNEL_LIST_ENTRY_CHECKS +#endif +#include <ndis.h> +#include <section_attribs.h> + +#include "dc21x4hw.h" +#include "eeprom.h" +#include "media.h" +#include "util.h" + +#define DC21X4_TAG '4x12' + +#define DC_TRANSMIT_DESCRIPTORS 64 +#define DC_TRANSMIT_BLOCKS 48 +#define DC_TRANSMIT_BUFFERS 4 +#define DC_LOOPBACK_FRAMES 4 + +#define DC_RECEIVE_BUFFERS_DEFAULT 64 +#define DC_RECEIVE_BUFFERS_MIN 8 +#define DC_RECEIVE_BUFFERS_EXTRA 16 + +#define DC_RECEIVE_ARRAY_SIZE 16 + +#define DC_MULTICAST_LIST_SIZE 36 + +#define DC_MAXIMUM_FRAME_SIZE 1514 +#define DC_TRANSMIT_BLOCK_SIZE 1536 +#define DC_RECEIVE_BLOCK_SIZE 1536 +#define DC_ETHERNET_HEADER_SIZE 14 + +#define DC_TX_UNDERRUN_LIMIT 5 +#define DC_INTERRUPT_PROCESSING_LIMIT 8 + +#define DC_FRAGMENTATION_THRESHOLD 32 + +#define DC_PACKET_FILTERS ( \ + NDIS_PACKET_TYPE_DIRECTED | \ + NDIS_PACKET_TYPE_MULTICAST | \ + NDIS_PACKET_TYPE_BROADCAST | \ + NDIS_PACKET_TYPE_PROMISCUOUS | \ + NDIS_PACKET_TYPE_ALL_MULTICAST) + +#define DC_LOOPBACK_FRAME_SIZE 64 + +/* Transmit descriptors reserved for internal use */ +#define DC_TBD_RESERVE (2 + DC_LOOPBACK_FRAMES) /* (+2 for setup frame) */ +#define DC_TCB_RESERVE (1 + DC_LOOPBACK_FRAMES) /* (+1 for setup frame) */ + +#define DC_EVENT_SETUP_FRAME_COMPLETED 0x00000001 + +typedef struct _DC21X4_ADAPTER DC21X4_ADAPTER, *PDC21X4_ADAPTER; +typedef struct _DC_TCB DC_TCB, *PDC_TCB; +typedef struct _DC_RCB DC_RCB, *PDC_RCB; +typedef struct _DC_COALESCE_BUFFER DC_COALESCE_BUFFER, *PDC_COALESCE_BUFFER; + +typedef VOID +(MEDIA_HANDLE_LINK_STATE_CHANGE)( + _In_ PDC21X4_ADAPTER Adapter, + _In_ ULONG InterruptStatus); +typedef MEDIA_HANDLE_LINK_STATE_CHANGE *PMEDIA_HANDLE_LINK_STATE_CHANGE; + +typedef struct _DC_TX_BUFFER_DATA +{ + PVOID VirtualAddress; + NDIS_PHYSICAL_ADDRESS PhysicalAddress; +} DC_TX_BUFFER_DATA, *PDC_TX_BUFFER_DATA; + +typedef struct _DC_STATISTICS +{ + ULONG64 TransmitOk; + ULONG64 TransmitDeferred; + ULONG64 TransmitHeartbeatErrors; + ULONG64 TransmitOneRetry; + ULONG64 TransmitMoreCollisions; + ULONG64 TransmitErrors; + ULONG64 TransmitExcessiveCollisions; + ULONG64 TransmitUnderrunErrors; + ULONG64 TransmitLostCarrierSense; + ULONG64 TransmitLateCollisions; + ULONG64 ReceiveOk; + ULONG64 ReceiveBroadcast; + ULONG64 ReceiveMulticast; + ULONG64 ReceiveUnicast; + ULONG64 ReceiveErrors; + ULONG64 ReceiveOverrunErrors; + ULONG64 ReceiveNoBuffers; + ULONG64 ReceiveCrcErrors; + ULONG64 ReceiveAlignmentErrors; +} DC_STATISTICS, *PDC_STATISTICS; + +typedef struct _DC21X4_ADAPTER +{ + PUCHAR IoBase; + ULONG InterruptMask; + ULONG CurrentInterruptMask; + + ULONG Features; +#define DC_NEED_RX_OVERFLOW_WORKAROUND 0x80000000 +#define DC_SIA_GPIO 0x00000001 +#define DC_SIA_ANALOG_CONTROL 0x00000002 +#define DC_HAS_POWER_MANAGEMENT 0x00000004 +#define DC_HAS_POWER_SAVING 0x00000008 +#define DC_HAS_MII 0x00000010 +#define DC_PERFECT_FILTERING_ONLY 0x00000020 +#define DC_ENABLE_PCI_COMMANDS 0x00000040 +#define DC_MII_AUTOSENSE 0x00000080 +#define DC_HAS_TIMER 0x00000100 + + ULONG Flags; +#define DC_ACTIVE 0x80000000 +#define DC_IO_MAPPED 0x00000001 +#define DC_IRQ_SHARED 0x00000002 +#define DC_FIRST_SETUP 0x00000004 +#define DC_AUTOSENSE 0x00000008 + + ULONG InterruptStatus; + PMEDIA_HANDLE_LINK_STATE_CHANGE HandleLinkStateChange; + + DECLSPEC_CACHEALIGN NDIS_SPIN_LOCK SendLock; + PDC_TCB TailTcb; + PDC_TCB LastTcb; + PDC_TCB CurrentTcb; + PDC_TBD CurrentTbd; + PDC_TBD HeadTbd; + PDC_TBD TailTbd; + LIST_ENTRY SendQueueList; + ULONG TcbSlots; + ULONG TbdSlots; + ULONG TcbCompleted; + ULONG LastTcbCompleted; + PDC_TCB HeadTcb; + SINGLE_LIST_ENTRY SendBufferList; + SCATTER_GATHER_LIST LocalSgList; + + DECLSPEC_CACHEALIGN NDIS_SPIN_LOCK ReceiveLock; + PDC_RCB* RcbArray; + PDC_RBD CurrentRbd; + PDC_RBD HeadRbd; + PDC_RBD TailRbd; + SINGLE_LIST_ENTRY FreeRcbList; + ULONG RcbFree; + + ULONG TransmitUnderruns; + ULONG PacketFilter; + + DC_STATISTICS Statistics; + + NDIS_HANDLE AdapterHandle; + NDIS_HANDLE WrapperConfigurationHandle; + + DECLSPEC_CACHEALIGN NDIS_SPIN_LOCK ModeLock; + ULONG ModeFlags; +#define DC_MODE_AUTONEG_MASK 0x0000000F +#define DC_MODE_PORT_AUTOSENSE 0x00000010 +#define DC_MODE_TEST_PACKET 0x00000020 +#define DC_MODE_AUI_FAILED 0x00000040 +#define DC_MODE_BNC_FAILED 0x00000080 + +#define DC_MODE_AUTONEG_NONE 0x00000000 +#define DC_MODE_AUTONEG_WAIT_INTERRUPT 0x00000001 +#define DC_MODE_AUTONEG_LINK_STATUS_CHECK 0x00000002 + + ULONG OpMode; + ULONG MediaNumber; + ULONG MediaBitmap; + BOOLEAN LinkUp; + ULONG PhyAddress; + ULONG SiaSetting; + ULONG LastReceiveActivity; + volatile LONG MediaTestStatus; + NDIS_MINIPORT_TIMER MediaMonitorTimer; + DC_MII_MEDIA MiiMedia; + DC_MEDIA Media[MEDIA_LIST_MAX]; + + ULONG AnalogControl; + ULONG SymAdvertising; + ULONG MiiAdvertising; + ULONG MiiControl; + DC_CHIP_TYPE ChipType; + ULONG LinkStateChangeMask; + + ULONG WakeUpFlags; + NDIS_DEVICE_POWER_STATE PowerState; + NDIS_DEVICE_POWER_STATE PrevPowerState; + + ULONG HpnaInitBitmap; + UCHAR HpnaRegister[32]; + + UCHAR PermanentMacAddress[ETH_LENGTH_OF_ADDRESS]; + UCHAR CurrentMacAddress[ETH_LENGTH_OF_ADDRESS]; + + ULONG MulticastMaxEntries; + _Field_range_(0, MulticastMaxEntries) + ULONG MulticastCount; + struct + { + UCHAR MacAddress[ETH_LENGTH_OF_ADDRESS]; + } MulticastList[DC_MULTICAST_LIST_SIZE]; + + ULONG LinkSpeedMbps; + ULONG BusMode; + ULONG DefaultMedia; + ULONG RcbCount; + BOOLEAN OidPending; + BOOLEAN ProgramHashPerfectFilter; + PULONG SetupFrame; + PULONG SetupFrameSaved; + ULONG SetupFramePhys; + ULONG LoopbackFrameSlots; + ULONG LoopbackFrameNumber; + ULONG LoopbackFramePhys[DC_LOOPBACK_FRAMES]; + ULONG BusNumber; + UCHAR DeviceNumber; + UCHAR RevisionId; + UCHAR ControllerIndex; + UCHAR ResetStreamLength; + USHORT ResetStream[SROM_MAX_STREAM_REGS]; + USHORT DeviceId; + SINGLE_LIST_ENTRY AllocRcbList; + SINGLE_LIST_ENTRY UsedRcbList; + NDIS_MINIPORT_INTERRUPT Interrupt; + ULONG InterruptVector; + ULONG InterruptLevel; + ULONG InterruptFlags; + ULONG AdapterSize; + NDIS_WORK_ITEM PowerWorkItem; + NDIS_WORK_ITEM ResetWorkItem; + NDIS_WORK_ITEM TxRecoveryWorkItem; + _Interlocked_ volatile LONG ResetLock; + NDIS_PHYSICAL_ADDRESS IoBaseAddress; + PDC_SROM_ENTRY SRomEntry; + PVOID AdapterOriginal; + PVOID TbdOriginal; + PVOID RbdOriginal; + ULONG TbdPhys; + ULONG RbdPhys; + NDIS_HANDLE BufferPool; + NDIS_HANDLE PacketPool; + NDIS_PHYSICAL_ADDRESS TbdPhysOriginal; + NDIS_PHYSICAL_ADDRESS RbdPhysOriginal; + PVOID LoopbackFrame[DC_LOOPBACK_FRAMES]; + PDC_COALESCE_BUFFER CoalesceBuffer; + DC_TX_BUFFER_DATA SendBufferData[DC_TRANSMIT_BUFFERS]; +} DC21X4_ADAPTER, *PDC21X4_ADAPTER; + +#include "sendrcv.h" + +extern LIST_ENTRY SRompAdapterList; + +FORCEINLINE +ULONG +DC_READ( + _In_ PDC21X4_ADAPTER Adapter, + _In_ DC_CSR Register) +{ + ULONG Value; + + NdisRawReadPortUlong((PULONG)(Adapter->IoBase + Register), &Value); + return Value; +} + +#define DC_WRITE(Adapter, Register, Value) \ + NdisRawWritePortUlong((PULONG)((Adapter)->IoBase + (Register)), (Value)); + +CODE_SEG("INIT") +DRIVER_INITIALIZE DriverEntry; + +CODE_SEG("PAGE") +NDIS_STATUS +NTAPI +DcInitialize( + _Out_ PNDIS_STATUS OpenErrorStatus, + _Out_ PUINT SelectedMediumIndex, + _In_ PNDIS_MEDIUM MediumArray, + _In_ UINT MediumArraySize, + _In_ NDIS_HANDLE MiniportAdapterHandle, + _In_ NDIS_HANDLE WrapperConfigurationContext); + +VOID +NTAPI +DcSendPackets( + _In_ NDIS_HANDLE MiniportAdapterContext, + _In_ PPNDIS_PACKET PacketArray, + _In_ UINT NumberOfPackets); + +VOID +NTAPI +DcCancelSendPackets( + _In_ NDIS_HANDLE MiniportAdapterContext, + _In_ PVOID CancelId); + +VOID +DcProcessPendingPackets( + _In_ PDC21X4_ADAPTER Adapter); + +VOID +NTAPI +DcReturnPacket( + _In_ NDIS_HANDLE MiniportAdapterContext, + _In_ PNDIS_PACKET Packet); + +NDIS_STATUS +NTAPI +DcQueryInformation( + _In_ NDIS_HANDLE MiniportAdapterContext, + _In_ NDIS_OID Oid, + _In_ PVOID InformationBuffer, + _In_ ULONG InformationBufferLength, + _Out_ PULONG BytesWritten, + _Out_ PULONG BytesNeeded); + +NDIS_STATUS +NTAPI +DcSetInformation( + _In_ NDIS_HANDLE MiniportAdapterContext, + _In_ NDIS_OID Oid, + _In_ PVOID InformationBuffer, + _In_ ULONG InformationBufferLength, + _Out_ PULONG BytesRead, + _Out_ PULONG BytesNeeded); + +VOID +NTAPI +DcIsr( + _Out_ PBOOLEAN InterruptRecognized, + _Out_ PBOOLEAN QueueMiniportHandleInterrupt, + _In_ NDIS_HANDLE MiniportAdapterContext); + +VOID +NTAPI +DcHandleInterrupt( + _In_ NDIS_HANDLE MiniportAdapterContext); + +CODE_SEG("PAGE") +VOID +NTAPI +DcPowerWorker( + _In_ PNDIS_WORK_ITEM WorkItem, + _In_opt_ PVOID Context); + +NDIS_STATUS +DcSetPower( + _In_ PDC21X4_ADAPTER Adapter, + _In_ NDIS_DEVICE_POWER_STATE PowerState); + +NDIS_STATUS +DcAddWakeUpPattern( + _In_ PDC21X4_ADAPTER Adapter, + _In_ PNDIS_PM_PACKET_PATTERN PmPattern); + +NDIS_STATUS +DcRemoveWakeUpPattern( + _In_ PDC21X4_ADAPTER Adapter, + _In_ PNDIS_PM_PACKET_PATTERN PmPattern); + +CODE_SEG("PAGE") +VOID +DcFreeAdapter( + _In_ __drv_freesMem(Mem) PDC21X4_ADAPTER Adapter); + +CODE_SEG("PAGE") +VOID +NTAPI +DcResetWorker( + _In_ PNDIS_WORK_ITEM WorkItem, + _In_opt_ PVOID Context); + +DECLSPEC_NOINLINE +VOID +DcStopAdapter( + _In_ PDC21X4_ADAPTER Adapter, + _In_ BOOLEAN WaitForPackets); + +CODE_SEG("PAGE") +VOID +DcStartAdapter( + _In_ PDC21X4_ADAPTER Adapter); + +CODE_SEG("PAGE") +NDIS_STATUS +DcSetupAdapter( + _In_ PDC21X4_ADAPTER Adapter); + +CODE_SEG("PAGE") +NDIS_STATUS +DcReadEeprom( + _In_ PDC21X4_ADAPTER Adapter); + +CODE_SEG("PAGE") +VOID +DcFreeEeprom( + _In_ PDC21X4_ADAPTER Adapter); + +CODE_SEG("PAGE") +VOID +DcInitTxRing( + _In_ PDC21X4_ADAPTER Adapter); + +CODE_SEG("PAGE") +VOID +DcInitRxRing( + _In_ PDC21X4_ADAPTER Adapter); + +ULONG +DcEthernetCrc( + _In_reads_bytes_(Size) const VOID* Buffer, + _In_ ULONG Size); + +VOID +DcDisableHw( + _In_ PDC21X4_ADAPTER Adapter); + +VOID +DcStopTxRxProcess( + _In_ PDC21X4_ADAPTER Adapter); + +VOID +DcWriteGpio( + _In_ PDC21X4_ADAPTER Adapter, + _In_ ULONG Value); + +VOID +DcWriteSia( + _In_ PDC21X4_ADAPTER Adapter, + _In_ ULONG Csr13, + _In_ ULONG Csr14, + _In_ ULONG Csr15); + +VOID +DcTestPacket( + _In_ PDC21X4_ADAPTER Adapter); + +CODE_SEG("PAGE") +VOID +DcSetupFrameInitialize( + _In_ PDC21X4_ADAPTER Adapter); + +BOOLEAN +DcSetupFrameDownload( + _In_ PDC21X4_ADAPTER Adapter, + _In_ BOOLEAN WaitForCompletion); + +NDIS_STATUS +DcApplyPacketFilter( + _In_ PDC21X4_ADAPTER Adapter, + _In_ ULONG PacketFilter); + +NDIS_STATUS +DcUpdateMulticastList( + _In_ PDC21X4_ADAPTER Adapter); + +VOID +DcPowerSave( + _In_ PDC21X4_ADAPTER Adapter, + _In_ BOOLEAN Enable); + +CODE_SEG("PAGE") +BOOLEAN +DcFindMiiPhy( + _In_ PDC21X4_ADAPTER Adapter); + +BOOLEAN +MiiWrite( + _In_ PDC21X4_ADAPTER Adapter, + _In_ ULONG PhyAddress, + _In_ ULONG RegAddress, + _In_ ULONG Data); + +BOOLEAN +MiiRead( + _In_ PDC21X4_ADAPTER Adapter, + _In_ ULONG PhyAddress, + _In_ ULONG RegAddress, + _Out_ PULONG Data); + +CODE_SEG("PAGE") +VOID +HpnaPhyInit( + _In_ PDC21X4_ADAPTER Adapter); + +VOID +NTAPI +DcTransmitTimeoutRecoveryWorker( + _In_ PNDIS_WORK_ITEM WorkItem, + _In_opt_ PVOID Context); + +NDIS_TIMER_FUNCTION MediaMonitor21040Dpc; +NDIS_TIMER_FUNCTION MediaMonitor21041Dpc; +NDIS_TIMER_FUNCTION MediaMonitor21140Dpc; +NDIS_TIMER_FUNCTION MediaMonitor21143Dpc; + +MEDIA_HANDLE_LINK_STATE_CHANGE MediaLinkStateChange21040; +MEDIA_HANDLE_LINK_STATE_CHANGE MediaLinkStateChange21041; +MEDIA_HANDLE_LINK_STATE_CHANGE MediaLinkStateChange21143; + +CODE_SEG("PAGE") +VOID +MediaInitMediaList( + _In_ PDC21X4_ADAPTER Adapter); + +CODE_SEG("PAGE") +VOID +MediaInitDefaultMedia( + _In_ PDC21X4_ADAPTER Adapter, + _In_ ULONG MediaNumber); + +VOID +MediaIndicateConnect( + _In_ PDC21X4_ADAPTER Adapter, + _In_ BOOLEAN LinkUp); + +VOID +MediaSelectMiiPort( + _In_ PDC21X4_ADAPTER Adapter, + _In_ BOOLEAN ResetPhy); + +VOID +MediaMiiSelect( + _In_ PDC21X4_ADAPTER Adapter); + +BOOLEAN +MediaMiiCheckLink( + _In_ PDC21X4_ADAPTER Adapter); + +VOID +MediaSiaSelect( + _In_ PDC21X4_ADAPTER Adapter); + +VOID +MediaGprSelect( + _In_ PDC21X4_ADAPTER Adapter); diff --git a/drivers/network/dd/dc21x4/dc21x4.rc b/drivers/network/dd/dc21x4/dc21x4.rc new file mode 100644 index 00000000000..1ecd5c02f7d --- /dev/null +++ b/drivers/network/dd/dc21x4/dc21x4.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "DC21x4 Ethernet Adapter Driver" +#define REACTOS_STR_INTERNAL_NAME "dc21x4" +#define REACTOS_STR_ORIGINAL_FILENAME "dc21x4.sys" +#include <reactos/version.rc> diff --git a/drivers/network/dd/dc21x4/dc21x4hw.h b/drivers/network/dd/dc21x4/dc21x4hw.h new file mode 100644 index 00000000000..fc53adc1b9d --- /dev/null +++ b/drivers/network/dd/dc21x4/dc21x4hw.h @@ -0,0 +1,597 @@ +/* + * PROJECT: ReactOS DC21x4 Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hardware specific definitions + * COPYRIGHT: Copyright 2023 Dmitry Borisov <di.sean(a)protonmail.com> + */ + +#pragma once + +typedef enum _DC_CHIP_TYPE +{ + DC21040, + DC21041, + DC21140, + DC21143, + DC21145, +} DC_CHIP_TYPE; + +/* + * PCI Vendor and Device IDs + */ +#define DC_DEV_DECCHIP_21040 0x00021011 +#define DC_DEV_DECCHIP_21041 0x00141011 +#define DC_DEV_DECCHIP_21140 0x00091011 +#define DC_DEV_INTEL_21143 0x00191011 +#define DC_DEV_INTEL_21145 0x00398086 + +#define DC_DESCRIPTOR_ALIGNMENT 4 +#define DC_SETUP_FRAME_ALIGNMENT 4 +#define DC_RECEIVE_BUFFER_ALIGNMENT 4 +#define DC_RECEIVE_BUFFER_SIZE_MULTIPLE 4 + +#define DC_IO_LENGTH 128 + +#define DC_SETUP_FRAME_SIZE 192 + +/* Multicast perfect filter */ +#define DC_SETUP_FRAME_PERFECT_FILTER_ADDRESSES 16 + +/* -1 for physical address and -1 for broadcast address */ +#define DC_SETUP_FRAME_ADDRESSES (16 - 2) + +/* Computed hash of FF:FF:FF:FF:FF:FF */ +#define DC_SETUP_FRAME_BROADCAST_HASH 0xFF + +#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) +#define DC_SETUP_FRAME_ENTRY(Value) (Value) +#else +#define DC_SETUP_FRAME_ENTRY(Value) ((Value) << 16) +#endif + +#include <pshpack1.h> + +/* + * Transmit Buffer Descriptor + */ +typedef struct _DC_TBD +{ + ULONG Status; +#define DC_TBD_STATUS_DEFFERED 0x00000001 +#define DC_TBD_STATUS_UNDERFLOW 0x00000002 +#define DC_TBD_STATUS_LINK_FAIL 0x00000004 +#define DC_TBD_STATUS_COLLISIONS_MASK 0x00000078 +#define DC_TBD_STATUS_HEARTBEAT_FAIL 0x00000080 +#define DC_TBD_STATUS_RETRY_ERROR 0x00000100 +#define DC_TBD_STATUS_LATE_COLLISION 0x00000200 +#define DC_TBD_STATUS_NO_CARRIER 0x00000400 +#define DC_TBD_STATUS_CARRIER_LOST 0x00000800 +#define DC_TBD_STATUS_JABBER_TIMEOUT 0x00004000 +#define DC_TBD_STATUS_ERROR_SUMMARY 0x00008000 +#define DC_TBD_STATUS_OWNED 0x80000000 + +#define DC_TBD_STATUS_SETUP_FRAME 0x7FFFFFFF + +#define DC_TBD_STATUS_COLLISIONS_SHIFT 3 + + ULONG Control; +#define DC_TBD_CONTROL_LENGTH_MASK_1 0x000007FF +#define DC_TBD_CONTROL_LENGTH_MASK_2 0x003FF800 +#define DC_TBD_CONTROL_NO_PAD 0x00800000 +#define DC_TBD_CONTROL_CHAINED 0x01000000 +#define DC_TBD_CONTROL_END_OF_RING 0x02000000 +#define DC_TBD_CONTROL_NO_CRC 0x04000000 +#define DC_TBD_CONTROL_SETUP_FRAME 0x08000000 +#define DC_TBD_CONTROL_FIRST_FRAGMENT 0x20000000 +#define DC_TBD_CONTROL_LAST_FRAGMENT 0x40000000 +#define DC_TBD_CONTROL_REQUEST_INTERRUPT 0x80000000 +#define DC_TBD_CONTROL_PERFECT_FILTER 0x00000000 +#define DC_TBD_CONTROL_HASH_PERFECT_FILTER 0x00400000 +#define DC_TBD_CONTROL_INVERSE_FILTER 0x10000000 +#define DC_TBD_CONTROL_IMPERFECT_FILTER 0x10400000 + +#define DC_TBD_CONTROL_LENGTH_2_SHIFT 11 + + ULONG Address1; + ULONG Address2; +} DC_TBD, *PDC_TBD; + +C_ASSERT(sizeof(DC_TBD) == 16); + +/* + * Receive Buffer Descriptor + */ +typedef struct _DC_RBD +{ + ULONG Status; +#define DC_RBD_STATUS_OVERRUN 0x00000001 +#define DC_RBD_STATUS_CRC_ERROR 0x00000002 +#define DC_RBD_STATUS_DRIBBLE 0x00000004 +#define DC_RBD_STATUS_MII_ERROR 0x00000008 +#define DC_RBD_STATUS_WDT_EXPIRED 0x00000010 +#define DC_RBD_STATUS_FRAME_TYPE 0x00000020 +#define DC_RBD_STATUS_COLLISION_SEEN 0x00000040 +#define DC_RBD_STATUS_TOO_LONG 0x00000080 +#define DC_RBD_STATUS_LAST_DESCRIPTOR 0x00000100 +#define DC_RBD_STATUS_FIRST_DESCRIPTOR 0x00000200 +#define DC_RBD_STATUS_MULTICAST 0x00000400 +#define DC_RBD_STATUS_RUNT 0x00000800 +#define DC_RBD_STATUS_DATA_TYPE_MASK 0x00003000 +#define DC_RBD_STATUS_LENGTH_ERROR 0x00004000 +#define DC_RBD_STATUS_ERROR_SUMMARY 0x00008000 +#define DC_RBD_STATUS_FRAME_LENGTH_MASK 0x3FFF0000 +#define DC_RBD_STATUS_FILTERING_FAIL 0x40000000 +#define DC_RBD_STATUS_OWNED 0x80000000 + +#define DC_RBD_STATUS_FRAME_LENGTH_SHIFT 16 + + ULONG Control; +#define DC_RBD_CONTROL_BUFFER_LENGTH_MASK_1 0x000007FF +#define DC_RBD_CONTROL_BUFFER_LENGTH_MASK_2 0x003FF800 +#define DC_RBD_CONTROL_CHAINED 0x01000000 +#define DC_RBD_CONTROL_END_OF_RING 0x02000000 + + ULONG Address1; + ULONG Address2; +} DC_RBD, *PDC_RBD; + +C_ASSERT(sizeof(DC_RBD) == 16); + +#define DC_PATTERN_FILTERS 4 + +/* + * Wake-Up Filter Register Block + */ +typedef union _DC_PATTERN_FILTER_BLOCK +{ + struct + { + ULONG Mask[DC_PATTERN_FILTERS]; + + UCHAR Command[DC_PATTERN_FILTERS]; +#define DC_PATTERN_FILTER_CMD_ENABLE 0x01 +#define DC_PATTERN_FILTER_CMD_INVERSE_MODE 0x02 +#define DC_PATTERN_FILTER_CMD_ADD_PREV 0x04 +#define DC_PATTERN_FILTER_CMD_MULTICAST 0x08 + + UCHAR Offset[DC_PATTERN_FILTERS]; + USHORT Crc[DC_PATTERN_FILTERS]; + }; + ULONG AsULONG[8]; +} DC_PATTERN_FILTER_BLOCK, *PDC_PATTERN_FILTER_BLOCK; + +C_ASSERT(sizeof(DC_PATTERN_FILTER_BLOCK) == 32); + +#include <poppack.h> + +/* + * NIC Control and Status Registers + */ +typedef enum _DC_CSR +{ + DcCsr0_BusMode = 0x00, + DcCsr1_TxPoll = 0x08, + DcCsr1_WakeUpFilter = 0x08, + DcCsr2_RxPoll = 0x10, + DcCsr2_WakeUpControl = 0x10, + DcCsr3_RxRingAddress = 0x18, + DcCsr4_TxRingAddress = 0x20, + DcCsr5_Status = 0x28, + DcCsr6_OpMode = 0x30, + DcCsr7_IrqMask = 0x38, + DcCsr8_RxCounters = 0x40, + DcCsr9_SerialInterface = 0x48, + DcCsr10_BootRom = 0x50, + DcCsr11_FullDuplex = 0x58, + DcCsr11_Timer = 0x58, + DcCsr12_Gpio = 0x60, + DcCsr12_SiaStatus = 0x60, + DcCsr13_SiaConnectivity = 0x68, + DcCsr14_SiaTxRx = 0x70, + DcCsr15_SiaGeneral = 0x78, +} DC_CSR; + +/* + * CSR0 Bus Mode + */ +#define DC_BUS_MODE_SOFT_RESET 0x00000001 +#define DC_BUS_MODE_BUS_ARB 0x00000002 +#define DC_BUS_MODE_DESC_SKIP_LENGTH_MASK 0x0000007C +#define DC_BUS_MODE_BUFFERS_BIG_ENDIAN 0x00000080 +#define DC_BUS_MODE_BURST_LENGTH_MASK 0x00003F00 +#define DC_BUS_MODE_CACHE_ALIGNMENT_MASK 0x0000C000 +#define DC_BUS_MODE_DIAGNOSTIC_ADDRESS_SPACE 0x00010000 +#define DC_BUS_MODE_TX_POLL_MASK 0x000E0000 +#define DC_BUS_MODE_DESC_BIG_ENDIAN 0x00100000 +#define DC_BUS_MODE_READ_MULTIPLE 0x00200000 +#define DC_BUS_MODE_READ_LINE 0x00800000 +#define DC_BUS_MODE_WRITE_INVALIDATE 0x01000000 +#define DC_BUS_MODE_ON_NOW_UNLOCK 0x04000000 + +#define DC_BUS_MODE_BURST_LENGTH_NO_LIMIT 0x00000000 +#define DC_BUS_MODE_BURST_LENGTH_1 0x00000100 +#define DC_BUS_MODE_BURST_LENGTH_2 0x00000200 +#define DC_BUS_MODE_BURST_LENGTH_4 0x00000400 +#define DC_BUS_MODE_BURST_LENGTH_8 0x00000800 +#define DC_BUS_MODE_BURST_LENGTH_16 0x00001000 +#define DC_BUS_MODE_BURST_LENGTH_32 0x00002000 + +#define DC_BUS_MODE_CACHE_ALIGNMENT_NONE 0x00000000 +#define DC_BUS_MODE_CACHE_ALIGNMENT_8 0x00004000 +#define DC_BUS_MODE_CACHE_ALIGNMENT_16 0x00008000 +#define DC_BUS_MODE_CACHE_ALIGNMENT_32 0x0000C000 + +#define DC_BUS_MODE_TX_POLL_DISABLED 0x00000000 +#define DC_BUS_MODE_TX_POLL_1 0x00020000 +#define DC_BUS_MODE_TX_POLL_2 0x00040000 +#define DC_BUS_MODE_TX_POLL_3 0x00060000 +#define DC_BUS_MODE_TX_POLL_4 0x00080000 +#define DC_BUS_MODE_TX_POLL_5 0x000A0000 +#define DC_BUS_MODE_TX_POLL_6 0x000C0000 +#define DC_BUS_MODE_TX_POLL_7 0x000E0000 + +#define DC_BUS_MODE_DESC_SKIP_LENGTH_0 0x00000000 +#define DC_BUS_MODE_DESC_SKIP_LENGTH_1 0x00000004 +#define DC_BUS_MODE_DESC_SKIP_LENGTH_2 0x00000008 +#define DC_BUS_MODE_DESC_SKIP_LENGTH_4 0x00000010 +#define DC_BUS_MODE_DESC_SKIP_LENGTH_8 0x00000020 +#define DC_BUS_MODE_DESC_SKIP_LENGTH_16 0x00000040 +#define DC_BUS_MODE_DESC_SKIP_LENGTH_32 0x00000080 + +/* + * CSR1 Transmit Poll Demand + */ +#define DC_TX_POLL_DOORBELL 0x00000001 + +/* + * CSR2 Receive Poll Demand + */ +#define DC_RX_POLL_DOORBELL 0x00000001 + +/* + * CSR2 Wake Up Control + */ +#define DC_WAKE_UP_CONTROL_LINK_CHANGE 0x00000001 +#define DC_WAKE_UP_CONTROL_MAGIC_PACKET 0x00000002 +#define DC_WAKE_UP_CONTROL_PATTERN_MATCH 0x00000004 +#define DC_WAKE_UP_STATUS_LINK_CHANGE 0x00000010 +#define DC_WAKE_UP_STATUS_MAGIC_PACKET 0x00000020 +#define DC_WAKE_UP_STATUS_PATTERN_MATCH 0x00000040 +#define DC_WAKE_UP_CONTROL_GLOBAL_UNICAST 0x00000200 +#define DC_WAKE_UP_CONTROL_VLAN_ENABLE 0x00000800 +#define DC_WAKE_UP_CONTROL_VLAN_TYPE_MASK 0xFFFF0000 + +/* + * CSR5 Status, CSR7 Irq Mask + */ +#define DC_IRQ_TX_OK 0x00000001 +#define DC_IRQ_TX_STOPPED 0x00000002 +#define DC_IRQ_TX_NO_BUFFER 0x00000004 +#define DC_IRQ_TX_JABBER_TIMEOUT 0x00000008 +#define DC_IRQ_LINK_PASS 0x00000010 +#define DC_IRQ_TX_UNDERFLOW 0x00000020 +#define DC_IRQ_RX_OK 0x00000040 +#define DC_IRQ_RX_NO_BUFFER 0x00000080 +#define DC_IRQ_RX_STOPPED 0x00000100 +#define DC_IRQ_RX_WDT_TIMEOUT 0x00000200 +#define DC_IRQ_AUI 0x00000400 +#define DC_IRQ_TX_EARLY 0x00000400 +#define DC_IRQ_FD_FRAME_RECEIVED 0x00000800 +#define DC_IRQ_TIMER_TIMEOUT 0x00000800 +#define DC_IRQ_LINK_FAIL 0x00001000 +#define DC_IRQ_SYSTEM_ERROR 0x00002000 +#define DC_IRQ_RX_EARLY 0x00004000 +#define DC_IRQ_ABNORMAL_SUMMARY 0x00008000 +#define DC_IRQ_NORMAL_SUMMARY 0x00010000 +#define DC_STATUS_RX_STATE_MASK 0x000E0000 +#define DC_STATUS_TX_STATE_MASK 0x00700000 +#define DC_STATUS_SYSTEM_ERROR_MASK 0x03800000 +#define DC_IRQ_GPIO_PORT 0x04000000 +#define DC_IRQ_LINK_CHANGED 0x08000000 +#define DC_IRQ_HPNA_PHY 0x10000000 + +#define DC_STATUS_TX_STATE_STOPPED 0x00000000 +#define DC_STATUS_TX_STATE_FETCH 0x00100000 +#define DC_STATUS_TX_STATE_WAIT_FOR_END 0x00200000 +#define DC_STATUS_TX_STATE_READ 0x00300000 +#define DC_STATUS_TX_STATE_RESERVED 0x00400000 +#define DC_STATUS_TX_STATE_SETUP_PACKET 0x00500000 +#define DC_STATUS_TX_STATE_SUSPENDED 0x00600000 +#define DC_STATUS_TX_STATE_CLOSE 0x00700000 + +#define DC_STATUS_RX_STATE_STOPPED 0x00000000 +#define DC_STATUS_RX_STATE_FETCH 0x00020000 +#define DC_STATUS_RX_STATE_CHECK_END 0x00040000 +#define DC_STATUS_RX_STATE_WAIT_FOR_RCV 0x00060000 +#define DC_STATUS_RX_STATE_SUSPENDED 0x00080000 +#define DC_STATUS_RX_STATE_CLOSE_DESC 0x000A0000 +#define DC_STATUS_RX_STATE_FLUSH 0x000C0000 +#define DC_STATUS_RX_STATE_DEQUEUE 0x000E0000 + +#define DC_STATUS_SYSTEM_ERROR_PARITY 0x00000000 +#define DC_STATUS_SYSTEM_ERROR_MASTER_ABORT 0x00800000 +#define DC_STATUS_SYSTEM_ERROR_TARGET_ABORT 0x01000000 + +/* + * CSR6 Operation Mode + */ +#define DC_OPMODE_RX_HASH_PERFECT_FILT 0x00000001 +#define DC_OPMODE_RX_ENABLE 0x00000002 +#define DC_OPMODE_RX_HASH_ONLY_FILT 0x00000004 +#define DC_OPMODE_RX_RUNTS 0x00000008 +#define DC_OPMODE_RX_INVERSE_FILT 0x00000010 +#define DC_OPMODE_BACKOFF_COUNTER 0x00000020 +#define DC_OPMODE_RX_PROMISCUOUS 0x00000040 +#define DC_OPMODE_RX_ALL_MULTICAST 0x00000080 +#define DC_OPMODE_FKD 0x00000100 +#define DC_OPMODE_FULL_DUPLEX 0x00000200 +#define DC_OPMODE_LOOPBACK_MASK 0x00000C00 +#define DC_OPMODE_FORCE_COLLISIONS 0x00001000 +#define DC_OPMODE_TX_ENABLE 0x00002000 +#define DC_OPMODE_TX_THRESHOLD_CTRL_MASK 0x0000C000 +#define DC_OPMODE_TX_BACK_PRESSURE 0x00010000 +#define DC_OPMODE_TX_CAPTURE_EFFECT 0x00020000 +#define DC_OPMODE_PORT_SELECT 0x00040000 +#define DC_OPMODE_PORT_HEARTBEAT_DISABLE 0x00080000 +#define DC_OPMODE_STORE_AND_FORWARD 0x00200000 +#define DC_OPMODE_PORT_XMIT_10 0x00400000 +#define DC_OPMODE_PORT_PCS 0x00800000 +#define DC_OPMODE_PORT_SCRAMBLER 0x01000000 +#define DC_OPMODE_PORT_ALWAYS 0x02000000 +#define DC_OPMODE_ADDR_LSB_IGNORE 0x04000000 +#define DC_OPMODE_RX_RECEIVE_ALL 0x40000000 +#define DC_OPMODE_TX_SPECIAL_CAPTURE_EFFECT 0x80000000 + +#define DC_OPMODE_LOOPBACK_NORMAL 0x00000000 +#define DC_OPMODE_LOOPBACK_INTERNAL 0x00000400 +#define DC_OPMODE_LOOPBACK_EXTERNAL 0x00000800 + +#define DC_OPMODE_TX_THRESHOLD_LEVEL 0x00004000 +#define DC_OPMODE_TX_THRESHOLD_MAX 0x0000C000 + +#define DC_OPMODE_MEDIA_MASK ( \ + DC_OPMODE_TX_THRESHOLD_CTRL_MASK | \ + DC_OPMODE_LOOPBACK_MASK | \ + DC_OPMODE_FULL_DUPLEX | \ + DC_OPMODE_PORT_SELECT | \ + DC_OPMODE_PORT_HEARTBEAT_DISABLE | \ + DC_OPMODE_PORT_XMIT_10 | \ + DC_OPMODE_PORT_PCS | \ + DC_OPMODE_PORT_SCRAMBLER) + +/* + * CSR8 Receive Counters + */ +#define DC_COUNTER_RX_NO_BUFFER_MASK 0x0001FFFF +#define DC_COUNTER_RX_OVERFLOW_MASK 0x1FFE0000 + +#define DC_COUNTER_RX_OVERFLOW_SHIFT 17 + +/* + * CSR9 Serial Interface + */ +#define DC_SERIAL_EE_CS 0x00000001 +#define DC_SERIAL_EE_SK 0x00000002 +#define DC_SERIAL_EE_DI 0x00000004 +#define DC_SERIAL_EE_DO 0x00000008 +#define DC_SERIAL_EE_REG 0x00000400 +#define DC_SERIAL_EE_SR 0x00000800 +#define DC_SERIAL_EE_WR 0x00002000 +#define DC_SERIAL_EE_RD 0x00004000 +#define DC_SERIAL_EE_MOD 0x00008000 +#define DC_SERIAL_MII_MDC 0x00010000 +#define DC_SERIAL_MII_MDO 0x00020000 +#define DC_SERIAL_MII_MII 0x00040000 +#define DC_SERIAL_MII_MDI 0x00080000 +#define DC_SERIAL_EAR_DN 0x80000000 +#define DC_SERIAL_EAR_DT 0x000000FF +#define DC_SERIAL_SPI_CS 0x00100000 +#define DC_SERIAL_SPI_SK 0x00200000 +#define DC_SERIAL_SPI_DI 0x00400000 +#define DC_SERIAL_SPI_DO 0x00800000 + +#define DC_SERIAL_EE_DI_SHIFT 2 +#define DC_SERIAL_EE_DO_SHIFT 3 +#define DC_SERIAL_MII_MDO_SHIFT 17 +#define DC_SERIAL_MII_MDI_SHIFT 19 +#define DC_SERIAL_SPI_DI_SHIFT 22 +#define DC_SERIAL_SPI_DO_SHIFT 23 + +/* + * CSR11 Timer + */ +#define DC_TIMER_VALUE_MASK 0x0000FFFF +#define DC_TIMER_CONTINUOUS 0x00010000 +#define DC_TIMER_RX_NUMBER_MASK 0x000E0000 +#define DC_TIMER_RX_TIMER_MASK 0x00F00000 +#define DC_TIMER_TX_NUMBER_MASK 0x07000000 +#define DC_TIMER_TX_TIMER_MASK 0x78000000 +#define DC_TIMER_CYCLE_SIZE 0x80000000 + +#define DC_TIMER_RX_NUMBER_SHIFT 17 +#define DC_TIMER_RX_TIMER_SHIFT 20 +#define DC_TIMER_TX_NUMBER_SHIFT 24 +#define DC_TIMER_TX_TIMER_SHIFT 27 + +/* + * CSR12 SIA Status + */ +#define DC_SIA_STATUS_MII_RECEIVE_ACTIVITY 0x00000001 +#define DC_SIA_STATUS_NETWORK_CONNECTION_ERROR 0x00000002 +#define DC_SIA_STATUS_100T_LINK_FAIL 0x00000002 +#define DC_SIA_STATUS_10T_LINK_FAIL 0x00000004 +#define DC_SIA_STATUS_SELECTED_PORT_ACTIVITY 0x00000100 +#define DC_SIA_STATUS_AUI_ACTIVITY 0x00000100 +#define DC_SIA_STATUS_HPNA_ACTIVITY 0x00000100 +#define DC_SIA_STATUS_NONSEL_PORT_ACTIVITY 0x00000200 +#define DC_SIA_STATUS_10T_ACTIVITY 0x00000200 +#define DC_SIA_STATUS_NSN 0x00000400 +#define DC_SIA_STATUS_TX_REMOTE_FAULT 0x00000800 +#define DC_SIA_STATUS_ANS_MASK 0x00007000 +#define DC_SIA_STATUS_LP_AUTONED_SUPPORTED 0x00008000 +#define DC_SIA_STATUS_LP_CODE_WORD_MASK 0xFFFF0000 + +#define DC_SIA_STATUS_ANS_AUTONEG_DISABLED 0x00000000 +#define DC_SIA_STATUS_ANS_TX_DISABLE 0x00001000 +#define DC_SIA_STATUS_ANS_ABILITY_DETECT 0x00002000 +#define DC_SIA_STATUS_ANS_ACK_DETECT 0x00003000 +#define DC_SIA_STATUS_ANS_ACK_COMPLETE 0x00004000 +#define DC_SIA_STATUS_ANS_AUTONEG_COMPLETE 0x00005000 +#define DC_SIA_STATUS_ANS_LINK_CHECK 0x00006000 + +#define DC_SIA_STATUS_LP_CODE_WORD_SHIFT 16 + +#define DC_GPIO_CONTROL 0x100 + +/* + * CSR13 SIA Connectivity + */ +#define DC_SIA_CONN_RESET 0x00000000 +#define DC_SIA_CONN_HPNA 0x00000008 + +/* + * CSR14 SIA Transmit and Receive + */ +#define DC_SIA_TXRX_ENCODER 0x00000001 +#define DC_SIA_TXRX_LOOPBACK 0x00000002 +#define DC_SIA_TXRX_DRIVER 0x00000004 +#define DC_SIA_TXRX_LINK_PULSE 0x00000008 +#define DC_SIA_TXRX_COMPENSATION 0x00000030 +#define DC_SIA_TXRX_ADV_10T_HD 0x00000040 +#define DC_SIA_TXRX_AUTONEG 0x00000080 +#define DC_SIA_TXRX_RX_SQUELCH 0x00000100 +#define DC_SIA_TXRX_COLLISION_SQUELCH 0x00000200 +#define DC_SIA_TXRX_COLLISION_DETECT 0x00000400 +#define DC_SIA_TXRX_HEARTBEAT 0x00000800 +#define DC_SIA_TXRX_LINK_TEST 0x00001000 +#define DC_SIA_TXRX_AUTOPOLARITY 0x00002000 +#define DC_SIA_TXRX_SET_POLARITY_PLUS 0x00004000 +#define DC_SIA_TXRX_10T_AUTOSENSE 0x00008000 +#define DC_SIA_TXRX_ADV_100TX_HD 0x00010000 +#define DC_SIA_TXRX_ADV_100TX_FD 0x00020000 +#define DC_SIA_TXRX_ADV_100T4 0x00040000 + +/* + * CSR15 SIA and GPIO + */ +#define DC_SIA_GENERAL_JABBER_DISABLE 0x00000001 +#define DC_SIA_GENERAL_HOST_UNJAB 0x00000002 +#define DC_SIA_GENERAL_JABBER_CLOCK 0x00000004 +#define DC_SIA_GENERAL_AUI_BNC_MODE 0x00000008 +#define DC_SIA_GENERAL_RX_WDT_DISABLE 0x00000010 +#define DC_SIA_GENERAL_RX_WDT_RELEASE 0x00000020 +#define DC_SIA_GENERAL_LINK_EXTEND 0x00000800 +#define DC_SIA_GENERAL_RX_MAGIC_PACKET 0x00004000 +#define DC_SIA_GENERAL_HCKR 0x00008000 +#define DC_SIA_GENERAL_GPIO_MASK 0x000F0000 +#define DC_SIA_GENERAL_LGS3 0x00100000 +#define DC_SIA_GENERAL_LGS2 0x00200000 +#define DC_SIA_GENERAL_LGS1 0x00400000 +#define DC_SIA_GENERAL_LGS0 0x00800000 +#define DC_SIA_GENERAL_GEI0 0x01000000 +#define DC_SIA_GENERAL_GEI1 0x02000000 +#define DC_SIA_GENERAL_RECEIVE_MATCH 0x04000000 +#define DC_SIA_GENERAL_CONTROL_WRITE 0x08000000 +#define DC_SIA_GENERAL_GI0 0x10000000 +#define DC_SIA_GENERAL_GI1 0x20000000 +#define DC_SIA_GENERAL_IRQ_RX_MATCH 0x40000000 + +#define DC_RBD_STATUS_INVALID \ + (DC_RBD_STATUS_OVERRUN | \ + DC_RBD_STATUS_CRC_ERROR | \ + DC_RBD_STATUS_WDT_EXPIRED | \ + DC_RBD_STATUS_COLLISION_SEEN | \ + DC_RBD_STATUS_TOO_LONG | \ + DC_RBD_STATUS_RUNT | \ + DC_RBD_STATUS_LENGTH_ERROR) + +#define DC_GENERIC_IRQ_MASK \ + (DC_IRQ_TX_OK | DC_IRQ_TX_STOPPED | DC_IRQ_TX_JABBER_TIMEOUT | \ + DC_IRQ_RX_OK | DC_IRQ_TX_UNDERFLOW | \ + DC_IRQ_RX_STOPPED | \ + DC_IRQ_SYSTEM_ERROR | DC_IRQ_ABNORMAL_SUMMARY | DC_IRQ_NORMAL_SUMMARY) + +/* Errata: The programming guide incorrectly stated that CSR13 must be set to 0x30480009 */ +#define DC_HPNA_ANALOG_CTRL 0x708A0000 + +/* + * PCI Configuration Registers + */ +#define DC_PCI_DEVICE_CONFIG 0x40 +#define DC_PCI_DEVICE_CONFIG_SNOOZE 0x40000000 +#define DC_PCI_DEVICE_CONFIG_SLEEP 0x80000000 + +/* + * SPI Interface + */ +#define DC_SPI_BYTE_WRITE_OPERATION 2 +#define DC_SPI_BYTE_READ_OPERATION 3 +#define DC_SPI_CLEAR_WRITE_ENABLE 4 +#define DC_SPI_SET_WRITE_ENABLE 6 + +/* + * HomePNA PHY Registers + */ +#define HPNA_CONTROL_LOW 0x00 +#define HPNA_CONTROL_HIGH 0x01 +#define HPNA_NOISE 0x10 +#define HPNA_NOISE_FLOOR 0x12 +#define HPNA_NOISE_CEILING 0x13 +#define HPNA_NOISE_ATTACK 0x14 + +/* + * MDIO Protocol (IEEE 802.3) + */ +#define MDIO_START 0x01 +#define MDIO_WRITE 0x01 +#define MDIO_READ 0x02 +#define MDIO_TA 0x02 +#define MDIO_PREAMBLE 0xFFFFFFFF + +#define MII_MAX_PHY_ADDRESSES 32 + +/* + * PHY register definitions (IEEE 802.3) + */ +#define MII_CONTROL 0x00 +#define MII_CR_COLLISION_TEST 0x0080 +#define MII_CR_FULL_DUPLEX 0x0100 +#define MII_CR_AUTONEG_RESTART 0x0200 +#define MII_CR_ISOLATE 0x0400 +#define MII_CR_POWER_DOWN 0x0800 +#define MII_CR_AUTONEG 0x1000 +#define MII_CR_SPEED_SELECTION 0x2000 +#define MII_CR_LOOPBACK 0x4000 +#define MII_CR_RESET 0x8000 +#define MII_STATUS 0x01 +#define MII_SR_LINK_STATUS 0x0004 +#define MII_SR_AUTONEG_COMPLETE 0x0020 +#define MII_PHY_ID1 0x02 +#define MII_PHY_ID2 0x03 +#define MII_AUTONEG_ADVERTISE 0x04 +#define MII_ADV_CSMA 0x0001 +#define MII_ADV_10T_HD 0x0020 +#define MII_ADV_10T_FD 0x0040 +#define MII_ADV_100T_HD 0x0080 +#define MII_ADV_100T_FD 0x0100 +#define MII_ADV_100T4 0x0200 +#define MII_ADV_PAUSE_SYM 0x0400 +#define MII_ADV_PAUSE_ASYM 0x0800 +#define MII_AUTONEG_LINK_PARTNER 0x05 +#define MII_LP_10T_HD 0x0020 +#define MII_LP_10T_FD 0x0040 +#define MII_LP_100T_HD 0x0080 +#define MII_LP_100T_FD 0x0100 +#define MII_LP_100T4 0x0200 +#define MII_LP_PAUSE_SYM 0x0400 +#define MII_LP_PAUSE_ASYM 0x0800 +#define MII_AUTONEG_EXPANSION 0x06 +#define MII_EXP_LP_AUTONEG 0x0001 +#define MII_MASTER_SLAVE_CONTROL 0x09 +#define MII_MS_CR_1000T_HD 0x0100 +#define MII_MS_CR_1000T_FD 0x0200 +#define MII_MASTER_SLAVE_STATUS 0x0A +#define MII_MS_SR_1000T_FD 0x0800 + +#define MII_ADV_100 \ + (MII_ADV_100T_HD | MII_ADV_100T_FD | MII_ADV_100T4) diff --git a/drivers/network/dd/dc21x4/debug.c b/drivers/network/dd/dc21x4/debug.c new file mode 100644 index 00000000000..3dc9e5f073f --- /dev/null +++ b/drivers/network/dd/dc21x4/debug.c @@ -0,0 +1,70 @@ +/* + * PROJECT: ReactOS DC21x4 Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Debug routines + * COPYRIGHT: Copyright 2023 Dmitry Borisov <di.sean(a)protonmail.com> + */ + +/* INCLUDES *******************************************************************/ + +#include "dc21x4.h" + +/* GLOBALS ********************************************************************/ + +static PCSTR MediaName[MEDIA_MAX] = +{ + "10Base-T", + "10Base-2 (BNC)", + "10Base-5 (AUI)", + "100Base-TX HD", + "10Base-T FD", + "100Base-TX FD", + "100Base-T4", + "100Base-FX HD", + "100Base-FX FD", + "HomePNA", + "MII", +}; + +/* FUNCTIONS ******************************************************************/ + +PCSTR +MediaNumber2Str( + _In_ PDC21X4_ADAPTER Adapter, + _In_ ULONG MediaNumber) +{ + switch (MediaNumber) + { + case MEDIA_100TX_HD: + { + if (Adapter->ChipType == DC21041) + return "10Base-T HD"; + break; + } + + default: + break; + } + + ASSERT(MediaNumber < MEDIA_MAX); + + return MediaName[MediaNumber]; +} + +PCSTR +DcDbgBusError( + _In_ ULONG InterruptStatus) +{ + switch (InterruptStatus & DC_STATUS_SYSTEM_ERROR_MASK) + { + case DC_STATUS_SYSTEM_ERROR_PARITY: + return "Parity Error"; + case DC_STATUS_SYSTEM_ERROR_MASTER_ABORT: + return "Master Abort"; + case DC_STATUS_SYSTEM_ERROR_TARGET_ABORT: + return "Target Abort"; + + default: + return "<unknown>"; + } +} diff --git a/drivers/network/dd/dc21x4/debug.h b/drivers/network/dd/dc21x4/debug.h new file mode 100644 index 00000000000..f1a4e178de3 --- /dev/null +++ b/drivers/network/dd/dc21x4/debug.h @@ -0,0 +1,96 @@ +/* + * PROJECT: ReactOS DC21x4 Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Debug support header file + * COPYRIGHT: Copyright 2023 Dmitry Borisov <di.sean(a)protonmail.com> + */ + +#pragma once + +#ifndef __RELFILE__ +#define __RELFILE__ __FILE__ +#endif + +#if DBG + +// #define DEBUG_TRACE +// #define DEBUG_INFO +#define DEBUG_INFO_VERB +#define DEBUG_WARN +#define DEBUG_ERR + +#ifdef DEBUG_TRACE +#define TRACE(fmt, ...) \ + do { \ + if (DbgPrint("(%s:%d) %s " fmt, __RELFILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__)) \ + DbgPrint("(%s:%d) DbgPrint() failed!\n", __RELFILE__, __LINE__); \ + } while (0) + +#else +#define TRACE +#endif + +#ifdef DEBUG_INFO +#define INFO(fmt, ...) \ + do { \ + if (DbgPrint("(%s:%d) %s " fmt, __RELFILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__)) \ + DbgPrint("(%s:%d) DbgPrint() failed!\n", __RELFILE__, __LINE__); \ + } while (0) + +#else +#define INFO +#endif + +#ifdef DEBUG_INFO_VERB +#define INFO_VERB(fmt, ...) \ + do { \ + if (DbgPrint("(%s:%d) %s " fmt, __RELFILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__)) \ + DbgPrint("(%s:%d) DbgPrint() failed!\n", __RELFILE__, __LINE__); \ + } while (0) + +#else +#define INFO_VERB +#endif + +#ifdef DEBUG_WARN +#define WARN(fmt, ...) \ + do { \ + if (DbgPrint("(%s:%d) %s " fmt, __RELFILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__)) \ + DbgPrint("(%s:%d) DbgPrint() failed!\n", __RELFILE__, __LINE__); \ + } while (0) + +#else +#define WARN +#endif + +#ifdef DEBUG_ERR +#define ERR(fmt, ...) \ + do { \ + if (DbgPrint("(%s:%d) %s " fmt, __RELFILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__)) \ + DbgPrint("(%s:%d) DbgPrint() failed!\n", __RELFILE__, __LINE__); \ + } while (0) + +#else +#define ERR +#endif + +PCSTR +MediaNumber2Str( + _In_ PDC21X4_ADAPTER Adapter, + _In_ ULONG MediaNumber); + +PCSTR +DcDbgBusError( + _In_ ULONG InterruptStatus); + +#else + +#define TRACE +#define INFO +#define INFO_VERB +#define WARN +#define ERR +#define MediaNumber2Str +#define DcDbgBusError + +#endif diff --git a/drivers/network/dd/dc21x4/eeprom.c b/drivers/network/dd/dc21x4/eeprom.c new file mode 100644 index 00000000000..6937a5723df --- /dev/null +++ b/drivers/network/dd/dc21x4/eeprom.c @@ -0,0 +1,1525 @@ +/* + * PROJECT: ReactOS DC21x4 Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: EEPROM manipulation and parsing + * COPYRIGHT: Copyright 2023 Dmitry Borisov <di.sean(a)protonmail.com> + */ + +/* INCLUDES *******************************************************************/ + +#include "dc21x4.h" + +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +#define SROM_READ(Adapter, Data) \ + do { \ + *Data = DC_READ((Adapter), DcCsr9_SerialInterface); \ + NdisStallExecution(10); \ + } while (0) + +#define SROM_WRITE(Adapter, Value) \ + do { \ + DC_WRITE((Adapter), DcCsr9_SerialInterface, Value); \ + NdisStallExecution(10); \ + } while (0) + +extern DC_PG_DATA DC_SROM_REPAIR_ENTRY SRompRepairData[]; + +LIST_ENTRY SRompAdapterList; + +_Interlocked_ +static volatile LONG SRompAdapterLock = 0; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static +CODE_SEG("PAGE") +VOID +SRomAcquireListMutex(VOID) +{ + PAGED_CODE(); + + while (_InterlockedCompareExchange(&SRompAdapterLock, 1, 0)) + { + NdisMSleep(10); + } +} + +static inline +CODE_SEG("PAGE") +VOID +SRomReleaseListMutex(VOID) +{ + PAGED_CODE(); + + _InterlockedDecrement(&SRompAdapterLock); +} + +static +CODE_SEG("PAGE") +BOOLEAN +SRomIsAdapterInList( + _In_ PDC21X4_ADAPTER Adapter, + _In_ BOOLEAN SearchForMaster, + _Out_opt_ PDC_SROM_ENTRY* FoundEntry) +{ + PLIST_ENTRY PrevEntry; + PDC_SROM_ENTRY SRomEntry; + + PAGED_CODE(); + + /* Loop the adapter list backwards */ + for (PrevEntry = (&SRompAdapterList)->Blink; + PrevEntry != &SRompAdapterList; + PrevEntry = PrevEntry->Blink) + { + SRomEntry = CONTAINING_RECORD(PrevEntry, DC_SROM_ENTRY, ListEntry); + + if ((SRomEntry->ChipType == Adapter->ChipType) && + (SRomEntry->BusNumber == Adapter->BusNumber) && + (!SearchForMaster || (SRomEntry->DeviceNumber == Adapter->DeviceNumber))) + { + if (FoundEntry) + *FoundEntry = SRomEntry; + + return TRUE; + } + } + + return FALSE; +} + +static +CODE_SEG("PAGE") +BOOLEAN +SRomRegisterMasterAdapter( + _In_ PDC21X4_ADAPTER Adapter, + _In_ PDC_SROM_ENTRY SRomEntry) +{ + BOOLEAN Success; + + PAGED_CODE(); + + SRomAcquireListMutex(); + + /* Check if board is already registered */ + if (SRomIsAdapterInList(Adapter, TRUE, NULL)) + { + Success = FALSE; + goto Exit; + } + + Adapter->SRomEntry = SRomEntry; + + SRomEntry->ChipType = Adapter->ChipType; + SRomEntry->BusNumber = Adapter->BusNumber; + SRomEntry->DeviceNumber = Adapter->DeviceNumber; + SRomEntry->InterruptLevel = Adapter->InterruptLevel; + SRomEntry->InterruptVector = Adapter->InterruptVector; + + /* Register the port */ + SRomEntry->DeviceBitmap |= 1 << Adapter->DeviceNumber; + + /* + * On some multiport boards only the first port contains an EEPROM. + * We put their references to the global adapter list. + */ + InsertTailList(&SRompAdapterList, &SRomEntry->ListEntry); + Success = TRUE; + +Exit: + SRomReleaseListMutex(); + + return Success; +} + +static +CODE_SEG("PAGE") +BOOLEAN +SRomFindMasterAdapter( + _In_ PDC21X4_ADAPTER Adapter, + _Out_ PDC_SROM_ENTRY* FoundEntry) +{ + PDC_SROM_ENTRY SRomEntry; + ULONG i; + BOOLEAN Found; + + PAGED_CODE(); + + SRomAcquireListMutex(); + + if (!SRomIsAdapterInList(Adapter, FALSE, &SRomEntry)) + { + Found = FALSE; + goto Exit; + } + + Adapter->SRomEntry = SRomEntry; + + /* Register the port */ + SRomEntry->DeviceBitmap |= 1 << Adapter->DeviceNumber; + + /* + * Determine the port index that should be used in order to + * (possibly) update the base MAC address. + */ + for (i = 0; i < PCI_MAX_DEVICES; ++i) + { + if (i == Adapter->DeviceNumber) + break; + + if (SRomEntry->DeviceBitmap & (1 << i)) + ++Adapter->ControllerIndex; + } + + /* + * On a multiport board there can be up to 4 ports + * connected through a 21050 or 21152 PCI-to-PCI Bridge. + * These boards share a single IRQ line between all of the chips. + * Some BIOSes incorrectly assign different IRQs to the different ports. + */ + Adapter->InterruptLevel = SRomEntry->InterruptLevel; + Adapter->InterruptVector = SRomEntry->InterruptVector; + + WARN("EEPROM is missing on controller %u, using image from the master at %u:%u\n", + Adapter->DeviceNumber, + SRomEntry->BusNumber, + SRomEntry->DeviceNumber); + + *FoundEntry = SRomEntry; + Found = TRUE; + +Exit: + SRomReleaseListMutex(); + + return Found; +} + +static +CODE_SEG("PAGE") +BOOLEAN +SRomIsEmpty( + _In_reads_bytes_(Length) const VOID* Buffer, + _In_ ULONG Length) +{ + const UCHAR* Data = Buffer; + const UCHAR FirstByte = Data[0]; + ULONG i; + + PAGED_CODE(); + + for (i = 1; i < Length; ++i) + { + if (FirstByte != Data[i]) + return FALSE; + } + + return TRUE; +} + +static +CODE_SEG("PAGE") +VOID +SRomNWayAdvertise( + _In_ PDC21X4_ADAPTER Adapter, + _In_ ULONG MediaCode) +{ + PAGED_CODE(); + + switch (MediaCode) + { + case MEDIA_10T: + Adapter->SymAdvertising |= MII_ADV_10T_HD; + break; + case MEDIA_10T_FD: + Adapter->SymAdvertising |= MII_ADV_10T_FD; + break; + case MEDIA_100TX_HD: + Adapter->SymAdvertising |= MII_ADV_100T_HD; + break; + case MEDIA_100TX_FD: + Adapter->SymAdvertising |= MII_ADV_100T_FD; + break; + case MEDIA_100T4: + Adapter->SymAdvertising |= MII_ADV_100T4; + break; + + default: + break; + } +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +SRomDecodeBlockGpr( + _In_ PDC21X4_ADAPTER Adapter, + _In_ PUCHAR SRomEnd, + _In_ PUCHAR BlockData) +{ + PDC_MEDIA Media; + ULONG MediaCode, OpMode; + USHORT Command; + + PAGED_CODE(); + + if (BlockData > (SRomEnd - 4)) + return NDIS_STATUS_BUFFER_OVERFLOW; + + MediaCode = SRomGetMediaCode(*BlockData++); + if (MediaCode > SROM_MEDIA_MAX) + { + WARN("Unknown media code %u\n", MediaCode); + return NDIS_STATUS_SUCCESS; + } + Adapter->MediaBitmap |= 1 << MediaCode; + + Media = &Adapter->Media[MediaCode]; + + Media->GpioData = *BlockData++; + + Command = DcRetrieveWord(BlockData); + + OpMode = Media->OpMode; + OpMode &= ~SROM_OPMODE_MASK; + OpMode |= SRomCommandToOpMode(Command); + Media->OpMode = OpMode; + + if (SRomMediaHasActivityIndicator(Command)) + { + Media->LinkMask = SRomMediaGetSenseMask(Command); + } + if (SRomMediaActivityIsActiveLow(Command)) + { + Media->Polarity = 0xFFFFFFFF; + } + + INFO("GPR #%u %s, Command %04lx, Data %02lx\n", + MediaCode, + MediaNumber2Str(Adapter, MediaCode), + Command, + Media->GpioData); + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +SRomDecodeBlockMii( + _In_ PDC21X4_ADAPTER Adapter, + _In_ PUCHAR SRomEnd, + _In_ PUCHAR BlockData, + _In_ BOOLEAN IsOldVersion) +{ + PDC_MII_MEDIA Media; + ULONG i, Bytes, Offset; + UCHAR PhyNumber, StreamLength, InterruptInfo; + USHORT Capabilities, Fdx, Ttm; + + PAGED_CODE(); + + if (BlockData > (SRomEnd - 2)) + return NDIS_STATUS_BUFFER_OVERFLOW; + + PhyNumber = *BlockData++; + + /* + * Even though the SROM specification allows several + * PHY devices to be connected to the same chip on a board, + * most if not all boards never use more than 1 MII PHY device. + */ + if (Adapter->Features & DC_HAS_MII) + { + WARN("Unsupported PHY %u\n", PhyNumber); + return NDIS_STATUS_SUCCESS; + } + + Media = &Adapter->MiiMedia; + + /* + * PHY selection sequence + */ + + StreamLength = *BlockData++; + if (StreamLength > SROM_MAX_STREAM_REGS) + { + WARN("Too much registers %u\n", StreamLength); + return NDIS_STATUS_SUCCESS; + } + + Bytes = StreamLength; + if (!IsOldVersion) + { + /* In words */ + Bytes *= 2; + } + if ((BlockData + Bytes) > (SRomEnd - 1)) + { + return NDIS_STATUS_BUFFER_OVERFLOW; + } + + Media->SetupStreamLength = StreamLength; + + /* Check if we already have the GPIO direction data */ + if (Media->SetupStream[0] != 0) + { + Offset = 1; + ++Media->SetupStreamLength; + } + else + { + Offset = 0; + } + + for (i = 0; i < StreamLength; ++i) + { + if (IsOldVersion) + { + Media->SetupStream[i + Offset] = *BlockData++; + } + else + { + Media->SetupStream[i + Offset] = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + } + } + + /* + * PHY reset sequence + */ + + if (BlockData > (SRomEnd - 1)) + { + return NDIS_STATUS_BUFFER_OVERFLOW; + } + + StreamLength = *BlockData++; + if (StreamLength > SROM_MAX_STREAM_REGS) + { + WARN("Too much registers %u\n", StreamLength); + return NDIS_STATUS_SUCCESS; + } + + Bytes = StreamLength; + if (!IsOldVersion) + { + /* In words */ + Bytes *= 2; + } + if ((BlockData + Bytes) > (SRomEnd - 1)) + { + return NDIS_STATUS_BUFFER_OVERFLOW; + } + + Media->ResetStreamLength = StreamLength; + + for (i = 0; i < StreamLength; ++i) + { + if (IsOldVersion) + { + Media->ResetStream[i] = *BlockData++; + } + else + { + Media->ResetStream[i] = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + } + } + + /* + * MII data + */ + + Bytes = 4 * sizeof(USHORT); + if (!IsOldVersion) + { + Bytes += 1; + } + if (BlockData > (SRomEnd - Bytes)) + { + return NDIS_STATUS_BUFFER_OVERFLOW; + } + + Capabilities = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + + Media->Advertising = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + + Fdx = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + + Ttm = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + + InterruptInfo = IsOldVersion ? 0 : *BlockData; + + Adapter->Features |= DC_HAS_MII; + + INFO("MII #%u, Caps %04lx, Adv %04lx, Fdx %04lx, Ttm %04lx, Int %02x\n", + PhyNumber, + Capabilities, + Media->Advertising, + Fdx, + Ttm, + InterruptInfo); + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +SRomDecodeBlockSia( + _In_ PDC21X4_ADAPTER Adapter, + _In_ PUCHAR SRomEnd, + _In_ PUCHAR BlockData) +{ + PDC_MEDIA Media; + UCHAR BlockStart; + ULONG MediaCode; + BOOLEAN HasExtendedData; + + PAGED_CODE(); + + if (BlockData > (SRomEnd - 1)) + return NDIS_STATUS_BUFFER_OVERFLOW; + + BlockStart = *BlockData++; + + HasExtendedData = SRomBlockHasExtendedData(BlockStart); + if (BlockData > (SRomEnd - (HasExtendedData ? 10 : 4))) + return NDIS_STATUS_BUFFER_OVERFLOW; + + MediaCode = SRomGetMediaCode(BlockStart); + if (MediaCode > SROM_MEDIA_MAX && MediaCode != SROM_MEDIA_HMR) + { + WARN("Unknown media code %u\n", MediaCode); + return NDIS_STATUS_SUCCESS; + } + + /* TODO: There were a few 21143-based boards with HMR media */ + if ((MediaCode == SROM_MEDIA_HMR) && (Adapter->ChipType != DC21145)) + { + ERR("FIXME: 21143 HMR is not supported yet\n"); + return NDIS_STATUS_SUCCESS; + } + + /* Map the code to our internal value */ + if (MediaCode == SROM_MEDIA_HMR) + { + MediaCode = MEDIA_HMR; + } + + Adapter->MediaBitmap |= 1 << MediaCode; + + Media = &Adapter->Media[MediaCode]; + + if (HasExtendedData) + { + Media->Csr13 = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + + Media->Csr14 = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + + Media->Csr15 = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + } + + Media->GpioCtrl = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + + Media->GpioData = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + + SRomNWayAdvertise(Adapter, MediaCode); + + INFO("SIA #%u %s, %sCSR13 %04lx CSR14 %04lx CSR15 %04lx, " + "Ctrl %04lx, Data %04lx\n", + MediaCode, + MediaNumber2Str(Adapter, MediaCode), + HasExtendedData ? "EXT " : "", + Media->Csr13, + Media->Csr14, + Media->Csr15, + Media->GpioCtrl, + Media->GpioData); + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +SRomDecodeBlockSym( + _In_ PDC21X4_ADAPTER Adapter, + _In_ PUCHAR SRomEnd, + _In_ PUCHAR BlockData) +{ + PDC_MEDIA Media; + ULONG MediaCode, OpMode; + USHORT Command; + + PAGED_CODE(); + + if (BlockData > (SRomEnd - 7)) + return NDIS_STATUS_BUFFER_OVERFLOW; + + MediaCode = SRomGetMediaCode(*BlockData++); + if (MediaCode > SROM_MEDIA_MAX) + { + WARN("Unknown media code %u\n", MediaCode); + return NDIS_STATUS_SUCCESS; + } + Adapter->MediaBitmap |= 1 << MediaCode; + + Media = &Adapter->Media[MediaCode]; + + Media->GpioCtrl = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + + Media->GpioData = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + + Command = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + + OpMode = Media->OpMode; + OpMode &= ~SROM_OPMODE_MASK; + OpMode |= SRomCommandToOpMode(Command); + Media->OpMode = OpMode; + + SRomNWayAdvertise(Adapter, MediaCode); + + INFO("SYM #%u %s, Command %04lx, Ctrl %04lx, Data %04lx\n", + MediaCode, + MediaNumber2Str(Adapter, MediaCode), + Command, + Media->GpioCtrl, + Media->GpioData); + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +SRomDecodeBlockReset( + _In_ PDC21X4_ADAPTER Adapter, + _In_ PUCHAR SRomEnd, + _In_ PUCHAR BlockData) +{ + UCHAR i, StreamLength; + + PAGED_CODE(); + + if (BlockData > (SRomEnd - 1)) + return NDIS_STATUS_BUFFER_OVERFLOW; + + StreamLength = *BlockData++; + if (StreamLength > SROM_MAX_STREAM_REGS) + { + WARN("Too much registers %u\n", StreamLength); + return NDIS_STATUS_SUCCESS; + } + + if ((BlockData + StreamLength * 2) > (SRomEnd - 1)) + return NDIS_STATUS_BUFFER_OVERFLOW; + + Adapter->ResetStreamLength = StreamLength; + + for (i = 0; i < StreamLength; ++i) + { + Adapter->ResetStream[i] = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + } + + INFO("RESET, length %u\n", StreamLength); + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +SRomDecodeBlockHmr( + _In_ PDC21X4_ADAPTER Adapter, + _In_ PUCHAR SRomEnd, + _In_ PUCHAR BlockData, + _In_ UCHAR BlockLength) +{ + ULONG Offset, ExtraData, i; + + PAGED_CODE(); + + if (BlockData > (SRomEnd - (2 + 6))) + return NDIS_STATUS_BUFFER_OVERFLOW; + + Adapter->AnalogControl = DcRetrieveWord(BlockData) << 16; + BlockData += sizeof(USHORT); + + Adapter->HpnaRegister[HPNA_CONTROL_LOW] = *BlockData++; + Adapter->HpnaRegister[HPNA_CONTROL_HIGH] = *BlockData++; + Adapter->HpnaRegister[HPNA_NOISE] = *BlockData++; + Adapter->HpnaRegister[HPNA_NOISE_FLOOR] = *BlockData++; + Adapter->HpnaRegister[HPNA_NOISE_CEILING] = *BlockData++; + Adapter->HpnaRegister[HPNA_NOISE_ATTACK] = *BlockData++; + Adapter->HpnaInitBitmap |= ((1 << HPNA_CONTROL_LOW) | + (1 << HPNA_CONTROL_HIGH) | + (1 << HPNA_NOISE) | + (1 << HPNA_NOISE_FLOOR) | + (1 << HPNA_NOISE_CEILING) | + (1 << HPNA_NOISE_ATTACK)); + + Offset = 2 /* Length and type fields */ + 2 /* Analog ctrl */ + 6; /* Regs */ + ExtraData = (BlockLength - Offset); + + if ((BlockData + ExtraData) > (SRomEnd - 1)) + return NDIS_STATUS_BUFFER_OVERFLOW; + + for (i = 0; i < ExtraData / sizeof(USHORT); ++i) + { + UCHAR RegAddress = SRomHmrRegAddress(*BlockData++); + UCHAR RegValue = *BlockData++; + + Adapter->HpnaRegister[RegAddress] = RegValue; + Adapter->HpnaInitBitmap |= 1 << RegAddress; + } + +#if DBG + INFO_VERB("Analog Ctrl %04lx\n", Adapter->AnalogControl); + + for (i = 0; i < RTL_NUMBER_OF(Adapter->HpnaRegister); ++i) + { + if (Adapter->HpnaInitBitmap & (1 << i)) + { + INFO_VERB("HR Reg %02x = %02x\n", i, Adapter->HpnaRegister[i]); + } + } + + if (ExtraData % sizeof(USHORT)) + { + INFO_VERB("HR Data = %02x\n", *BlockData); + } +#endif + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +SRomParseExtendedBlock( + _In_ PDC21X4_ADAPTER Adapter, + _In_ PUCHAR SRomEnd, + _In_ PUCHAR BlockData, + _Out_ PULONG BlockSize) +{ + NDIS_STATUS Status; + ULONG Length, Type; + + PAGED_CODE(); + + if (BlockData > (SRomEnd - 2)) + return NDIS_STATUS_BUFFER_OVERFLOW; + + Length = SRomGetExtendedBlockLength(*BlockData++); + Type = *BlockData++; + + *BlockSize = Length; + + switch (Type) + { + case SROM_BLOCK_TYPE_GPR: + Status = SRomDecodeBlockGpr(Adapter, SRomEnd, BlockData); + break; + case SROM_BLOCK_TYPE_MII_1: + case SROM_BLOCK_TYPE_MII_2: + Status = SRomDecodeBlockMii(Adapter, + SRomEnd, + BlockData, + (Type == SROM_BLOCK_TYPE_MII_1)); + break; + case SROM_BLOCK_TYPE_SIA: + Status = SRomDecodeBlockSia(Adapter, SRomEnd, BlockData); + break; + case SROM_BLOCK_TYPE_SYM: + Status = SRomDecodeBlockSym(Adapter, SRomEnd, BlockData); + break; + case SROM_BLOCK_TYPE_RESET: + Status = SRomDecodeBlockReset(Adapter, SRomEnd, BlockData); + break; + case SROM_BLOCK_TYPE_HOMERUN: + Status = SRomDecodeBlockHmr(Adapter, SRomEnd, BlockData, Length); + break; + + /* Skip over the unused or unknown blocks */ + default: + WARN("Unknown block type %u, length %u\n", Type, Length); + case SROM_BLOCK_TYPE_PHY_SHUTDOWN: + Status = NDIS_STATUS_SUCCESS; + break; + } + + return Status; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +SRomParse21041Block( + _In_ PDC21X4_ADAPTER Adapter, + _In_ PUCHAR SRomEnd, + _In_ PUCHAR BlockData, + _Out_ PULONG BlockSize) +{ + PDC_MEDIA Media; + UCHAR BlockStart; + ULONG MediaCode; + BOOLEAN HasExtendedData; + + PAGED_CODE(); + + if (BlockData > (SRomEnd - 1)) + return NDIS_STATUS_BUFFER_OVERFLOW; + + BlockStart = *BlockData++; + + HasExtendedData = SRomBlockHasExtendedData(BlockStart); + if (BlockData > (SRomEnd - (HasExtendedData ? 7 : 1))) + return NDIS_STATUS_BUFFER_OVERFLOW; + + *BlockSize = HasExtendedData ? 7 : 1; + + MediaCode = SRomGetMediaCode(BlockStart); + if (MediaCode > SROM_MEDIA_MAX) + { + WARN("Unknown media code %u\n", MediaCode); + return NDIS_STATUS_SUCCESS; + } + Adapter->MediaBitmap |= 1 << MediaCode; + + Media = &Adapter->Media[MediaCode]; + + if (HasExtendedData) + { + Media->Csr13 = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + + Media->Csr14 = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + + Media->Csr15 = DcRetrieveWord(BlockData); + BlockData += sizeof(USHORT); + } + + INFO("SIA #%u %s, %sCSR13 %04lx CSR14 %04lx CSR15 %04lx\n", + MediaCode, + MediaNumber2Str(Adapter, MediaCode), + HasExtendedData ? "EXT " : "", + Media->Csr13, + Media->Csr14, + Media->Csr15); + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +BOOLEAN +SRomChecksumValid( + _In_ PUCHAR SRom) +{ + USHORT Checksum; + + PAGED_CODE(); + + Checksum = ~DcEthernetCrc(SRom, SROM_CHECKSUM_V1); + if (Checksum == DcRetrieveWord(&SRom[SROM_CHECKSUM_V1])) + return TRUE; + + Checksum = ~DcEthernetCrc(SRom, SROM_CHECKSUM_V2); + if (Checksum == DcRetrieveWord(&SRom[SROM_CHECKSUM_V2])) + return TRUE; + + return FALSE; +} + +static +CODE_SEG("PAGE") +BOOLEAN +AddressRomChecksumValid( + _In_reads_bytes_(EAR_SIZE) PVOID AddressRom) +{ + const UCHAR* Octet = AddressRom; + ULONG64 TestPatterm; + ULONG Checksum, i; + + NdisMoveMemory(&TestPatterm, &Octet[24], 8); + if (TestPatterm != EAR_TEST_PATTERN) + return FALSE; + + for (i = 0; i < 8; ++i) + { + if (Octet[i] != Octet[15 - i]) + return FALSE; + } + + Checksum = (Octet[0] << 10) + (Octet[2] << 9) + (Octet[4] << 8) + + (Octet[1] << 2) + (Octet[3] << 1) + Octet[5]; + Checksum %= 0xFFFF; + + return ((USHORT)Checksum == ((Octet[6] << 8) | Octet[7])); +} + +static +CODE_SEG("PAGE") +BOOLEAN +SRomReadMacAddress( + _In_ PDC21X4_ADAPTER Adapter, + _In_ PUCHAR SRom, + _Out_opt_ PULONG AddressOffset) +{ + ULONG MacOffset; + + /* Check if we have a board with an old EAR format */ + if (NdisEqualMemory(SRom, &SRom[16], 8)) + { + /* Validate the EAR checksum */ + if (!AddressRomChecksumValid(SRom)) + { + ERR("EAR has an invalid checksum\n"); + return FALSE; + } + + MacOffset = 0; + goto ReadMac; + } + + /* Check for a new SROM format */ + if (Adapter->ChipType != DC21040) + { + /* Validate the SROM checksum */ + if (SRomChecksumValid(SRom)) + { + MacOffset = SROM_MAC_ADDRESS; + goto ReadMac; + } + } + + /* Sanity check */ + if (*(PULONG)SRom == 0xFFFFFFF || *(PULONG)SRom == 0) + return FALSE; + + WARN("Legacy/unknown board found\n"); + MacOffset = 0; + +ReadMac: + if (AddressOffset) + *AddressOffset = MacOffset; + + NdisMoveMemory(Adapter->PermanentMacAddress, + &SRom[MacOffset], + ETH_LENGTH_OF_ADDRESS); + + return TRUE; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +SRomParseHeader( + _In_ PDC21X4_ADAPTER Adapter, + _In_ PUCHAR SRom, + _Out_ PUCHAR* InfoLeaf, + _Out_ PUCHAR* SRomEnd) +{ + ULONG i, MacOffset, LeafOffset; + + PAGED_CODE(); + + if (!SRomReadMacAddress(Adapter, SRom, &MacOffset)) + { + ERR("Unable to read the MAC address\n"); + return NDIS_STATUS_FAILURE; + } + + /* Assign our own fake info leaf */ + if (MacOffset != SROM_MAC_ADDRESS) + { + for (i = 0; SRompRepairData[i].InfoLeaf; ++i) + { + /* Check for a MAC match */ + if (NdisEqualMemory(SRompRepairData[i].InfoLeaf, &Adapter->PermanentMacAddress, 3)) + { + /* This check is used to distinguish Accton EN1207 from Maxtech */ + if ((Adapter->PermanentMacAddress[0] == 0xE8) && (SRom[0x1A] == 0x55)) + ++i; + + break; + } + } + if (!SRompRepairData[i].InfoLeaf) + { + ERR("Non-standard SROM format, OUI %02x:%02x:%02x\n", + Adapter->PermanentMacAddress[0], + Adapter->PermanentMacAddress[1], + Adapter->PermanentMacAddress[2]); + + return NDIS_STATUS_ADAPTER_NOT_FOUND; + } + + *InfoLeaf = &SRompRepairData[i].InfoLeaf[3]; + *SRomEnd = *InfoLeaf + SRompRepairData[i].Length; + + /* Update the base address on multiport boards */ + Adapter->PermanentMacAddress[5] += Adapter->ControllerIndex; + +#if DBG + WARN("Non-standard SROM format, using '%s' info leaf\n", SRompRepairData[i].Name); +#endif + return STATUS_SUCCESS; + } + + /* Check if the SROM chip is shared between multiple controllers on a multiport board */ + if (SRom[SROM_CONTROLLER_COUNT] > 1) + { + INFO("Multiport board, controller number %u (%u/%u)\n", + Adapter->DeviceNumber, + Adapter->ControllerIndex + 1, + SRom[SROM_CONTROLLER_COUNT]); + + for (i = 0; i < SRom[SROM_CONTROLLER_COUNT]; ++i) + { + if (SROM_DEVICE_NUMBER(i) >= EE_SIZE) + return NDIS_STATUS_BUFFER_OVERFLOW; + + if (SRom[SROM_DEVICE_NUMBER(i)] == Adapter->DeviceNumber) + break; + } + if (i == SRom[SROM_CONTROLLER_COUNT]) + { + ERR("Controller %u was not found in the SROM\n", Adapter->DeviceNumber); + return NDIS_STATUS_ADAPTER_NOT_FOUND; + } + + if (SROM_LEAF_OFFSET(i) >= EE_SIZE) + return NDIS_STATUS_BUFFER_OVERFLOW; + + /* Update the base address */ + Adapter->PermanentMacAddress[5] += i; + } + else + { + i = 0; + } + + /* Controller info block offset */ + LeafOffset = DcRetrieveWord(SRom + SROM_LEAF_OFFSET(i)); + if (LeafOffset > (EE_SIZE - sizeof(DC_SROM_COMPACT_BLOCK))) + return NDIS_STATUS_BUFFER_OVERFLOW; + + /* Controller info leaf */ + *InfoLeaf = &SRom[LeafOffset]; + + *SRomEnd = SRom + EE_SIZE; + + return STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +SRomParse( + _In_ PDC21X4_ADAPTER Adapter, + _In_ PUCHAR SRom) +{ + ULONG Index, BlockCount, BlockSize, DefaultMedia; + NDIS_STATUS Status; + USHORT GpioCtrl; + PUCHAR Data, SRomEnd; + + PAGED_CODE(); + + INFO("SROM Version %u, Controller count %u\n", + SRom[SROM_VERSION], + SRom[SROM_CONTROLLER_COUNT]); + + Status = SRomParseHeader(Adapter, SRom, &Data, &SRomEnd); + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + DefaultMedia = DcRetrieveWord(Data); + Data += sizeof(USHORT); + + INFO("Default Media: %04lx\n", DefaultMedia); + + /* Direction of the GPIO pins */ + if (Adapter->ChipType == DC21140) + { + GpioCtrl = *Data++; + + INFO("GPIO Direction: %04lx\n", GpioCtrl); + + GpioCtrl |= DC_GPIO_CONTROL; + + for (Index = 0; Index < MEDIA_LIST_MAX; ++Index) + { + Adapter->Media[Index].GpioCtrl = GpioCtrl; + } + + /* Control word for block type 1 */ + Adapter->MiiMedia.SetupStream[0] = GpioCtrl; + } + + BlockCount = *Data++; + + INFO("Block Count: %u\n", BlockCount); + + if (BlockCount == 0 || BlockCount == 0xFF) + { + WARN("No media information found\n"); + return NDIS_STATUS_SUCCESS; + } + + /* Analyze and decode blocks */ + for (Index = 0; Index < BlockCount; ++Index) + { + if (Adapter->ChipType == DC21041) + { + Status = SRomParse21041Block(Adapter, SRomEnd, Data, &BlockSize); + } + else + { + if (Data > (SRomEnd - 1)) + return NDIS_STATUS_BUFFER_OVERFLOW; + + if (SRomIsBlockExtended(*Data)) + { + Status = SRomParseExtendedBlock(Adapter, SRomEnd, Data, &BlockSize); + } + else + { + Status = SRomDecodeBlockGpr(Adapter, SRomEnd, Data); + BlockSize = 4; + } + } + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + Data += BlockSize; + } + + if ((Adapter->MediaBitmap == 0) && !(Adapter->Features & DC_HAS_MII)) + { + WARN("No media information found\n"); + } + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +VOID +SRomShiftOut( + _In_ PDC21X4_ADAPTER Adapter, + _In_ ULONG Sequence, + _In_ ULONG BitCount) +{ + LONG i; + + PAGED_CODE(); + + for (i = BitCount - 1; i >= 0; --i) + { + ULONG DataIn = ((Sequence >> i) & 1) << DC_SERIAL_EE_DI_SHIFT; + + SROM_WRITE(Adapter, DataIn | DC_SERIAL_EE_RD | DC_SERIAL_EE_SR | DC_SERIAL_EE_CS); + SROM_WRITE(Adapter, DataIn | DC_SERIAL_EE_RD | DC_SERIAL_EE_SR | DC_SERIAL_EE_CS | + DC_SERIAL_EE_SK); + SROM_WRITE(Adapter, DataIn | DC_SERIAL_EE_RD | DC_SERIAL_EE_SR | DC_SERIAL_EE_CS); + } +} + +static +CODE_SEG("PAGE") +USHORT +SRomShiftIn( + _In_ PDC21X4_ADAPTER Adapter) +{ + ULONG i, Csr; + USHORT SerialData; + + PAGED_CODE(); + + /* Shift the data out of the EEPROM */ + SerialData = 0; + for (i = 0; i < RTL_BITS_OF(USHORT); ++i) + { + SROM_WRITE(Adapter, DC_SERIAL_EE_RD | DC_SERIAL_EE_SR | DC_SERIAL_EE_CS | DC_SERIAL_EE_SK); + + SROM_READ(Adapter, &Csr); + SerialData = (SerialData << 1) | ((Csr >> DC_SERIAL_EE_DO_SHIFT) & 1); + + SROM_WRITE(Adapter, DC_SERIAL_EE_RD | DC_SERIAL_EE_SR | DC_SERIAL_EE_CS); + } + + /* End the read cycle */ + SROM_WRITE(Adapter, DC_SERIAL_EE_RD | DC_SERIAL_EE_SR); + + return SerialData; +} + +static +CODE_SEG("PAGE") +ULONG +SRomDetectAddressBusWidth( + _In_ PDC21X4_ADAPTER Adapter) +{ + ULONG Csr, BusWidth; + + PAGED_CODE(); + + /* Assume the SROM is a 1kB ROM, send the read command and zero address (6 bits) */ + SRomShiftOut(Adapter, EEPROM_CMD_READ << 6, EEPROM_CMD_LENGTH + 6); + + /* Check the preceding dummy zero bit */ + Csr = DC_READ(Adapter, DcCsr9_SerialInterface); + if (Csr & DC_SERIAL_EE_DO) + { + /* 4kB EEPROM */ + BusWidth = 8; + + /* Send the remaining part of the address */ + SRomShiftOut(Adapter, 0, 8 - 6); + + /* The preceding dummy bit must be zero */ + Csr = DC_READ(Adapter, DcCsr9_SerialInterface); + if (Csr & DC_SERIAL_EE_DO) + return 0; + } + else + { + /* 1kB EEPROM */ + BusWidth = 6; + } + + /* Complete the read cycle */ + (VOID)SRomShiftIn(Adapter); + + return BusWidth; +} + +static +CODE_SEG("PAGE") +BOOLEAN +SRomReadSRom( + _In_ PDC21X4_ADAPTER Adapter, + _Out_writes_all_(EE_SIZE) PVOID SRom) +{ + PUSHORT SRomWord = SRom; + BOOLEAN Success = TRUE; + ULONG BusWidth, Address; + + PAGED_CODE(); + + /* Select the device */ + SROM_WRITE(Adapter, DC_SERIAL_EE_RD | DC_SERIAL_EE_SR); + SROM_WRITE(Adapter, DC_SERIAL_EE_RD | DC_SERIAL_EE_SR | DC_SERIAL_EE_CS); + + BusWidth = SRomDetectAddressBusWidth(Adapter); + if (BusWidth == 0) + { + Success = FALSE; + goto Done; + } + INFO("SROM Bus width: %u\n", BusWidth); + + /* Read the SROM contents once */ + for (Address = 0; Address < (EE_SIZE / sizeof(USHORT)); ++Address) + { + /* Send the command and address */ + SRomShiftOut(Adapter, + (EEPROM_CMD_READ << BusWidth) | Address, + EEPROM_CMD_LENGTH + BusWidth); + + /* Read the data */ + SRomWord[Address] = SRomShiftIn(Adapter); + } + +Done: + /* End chip select */ + DC_WRITE(Adapter, DcCsr9_SerialInterface, 0); + + return Success; +} + +#if DBG +static +CODE_SEG("PAGE") +VOID +SRomDumpContents( + _In_reads_bytes_(Length) const VOID* Buffer, + _In_ ULONG Length) +{ + ULONG Offset, Count, i; + const UCHAR* Data = Buffer; + + PAGED_CODE(); + + DbgPrint("SROM data:\n"); + + Offset = 0; + while (Offset < Length) + { + DbgPrint("%04x:\t", Offset); + + Count = min(Length - Offset, 16); + for (i = 0; i < Count; ++i, ++Offset) + { + DbgPrint("0x%02x, ", Data[Offset], (i == 7) ? '-' : ' '); + } + + DbgPrint("\n"); + } +} +#endif // DBG + +static +CODE_SEG("PAGE") +NDIS_STATUS +SRomRead( + _In_ PDC21X4_ADAPTER Adapter) +{ + PDC_SROM_ENTRY SRomEntry; + NDIS_STATUS Status; + BOOLEAN ReleaseImage; + + PAGED_CODE(); + + Status = NdisAllocateMemoryWithTag((PVOID*)&SRomEntry, + FIELD_OFFSET(DC_SROM_ENTRY, SRomImage[EE_SIZE]), + DC21X4_TAG); + if (Status != NDIS_STATUS_SUCCESS) + return NDIS_STATUS_RESOURCES; + NdisZeroMemory(SRomEntry, FIELD_OFFSET(DC_SROM_ENTRY, SRomImage)); + + ReleaseImage = FALSE; + + if (SRomReadSRom(Adapter, SRomEntry->SRomImage)) + { + if (!SRomRegisterMasterAdapter(Adapter, SRomEntry)) + ReleaseImage = TRUE; + } + else + { + NdisFreeMemory(SRomEntry, 0, 0); + + if (!SRomFindMasterAdapter(Adapter, &SRomEntry)) + { + ERR("Failed to retrieve the SROM contents\n"); + return NDIS_STATUS_FAILURE; + } + } + + Status = SRomParse(Adapter, SRomEntry->SRomImage); + if (Status != NDIS_STATUS_SUCCESS) + { + ERR("Failed to parse SROM\n"); + } + +#if DBG + if (Status != NDIS_STATUS_SUCCESS) + SRomDumpContents(SRomEntry->SRomImage, EE_SIZE); +#endif + + if (ReleaseImage) + NdisFreeMemory(SRomEntry, 0, 0); + + return Status; +} + +static +CODE_SEG("PAGE") +BOOLEAN +AddressRomReadData( + _In_ PDC21X4_ADAPTER Adapter, + _Out_writes_all_(EAR_SIZE) PUCHAR AddressRom) +{ + ULONG Data, i, j; + + PAGED_CODE(); + + /* Reset the ROM pointer */ + DC_WRITE(Adapter, DcCsr9_SerialInterface, 0); + + for (i = 0; i < EAR_SIZE; ++i) + { + for (j = 10000; j > 0; --j) + { + NdisStallExecution(1); + Data = DC_READ(Adapter, DcCsr9_SerialInterface); + + if (!(Data & DC_SERIAL_EAR_DN)) + break; + } + AddressRom[i] = Data & DC_SERIAL_EAR_DT; + } + + if (SRomIsEmpty(AddressRom, EAR_SIZE)) + return FALSE; + + return TRUE; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +AddressRomRead( + _In_ PDC21X4_ADAPTER Adapter) +{ + PDC_SROM_ENTRY SRomEntry; + NDIS_STATUS Status; + BOOLEAN ReleaseImage; + + PAGED_CODE(); + + Status = NdisAllocateMemoryWithTag((PVOID*)&SRomEntry, + FIELD_OFFSET(DC_SROM_ENTRY, SRomImage[EAR_SIZE]), + DC21X4_TAG); + if (Status != NDIS_STATUS_SUCCESS) + return NDIS_STATUS_RESOURCES; + NdisZeroMemory(SRomEntry, FIELD_OFFSET(DC_SROM_ENTRY, SRomImage)); + + ReleaseImage = FALSE; + + if (AddressRomReadData(Adapter, SRomEntry->SRomImage)) + { + if (!SRomRegisterMasterAdapter(Adapter, SRomEntry)) + ReleaseImage = TRUE; + } + else + { + NdisFreeMemory(SRomEntry, 0, 0); + + if (!SRomFindMasterAdapter(Adapter, &SRomEntry)) + { + ERR("Failed to retrieve the EAR contents\n"); + return NDIS_STATUS_FAILURE; + } + } + + if (!SRomReadMacAddress(Adapter, SRomEntry->SRomImage, NULL)) + { + ERR("Unable to read the MAC address\n"); + Status = NDIS_STATUS_FAILURE; + } + + /* Update the base address on multiport boards */ + Adapter->PermanentMacAddress[5] += Adapter->ControllerIndex; + +#if DBG + if (Status != NDIS_STATUS_SUCCESS) + SRomDumpContents(SRomEntry->SRomImage, EAR_SIZE); +#endif + + if (ReleaseImage) + NdisFreeMemory(SRomEntry, 0, 0); + + return Status; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +CODE_SEG("PAGE") +VOID +DcFreeEeprom( + _In_ PDC21X4_ADAPTER Adapter) +{ + PDC_SROM_ENTRY SRomEntry; + + PAGED_CODE(); + + SRomEntry = Adapter->SRomEntry; + if (!SRomEntry) + return; + + SRomAcquireListMutex(); + + /* Unregister the port */ + SRomEntry->DeviceBitmap &= ~(1 << Adapter->DeviceNumber); + + /* + * Free the SROM as soon as the last registered port has removed. + * We can't free it in an unload handler + * as the bus numbers can be changed by a resource rebalance. + */ + if (SRomEntry->DeviceBitmap == 0) + { + INFO("Freeing SROM %p at %u:%u\n", + SRomEntry, + SRomEntry->BusNumber, + SRomEntry->DeviceNumber); + + RemoveEntryList(&SRomEntry->ListEntry); + + NdisFreeMemory(SRomEntry, 0, 0); + } + + SRomReleaseListMutex(); +} + +CODE_SEG("PAGE") +NDIS_STATUS +DcReadEeprom( + _In_ PDC21X4_ADAPTER Adapter) +{ + NDIS_STATUS Status; + + PAGED_CODE(); + + if (Adapter->ChipType == DC21040) + { + /* Ethernet Address ROM */ + Status = AddressRomRead(Adapter); + } + else + { + /* MicroWire Compatible Serial EEPROM */ + Status = SRomRead(Adapter); + } + + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + INFO("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + Adapter->PermanentMacAddress[0], + Adapter->PermanentMacAddress[1], + Adapter->PermanentMacAddress[2], + Adapter->PermanentMacAddress[3], + Adapter->PermanentMacAddress[4], + Adapter->PermanentMacAddress[5]); + + if (ETH_IS_BROADCAST(Adapter->PermanentMacAddress) || + ETH_IS_EMPTY(Adapter->PermanentMacAddress) || + ETH_IS_MULTICAST(Adapter->PermanentMacAddress)) + { + ERR("Invalid permanent MAC address %02x:%02x:%02x:%02x:%02x:%02x\n", + Adapter->PermanentMacAddress[0], + Adapter->PermanentMacAddress[1], + Adapter->PermanentMacAddress[2], + Adapter->PermanentMacAddress[3], + Adapter->PermanentMacAddress[4], + Adapter->PermanentMacAddress[5]); + + NdisWriteErrorLogEntry(Adapter->AdapterHandle, NDIS_ERROR_CODE_NETWORK_ADDRESS, 0); + + return NDIS_STATUS_INVALID_ADDRESS; + } + + return NDIS_STATUS_SUCCESS; +} diff --git a/drivers/network/dd/dc21x4/eeprom.h b/drivers/network/dd/dc21x4/eeprom.h new file mode 100644 index 00000000000..58d44202def --- /dev/null +++ b/drivers/network/dd/dc21x4/eeprom.h @@ -0,0 +1,108 @@ +/* + * PROJECT: ReactOS DC21x4 Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: EEPROM specific definitions + * COPYRIGHT: Copyright 2023 Dmitry Borisov <di.sean(a)protonmail.com> + */ + +#pragma once + +#include <pshpack1.h> +typedef struct _DC_SROM_COMPACT_BLOCK +{ + USHORT SelectedConnectionType; + UCHAR GpioDirection; /* 21140 only */ + UCHAR BlockCount; +} DC_SROM_COMPACT_BLOCK, *PDC_SROM_COMPACT_BLOCK; +#include <poppack.h> + +typedef struct _DC_SROM_REPAIR_ENTRY +{ +#if DBG + PCSTR Name; +#endif + PUCHAR InfoLeaf; + ULONG Length; +} DC_SROM_REPAIR_ENTRY, *PDC_SROM_REPAIR_ENTRY; + +typedef struct _DC_SROM_ENTRY +{ + LIST_ENTRY ListEntry; + ULONG BusNumber; + DC_CHIP_TYPE ChipType; + UCHAR DeviceNumber; + ULONG InterruptLevel; + ULONG InterruptVector; + ULONG DeviceBitmap; + UCHAR SRomImage[ANYSIZE_ARRAY]; +} DC_SROM_ENTRY, *PDC_SROM_ENTRY; + +#define SRomIsBlockExtended(Byte) ((Byte) & 0x80) +#define SRomGetExtendedBlockLength(Byte) (((Byte) & 0x7F) + 1) +#define SRomGetMediaCode(Byte) ((Byte) & 0x3F) +#define SRomBlockHasExtendedData(Byte) ((Byte) & 0x40) +#define SRomIsDefaultMedia(Word) ((Word) & 0x4000) +#define SRomMediaHasActivityIndicator(Word) (((Word) & 0x8000) == 0) +#define SRomMediaActivityIsActiveLow(Word) ((Word) & 0x80) +#define SRomMediaGetSenseMask(Word) (1 << (((Word) & 0x0E) >> 1)) +#define SRomCommandToOpMode(Word) (((Word) & 0x71) << 18) +#define SRomMediaAutoSense(Media) ((Media) & 0x800) +#define SRomMediaToMediaNumber(Word) ((Word) & 0x1F) +#define SRomHmrRegAddress(Byte) ((Byte) & 0x1F) + +#define SROM_OPMODE_MASK \ + (DC_OPMODE_PORT_SELECT | \ + DC_OPMODE_PORT_XMIT_10 | \ + DC_OPMODE_PORT_PCS | \ + DC_OPMODE_PORT_SCRAMBLER) + +#define EE_SIZE 128 +#define EAR_SIZE 32 + +#define EAR_TEST_PATTERN 0xAA5500FFAA5500FFULL + +#define EEPROM_CMD_WRITE 5 +#define EEPROM_CMD_READ 6 +#define EEPROM_CMD_ERASE 7 + +#define EEPROM_CMD_LENGTH 3 + +/* + * Various offsets in the SROM + */ +#define SROM_VERSION 18 +#define SROM_CONTROLLER_COUNT 19 +#define SROM_MAC_ADDRESS 20 +#define SROM_DEVICE_NUMBER(n) (26 + ((n) * 3)) +#define SROM_LEAF_OFFSET(n) (27 + ((n) * 3)) +#define SROM_CHECKSUM_V1 126 +#define SROM_CHECKSUM_V2 94 + +/* + * SROM compact and extended format types + */ +#define SROM_BLOCK_TYPE_GPR 0 +#define SROM_BLOCK_TYPE_MII_1 1 +#define SROM_BLOCK_TYPE_SIA 2 +#define SROM_BLOCK_TYPE_MII_2 3 +#define SROM_BLOCK_TYPE_SYM 4 +#define SROM_BLOCK_TYPE_RESET 5 +#define SROM_BLOCK_TYPE_PHY_SHUTDOWN 6 +#define SROM_BLOCK_TYPE_HOMERUN 7 + +#define SROM_MAX_STREAM_REGS 6 + +/* + * SROM media codes + */ +#define SROM_MEDIA_10T 0 +#define SROM_MEDIA_BNC 1 +#define SROM_MEDIA_AUI 2 +#define SROM_MEDIA_100T_HD 3 +#define SROM_MEDIA_10T_FD 4 +#define SROM_MEDIA_100TX_FD 5 +#define SROM_MEDIA_100T4 6 +#define SROM_MEDIA_100FX_HD 7 +#define SROM_MEDIA_100FX_FD 8 +#define SROM_MEDIA_MAX 8 +#define SROM_MEDIA_HMR 18 diff --git a/drivers/network/dd/dc21x4/eeprom_data.c b/drivers/network/dd/dc21x4/eeprom_data.c new file mode 100644 index 00000000000..f00f80b293d --- /dev/null +++ b/drivers/network/dd/dc21x4/eeprom_data.c @@ -0,0 +1,219 @@ +/* + * PROJECT: ReactOS DC21x4 Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: EEPROM data for boards without the standard SROM Format + * COPYRIGHT: Copyright 2023 Dmitry Borisov <di.sean(a)protonmail.com> + */ + +/* Adapted from the Linux tulip driver written by Donald Becker */ + +/* INCLUDES *******************************************************************/ + +#include "dc21x4.h" + +/* GLOBALS ********************************************************************/ + +/* Asante */ +static DC_PG_DATA UCHAR SRompLeafAsante[] = +{ + 0x00, 0x00, 0x94, + + 0x00, 0x08, // Default Autoselect + 0x00, // GPIO direction + 0x01, // 1 block + + 0x80 + 12, // Extended block, 12 bytes + 0x01, // MII + 0x00, // PHY #0 + 0x00, // GPIO stream length + 0x00, // Reset stream length + 0x00, 0x78, // Capabilities + 0xE0, 0x01, // Advertisement + 0x00, 0x50, // FDX + 0x00, 0x18, // TTM +}; + +/* SMC 9332DST */ +static DC_PG_DATA UCHAR SRompLeaf9332[] = +{ + 0x00, 0x00, 0xC0, + + 0x00, 0x08, // Default Autoselect + 0x1F, // GPIO direction + 0x04, // 4 blocks + + 0x00, // GPR 0 + 0x00, // GPIO data + 0x9E, 0x00, // Command 0x009E + + 0x04, // GPR 4 + 0x00, // GPIO data + 0x9E, 0x00, // Command 0x009E + 0x03, // GPR 3 + 0x09, // GPIO data + 0x6D, 0x00, // Command 0x006D + + 0x05, // GPR 5 + 0x09, // GPIO data + 0x6D, 0x00, // Command 0x006D +}; + +/* Cogent EM100 */ +static DC_PG_DATA UCHAR SRompLeafEm100[] = +{ + 0x00, 0x00, 0x92, + + 0x00, 0x08, // Default Autoselect + 0x3F, // GPIO direction + 0x06, // 6 blocks + + 0x07, // GPR 7 + 0x01, // GPIO data + 0x21, 0x80, // Command 0x8021 + + 0x08, // GPR 8 + 0x01, // GPIO data + 0x21, 0x80, // Command 0x8021 + + 0x00, // GPR 0 + 0x01, // GPIO data + 0x9E, 0x00, // Command 0x009E + + 0x04, // GPR 4 + 0x01, // GPIO data + 0x9E, 0x00, // Command 0x009E + + 0x03, // GPR 3 + 0x01, // GPIO data + 0x6D, 0x00, // Command 0x006D + + 0x05, // GPR 5 + 0x01, // GPIO data + 0x6D, 0x00, // Command 0x006D +}; + +/* Maxtech NX-110 */ +static DC_PG_DATA UCHAR SRompLeafNx110[] = +{ + 0x00, 0x00, 0xE8, + + 0x00, 0x08, // Default Autoselect + 0x13, // GPIO direction + 0x05, // 5 blocks + + 0x01, // GPR 1 + 0x10, // GPIO data + 0x9E, 0x00, // Command 0x009E + + 0x00, // GPR 0 + 0x00, // GPIO data + 0x9E, 0x00, // Command 0x009E + + 0x04, // GPR 4 + 0x00, // GPIO data + 0x9E, 0x00, // Command 0x009E + + 0x03, // GPR 3 + 0x03, // GPIO data + 0x6D, 0x00, // Command 0x006D + + 0x05, // GPR 5 + 0x03, // GPIO data + 0x6D, 0x00, // Command 0x006D +}; + +/* Accton EN1207 */ +static DC_PG_DATA UCHAR SRompLeafEn1207[] = +{ + 0x00, 0x00, 0xE8, + + 0x00, 0x08, // Default Autoselect + 0x1F, // GPIO direction + 0x05, // 5 blocks + + 0x01, // GPR 1 + 0x1B, // GPIO data + 0x00, 0x00, // Command 0x0000 + + 0x00, // GPR 0 + 0x0B, // GPIO data + 0x9E, 0x00, // Command 0x009E + + 0x04, // GPR 4 + 0x0B, // GPIO data + 0x9E, 0x00, // Command 0x009E + + 0x03, // GPR 3 + 0x1B, // GPIO data + 0x6D, 0x00, // Command 0x006D + + 0x05, // GPR 5 + 0x1B, // GPIO data + 0x6D, 0x00, // Command 0x006D +}; + +/* NetWinder */ +static DC_PG_DATA UCHAR SRompLeafNetWinder[] = +{ + 0x00, 0x10, 0x57, + + 0x00, 0x08, // Default Autoselect + 0x01, // 1 block + + 0x80 + 21, // Extended block, 21 bytes + 0x03, // MII + 0x01, // PHY #1 + 0x00, // GPIO stream length + 0x03, // Reset stream length + 0x21, 0x08, + 0x00, 0x00, + 0x01, 0x00, + 0x00, 0x00, // Capabilities + 0xE1, 0x01, // Advertisement + 0x00, 0x00, // FDX + 0x00, 0x00, // TTM + 0x00, // PHY cannot be unplugged +}; + +/* Cobalt Microserver */ +static DC_PG_DATA UCHAR SRompLeafCobaltMicroserver[] = +{ + 0x00, 0x10, 0xE0, + + 0x00, 0x08, // Default Autoselect + 0x01, // 1 block + + 0x80 + 21, // Extended block, 21 bytes + 0x03, // MII + 0x00, // PHY #0 + 0x00, // GPIO stream length + 0x04, // Reset stream length + 0x01, 0x08, // Set control mode, GP0 output + 0x00, 0x00, // Drive GP0 Low (RST is active low) + 0x00, 0x08, // Control mode, GP0 input (undriven) + 0x00, 0x00, // Clear control mode + 0x00, 0x78, // Capabilities: 100TX FDX + HDX, 10bT FDX + HDX + 0xE0, 0x01, // Advertise all above + 0x00, 0x50, // FDX all above + 0x00, 0x18, // Set fast TTM in 100bt modes + 0x00, // PHY cannot be unplugged +}; + +#if DBG +#define DEFINE_BOARD(Leaf, Name) { Name, Leaf, sizeof(Leaf) - 3 /* OUI (3 bytes) */} +#else +#define DEFINE_BOARD(Leaf, Name) { Leaf, sizeof(Leaf) - 3 } +#endif + +DC_PG_DATA +DC_SROM_REPAIR_ENTRY SRompRepairData[] = +{ + DEFINE_BOARD(SRompLeafAsante, "Asante"), + DEFINE_BOARD(SRompLeaf9332, "SMC 9332DST"), + DEFINE_BOARD(SRompLeafEm100, "Cogent EM100"), + DEFINE_BOARD(SRompLeafNx110, "Maxtech NX-110"), + DEFINE_BOARD(SRompLeafEn1207, "Accton EN1207"), // Must be defined after the NX-110 + DEFINE_BOARD(SRompLeafNetWinder, "NetWinder"), + DEFINE_BOARD(SRompLeafCobaltMicroserver, "Cobalt Microserver"), + DEFINE_BOARD(NULL, NULL), +}; diff --git a/drivers/network/dd/dc21x4/hardware.c b/drivers/network/dd/dc21x4/hardware.c new file mode 100644 index 00000000000..971c10d6d1a --- /dev/null +++ b/drivers/network/dd/dc21x4/hardware.c @@ -0,0 +1,585 @@ +/* + * PROJECT: ReactOS DC21x4 Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hardware specific functions + * COPYRIGHT: Copyright 2023 Dmitry Borisov <di.sean(a)protonmail.com> + */ + +/* INCLUDES *******************************************************************/ + +#include "dc21x4.h" + +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +VOID +DcDisableHw( + _In_ PDC21X4_ADAPTER Adapter) +{ + ULONG OpMode; + + /* Disable interrupts */ + DC_WRITE(Adapter, DcCsr7_IrqMask, 0); + + /* Stop DMA */ + OpMode = Adapter->OpMode; + OpMode &= ~(DC_OPMODE_RX_ENABLE | DC_OPMODE_TX_ENABLE); + DC_WRITE(Adapter, DcCsr6_OpMode, OpMode); + + /* Put the adapter to snooze mode */ + DcPowerSave(Adapter, TRUE); + + /* Perform a software reset */ + DC_WRITE(Adapter, DcCsr0_BusMode, DC_BUS_MODE_SOFT_RESET); +} + +VOID +DcStopTxRxProcess( + _In_ PDC21X4_ADAPTER Adapter) +{ + ULONG i, OpMode, Status; + + OpMode = Adapter->OpMode; + OpMode &= ~(DC_OPMODE_RX_ENABLE | DC_OPMODE_TX_ENABLE); + DC_WRITE(Adapter, DcCsr6_OpMode, OpMode); + + for (i = 0; i < 5000; ++i) + { + Status = DC_READ(Adapter, DcCsr5_Status); + + if (((Status & DC_STATUS_TX_STATE_MASK) == DC_STATUS_TX_STATE_STOPPED) && + ((Status & DC_STATUS_RX_STATE_MASK) == DC_STATUS_RX_STATE_STOPPED)) + { + return; + } + + NdisStallExecution(10); + } + + WARN("Failed to stop the TX/RX process 0x%08lx\n", Status); +} + +VOID +DcWriteGpio( + _In_ PDC21X4_ADAPTER Adapter, + _In_ ULONG Value) +{ + ULONG Data, Register; + + /* Some chips don't have a separate GPIO register */ + if (Adapter->Features & DC_SIA_GPIO) + { + Data = Adapter->SiaSetting; + Data &= 0x0000FFFF; /* SIA */ + Data |= Value << 16; /* GPIO */ + Adapter->SiaSetting = Data; + + Register = DcCsr15_SiaGeneral; + } + else + { + Data = Value; + Register = DcCsr12_Gpio; + } + DC_WRITE(Adapter, Register, Data); +} + +VOID +DcWriteSia( + _In_ PDC21X4_ADAPTER Adapter, + _In_ ULONG Csr13, + _In_ ULONG Csr14, + _In_ ULONG Csr15) +{ + ULONG SiaConn, SiaGen; + + TRACE("CSR13 %08lx, CSR14 %08lx, CSR15 %08lx\n", Csr13, Csr14, Csr15); + + SiaConn = 0; + + /* The 21145 comes with 16 new bits in CSR13 */ + if (Adapter->Features & DC_SIA_ANALOG_CONTROL) + { + SiaConn = Adapter->AnalogControl; + } + + /* Reset the transceiver */ + DC_WRITE(Adapter, DcCsr13_SiaConnectivity, SiaConn | DC_SIA_CONN_RESET); + NdisStallExecution(20); + + /* Some chips don't have a separate GPIO register */ + if (Adapter->Features & DC_SIA_GPIO) + { + SiaGen = Adapter->SiaSetting; + SiaGen &= 0xFFFF0000; /* GPIO */ + SiaGen |= Csr15; /* SIA */ + Adapter->SiaSetting = SiaGen; + } + else + { + SiaGen = Csr15; + } + + DC_WRITE(Adapter, DcCsr14_SiaTxRx, Csr14); + DC_WRITE(Adapter, DcCsr15_SiaGeneral, SiaGen); + + /* Don't reset the transceiver twice */ + if (Csr13 == DC_SIA_CONN_RESET) + return; + + DC_WRITE(Adapter, DcCsr13_SiaConnectivity, SiaConn | Csr13); +} + +VOID +DcTestPacket( + _In_ PDC21X4_ADAPTER Adapter) +{ + PDC_TCB Tcb; + PDC_TBD Tbd; + ULONG FrameNumber; + + Adapter->MediaTestStatus = FALSE; + Adapter->ModeFlags |= DC_MODE_TEST_PACKET; + + if (!Adapter->LoopbackFrameSlots) + { + ERR("Failed to complete test packets, CSR12 %08lx, CSR5 %08lx\n", + DC_READ(Adapter, DcCsr12_SiaStatus), + DC_READ(Adapter, DcCsr5_Status)); + + /* Try to recover the lost TX buffers */ + NdisScheduleWorkItem(&Adapter->TxRecoveryWorkItem); + return; + } + + --Adapter->LoopbackFrameSlots; + + FrameNumber = (Adapter->LoopbackFrameNumber++) % DC_LOOPBACK_FRAMES; + + Tbd = Adapter->CurrentTbd; + Adapter->CurrentTbd = DC_NEXT_TBD(Adapter, Tbd); + + Tcb = Adapter->CurrentTcb; + Adapter->CurrentTcb = DC_NEXT_TCB(Adapter, Tcb); + + Tcb->Tbd = Tbd; + Tcb->Packet = NULL; + + ASSERT(!(Tbd->Status & DC_TBD_STATUS_OWNED)); + + /* Put the loopback frame on the transmit ring */ + Tbd->Address1 = Adapter->LoopbackFramePhys[FrameNumber]; + Tbd->Address2 = 0; + Tbd->Control &= DC_TBD_CONTROL_END_OF_RING; + Tbd->Control |= DC_LOOPBACK_FRAME_SIZE | + DC_TBD_CONTROL_FIRST_FRAGMENT | + DC_TBD_CONTROL_LAST_FRAGMENT | + DC_TBD_CONTROL_REQUEST_INTERRUPT; + DC_WRITE_BARRIER(); + Tbd->Status = DC_TBD_STATUS_OWNED; + + /* Send the loopback packet to verify connectivity of a media */ + DC_WRITE(Adapter, DcCsr1_TxPoll, DC_TX_POLL_DOORBELL); +} + +BOOLEAN +DcSetupFrameDownload( + _In_ PDC21X4_ADAPTER Adapter, + _In_ BOOLEAN WaitForCompletion) +{ + PDC_TCB Tcb; + PDC_TBD Tbd; + ULONG i, Control; + + Tbd = Adapter->CurrentTbd; + + /* Ensure correct setup frame processing */ + if (Tbd != Adapter->HeadTbd) + { + ASSERT(!(Tbd->Status & DC_TBD_STATUS_OWNED)); + + /* Put the null frame on the transmit ring */ + Tbd->Control &= DC_TBD_CONTROL_END_OF_RING; + Tbd->Address1 = 0; + Tbd->Address2 = 0; + DC_WRITE_BARRIER(); + Tbd->Status = DC_TBD_STATUS_OWNED; + + Tbd = DC_NEXT_TBD(Adapter, Tbd); + } + + Adapter->CurrentTbd = DC_NEXT_TBD(Adapter, Tbd); + + Tcb = Adapter->CurrentTcb; + Adapter->CurrentTcb = DC_NEXT_TCB(Adapter, Tcb); + + Tcb->Tbd = Tbd; + Tcb->Packet = NULL; + + ASSERT(!(Tbd->Status & DC_TBD_STATUS_OWNED)); + + /* Prepare the setup frame */ + Tbd->Address1 = Adapter->SetupFramePhys; + Tbd->Address2 = 0; + Tbd->Control &= DC_TBD_CONTROL_END_OF_RING; + Control = DC_SETUP_FRAME_SIZE | DC_TBD_CONTROL_SETUP_FRAME; + if (!WaitForCompletion) + Control |= DC_TBD_CONTROL_REQUEST_INTERRUPT; + if (Adapter->ProgramHashPerfectFilter) + Control |= DC_TBD_CONTROL_HASH_PERFECT_FILTER; + Tbd->Control |= Control; + DC_WRITE_BARRIER(); + Tbd->Status = DC_TBD_STATUS_OWNED; + + DC_WRITE(Adapter, DcCsr1_TxPoll, DC_TX_POLL_DOORBELL); + + if (!WaitForCompletion) + return TRUE; + + /* Wait up to 500 ms for the chip to process the setup frame */ + for (i = 50000; i > 0; --i) + { + NdisStallExecution(10); + + KeMemoryBarrierWithoutFence(); + if (!(Tbd->Status & DC_TBD_STATUS_OWNED)) + break; + } + if (i == 0) + { + ERR("Failed to complete setup frame %08lx\n", Tbd->Status); + return FALSE; + } + + return TRUE; +} + +CODE_SEG("PAGE") +VOID +DcSetupFrameInitialize( + _In_ PDC21X4_ADAPTER Adapter) +{ + PULONG SetupFrame, SetupFrameStart; + PUSHORT MacAddress; + ULONG i; + + PAGED_CODE(); + + SetupFrame = Adapter->SetupFrame; + + /* Add the physical address entry */ + MacAddress = (PUSHORT)Adapter->CurrentMacAddress; + *SetupFrame++ = DC_SETUP_FRAME_ENTRY(MacAddress[0]); + *SetupFrame++ = DC_SETUP_FRAME_ENTRY(MacAddress[1]); + *SetupFrame++ = DC_SETUP_FRAME_ENTRY(MacAddress[2]); + + /* Pad to 16 addresses */ + SetupFrameStart = Adapter->SetupFrame; + for (i = 1; i < DC_SETUP_FRAME_PERFECT_FILTER_ADDRESSES; ++i) + { + *SetupFrame++ = SetupFrameStart[0]; + *SetupFrame++ = SetupFrameStart[1]; + *SetupFrame++ = SetupFrameStart[2]; + } +} + +static +VOID +DcSetupFramePerfectFiltering( + _In_ PDC21X4_ADAPTER Adapter) +{ + PULONG SetupFrame, SetupFrameStart; + PUSHORT MacAddress; + ULONG i; + + SetupFrame = Adapter->SetupFrame; + + /* Add the physical address entry */ + MacAddress = (PUSHORT)Adapter->CurrentMacAddress; + *SetupFrame++ = DC_SETUP_FRAME_ENTRY(MacAddress[0]); + *SetupFrame++ = DC_SETUP_FRAME_ENTRY(MacAddress[1]); + *SetupFrame++ = DC_SETUP_FRAME_ENTRY(MacAddress[2]); + + /* Store multicast addresses */ + for (i = 0; i < Adapter->MulticastCount; ++i) + { + MacAddress = (PUSHORT)Adapter->MulticastList[i].MacAddress; + + *SetupFrame++ = DC_SETUP_FRAME_ENTRY(MacAddress[0]); + *SetupFrame++ = DC_SETUP_FRAME_ENTRY(MacAddress[1]); + *SetupFrame++ = DC_SETUP_FRAME_ENTRY(MacAddress[2]); + } + + ++i; + + /* Add the broadcast address entry */ + if (Adapter->PacketFilter & NDIS_PACKET_TYPE_BROADCAST) + { + *SetupFrame++ = DC_SETUP_FRAME_ENTRY(0x0000FFFF); + *SetupFrame++ = DC_SETUP_FRAME_ENTRY(0x0000FFFF); + *SetupFrame++ = DC_SETUP_FRAME_ENTRY(0x0000FFFF); + + ++i; + } + + /* Pad to 16 addresses */ + SetupFrameStart = Adapter->SetupFrame; + while (i < DC_SETUP_FRAME_PERFECT_FILTER_ADDRESSES) + { + *SetupFrame++ = SetupFrameStart[0]; + *SetupFrame++ = SetupFrameStart[1]; + *SetupFrame++ = SetupFrameStart[2]; + + ++i; + } +} + +static +VOID +DcSetupFrameImperfectFiltering( + _In_ PDC21X4_ADAPTER Adapter) +{ + PULONG SetupFrame = Adapter->SetupFrame; + PUSHORT MacAddress; + ULONG Hash, i; + + RtlZeroMemory(SetupFrame, DC_SETUP_FRAME_SIZE); + + /* Fill up the 512-bit multicast hash table */ + for (i = 0; i < Adapter->MulticastCount; ++i) + { + MacAddress = (PUSHORT)Adapter->MulticastList[i].MacAddress; + + /* Only need lower 9 bits of the hash */ + Hash = DcEthernetCrc(MacAddress, ETH_LENGTH_OF_ADDRESS); + Hash &= 512 - 1; + SetupFrame[Hash / 16] |= 1 << (Hash % 16); + } + + /* Insert the broadcast address hash to the bin */ + if (Adapter->PacketFilter & NDIS_PACKET_TYPE_BROADCAST) + { + Hash = DC_SETUP_FRAME_BROADCAST_HASH; + SetupFrame[Hash / 16] |= 1 << (Hash % 16); + } + + /* Add the physical address entry */ + MacAddress = (PUSHORT)Adapter->CurrentMacAddress; + SetupFrame[39] = DC_SETUP_FRAME_ENTRY(MacAddress[0]); + SetupFrame[40] = DC_SETUP_FRAME_ENTRY(MacAddress[1]); + SetupFrame[41] = DC_SETUP_FRAME_ENTRY(MacAddress[2]); +} + +NDIS_STATUS +DcUpdateMulticastList( + _In_ PDC21X4_ADAPTER Adapter) +{ + BOOLEAN UsePerfectFiltering; + + /* If more than 14 addresses are requested, switch to hash filtering mode */ + UsePerfectFiltering = (Adapter->MulticastCount <= DC_SETUP_FRAME_ADDRESSES); + + Adapter->ProgramHashPerfectFilter = UsePerfectFiltering; + Adapter->OidPending = TRUE; + + if (UsePerfectFiltering) + DcSetupFramePerfectFiltering(Adapter); + else + DcSetupFrameImperfectFiltering(Adapter); + + NdisAcquireSpinLock(&Adapter->SendLock); + + DcSetupFrameDownload(Adapter, FALSE); + + NdisReleaseSpinLock(&Adapter->SendLock); + + return NDIS_STATUS_PENDING; +} + +NDIS_STATUS +DcApplyPacketFilter( + _In_ PDC21X4_ADAPTER Adapter, + _In_ ULONG PacketFilter) +{ + ULONG OpMode, OldPacketFilter; + + INFO("Packet filter value 0x%lx\n", PacketFilter); + + NdisAcquireSpinLock(&Adapter->ModeLock); + + /* Update the filtering mode */ + OpMode = Adapter->OpMode; + OpMode &= ~(DC_OPMODE_RX_PROMISCUOUS | DC_OPMODE_RX_ALL_MULTICAST); + if (PacketFilter & NDIS_PACKET_TYPE_PROMISCUOUS) + { + OpMode |= DC_OPMODE_RX_PROMISCUOUS; + } + else if (PacketFilter & NDIS_PACKET_TYPE_ALL_MULTICAST) + { + OpMode |= DC_OPMODE_RX_ALL_MULTICAST; + } + Adapter->OpMode = OpMode; + DC_WRITE(Adapter, DcCsr6_OpMode, OpMode); + + NdisReleaseSpinLock(&Adapter->ModeLock); + + OldPacketFilter = Adapter->PacketFilter; + Adapter->PacketFilter = PacketFilter; + + /* Program the NIC to receive or reject broadcast frames */ + if ((OldPacketFilter ^ PacketFilter) & NDIS_PACKET_TYPE_BROADCAST) + { + return DcUpdateMulticastList(Adapter); + } + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +VOID +DcSoftReset( + _In_ PDC21X4_ADAPTER Adapter) +{ + PAGED_CODE(); + + /* Linux driver does this */ + if (Adapter->Features & DC_HAS_MII) + { + /* Select the MII/SYM port */ + DC_WRITE(Adapter, DcCsr6_OpMode, DC_OPMODE_PORT_SELECT); + } + + /* Perform a software reset */ + DC_WRITE(Adapter, DcCsr0_BusMode, DC_BUS_MODE_SOFT_RESET); + NdisMSleep(100); + DC_WRITE(Adapter, DcCsr0_BusMode, Adapter->BusMode); +} + +CODE_SEG("PAGE") +NDIS_STATUS +DcSetupAdapter( + _In_ PDC21X4_ADAPTER Adapter) +{ + PAGED_CODE(); + + DcInitTxRing(Adapter); + DcInitRxRing(Adapter); + + /* Initial values */ + if (!MEDIA_IS_FIXED(Adapter)) + { + Adapter->LinkSpeedMbps = 10; + } + Adapter->MediaNumber = Adapter->DefaultMedia; + Adapter->ModeFlags &= ~(DC_MODE_PORT_AUTOSENSE | DC_MODE_AUI_FAILED | DC_MODE_BNC_FAILED | + DC_MODE_TEST_PACKET | DC_MODE_AUTONEG_MASK); + + DcSoftReset(Adapter); + + /* Receive descriptor ring buffer */ + DC_WRITE(Adapter, DcCsr3_RxRingAddress, Adapter->RbdPhys); + + /* Transmit descriptor ring buffer */ + DC_WRITE(Adapter, DcCsr4_TxRingAddress, Adapter->TbdPhys); + + switch (Adapter->ChipType) + { + case DC21040: + { + DcWriteSia(Adapter, + Adapter->Media[Adapter->MediaNumber].Csr13, + Adapter->Media[Adapter->MediaNumber].Csr14, + Adapter->Media[Adapter->MediaNumber].Csr15); + + /* Explicitly specifed by user */ + if (Adapter->MediaNumber == MEDIA_10T_FD) + { + Adapter->OpMode |= DC_OPMODE_FULL_DUPLEX; + } + break; + } + + case DC21041: + { + MediaSiaSelect(Adapter); + break; + } + + case DC21140: + { + if (Adapter->MediaNumber == MEDIA_MII) + { + MediaSelectMiiPort(Adapter, !(Adapter->Flags & DC_FIRST_SETUP)); + MediaMiiSelect(Adapter); + } + else + { + /* All media use the same GPIO directon */ + DC_WRITE(Adapter, DcCsr12_Gpio, Adapter->Media[Adapter->MediaNumber].GpioCtrl); + NdisStallExecution(10); + + MediaGprSelect(Adapter); + } + break; + } + + case DC21143: + case DC21145: + { + /* Init the HPNA PHY */ + if ((Adapter->MediaBitmap & (1 << MEDIA_HMR)) && Adapter->HpnaInitBitmap) + { + HpnaPhyInit(Adapter); + } + + if (Adapter->MediaNumber == MEDIA_MII) + { + MediaSelectMiiPort(Adapter, !(Adapter->Flags & DC_FIRST_SETUP)); + MediaMiiSelect(Adapter); + break; + } + + /* If the current media is FX, assume we have a link */ + if (MEDIA_IS_FX(Adapter->MediaNumber)) + { + Adapter->LinkUp = TRUE; + + NdisMIndicateStatus(Adapter->AdapterHandle, + NDIS_STATUS_MEDIA_CONNECT, + NULL, + 0); + NdisMIndicateStatusComplete(Adapter->AdapterHandle); + } + + MediaSiaSelect(Adapter); + break; + } + + default: + ASSERT(FALSE); + UNREACHABLE; + break; + } + + /* Start the TX process */ + Adapter->OpMode |= DC_OPMODE_TX_ENABLE; + DC_WRITE(Adapter, DcCsr6_OpMode, Adapter->OpMode); + + /* Load the address recognition RAM */ + if (!DcSetupFrameDownload(Adapter, TRUE)) + { + /* This normally should not happen */ + ASSERT(FALSE); + + NdisWriteErrorLogEntry(Adapter->AdapterHandle, + NDIS_ERROR_CODE_HARDWARE_FAILURE, + 1, + __LINE__); + + return NDIS_STATUS_HARD_ERRORS; + } + + return NDIS_STATUS_SUCCESS; +} diff --git a/drivers/network/dd/dc21x4/init.c b/drivers/network/dd/dc21x4/init.c new file mode 100644 index 00000000000..1bcec4d9a65 --- /dev/null +++ b/drivers/network/dd/dc21x4/init.c @@ -0,0 +1,1321 @@ +/* + * PROJECT: ReactOS DC21x4 Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Miniport initialization helper routines + * COPYRIGHT: Copyright 2023 Dmitry Borisov <di.sean(a)protonmail.com> + */ + +/* INCLUDES *******************************************************************/ + +#include "dc21x4.h" + +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* + * The driver must align the buffers on a 4 byte boundary to meet the hardware requirement. + * We stick with cache alignment to get better performance. + */ +C_ASSERT((SYSTEM_CACHE_ALIGNMENT_SIZE % DC_RECEIVE_BUFFER_ALIGNMENT) == 0); +C_ASSERT((SYSTEM_CACHE_ALIGNMENT_SIZE % DC_DESCRIPTOR_ALIGNMENT) == 0); +C_ASSERT((SYSTEM_CACHE_ALIGNMENT_SIZE % DC_SETUP_FRAME_ALIGNMENT) == 0); + +/* Errata: The end of receive buffer must not fall on a cache boundary */ +#define DC_RECEIVE_BUFFER_SIZE (DC_RECEIVE_BLOCK_SIZE - 4) +C_ASSERT((DC_RECEIVE_BUFFER_SIZE % 32) != 0); + +#define DC_MEM_BLOCK_SIZE_RCB \ + (DC_RECEIVE_BLOCK_SIZE + SYSTEM_CACHE_ALIGNMENT_SIZE - 1) + +#define DC_MEM_BLOCK_SIZE_RBD \ + (sizeof(DC_RBD) * DC_RECEIVE_BUFFERS_DEFAULT + SYSTEM_CACHE_ALIGNMENT_SIZE - 1) + +#define DC_MEM_BLOCK_SIZE_TBD_AUX \ + (sizeof(DC_TBD) * DC_TRANSMIT_DESCRIPTORS + SYSTEM_CACHE_ALIGNMENT_SIZE - 1 + \ + DC_SETUP_FRAME_SIZE + SYSTEM_CACHE_ALIGNMENT_SIZE - 1 + \ + DC_LOOPBACK_FRAME_SIZE * DC_LOOPBACK_FRAMES + SYSTEM_CACHE_ALIGNMENT_SIZE - 1) + +#define DC_MEM_BLOCK_SIZE_TX_BUFFER \ + (DC_TRANSMIT_BLOCK_SIZE + SYSTEM_CACHE_ALIGNMENT_SIZE - 1) + +/* FUNCTIONS ******************************************************************/ + +static +CODE_SEG("PAGE") +VOID +DcConfigQueryInteger( + _In_ NDIS_HANDLE ConfigurationHandle, + _In_ PCWSTR EntryName, + _Out_ PULONG EntryContext, + _In_ ULONG DefaultValue, + _In_ ULONG Minimum, + _In_ ULONG Maximum) +{ + NDIS_STATUS Status; + UNICODE_STRING Keyword; + PNDIS_CONFIGURATION_PARAMETER ConfigurationParameter; + + PAGED_CODE(); + + NdisInitUnicodeString(&Keyword, EntryName); + NdisReadConfiguration(&Status, + &ConfigurationParameter, + ConfigurationHandle, + &Keyword, + NdisParameterInteger); + if (Status != NDIS_STATUS_SUCCESS) + { + TRACE("'%S' request failed, default value %u\n", EntryName, DefaultValue); + + *EntryContext = DefaultValue; + return; + } + + if (ConfigurationParameter->ParameterData.IntegerData >= Minimum && + ConfigurationParameter->ParameterData.IntegerData <= Maximum) + { + *EntryContext = ConfigurationParameter->ParameterData.IntegerData; + } + else + { + WARN("'%S' value out of range\n", EntryName); + + *EntryContext = DefaultValue; + } + + TRACE("Set '%S' to %u\n", EntryName, *EntryContext); +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +DcReadConfiguration( + _In_ PDC21X4_ADAPTER Adapter) +{ + NDIS_STATUS Status; + NDIS_HANDLE ConfigurationHandle; + PUCHAR NetworkAddress; + UINT Length; + ULONG GenericUlong; + + PAGED_CODE(); + + NdisOpenConfiguration(&Status, + &ConfigurationHandle, + Adapter->WrapperConfigurationHandle); + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + DcConfigQueryInteger(ConfigurationHandle, + L"SpeedDuplex", + &GenericUlong, + MEDIA_AUTO, + MEDIA_10T, + MEDIA_HMR); + Adapter->DefaultMedia = GenericUlong; + + NdisReadNetworkAddress(&Status, + (PVOID*)&NetworkAddress, + &Length, + ConfigurationHandle); + if ((Status == NDIS_STATUS_SUCCESS) && (Length == ETH_LENGTH_OF_ADDRESS)) + { + if (ETH_IS_MULTICAST(NetworkAddress) || + ETH_IS_EMPTY(NetworkAddress) || + ETH_IS_BROADCAST(NetworkAddress) || + !ETH_IS_LOCALLY_ADMINISTERED(NetworkAddress)) + { + ERR("Invalid software MAC address: %02x:%02x:%02x:%02x:%02x:%02x\n", + NetworkAddress[0], + NetworkAddress[1], + NetworkAddress[2], + NetworkAddress[3], + NetworkAddress[4], + NetworkAddress[5]); + } + else + { + INFO("Using software MAC address\n"); + + /* Override the MAC address */ + NdisMoveMemory(Adapter->CurrentMacAddress, NetworkAddress, ETH_LENGTH_OF_ADDRESS); + } + } + + NdisCloseConfiguration(ConfigurationHandle); + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +VOID +DcFreeRcb( + _In_ PDC21X4_ADAPTER Adapter, + _In_ __drv_freesMem(Mem) PDC_RCB Rcb) +{ + PAGED_CODE(); + + if (Rcb->VirtualAddressOriginal) + { + NdisMFreeSharedMemory(Adapter->AdapterHandle, + DC_MEM_BLOCK_SIZE_RCB, + TRUE, /* Cached */ + Rcb->VirtualAddressOriginal, + Rcb->PhysicalAddressOriginal); + } + + if (Rcb->NdisBuffer) + NdisFreeBuffer(Rcb->NdisBuffer); + if (Rcb->Packet) + NdisFreePacket(Rcb->Packet); + + NdisFreeMemory(Rcb, sizeof(*Rcb), 0); +} + +static +CODE_SEG("PAGE") +PDC_RCB +DcAllocateRcb( + _In_ PDC21X4_ADAPTER Adapter) +{ + NDIS_STATUS Status; + PDC_RCB Rcb; + PVOID VirtualAddress; + NDIS_PHYSICAL_ADDRESS PhysicalAddress; + + PAGED_CODE(); + + Status = NdisAllocateMemoryWithTag((PVOID*)&Rcb, sizeof(*Rcb), DC21X4_TAG); + if (Status != NDIS_STATUS_SUCCESS) + return NULL; + NdisZeroMemory(Rcb, sizeof(*Rcb)); + + NdisMAllocateSharedMemory(Adapter->AdapterHandle, + DC_MEM_BLOCK_SIZE_RCB, + TRUE, /* Cached */ + &VirtualAddress, + &PhysicalAddress); + if (!VirtualAddress) + goto Failure; + + /* 32-bit DMA */ + ASSERT(PhysicalAddress.HighPart == 0); + + Rcb->VirtualAddress = ALIGN_UP_POINTER_BY(VirtualAddress, SYSTEM_CACHE_ALIGNMENT_SIZE); + Rcb->PhysicalAddress = ALIGN_UP_BY(PhysicalAddress.LowPart, SYSTEM_CACHE_ALIGNMENT_SIZE); + + ASSERT((Rcb->PhysicalAddress % DC_RECEIVE_BUFFER_ALIGNMENT) == 0); + + Rcb->VirtualAddressOriginal = VirtualAddress; + Rcb->PhysicalAddressOriginal.QuadPart = PhysicalAddress.QuadPart; + + NdisAllocatePacket(&Status, &Rcb->Packet, Adapter->PacketPool); + if (Status != NDIS_STATUS_SUCCESS) + goto Failure; + + *DC_RCB_FROM_PACKET(Rcb->Packet) = Rcb; + + NdisAllocateBuffer(&Status, + &Rcb->NdisBuffer, + Adapter->BufferPool, + Rcb->VirtualAddress, + DC_RECEIVE_BLOCK_SIZE); + if (Status != NDIS_STATUS_SUCCESS) + goto Failure; + + NDIS_SET_PACKET_HEADER_SIZE(Rcb->Packet, DC_ETHERNET_HEADER_SIZE); + NdisChainBufferAtFront(Rcb->Packet, Rcb->NdisBuffer); + + PushEntryList(&Adapter->AllocRcbList, &Rcb->AllocListEntry); + + return Rcb; + +Failure: + DcFreeRcb(Adapter, Rcb); + + return NULL; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +DcAllocateReceiveBuffers( + _In_ PDC21X4_ADAPTER Adapter) +{ + ULONG i; + NDIS_STATUS Status; + PDC_RCB Rcb; + + PAGED_CODE(); + + NdisAllocatePacketPool(&Status, + &Adapter->PacketPool, + DC_RECEIVE_BUFFERS_DEFAULT + DC_RECEIVE_BUFFERS_EXTRA, + PROTOCOL_RESERVED_SIZE_IN_PACKET); + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + NdisAllocateBufferPool(&Status, + &Adapter->BufferPool, + DC_RECEIVE_BUFFERS_DEFAULT + DC_RECEIVE_BUFFERS_EXTRA); + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + /* Allocate RCBs */ + for (i = 0; i < DC_RECEIVE_BUFFERS_DEFAULT; ++i) + { + Rcb = DcAllocateRcb(Adapter); + if (!Rcb) + { + WARN("RCB allocation failed, total buffers %u\n", Adapter->RcbCount); + break; + } + + PushEntryList(&Adapter->UsedRcbList, &Rcb->ListEntry); + + ++Adapter->RcbCount; + } + + if (Adapter->RcbCount < DC_RECEIVE_BUFFERS_MIN) + return NDIS_STATUS_RESOURCES; + + Adapter->RcbFree = Adapter->RcbCount; + + /* Fix up the ring size */ + Adapter->TailRbd = Adapter->HeadRbd + Adapter->RcbCount - 1; + + /* Allocate extra RCBs for receive indication */ + for (i = 0; i < DC_RECEIVE_BUFFERS_EXTRA; ++i) + { + Rcb = DcAllocateRcb(Adapter); + if (!Rcb) + { + WARN("Extra RCB allocation failed\n"); + break; + } + + PushEntryList(&Adapter->FreeRcbList, &Rcb->ListEntry); + } + + Status = NdisAllocateMemoryWithTag((PVOID*)&Adapter->RcbArray, + sizeof(PVOID) * Adapter->RcbCount, + DC21X4_TAG); + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +DcAllocateReceiveDescriptors( + _In_ PDC21X4_ADAPTER Adapter) +{ + PDC_RBD Rbd; + + PAGED_CODE(); + + NdisMAllocateSharedMemory(Adapter->AdapterHandle, + DC_MEM_BLOCK_SIZE_RBD, + FALSE, /* Non-cached */ + &Adapter->RbdOriginal, + &Adapter->RbdPhysOriginal); + if (!Adapter->RbdOriginal) + return NDIS_STATUS_RESOURCES; + + /* 32-bit DMA */ + ASSERT(Adapter->RbdPhysOriginal.HighPart == 0); + + Adapter->RbdPhys = ALIGN_UP_BY(Adapter->RbdPhysOriginal.LowPart, SYSTEM_CACHE_ALIGNMENT_SIZE); + + ASSERT((Adapter->RbdPhys % DC_DESCRIPTOR_ALIGNMENT) == 0); + + Rbd = ALIGN_UP_POINTER_BY(Adapter->RbdOriginal, SYSTEM_CACHE_ALIGNMENT_SIZE); + + Adapter->HeadRbd = Rbd; + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +DcAllocateTransmitBlocks( + _In_ PDC21X4_ADAPTER Adapter) +{ + PDC_TCB Tcb; + NDIS_STATUS Status; + + PAGED_CODE(); + + Status = NdisAllocateMemoryWithTag((PVOID*)&Tcb, + DC_TRANSMIT_BLOCKS * sizeof(*Tcb), + DC21X4_TAG); + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + NdisZeroMemory(Tcb, DC_TRANSMIT_BLOCKS * sizeof(*Tcb)); + + Adapter->HeadTcb = Tcb; + Adapter->TailTcb = Tcb + (DC_TRANSMIT_BLOCKS - 1); + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +DcAllocateTransmitDescriptorsAndBuffers( + _In_ PDC21X4_ADAPTER Adapter) +{ + ULONG_PTR BufferVa, BufferPa; + NDIS_STATUS Status; + ULONG i; + + PAGED_CODE(); + + NdisMAllocateSharedMemory(Adapter->AdapterHandle, + DC_MEM_BLOCK_SIZE_TBD_AUX, + FALSE, /* Non-cached */ + &Adapter->TbdOriginal, + &Adapter->TbdPhysOriginal); + if (!Adapter->TbdOriginal) + return NDIS_STATUS_RESOURCES; + + /* 32-bit DMA */ + ASSERT(Adapter->TbdPhysOriginal.HighPart == 0); + + BufferVa = (ULONG_PTR)Adapter->TbdOriginal; + BufferPa = Adapter->TbdPhysOriginal.LowPart; + + BufferVa = ALIGN_UP_BY(BufferVa, SYSTEM_CACHE_ALIGNMENT_SIZE); + BufferPa = ALIGN_UP_BY(BufferPa, SYSTEM_CACHE_ALIGNMENT_SIZE); + + ASSERT((BufferPa % DC_DESCRIPTOR_ALIGNMENT) == 0); + + Adapter->TbdPhys = (ULONG)BufferPa; + Adapter->HeadTbd = (PDC_TBD)BufferVa; + Adapter->TailTbd = (PDC_TBD)BufferVa + DC_TRANSMIT_DESCRIPTORS - 1; + + BufferVa += sizeof(DC_TBD) * DC_TRANSMIT_DESCRIPTORS; + BufferPa += sizeof(DC_TBD) * DC_TRANSMIT_DESCRIPTORS; + + BufferVa = ALIGN_UP_BY(BufferVa, SYSTEM_CACHE_ALIGNMENT_SIZE); + BufferPa = ALIGN_UP_BY(BufferPa, SYSTEM_CACHE_ALIGNMENT_SIZE); + + ASSERT((BufferPa % DC_SETUP_FRAME_ALIGNMENT) == 0); + + Adapter->SetupFrame = (PVOID)BufferVa; + Adapter->SetupFramePhys = BufferPa; + + BufferVa += DC_SETUP_FRAME_SIZE; + BufferPa += DC_SETUP_FRAME_SIZE; + + BufferVa = ALIGN_UP_BY(BufferVa, SYSTEM_CACHE_ALIGNMENT_SIZE); + BufferPa = ALIGN_UP_BY(BufferPa, SYSTEM_CACHE_ALIGNMENT_SIZE); + + for (i = 0; i < DC_LOOPBACK_FRAMES; ++i) + { + Adapter->LoopbackFrame[i] = (PVOID)BufferVa; + Adapter->LoopbackFramePhys[i] = BufferPa; + + BufferVa += DC_LOOPBACK_FRAME_SIZE; + BufferPa += DC_LOOPBACK_FRAME_SIZE; + } + + if (Adapter->Features & DC_HAS_POWER_MANAGEMENT) + { + Status = NdisAllocateMemoryWithTag((PVOID*)&Adapter->SetupFrameSaved, + DC_SETUP_FRAME_SIZE, + DC21X4_TAG); + if (Status != NDIS_STATUS_SUCCESS) + return Status; + } + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +DcAllocateTransmitBuffers( + _In_ PDC21X4_ADAPTER Adapter) +{ + PDC_COALESCE_BUFFER CoalesceBuffer; + NDIS_STATUS Status; + ULONG i; + + PAGED_CODE(); + + Status = NdisAllocateMemoryWithTag((PVOID*)&CoalesceBuffer, + DC_TRANSMIT_BUFFERS * sizeof(*CoalesceBuffer), + DC21X4_TAG); + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + NdisZeroMemory(CoalesceBuffer, DC_TRANSMIT_BUFFERS * sizeof(*CoalesceBuffer)); + + Adapter->CoalesceBuffer = CoalesceBuffer; + + for (i = 0; i < DC_TRANSMIT_BUFFERS; ++i) + { + PVOID VirtualAddress; + NDIS_PHYSICAL_ADDRESS PhysicalAddress; + + NdisMAllocateSharedMemory(Adapter->AdapterHandle, + DC_MEM_BLOCK_SIZE_TX_BUFFER, + FALSE, /* Non-cached */ + &VirtualAddress, + &PhysicalAddress); + if (!VirtualAddress) + continue; + + ASSERT(PhysicalAddress.HighPart == 0); + + CoalesceBuffer->VirtualAddress = + ALIGN_UP_POINTER_BY(VirtualAddress, SYSTEM_CACHE_ALIGNMENT_SIZE); + CoalesceBuffer->PhysicalAddress = + ALIGN_UP_BY(PhysicalAddress.LowPart, SYSTEM_CACHE_ALIGNMENT_SIZE); + + Adapter->SendBufferData[i].PhysicalAddress.QuadPart = PhysicalAddress.QuadPart; + Adapter->SendBufferData[i].VirtualAddress = VirtualAddress; + + PushEntryList(&Adapter->SendBufferList, &CoalesceBuffer->ListEntry); + + ++CoalesceBuffer; + } + + if (!Adapter->SendBufferList.Next) + return NDIS_STATUS_RESOURCES; + + return NDIS_STATUS_SUCCESS; +} + +CODE_SEG("PAGE") +VOID +DcInitTxRing( + _In_ PDC21X4_ADAPTER Adapter) +{ + PDC_TCB Tcb; + PDC_TBD Tbd; + + PAGED_CODE(); + + InitializeListHead(&Adapter->SendQueueList); + + Tcb = Adapter->HeadTcb; + + Adapter->CurrentTcb = Tcb; + Adapter->LastTcb = Tcb; + + Adapter->TcbSlots = DC_TRANSMIT_BLOCKS - DC_TCB_RESERVE; + Adapter->TbdSlots = DC_TRANSMIT_DESCRIPTORS - DC_TBD_RESERVE; + Adapter->LoopbackFrameSlots = DC_LOOPBACK_FRAMES; + Adapter->TcbCompleted = 0; + + Tbd = Adapter->HeadTbd; + Adapter->CurrentTbd = Tbd; + + NdisZeroMemory(Tbd, sizeof(*Tbd) * DC_TRANSMIT_DESCRIPTORS); + + Adapter->TailTbd->Control |= DC_TBD_CONTROL_END_OF_RING; +} + +static +CODE_SEG("PAGE") +VOID +DcCreateRxRing( + _In_ PDC21X4_ADAPTER Adapter) +{ + PDC_RCB* RcbSlot; + PDC_RCB Rcb; + PDC_RBD Rbd; + PSINGLE_LIST_ENTRY Entry; + + PAGED_CODE(); + + Rbd = Adapter->HeadRbd; + Adapter->CurrentRbd = Rbd; + + RcbSlot = DC_GET_RCB_SLOT(Adapter, Rbd); + Rcb = (PDC_RCB)Adapter->UsedRcbList.Next; + + for (Entry = Adapter->UsedRcbList.Next; + Entry != NULL; + Entry = Entry->Next) + { + Rcb = (PDC_RCB)Entry; + + C_ASSERT((DC_RECEIVE_BUFFER_SIZE % DC_RECEIVE_BUFFER_SIZE_MULTIPLE) == 0); + + Rbd->Address1 = Rcb->PhysicalAddress; + Rbd->Address2 = 0; + Rbd->Control = DC_RECEIVE_BUFFER_SIZE; + Rbd->Status = DC_RBD_STATUS_OWNED; + + *RcbSlot = Rcb; + + ++RcbSlot; + ++Rbd; + Rcb = (PDC_RCB)Rcb->ListEntry.Next; + } + Rbd = Rbd - 1; + Rbd->Control |= DC_RBD_CONTROL_CHAINED; + Rbd->Address2 = Adapter->RbdPhys; + + ASSERT(Rbd == Adapter->TailRbd); +} + +CODE_SEG("PAGE") +VOID +DcInitRxRing( + _In_ PDC21X4_ADAPTER Adapter) +{ + PDC_RBD Rbd; + ULONG i; + + PAGED_CODE(); + + Rbd = Adapter->HeadRbd; + Adapter->CurrentRbd = Rbd; + + for (i = 0; i < Adapter->RcbCount; ++i) + { + Rbd->Control = DC_RECEIVE_BUFFER_SIZE; + Rbd->Status = DC_RBD_STATUS_OWNED; + + ++Rbd; + } + Rbd = Rbd - 1; + Rbd->Control |= DC_RBD_CONTROL_CHAINED; + + ASSERT(Rbd == Adapter->TailRbd); +} + +static +CODE_SEG("PAGE") +NDIS_STATUS +DcAllocateMemory( + _In_ PDC21X4_ADAPTER Adapter) +{ + NDIS_STATUS Status; + + PAGED_CODE(); + + Status = NdisMInitializeScatterGatherDma(Adapter->AdapterHandle, + FALSE, /* 32-bit DMA */ + DC_TRANSMIT_BLOCK_SIZE); + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + Status = DcAllocateReceiveDescriptors(Adapter); + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + Status = DcAllocateTransmitBlocks(Adapter); + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + Status = DcAllocateTransmitBuffers(Adapter); + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + Status = DcAllocateTransmitDescriptorsAndBuffers(Adapter); + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + Status = DcAllocateReceiveBuffers(Adapter); + if (Status != NDIS_STATUS_SUCCESS) + return Status; + + NdisAllocateSpinLock(&Adapter->SendLock); + NdisAllocateSpinLock(&Adapter->ReceiveLock); + NdisAllocateSpinLock(&Adapter->ModeLock); + + return NDIS_STATUS_SUCCESS; +} + +static +CODE_SEG("PAGE") +VOID +DcInitTestPacket( + _In_ PDC21X4_ADAPTER Adapter) +{ + ULONG i; + + PAGED_CODE(); + + for (i = 0; i < DC_LOOPBACK_FRAMES; ++i) + { + PETH_HEADER PacketBuffer = Adapter->LoopbackFrame[i]; + + NdisZeroMemory(PacketBuffer, DC_LOOPBACK_FRAME_SIZE); + + /* Destination MAC address */ + NdisMoveMemory(PacketBuffer->Destination, + Adapter->CurrentMacAddress, + ETH_LENGTH_OF_ADDRESS); + + /* Source MAC address */ + NdisMoveMemory(PacketBuffer->Source, + Adapter->CurrentMacAddress, + ETH_LENGTH_OF_ADDRESS); + + ++PacketBuffer; + } +} + +static +CODE_SEG("PAGE") ... 4975 lines suppressed ...

11 months

[reactos] 01/01: [KERNEL32] Export more Vista functions

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8e8add0c035baea24de6… commit a8e8add0c035baea24de6b4100076021adda6599 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Oct 5 21:54:05 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Oct 18 15:55:41 2023 +0300 [KERNEL32] Export more Vista functions --- dll/win32/kernel32/CMakeLists.txt | 1 - dll/win32/kernel32/kernel32.spec | 14 +++++++------- dll/win32/kernel32/kernel32_vista/CMakeLists.txt | 10 +++++++++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index 555aaab31dc..c9d491d4837 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -49,7 +49,6 @@ list(APPEND SOURCE client/console/history.c client/console/init.c client/console/readwrite.c - client/console/vista.c client/file/backup.c client/file/cnotify.c client/file/copy.c diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index c4583be816f..3b41edde6d8 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -405,7 +405,7 @@ @ stdcall GetConsoleFontInfo(long long long ptr) @ stdcall GetConsoleFontSize(long long) @ stdcall GetConsoleHardwareState(long long ptr) -@ stub -version=0x600+ GetConsoleHistoryInfo +@ stdcall -version=0x600+ GetConsoleHistoryInfo(ptr) @ stdcall GetConsoleInputExeNameA(long ptr) @ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleInputWaitHandle() @@ -413,12 +413,12 @@ @ stdcall GetConsoleKeyboardLayoutNameW(ptr) @ stdcall GetConsoleMode(long ptr) @ stdcall GetConsoleNlsMode(long ptr) -@ stub -version=0x600+ GetConsoleOriginalTitleA -@ stub -version=0x600+ GetConsoleOriginalTitleW +@ stdcall -version=0x600+ GetConsoleOriginalTitleA(ptr long) +@ stdcall -version=0x600+ GetConsoleOriginalTitleW(ptr long) @ stdcall GetConsoleOutputCP() @ stdcall GetConsoleProcessList(ptr long) ; missing in XP SP3 @ stdcall GetConsoleScreenBufferInfo(long ptr) -@ stdcall -stub -version=0x600+ GetConsoleScreenBufferInfoEx(ptr ptr) +@ stdcall -version=0x600+ GetConsoleScreenBufferInfoEx(ptr ptr) @ stdcall GetConsoleSelectionInfo(ptr) @ stdcall GetConsoleTitleA(ptr long) @ stdcall GetConsoleTitleW(ptr long) @@ -428,7 +428,7 @@ @ stdcall GetCurrencyFormatW(long long wstr ptr wstr long) @ stdcall GetCurrentActCtx(ptr) @ stdcall GetCurrentConsoleFont(long long ptr) -@ stub -version=0x600+ GetCurrentConsoleFontEx +@ stdcall -version=0x600+ GetCurrentConsoleFontEx(ptr long ptr) @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) @ stdcall -version=0x602+ GetCurrentPackageId(ptr ptr) @@ -982,7 +982,7 @@ @ stdcall SetConsoleDisplayMode(long long ptr) @ stdcall SetConsoleFont(long long) @ stdcall SetConsoleHardwareState(long long long) -@ stub -version=0x600+ SetConsoleHistoryInfo +@ stdcall -version=0x600+ SetConsoleHistoryInfo(ptr) @ stdcall SetConsoleIcon(ptr) @ stdcall SetConsoleInputExeNameA(ptr) @ stdcall SetConsoleInputExeNameW(ptr) @@ -997,7 +997,7 @@ @ stdcall SetConsoleOS2OemFormat(long) @ stdcall SetConsoleOutputCP(long) @ stdcall SetConsolePalette(long long long) -@ stub -version=0x600+ SetConsoleScreenBufferInfoEx +@ stdcall -version=0x600+ SetConsoleScreenBufferInfoEx(ptr ptr) @ stdcall SetConsoleScreenBufferSize(long long) @ stdcall SetConsoleTextAttribute(long long) @ stdcall SetConsoleTitleA(str) diff --git a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt index 3b2b8e735b7..0ffbadc1ad6 100644 --- a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt +++ b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt @@ -3,7 +3,7 @@ remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600) add_definitions(-D_KERNEL32_) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys ..) spec2def(kernel32_vista.dll kernel32_vista.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -13,7 +13,15 @@ list(APPEND SOURCE sync.c vista.c) +# These functions are not exported from kernel32_vista (yet). +# They are only used when NT6 exports in kernel32 are enabled. +if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600) + list(APPEND SOURCE + ../client/console/vista.c) +endif() + add_library(kernel32_vista_static ${SOURCE}) +target_link_libraries(kernel32_vista_static ${PSEH_LIB}) add_dependencies(kernel32_vista_static psdk) add_library(kernel32_vista MODULE DllMain.c ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def) set_module_type(kernel32_vista win32dll ENTRYPOINT DllMain 12)

11 months

[reactos] 01/01: [CMAKE] Improve configure script to work with newer CMake versions (#5742)

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0545dab156a496e7f0f0… commit e0545dab156a496e7f0f0208aaec8f9fdfcdbbfa Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Oct 17 13:17:35 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 17 13:17:35 2023 +0300 [CMAKE] Improve configure script to work with newer CMake versions (#5742) This change allows to properly pass parameters to newer CMake versions. Currently the script passes "VSSolution" and similar on to CMake, which are ignored, but newer CMake will complain. Allows to configure a VSSolution with CMake 3.27.4. --- configure.cmd | 80 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/configure.cmd b/configure.cmd index f8c2cc67669..32f776a90e0 100755 --- a/configure.cmd +++ b/configure.cmd @@ -76,48 +76,58 @@ if not defined ARCH ( set USE_CLANG_CL=0 REM Parse command line parameters +set CMAKE_PARAMS= +set REMAINING=%* :repeat + + REM Extract a parameter without removing '=' + for /f "tokens=1*" %%a in ("%REMAINING%") do ( + set "PARAM=%%a" + set REMAINING=%%b + ) + if "%BUILD_ENVIRONMENT%" == "MinGW" ( - if /I "%1" == "Codeblocks" ( + if /I "!PARAM!" == "Codeblocks" ( set CMAKE_GENERATOR="CodeBlocks - MinGW Makefiles" - ) else if /I "%1" == "Eclipse" ( + ) else if /I "!PARAM!" == "Eclipse" ( set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles" - ) else if /I "%1" == "Makefiles" ( + ) else if /I "!PARAM!" == "Makefiles" ( set CMAKE_GENERATOR="MinGW Makefiles" - ) else if /I "%1" == "Ninja" ( + ) else if /I "!PARAM!" == "Ninja" ( set CMAKE_GENERATOR="Ninja" - ) else if /I "%1" == "VSSolution" ( + ) else if /I "!PARAM!" == "VSSolution" ( echo. && echo Error: Creation of VS Solution files is not supported in a MinGW environment. echo Please run this command in a [Developer] Command Prompt for Visual Studio. goto quit - ) else if /I "%1" NEQ "" ( - echo.%1| find /I "-D" >nul 2>&1 - if not errorlevel 1 ( - REM User is passing a switch to CMake - REM Ignore it, and ignore the next parameter that follows - Shift - ) else ( - echo. && echo Warning: Unrecognized switch "%1" && echo. - ) + ) else if /I "!PARAM:~0,2!" == "-D" ( + REM User is passing a switch to CMake + set "CMAKE_PARAMS=%CMAKE_PARAMS% !PARAM!" ) else ( - goto continue + echo. && echo Warning: Unrecognized switch "!PARAM!" && echo. ) ) else ( - if /I "%1" == "CodeBlocks" ( + if /I "!PARAM!" == "CodeBlocks" ( set CMAKE_GENERATOR="CodeBlocks - NMake Makefiles" - ) else if /I "%1" == "Eclipse" ( + ) else if /I "!PARAM!" == "Eclipse" ( set CMAKE_GENERATOR="Eclipse CDT4 - NMake Makefiles" - ) else if /I "%1" == "Makefiles" ( + ) else if /I "!PARAM!" == "Makefiles" ( set CMAKE_GENERATOR="NMake Makefiles" - ) else if /I "%1" == "Ninja" ( + ) else if /I "!PARAM!" == "Ninja" ( set CMAKE_GENERATOR="Ninja" - ) else if /I "%1" == "clang" ( + ) else if /I "!PARAM!" == "clang" ( set USE_CLANG_CL=1 - ) else if /I "%1" == "VSSolution" ( + ) else if /I "!PARAM!" == "VSSolution" ( set VS_SOLUTION=1 REM explicitly set VS version for project generator - if /I "%2" == "-VS_VER" ( - set VS_VERSION=%3 + for /f "tokens=1*" %%a in ("%REMAINING%") do ( + set PARAM=%%a + set REMAINING2=%%b + ) + if /I "!PARAM!" == "-VS_VER" ( + for /f "tokens=1*" %%a in ("!REMAINING2!") do ( + set VS_VERSION=%%a + set REMAINING=%%b + ) echo Visual Studio Environment set to !BUILD_ENVIRONMENT!!VS_VERSION!-!ARCH! ) set CMAKE_GENERATOR="Visual Studio !VS_VERSION!" @@ -130,24 +140,16 @@ REM Parse command line parameters ) else if "!ARCH!" == "arm64" ( set CMAKE_ARCH=-A ARM64 ) - ) else if /I "%1" NEQ "" ( - echo.%1| find /I "-D" >nul 2>&1 - if not errorlevel 1 ( - REM User is passing a switch to CMake - REM Ignore it, and ignore the next parameter that follows - Shift - ) else ( - echo. && echo Warning: Unrecognized switch "%1" && echo. - ) + ) else if /I "!PARAM:~0,2!" == "-D" ( + REM User is passing a switch to CMake + set "CMAKE_PARAMS=%CMAKE_PARAMS% !PARAM!" ) else ( - goto continue + echo. && echo Warning: Unrecognized switch "!PARAM!" && echo. ) ) REM Go to next parameter - SHIFT - goto repeat -:continue + if defined REMAINING goto repeat REM Inform the user about the default build if "!CMAKE_GENERATOR!" == "Ninja" ( @@ -194,11 +196,11 @@ if EXIST CMakeCache.txt ( if "%BUILD_ENVIRONMENT%" == "MinGW" ( - cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=%MINGW_TOOCHAIN_FILE% -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% %* "%REACTOS_SOURCE_DIR%" + cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=%MINGW_TOOCHAIN_FILE% -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% %CMAKE_PARAMS% "%REACTOS_SOURCE_DIR%" ) else if %USE_CLANG_CL% == 1 ( - cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% -DUSE_CLANG_CL:BOOL=1 %* "%REACTOS_SOURCE_DIR%" + cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% -DUSE_CLANG_CL:BOOL=1 %CMAKE_PARAMS% "%REACTOS_SOURCE_DIR%" ) else ( - cmake -G %CMAKE_GENERATOR% %CMAKE_ARCH% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% %* "%REACTOS_SOURCE_DIR%" + cmake -G %CMAKE_GENERATOR% %CMAKE_ARCH% -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=%ARCH% %BUILD_TOOLS_FLAG% %CMAKE_PARAMS% "%REACTOS_SOURCE_DIR%" ) if %ERRORLEVEL% NEQ 0 (

11 months, 1 week

← Newer
1
2
3
4
5
6
7
8
9
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2023