Ros-diffs March 2019

ros-diffs@reactos.org

36 participants
217 discussions

[reactos] 01/01: [SYSDM] Add the 'Copy to' dialog and move the 'Change Profile Type' dialog a little.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a2911d7d85cb4b3c24d5… commit 5a2911d7d85cb4b3c24d5d927858299f26a613d3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Mar 25 00:19:58 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Mar 25 00:19:58 2019 +0100 [SYSDM] Add the 'Copy to' dialog and move the 'Change Profile Type' dialog a little. --- dll/cpl/sysdm/lang/bg-BG.rc | 17 +++- dll/cpl/sysdm/lang/cs-CZ.rc | 17 +++- dll/cpl/sysdm/lang/da-DK.rc | 17 +++- dll/cpl/sysdm/lang/de-DE.rc | 17 +++- dll/cpl/sysdm/lang/el-GR.rc | 17 +++- dll/cpl/sysdm/lang/en-US.rc | 17 +++- dll/cpl/sysdm/lang/es-ES.rc | 17 +++- dll/cpl/sysdm/lang/fr-FR.rc | 39 ++++++--- dll/cpl/sysdm/lang/he-IL.rc | 17 +++- dll/cpl/sysdm/lang/hu-HU.rc | 17 +++- dll/cpl/sysdm/lang/id-ID.rc | 17 +++- dll/cpl/sysdm/lang/it-IT.rc | 17 +++- dll/cpl/sysdm/lang/ja-JP.rc | 17 +++- dll/cpl/sysdm/lang/nl-NL.rc | 17 +++- dll/cpl/sysdm/lang/no-NO.rc | 17 +++- dll/cpl/sysdm/lang/pl-PL.rc | 17 +++- dll/cpl/sysdm/lang/ro-RO.rc | 17 +++- dll/cpl/sysdm/lang/ru-RU.rc | 17 +++- dll/cpl/sysdm/lang/sk-SK.rc | 17 +++- dll/cpl/sysdm/lang/sq-AL.rc | 17 +++- dll/cpl/sysdm/lang/sv-SE.rc | 17 +++- dll/cpl/sysdm/lang/tr-TR.rc | 17 +++- dll/cpl/sysdm/lang/uk-UA.rc | 17 +++- dll/cpl/sysdm/lang/zh-CN.rc | 17 +++- dll/cpl/sysdm/lang/zh-TW.rc | 17 +++- dll/cpl/sysdm/resource.h | 8 ++ dll/cpl/sysdm/userprofile.c | 190 +++++++++++++++++++++++++++++++------------- 27 files changed, 554 insertions(+), 91 deletions(-) diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index baede2efb2a..bd3a5bc9fe9 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Пускане и възстановяване" diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index da662b15539..f16ccb3d5cb 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -170,7 +170,7 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -182,6 +182,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Spuštění a zotavení" diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index 1aae2813cc7..21ceef5ba63 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Fortryd", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Opstart og Gendannelse" diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index a1cddac197e..29f5d06ff00 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -174,7 +174,7 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Profiltyp ändern" FONT 8, "MS Shell Dlg" @@ -186,6 +186,21 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Kopieren nach" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Profil kopieren nach", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Durchsuchen", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Benutzer", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "Ä&ndern", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Starten und Wiederherstellen" diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index 8b1ac79e06e..d8552a3a7f7 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Άκυρο", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Εκκίνηση και αποκατάσταση" diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index 4d75aa16f34..02941a12319 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Startup and Recovery" diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index 89c773a83be..1f8f58c1b9b 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -167,7 +167,7 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -179,6 +179,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Inicio y recuperación" diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index db30145b1c2..7661696d665 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -146,18 +146,6 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 196, 24, 50, 14 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Change Profile Type" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 - AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 - AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 - DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 -END - IDD_USERPROFILE DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Profils Utilisateurs" @@ -177,6 +165,33 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 196, 198, 54, 15 END +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Change Profile Type" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USERPROFILE_TYPE_TEXT, 7, 11, 206, 28 + AUTORADIOBUTTON "&Roaming profile", IDC_USERPROFILE_TYPE_ROAMING, 60, 49, 145, 10 + AUTORADIOBUTTON "&Local profile", IDC_USERPROFILE_TYPE_LOCAL, 60, 63, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 60, 82, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 +END + +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Démarrage et Récupération" diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index 16fd5388f1b..057a008bab3 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -167,7 +167,7 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -179,6 +179,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "הפעלה ושחזור" diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index 99e02ffc9cb..ef2ee19adfc 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -167,7 +167,7 @@ BEGIN PUSHBUTTON "Mégsem", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -179,6 +179,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Indítás és helyreállítás" diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index d873b96055e..4c0f1bc5a8b 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Startup and Recovery" diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index 33a0fe8bd91..f11d4b13eb1 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Annulla", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Avvio e recupero" diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 5eadab04e68..c992ae20241 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 9, "MS UI Gothic" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "起動と回復" diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 7a39ea7d5b1..601c91e8363 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Annuleren", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Opstart- en herstelinstellingen" diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index 6fb3d8a3b0c..2570df6a967 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Oppstart og gjenoppretting" diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 30d148c90a2..8242fa9ec4c 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -174,7 +174,7 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -186,6 +186,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Uruchamianie i odzyskiwanie" diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index d08ddee1868..2a6ad877111 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -174,7 +174,7 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -186,6 +186,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Pornire și Recuperare" diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 521d85c03d4..b9eccd4e821 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Загрузка и восстановление" diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index 6e77a82f658..f478192e44b 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -173,7 +173,7 @@ BEGIN PUSHBUTTON "Zrušiť", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -185,6 +185,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Spúšťanie a obnovovanie" diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 9bf0b6f7108..1974f3ba3ce 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -165,7 +165,7 @@ BEGIN PUSHBUTTON "Anulo", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -177,6 +177,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Fillimi dhe Shërimi" diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index ba6975fd19d..78f6de889ed 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -167,7 +167,7 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -179,6 +179,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Start och återställning" diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index 34373a7d295..90f11345a26 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -167,7 +167,7 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -179,6 +179,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Başlangıç ve Kurtarma" diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 5244315769e..116cef429fb 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -173,7 +173,7 @@ BEGIN PUSHBUTTON "Скасувати", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 8, "MS Shell Dlg" @@ -185,6 +185,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Завантаження й відновлення" diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 31655dc24ce..51c5d1319e4 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -168,7 +168,7 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 9, "宋体" @@ -180,6 +180,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 9, "宋体" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "启动和故障恢复" diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index c47d483a7f2..a5cdd973313 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -168,7 +168,7 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 196, 198, 54, 15 END -IDD_USERPROFILE_TYPE DIALOGEX 0, 0, 225, 103 +IDD_USERPROFILE_TYPE DIALOGEX 6, 18, 225, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Change Profile Type" FONT 9, "新細明體" @@ -180,6 +180,21 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 122, 82, 50, 14 END +IDD_USERPROFILE_COPY DIALOGEX 6, 18, 261, 133 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy To" +FONT 9, "新細明體" +BEGIN + GROUPBOX "Copy &profile to", -1, 8, 9, 185, 52 + EDITTEXT IDC_USERPROFILE_COPY_PATH, 15, 23, 167, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse", IDC_USERPROFILE_COPY_BROWSE, 15, 41, 50, 14 + GROUPBOX "Permitted to use", -1, 8, 77, 185, 48 + LTEXT "", IDC_USERPROFILE_COPY_USER, 15, 91, 167, 8 + PUSHBUTTON "&Change", IDC_USERPROFILE_COPY_CHANGE, 15, 105, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 204, 13, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 204, 30, 50, 14 +END + IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "啓動和故障恢復" diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index 6d9d22aff74..93d204416b5 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -110,6 +110,14 @@ #define IDC_USERPROFILE_TYPE_ROAMING 522 #define IDC_USERPROFILE_TYPE_LOCAL 523 +/* Copy user profile */ +#define IDD_USERPROFILE_COPY 530 +#define IDC_USERPROFILE_COPY_PATH 531 +#define IDC_USERPROFILE_COPY_BROWSE 532 +#define IDC_USERPROFILE_COPY_USER 533 +#define IDC_USERPROFILE_COPY_CHANGE 534 + + /* Environment variables */ #define IDD_ENVIRONMENT_VARIABLES 600 #define IDC_USER_VARIABLE_LIST 601 diff --git a/dll/cpl/sysdm/userprofile.c b/dll/cpl/sysdm/userprofile.c index fa59e9e534e..ff0e08ba3e7 100644 --- a/dll/cpl/sysdm/userprofile.c +++ b/dll/cpl/sysdm/userprofile.c @@ -69,10 +69,11 @@ done: static INT_PTR CALLBACK -UserProfileTypeDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +UserProfileTypeDlgProc( + _In_ HWND hwndDlg, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) { switch (uMsg) { @@ -142,6 +143,134 @@ ChangeUserProfileType( } +static +BOOL +DeleteUserProfile( + _In_ HWND hwndDlg) +{ + WCHAR szTitle[64], szRawText[128], szCookedText[256]; + HWND hwndListView; + LVITEM Item; + INT iSelected; + PPROFILEDATA pProfileData; + + DPRINT("DeleteUserProfile()\n"); + + hwndListView = GetDlgItem(hwndDlg, IDC_USERPROFILE_LIST); + if (hwndListView == NULL) + return FALSE; + + iSelected = ListView_GetNextItem(hwndListView, -1, LVNI_SELECTED); + if (iSelected == -1) + return FALSE; + + ZeroMemory(&Item, sizeof(LVITEM)); + Item.mask = LVIF_PARAM; + Item.iItem = iSelected; + Item.iSubItem = 0; + if (!ListView_GetItem(hwndListView, &Item)) + return FALSE; + + if (Item.lParam == 0) + return FALSE; + + pProfileData = (PPROFILEDATA)Item.lParam; + if (pProfileData->bMyProfile) + return FALSE; + + LoadStringW(hApplet, IDS_USERPROFILE_CONFIRM_DELETE_TITLE, szTitle, ARRAYSIZE(szTitle)); + LoadStringW(hApplet, IDS_USERPROFILE_CONFIRM_DELETE, szRawText, ARRAYSIZE(szRawText)); + swprintf(szCookedText, szRawText, pProfileData->pszFullName); + + if (MessageBoxW(hwndDlg, + szCookedText, + szTitle, + MB_ICONQUESTION | MB_YESNO) == IDYES) + { + /* FIXME: Delete the profile here! */ + return TRUE; + } + + return FALSE; +} + + +static +INT_PTR +CALLBACK +CopyUserProfileDlgProc( + _In_ HWND hwndDlg, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + return TRUE; + + case WM_DESTROY: + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + case IDCANCEL: + EndDialog(hwndDlg, + LOWORD(wParam)); + return TRUE; + } + break; + } + + return FALSE; +} + + +static +BOOL +CopyUserProfile( + _In_ HWND hwndDlg) +{ + HWND hwndListView; + LVITEM Item; + INT iSelected; + + DPRINT("CopyUserProfile()\n"); + + hwndListView = GetDlgItem(hwndDlg, IDC_USERPROFILE_LIST); + if (hwndListView == NULL) + return FALSE; + + iSelected = ListView_GetNextItem(hwndListView, -1, LVNI_SELECTED); + if (iSelected == -1) + return FALSE; + + ZeroMemory(&Item, sizeof(LVITEM)); + Item.mask = LVIF_PARAM; + Item.iItem = iSelected; + Item.iSubItem = 0; + if (!ListView_GetItem(hwndListView, &Item)) + return FALSE; + + if (Item.lParam == 0) + return FALSE; + + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_USERPROFILE_COPY), + hwndDlg, + CopyUserProfileDlgProc, + (LPARAM)Item.lParam) == IDOK) + { + /* FIXME: Update the profile list view */ + return TRUE; + } + + return FALSE; +} + + static VOID SetListViewColumns( _In_ HWND hwndListView) @@ -258,6 +387,7 @@ AddUserProfile( dwState = 0; } + /* Create and fill the profile data entry */ dwProfileData = sizeof(PROFILEDATA) + ((wcslen(szNameBuffer) + 1) * sizeof(WCHAR)); pProfileData = HeapAlloc(GetProcessHeap(), @@ -467,57 +597,6 @@ OnNotify( } -static -BOOL -DeleteUserProfile( - HWND hwndDlg) -{ - WCHAR szTitle[64], szRawText[128], szCookedText[256]; - HWND hwndListView; - LVITEM Item; - INT iSelected; - PPROFILEDATA pProfileData; - - DPRINT("DeleteUserProfile()\n"); - - hwndListView = GetDlgItem(hwndDlg, IDC_USERPROFILE_LIST); - if (hwndListView == NULL) - return FALSE; - - iSelected = ListView_GetNextItem(hwndListView, -1, LVNI_SELECTED); - if (iSelected == -1) - return FALSE; - - ZeroMemory(&Item, sizeof(LVITEM)); - Item.mask = LVIF_PARAM; - Item.iItem = iSelected; - Item.iSubItem = 0; - if (!ListView_GetItem(hwndListView, &Item)) - return FALSE; - - if (Item.lParam == 0) - return FALSE; - - pProfileData = (PPROFILEDATA)Item.lParam; - if (pProfileData->bMyProfile) - return FALSE; - - LoadStringW(hApplet, IDS_USERPROFILE_CONFIRM_DELETE_TITLE, szTitle, ARRAYSIZE(szTitle)); - LoadStringW(hApplet, IDS_USERPROFILE_CONFIRM_DELETE, szRawText, ARRAYSIZE(szRawText)); - swprintf(szCookedText, szRawText, pProfileData->pszFullName); - - if (MessageBoxW(hwndDlg, - szCookedText, - szTitle, - MB_ICONQUESTION | MB_YESNO) == IDNO) - return FALSE; - - /* FIXME: Delete the profile here! */ - - return TRUE; -} - - /* Property page dialog callback */ INT_PTR CALLBACK UserProfileDlgProc(HWND hwndDlg, @@ -553,6 +632,7 @@ UserProfileDlgProc(HWND hwndDlg, break; case IDC_USERPROFILE_COPY: + CopyUserProfile(hwndDlg); break; } break;

