Ros-diffs October 2018

ros-diffs@reactos.org

21 participants
354 discussions

01/04: [USETUP] Massage the USETUP interface code.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38e20b638fd5f1dd66903… commit 38e20b638fd5f1dd6690319e68b3b092145afe30 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 15 01:48:19 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 24 00:35:52 2018 +0200 [USETUP] Massage the USETUP interface code. - The "intro" page is renamed into the "Welcome" page, because its corresponding resource indeed is the welcome screen; - Because the "setup start" page can only be displayed once, move it out of the while-loop, and use its result as the initial value of the 'Page' variable. - Remove unneeded _PAGE_NUMBER_DEFINED guards; - Add a DPRINT in the RepairUpdateFlag case of RegistryPage() (because we don't implement yet a correct upgrading or repairing of the registry). - In InstallIntroPage(), display the page itself only if needed (i.e. after all the validation checks & repair/update or unattended checks are done). Similar modifications are done also in DeviceSettingsPage(), SelectPartitionPage() - Turn both CheckUnattendedSetup() and UpdateKBLayout() into static functions. - Fix the code of ScsiControllerPage() so that it can be compiled if needed, and add a dummy OemDriverPage(). svn path=/branches/setup_improvements/; revision=74575 --- base/setup/usetup/lang/bg-BG.h | 2 +- base/setup/usetup/lang/bn-BD.h | 2 +- base/setup/usetup/lang/cs-CZ.h | 2 +- base/setup/usetup/lang/da-DK.h | 2 +- base/setup/usetup/lang/de-DE.h | 2 +- base/setup/usetup/lang/el-GR.h | 2 +- base/setup/usetup/lang/en-US.h | 2 +- base/setup/usetup/lang/es-ES.h | 2 +- base/setup/usetup/lang/et-EE.h | 2 +- base/setup/usetup/lang/fr-FR.h | 2 +- base/setup/usetup/lang/he-IL.h | 2 +- base/setup/usetup/lang/it-IT.h | 2 +- base/setup/usetup/lang/ja-JP.h | 2 +- base/setup/usetup/lang/lt-LT.h | 2 +- base/setup/usetup/lang/ms-MY.h | 2 +- base/setup/usetup/lang/nl-NL.h | 2 +- base/setup/usetup/lang/pl-PL.h | 2 +- base/setup/usetup/lang/pt-BR.h | 2 +- base/setup/usetup/lang/ro-RO.h | 2 +- base/setup/usetup/lang/ru-RU.h | 2 +- base/setup/usetup/lang/sk-SK.h | 2 +- base/setup/usetup/lang/sq-AL.h | 2 +- base/setup/usetup/lang/sv-SE.h | 2 +- base/setup/usetup/lang/tr-TR.h | 2 +- base/setup/usetup/lang/uk-UA.h | 2 +- base/setup/usetup/usetup.c | 134 +++++++++++++++++++++++++---------------- base/setup/usetup/usetup.h | 15 ++--- 27 files changed, 113 insertions(+), 86 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index b6366eac4e..803de8a23c 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1629,7 +1629,7 @@ MUI_PAGE bgBGPages[] = bgBGLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, bgBGWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 5a4d7786e1..145c0e86d0 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1616,7 +1616,7 @@ MUI_PAGE bnBDPages[] = bnBDLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, bnBDWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 4359652d37..10e517619f 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1624,7 +1624,7 @@ MUI_PAGE csCZPages[] = csCZLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, csCZWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index febfb2b68d..9e1d724f2d 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1630,7 +1630,7 @@ MUI_PAGE daDKPages[] = daDKLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, daDKWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index fda98fbce0..afc257b78b 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1620,7 +1620,7 @@ MUI_PAGE deDEPages[] = deDELanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, deDEWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 58e624f0c3..ec8edb65f3 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1633,7 +1633,7 @@ MUI_PAGE elGRPages[] = elGRLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, elGRWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 9f3a6334e5..b8b5665d9c 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1616,7 +1616,7 @@ MUI_PAGE enUSPages[] = enUSLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, enUSWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index e52c7a56ad..5e43233d52 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1620,7 +1620,7 @@ MUI_PAGE esESPages[] = esESLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, esESWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index ee47d0ec84..e61b71ae53 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1614,7 +1614,7 @@ MUI_PAGE etEEPages[] = etEELanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, etEEWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index 51456c43d9..8363184f8c 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1635,7 +1635,7 @@ MUI_PAGE frFRPages[] = frFRLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, frFRWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 686ed20ed8..8c3e4ce198 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1617,7 +1617,7 @@ MUI_PAGE heILPages[] = heILLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, heILWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 5ac3a4c8b7..c95073e10d 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1623,7 +1623,7 @@ MUI_PAGE itITPages[] = itITLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, itITWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index d30be1487d..0cbb7c52e6 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1618,7 +1618,7 @@ MUI_PAGE jaJPPages[] = jaJPLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, jaJPWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 697b19ff67..86b3bec27b 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1626,7 +1626,7 @@ MUI_PAGE ltLTPages[] = ltLTLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, ltLTWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index 2da4e91f0f..7b76c4f81f 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1509,7 +1509,7 @@ MUI_PAGE msMYPages[] = msMYLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, msMYWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index 9f080ce4c2..cfcc71fce4 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1644,7 +1644,7 @@ MUI_PAGE nlNLPages[] = nlNLLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, nlNLWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index c7c3269097..1849b809fe 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1627,7 +1627,7 @@ MUI_PAGE plPLPages[] = plPLLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, plPLWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 4372dc3761..0d9f7b3f37 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1648,7 +1648,7 @@ MUI_PAGE ptBRPages[] = ptBRLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, ptBRWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 422188d7cb..457ba53ba3 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1670,7 +1670,7 @@ MUI_PAGE roROPages[] = roROLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, roROWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 98f16b0dac..52e9b81da6 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1617,7 +1617,7 @@ MUI_PAGE ruRUPages[] = ruRULanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, ruRUWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index be99ea5586..d44fcb9ac0 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1628,7 +1628,7 @@ MUI_PAGE skSKPages[] = skSKLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, skSKWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index bf157a9bda..13c7c105a9 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1621,7 +1621,7 @@ MUI_PAGE sqALPages[] = sqALLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, sqALWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 38e766f447..15c3f493a7 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1624,7 +1624,7 @@ MUI_PAGE svSEPages[] = svSELanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, svSEWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index be2ce60cf5..e61abbbdb3 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1597,7 +1597,7 @@ MUI_PAGE trTRPages[] = trTRLanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, trTRWelcomePageEntries }, { diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index 7f693079b8..12f3ce1bef 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1624,7 +1624,7 @@ MUI_PAGE ukUAPages[] = ukUALanguagePageEntries }, { - START_PAGE, + WELCOME_PAGE, ukUAWelcomePageEntries }, { diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 3c7eb74de5..eea168791e 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -420,7 +420,7 @@ ConfirmQuit(PINPUT_RECORD Ir) } -VOID +static VOID CheckUnattendedSetup(VOID) { WCHAR UnattendInfPath[MAX_PATH]; @@ -593,7 +593,7 @@ CheckUnattendedSetup(VOID) } -VOID +static VOID UpdateKBLayout(VOID) { PGENERIC_LIST_ENTRY ListEntry; @@ -633,7 +633,7 @@ UpdateKBLayout(VOID) /* * Displays the LanguagePage. * - * Next pages: IntroPage, QuitPage + * Next pages: WelcomePage, QuitPage * * SIDEEFFECTS * Init SelectedLanguageId @@ -656,7 +656,7 @@ LanguagePage(PINPUT_RECORD Ir) if (LanguageList == NULL) { PopupError("Setup failed to initialize available translations", NULL, NULL, POPUP_WAIT_NONE); - return INTRO_PAGE; + return WELCOME_PAGE; } } @@ -670,7 +670,7 @@ LanguagePage(PINPUT_RECORD Ir) if (GenericListHasSingleEntry(LanguageList)) { LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); - return INTRO_PAGE; + return WELCOME_PAGE; } InitGenericListUi(&ListUi, LanguageList); @@ -734,7 +734,7 @@ LanguagePage(PINPUT_RECORD Ir) /* Load the font */ SetConsoleCodePage(); - return INTRO_PAGE; + return WELCOME_PAGE; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar > 0x60) && (Ir->Event.KeyEvent.uChar.AsciiChar < 0x7b)) { @@ -765,7 +765,7 @@ LanguagePage(PINPUT_RECORD Ir) } } - return INTRO_PAGE; + return WELCOME_PAGE; } @@ -930,7 +930,7 @@ SetupStartPage(PINPUT_RECORD Ir) /* - * Displays the IntroPage. + * Displays the WelcomePage. * * Next pages: * InstallIntroPage (default) @@ -942,9 +942,9 @@ SetupStartPage(PINPUT_RECORD Ir) * Number of the next page. */ static PAGE_NUMBER -IntroPage(PINPUT_RECORD Ir) +WelcomePage(PINPUT_RECORD Ir) { - MUIDisplayPage(START_PAGE); + MUIDisplayPage(WELCOME_PAGE); while (TRUE) { @@ -972,7 +972,7 @@ IntroPage(PINPUT_RECORD Ir) } } - return INTRO_PAGE; + return WELCOME_PAGE; } @@ -980,7 +980,7 @@ IntroPage(PINPUT_RECORD Ir) * Displays the License page. * * Next page: - * IntroPage (default) + * WelcomePage (default) * * RETURNS * Number of the next page. @@ -996,7 +996,7 @@ LicensePage(PINPUT_RECORD Ir) if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - return INTRO_PAGE; + return WELCOME_PAGE; } } @@ -1041,7 +1041,7 @@ RepairIntroPage(PINPUT_RECORD Ir) else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ { - return INTRO_PAGE; + return WELCOME_PAGE; } } @@ -1063,8 +1063,6 @@ RepairIntroPage(PINPUT_RECORD Ir) static PAGE_NUMBER InstallIntroPage(PINPUT_RECORD Ir) { - MUIDisplayPage(INSTALL_INTRO_PAGE); - if (RepairUpdateFlag) { //return SELECT_PARTITION_PAGE; @@ -1072,9 +1070,9 @@ InstallIntroPage(PINPUT_RECORD Ir) } if (IsUnattendedSetup) - { return SELECT_PARTITION_PAGE; - } + + MUIDisplayPage(INSTALL_INTRO_PAGE); while (TRUE) { @@ -1103,19 +1101,20 @@ InstallIntroPage(PINPUT_RECORD Ir) static PAGE_NUMBER ScsiControllerPage(PINPUT_RECORD Ir) { - SetTextXY(6, 8, "Setup detected the following mass storage devices:"); + // MUIDisplayPage(SCSI_CONTROLLER_PAGE); + + CONSOLE_SetTextXY(6, 8, "Setup detected the following mass storage devices:"); /* FIXME: print loaded mass storage driver descriptions */ #if 0 - SetTextXY(8, 10, "TEST device"); + CONSOLE_SetTextXY(8, 10, "TEST device"); #endif - - SetStatusText(" ENTER = Continue F3 = Quit"); + CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); while (TRUE) { - ConInKey(Ir); + CONSOLE_ConInKey(Ir); if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1133,6 +1132,38 @@ ScsiControllerPage(PINPUT_RECORD Ir) return SCSI_CONTROLLER_PAGE; } + +static PAGE_NUMBER +OemDriverPage(PINPUT_RECORD Ir) +{ + // MUIDisplayPage(OEM_DRIVER_PAGE); + + CONSOLE_SetTextXY(6, 8, "This is the OEM driver page!"); + + /* FIXME: Implement!! */ + + CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); + + while (TRUE) + { + CONSOLE_ConInKey(Ir); + + if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ + { + if (ConfirmQuit(Ir) == TRUE) + return QUIT_PAGE; + + break; + } + else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ + { + return DEVICE_SETTINGS_PAGE; + } + } + + return OEM_DRIVER_PAGE; +} #endif @@ -1161,7 +1192,6 @@ static PAGE_NUMBER DeviceSettingsPage(PINPUT_RECORD Ir) { static ULONG Line = 16; - MUIDisplayPage(DEVICE_SETTINGS_PAGE); /* Initialize the computer settings list */ if (ComputerList == NULL) @@ -1208,20 +1238,20 @@ DeviceSettingsPage(PINPUT_RECORD Ir) } } - MUIDisplayPage(DEVICE_SETTINGS_PAGE); + if (RepairUpdateFlag) + return SELECT_PARTITION_PAGE; + // if (IsUnattendedSetup) + // return SELECT_PARTITION_PAGE; - CONSOLE_SetTextXY(25, 11, GetListEntryText(GetCurrentListEntry((ComputerList)))); - CONSOLE_SetTextXY(25, 12, GetListEntryText(GetCurrentListEntry((DisplayList)))); - CONSOLE_SetTextXY(25, 13, GetListEntryText(GetCurrentListEntry((KeyboardList)))); - CONSOLE_SetTextXY(25, 14, GetListEntryText(GetCurrentListEntry((LayoutList)))); + MUIDisplayPage(DEVICE_SETTINGS_PAGE); - CONSOLE_InvertTextXY(24, Line, 48, 1); + CONSOLE_SetTextXY(25, 11, GetListEntryText(GetCurrentListEntry(ComputerList))); + CONSOLE_SetTextXY(25, 12, GetListEntryText(GetCurrentListEntry(DisplayList))); + CONSOLE_SetTextXY(25, 13, GetListEntryText(GetCurrentListEntry(KeyboardList))); + CONSOLE_SetTextXY(25, 14, GetListEntryText(GetCurrentListEntry(LayoutList))); - if (RepairUpdateFlag) - { - return SELECT_PARTITION_PAGE; - } + CONSOLE_InvertTextXY(24, Line, 48, 1); while (TRUE) { @@ -1509,8 +1539,6 @@ SelectPartitionPage(PINPUT_RECORD Ir) PARTLIST_UI ListUi; ULONG Error; - MUIDisplayPage(SELECT_PARTITION_PAGE); - if (PartitionList == NULL) { PartitionList = CreatePartitionList(); @@ -1530,6 +1558,8 @@ SelectPartitionPage(PINPUT_RECORD Ir) FormatState = Start; } + MUIDisplayPage(SELECT_PARTITION_PAGE); + InitPartitionListUi(&ListUi, PartitionList, 2, 23, @@ -3180,9 +3210,8 @@ CheckFileSystemPage(PINPUT_RECORD Ir) } -static -VOID -BuildInstallPaths(PWCHAR InstallDir, +static VOID +BuildInstallPaths(PWSTR InstallDir, PDISKENTRY DiskEntry, PPARTENTRY PartEntry) { @@ -4033,6 +4062,8 @@ RegistryPage(PINPUT_RECORD Ir) if (RepairUpdateFlag) { + // FIXME! + DPRINT1("FIXME: Updating / repairing the registry is NOT implemented yet!\n"); return SUCCESS_PAGE; } @@ -4872,37 +4903,36 @@ RunUSetup(VOID) /* Hide the cursor */ CONSOLE_SetCursorType(TRUE, FALSE); - Page = START_PAGE; + /* Global Initialization page */ + CONSOLE_ClearScreen(); + CONSOLE_Flush(); + Page = SetupStartPage(&Ir); + while (Page != REBOOT_PAGE && Page != RECOVERY_PAGE) { CONSOLE_ClearScreen(); CONSOLE_Flush(); - //CONSOLE_SetUnderlinedTextXY(4, 3, " ReactOS " KERNEL_VERSION_STR " Setup "); - //CONSOLE_Flush(); + // CONSOLE_SetUnderlinedTextXY(4, 3, " ReactOS " KERNEL_VERSION_STR " Setup "); + // CONSOLE_Flush(); switch (Page) { - /* Start page */ - case START_PAGE: - Page = SetupStartPage(&Ir); - break; - /* Language page */ case LANGUAGE_PAGE: Page = LanguagePage(&Ir); break; + /* Welcome page */ + case WELCOME_PAGE: + Page = WelcomePage(&Ir); + break; + /* License page */ case LICENSE_PAGE: Page = LicensePage(&Ir); break; - /* Intro page */ - case INTRO_PAGE: - Page = IntroPage(&Ir); - break; - /* Install pages */ case INSTALL_INTRO_PAGE: Page = InstallIntroPage(&Ir); diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index 97ac61a63e..2f548b57bc 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -102,17 +102,17 @@ extern BOOLEAN InfGetStringField(PINFCONTEXT Context, #define SetupGetMultiSzFieldW InfGetMultiSzField #define SetupGetStringFieldW InfGetStringField -#ifndef _PAGE_NUMBER_DEFINED -#define _PAGE_NUMBER_DEFINED typedef enum _PAGE_NUMBER { - START_PAGE, LANGUAGE_PAGE, - INTRO_PAGE, + WELCOME_PAGE, LICENSE_PAGE, INSTALL_INTRO_PAGE, // SCSI_CONTROLLER_PAGE, +// OEM_DRIVER_PAGE, + + REPAIR_INTRO_PAGE, DEVICE_SETTINGS_PAGE, COMPUTER_SETTINGS_PAGE, @@ -140,15 +140,12 @@ typedef enum _PAGE_NUMBER BOOT_LOADER_HARDDISK_MBR_PAGE, BOOT_LOADER_HARDDISK_VBR_PAGE, - REPAIR_INTRO_PAGE, - SUCCESS_PAGE, QUIT_PAGE, FLUSH_PAGE, - REBOOT_PAGE, /* virtual page */ - RECOVERY_PAGE, /* virtual page */ + REBOOT_PAGE, /* Virtual page */ + RECOVERY_PAGE, /* Virtual page */ } PAGE_NUMBER, *PPAGE_NUMBER; -#endif #define POPUP_WAIT_NONE 0 #define POPUP_WAIT_ANY_KEY 1

6 years, 2 months

01/01: [INETCPL] Add icon codes for trusted and restricted zones

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7886ad46db3d08867edad… commit 7886ad46db3d08867edad69b92b96ac85eb8f1c5 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Oct 24 01:13:15 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 24 00:27:10 2018 +0200 [INETCPL] Add icon codes for trusted and restricted zones --- dll/cpl/inetcpl/inetcpl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/cpl/inetcpl/inetcpl.h b/dll/cpl/inetcpl/inetcpl.h index b8b09218f0..b97c22e786 100644 --- a/dll/cpl/inetcpl/inetcpl.h +++ b/dll/cpl/inetcpl/inetcpl.h @@ -41,6 +41,8 @@ INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; #define ICO_CERTIFICATES 1314 #define ICO_HISTORY 1315 #define ICO_HOME 1316 +#define ICO_TRUSTED 4480 +#define ICO_RESTRICTED 4481 #endif /* strings */

6 years, 2 months

01/01: [SETUPAPI] SetupDiGetClassDevPropertySheetsW: Implement adding property pages from an installer.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5e956e7a8e9f137fb009… commit b5e956e7a8e9f137fb009de741d6f4ce38703ffd Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Oct 23 23:10:03 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Oct 23 23:11:19 2018 +0200 [SETUPAPI] SetupDiGetClassDevPropertySheetsW: Implement adding property pages from an installer. SetupDiGetClassInstallParamsW must be implemented before this will work. --- dll/win32/setupapi/devclass.c | 123 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 122 insertions(+), 1 deletion(-) diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c index cc7446fdfd..86fc33d281 100644 --- a/dll/win32/setupapi/devclass.c +++ b/dll/win32/setupapi/devclass.c @@ -1264,6 +1264,102 @@ SETUP_GetValueString( return ERROR_SUCCESS; } +static +BOOL +SETUP_CallInstaller( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_ADDPROPERTYPAGE_DATA PageData) +{ + PSP_CLASSINSTALL_HEADER pClassInstallParams = NULL; + DWORD dwSize = 0; + DWORD dwError; + BOOL ret = TRUE; + + /* Get the size of the old class install parameters */ + if (!SetupDiGetClassInstallParams(DeviceInfoSet, + DeviceInfoData, + NULL, + 0, + &dwSize)) + { + dwError = GetLastError(); + if (dwError != ERROR_INSUFFICIENT_BUFFER) + { + ERR("SetupDiGetClassInstallParams failed (Error %lu)\n", dwError); + return FALSE; + } + } + + /* Allocate a buffer for the old class install parameters */ + pClassInstallParams = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (pClassInstallParams == NULL) + { + ERR("Failed to allocate the parameters buffer!\n"); + return FALSE; + } + + /* Save the old class install parameters */ + if (!SetupDiGetClassInstallParams(DeviceInfoSet, + DeviceInfoData, + pClassInstallParams, + dwSize, + &dwSize)) + { + ERR("SetupDiGetClassInstallParams failed (Error %lu)\n", GetLastError()); + ret = FALSE; + goto done; + } + + /* Set the new class install parameters */ + if (!SetupDiSetClassInstallParams(DeviceInfoSet, + DeviceInfoData, + &PageData->ClassInstallHeader, + sizeof(SP_ADDPROPERTYPAGE_DATA))) + { + ERR("SetupDiSetClassInstallParams failed (Error %lu)\n", dwError); + ret = FALSE; + goto done; + } + + /* Call the installer */ + ret = SetupDiCallClassInstaller(InstallFunction, + DeviceInfoSet, + DeviceInfoData); + if (ret == FALSE) + { + ERR("SetupDiCallClassInstaller failed\n"); + goto done; + } + + /* Read the new class installer parameters */ + if (!SetupDiGetClassInstallParams(DeviceInfoSet, + DeviceInfoData, + &PageData->ClassInstallHeader, + sizeof(SP_ADDPROPERTYPAGE_DATA), + NULL)) + { + ERR("SetupDiGetClassInstallParams failed (Error %lu)\n", GetLastError()); + ret = FALSE; + goto done; + } + +done: + /* Restore and free the old class install parameters */ + if (pClassInstallParams != NULL) + { + SetupDiSetClassInstallParams(DeviceInfoSet, + DeviceInfoData, + pClassInstallParams, + dwSize); + + HeapFree(GetProcessHeap(), 0, pClassInstallParams); + } + + return ret; +} + /*********************************************************************** * SetupDiGetClassDevPropertySheetsW(SETUPAPI.@) */ @@ -1311,7 +1407,8 @@ SetupDiGetClassDevPropertySheetsW( HMODULE hModule = NULL; PROPERTY_PAGE_PROVIDER pPropPageProvider = NULL; struct ClassDevPropertySheetsData PropPageData; - DWORD InitialNumberOfPages; + SP_ADDPROPERTYPAGE_DATA InstallerPropPageData; + DWORD InitialNumberOfPages, i; DWORD rc; if (DeviceInfoData) @@ -1394,6 +1491,30 @@ SetupDiGetClassDevPropertySheetsW( if (devInfo != NULL && devInfo->pDevicePropPageProvider != NULL) ((PROPERTY_PAGE_PROVIDER)devInfo->pDevicePropPageProvider)(&Request, SETUP_GetClassDevPropertySheetsCallback, (LPARAM)&PropPageData); + /* Call the class installer and add the returned pages */ + ZeroMemory(&InstallerPropPageData, sizeof(SP_ADDPROPERTYPAGE_DATA)); + InstallerPropPageData.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + InstallerPropPageData.ClassInstallHeader.InstallFunction = DIF_ADDPROPERTYPAGE_ADVANCED; + InstallerPropPageData.hwndWizardDlg = PropertySheetHeader->hwndParent; + + if (SETUP_CallInstaller(DIF_ADDPROPERTYPAGE_ADVANCED, + DeviceInfoSet, + DeviceInfoData, + &InstallerPropPageData)) + { + for (i = 0; i < InstallerPropPageData.NumDynamicPages; i++) + { + if (PropPageData.PropertySheetHeader->nPages < PropertySheetHeaderPageListSize) + { + PropPageData.PropertySheetHeader->phpage[PropPageData.PropertySheetHeader->nPages] = + InstallerPropPageData.DynamicPages[i]; + PropPageData.PropertySheetHeader->nPages++; + } + } + + PropPageData.NumberOfPages += InstallerPropPageData.NumDynamicPages; + } + if (RequiredSize) *RequiredSize = PropPageData.NumberOfPages;

6 years, 2 months

01/01: [NTOSKRNL] Translate pinning flags to mapping flags when first mapping a file

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3b9beeb391858c79b1fc… commit f3b9beeb391858c79b1fc474e566690cf2e765bc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Oct 23 21:48:01 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Oct 23 22:07:53 2018 +0200 [NTOSKRNL] Translate pinning flags to mapping flags when first mapping a file --- ntoskrnl/cc/pin.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 4f0e4f5a82..d972f8a75d 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -267,6 +267,7 @@ CcpPinData( BOOLEAN Result; PROS_VACB Vacb; KIRQL OldIrql; + ULONG MapFlags; KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); NewBcb = CcpFindBcb(SharedCacheMap, FileOffset, Length, TRUE); @@ -305,7 +306,13 @@ CcpPinData( return FALSE; } - Result = CcpMapData(SharedCacheMap, FileOffset, Length, Flags, &Vacb, Buffer); + MapFlags = Flags & PIN_WAIT; + if (BooleanFlagOn(Flags, PIN_NO_READ)) + { + SetFlag(MapFlags, MAP_NO_READ); + } + + Result = CcpMapData(SharedCacheMap, FileOffset, Length, MapFlags, &Vacb, Buffer); if (Result) { NewBcb = CcpGetAppropriateBcb(SharedCacheMap, Vacb, FileOffset, Length, Flags, TRUE);

6 years, 2 months

01/01: [USETUP] Fix a broken character in Italian resource (#968)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e41230dac43640f476c2… commit 0e41230dac43640f476c2e38b5accd22669fb5e1 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Tue Oct 23 17:41:38 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 23 17:41:38 2018 +0200 [USETUP] Fix a broken character in Italian resource (#968) Also add two spaces at the beginning of the "deleting cache" string. --- base/setup/usetup/lang/it-IT.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 691830a939..5ac3a4c8b7 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -561,7 +561,7 @@ static MUI_ENTRY itITFlushPageEntries[] = { 0, 0, - "Svuotamento della cache in corso", + " Svuotamento della cache in corso", TEXT_TYPE_STATUS }, { @@ -1785,7 +1785,7 @@ MUI_STRING itITStrings[] = {STRING_REBOOTCOMPUTER2, " INVIO = Riavvia il computer"}, {STRING_REBOOTPROGRESSBAR, - " Il computer si riavvierà in %li secondi... "}, + " Il computer si riavvier\x85 in %li secondi... "}, {STRING_CONSOLEFAIL1, "Impossibile aprire la console\r\n\r\n"}, {STRING_CONSOLEFAIL2,

6 years, 2 months

01/01: [NET] Fix an escape sequence in Polish translation (#966)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d7f1d4ca30d2983548b1… commit 7d7f1d4ca30d2983548b1d203017ae3a67531e55 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 23 20:10:38 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 23 13:10:38 2018 +0200 [NET] Fix an escape sequence in Polish translation (#966) --- base/applications/network/net/lang/pl-PL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc index a232e2f278..08191b44a2 100644 --- a/base/applications/network/net/lang/pl-PL.rc +++ b/base/applications/network/net/lang/pl-PL.rc @@ -139,7 +139,7 @@ Polecenie użyte bez parametrów wyświetla grupy lokalne na komputerze.\n\n" nazwy użytkowników lub grup globalnych, lecz nie może\n\ zawierać nazw innych grup lokalnych. Podając nazwę\n\ użytkownika z innej domeny poprzedź ją nazwą domeny\n\ - (na przykład: WARSZAWA\PIOTRS).\n" + (na przykład: WARSZAWA\\PIOTRS).\n" IDS_LOCALGROUP_HELP_6 "/ADD Dodaje nazwę grupy lub użytkownika do grupy lokalnej.\n\ Dla użytkowników lub grup globalnych dodawanych tym\n\ poleceniem do grupy lokalnej należy wcześniej utworzyć\n\

6 years, 2 months

01/01: [rosctrls.h] CListView: Add Arrange method

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c69ef281c07bac913c876… commit c69ef281c07bac913c8761c3d4dba7f702e9f9ee Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Oct 22 23:51:37 2018 +0300 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Oct 22 23:51:37 2018 +0300 [rosctrls.h] CListView: Add Arrange method [SHELL32] CDefView: Start implementing Auto arrange. So far its effect is only shown when the browser window resizes. --- dll/win32/shell32/CDefView.cpp | 45 +++++++++++++++++++++--------------------- sdk/include/reactos/rosctrls.h | 6 ++++++ 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index cd2b91d41c..0032366568 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -125,7 +125,6 @@ class CDefView : HRESULT OnStateChange(UINT uFlags); void UpdateStatusbar(); void CheckToolbar(); - void SetStyle(DWORD dwAdd, DWORD dwRemove); BOOL CreateList(); void UpdateListColors(); BOOL InitList(); @@ -500,18 +499,6 @@ void CDefView::UpdateStatusbar() * * ##### helperfunctions for initializing the view ##### */ -/********************************************************** - * change the style of the listview control - */ -void CDefView::SetStyle(DWORD dwAdd, DWORD dwRemove) -{ - DWORD tmpstyle; - - TRACE("(%p)\n", this); - - tmpstyle = ::GetWindowLongPtrW(m_ListView, GWL_STYLE); - ::SetWindowLongPtrW(m_ListView, GWL_STYLE, dwAdd | (tmpstyle & ~dwRemove)); -} /********************************************************** * ShellView_CreateList() @@ -1193,10 +1180,18 @@ HRESULT CDefView::FillArrangeAsMenu(HMENU hmenuArrange) MF_BYCOMMAND); if (m_FolderSettings.ViewMode == FVM_DETAILS || m_FolderSettings.ViewMode == FVM_LIST) + { EnableMenuItem(hmenuArrange, FCIDM_SHVIEW_AUTOARRANGE, MF_BYCOMMAND | MF_GRAYED); + } else + { EnableMenuItem(hmenuArrange, FCIDM_SHVIEW_AUTOARRANGE, MF_BYCOMMAND); + if (GetAutoArrange() == S_OK) + CheckMenuItem(hmenuArrange, FCIDM_SHVIEW_AUTOARRANGE, MF_CHECKED); + } + + return S_OK; } @@ -1560,25 +1555,25 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand { case FCIDM_SHVIEW_SMALLICON: m_FolderSettings.ViewMode = FVM_SMALLICON; - SetStyle (LVS_SMALLICON, LVS_TYPEMASK); + m_ListView.ModifyStyle(LVS_TYPEMASK, LVS_SMALLICON); CheckToolbar(); break; case FCIDM_SHVIEW_BIGICON: m_FolderSettings.ViewMode = FVM_ICON; - SetStyle (LVS_ICON, LVS_TYPEMASK); + m_ListView.ModifyStyle(LVS_TYPEMASK, LVS_ICON); CheckToolbar(); break; case FCIDM_SHVIEW_LISTVIEW: m_FolderSettings.ViewMode = FVM_LIST; - SetStyle (LVS_LIST, LVS_TYPEMASK); + m_ListView.ModifyStyle(LVS_TYPEMASK, LVS_LIST); CheckToolbar(); break; case FCIDM_SHVIEW_REPORTVIEW: m_FolderSettings.ViewMode = FVM_DETAILS; - SetStyle (LVS_REPORT, LVS_TYPEMASK); + m_ListView.ModifyStyle(LVS_TYPEMASK, LVS_REPORT); CheckToolbar(); break; @@ -1593,9 +1588,14 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand break; case FCIDM_SHVIEW_SNAPTOGRID: - case FCIDM_SHVIEW_AUTOARRANGE: //FIXME break; + case FCIDM_SHVIEW_AUTOARRANGE: + if (GetAutoArrange() == S_OK) + m_ListView.ModifyStyle(LVS_AUTOARRANGE, 0); + else + AutoArrange(); + break; case FCIDM_SHVIEW_SELECTALL: m_ListView.SetItemState(-1, LVIS_SELECTED, LVIS_SELECTED); break; @@ -2380,7 +2380,7 @@ HRESULT STDMETHODCALLTYPE CDefView::SetCurrentViewMode(UINT ViewMode) } } - SetStyle(dwStyle, LVS_TYPEMASK); + m_ListView.ModifyStyle(LVS_TYPEMASK, dwStyle); /* This will not necessarily be the actual mode set above. This mimics the behavior of Windows XP. */ @@ -2481,7 +2481,7 @@ HRESULT STDMETHODCALLTYPE CDefView::GetDefaultSpacing(POINT *ppt) HRESULT STDMETHODCALLTYPE CDefView::GetAutoArrange() { - return E_NOTIMPL; + return ((m_ListView.GetStyle() & LVS_AUTOARRANGE) ? S_OK : S_FALSE); } HRESULT STDMETHODCALLTYPE CDefView::SelectItem(int iItem, DWORD dwFlags) @@ -2666,8 +2666,9 @@ HRESULT STDMETHODCALLTYPE CDefView::ArrangeGrid() HRESULT STDMETHODCALLTYPE CDefView::AutoArrange() { - FIXME("(%p) stub\n", this); - return E_NOTIMPL; + m_ListView.ModifyStyle(0, LVS_AUTOARRANGE); + m_ListView.Arrange(LVA_DEFAULT); + return S_OK; } HRESULT STDMETHODCALLTYPE CDefView::AddObject(PITEMID_CHILD pidl, UINT *item) diff --git a/sdk/include/reactos/rosctrls.h b/sdk/include/reactos/rosctrls.h index eb5cebc026..6d3481a042 100644 --- a/sdk/include/reactos/rosctrls.h +++ b/sdk/include/reactos/rosctrls.h @@ -224,6 +224,12 @@ public: { return (BOOL)SendMessage(LVM_SETITEMPOSITION, nItem, MAKELPARAM(pPoint->x, pPoint->y)); } + + BOOL Arrange(UINT nCode) + { + return (BOOL)SendMessage(LVM_ARRANGE, nCode, 0); + } + }; template<typename TItemData = DWORD_PTR>

6 years, 2 months

01/01: [SHELL32] CDefView: Disable auto arrange in list and details view mode. This supersedes PR #927 and does it correctly.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=410cfbfe15319ef7d736b… commit 410cfbfe15319ef7d736bc35219e6220c32c994a Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Oct 22 19:18:28 2018 +0300 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Oct 22 19:18:28 2018 +0300 [SHELL32] CDefView: Disable auto arrange in list and details view mode. This supersedes PR #927 and does it correctly. --- dll/win32/shell32/CDefView.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 9e67b441df..cd2b91d41c 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1192,6 +1192,11 @@ HRESULT CDefView::FillArrangeAsMenu(HMENU hmenuArrange) m_sortInfo.nHeaderID + 0x30, MF_BYCOMMAND); + if (m_FolderSettings.ViewMode == FVM_DETAILS || m_FolderSettings.ViewMode == FVM_LIST) + EnableMenuItem(hmenuArrange, FCIDM_SHVIEW_AUTOARRANGE, MF_BYCOMMAND | MF_GRAYED); + else + EnableMenuItem(hmenuArrange, FCIDM_SHVIEW_AUTOARRANGE, MF_BYCOMMAND); + return S_OK; }

6 years, 2 months

01/01: [BROWSEUI] CInternetToolbar: Implement hiding and showing the browser toolbars.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e9cba5375b11239af2800… commit e9cba5375b11239af2800386b7ac31682f3c0e08 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Oct 22 18:41:47 2018 +0300 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Oct 22 18:42:38 2018 +0300 [BROWSEUI] CInternetToolbar: Implement hiding and showing the browser toolbars. --- dll/win32/browseui/internettoolbar.cpp | 56 ++++++++++++++++++++++++---------- dll/win32/browseui/internettoolbar.h | 3 ++ 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index f5463146fe..ca043486e5 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -1051,6 +1051,34 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::InitNew() return S_OK; } +HRESULT CInternetToolbar::IsBandVisible(int BandID) +{ + int index = (int)SendMessage(fMainReBar, RB_IDTOINDEX, BandID, 0); + + REBARBANDINFOW bandInfo = {sizeof(REBARBANDINFOW), RBBIM_STYLE}; + SendMessage(fMainReBar, RB_GETBANDINFOW, index, (LPARAM)&bandInfo); + + return (bandInfo.fStyle & RBBS_HIDDEN) ? S_FALSE : S_OK; +} + +HRESULT CInternetToolbar::ToggleBandVisibility(int BandID) +{ + int index = (int)SendMessage(fMainReBar, RB_IDTOINDEX, BandID, 0); + + REBARBANDINFOW bandInfo = {sizeof(REBARBANDINFOW), RBBIM_STYLE}; + SendMessage(fMainReBar, RB_GETBANDINFOW, index, (LPARAM)&bandInfo); + + if (bandInfo.fStyle & RBBS_HIDDEN) + bandInfo.fStyle &= ~RBBS_HIDDEN; + else + bandInfo.fStyle |= RBBS_HIDDEN; + + SendMessage(fMainReBar, RB_SETBANDINFOW, index, (LPARAM)&bandInfo); + + ReserveBorderSpace(0); + return S_OK; +} + HRESULT STDMETHODCALLTYPE CInternetToolbar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) { @@ -1064,13 +1092,13 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::QueryStatus(const GUID *pguidCmdGrou prgCmds->cmdf = OLECMDF_SUPPORTED; break; case ITID_TOOLBARBANDSHOWN: // toolbar visibility - prgCmds->cmdf = OLECMDF_SUPPORTED; - if (fControlsBar) - prgCmds->cmdf |= OLECMDF_LATCHED; + prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; + if (IsBandVisible(ITBBID_TOOLSBAND) == S_OK) + prgCmds->cmdf |= OLECMDF_LATCHED; break; case ITID_ADDRESSBANDSHOWN: // address bar visibility - prgCmds->cmdf = OLECMDF_SUPPORTED; - if (fNavigationBar) + prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; + if (IsBandVisible(ITBBID_ADDRESSBAND) == S_OK) prgCmds->cmdf |= OLECMDF_LATCHED; break; case ITID_LINKSBANDSHOWN: // links bar visibility @@ -1118,11 +1146,9 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::Exec(const GUID *pguidCmdGroup, DWOR // toggle text labels return S_OK; case ITID_TOOLBARBANDSHOWN: - // toggle toolbar band visibility - return S_OK; + return ToggleBandVisibility(ITBBID_TOOLSBAND); case ITID_ADDRESSBANDSHOWN: - // toggle address band visibility - return S_OK; + return ToggleBandVisibility(ITBBID_ADDRESSBAND); case ITID_LINKSBANDSHOWN: // toggle links band visibility return S_OK; @@ -1661,15 +1687,11 @@ LRESULT CInternetToolbar::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, default: break; } - - // TODO: Implement show/hide toolbars - SHEnableMenuItem(contextMenu, IDM_TOOLBARS_STANDARDBUTTONS, FALSE); - SHEnableMenuItem(contextMenu, IDM_TOOLBARS_ADDRESSBAR, FALSE); + SHEnableMenuItem(contextMenu, IDM_TOOLBARS_LINKSBAR, FALSE); - SHEnableMenuItem(contextMenu, IDM_TOOLBARS_CUSTOMIZE, FALSE); - SHCheckMenuItem(contextMenu, IDM_TOOLBARS_STANDARDBUTTONS, fControlsBar != NULL); - SHCheckMenuItem(contextMenu, IDM_TOOLBARS_ADDRESSBAR, fNavigationBar != NULL); + SHCheckMenuItem(contextMenu, IDM_TOOLBARS_STANDARDBUTTONS, IsBandVisible(ITBBID_TOOLSBAND) == S_OK); + SHCheckMenuItem(contextMenu, IDM_TOOLBARS_ADDRESSBAR, IsBandVisible(ITBBID_ADDRESSBAND) == S_OK); SHCheckMenuItem(contextMenu, IDM_TOOLBARS_LINKSBAR, FALSE); SHCheckMenuItem(contextMenu, IDM_TOOLBARS_CUSTOMIZE, FALSE); SHCheckMenuItem(contextMenu, IDM_TOOLBARS_LOCKTOOLBARS, fLocked); @@ -1682,8 +1704,10 @@ LRESULT CInternetToolbar::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, switch (command) { case IDM_TOOLBARS_STANDARDBUTTONS: // standard buttons + ToggleBandVisibility(ITBBID_TOOLSBAND); break; case IDM_TOOLBARS_ADDRESSBAR: // address bar + ToggleBandVisibility(ITBBID_ADDRESSBAND); break; case IDM_TOOLBARS_LINKSBAR: // links break; diff --git a/dll/win32/browseui/internettoolbar.h b/dll/win32/browseui/internettoolbar.h index b8d8f1cff4..0c47019b98 100644 --- a/dll/win32/browseui/internettoolbar.h +++ b/dll/win32/browseui/internettoolbar.h @@ -102,6 +102,9 @@ public: HRESULT LockUnlockToolbars(bool locked); HRESULT CommandStateChanged(bool newValue, int commandID); HRESULT CreateAndInitBandProxy(); + HRESULT IsBandVisible(int BandID); + HRESULT ToggleBandVisibility(int BandID); + public: // *** IInputObject specific methods *** virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg);

6 years, 2 months

01/01: [NTOS:CM] CmpCmdHiveOpen(): Resolve FileAttributes->RootDirectory when a hive file name is provided relative to it.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e6bc236a11de9c62d64c… commit 0e6bc236a11de9c62d64cc8f02473162c208cc44 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 22 00:39:50 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 22 00:39:50 2018 +0200 [NTOS:CM] CmpCmdHiveOpen(): Resolve FileAttributes->RootDirectory when a hive file name is provided relative to it. Fixes registry hive loading. CORE-13448 --- ntoskrnl/config/cmhvlist.c | 3 +- ntoskrnl/config/cmlazy.c | 97 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 95 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/config/cmhvlist.c b/ntoskrnl/config/cmhvlist.c index 0428ed7c8c..25f8414052 100644 --- a/ntoskrnl/config/cmhvlist.c +++ b/ntoskrnl/config/cmhvlist.c @@ -136,7 +136,8 @@ CmpAddToHiveFileList(IN PCMHIVE Hive) PWCHAR FilePath; UCHAR Buffer[sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; ULONG Length = sizeof(Buffer); - POBJECT_NAME_INFORMATION FileNameInfo = (POBJECT_NAME_INFORMATION)&Buffer; + POBJECT_NAME_INFORMATION FileNameInfo = (POBJECT_NAME_INFORMATION)Buffer; + HivePath.Buffer = NULL; /* Create or open the hive list key */ diff --git a/ntoskrnl/config/cmlazy.c b/ntoskrnl/config/cmlazy.c index cd643452c2..0b19924216 100644 --- a/ntoskrnl/config/cmlazy.c +++ b/ntoskrnl/config/cmlazy.c @@ -274,13 +274,97 @@ CmpCmdHiveOpen(IN POBJECT_ATTRIBUTES FileAttributes, OUT PCMHIVE *NewHive, IN ULONG CheckFlags) { - PUNICODE_STRING FileName; NTSTATUS Status; + UNICODE_STRING FileName; + PWCHAR FilePath; + UCHAR Buffer[sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; + ULONG Length = sizeof(Buffer); + POBJECT_NAME_INFORMATION FileNameInfo = (POBJECT_NAME_INFORMATION)Buffer; + PAGED_CODE(); + if (FileAttributes->RootDirectory) + { + /* + * Validity check: The ObjectName is relative to RootDirectory, + * therefore it must not start with a path separator. + */ + if (FileAttributes->ObjectName && FileAttributes->ObjectName->Buffer && + FileAttributes->ObjectName->Length >= sizeof(WCHAR) && + *FileAttributes->ObjectName->Buffer == OBJ_NAME_PATH_SEPARATOR) + { + return STATUS_OBJECT_PATH_SYNTAX_BAD; + } + + /* Try to get the value */ + Status = ZwQueryObject(FileAttributes->RootDirectory, + ObjectNameInformation, + FileNameInfo, + Length, + &Length); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("CmpCmdHiveOpen(): Root directory handle object name query failed, Status = 0x%08lx\n", Status); + return Status; + } + + /* Null-terminate and add the length of the terminator */ + Length -= sizeof(OBJECT_NAME_INFORMATION); + FilePath = FileNameInfo->Name.Buffer; + FilePath[Length / sizeof(WCHAR)] = UNICODE_NULL; + Length += sizeof(UNICODE_NULL); + + /* Compute the size of the full path; Length already counts the terminating NULL */ + Length = Length + sizeof(WCHAR) + FileAttributes->ObjectName->Length; + if (Length > MAXUSHORT) + { + /* Name size too long, bail out */ + return STATUS_OBJECT_PATH_INVALID; + } + + /* Build the full path */ + RtlInitEmptyUnicodeString(&FileName, NULL, 0); + FileName.Buffer = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); + if (!FileName.Buffer) + { + /* Fail */ + DPRINT1("CmpCmdHiveOpen(): Unable to allocate memory\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + FileName.MaximumLength = Length; + RtlCopyUnicodeString(&FileName, &FileNameInfo->Name); + + /* + * Append a path terminator if needed (we have already accounted + * for a possible extra one when allocating the buffer). + */ + if (/* FileAttributes->ObjectName->Buffer[0] != OBJ_NAME_PATH_SEPARATOR && */ // We excluded ObjectName starting with a path separator above. + FileName.Length > 0 && FileName.Buffer[FileName.Length / sizeof(WCHAR) - 1] != OBJ_NAME_PATH_SEPARATOR) + { + /* ObjectName does not start with '\' and PathBuffer does not end with '\' */ + FileName.Buffer[FileName.Length / sizeof(WCHAR)] = OBJ_NAME_PATH_SEPARATOR; + FileName.Length += sizeof(WCHAR); + FileName.Buffer[FileName.Length / sizeof(WCHAR)] = UNICODE_NULL; + } + + /* Append the object name */ + Status = RtlAppendUnicodeStringToString(&FileName, FileAttributes->ObjectName); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("CmpCmdHiveOpen(): RtlAppendUnicodeStringToString() failed, Status = 0x%08lx\n", Status); + ExFreePoolWithTag(FileName.Buffer, TAG_CM); + return Status; + } + } + else + { + FileName = *FileAttributes->ObjectName; + } + /* Open the file in the current security context */ - FileName = FileAttributes->ObjectName; - Status = CmpInitHiveFromFile(FileName, + Status = CmpInitHiveFromFile(&FileName, 0, NewHive, Allocate, @@ -298,7 +382,7 @@ CmpCmdHiveOpen(IN POBJECT_ATTRIBUTES FileAttributes, if (NT_SUCCESS(Status)) { /* Now try again */ - Status = CmpInitHiveFromFile(FileName, + Status = CmpInitHiveFromFile(&FileName, 0, NewHive, Allocate, @@ -309,6 +393,11 @@ CmpCmdHiveOpen(IN POBJECT_ATTRIBUTES FileAttributes, } } + if (FileAttributes->RootDirectory) + { + ExFreePoolWithTag(FileName.Buffer, TAG_CM); + } + /* Return status of open attempt */ return Status; }

6 years, 2 months

← Newer
1
...
14
15
16
17
18
19
20
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2018