5 years, 9 months

[reactos] 02/02: Fix regression with double click action

by Brock Mammen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb4c9fbcf276c9ce5e169… commit fb4c9fbcf276c9ce5e16991f78754822f5699d63 Author: Brock Mammen <brockmammen(a)gmail.com> AuthorDate: Sat Mar 23 11:16:44 2019 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 24 23:34:57 2019 +0100 Fix regression with double click action The double click action is now triggered by the WM_LBUTTONDBLCLK message instead of WM_NCLBUTTONDBLCLK. --- base/shell/explorer/trayclock.cpp | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index c49f154554c..8c217c8c4c9 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -97,7 +97,7 @@ private: LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); public: @@ -136,7 +136,7 @@ public: MESSAGE_HANDLER(WM_SETFONT, OnSetFont) MESSAGE_HANDLER(TNWM_GETMINIMUMSIZE, OnGetMinimumSize) MESSAGE_HANDLER(TWM_SETTINGSCHANGED, OnTaskbarSettingsChanged) - MESSAGE_HANDLER(WM_NCLBUTTONDBLCLK, OnNcLButtonDblClick) + MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnLButtonDblClick) END_MSG_MAP() HRESULT Initialize(IN HWND hWndParent); @@ -720,23 +720,12 @@ LRESULT CTrayClockWnd::OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM return 0; } -LRESULT CTrayClockWnd::OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +LRESULT CTrayClockWnd::OnLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (IsWindowVisible()) { - /* We get all WM_NCLBUTTONDBLCLK for the taskbar so we need to check if it is on the clock*/ - RECT rcClock; - if (GetWindowRect(&rcClock)) - { - POINT ptClick; - ptClick.x = MAKEPOINTS(lParam).x; - ptClick.y = MAKEPOINTS(lParam).y; - if (PtInRect(&rcClock, ptClick)) - { - //FIXME: use SHRunControlPanel - ShellExecuteW(m_hWnd, NULL, L"timedate.cpl", NULL, NULL, SW_NORMAL); - } - } + //FIXME: use SHRunControlPanel + ShellExecuteW(m_hWnd, NULL, L"timedate.cpl", NULL, NULL, SW_NORMAL); } return TRUE; }

5 years, 9 months

[reactos] 01/02: [EXPLORER] Add date tooltip to taskbar clock

by Brock Mammen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7ad10241f12bb3760d6c… commit e7ad10241f12bb3760d6cdb73fd7077f87ce1cd3 Author: Brock Mammen <brockmammen(a)gmail.com> AuthorDate: Sat Mar 23 11:16:44 2019 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 24 23:34:57 2019 +0100 [EXPLORER] Add date tooltip to taskbar clock CORE-11444 --- base/shell/explorer/trayclock.cpp | 41 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index b4e85d951c3..c49f154554c 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -51,6 +51,7 @@ class CTrayClockWnd : COLORREF textColor; RECT rcText; SYSTEMTIME LocalTime; + CTooltips m_tooltip; union { @@ -388,6 +389,31 @@ VOID CTrayClockWnd::UpdateWnd() GetParent().SendMessage(WM_NOTIFY, 0, (LPARAM) &nmh); } } + + int iDateLength = GetDateFormat(LOCALE_USER_DEFAULT, + DATE_LONGDATE, + &LocalTime, + NULL, + NULL, + 0); + if (iDateLength <= 0) + { + return; + } + + WCHAR* szDate = new WCHAR[iDateLength]; + if (GetDateFormat(LOCALE_USER_DEFAULT, + DATE_LONGDATE, + &LocalTime, + NULL, + szDate, + iDateLength) > 0) + { + m_tooltip.UpdateTipText(m_hWnd, + reinterpret_cast<UINT_PTR>(m_hWnd), + szDate); + } + delete[] szDate; } VOID CTrayClockWnd::Update() @@ -624,7 +650,8 @@ LRESULT CTrayClockWnd::OnGetMinimumSize(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT CTrayClockWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - return HTTRANSPARENT; + // HTCLIENT is returned to receive WM_MOUSEMOVE messages for the tooltip + return HTCLIENT; } LRESULT CTrayClockWnd::OnSetFont(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -635,6 +662,18 @@ LRESULT CTrayClockWnd::OnSetFont(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& LRESULT CTrayClockWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + m_tooltip.Create(m_hWnd, WS_POPUP | TTS_NOPREFIX | TTS_ALWAYSTIP); + + TOOLINFOW ti = { 0 }; + ti.cbSize = TTTOOLINFOW_V1_SIZE; + ti.uFlags = TTF_IDISHWND | TTF_SUBCLASS; + ti.hwnd = m_hWnd; + ti.uId = reinterpret_cast<UINT_PTR>(m_hWnd); + ti.lpszText = NULL; + ti.lParam = NULL; + + m_tooltip.AddTool(&ti); + ResetTime(); return TRUE; }

5 years, 9 months

[reactos] 02/02: [USER32] Edit: Fix caret and scroll position

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36230bb214e9e24d4be99… commit 36230bb214e9e24d4be99297332e697f43e4454c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Mar 18 20:12:41 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 24 23:26:20 2019 +0100 [USER32] Edit: Fix caret and scroll position Based on patch by JIRA contributor 'I_Kill_Bugs'. CORE-15780 --- win32ss/user/user32/controls/edit.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index 2f2da0f4462..790c8c32bbb 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -1135,7 +1135,11 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) x -= es->x_offset; } else +#ifdef __REACTOS__ /* CORE-15780 */ + x = (lw > 0 ? es->x_offset : x - es->x_offset); +#else x = es->x_offset; +#endif if (es->style & ES_RIGHT) x = w - (lw - x);

5 years, 9 months

[reactos] 01/02: [COMCTL32] Edit: Fix caret and scroll position

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd7011388e10f2ad6f4ea… commit cd7011388e10f2ad6f4eac9c418223437d0a7884 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Mar 18 20:10:10 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 24 23:26:20 2019 +0100 [COMCTL32] Edit: Fix caret and scroll position Based on patch by JIRA contributor 'I_Kill_Bugs'. CORE-15780 --- dll/win32/comctl32/edit.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c index 11d1b1852ce..a6a04fe330a 100644 --- a/dll/win32/comctl32/edit.c +++ b/dll/win32/comctl32/edit.c @@ -1050,7 +1050,11 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) x -= es->x_offset; } else +#ifdef __REACTOS__ /* CORE-15780 */ + x = (lw > 0 ? es->x_offset : x - es->x_offset); +#else x = es->x_offset; +#endif if (es->style & ES_RIGHT) x = w - (lw - x);

5 years, 9 months

[reactos] 02/02: [USER32] Add support for navigating a group of radio buttons using a keyboard.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=048c8c1605e41600a2610… commit 048c8c1605e41600a2610c46b8d5eddca4e50c86 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 24 17:18:06 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 24 17:23:33 2019 +0100 [USER32] Add support for navigating a group of radio buttons using a keyboard. Import Wine commit: https://source.winehq.org/git/wine.git/commit/b1b8fb77be5dd9a8754b04b2ef9f7… "user32: Add support for navigating a group of radio buttons using a keyboard. The patch approximates the behaviour observed in the message tests but still doesn't make the message tests pass without failures. " by Dmitry Timoshkov. See bug report https://bugs.winehq.org/show_bug.cgi?id=16845 --- win32ss/user/user32/windows/dialog.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/win32ss/user/user32/windows/dialog.c b/win32ss/user/user32/windows/dialog.c index 0fc31a71fe5..4770169e99a 100644 --- a/win32ss/user/user32/windows/dialog.c +++ b/win32ss/user/user32/windows/dialog.c @@ -2556,8 +2556,16 @@ IsDialogMessageW( if (!(dlgCode & DLGC_WANTARROWS)) { BOOL fPrevious = (lpMsg->wParam == VK_LEFT || lpMsg->wParam == VK_UP); - HWND hwndNext = GetNextDlgGroupItem (hDlg, GetFocus(), fPrevious ); - SendMessageW( hDlg, WM_NEXTDLGCTL, (WPARAM)hwndNext, 1 ); + HWND hwndNext = GetNextDlgGroupItem( hDlg, lpMsg->hwnd, fPrevious ); + if (hwndNext && SendMessageW( hwndNext, WM_GETDLGCODE, lpMsg->wParam, (LPARAM)lpMsg ) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) + { + SetFocus( hwndNext ); + if ((GetWindowLongW( hwndNext, GWL_STYLE ) & BS_TYPEMASK) == BS_AUTORADIOBUTTON && + SendMessageW( hwndNext, BM_GETCHECK, 0, 0 ) != BST_CHECKED) + SendMessageW( hwndNext, BM_CLICK, 1, 0 ); + } + else + SendMessageW( hDlg, WM_NEXTDLGCTL, (WPARAM)hwndNext, 1 ); return TRUE; } break;

5 years, 9 months

[reactos] 01/02: [USER32][COMCTL32] Move the auto radio button group logic from BM_SETCHECK to WM_LBUTTONUP handler. CORE-8526

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=780f2ba2159575f4f0edf… commit 780f2ba2159575f4f0edf1a97475a5edaa2f7a6b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 24 17:01:07 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 24 17:23:24 2019 +0100 [USER32][COMCTL32] Move the auto radio button group logic from BM_SETCHECK to WM_LBUTTONUP handler. CORE-8526 Import Wine commit: https://source.winehq.org/git/wine.git/commit/96d0af52eb0d14084397647b974c5… "user32: Move the auto radio button group logic from BM_SETCHECK to WM_LBUTTONUP handler. This patch also changes the logic to get the control style with WM_GETDLGCODE instead of GetWindowLong to make the message test pass. " by Dmitry Timoshkov. See bug report https://bugs.winehq.org/show_bug.cgi?id=42010 - (ReactOS-only) Fix also the corresponding logic in COMCTL32. --- dll/win32/comctl32/button.c | 15 +++++++++++++++ win32ss/user/user32/controls/button.c | 11 ++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c index 1d7431d0b16..aacb96f7a29 100644 --- a/dll/win32/comctl32/button.c +++ b/dll/win32/comctl32/button.c @@ -785,7 +785,11 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L SendMessageW( hWnd, BM_SETCHECK, !(infoPtr->state & BST_CHECKED), 0 ); break; case BS_AUTORADIOBUTTON: +#ifdef __REACTOS__ + BUTTON_CheckAutoRadioButton( hWnd ); +#else SendMessageW( hWnd, BM_SETCHECK, TRUE, 0 ); +#endif break; case BS_AUTO3STATE: SendMessageW( hWnd, BM_SETCHECK, (infoPtr->state & BST_INDETERMINATE) ? 0 : @@ -1118,8 +1122,10 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L infoPtr->state = (infoPtr->state & ~3) | wParam; InvalidateRect( hWnd, NULL, FALSE ); } +#ifndef __REACTOS__ if ((btn_type == BS_AUTORADIOBUTTON) && (wParam == BST_CHECKED) && (style & WS_CHILD)) BUTTON_CheckAutoRadioButton( hWnd ); +#endif break; case BM_GETSTATE: @@ -1645,13 +1651,22 @@ static void BUTTON_CheckAutoRadioButton( HWND hwnd ) parent = GetParent(hwnd); /* make sure that starting control is not disabled or invisible */ +#ifdef __REACTOS__ + start = sibling = hwnd; +#else start = sibling = GetNextDlgGroupItem( parent, hwnd, TRUE ); +#endif do { if (!sibling) break; +#ifdef __REACTOS__ + if (SendMessageW( sibling, WM_GETDLGCODE, 0, 0 ) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) + SendMessageW( sibling, BM_SETCHECK, sibling == hwnd ? BST_CHECKED : BST_UNCHECKED, 0 ); +#else if ((hwnd != sibling) && ((GetWindowLongW( sibling, GWL_STYLE) & BS_TYPEMASK) == BS_AUTORADIOBUTTON)) SendMessageW( sibling, BM_SETCHECK, BST_UNCHECKED, 0 ); +#endif sibling = GetNextDlgGroupItem( parent, sibling, FALSE ); } while (sibling != start); } diff --git a/win32ss/user/user32/controls/button.c b/win32ss/user/user32/controls/button.c index 6e7d70e77e0..a9afe494c7a 100644 --- a/win32ss/user/user32/controls/button.c +++ b/win32ss/user/user32/controls/button.c @@ -412,7 +412,7 @@ LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg, SendMessageW( hWnd, BM_SETCHECK, !(state & BST_CHECKED), 0 ); break; case BS_AUTORADIOBUTTON: - SendMessageW( hWnd, BM_SETCHECK, TRUE, 0 ); + BUTTON_CheckAutoRadioButton( hWnd ); break; case BS_AUTO3STATE: SendMessageW( hWnd, BM_SETCHECK, @@ -624,8 +624,6 @@ LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg, set_button_state( hWnd, (state & ~3) | wParam ); paint_button( hWnd, btn_type, ODA_SELECT ); } - if ((btn_type == BS_AUTORADIOBUTTON) && (wParam == BST_CHECKED) && (style & WS_CHILD)) - BUTTON_CheckAutoRadioButton( hWnd ); break; case BM_GETSTATE: @@ -1188,13 +1186,12 @@ static void BUTTON_CheckAutoRadioButton( HWND hwnd ) parent = GetParent(hwnd); /* make sure that starting control is not disabled or invisible */ - start = sibling = GetNextDlgGroupItem( parent, hwnd, TRUE ); + start = sibling = hwnd; do { if (!sibling) break; - if ((hwnd != sibling) && - ((GetWindowLongPtrW( sibling, GWL_STYLE) & BS_TYPEMASK) == BS_AUTORADIOBUTTON)) - SendMessageW( sibling, BM_SETCHECK, BST_UNCHECKED, 0 ); + if (SendMessageW( sibling, WM_GETDLGCODE, 0, 0 ) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) + SendMessageW( sibling, BM_SETCHECK, sibling == hwnd ? BST_CHECKED : BST_UNCHECKED, 0 ); sibling = GetNextDlgGroupItem( parent, sibling, FALSE ); } while (sibling != start); }

5 years, 9 months

[reactos] 01/01: [EXPLORER][SHPOLICY] Implement "NoSimpleStartMenu" policy (#1258)

by Yaroslav Kibysh

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a30e644dc43b867f04372… commit a30e644dc43b867f04372c0d5d87b6d5daf07728 Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Sun Mar 24 15:56:43 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 24 14:56:43 2019 +0100 [EXPLORER][SHPOLICY] Implement "NoSimpleStartMenu" policy (#1258) - Enable "New Start Menu" control for all languages. - Implement the "NoSimpleStartMenu" policy in shpolicy.c and its usage in explorer. - Hide controls instead of disabling (as in Win XP/Vista). --- base/shell/explorer/lang/bg-BG.rc | 8 ++++---- base/shell/explorer/lang/cs-CZ.rc | 8 ++++---- base/shell/explorer/lang/de-DE.rc | 8 ++++---- base/shell/explorer/lang/en-US.rc | 8 ++++---- base/shell/explorer/lang/es-ES.rc | 8 ++++---- base/shell/explorer/lang/et-EE.rc | 8 ++++---- base/shell/explorer/lang/fi-FI.rc | 8 ++++---- base/shell/explorer/lang/fr-FR.rc | 8 ++++---- base/shell/explorer/lang/he-IL.rc | 8 ++++---- base/shell/explorer/lang/hi-IN.rc | 8 ++++---- base/shell/explorer/lang/it-IT.rc | 8 ++++---- base/shell/explorer/lang/ja-JP.rc | 8 ++++---- base/shell/explorer/lang/ko-KR.rc | 8 ++++---- base/shell/explorer/lang/lt-LT.rc | 8 ++++---- base/shell/explorer/lang/ms-MY.rc | 8 ++++---- base/shell/explorer/lang/nl-NL.rc | 8 ++++---- base/shell/explorer/lang/no-NO.rc | 8 ++++---- base/shell/explorer/lang/pl-PL.rc | 8 ++++---- base/shell/explorer/lang/pt-BR.rc | 8 ++++---- base/shell/explorer/lang/ro-RO.rc | 8 ++++---- base/shell/explorer/lang/ru-RU.rc | 8 ++++---- base/shell/explorer/lang/sk-SK.rc | 8 ++++---- base/shell/explorer/lang/sq-AL.rc | 8 ++++---- base/shell/explorer/lang/tr-TR.rc | 8 ++++---- base/shell/explorer/lang/uk-UA.rc | 8 ++++---- base/shell/explorer/lang/zh-CN.rc | 8 ++++---- base/shell/explorer/lang/zh-TW.rc | 8 ++++---- base/shell/explorer/resource.h | 2 ++ base/shell/explorer/trayprop.cpp | 29 +++++++++++++++++++++++++++-- boot/bootdata/hivedef.inf | 3 +++ boot/bootdata/hivesft.inf | 5 +++++ dll/win32/shell32/wine/shpolicy.c | 11 +++++++++++ 32 files changed, 156 insertions(+), 110 deletions(-) diff --git a/base/shell/explorer/lang/bg-BG.rc b/base/shell/explorer/lang/bg-BG.rc index 821b4ba935..50c32be951 100644 --- a/base/shell/explorer/lang/bg-BG.rc +++ b/base/shell/explorer/lang/bg-BG.rc @@ -89,11 +89,11 @@ CAPTION "Пусков изборник" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Пусков изборник", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Този изборник ви дава лесне достъп до папките ви, любимите ви приложения и търсенето.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "На&гласяване...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Пусков изборник", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Този изборник ви дава лесне достъп до папките ви, любимите ви приложения и търсенето.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "На&гласяване...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Класически пусков из&борник", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Този изглед на изборника ви осигурява класически облик и начин на работа.", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Този изглед на изборника ви осигурява класически облик и начин на работа.", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "На&гласяване...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/cs-CZ.rc b/base/shell/explorer/lang/cs-CZ.rc index 52b9e27506..e94f531fe6 100644 --- a/base/shell/explorer/lang/cs-CZ.rc +++ b/base/shell/explorer/lang/cs-CZ.rc @@ -95,11 +95,11 @@ CAPTION "Nabídka Start" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "Nabídka &Start", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Tento styl menu umožňuje snadný přístup ke složkám, oblíbeným programům a vyhledávání.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Upravit...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "Nabídka &Start", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Tento styl menu umožňuje snadný přístup ke složkám, oblíbeným programům a vyhledávání.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Upravit...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "&Klasická nabídka Start", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Tento styl menu umožňuje používat klasický vzhled a funkce", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Tento styl menu umožňuje používat klasický vzhled a funkce", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "Up&ravit...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/de-DE.rc b/base/shell/explorer/lang/de-DE.rc index b904f31582..f87873a930 100644 --- a/base/shell/explorer/lang/de-DE.rc +++ b/base/shell/explorer/lang/de-DE.rc @@ -89,11 +89,11 @@ CAPTION "Startmenü" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "Modernes &Startmenü", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Dieser Stil gewährt Ihnen einfachen Zugriff auf Ihre Verzeichnisse, bevorzugten Programme und die Suchfunktion.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "An&passen...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "Modernes &Startmenü", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Dieser Stil gewährt Ihnen einfachen Zugriff auf Ihre Verzeichnisse, bevorzugten Programme und die Suchfunktion.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "An&passen...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Klassisches Start&menü", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Dieser Stil beinhaltet das klassische Aussehen mit gewohnter Funktionalität", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Dieser Stil beinhaltet das klassische Aussehen mit gewohnter Funktionalität", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "An&passen...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/en-US.rc b/base/shell/explorer/lang/en-US.rc index abf909a89a..d9a420e334 100644 --- a/base/shell/explorer/lang/en-US.rc +++ b/base/shell/explorer/lang/en-US.rc @@ -89,11 +89,11 @@ CAPTION "Start Menu" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Classic Start &menu", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "This menu style gives you the classic look and functionality", IDC_STATIC, 20, 185, 150, 24 + LTEXT "This menu style gives you the classic look and functionality", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/es-ES.rc b/base/shell/explorer/lang/es-ES.rc index 74771c4572..eb13428beb 100644 --- a/base/shell/explorer/lang/es-ES.rc +++ b/base/shell/explorer/lang/es-ES.rc @@ -100,11 +100,11 @@ CAPTION "Menú Inicio" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Menú inicio", IDC_TASKBARPROP_STARTMENU, 7,135,105,10, WS_DISABLED - LTEXT "Este estilo de menú proporciona un rápido acceso a las carpetas, programas favoritos, y búsquedas.", IDC_STATIC, 20,145,150,24, WS_DISABLED - PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCUST, 192,132,53,14, WS_DISABLED + AUTORADIOBUTTON "&Menú inicio", IDC_TASKBARPROP_STARTMENU, 7,135,105,10 + LTEXT "Este estilo de menú proporciona un rápido acceso a las carpetas, programas favoritos, y búsquedas.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20,145,150,24 + PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCUST, 192,132,53,14 AUTORADIOBUTTON "Menú Inicio &clásico", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,175,105,10 - LTEXT "Este estilo de menú le proporciona el aspecto y funcionalidad clásicas.",IDC_STATIC,20,185,150,24 + LTEXT "Este estilo de menú le proporciona el aspecto y funcionalidad clásicas.",IDC_TASKBARPROP_STARTMENUCLASSICTEXT,20,185,150,24 PUSHBUTTON "P&ersonalizar...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,172,53,14 END diff --git a/base/shell/explorer/lang/et-EE.rc b/base/shell/explorer/lang/et-EE.rc index 7f057af7ce..43ef2fda63 100644 --- a/base/shell/explorer/lang/et-EE.rc +++ b/base/shell/explorer/lang/et-EE.rc @@ -96,11 +96,11 @@ CAPTION "Menüü Start" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Menüü Start", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Valige see menüü, et tagada lihtne juurdepääs Internetile, e-postile ja oma lemmikprogrammidele", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Kohanda...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Menüü Start", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Valige see menüü, et tagada lihtne juurdepääs Internetile, e-postile ja oma lemmikprogrammidele", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Kohanda...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Klassikaline menüü &Start", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Valige see menüü, et kasutada Windowsi varasemate versioonide menüülaadi.", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Valige see menüü, et kasutada Windowsi varasemate versioonide menüülaadi.", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "&Kohanda...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/fi-FI.rc b/base/shell/explorer/lang/fi-FI.rc index adfaeb4ad5..179106f122 100644 --- a/base/shell/explorer/lang/fi-FI.rc +++ b/base/shell/explorer/lang/fi-FI.rc @@ -89,11 +89,11 @@ CAPTION "Käynnistä Valikko" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Käynnistä Valikko", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Tämä valikkotyyli tarjoaa helpon pääsyn kansioihisi, suosikki ohjelmiisi, ja etsimiseen.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Mukauta...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Käynnistä Valikko", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Tämä valikkotyyli tarjoaa helpon pääsyn kansioihisi, suosikki ohjelmiisi, ja etsimiseen.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Mukauta...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Klassinen Käynnistä &valikko", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Tämä valikkotyyli tarjoaa klassisen tyylin ja toiminnallisuuden", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Tämä valikkotyyli tarjoaa klassisen tyylin ja toiminnallisuuden", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "M&ukauta...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/fr-FR.rc b/base/shell/explorer/lang/fr-FR.rc index 6654292abe..0d99b22d71 100644 --- a/base/shell/explorer/lang/fr-FR.rc +++ b/base/shell/explorer/lang/fr-FR.rc @@ -89,11 +89,11 @@ CAPTION "Menu démarrer" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Menu démarrer", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Ce style de menu vous donne un accès rapide à vos dossiers, programmes favoris et à l'outil de recherche.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Personnaliser...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Menu démarrer", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Ce style de menu vous donne un accès rapide à vos dossiers, programmes favoris et à l'outil de recherche.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Personnaliser...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Menu démarrer &classique", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Ce style de menu vous donne l'apparence et les fonctionnalités classiques", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Ce style de menu vous donne l'apparence et les fonctionnalités classiques", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "&Personnaliser...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/he-IL.rc b/base/shell/explorer/lang/he-IL.rc index 8791b8face..2fafd91a41 100644 --- a/base/shell/explorer/lang/he-IL.rc +++ b/base/shell/explorer/lang/he-IL.rc @@ -89,11 +89,11 @@ CAPTION "תפריט התחל" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "תפריט התחל", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "התאם אישית...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "תפריט התחל", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "התאם אישית...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "תפריט התחל קלאסי", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "This menu style gives you the classic look and functionality", IDC_STATIC, 20, 185, 150, 24 + LTEXT "This menu style gives you the classic look and functionality", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "התאם אישית...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/hi-IN.rc b/base/shell/explorer/lang/hi-IN.rc index 49fede8881..35926eee54 100644 --- a/base/shell/explorer/lang/hi-IN.rc +++ b/base/shell/explorer/lang/hi-IN.rc @@ -89,11 +89,11 @@ CAPTION "प्रारंभ मेनू" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&प्रारंभ मेनू", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "यह मेनू शैली आपको अपने फ़ोल्डर्स, पसंदीदा प्रोग्राम और ढूंढ ने में आसान पहुंच प्रदान करती है।", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&कस्टमाइज़...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&प्रारंभ मेनू", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "यह मेनू शैली आपको अपने फ़ोल्डर्स, पसंदीदा प्रोग्राम और ढूंढ ने में आसान पहुंच प्रदान करती है।", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&कस्टमाइज़...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "क्लासिक स्टार्ट &मेनू", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "यह मेनू शैली आपको क्लासिक लुक और कार्यक्षमता देता है", IDC_STATIC, 20, 185, 150, 24 + LTEXT "यह मेनू शैली आपको क्लासिक लुक और कार्यक्षमता देता है", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "&कस्टमाइज़...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/it-IT.rc b/base/shell/explorer/lang/it-IT.rc index 4d1638c037..c8e5e594f7 100644 --- a/base/shell/explorer/lang/it-IT.rc +++ b/base/shell/explorer/lang/it-IT.rc @@ -89,11 +89,11 @@ CAPTION "Menù avvio" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Menù avvio", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Questo stile di menu consente di accedere facilmente alle cartelle, ai programmi preferiti e alla ricerca.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Personalizzare...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Menù avvio", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Questo stile di menu consente di accedere facilmente alle cartelle, ai programmi preferiti e alla ricerca.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Personalizzare...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Menù avvio &classico", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Questo stile di menù ha funzionalità e aspetto classici", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Questo stile di menù ha funzionalità e aspetto classici", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "&Personalizza...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/ja-JP.rc b/base/shell/explorer/lang/ja-JP.rc index 3e67534f21..6dfef99ae8 100644 --- a/base/shell/explorer/lang/ja-JP.rc +++ b/base/shell/explorer/lang/ja-JP.rc @@ -89,11 +89,11 @@ CAPTION "スタートメニュー" FONT 9, "MS UI Gothic", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "スタートメニュー(&S)", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "このメニュースタイルはフォルダ、お気に入りのプログラム、検索への簡単なアクセスを提供します。", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "カスタマイズ(&C)...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "スタートメニュー(&S)", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "このメニュースタイルはフォルダ、お気に入りのプログラム、検索への簡単なアクセスを提供します。", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "カスタマイズ(&C)...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "クラシックスタートメニュー(&M)", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "このメニュースタイルはクラシックな外観、機能性を提供します", IDC_STATIC, 20, 185, 150, 24 + LTEXT "このメニュースタイルはクラシックな外観、機能性を提供します", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "カスタマイズ(&C)...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/ko-KR.rc b/base/shell/explorer/lang/ko-KR.rc index 33c1e95998..fd0bada22c 100644 --- a/base/shell/explorer/lang/ko-KR.rc +++ b/base/shell/explorer/lang/ko-KR.rc @@ -91,11 +91,11 @@ CAPTION "Start Menu" FONT 9, "굴림", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Classic Start &menu", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "This menu style gives you the classic look and functionality", IDC_STATIC, 20, 185, 150, 24 + LTEXT "This menu style gives you the classic look and functionality", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/lt-LT.rc b/base/shell/explorer/lang/lt-LT.rc index 347af775ee..3632a7b685 100644 --- a/base/shell/explorer/lang/lt-LT.rc +++ b/base/shell/explorer/lang/lt-LT.rc @@ -92,11 +92,11 @@ CAPTION "Start Menu" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Classic Start &menu", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "This menu style gives you the classic look and functionality", IDC_STATIC, 20, 185, 150, 24 + LTEXT "This menu style gives you the classic look and functionality", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/ms-MY.rc b/base/shell/explorer/lang/ms-MY.rc index 5e97a7281b..b21f90d15b 100644 --- a/base/shell/explorer/lang/ms-MY.rc +++ b/base/shell/explorer/lang/ms-MY.rc @@ -91,11 +91,11 @@ CAPTION "Menu Mula" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "Menu Mula(&S)", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Gaya menu ini memberikan anda akses ke folder, programs kegemaran anda, dan cari fail anda.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "Suaikan...(&C)", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "Menu Mula(&S)", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Gaya menu ini memberikan anda akses ke folder, programs kegemaran anda, dan cari fail anda.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "Suaikan...(&C)", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Klasik &menu mula", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Gaya menu ini memberikan anda lihat klasik dan berfungsi", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Gaya menu ini memberikan anda lihat klasik dan berfungsi", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "Suaikan...(&C)", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/nl-NL.rc b/base/shell/explorer/lang/nl-NL.rc index 713b31161f..8a1733778d 100644 --- a/base/shell/explorer/lang/nl-NL.rc +++ b/base/shell/explorer/lang/nl-NL.rc @@ -89,11 +89,11 @@ CAPTION "Menu Start" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Menu Start", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Deze menustijl biedt u eenvoudige toegang tot uw mappen, favoriete programma's en zoekopdrachten.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "Aan&passen...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Menu Start", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Deze menustijl biedt u eenvoudige toegang tot uw mappen, favoriete programma's en zoekopdrachten.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "Aan&passen...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "&Klassiek menu Start", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 47, 105, 10 - LTEXT "Deze menustijl biedt u de weergave en functionaliteit van vorige versies van Windows.", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Deze menustijl biedt u de weergave en functionaliteit van vorige versies van Windows.", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "&Aanpassen...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/no-NO.rc b/base/shell/explorer/lang/no-NO.rc index 3ceb3c1556..7553328991 100644 --- a/base/shell/explorer/lang/no-NO.rc +++ b/base/shell/explorer/lang/no-NO.rc @@ -90,11 +90,11 @@ CAPTION "Startmeny" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Startmeny", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Denne meny stilen gir deg enkelt tilgang til dine mapper, favoritt programmer, og søk.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Tilpass...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Startmeny", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Denne meny stilen gir deg enkelt tilgang til dine mapper, favoritt programmer, og søk.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Tilpass...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Klassisk Start&meny", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Denne menystilen gir deg en klassisk utsende og funksjoner", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Denne menystilen gir deg en klassisk utsende og funksjoner", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "&Tilpass...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/pl-PL.rc b/base/shell/explorer/lang/pl-PL.rc index 19b24a0e4b..4e6eca8d4d 100644 --- a/base/shell/explorer/lang/pl-PL.rc +++ b/base/shell/explorer/lang/pl-PL.rc @@ -99,11 +99,11 @@ CAPTION "Menu Start" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Menu Start", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Ten styl menu pozwala na łatwy dostęp do twoich folderów, ulubionych programów i wyszukiwania.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Dostosuj...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Menu Start", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Ten styl menu pozwala na łatwy dostęp do twoich folderów, ulubionych programów i wyszukiwania.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Dostosuj...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "&Klasyczne Menu Start", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Ten styl menu zawiera klasyczny wygląd i funkcjonalność", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Ten styl menu zawiera klasyczny wygląd i funkcjonalność", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "&Dostosuj...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/pt-BR.rc b/base/shell/explorer/lang/pt-BR.rc index 0bf04738ac..f3b70e4c81 100644 --- a/base/shell/explorer/lang/pt-BR.rc +++ b/base/shell/explorer/lang/pt-BR.rc @@ -91,11 +91,11 @@ CAPTION "Menu Iniciar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Menu Iniciar", IDC_TASKBARPROP_STARTMENU, 7, 175, 105, 10, WS_DISABLED - LTEXT "Acesso facilitado a suas pastas, programas favoritos e busca.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Menu Iniciar", IDC_TASKBARPROP_STARTMENU, 7, 175, 105, 10 + LTEXT "Acesso facilitado a suas pastas, programas favoritos e busca.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "M&enu Inicar clássico", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Estilo e funcionalidades do menu clássico", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Estilo e funcionalidades do menu clássico", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/ro-RO.rc b/base/shell/explorer/lang/ro-RO.rc index a78a7e82ed..4b3655343c 100644 --- a/base/shell/explorer/lang/ro-RO.rc +++ b/base/shell/explorer/lang/ro-RO.rc @@ -91,11 +91,11 @@ CAPTION "Meniul „Pornire”" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "Meniul „&Pornire”", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Acest model de meniu oferă acces facil la dosare, programele favorite, și căutare.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "P&articularizare…", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "Meniul „&Pornire”", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Acest model de meniu oferă acces facil la dosare, programele favorite, și căutare.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "P&articularizare…", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Meniul „Pornire” &clasic", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Acest model de meniu vă oferă aspectul și funcționalitatea clasică", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Acest model de meniu vă oferă aspectul și funcționalitatea clasică", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "Pa&rticularizare…", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/ru-RU.rc b/base/shell/explorer/lang/ru-RU.rc index d11c4602ab..0c67da5fa4 100644 --- a/base/shell/explorer/lang/ru-RU.rc +++ b/base/shell/explorer/lang/ru-RU.rc @@ -91,11 +91,11 @@ CAPTION "Меню ""Пуск""" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "М&еню ""Пуск""", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Этот стиль меню обеспечивает удобный доступ к папкам, часто используемым программам и поиску.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Настроить...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "М&еню ""Пуск""", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Этот стиль меню обеспечивает удобный доступ к папкам, часто используемым программам и поиску.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Настроить...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "&Классическое меню ""Пуск""", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Классический стиль отображения меню ""Пуск"".", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Классический стиль отображения меню ""Пуск"".", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "Н&астроить...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/sk-SK.rc b/base/shell/explorer/lang/sk-SK.rc index f6b28dbf1a..c6c65838b9 100644 --- a/base/shell/explorer/lang/sk-SK.rc +++ b/base/shell/explorer/lang/sk-SK.rc @@ -94,11 +94,11 @@ CAPTION "Ponuka Štart" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "Pon&uka Štart", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "P&rispôsobiť...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "Pon&uka Štart", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "P&rispôsobiť...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Klasická po&nuka Štart", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "This menu style gives you the classic look and functionality", IDC_STATIC, 20, 185, 150, 24 + LTEXT "This menu style gives you the classic look and functionality", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "&Prispôsobiť...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/sq-AL.rc b/base/shell/explorer/lang/sq-AL.rc index a561a2f850..2750b8ad2d 100644 --- a/base/shell/explorer/lang/sq-AL.rc +++ b/base/shell/explorer/lang/sq-AL.rc @@ -93,11 +93,11 @@ CAPTION "Fillo" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Fillo menu", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Ky stil menu ju jep juve akses të lehtë në dosjet tuaja të preferuara, programet, dhe kërko.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Modifiko...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Fillo menu", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Ky stil menu ju jep juve akses të lehtë në dosjet tuaja të preferuara, programet, dhe kërko.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Modifiko...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Start &menu klasike", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Ky stil menu ju jep pamjen klasike dhe funksionalitetin", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Ky stil menu ju jep pamjen klasike dhe funksionalitetin", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "&Modifiko...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/tr-TR.rc b/base/shell/explorer/lang/tr-TR.rc index 59e924afb1..c1f25d400d 100644 --- a/base/shell/explorer/lang/tr-TR.rc +++ b/base/shell/explorer/lang/tr-TR.rc @@ -91,11 +91,11 @@ CAPTION "Başlat Seçkesi" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Başlat Seçkesi", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Bu seçke türü; size dizinlerinize, sık kullanılan izlencelere ve aramaya kolay erişim verir.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Husûsileştir...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Başlat Seçkesi", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Bu seçke türü; size dizinlerinize, sık kullanılan izlencelere ve aramaya kolay erişim verir.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Husûsileştir...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "&Geleneklik Başlat Seçkesi", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Bu seçke türü, size geleneklik görünümü ve geleneklik işlevliliği sağlar.", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Bu seçke türü, size geleneklik görünümü ve geleneklik işlevliliği sağlar.", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "H&usûsileştir...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/uk-UA.rc b/base/shell/explorer/lang/uk-UA.rc index 865528b68f..082daf5975 100644 --- a/base/shell/explorer/lang/uk-UA.rc +++ b/base/shell/explorer/lang/uk-UA.rc @@ -97,11 +97,11 @@ CAPTION "Меню ""Пуск""" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Меню ""Пуск""", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "Цей стиль меню забезпечує зручний доступ до папок, часто використовуваних програм та пошуку.", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "&Налаштувати...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "&Меню ""Пуск""", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Цей стиль меню забезпечує зручний доступ до папок, часто використовуваних програм та пошуку.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Налаштувати...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "Класичне меню ""Пуск""", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "Цей стиль меню має класичний вигляд і функціональність", IDC_STATIC, 20, 185, 150, 24 + LTEXT "Цей стиль меню має класичний вигляд і функціональність", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "Н&алаштувати...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/zh-CN.rc b/base/shell/explorer/lang/zh-CN.rc index 0873deaca6..9ff6d7e236 100644 --- a/base/shell/explorer/lang/zh-CN.rc +++ b/base/shell/explorer/lang/zh-CN.rc @@ -98,11 +98,11 @@ CAPTION "开始菜单" FONT 9, "宋体", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "开始菜单(&S)", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "这种菜单风格让您能方便地访问您的文件夹、收藏的程序和搜索。", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "自定义(&C)...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "开始菜单(&S)", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "这种菜单风格让您能方便地访问您的文件夹、收藏的程序和搜索。", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "自定义(&C)...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "经典开始菜单(&M)", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "这种菜单风格给您带来经典的外观和功能。", IDC_STATIC, 20, 185, 150, 24 + LTEXT "这种菜单风格给您带来经典的外观和功能。", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "自定义(&C)...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/lang/zh-TW.rc b/base/shell/explorer/lang/zh-TW.rc index 74e1d4108b..070870f769 100644 --- a/base/shell/explorer/lang/zh-TW.rc +++ b/base/shell/explorer/lang/zh-TW.rc @@ -98,11 +98,11 @@ CAPTION "開始功能表" FONT 9, "新細明體", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "開始功能表(&S)", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED - LTEXT "這個樣式讓你可以輕鬆存取您的資料夾、最愛的程式和搜尋資料。", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED - PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "開始功能表(&S)", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "這個樣式讓你可以輕鬆存取您的資料夾、最愛的程式和搜尋資料。", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 AUTORADIOBUTTON "傳統開始功能表(&M)", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 - LTEXT "這個樣式可以為您帶來傳統的外貌及功能。", IDC_STATIC, 20, 185, 150, 24 + LTEXT "這個樣式可以為您帶來傳統的外貌及功能。", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END diff --git a/base/shell/explorer/resource.h b/base/shell/explorer/resource.h index b773da61f9..2e748252fd 100644 --- a/base/shell/explorer/resource.h +++ b/base/shell/explorer/resource.h @@ -124,9 +124,11 @@ /* Startmenu Page */ #define IDC_TASKBARPROP_STARTMENUCLASSICCUST 1130 +#define IDC_TASKBARPROP_STARTMENUMODERNTEXT 1141 #define IDC_TASKBARPROP_STARTMENUCUST 1131 #define IDC_TASKBARPROP_STARTMENU 1132 #define IDC_TASKBARPROP_STARTMENUCLASSIC 1133 +#define IDC_TASKBARPROP_STARTMENUCLASSICTEXT 1142 #define IDC_TASKBARPROP_STARTMENU_BITMAP 1134 #define IDC_STARTBTN 1140 diff --git a/base/shell/explorer/trayprop.cpp b/base/shell/explorer/trayprop.cpp index d5b075a952..00ac0b3767 100644 --- a/base/shell/explorer/trayprop.cpp +++ b/base/shell/explorer/trayprop.cpp @@ -196,8 +196,31 @@ private: HWND hwndCustomizeClassic = GetDlgItem(IDC_TASKBARPROP_STARTMENUCLASSICCUST); HWND hwndCustomizeModern = GetDlgItem(IDC_TASKBARPROP_STARTMENUCUST); HWND hwndStartBitmap = GetDlgItem(IDC_TASKBARPROP_STARTMENU_BITMAP); + HWND hwndModernRadioBtn = GetDlgItem(IDC_TASKBARPROP_STARTMENU); + HWND hwndModernText = GetDlgItem(IDC_TASKBARPROP_STARTMENUMODERNTEXT); + BOOL policyNoSimpleStartMenu = SHRestricted(REST_NOSTARTPANEL) != 0; + BOOL bModern = FALSE; + + /* If NoSimpleStartMenu, disable ability to use Modern Start Menu */ + if (policyNoSimpleStartMenu) + { + /* Switch to classic */ + CheckDlgButton(IDC_TASKBARPROP_STARTMENUCLASSIC, BST_CHECKED); + + /* Disable radio button */ + ::EnableWindow(hwndModernRadioBtn, FALSE); + + /* Hide controls related to modern menu */ + ::ShowWindow(hwndModernRadioBtn, SW_HIDE); + ::ShowWindow(hwndModernText, SW_HIDE); + ::ShowWindow(hwndCustomizeModern, SW_HIDE); + } + /* If no restrictions, then get bModern from dialog */ + else + { + bModern = IsDlgButtonChecked(IDC_TASKBARPROP_STARTMENU); + } - BOOL bModern = IsDlgButtonChecked(IDC_TASKBARPROP_STARTMENU); ::EnableWindow(hwndCustomizeModern, bModern); ::EnableWindow(hwndCustomizeClassic, !bModern); @@ -227,8 +250,10 @@ public: LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - CheckDlgButton(IDC_TASKBARPROP_STARTMENUCLASSIC, BST_CHECKED); // HACK: This has to be read from registry! + // fix me: start menu style (classic/modern) should be read somewhere from the registry. + CheckDlgButton(IDC_TASKBARPROP_STARTMENUCLASSIC, BST_CHECKED); // HACK: This has to be read from registry!!!!!!! UpdateDialog(); + return TRUE; } diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 844ba9c7d3..d7e561f766 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1898,6 +1898,9 @@ HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 ;HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer","NoSimpleStartMenu",0x00010003,1 + HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",,0x00000012 diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index 90907e3d49..f63f87ca96 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -211,6 +211,11 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion","WallPaperDir",0x00020002,"%Sys HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Applets",,0x00000012 +; default shell +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer","NoSimpleStartMenu",0x00010003,1 + ; Extra Control Panel Applets HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cpls",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cpls","Console",0x00020000,"%SystemRoot%\system32\console.dll" diff --git a/dll/win32/shell32/wine/shpolicy.c b/dll/win32/shell32/wine/shpolicy.c index 97f938aec7..6f7a2a5b20 100644 --- a/dll/win32/shell32/wine/shpolicy.c +++ b/dll/win32/shell32/wine/shpolicy.c @@ -131,6 +131,9 @@ static const char strNoFileMenu[] = {"NoFileMenu"}; static const char strNoSaveSetting[] = {"NoSaveSettings"}; static const char strNoClose[] = {"NoClose"}; static const char strNoRun[] = {"NoRun"}; +#ifdef __REACTOS__ +static const char strNoSimpleStartMenu[] = {"NoSimpleStartMenu"}; +#endif /* policy data array */ static POLICYDATA sh32_policy_table[] = @@ -762,6 +765,14 @@ static POLICYDATA sh32_policy_table[] = "NoneLegacyShellMode", SHELL_NO_POLICY }, +#ifdef __REACTOS__ + { + REST_NOSTARTPANEL, + strExplorer, + strNoSimpleStartMenu, + SHELL_NO_POLICY + }, +#endif { REST_STARTRUNNOHOMEPATH, strExplorer,

5 years, 9 months

[reactos] 01/01: [UNIATA] Update to version 0.47. CORE-15870

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b54613073127f5204660d… commit b54613073127f5204660d9e9ab86159fea06b23e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Mar 19 21:47:11 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Mar 24 14:48:32 2019 +0100 [UNIATA] Update to version 0.47. CORE-15870 --- drivers/storage/ide/uniata/atacmd_map.h | 2 +- drivers/storage/ide/uniata/bm_devs.h | 221 ++++++++++++++++++++++++++---- drivers/storage/ide/uniata/bm_devs_decl.h | 2 + drivers/storage/ide/uniata/id_ata.cpp | 26 +++- drivers/storage/ide/uniata/id_probe.cpp | 4 - drivers/storage/ide/uniata/id_sata.cpp | 49 ++++++- drivers/storage/ide/uniata/uniata_ver.h | 14 +- 7 files changed, 272 insertions(+), 46 deletions(-) diff --git a/drivers/storage/ide/uniata/atacmd_map.h b/drivers/storage/ide/uniata/atacmd_map.h index 9158bc8c5d..2b62e37258 100644 --- a/drivers/storage/ide/uniata/atacmd_map.h +++ b/drivers/storage/ide/uniata/atacmd_map.h @@ -1,5 +1,5 @@ -// Build Version 0.46e6 +// Build Version 0.46e8 UCHAR const AtaCommands48[256] = { diff --git a/drivers/storage/ide/uniata/bm_devs.h b/drivers/storage/ide/uniata/bm_devs.h index 1de82b2f6e..5acef02a1d 100644 --- a/drivers/storage/ide/uniata/bm_devs.h +++ b/drivers/storage/ide/uniata/bm_devs.h @@ -1,6 +1,6 @@ /*++ -Copyright (c) 2002-2016 Alexandr A. Telyatnikov (Alter) +Copyright (c) 2002-2019 Alexandr A. Telyatnikov (Alter) Module Name: bm_devs.h @@ -64,6 +64,37 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 208F, 1022, 0x00, ATA_UDMA4, "AMD CS5535" , CYRIX_35 ), PCI_DEV_HW_SPEC_BM( 209a, 1022, 0x00, ATA_UDMA5, "AMD CS5536" , 0 ), + PCI_DEV_HW_SPEC_BM( 4380, 1022, 0x00, ATA_SA300, "AMD CS5536" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 4390, 1022, 0x00, ATA_SA300, "AMD SB7x0/SB8x0/SB9x0" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 4391, 1022, 0x00, ATA_SA300, "AMD SB7x0/SB8x0/SB9x0" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 4392, 1022, 0x00, ATA_SA300, "AMD SB7x0/SB8x0/SB9x0" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 4393, 1022, 0x00, ATA_SA300, "AMD SB7x0/SB8x0/SB9x0" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 4394, 1022, 0x00, ATA_SA300, "AMD SB7x0/SB8x0/SB9x0" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 4395, 1022, 0x00, ATA_SA300, "AMD SB8x0/SB9x0" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 43b6, 1022, 0x00, ATA_SA300, "AMD X399", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 43b5, 1022, 0x00, ATA_SA300, "AMD 300 Series", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 43b7, 1022, 0x00, ATA_SA300, "AMD 300 Series", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 7800, 1022, 0x00, ATA_SA300, "AMD Hudson-2", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 7801, 1022, 0x00, ATA_SA300, "AMD Hudson-2", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 7802, 1022, 0x00, ATA_SA300, "AMD Hudson-2", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 7803, 1022, 0x00, ATA_SA300, "AMD Hudson-2", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 7804, 1022, 0x00, ATA_SA300, "AMD Hudson-2", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 7900, 1022, 0x00, ATA_SA300, "AMD KERNCZ", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 7901, 1022, 0x00, ATA_SA300, "AMD KERNCZ", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 7902, 1022, 0x00, ATA_SA300, "AMD KERNCZ", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 7903, 1022, 0x00, ATA_SA300, "AMD KERNCZ", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 7904, 1022, 0x00, ATA_SA300, "AMD KERNCZ", UNIATA_SATA | UNIATA_AHCI), + + PCI_DEV_HW_SPEC_BM( 0601, 1022, 0x00, ATA_SA300, "ASMedia ASM1060", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0602, 1022, 0x00, ATA_SA300, "ASMedia ASM1060", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0611, 1022, 0x00, ATA_SA300, "ASMedia ASM1061", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0612, 1022, 0x00, ATA_SA300, "ASMedia ASM1062", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0620, 1022, 0x00, ATA_SA300, "ASMedia ASM106x", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0621, 1022, 0x00, ATA_SA300, "ASMedia ASM106x", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0622, 1022, 0x00, ATA_SA300, "ASMedia ASM106x", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0624, 1022, 0x00, ATA_SA300, "ASMedia ASM106x", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0625, 1022, 0x00, ATA_SA300, "ASMedia ASM106x", UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 4349, 1002, 0x00, ATA_UDMA5, "ATI IXP200" , 0 ), PCI_DEV_HW_SPEC_BM( 4369, 1002, 0x00, ATA_UDMA6, "ATI IXP300" , 0 ), PCI_DEV_HW_SPEC_BM( 4376, 1002, 0x00, ATA_UDMA6, "ATI IXP400" , 0 ), @@ -97,13 +128,26 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 0007, 1103, 0x01, ATA_UDMA6, "HighPoint HPT371" , HPT372 | 0x00 | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 0008, 1103, 0x07, ATA_UDMA6, "HighPoint HPT374" , HPT374 | 0x00 | UNIATA_RAID_CONTROLLER), + /* some chips have marvell vendor id ? */ + PCI_DEV_HW_SPEC_BM( 0620, 1103, 0x07, ATA_SA300, "HighPoint RocketRAID 620" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0620, 1b4b, 0x07, ATA_SA300, "HighPoint RocketRAID 620" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0622, 1103, 0x07, ATA_SA300, "HighPoint RocketRAID 622" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0622, 1b4b, 0x07, ATA_SA300, "HighPoint RocketRAID 622" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0640, 1103, 0x07, ATA_SA300, "HighPoint RocketRAID 640" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0640, 1b4b, 0x07, ATA_SA300, "HighPoint RocketRAID 640" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0644, 1103, 0x07, ATA_SA300, "HighPoint RocketRAID 644" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0644, 1b4b, 0x07, ATA_SA300, "HighPoint RocketRAID 644" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0641, 1103, 0x07, ATA_SA300, "HighPoint RocketRAID 640L" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0642, 1103, 0x07, ATA_SA300, "HighPoint RocketRAID 642L" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0645, 1103, 0x07, ATA_SA300, "HighPoint RocketRAID 644L" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 1230, 8086, 0x00, ATA_WDMA2, "Intel PIIX" , UNIATA_CHAN_TIMINGS ), PCI_DEV_HW_SPEC_BM( 7010, 8086, 0x00, ATA_WDMA2, "Intel PIIX3" , 0 ), PCI_DEV_HW_SPEC_BM( 7111, 8086, 0x00, ATA_UDMA2, "Intel PIIX3" , 0 ), PCI_DEV_HW_SPEC_BM( 7199, 8086, 0x00, ATA_UDMA2, "Intel PIIX4" , 0 ), PCI_DEV_HW_SPEC_BM( 84ca, 8086, 0x00, ATA_UDMA2, "Intel PIIX4" , 0 ), PCI_DEV_HW_SPEC_BM( 7601, 8086, 0x00, ATA_UDMA2, "Intel ICH0" , 0 ), - + PCI_DEV_HW_SPEC_BM( 2421, 8086, 0x00, ATA_UDMA4, "Intel ICH" , 0 ), PCI_DEV_HW_SPEC_BM( 2411, 8086, 0x00, ATA_UDMA4, "Intel ICH" , 0 ), @@ -145,12 +189,12 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 2820, 8086, 0x00, ATA_SA300, "Intel ICH8" , I6CH ), PCI_DEV_HW_SPEC_BM( 2821, 8086, 0x00, ATA_SA300, "Intel ICH8" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 2822, 8086, 0x00, ATA_SA300, "Intel ICH8" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 2822, 8086, 0x00, ATA_SA300, "Intel ICH8+" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 2824, 8086, 0x00, ATA_SA300, "Intel ICH8" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2825, 8086, 0x00, ATA_SA300, "Intel ICH8" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 2828, 8086, 0x00, ATA_SA300, "Intel ICH8M" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 2829, 8086, 0x00, ATA_SA300, "Intel ICH8M" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 282a, 8086, 0x00, ATA_SA300, "Intel ICH8M" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 282a, 8086, 0x00, ATA_SA300, "Intel ICH8M+" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 2850, 8086, 0x00, ATA_UDMA5, "Intel ICH8M" , 0 ), PCI_DEV_HW_SPEC_BM( 2920, 8086, 0x00, ATA_SA300, "Intel ICH9" , I6CH | UNIATA_SATA ), @@ -168,12 +212,12 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 3a20, 8086, 0x00, ATA_SA300, "Intel ICH10" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 3a26, 8086, 0x00, ATA_SA300, "Intel ICH10" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 3a22, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 3a25, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3a25, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 3a00, 8086, 0x00, ATA_SA300, "Intel ICH10" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 3a06, 8086, 0x00, ATA_SA300, "Intel ICH10" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 3a02, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 3a05, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3a05, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), /* PCI_DEV_HW_SPEC_BM( ????, 8086, 0x00, ATA_SA300, "Intel ICH10" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( ????, 8086, 0x00, ATA_SA300, "Intel ICH10" , I6CH2 | UNIATA_SATA ), @@ -182,23 +226,45 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { */ PCI_DEV_HW_SPEC_BM( 3b20, 8086, 0x00, ATA_SA300, "Intel 5 Series/3400" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 3b21, 8086, 0x00, ATA_SA300, "Intel 5 Series/3400" , I6CH2 | UNIATA_SATA ), - PCI_DEV_HW_SPEC_BM( 3b22, 8086, 0x00, ATA_SA300, "Intel 5 Series/3400" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 3b23, 8086, 0x00, ATA_SA300, "Intel 5 Series/3400" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 3b25, 8086, 0x00, ATA_SA300, "Intel 5 Series/3400" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3b22, 8086, 0x00, ATA_SA300, "Intel Ibex Peak" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3b23, 8086, 0x00, ATA_SA300, "Intel Ibex Peak" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3b25, 8086, 0x00, ATA_SA300, "Intel Ibex Peak" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 3b26, 8086, 0x00, ATA_SA300, "Intel 5 Series/3400" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 3b28, 8086, 0x00, ATA_SA300, "Intel 5 Series/3400" , I6CH | UNIATA_SATA ), - PCI_DEV_HW_SPEC_BM( 3b29, 8086, 0x00, ATA_SA300, "Intel 5 Series/3400" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 3b2c, 8086, 0x00, ATA_SA300, "Intel 5 Series/3400" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3b29, 8086, 0x00, ATA_SA300, "Intel Ibex Peak-M" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3b2c, 8086, 0x00, ATA_SA300, "Intel Ibex Peak-M" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 3b2d, 8086, 0x00, ATA_SA300, "Intel 5 Series/3400" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 3b2e, 8086, 0x00, ATA_SA300, "Intel 5 Series/3400" , I6CH | UNIATA_SATA ), - PCI_DEV_HW_SPEC_BM( 3b2f, 8086, 0x00, ATA_SA300, "Intel 5 Series/3400" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3b2f, 8086, 0x00, ATA_SA300, "Intel Ibex Peak-M" , UNIATA_SATA | UNIATA_AHCI ), + + PCI_DEV_HW_SPEC_BM( 19b0, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19b1, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19b2, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19b3, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19b4, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19b5, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19b6, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19b7, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19be, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19bf, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19c0, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19c1, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19c2, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19c3, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19c4, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19c5, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19c6, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19c7, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19ce, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 19cf, 8086, 0x00, ATA_SA300, "Intel Denverton" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 1c00, 8086, 0x00, ATA_SA300, "Intel Cougar Point" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 1c01, 8086, 0x00, ATA_SA300, "Intel Cougar Point" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 1c02, 8086, 0x00, ATA_SA300, "Intel Cougar Point" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 1c03, 8086, 0x00, ATA_SA300, "Intel Cougar Point" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 1c04, 8086, 0x00, ATA_SA300, "Intel Cougar Point" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 1c05, 8086, 0x00, ATA_SA300, "Intel Cougar Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1c04, 8086, 0x00, ATA_SA300, "Intel Cougar Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1c05, 8086, 0x00, ATA_SA300, "Intel Cougar Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1c06, 8086, 0x00, ATA_SA300, "Intel Cougar Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 1c08, 8086, 0x00, ATA_SA300, "Intel Cougar Point" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 1c09, 8086, 0x00, ATA_SA300, "Intel Cougar Point" , I6CH2 | UNIATA_SATA ), @@ -206,35 +272,106 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 1d02, 8086, 0x00, ATA_SA300, "Intel Patsburg" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 1d04, 8086, 0x00, ATA_SA300, "Intel Patsburg" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 1d06, 8086, 0x00, ATA_SA300, "Intel Patsburg" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 2826, 8086, 0x00, ATA_SA300, "Intel Patsburg" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 2826, 8086, 0x00, ATA_SA300, "Intel Patsburg+" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 1d08, 8086, 0x00, ATA_SA300, "Intel Patsburg" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 1e00, 8086, 0x00, ATA_SA300, "Intel Panther Point" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 1e01, 8086, 0x00, ATA_SA300, "Intel Panther Point" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 1e02, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 1e03, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 1e04, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 1e05, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 1e06, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 1e07, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1e04, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1e05, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1e06, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1e07, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 1e08, 8086, 0x00, ATA_SA300, "Intel Panther Point" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 1e09, 8086, 0x00, ATA_SA300, "Intel Panther Point" , I6CH2 | UNIATA_SATA ), - PCI_DEV_HW_SPEC_BM( 1e0e, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 1e0f, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), - + PCI_DEV_HW_SPEC_BM( 1e0e, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1e0f, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + + PCI_DEV_HW_SPEC_BM( 1f22, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1f23, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1f24, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1f25, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1f26, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1f27, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1f2e, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1f2f, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1f32, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1f33, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1f34, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1f35, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1f36, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1f37, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1f3e, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 1f3f, 8086, 0x00, ATA_SA300, "Intel Avoton Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + + PCI_DEV_HW_SPEC_BM( 23a3, 8086, 0x00, ATA_SA300, "Intel Coleto Creek" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 8c00, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 8c01, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 8c02, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 8c03, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 8c04, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 8c05, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 8c06, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 8c07, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 8c04, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 8c05, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 8c06, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 8c07, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 8c08, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 8c09, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , I6CH2 | UNIATA_SATA ), - PCI_DEV_HW_SPEC_BM( 8c0e, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 8c0f, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI ), - + PCI_DEV_HW_SPEC_BM( 8c0e, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 8c0f, 8086, 0x00, ATA_SA300, "Intel Lynx Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + + PCI_DEV_HW_SPEC_BM( 8c82, 8086, 0x00, ATA_SA300, "Intel Wildcat Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 8c83, 8086, 0x00, ATA_SA300, "Intel Wildcat Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 8c84, 8086, 0x00, ATA_SA300, "Intel Wildcat Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 8c85, 8086, 0x00, ATA_SA300, "Intel Wildcat Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 8c86, 8086, 0x00, ATA_SA300, "Intel Wildcat Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 8c87, 8086, 0x00, ATA_SA300, "Intel Wildcat Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 8c8e, 8086, 0x00, ATA_SA300, "Intel Wildcat Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 8c8f, 8086, 0x00, ATA_SA300, "Intel Wildcat Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + + PCI_DEV_HW_SPEC_BM( 8d02, 8086, 0x00, ATA_SA300, "Intel Wellsburg Point" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 8d04, 8086, 0x00, ATA_SA300, "Intel Wellsburg Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 8d06, 8086, 0x00, ATA_SA300, "Intel Wellsburg Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 8d62, 8086, 0x00, ATA_SA300, "Intel Wellsburg Point" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 8d64, 8086, 0x00, ATA_SA300, "Intel Wellsburg Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 8d66, 8086, 0x00, ATA_SA300, "Intel Wellsburg Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 8d6e, 8086, 0x00, ATA_SA300, "Intel Wellsburg Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 2823, 8086, 0x00, ATA_SA300, "Intel Wellsburg Point+" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 2827, 8086, 0x00, ATA_SA300, "Intel Wellsburg Point+" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + + PCI_DEV_HW_SPEC_BM( 9c02, 8086, 0x00, ATA_SA300, "Intel Lynx Point-LP" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 9c03, 8086, 0x00, ATA_SA300, "Intel Lynx Point-LP" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 9c04, 8086, 0x00, ATA_SA300, "Intel Lynx Point-LP" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 9c05, 8086, 0x00, ATA_SA300, "Intel Lynx Point-LP" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 9c06, 8086, 0x00, ATA_SA300, "Intel Lynx Point-LP" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 9c07, 8086, 0x00, ATA_SA300, "Intel Lynx Point-LP" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 9c0e, 8086, 0x00, ATA_SA300, "Intel Lynx Point-LP" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 9c0f, 8086, 0x00, ATA_SA300, "Intel Lynx Point-LP" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + + PCI_DEV_HW_SPEC_BM( 9d03, 8086, 0x00, ATA_SA300, "Intel Sunrise Point-LP" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 9d05, 8086, 0x00, ATA_SA300, "Intel Sunrise Point-LP" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( 9d07, 8086, 0x00, ATA_SA300, "Intel Sunrise Point-LP" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + + PCI_DEV_HW_SPEC_BM( a102, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( a103, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( a105, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( a106, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( a107, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( a10f, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + + PCI_DEV_HW_SPEC_BM( a182, 8086, 0x00, ATA_SA300, "Intel Lewisburg" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( a186, 8086, 0x00, ATA_SA300, "Intel Lewisburg" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( a1d2, 8086, 0x00, ATA_SA300, "Intel Lewisburg" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( a1d6, 8086, 0x00, ATA_SA300, "Intel Lewisburg" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( a202, 8086, 0x00, ATA_SA300, "Intel Lewisburg" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( a206, 8086, 0x00, ATA_SA300, "Intel Lewisburg" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( a252, 8086, 0x00, ATA_SA300, "Intel Lewisburg" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( a256, 8086, 0x00, ATA_SA300, "Intel Lewisburg" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + + PCI_DEV_HW_SPEC_BM( a282, 8086, 0x00, ATA_SA300, "Intel Union Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( a286, 8086, 0x00, ATA_SA300, "Intel Union Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + PCI_DEV_HW_SPEC_BM( a28e, 8086, 0x00, ATA_SA300, "Intel Union Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), + // PCI_DEV_HW_SPEC_BM( 3200, 8086, 0x00, ATA_SA150, "Intel 31244" , UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 811a, 8086, 0x00, ATA_UDMA5, "Intel SCH" , 0 ), PCI_DEV_HW_SPEC_BM( 2323, 8086, 0x00, ATA_SA300, "Intel DH98xxCC" , UNIATA_SATA | UNIATA_AHCI ), @@ -263,9 +400,24 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 6121, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6121" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 6141, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6141" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 6145, 11ab, 0x00, ATA_UDMA6, "Marvell 88SX6145" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 9123, 1b4b, 0x00, ATA_UDMA6, "Marvell 88SX9123" , UNIATA_SATA | UNIATA_AHCI ), +// PCI_DEV_HW_SPEC_BM( 9123, 1b4b, 0x00, ATA_UDMA6, "Marvell 88SX9123" , UNIATA_SATA | UNIATA_AHCI ), /* PCI_DEV_HW_SPEC_BM( 91a4, 1b4b, 0x00, ATA_UDMA6, "Marvell 88SE912x" , 0 ),*/ + PCI_DEV_HW_SPEC_BM( 9120, 1b4b, 0x00, ATA_SA300, "Marvell 88SE912x" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 9123, 1b4b, 0x11, ATA_SA300, "Marvell 88SE912x" , UNIATA_SATA | UNIATA_AHCI | UNIATA_AHCI_ALT_SIG), + PCI_DEV_HW_SPEC_BM( 9123, 1b4b, 0x00, ATA_SA300, "Marvell 88SE912x" , UNIATA_SATA | UNIATA_AHCI ),// AHCI_Q_SATA2 + PCI_DEV_HW_SPEC_BM( 9125, 1b4b, 0x00, ATA_SA300, "Marvell 88SE9125" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 9128, 1b4b, 0x00, ATA_SA300, "Marvell 88SE9128" , UNIATA_SATA | UNIATA_AHCI | UNIATA_AHCI_ALT_SIG), + PCI_DEV_HW_SPEC_BM( 9130, 1b4b, 0x00, ATA_SA300, "Marvell 88SE9130" , UNIATA_SATA | UNIATA_AHCI | UNIATA_AHCI_ALT_SIG), + PCI_DEV_HW_SPEC_BM( 9172, 1b4b, 0x00, ATA_SA300, "Marvell 88SE9172" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 9182, 1b4b, 0x00, ATA_SA300, "Marvell 88SE9182" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 9183, 1b4b, 0x00, ATA_SA300, "Marvell 88SS9183" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 91a0, 1b4b, 0x00, ATA_SA300, "Marvell 88SE91Ax" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 9215, 1b4b, 0x00, ATA_SA300, "Marvell 88SE9215" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 9220, 1b4b, 0x00, ATA_SA300, "Marvell 88SE9220" , UNIATA_SATA | UNIATA_AHCI | UNIATA_AHCI_ALT_SIG), + PCI_DEV_HW_SPEC_BM( 9230, 1b4b, 0x00, ATA_SA300, "Marvell 88SE9230" , UNIATA_SATA | UNIATA_AHCI | UNIATA_AHCI_ALT_SIG), + PCI_DEV_HW_SPEC_BM( 9235, 1b4b, 0x00, ATA_SA300, "Marvell 88SE9235" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 01bc, 10de, 0x00, ATA_UDMA5, "nVidia nForce" , 0 ), PCI_DEV_HW_SPEC_BM( 0065, 10de, 0x00, ATA_UDMA6, "nVidia nForce2" , 0 ), PCI_DEV_HW_SPEC_BM( 0085, 10de, 0x00, ATA_UDMA6, "nVidia nForce2 Pro",0 ), @@ -407,6 +559,7 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 3574, 105a, 0x00, ATA_SA150, "Promise PDC40718" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA), PCI_DEV_HW_SPEC_BM( 3570, 105a, 0x00, ATA_SA300, "Promise PDC40719" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA), PCI_DEV_HW_SPEC_BM( 3d73, 105a, 0x00, ATA_SA300, "Promise PDC40779" , PRMIO | PRSATA2 | UNIATA_RAID_CONTROLLER | UNIATA_SATA), + PCI_DEV_HW_SPEC_BM( 3781, 105a, 0x00, ATA_SA300, "Promise TX8660" , UNIATA_SATA | UNIATA_AHCI), PCI_DEV_HW_SPEC_BM( 0211, 1166, 0x00, ATA_UDMA2, "ServerWorks ROSB4", SWKS33 | UNIATA_NO_DPC ), PCI_DEV_HW_SPEC_BM( 0212, 1166, 0x92, ATA_UDMA5, "ServerWorks CSB5" , SWKS100 ), @@ -480,6 +633,10 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 0181, 1039, 0x00, ATA_SA150, "SiS SATA 181" , SISSATA | UNIATA_SATA), PCI_DEV_HW_SPEC_BM( 0180, 1039, 0x00, ATA_SA150, "SiS SATA 180" , SISSATA | UNIATA_SATA), + PCI_DEV_HW_SPEC_BM( 1184, 1039, 0x00, ATA_SA300, "SiS 966" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 1185, 1039, 0x00, ATA_SA300, "SiS 968" , UNIATA_SATA | UNIATA_AHCI), + PCI_DEV_HW_SPEC_BM( 0186, 1039, 0x00, ATA_SA300, "SiS 968" , UNIATA_SATA | UNIATA_AHCI), + /* PCI_DEV_HW_SPEC_BM( 0586, 1106, 0x41, ATA_UDMA2, "VIA 82C586B" , VIA33 | 0x00 ), PCI_DEV_HW_SPEC_BM( 0586, 1106, 0x40, ATA_UDMA2, "VIA 82C586B" , VIA33 | VIAPRQ ), PCI_DEV_HW_SPEC_BM( 0586, 1106, 0x02, ATA_UDMA2, "VIA 82C586B" , VIA33 | 0x00 ), @@ -507,6 +664,7 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 5372, 1106, 0x00, ATA_SA300, "VIA 8237" , 0 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 7372, 1106, 0x00, ATA_SA300, "VIA 8237" , 0 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 3349, 1106, 0x00, ATA_SA150, "VIA 8251" , 0 | UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 6287, 1106, 0x00, ATA_SA150, "VIA 8251" , 0 | UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( c693, 1080, 0x00, ATA_WDMA2, "Cypress 82C693" ,0 ), @@ -549,6 +707,9 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 8013, 3388, 0x00, ATA_DMA, "HiNT VXII EIDE" , 0 ), + PCI_DEV_HW_SPEC_BM( a01c, 177d, 0x00, ATA_SA300, "ThunderX" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 0031, 1c36, 0x00, ATA_SA300, "Annapurna" , UNIATA_SATA | UNIATA_AHCI ), + // Terminator PCI_DEV_HW_SPEC_BM( ffff, ffff, 0xff, BMLIST_TERMINATOR, NULL , BMLIST_TERMINATOR ) }; diff --git a/drivers/storage/ide/uniata/bm_devs_decl.h b/drivers/storage/ide/uniata/bm_devs_decl.h index 16070cd530..15c6a72ec0 100644 --- a/drivers/storage/ide/uniata/bm_devs_decl.h +++ b/drivers/storage/ide/uniata/bm_devs_decl.h @@ -630,6 +630,8 @@ typedef struct _BUSMASTER_CONTROLLER_INFORMATION { #define UNIATA_AHCI 0x02000000 #define UNIATA_NO80CHK 0x01000000 #define UNIATA_CHAN_TIMINGS 0x00800000 /* controller has common timing settings for master/slave */ +#define UNIATA_AHCI_ALT_SIG 0x00400000 /* Some weird controllers do not return signature in + FIS receive area. Read it from PxSIG register */ #define ATPOLD 0x0100 diff --git a/drivers/storage/ide/uniata/id_ata.cpp b/drivers/storage/ide/uniata/id_ata.cpp index 26d9257ad0..4c8e15944e 100644 --- a/drivers/storage/ide/uniata/id_ata.cpp +++ b/drivers/storage/ide/uniata/id_ata.cpp @@ -7240,7 +7240,7 @@ IdeVerify( } KdPrint2((PRINT_PREFIX - "IdeVerify: Total sectors %#x\n", + "IdeVerify: Total sectors %#I64x\n", sectors)); // Get starting sector number from CDB. @@ -7304,6 +7304,7 @@ IdeVerify( if(!(statusByte & IDE_STATUS_ERROR)) { // Wait for interrupt. + UniataExpectChannelInterrupt(chan, TRUE); return SRB_STATUS_PENDING; } return SRB_STATUS_ERROR; @@ -11245,6 +11246,7 @@ AtapiRegCheckDevValue( IN ULONG VendorID; IN ULONG DeviceID; IN ULONG SlotNumber; + IN ULONG HwFlags; ULONG val = Default; @@ -11254,16 +11256,38 @@ AtapiRegCheckDevValue( VendorID = deviceExtension->DevID & 0xffff; DeviceID = (deviceExtension->DevID >> 16) & 0xffff; SlotNumber = deviceExtension->slotNumber; + HwFlags = deviceExtension->HwFlags; } else { VendorID = 0xffff; DeviceID = 0xffff; SlotNumber = 0xffffffff; + HwFlags = 0; } val = AtapiRegCheckDevLunValue( HwDeviceExtension, L"Parameters", chan, dev, Name, val); if(deviceExtension) { + + if(HwFlags & UNIATA_SATA) { + swprintf(namev, L"\\SATA"); + swprintf(namex, L"Parameters%s", namev); + val = AtapiRegCheckDevLunValue( + HwDeviceExtension, namex, chan, dev, Name, val); + } + if(HwFlags & UNIATA_AHCI) { + swprintf(namev, L"\\AHCI"); + swprintf(namex, L"Parameters%s", namev); + val = AtapiRegCheckDevLunValue( + HwDeviceExtension, namex, chan, dev, Name, val); + } + if(!(HwFlags & (UNIATA_AHCI | UNIATA_AHCI))) { + swprintf(namev, L"\\PATA"); + swprintf(namex, L"Parameters%s", namev); + val = AtapiRegCheckDevLunValue( + HwDeviceExtension, namex, chan, dev, Name, val); + } + if(deviceExtension->AdapterInterfaceType == PCIBus) { // PCI swprintf(namev, L"\\IDE_%d", deviceExtension->DevIndex); diff --git a/drivers/storage/ide/uniata/id_probe.cpp b/drivers/storage/ide/uniata/id_probe.cpp index 0a36684d7f..dcb4225f00 100644 --- a/drivers/storage/ide/uniata/id_probe.cpp +++ b/drivers/storage/ide/uniata/id_probe.cpp @@ -148,11 +148,7 @@ UniataEnableIoPCI( /* Get PCI address by ConfigInfo and RID */ -#ifdef __REACTOS__ ULONGIO_PTR -#else -ULONG -#endif NTAPI AtapiGetIoRange( IN PVOID HwDeviceExtension, diff --git a/drivers/storage/ide/uniata/id_sata.cpp b/drivers/storage/ide/uniata/id_sata.cpp index c39b0a83fa..32c4c9008d 100644 --- a/drivers/storage/ide/uniata/id_sata.cpp +++ b/drivers/storage/ide/uniata/id_sata.cpp @@ -1,6 +1,6 @@ /*++ -Copyright (c) 2008-2016 Alexandr A. Telyatnikov (Alter) +Copyright (c) 2008-2019 Alexandr A. Telyatnikov (Alter) Module Name: id_probe.cpp @@ -895,6 +895,7 @@ UniataAhciDetect( ULONG version; ULONG i, n; ULONG PI; + //ULONG PI_ex_mask=0; ULONG CAP; ULONG CAP2; ULONG GHC, GHC0; @@ -906,6 +907,7 @@ UniataAhciDetect( ULONG_PTR BaseMemAddress; BOOLEAN MemIo = FALSE; BOOLEAN found = FALSE; + ULONG BarId=5; KdPrint2((PRINT_PREFIX " UniataAhciDetect:\n")); @@ -913,13 +915,19 @@ UniataAhciDetect( KdPrint((" AHCI excluded\n")); return FALSE; } + switch(deviceExtension->DevID) { + case 0xa01c0031: + KdPrint2((PRINT_PREFIX " Cavium uses BAR(0)\n")); + BarId = 0; + break; + } BaseMemAddress = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber, - 5, 0, 0x10); + BarId, 0, 0x10); if(!BaseMemAddress) { KdPrint2((PRINT_PREFIX " AHCI init failed - no IoRange\n")); return FALSE; } - if((*ConfigInfo->AccessRanges)[5].RangeInMemory) { + if((*ConfigInfo->AccessRanges)[BarId].RangeInMemory) { KdPrint2((PRINT_PREFIX "MemIo\n")); MemIo = TRUE; } @@ -1001,6 +1009,7 @@ UniataAhciDetect( KdPrint2((PRINT_PREFIX "Channel %d excluded\n", n)); deviceExtension->AHCI_PI &= ~((ULONG)1 << n); deviceExtension->AHCI_PI_mask &= ~((ULONG)1 << n); + //PI_ex_mask |= ((ULONG)1 << n); } } deviceExtension->AHCI_PI_mask = @@ -1011,10 +1020,36 @@ UniataAhciDetect( NumberChannels = max((CAP & AHCI_CAP_NOP_MASK)+1, n); + if(!PI && ((CAP & AHCI_CAP_NOP_MASK)+1)) { + /* Enable ports. + * The spec says that BIOS sets up bits corresponding to + * available ports. On platforms where this information + * is missing, the driver can define available ports on its own. + */ + KdPrint2((PRINT_PREFIX "PI=0 -> Enable ports (mask) %#x\n", deviceExtension->AHCI_PI_mask)); + n = NumberChannels; + deviceExtension->AHCI_PI = ((ULONG)1 << n)-1; + + if(deviceExtension->AHCI_PI_mask) { + // we have some forced port mask + PI = deviceExtension->AHCI_PI_mask; + } else { + // construct mask + PI = deviceExtension->AHCI_PI = (((ULONG)1 << n)-1); + deviceExtension->AHCI_PI_mask = (((ULONG)1 << n)-1); + } + KdPrint2((PRINT_PREFIX "Enable ports final PI %#x\n", PI)); + UniataAhciWriteHostPort4(deviceExtension, IDX_AHCI_PI, PI); + } + KdPrint2((PRINT_PREFIX " CommandSlots %d\n", (CAP & AHCI_CAP_NCS_MASK)>>8 )); KdPrint2((PRINT_PREFIX " Detected Channels %d / %d\n", NumberChannels, n)); switch(deviceExtension->DevID) { + case 0x2361197b: + KdPrint2((PRINT_PREFIX " JMicron JMB361 -> 1\n")); + NumberChannels = 1; + break; case ATA_M88SE6111: KdPrint2((PRINT_PREFIX " Marvell M88SE6111 -> 1\n")); NumberChannels = 1; @@ -1798,6 +1833,13 @@ UniataAhciSoftReset( KdDump(RCV_FIS, sizeof(chan->AhciCtlBlock->rcv_fis.rfis)); + if(deviceExtension->HwFlags & UNIATA_AHCI_ALT_SIG) { + ULONG signature; + signature = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_SIG); + KdPrint((" alt sig: %#x\n", signature)); + return signature; + } + return UniataAhciUlongFromRFIS(RCV_FIS); } // end UniataAhciSoftReset() @@ -2295,6 +2337,7 @@ UniataAhciEndTransaction( ((ULONGLONG)(RCV_FIS[7] & 0x0f) << 24); } AtaReq->WordsTransfered = AHCI_CL->bytecount/2; + /* if(LunExt->DeviceFlags & DFLAGS_ATAPI_DEVICE) { KdPrint2(("RCV:\n")); diff --git a/drivers/storage/ide/uniata/uniata_ver.h b/drivers/storage/ide/uniata/uniata_ver.h index 2dc11c5d90..28a985f1e4 100644 --- a/drivers/storage/ide/uniata/uniata_ver.h +++ b/drivers/storage/ide/uniata/uniata_ver.h @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "46e8" -#define UNIATA_VER_DOT 0.46.5.8 +#define UNIATA_VER_STR "47" +#define UNIATA_VER_DOT 0.47.0.0 #define UNIATA_VER_MJ 0 -#define UNIATA_VER_MN 46 -#define UNIATA_VER_SUB_MJ 5 -#define UNIATA_VER_SUB_MN 8 -#define UNIATA_VER_DOT_COMMA 0,46,5,8 -#define UNIATA_VER_DOT_STR "0.46.5.8" +#define UNIATA_VER_MN 47 +#define UNIATA_VER_SUB_MJ 0 +#define UNIATA_VER_SUB_MN 0 +#define UNIATA_VER_DOT_COMMA 0,47,0,0 +#define UNIATA_VER_DOT_STR "0.47.0.0" #define UNIATA_VER_YEAR 2019 #define UNIATA_VER_YEAR_STR "2019"

5 years, 9 months

[reactos] 01/01: [IDL] Fix the declaration of function 7 (NetrBrowserStatisticsClear)

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89aaf0efca16e0a31fa6c… commit 89aaf0efca16e0a31fa6ca28f7db2f12c759788f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 24 13:02:10 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 24 13:02:10 2019 +0100 [IDL] Fix the declaration of function 7 (NetrBrowserStatisticsClear) --- sdk/include/reactos/idl/browser.idl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/idl/browser.idl b/sdk/include/reactos/idl/browser.idl index a38790471b..65f2ff8f7e 100644 --- a/sdk/include/reactos/idl/browser.idl +++ b/sdk/include/reactos/idl/browser.idl @@ -191,10 +191,11 @@ interface browser I_BrowserrResetStatistics( [in, string, unique] BROWSER_IDENTIFY_HANDLE ServerName); - /* Function 7 (NetrBrowserStatisticsClear) */ + /* Function 7 - Not used on wire */ NET_API_STATUS __stdcall - BrowserOpnum7NotUsedOnWire(void); + NetrBrowserStatisticsClear( + [in, string, unique] BROWSER_IDENTIFY_HANDLE ServerName); /* Function 8 */ NET_API_STATUS

5 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
22
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 March 2019