Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NET] Display the country along with the users country code.
by Eric Kohl 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08d30403777c2db122f22… commit 08d30403777c2db122f2292657a46f42d9f59aa2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 10 22:00:41 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 10 22:01:40 2019 +0100 [NET] Display the country along with the users country code. --- base/applications/network/net/cmdUser.c | 80 ++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 7 deletions(-) diff --git a/base/applications/network/net/cmdUser.c b/base/applications/network/net/cmdUser.c index 0cb5dacc8f..a2d092613f 100644 --- a/base/applications/network/net/cmdUser.c +++ b/base/applications/network/net/cmdUser.c @@ -10,7 +10,41 @@ #include "net.h" +typedef struct _COUNTY_TABLE +{ + DWORD dwCountryCode; + DWORD dwMessageId; +} COUNTRY_TABLE, *PCOUNTRY_TABLE; + + static WCHAR szPasswordChars[] = L"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@#$%_-+:"; +static COUNTRY_TABLE CountryTable[] = +{ { 0, 5080}, // System Default + { 1, 5081}, // United States + { 2, 5082}, // Canada (French) + { 3, 5083}, // Latin America + { 31, 5084}, // Netherlands + { 32, 5085}, // Belgium + { 33, 5086}, // France + { 34, 5090}, // Spain + { 39, 5087}, // Italy + { 41, 5088}, // Switzerland + { 44, 5089}, // United Kingdom + { 45, 5091}, // Denmark + { 46, 5092}, // Sweden + { 47, 5093}, // Norway + { 49, 5094}, // Germany + { 61, 5095}, // Australia + { 81, 5096}, // Japan + { 82, 5097}, // Korea + { 86, 5098}, // China (PRC) + { 88, 5099}, // Taiwan + { 99, 5100}, // Asia + {351, 5101}, // Portugal + {358, 5102}, // Finland + {785, 5103}, // Arabic + {972, 5104} }; // Hebrew + static int @@ -130,6 +164,38 @@ GetTimeInSeconds(VOID) } +static +BOOL +GetCountryFromCountryCode( + _In_ DWORD dwCountryCode, + _In_ DWORD dwCountryLength, + _Out_ PWSTR szCountryBuffer) +{ + DWORD i; + + for (i = 0; i < ARRAYSIZE(CountryTable); i++) + { + if (CountryTable[i].dwCountryCode == dwCountryCode) + { + if (szCountryBuffer != NULL && dwCountryLength > 0) + { + FormatMessageW(FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_IGNORE_INSERTS, + hModuleNetMsg, + CountryTable[i].dwMessageId, + LANG_USER_DEFAULT, + szCountryBuffer, + dwCountryLength, + NULL); + } + + return TRUE; + } + } + + return FALSE; +} + + static NET_API_STATUS DisplayUser(LPWSTR lpUserName) @@ -142,6 +208,7 @@ DisplayUser(LPWSTR lpUserName) DWORD dwGroupRead, dwGroupTotal; DWORD dwLastSet; DWORD i; + WCHAR szCountry[40]; INT nPaddedLength = 29; NET_API_STATUS Status; @@ -193,7 +260,9 @@ DisplayUser(LPWSTR lpUserName) ConPrintf(StdOut, L"%s\n", pUserInfo->usri4_usr_comment); PrintPaddedResourceString(IDS_USER_COUNTRY_CODE, nPaddedLength); - ConPrintf(StdOut, L"%03ld ()\n", pUserInfo->usri4_country_code); + GetCountryFromCountryCode(pUserInfo->usri4_country_code, + ARRAYSIZE(szCountry), szCountry); + ConPrintf(StdOut, L"%03ld (%s)\n", pUserInfo->usri4_country_code, szCountry); PrintPaddedResourceString(IDS_USER_ACCOUNT_ACTIVE, nPaddedLength); if (pUserInfo->usri4_flags & UF_ACCOUNTDISABLE) @@ -770,9 +839,9 @@ cmdUser( goto done; } - /* FIXME: verify the country code */ - - pUserInfo->usri4_country_code = value; + /* Verify the country code */ + if (GetCountryFromCountryCode(value, 0, NULL)) + pUserInfo->usri4_country_code = value; } else if (_wcsnicmp(argv[j], L"/expires:", 9) == 0) { @@ -786,9 +855,6 @@ cmdUser( ConResPrintf(StdErr, IDS_ERROR_INVALID_OPTION_VALUE, L"/EXPIRES"); result = 1; goto done; - - /* FIXME: Parse the date */ -// ConResPrintf(StdErr, IDS_ERROR_OPTION_NOT_SUPPORTED, L"/EXPIRES"); } } else if (_wcsnicmp(argv[j], L"/fullname:", 10) == 0)

1 0

[reactos] 01/01: [TRANSLATION] Update Hebrew translations (#1408)
by Shy Zedaka 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b94d222acbd69a625da6… commit 5b94d222acbd69a625da6722ada8226bf6149689 Author: Shy Zedaka <shaytzedaka(a)outlook.com> AuthorDate: Sun Mar 10 20:21:57 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 10 19:21:57 2019 +0100 [TRANSLATION] Update Hebrew translations (#1408) --- base/applications/mplay32/lang/he-IL.rc | 2 +- base/applications/mspaint/lang/he-IL.rc | 2 +- base/applications/shutdown/lang/he-IL.rc | 6 +++--- base/applications/taskmgr/lang/he-IL.rc | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/mplay32/lang/he-IL.rc b/base/applications/mplay32/lang/he-IL.rc index e64972cebb..fd4586a7d0 100644 --- a/base/applications/mplay32/lang/he-IL.rc +++ b/base/applications/mplay32/lang/he-IL.rc @@ -14,7 +14,7 @@ BEGIN MENUITEM "נגינה/&השהייה\tCtrl+P", IDC_PLAY MENUITEM "&עצירה\tCtrl+S", IDC_STOP MENUITEM SEPARATOR - MENUITEM "&חזרה\tCtrl+T", IDM_REPEAT + MENUITEM "&ניגון חוזר\tCtrl+T", IDM_REPEAT END POPUP "&תצוגה" BEGIN diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index cc8b08e720..d1ead45e0e 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -218,6 +218,6 @@ BEGIN IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." - IDS_LOADERRORTEXT, "The file %s could not be loaded." + IDS_LOADERRORTEXT, ".%s לא היה ניתן לטעון את הקובץ" IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" END diff --git a/base/applications/shutdown/lang/he-IL.rc b/base/applications/shutdown/lang/he-IL.rc index 7b654f98af..b790da17c3 100644 --- a/base/applications/shutdown/lang/he-IL.rc +++ b/base/applications/shutdown/lang/he-IL.rc @@ -22,7 +22,7 @@ BEGIN LTEXT "שניה/ות", IDC_SHOW_WARN_TWO, 124, 99, 32, 10 GROUPBOX "מעקב אירועי כיבוי", IDC_STATIC, 5, 114, 224, 114 LTEXT "סיבה:", IDC_STATIC, 16, 130, 27, 8 - CHECKBOX "מתוכנן...", IDC_PLANNED, 175, 130, 43, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "מתוכנן", IDC_PLANNED, 175, 130, 43, 12, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_REASON_CODE, 17, 142, 198, 13, WS_TABSTOP | CBS_DROPDOWN LTEXT "הערה:", IDC_COMMENT_CAPTION, 16, 159, 38, 8 EDITTEXT IDC_COMMENT_TEXT, 17, 171, 198, 50, WS_VSCROLL @@ -75,7 +75,7 @@ Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ IDS_ERROR_HIBERNATE "ERROR: Unable to send system into hibernation mode.\n" IDS_ERROR_HIBERNATE_LOCAL "ERROR: Hibernation mode cannot be started remotely.\n" IDS_ERROR_HIBERNATE_ENABLED "ERROR: Hibernation mode is not enabled.\n" - IDS_ERROR_DIALOG_CAPTION "Remote Shutdown" + IDS_ERROR_DIALOG_CAPTION "כיבוי מרחוק" IDS_ERROR_DIALOG_INIT "Unable to display the graphical user interface." END @@ -100,5 +100,5 @@ BEGIN IDS_REASON_APP_UNRESPONSIVE "יישום: לא מגיב" IDS_REASON_APP_UNSTABLE "יישום: לא יציב" IDS_REASON_SECURITY "בעיית בטיחות" - IDS_REASON_NETWORK "איבוד קישוריות רשת" + IDS_REASON_NETWORK "החיבור לרשת אבד" END diff --git a/base/applications/taskmgr/lang/he-IL.rc b/base/applications/taskmgr/lang/he-IL.rc index 9893bde208..6244f6178d 100644 --- a/base/applications/taskmgr/lang/he-IL.rc +++ b/base/applications/taskmgr/lang/he-IL.rc @@ -186,7 +186,7 @@ BEGIN GROUPBOX "שימוש בזיכרון", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "סך הכל", IDC_TOTALS_FRAME, 5, 122, 111, 39, 0, WS_EX_TRANSPARENT GROUPBOX "Commit Charge (K)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 111, 39, 0, WS_EX_TRANSPARENT - GROUPBOX "זכרון פיזי (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT + GROUPBOX "זיכרון פיזי (K)", IDC_PHYSICAL_MEMORY_FRAME, 131, 122, 111, 39, 0, WS_EX_TRANSPARENT GROUPBOX "זיכרון ליבה (K)", IDC_KERNEL_MEMORY_FRAME, 131, 166, 111, 39, 0, WS_EX_TRANSPARENT LTEXT "מזהים יחודיים", IDS_TOTALS_HANDLE_COUNT, 12, 131, 27, 8 LTEXT "תהליכי משנה", IDS_TOTALS_THREAD_COUNT, 12, 140, 27, 8 @@ -225,11 +225,11 @@ BEGIN EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 185, 193, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "היסטורית שימוש במעבד", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "היסטורית שימוש בזכרון", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT + GROUPBOX "היסטורית שימוש בזיכרון", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT PUSHBUTTON "CPU Usage Display", IDC_CPU_USAGE_GRAPH, 12, 17, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE PUSHBUTTON "MEM Usage Display", IDC_MEM_USAGE_GRAPH, 12, 75, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE PUSHBUTTON "היסטורית שימוש במעבד", IDC_CPU_USAGE_HISTORY_GRAPH, 81, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE - PUSHBUTTON "היסטורית שימוש בזכרון", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE + PUSHBUTTON "היסטורית שימוש בזיכרון", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210

1 0

[reactos] 03/03: [USETUP] Improve the formatter & check-disk state machine. CORE-7749
by Hermès Bélusca-Maïto 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5431030681038941cff3… commit a5431030681038941cff3037a6b48c35e1ac1b2a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Feb 25 20:29:16 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 10 15:41:25 2019 +0100 [USETUP] Improve the formatter & check-disk state machine. CORE-7749 - Find or set the active system partition only once, when we start the formatting stage. If the system partition is to be created in some non-partitioned space, we create it. - A file-system check is always scheduled for both the system and the installation partitions. - If the system partition was already formatted (which usually means that it already existed on the system), don't ask for formatting it. CORE-13205 - For each partition to be formatted, the file-system menu list is re-created, in order to display only the FSes that are compatible with the selected partition, and allow to give the user the choice to keep the existing file-system only if the selected partition was already formatted. - Check whether the user attempts to delete the partition on which the installation source is present, only if it is not "new" and is formatted. - Check first whether the current partition is the system partition, before displaying the CONFIRM_DELETE_SYSTEM_PARTITION_PAGE. --- base/setup/usetup/partlist.c | 3 +- base/setup/usetup/partlist.h | 11 +- base/setup/usetup/usetup.c | 419 ++++++++++++++++++++++++++++--------------- 3 files changed, 287 insertions(+), 146 deletions(-) diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index 7ad044c1c6..2c0cd5a55a 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -16,7 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/partlist.c * PURPOSE: Partition list functions diff --git a/base/setup/usetup/partlist.h b/base/setup/usetup/partlist.h index c07b993497..87c9959854 100644 --- a/base/setup/usetup/partlist.h +++ b/base/setup/usetup/partlist.h @@ -16,7 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/partlist.h * PURPOSE: Partition list functions @@ -34,10 +35,10 @@ typedef enum _FORMATMACHINESTATE FormatInstallPartition, FormatOtherPartition, FormatDone, - CheckSystemPartition, - CheckInstallPartition, - CheckOtherPartition, - CheckDone + // CheckSystemPartition, + // CheckInstallPartition, + // CheckOtherPartition, + // CheckDone } FORMATMACHINESTATE, *PFORMATMACHINESTATE; typedef struct _PARTLIST_UI diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 555d37e83a..c030d07ff3 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -57,9 +57,14 @@ static WCHAR DefaultKBLayout[20]; // Copy of string inside KeyboardList static BOOLEAN RepairUpdateFlag = FALSE; +/* Global partition list on the system */ static PPARTLIST PartitionList = NULL; -static PPARTENTRY TempPartition = NULL; + +/* List of currently supported file systems for the partition to be formatted */ static PFILE_SYSTEM_LIST FileSystemList = NULL; + +/* Machine state for the formatter */ +static PPARTENTRY TempPartition = NULL; static FORMATMACHINESTATE FormatState = Start; /*****************************************************/ @@ -798,7 +803,7 @@ RepairIntroPage(PINPUT_RECORD Ir) { MUIDisplayPage(REPAIR_INTRO_PAGE); - while(TRUE) + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -858,6 +863,7 @@ UpgradeRepairPage(PINPUT_RECORD Ir) return QUIT_PAGE; } + /* Reset the formatter machine state */ TempPartition = NULL; FormatState = Start; } @@ -1461,6 +1467,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) return QUIT_PAGE; } + /* Reset the formatter machine state */ TempPartition = NULL; FormatState = Start; } @@ -1690,8 +1697,8 @@ SelectPartitionPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { - WCHAR PathBuffer[MAX_PATH]; UNICODE_STRING CurrentPartition; + WCHAR PathBuffer[MAX_PATH]; if (PartitionList->CurrentPartition->IsPartitioned == FALSE) { @@ -1699,27 +1706,34 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; } - RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"\\Device\\Harddisk%lu\\Partition%lu\\", - PartitionList->CurrentDisk->DiskNumber, - PartitionList->CurrentPartition->PartitionNumber); - RtlInitUnicodeString(&CurrentPartition, PathBuffer); - - /* - * Check whether the user attempts to delete the partition on which - * the installation source is present. If so, fail with an error. - */ - // &USetupData.SourceRootPath - if (RtlPrefixUnicodeString(&CurrentPartition, &USetupData.SourcePath, TRUE)) +// TODO: Do something similar before trying to format the partition? + if (!PartitionList->CurrentPartition->New && + PartitionList->CurrentPartition->FormatState != Unformatted) { - PopupError("You cannot delete the partition containing the installation source!", - MUIGetString(STRING_CONTINUE), - Ir, POPUP_WAIT_ENTER); - return SELECT_PARTITION_PAGE; + ASSERT(PartitionList->CurrentPartition->PartitionNumber != 0); + + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu\\", + PartitionList->CurrentDisk->DiskNumber, + PartitionList->CurrentPartition->PartitionNumber); + RtlInitUnicodeString(&CurrentPartition, PathBuffer); + + /* + * Check whether the user attempts to delete the partition on which + * the installation source is present. If so, fail with an error. + */ + // &USetupData.SourceRootPath + if (RtlPrefixUnicodeString(&CurrentPartition, &USetupData.SourcePath, TRUE)) + { + PopupError("You cannot delete the partition containing the installation source!", + MUIGetString(STRING_CONTINUE), + Ir, POPUP_WAIT_ENTER); + return SELECT_PARTITION_PAGE; + } } - if (PartitionList->CurrentPartition->BootIndicator || - PartitionList->CurrentPartition == PartitionList->SystemPartition) + if (PartitionList->CurrentPartition == PartitionList->SystemPartition || + PartitionList->CurrentPartition->BootIndicator) { return CONFIRM_DELETE_SYSTEM_PARTITION_PAGE; } @@ -1733,7 +1747,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) #define PARTITION_SIZE_INPUT_FIELD_LENGTH 9 -/* Restriction for MaxSize: pow(10, (PARTITION_SIZE_INPUT_FIELD_LENGTH - 1)) - 1 */ +/* Restriction for MaxSize */ #define PARTITION_MAXSIZE (pow(10, (PARTITION_SIZE_INPUT_FIELD_LENGTH - 1)) - 1) static VOID @@ -2485,6 +2499,7 @@ DeletePartitionPage(PINPUT_RECORD Ir) MUIDisplayPage(DELETE_PARTITION_PAGE); + /* Adjust partition type */ GetPartTypeStringFromPartitionType(PartEntry->PartitionType, PartTypeString, ARRAYSIZE(PartTypeString)); @@ -2596,7 +2611,6 @@ DeletePartitionPage(PINPUT_RECORD Ir) else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { DeleteCurrentPartition(PartitionList); - return SELECT_PARTITION_PAGE; } } @@ -2605,6 +2619,16 @@ DeletePartitionPage(PINPUT_RECORD Ir) } +static VOID +ResetFileSystemList(VOID) +{ + if (!FileSystemList) + return; + + DestroyFileSystemList(FileSystemList); + FileSystemList = NULL; +} + /* * Displays the SelectFileSystemPage. * @@ -2634,6 +2658,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) PCHAR PartUnit; CHAR PartTypeString[32]; FORMATMACHINESTATE PreviousFormatState; + PCWSTR DefaultFs; DPRINT("SelectFileSystemPage()\n"); @@ -2645,31 +2670,101 @@ SelectFileSystemPage(PINPUT_RECORD Ir) return QUIT_PAGE; } - /* Find or set the active system partition */ - CheckActiveSystemPartition(PartitionList); - if (PartitionList->SystemPartition == NULL) + /* Find or set the active system partition when starting formatting */ + if (FormatState == Start) { - /* FIXME: show an error dialog */ - // - // Error dialog should say that we cannot find a suitable - // system partition and create one on the system. At this point, - // it may be nice to ask the user whether he wants to continue, - // or use an external drive as the system drive/partition - // (e.g. floppy, USB drive, etc...) - // - return QUIT_PAGE; + /* Find or set the active system partition */ + CheckActiveSystemPartition(PartitionList); + if (PartitionList->SystemPartition == NULL) + { + /* FIXME: show an error dialog */ + // + // Error dialog should say that we cannot find a suitable + // system partition and create one on the system. At this point, + // it may be nice to ask the user whether he wants to continue, + // or use an external drive as the system drive/partition + // (e.g. floppy, USB drive, etc...) + // + return QUIT_PAGE; + } + + /* + * If the system partition can be created in some + * non-partitioned space, create it now. + */ + if (!PartitionList->SystemPartition->IsPartitioned) + { + // if (IsUnattendedSetup) + { + CreatePrimaryPartition(PartitionList, + PartitionList->SystemPartition, + 0LL, // PartitionList->SystemPartition->SectorCount.QuadPart, + TRUE); + ASSERT(PartitionList->SystemPartition->IsPartitioned); + } + // else + { + } + } + + /* Commit all partition changes to all the disks */ + if (!WritePartitionsToDisk(PartitionList)) + { + DPRINT("WritePartitionsToDisk() failed\n"); + MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + + /* + * In all cases, whether or not we are going to perform a formatting, + * we must perform a filesystem check of both the system and the + * installation partitions. + */ + PartitionList->CurrentPartition->NeedsCheck = TRUE; + if (PartitionList->SystemPartition != PartitionList->CurrentPartition) + PartitionList->SystemPartition->NeedsCheck = TRUE; + + /* + * In case we just repair an existing installation, or make + * an unattended setup without formatting, just go to the + * filesystem check step. + */ + if (RepairUpdateFlag) + return CHECK_FILE_SYSTEM_PAGE; + + if (IsUnattendedSetup && !USetupData.FormatPartition) + return CHECK_FILE_SYSTEM_PAGE; } + // ASSERT(PartitionList->SystemPartition->IsPartitioned); + + /* Reset the filesystem list for each partition that is to be formatted */ + ResetFileSystemList(); + PreviousFormatState = FormatState; switch (FormatState) { case Start: { - if (PartitionList->CurrentPartition != PartitionList->SystemPartition) + /* + * We start by formatting the system partition in case it is new + * (it didn't exist before) and is not the same as the installation + * partition. Otherwise we just require a filesystem check on it, + * and start by formatting the installation partition instead. + */ + + ASSERT(PartitionList->SystemPartition->IsPartitioned); + + if ((PartitionList->SystemPartition != PartitionList->CurrentPartition) && + (PartitionList->SystemPartition->FormatState == Unformatted)) { TempPartition = PartitionList->SystemPartition; TempPartition->NeedsCheck = TRUE; + // TODO: Should we let the user using a custom file-system, + // or should we always use FAT(32) for it? + // For "compatibility", FAT(32) would be best indeed. + FormatState = FormatSystemPartition; DPRINT1("FormatState: Start --> FormatSystemPartition\n"); } @@ -2678,6 +2773,16 @@ SelectFileSystemPage(PINPUT_RECORD Ir) TempPartition = PartitionList->CurrentPartition; TempPartition->NeedsCheck = TRUE; + if (PartitionList->SystemPartition != PartitionList->CurrentPartition) + { + /* The system partition is separate, so it had better be formatted! */ + ASSERT((PartitionList->SystemPartition->FormatState == Preformatted) || + (PartitionList->SystemPartition->FormatState == Formatted)); + + /* Require a filesystem check on the system partition too */ + PartitionList->SystemPartition->NeedsCheck = TRUE; + } + FormatState = FormatInstallPartition; DPRINT1("FormatState: Start --> FormatInstallPartition\n"); } @@ -2695,6 +2800,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) } case FormatInstallPartition: + case FormatOtherPartition: { if (GetNextUnformattedPartition(PartitionList, NULL, @@ -2702,34 +2808,30 @@ SelectFileSystemPage(PINPUT_RECORD Ir) { FormatState = FormatOtherPartition; TempPartition->NeedsCheck = TRUE; - DPRINT1("FormatState: FormatInstallPartition --> FormatOtherPartition\n"); + + if (FormatState == FormatInstallPartition) + DPRINT1("FormatState: FormatInstallPartition --> FormatOtherPartition\n"); + else + DPRINT1("FormatState: FormatOtherPartition --> FormatOtherPartition\n"); } else { FormatState = FormatDone; - DPRINT1("FormatState: FormatInstallPartition --> FormatDone\n"); + + if (FormatState == FormatInstallPartition) + DPRINT1("FormatState: FormatInstallPartition --> FormatDone\n"); + else + DPRINT1("FormatState: FormatOtherPartition --> FormatDone\n"); + return CHECK_FILE_SYSTEM_PAGE; } break; } - case FormatOtherPartition: + case FormatDone: { - if (GetNextUnformattedPartition(PartitionList, - NULL, - &TempPartition)) - { - FormatState = FormatOtherPartition; - TempPartition->NeedsCheck = TRUE; - DPRINT1("FormatState: FormatOtherPartition --> FormatOtherPartition\n"); - } - else - { - FormatState = FormatDone; - DPRINT1("FormatState: FormatOtherPartition --> FormatDone\n"); - return CHECK_FILE_SYSTEM_PAGE; - } - break; + DPRINT1("FormatState: FormatDone\n"); + return CHECK_FILE_SYSTEM_PAGE; } default: @@ -2866,54 +2968,47 @@ SelectFileSystemPage(PINPUT_RECORD Ir) "RAW"); } - if (FileSystemList == NULL) + ASSERT(FileSystemList == NULL); + + if (IsUnattendedSetup) { - PWSTR DefaultFs; + ASSERT(USetupData.FormatPartition); - if (IsUnattendedSetup) + switch (USetupData.FsType) { - switch (USetupData.FsType) - { - /* 1 is for BtrFS */ - case 1: - DefaultFs = L"BTRFS"; - break; - - /* If we don't understand input, default to FAT */ - default: - DefaultFs = L"FAT"; - break; - } - } - else - { - /* By default select the "FAT" file system */ - DefaultFs = L"FAT"; - } + /* 1 is for BtrFS */ + case 1: + DefaultFs = L"BTRFS"; + break; - /* Create the file system list */ - FileSystemList = CreateFileSystemList(6, 26, PartEntry->New, DefaultFs); - if (FileSystemList == NULL) - { - /* FIXME: show an error dialog */ - return QUIT_PAGE; + /* If we don't understand input, default to FAT */ + default: + DefaultFs = L"FAT"; + break; } } + else + { + /* By default select the "FAT" file system */ + DefaultFs = L"FAT"; + } - if (RepairUpdateFlag) + /* Create the file system list */ + // TODO: Display only the FSes compatible with the selected partition! + FileSystemList = CreateFileSystemList(6, 26, + PartEntry->New || + PartEntry->FormatState == Unformatted, + DefaultFs); + if (FileSystemList == NULL) { - return CHECK_FILE_SYSTEM_PAGE; - //return SELECT_PARTITION_PAGE; + /* FIXME: show an error dialog */ + return QUIT_PAGE; } if (IsUnattendedSetup) { - if (USetupData.FormatPartition) - { - return FORMAT_PARTITION_PAGE; - } - - return CHECK_FILE_SYSTEM_PAGE; + ASSERT(USetupData.FormatPartition); + return FORMAT_PARTITION_PAGE; } DrawFileSystemList(FileSystemList); @@ -2926,14 +3021,24 @@ SelectFileSystemPage(PINPUT_RECORD Ir) (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { if (ConfirmQuit(Ir)) + { + /* Reset the filesystem list */ + ResetFileSystemList(); return QUIT_PAGE; + } break; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ { + /* Reset the formatter machine state */ + TempPartition = NULL; FormatState = Start; + + /* Reset the filesystem list */ + ResetFileSystemList(); + return SELECT_PARTITION_PAGE; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && @@ -2949,9 +3054,27 @@ SelectFileSystemPage(PINPUT_RECORD Ir) else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { if (!FileSystemList->Selected->FileSystem) + { + ASSERT(!TempPartition->New && TempPartition->FormatState != Unformatted); + + /* + * Skip formatting this partition. We will also ignore + * filesystem checks on it, unless it is either the system + * or the installation partition. + */ + if (TempPartition != PartitionList->SystemPartition && + TempPartition != PartitionList->CurrentPartition) + { + PartEntry->NeedsCheck = FALSE; + } + return SELECT_FILE_SYSTEM_PAGE; + } else + { + /* Format this partition */ return FORMAT_PARTITION_PAGE; + } } } @@ -3014,15 +3137,17 @@ FormatPartitionPage(PINPUT_RECORD Ir) while (TRUE) { if (!IsUnattendedSetup) - { CONSOLE_ConInKey(Ir); - } if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { if (ConfirmQuit(Ir)) + { + /* Reset the filesystem list */ + ResetFileSystemList(); return QUIT_PAGE; + } break; } @@ -3033,6 +3158,10 @@ FormatPartitionPage(PINPUT_RECORD Ir) if (!PreparePartitionForFormatting(PartEntry, SelectedFileSystem->FileSystem)) { /* FIXME: show an error dialog */ + + /* Reset the filesystem list */ + ResetFileSystemList(); + return QUIT_PAGE; } @@ -3064,10 +3193,17 @@ FormatPartitionPage(PINPUT_RECORD Ir) #endif /* Commit the partition changes to the disk */ - if (!WritePartitionsToDisk(PartitionList)) + Status = WritePartitions(DiskEntry); + if (!NT_SUCCESS(Status)) { - DPRINT("WritePartitionsToDisk() failed\n"); + DPRINT1("WritePartitions(disk %lu) failed, Status 0x%08lx\n", + DiskEntry->DiskNumber, Status); + MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); + + /* Reset the filesystem list */ + ResetFileSystemList(); + return QUIT_PAGE; } @@ -3080,54 +3216,65 @@ FormatPartitionPage(PINPUT_RECORD Ir) DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); /* Format the partition */ - if (SelectedFileSystem->FileSystem) + Status = FormatPartition(&PartitionRootPath, + SelectedFileSystem->FileSystem, + SelectedFileSystem->QuickFormat); + if (Status == STATUS_NOT_SUPPORTED) { - Status = FormatPartition(&PartitionRootPath, - SelectedFileSystem->FileSystem, - SelectedFileSystem->QuickFormat); - if (Status == STATUS_NOT_SUPPORTED) + sprintf(Buffer, + "Setup is currently unable to format a partition in %S.\n" + "\n" + " \x07 Press ENTER to continue Setup.\n" + " \x07 Press F3 to quit Setup.", + SelectedFileSystem->FileSystem); + + PopupError(Buffer, + MUIGetString(STRING_QUITCONTINUE), + NULL, POPUP_WAIT_NONE); + + while (TRUE) { - sprintf(Buffer, - "Setup is currently unable to format a partition in %S.\n" - "\n" - " \x07 Press ENTER to continue Setup.\n" - " \x07 Press F3 to quit Setup.", - SelectedFileSystem->FileSystem); - - PopupError(Buffer, - MUIGetString(STRING_QUITCONTINUE), - NULL, POPUP_WAIT_NONE); - - while (TRUE) - { - CONSOLE_ConInKey(Ir); + CONSOLE_ConInKey(Ir); - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x00 && - Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3) /* F3 */ + if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x00 && + Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3) /* F3 */ + { + if (ConfirmQuit(Ir)) { - if (ConfirmQuit(Ir)) - return QUIT_PAGE; - else - return SELECT_FILE_SYSTEM_PAGE; + /* Reset the filesystem list */ + ResetFileSystemList(); + return QUIT_PAGE; } - else if (Ir->Event.KeyEvent.uChar.AsciiChar == VK_RETURN) /* ENTER */ + else { return SELECT_FILE_SYSTEM_PAGE; } } + else if (Ir->Event.KeyEvent.uChar.AsciiChar == VK_RETURN) /* ENTER */ + { + return SELECT_FILE_SYSTEM_PAGE; + } } - else if (!NT_SUCCESS(Status)) - { - DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); - MUIDisplayError(ERROR_FORMATTING_PARTITION, Ir, POPUP_WAIT_ANY_KEY, PathBuffer); - return QUIT_PAGE; - } + } + else if (!NT_SUCCESS(Status)) + { + DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); + MUIDisplayError(ERROR_FORMATTING_PARTITION, Ir, POPUP_WAIT_ANY_KEY, PathBuffer); + + /* Reset the filesystem list */ + ResetFileSystemList(); - PartEntry->FormatState = Formatted; - // PartEntry->FileSystem = FileSystem; - PartEntry->New = FALSE; + return QUIT_PAGE; } +// +// TODO: Here, call a partlist.c function that update the actual FS name +// and the label fields of the volume. +// + PartEntry->FormatState = Formatted; + // PartEntry->FileSystem = FileSystem; + PartEntry->New = FALSE; + #ifndef NDEBUG CONSOLE_SetStatusText(" Done. Press any key ..."); CONSOLE_ConInKey(Ir); @@ -3234,7 +3381,6 @@ CheckFileSystemPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.uChar.AsciiChar == VK_RETURN) /* ENTER */ { - PartEntry->NeedsCheck = FALSE; return CHECK_FILE_SYSTEM_PAGE; } } @@ -3347,11 +3493,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) NTSTATUS Status; /* We do not need the filesystem list anymore */ - if (FileSystemList != NULL) - { - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; - } + ResetFileSystemList(); if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -4511,15 +4653,12 @@ QuitPage(PINPUT_RECORD Ir) PartitionList = NULL; } + /* Reset the formatter machine state */ TempPartition = NULL; FormatState = Start; /* Destroy the filesystem list */ - if (FileSystemList != NULL) - { - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; - } + ResetFileSystemList(); CONSOLE_SetStatusText(MUIGetString(STRING_REBOOTCOMPUTER2));

1 0

[reactos] 02/03: [SETUPLIB][USETUP] Minor improvements.
by Hermès Bélusca-Maïto 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29cc1843d074106649aa6… commit 29cc1843d074106649aa6b0155f9ff347c7abb45 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 24 19:04:57 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 10 15:41:20 2019 +0100 [SETUPLIB][USETUP] Minor improvements. - Make some partitioning functions not dependent on the selected "CurrentPartition". - Add some sanity checks. - Improve some of the "is-partitioned" checks. --- base/setup/lib/setuplib.c | 2 + base/setup/lib/utils/osdetect.c | 2 + base/setup/lib/utils/partlist.c | 201 +++++++++++++++++++++++----------------- base/setup/lib/utils/partlist.h | 18 +++- base/setup/usetup/usetup.c | 26 +++++- 5 files changed, 155 insertions(+), 94 deletions(-) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 9e4d22ee37..0501fe72ef 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -630,6 +630,8 @@ InitDestinationPaths( WCHAR PathBuffer[MAX_PATH]; NTSTATUS Status; + ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); + /* Create 'pSetupData->DestinationRootPath' string */ RtlFreeUnicodeString(&pSetupData->DestinationRootPath); Status = RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), diff --git a/base/setup/lib/utils/osdetect.c b/base/setup/lib/utils/osdetect.c index 8dd35cd55b..d191c58998 100644 --- a/base/setup/lib/utils/osdetect.c +++ b/base/setup/lib/utils/osdetect.c @@ -697,6 +697,8 @@ FindNTOSInstallations( ULONG Version; WCHAR PathBuffer[MAX_PATH]; + ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); + /* Set PartitionRootPath */ RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu\\", diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 5c20c4bf36..269bb99b2f 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -342,9 +342,10 @@ AssignDriveLetters( if (PartEntry->IsPartitioned && !IsContainerPartition(PartEntry->PartitionType)) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + if (IsRecognizedPartition(PartEntry->PartitionType) || - (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED && - PartEntry->SectorCount.QuadPart != 0LL)) + PartEntry->SectorCount.QuadPart != 0LL) { if (Letter <= L'Z') { @@ -373,9 +374,10 @@ AssignDriveLetters( if (PartEntry->IsPartitioned) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + if (IsRecognizedPartition(PartEntry->PartitionType) || - (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED && - PartEntry->SectorCount.QuadPart != 0LL)) + PartEntry->SectorCount.QuadPart != 0LL) { if (Letter <= L'Z') { @@ -903,6 +905,7 @@ AddPartitionToDisk( else if (IsRecognizedPartition(PartEntry->PartitionType)) { ASSERT(PartitionInfo->RecognizedPartition); + ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); /* Open the volume, ignore any errors */ RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), @@ -2384,7 +2387,7 @@ UpdateDiskLayout( if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) { - DPRINT("GPT-partitioned disk detected, not currently supported by SETUP!\n"); + DPRINT1("GPT-partitioned disk detected, not currently supported by SETUP!\n"); return; } @@ -2405,14 +2408,16 @@ UpdateDiskLayout( if (PartEntry->IsPartitioned) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; PartEntry->PartitionIndex = Index; - /* Reset the current partition number only for newly-created partitions */ + /* Reset the current partition number only for newly-created (unmounted) partitions */ if (PartEntry->New) PartEntry->PartitionNumber = 0; - PartEntry->OnDiskPartitionNumber = (!IsContainerPartition(PartEntry->PartitionType)) ? PartitionNumber : 0; + PartEntry->OnDiskPartitionNumber = (!IsContainerPartition(PartEntry->PartitionType) ? PartitionNumber : 0); if (!IsSamePrimaryLayoutEntry(PartitionInfo, DiskEntry, PartEntry)) { @@ -2447,17 +2452,19 @@ UpdateDiskLayout( if (PartEntry->IsPartitioned) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; PartEntry->PartitionIndex = Index; - DPRINT1("Updating logical partition entry %lu\n", Index); - - /* Reset the current partition number only for newly-created partitions */ + /* Reset the current partition number only for newly-created (unmounted) partitions */ if (PartEntry->New) PartEntry->PartitionNumber = 0; PartEntry->OnDiskPartitionNumber = PartitionNumber; + DPRINT1("Updating logical partition entry %lu\n", Index); + PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; PartitionInfo->HiddenSectors = DiskEntry->SectorAlignment; @@ -2569,7 +2576,10 @@ GetPrevUnpartitionedEntry( PARTENTRY, ListEntry); if (PrevPartEntry->IsPartitioned == FALSE) + { + ASSERT(PrevPartEntry->PartitionType == PARTITION_ENTRY_UNUSED); return PrevPartEntry; + } } return NULL; @@ -2601,7 +2611,10 @@ GetNextUnpartitionedEntry( PARTENTRY, ListEntry); if (NextPartEntry->IsPartitioned == FALSE) + { + ASSERT(NextPartEntry->PartitionType == PARTITION_ENTRY_UNUSED); return NextPartEntry; + } } return NULL; @@ -2610,39 +2623,36 @@ GetNextUnpartitionedEntry( BOOLEAN CreatePrimaryPartition( IN PPARTLIST List, + IN PPARTENTRY SelectedEntry, IN ULONGLONG SectorCount, IN BOOLEAN AutoCreate) { ERROR_NUMBER Error; - PDISKENTRY DiskEntry; PPARTENTRY PartEntry; DPRINT1("CreatePrimaryPartition(%I64u)\n", SectorCount); if (List == NULL || - List->CurrentDisk == NULL || - List->CurrentPartition == NULL || - List->CurrentPartition->IsPartitioned) + SelectedEntry == NULL || + SelectedEntry->DiskEntry == NULL || + SelectedEntry->IsPartitioned) { return FALSE; } - Error = PrimaryPartitionCreationChecks(List); + Error = PrimaryPartitionCreationChecks(SelectedEntry); if (Error != NOT_AN_ERROR) { DPRINT1("PrimaryPartitionCreationChecks() failed with error %lu\n", Error); return FALSE; } - DiskEntry = List->CurrentDisk; - PartEntry = List->CurrentPartition; - /* Convert the current entry, or insert and initialize a new partition entry */ - PartEntry = InitializePartitionEntry(DiskEntry, PartEntry, SectorCount, AutoCreate); + PartEntry = InitializePartitionEntry(SelectedEntry->DiskEntry, SelectedEntry, SectorCount, AutoCreate); if (PartEntry == NULL) return FALSE; - UpdateDiskLayout(DiskEntry); + UpdateDiskLayout(PartEntry->DiskEntry); AssignDriveLetters(List); @@ -2681,34 +2691,31 @@ AddLogicalDiskSpace( BOOLEAN CreateExtendedPartition( IN PPARTLIST List, + IN PPARTENTRY SelectedEntry, IN ULONGLONG SectorCount) { ERROR_NUMBER Error; - PDISKENTRY DiskEntry; PPARTENTRY PartEntry; DPRINT1("CreateExtendedPartition(%I64u)\n", SectorCount); if (List == NULL || - List->CurrentDisk == NULL || - List->CurrentPartition == NULL || - List->CurrentPartition->IsPartitioned) + SelectedEntry == NULL || + SelectedEntry->DiskEntry == NULL || + SelectedEntry->IsPartitioned) { return FALSE; } - Error = ExtendedPartitionCreationChecks(List); + Error = ExtendedPartitionCreationChecks(SelectedEntry); if (Error != NOT_AN_ERROR) { DPRINT1("ExtendedPartitionCreationChecks() failed with error %lu\n", Error); return FALSE; } - DiskEntry = List->CurrentDisk; - PartEntry = List->CurrentPartition; - /* Convert the current entry, or insert and initialize a new partition entry */ - PartEntry = InitializePartitionEntry(DiskEntry, PartEntry, SectorCount, FALSE); + PartEntry = InitializePartitionEntry(SelectedEntry->DiskEntry, SelectedEntry, SectorCount, FALSE); if (PartEntry == NULL) return FALSE; @@ -2727,11 +2734,11 @@ CreateExtendedPartition( PartEntry->New = FALSE; PartEntry->FormatState = Formatted; - DiskEntry->ExtendedPartition = PartEntry; + PartEntry->DiskEntry->ExtendedPartition = PartEntry; - AddLogicalDiskSpace(DiskEntry); + AddLogicalDiskSpace(PartEntry->DiskEntry); - UpdateDiskLayout(DiskEntry); + UpdateDiskLayout(PartEntry->DiskEntry); AssignDriveLetters(List); @@ -2741,41 +2748,38 @@ CreateExtendedPartition( BOOLEAN CreateLogicalPartition( IN PPARTLIST List, + IN PPARTENTRY SelectedEntry, IN ULONGLONG SectorCount, IN BOOLEAN AutoCreate) { ERROR_NUMBER Error; - PDISKENTRY DiskEntry; PPARTENTRY PartEntry; DPRINT1("CreateLogicalPartition(%I64u)\n", SectorCount); if (List == NULL || - List->CurrentDisk == NULL || - List->CurrentPartition == NULL || - List->CurrentPartition->IsPartitioned) + SelectedEntry == NULL || + SelectedEntry->DiskEntry == NULL || + SelectedEntry->IsPartitioned) { return FALSE; } - Error = LogicalPartitionCreationChecks(List); + Error = LogicalPartitionCreationChecks(SelectedEntry); if (Error != NOT_AN_ERROR) { DPRINT1("LogicalPartitionCreationChecks() failed with error %lu\n", Error); return FALSE; } - DiskEntry = List->CurrentDisk; - PartEntry = List->CurrentPartition; - /* Convert the current entry, or insert and initialize a new partition entry */ - PartEntry = InitializePartitionEntry(DiskEntry, PartEntry, SectorCount, AutoCreate); + PartEntry = InitializePartitionEntry(SelectedEntry->DiskEntry, SelectedEntry, SectorCount, AutoCreate); if (PartEntry == NULL) return FALSE; PartEntry->LogicalPartition = TRUE; - UpdateDiskLayout(DiskEntry); + UpdateDiskLayout(PartEntry->DiskEntry); AssignDriveLetters(List); @@ -2795,11 +2799,10 @@ DismountVolume( HANDLE PartitionHandle; WCHAR Buffer[MAX_PATH]; - /* Check whether the partition is valid and may have been mounted in the system */ + /* Check whether the partition is valid and was mounted by the system */ if (!PartEntry->IsPartitioned || - PartEntry->PartitionType == PARTITION_ENTRY_UNUSED || - IsContainerPartition(PartEntry->PartitionType) || - !IsRecognizedPartition(PartEntry->PartitionType) || + IsContainerPartition(PartEntry->PartitionType) || + !IsRecognizedPartition(PartEntry->PartitionType) || PartEntry->FormatState == Unformatted /* || PartEntry->FormatState == UnknownFormat */ || !*PartEntry->FileSystem || PartEntry->PartitionNumber == 0) @@ -2808,6 +2811,8 @@ DismountVolume( return STATUS_SUCCESS; } + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + /* Open the volume */ RtlStringCchPrintfW(Buffer, ARRAYSIZE(Buffer), L"\\Device\\Harddisk%lu\\Partition%lu", @@ -2888,32 +2893,37 @@ DismountVolume( } VOID -DeleteCurrentPartition( - IN PPARTLIST List) +DeletePartition( + IN PPARTLIST List, + IN PPARTENTRY PartEntry) { PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; PPARTENTRY PrevPartEntry; PPARTENTRY NextPartEntry; PPARTENTRY LogicalPartEntry; PLIST_ENTRY Entry; if (List == NULL || - List->CurrentDisk == NULL || - List->CurrentPartition == NULL || - List->CurrentPartition->IsPartitioned == FALSE) + PartEntry == NULL || + PartEntry->DiskEntry == NULL || + PartEntry->IsPartitioned == FALSE) { return; } - /* Clear the system disk and partition pointers if the system partition is being deleted */ - if (List->SystemPartition == List->CurrentPartition) + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + + /* Clear the system partition pointers if it is being deleted */ + if (List->SystemPartition == PartEntry) { + ASSERT(List->SystemPartition); + + if (List->SystemPartition == List->OriginalSystemPartition) + List->OriginalSystemPartition = NULL; List->SystemPartition = NULL; } - DiskEntry = List->CurrentDisk; - PartEntry = List->CurrentPartition; + DiskEntry = PartEntry->DiskEntry; /* Check which type of partition (primary/logical or extended) is being deleted */ if (DiskEntry->ExtendedPartition == PartEntry) @@ -2961,7 +2971,11 @@ DeleteCurrentPartition( RtlFreeHeap(ProcessHeap, 0, NextPartEntry); /* Update current partition */ - List->CurrentPartition = PrevPartEntry; + if (List->CurrentPartition == PartEntry || + List->CurrentPartition == NextPartEntry) + { + List->CurrentPartition = PrevPartEntry; + } } else if (PrevPartEntry != NULL && NextPartEntry == NULL) { @@ -2975,7 +2989,10 @@ DeleteCurrentPartition( RtlFreeHeap(ProcessHeap, 0, PartEntry); /* Update current partition */ - List->CurrentPartition = PrevPartEntry; + if (List->CurrentPartition == PartEntry) + { + List->CurrentPartition = PrevPartEntry; + } } else if (PrevPartEntry == NULL && NextPartEntry != NULL) { @@ -2990,7 +3007,10 @@ DeleteCurrentPartition( RtlFreeHeap(ProcessHeap, 0, PartEntry); /* Update current partition */ - List->CurrentPartition = NextPartEntry; + if (List->CurrentPartition == PartEntry) + { + List->CurrentPartition = NextPartEntry; + } } else { @@ -3010,6 +3030,13 @@ DeleteCurrentPartition( AssignDriveLetters(List); } +VOID +DeleteCurrentPartition( + IN PPARTLIST List) +{ + DeletePartition(List, List->CurrentPartition); +} + static BOOLEAN IsSupportedActivePartition( @@ -3292,10 +3319,8 @@ SetSystemPartition: List->SystemPartition->DiskEntry->Dirty = TRUE; } -static NTSTATUS WritePartitions( - IN PPARTLIST List, IN PDISKENTRY DiskEntry) { NTSTATUS Status; @@ -3312,6 +3337,10 @@ WritePartitions( DPRINT("WritePartitions() Disk: %lu\n", DiskEntry->DiskNumber); + /* If the disk is not dirty, there is nothing to do */ + if (!DiskEntry->Dirty) + return STATUS_SUCCESS; + RtlStringCchPrintfW(DstPath, ARRAYSIZE(DstPath), L"\\Device\\Harddisk%lu\\Partition0", DiskEntry->DiskNumber); @@ -3394,6 +3423,7 @@ WritePartitions( if (PartEntry->IsPartitioned) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex]; PartEntry->PartitionNumber = PartitionInfo->PartitionNumber; } @@ -3408,6 +3438,7 @@ WritePartitions( if (PartEntry->IsPartitioned) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex]; PartEntry->PartitionNumber = PartitionInfo->PartitionNumber; } @@ -3423,7 +3454,8 @@ WritePartitions( // DiskEntry->NoMbr was TRUE (instead of NewDisk). // - // DiskEntry->Dirty = FALSE; + /* The layout has been successfully updated, the disk is not dirty anymore */ + DiskEntry->Dirty = FALSE; return Status; } @@ -3432,6 +3464,7 @@ BOOLEAN WritePartitionsToDisk( IN PPARTLIST List) { + NTSTATUS Status; PLIST_ENTRY Entry; PDISKENTRY DiskEntry; @@ -3452,8 +3485,12 @@ WritePartitionsToDisk( if (DiskEntry->Dirty != FALSE) { - WritePartitions(List, DiskEntry); - DiskEntry->Dirty = FALSE; + Status = WritePartitions(DiskEntry); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WritePartitionsToDisk() failed to update disk %lu, Status 0x%08lx\n", + DiskEntry->DiskNumber, Status); + } } } @@ -3553,8 +3590,10 @@ SetMountedDeviceValues( Entry2 = Entry2->Flink) { PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - if (PartEntry->IsPartitioned) + if (PartEntry->IsPartitioned) // && !IsContainerPartition(PartEntry->PartitionType) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + /* Assign a "\DosDevices\#:" mount point to this partition */ if (PartEntry->DriveLetter) { @@ -3574,8 +3613,10 @@ SetMountedDeviceValues( Entry2 = Entry2->Flink) { PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - if (PartEntry->IsPartitioned) + if (PartEntry->IsPartitioned) // && !IsContainerPartition(PartEntry->PartitionType) { + ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + /* Assign a "\DosDevices\#:" mount point to this partition */ if (PartEntry->DriveLetter) { @@ -3611,13 +3652,9 @@ SetPartitionType( ERROR_NUMBER PrimaryPartitionCreationChecks( - IN PPARTLIST List) + IN PPARTENTRY PartEntry) { - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - - DiskEntry = List->CurrentDisk; - PartEntry = List->CurrentPartition; + PDISKENTRY DiskEntry = PartEntry->DiskEntry; if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) { @@ -3638,13 +3675,9 @@ PrimaryPartitionCreationChecks( ERROR_NUMBER ExtendedPartitionCreationChecks( - IN PPARTLIST List) + IN PPARTENTRY PartEntry) { - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - - DiskEntry = List->CurrentDisk; - PartEntry = List->CurrentPartition; + PDISKENTRY DiskEntry = PartEntry->DiskEntry; if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) { @@ -3669,13 +3702,9 @@ ExtendedPartitionCreationChecks( ERROR_NUMBER LogicalPartitionCreationChecks( - IN PPARTLIST List) + IN PPARTENTRY PartEntry) { - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - - DiskEntry = List->CurrentDisk; - PartEntry = List->CurrentPartition; + PDISKENTRY DiskEntry = PartEntry->DiskEntry; if (DiskEntry->DiskStyle == PARTITION_STYLE_GPT) { @@ -3778,7 +3807,7 @@ GetNextUncheckedPartition( Entry2 = Entry2->Flink) { PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - if (PartEntry->NeedsCheck == TRUE) + if (PartEntry->IsPartitioned && PartEntry->NeedsCheck) { ASSERT(DiskEntry == PartEntry->DiskEntry); if (pDiskEntry) *pDiskEntry = DiskEntry; @@ -3792,7 +3821,7 @@ GetNextUncheckedPartition( Entry2 = Entry2->Flink) { PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - if (PartEntry->NeedsCheck == TRUE) + if (PartEntry->IsPartitioned && PartEntry->NeedsCheck) { ASSERT(DiskEntry == PartEntry->DiskEntry); if (pDiskEntry) *pDiskEntry = DiskEntry; diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index 57873a444e..ab4905a6d1 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -292,20 +292,28 @@ GetPrevPartition( BOOLEAN CreatePrimaryPartition( IN PPARTLIST List, + IN PPARTENTRY SelectedEntry, IN ULONGLONG SectorCount, IN BOOLEAN AutoCreate); BOOLEAN CreateExtendedPartition( IN PPARTLIST List, + IN PPARTENTRY SelectedEntry, IN ULONGLONG SectorCount); BOOLEAN CreateLogicalPartition( IN PPARTLIST List, + IN PPARTENTRY SelectedEntry, IN ULONGLONG SectorCount, IN BOOLEAN AutoCreate); +VOID +DeletePartition( + IN PPARTLIST List, + IN PPARTENTRY PartEntry); + VOID DeleteCurrentPartition( IN PPARTLIST List); @@ -314,6 +322,10 @@ VOID CheckActiveSystemPartition( IN PPARTLIST List); +NTSTATUS +WritePartitions( + IN PDISKENTRY DiskEntry); + BOOLEAN WritePartitionsToDisk( IN PPARTLIST List); @@ -335,15 +347,15 @@ SetPartitionType( ERROR_NUMBER PrimaryPartitionCreationChecks( - IN PPARTLIST List); + IN PPARTENTRY PartEntry); ERROR_NUMBER ExtendedPartitionCreationChecks( - IN PPARTLIST List); + IN PPARTENTRY PartEntry); ERROR_NUMBER LogicalPartitionCreationChecks( - IN PPARTLIST List); + IN PPARTENTRY PartEntry); BOOLEAN GetNextUnformattedPartition( diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index b8df7c9261..555d37e83a 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1499,12 +1499,14 @@ SelectPartitionPage(PINPUT_RECORD Ir) if (PartitionList->CurrentPartition->LogicalPartition) { CreateLogicalPartition(PartitionList, + PartitionList->CurrentPartition, PartitionList->CurrentPartition->SectorCount.QuadPart, TRUE); } else { CreatePrimaryPartition(PartitionList, + PartitionList->CurrentPartition, PartitionList->CurrentPartition->SectorCount.QuadPart, TRUE); } @@ -1607,7 +1609,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) { if (PartitionList->CurrentPartition->LogicalPartition) { - Error = LogicalPartitionCreationChecks(PartitionList); + Error = LogicalPartitionCreationChecks(PartitionList->CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1615,12 +1617,13 @@ SelectPartitionPage(PINPUT_RECORD Ir) } CreateLogicalPartition(PartitionList, + PartitionList->CurrentPartition, 0ULL, TRUE); } else { - Error = PrimaryPartitionCreationChecks(PartitionList); + Error = PrimaryPartitionCreationChecks(PartitionList->CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1628,6 +1631,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) } CreatePrimaryPartition(PartitionList, + PartitionList->CurrentPartition, 0ULL, TRUE); } @@ -1646,7 +1650,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) { if (PartitionList->CurrentPartition->LogicalPartition == FALSE) { - Error = PrimaryPartitionCreationChecks(PartitionList); + Error = PrimaryPartitionCreationChecks(PartitionList->CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1660,7 +1664,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) { if (PartitionList->CurrentPartition->LogicalPartition == FALSE) { - Error = ExtendedPartitionCreationChecks(PartitionList); + Error = ExtendedPartitionCreationChecks(PartitionList->CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -1674,7 +1678,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) { if (PartitionList->CurrentPartition->LogicalPartition) { - Error = LogicalPartitionCreationChecks(PartitionList); + Error = LogicalPartitionCreationChecks(PartitionList->CurrentPartition); if (Error != NOT_AN_ERROR) { MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); @@ -2068,6 +2072,7 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) DPRINT ("Partition size: %I64u bytes\n", PartSize); CreatePrimaryPartition(PartitionList, + PartitionList->CurrentPartition, SectorCount, FALSE); @@ -2231,6 +2236,7 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) DPRINT ("Partition size: %I64u bytes\n", PartSize); CreateExtendedPartition(PartitionList, + PartitionList->CurrentPartition, SectorCount); return SELECT_PARTITION_PAGE; @@ -2393,6 +2399,7 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) DPRINT("Partition size: %I64u bytes\n", PartSize); CreateLogicalPartition(PartitionList, + PartitionList->CurrentPartition, SectorCount, FALSE); @@ -2736,6 +2743,8 @@ SelectFileSystemPage(PINPUT_RECORD Ir) PartEntry = TempPartition; DiskEntry = PartEntry->DiskEntry; + ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); + /* Adjust disk size */ DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; if (DiskSize >= 10 * GB) /* 10 GB */ @@ -2997,7 +3006,10 @@ FormatPartitionPage(PINPUT_RECORD Ir) PartEntry = TempPartition; DiskEntry = PartEntry->DiskEntry; + ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); + SelectedFileSystem = FileSystemList->Selected; + ASSERT(SelectedFileSystem && SelectedFileSystem->FileSystem); while (TRUE) { @@ -3163,6 +3175,8 @@ CheckFileSystemPage(PINPUT_RECORD Ir) return INSTALL_DIRECTORY_PAGE; } + ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHECKINGPART)); CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); @@ -3930,6 +3944,8 @@ BootLoaderPage(PINPUT_RECORD Ir) CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); + ASSERT(PartitionList->SystemPartition->IsPartitioned && PartitionList->SystemPartition->PartitionNumber != 0); + RtlFreeUnicodeString(&USetupData.SystemRootPath); RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu\\",

1 0

[reactos] 01/03: [SETUPLIB][USETUP] Factor out the usage of FS provider structures.
by Hermès Bélusca-Maïto 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1fbc2d651e10590435f4… commit c1fbc2d651e10590435f4d7722f13b1315457d41 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 24 17:52:33 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 10 15:41:05 2019 +0100 [SETUPLIB][USETUP] Factor out the usage of FS provider structures. Similarly to FMIFS this structure should be private. Instead file-system names are passed to the helper functions, allowing to use the names returned by the FS drivers. The names are then internally mapped to the corresponding FS providers. In particular this allows to handle the "RAW" file-system and to assign the 'Unformatted' flag to partitions having this FS. Finally this helps us refining the checks performed to see whether the current "active" system partition uses a supported file-system. --- base/setup/lib/bootsup.c | 38 ++-- base/setup/lib/fsutil.c | 481 +++++++++++++++++++++++++++++----------- base/setup/lib/fsutil.h | 113 ++++++++-- base/setup/lib/utils/partlist.c | 294 ++++++++++++++---------- base/setup/lib/utils/partlist.h | 13 +- base/setup/usetup/chkdsk.c | 20 +- base/setup/usetup/chkdsk.h | 3 +- base/setup/usetup/format.c | 20 +- base/setup/usetup/format.h | 3 +- base/setup/usetup/fslist.c | 48 ++-- base/setup/usetup/fslist.h | 6 +- base/setup/usetup/usetup.c | 46 ++-- 12 files changed, 718 insertions(+), 367 deletions(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index 3d494c949a..ec9a1a4cf5 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -2351,38 +2351,38 @@ InstallFatBootcodeToFloppy( IN PUNICODE_STRING SourceRootPath, IN PUNICODE_STRING DestinationArcPath) { + static const PCWSTR FloppyDevice = L"\\Device\\Floppy0\\"; + NTSTATUS Status; - PFILE_SYSTEM FatFS; - UNICODE_STRING FloppyDevice = RTL_CONSTANT_STRING(L"\\Device\\Floppy0\\"); WCHAR SrcPath[MAX_PATH]; WCHAR DstPath[MAX_PATH]; /* Verify that the floppy disk is accessible */ - if (DoesDirExist(NULL, FloppyDevice.Buffer) == FALSE) + if (DoesDirExist(NULL, FloppyDevice) == FALSE) return STATUS_DEVICE_NOT_READY; /* Format the floppy disk */ - FatFS = GetFileSystemByName(L"FAT"); - if (!FatFS) - { - DPRINT1("FAT FS non existent on this system?!\n"); - return STATUS_NOT_SUPPORTED; - } - Status = FatFS->FormatFunc(&FloppyDevice, - FMIFS_FLOPPY, - NULL, - TRUE, - 0, - NULL); + // FormatPartition(...) + Status = FormatFileSystem(FloppyDevice, + L"FAT", + FMIFS_FLOPPY, + NULL, + TRUE, + 0, + NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("VfatFormat() failed (Status %lx)\n", Status); + if (Status == STATUS_NOT_SUPPORTED) + DPRINT1("FAT FS non existent on this system?!\n"); + else + DPRINT1("VfatFormat() failed (Status %lx)\n", Status); + return Status; } /* Copy FreeLoader to the boot partition */ CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, FloppyDevice.Buffer, L"freeldr.sys"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, FloppyDevice, L"freeldr.sys"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath, FALSE); @@ -2394,7 +2394,7 @@ InstallFatBootcodeToFloppy( /* Create new 'freeldr.ini' */ DPRINT("Create new 'freeldr.ini'\n"); - Status = CreateFreeLoaderIniForReactOS(FloppyDevice.Buffer, DestinationArcPath->Buffer); + Status = CreateFreeLoaderIniForReactOS(FloppyDevice, DestinationArcPath->Buffer); if (!NT_SUCCESS(Status)) { DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status %lx)\n", Status); @@ -2403,7 +2403,7 @@ InstallFatBootcodeToFloppy( /* Install FAT12 boosector */ CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat.bin"); - CombinePaths(DstPath, ARRAYSIZE(DstPath), 1, FloppyDevice.Buffer); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 1, FloppyDevice); DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath); Status = InstallFat12BootCodeToFloppy(SrcPath, DstPath); diff --git a/base/setup/lib/fsutil.c b/base/setup/lib/fsutil.c index b9d0ed838f..8955518465 100644 --- a/base/setup/lib/fsutil.c +++ b/base/setup/lib/fsutil.c @@ -2,8 +2,8 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Filesystem support functions - * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Copyright 2017-2018 Hermes Belusca-Maito + * COPYRIGHT: Copyright 2003-2019 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Copyright 2017-2019 Hermes Belusca-Maito */ // @@ -28,10 +28,18 @@ #include <debug.h> -/* GLOBALS ******************************************************************/ +/* LOCALS *******************************************************************/ + +/** IFS_PROVIDER **/ +typedef struct _FILE_SYSTEM +{ + PCWSTR FileSystemName; + FORMATEX FormatFunc; + CHKDSKEX ChkdskFunc; +} FILE_SYSTEM, *PFILE_SYSTEM; /* The list of file systems on which we can install ReactOS */ -FILE_SYSTEM RegisteredFileSystems[] = +static FILE_SYSTEM RegisteredFileSystems[] = { /* NOTE: The FAT formatter automatically determines * whether it will use FAT-16 or FAT-32. */ @@ -54,16 +62,24 @@ FILE_SYSTEM RegisteredFileSystems[] = /* FUNCTIONS ****************************************************************/ -PFILE_SYSTEM -GetRegisteredFileSystems(OUT PULONG Count) +/** QueryAvailableFileSystemFormat() **/ +BOOLEAN +GetRegisteredFileSystems( + IN ULONG Index, + OUT PCWSTR* FileSystemName) { - *Count = ARRAYSIZE(RegisteredFileSystems); - return RegisteredFileSystems; + if (Index >= ARRAYSIZE(RegisteredFileSystems)) + return FALSE; + + *FileSystemName = RegisteredFileSystems[Index].FileSystemName; + + return TRUE; } -PFILE_SYSTEM + +/** GetProvider() **/ +static PFILE_SYSTEM GetFileSystemByName( - // IN PFILE_SYSTEM_LIST List, IN PCWSTR FileSystemName) { #if 0 // Reenable when the list of registered FSes will again be dynamic @@ -75,25 +91,33 @@ GetFileSystemByName( while (ListEntry != &List->ListHead) { Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); - if (Item->FileSystemName && wcsicmp(FileSystemName, Item->FileSystemName) == 0) + if (Item->FileSystemName && + (wcsicmp(FileSystemName, Item->FileSystemName) == 0 || + /* Map FAT32 back to FAT */ + (wcsicmp(FileSystemName, L"FAT32") == 0 && wcsicmp(Item->FileSystemName, L"FAT") == 0))) + { return Item; + } ListEntry = ListEntry->Flink; } #else - ULONG Count; - PFILE_SYSTEM FileSystems; + ULONG Count = ARRAYSIZE(RegisteredFileSystems); + PFILE_SYSTEM FileSystems = RegisteredFileSystems; - FileSystems = GetRegisteredFileSystems(&Count); - if (!FileSystems || Count == 0) - return NULL; + ASSERT(FileSystems && Count != 0); while (Count--) { - if (FileSystems->FileSystemName && wcsicmp(FileSystemName, FileSystems->FileSystemName) == 0) + if (FileSystems->FileSystemName && + (wcsicmp(FileSystemName, FileSystems->FileSystemName) == 0 || + /* Map FAT32 back to FAT */ + (wcsicmp(FileSystemName, L"FAT32") == 0 && wcsicmp(FileSystems->FileSystemName, L"FAT") == 0))) + { return FileSystems; + } ++FileSystems; } @@ -105,40 +129,59 @@ GetFileSystemByName( // -// FileSystem recognition (using NT OS functionality) +// FileSystem recognition, using NT OS functionality // /* NOTE: Ripped & adapted from base/system/autochk/autochk.c */ -static NTSTATUS -_MyGetFileSystem( - IN struct _PARTENTRY* PartEntry, +NTSTATUS +GetFileSystemNameByHandle( + IN HANDLE PartitionHandle, IN OUT PWSTR FileSystemName, IN SIZE_T FileSystemNameSize) { NTSTATUS Status; - UNICODE_STRING PartitionRootPath; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE FileHandle; IO_STATUS_BLOCK IoStatusBlock; - WCHAR PathBuffer[MAX_PATH]; UCHAR Buffer[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; PFILE_FS_ATTRIBUTE_INFORMATION FileFsAttribute = (PFILE_FS_ATTRIBUTE_INFORMATION)Buffer; - /* Set PartitionRootPath */ - RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"\\Device\\Harddisk%lu\\Partition%lu", - PartEntry->DiskEntry->DiskNumber, - PartEntry->PartitionNumber); - RtlInitUnicodeString(&PartitionRootPath, PathBuffer); - DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); + /* Retrieve the FS attributes */ + Status = NtQueryVolumeInformationFile(PartitionHandle, + &IoStatusBlock, + FileFsAttribute, + sizeof(Buffer), + FileFsAttributeInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtQueryVolumeInformationFile failed, Status 0x%08lx\n", Status); + return Status; + } + + if (FileSystemNameSize < FileFsAttribute->FileSystemNameLength + sizeof(WCHAR)) + return STATUS_BUFFER_TOO_SMALL; + + return RtlStringCbCopyNW(FileSystemName, FileSystemNameSize, + FileFsAttribute->FileSystemName, + FileFsAttribute->FileSystemNameLength); +} + +NTSTATUS +GetFileSystemName_UStr( + IN PUNICODE_STRING PartitionPath, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE PartitionHandle; + IO_STATUS_BLOCK IoStatusBlock; /* Open the partition */ InitializeObjectAttributes(&ObjectAttributes, - &PartitionRootPath, + PartitionPath, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenFile(&FileHandle, // PartitionHandle, + Status = NtOpenFile(&PartitionHandle, FILE_GENERIC_READ /* | SYNCHRONIZE */, &ObjectAttributes, &IoStatusBlock, @@ -146,72 +189,62 @@ _MyGetFileSystem( 0 /* FILE_SYNCHRONOUS_IO_NONALERT */); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open partition '%wZ', Status 0x%08lx\n", &PartitionRootPath, Status); + DPRINT1("Failed to open partition '%wZ', Status 0x%08lx\n", PartitionPath, Status); return Status; } /* Retrieve the FS attributes */ - Status = NtQueryVolumeInformationFile(FileHandle, - &IoStatusBlock, - FileFsAttribute, - sizeof(Buffer), - FileFsAttributeInformation); - NtClose(FileHandle); - + Status = GetFileSystemNameByHandle(PartitionHandle, FileSystemName, FileSystemNameSize); if (!NT_SUCCESS(Status)) { - DPRINT1("NtQueryVolumeInformationFile failed for partition '%wZ', Status 0x%08lx\n", - &PartitionRootPath, Status); - return Status; + DPRINT1("GetFileSystemNameByHandle() failed for partition '%wZ', Status 0x%08lx\n", + PartitionPath, Status); } - if (FileSystemNameSize < FileFsAttribute->FileSystemNameLength + sizeof(WCHAR)) - return STATUS_BUFFER_TOO_SMALL; + /* Close the partition */ + NtClose(PartitionHandle); - return RtlStringCbCopyNW(FileSystemName, FileSystemNameSize, - FileFsAttribute->FileSystemName, - FileFsAttribute->FileSystemNameLength); + return Status; } -PFILE_SYSTEM -GetFileSystem( - // IN PFILE_SYSTEM_LIST FileSystemList, - IN struct _PARTENTRY* PartEntry) +NTSTATUS +GetFileSystemName( + IN PCWSTR Partition, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize) { - PFILE_SYSTEM CurrentFileSystem; - NTSTATUS Status; - PWSTR FileSystemName = NULL; - WCHAR FsRecFileSystemName[MAX_PATH]; + UNICODE_STRING PartitionPath; - CurrentFileSystem = PartEntry->FileSystem; + RtlInitUnicodeString(&PartitionPath, Partition); + return GetFileSystemName_UStr(&PartitionPath, + FileSystemName, + FileSystemNameSize); +} - /* We have a file system, return it */ - if (CurrentFileSystem != NULL && CurrentFileSystem->FileSystemName != NULL) - return CurrentFileSystem; +NTSTATUS +InferFileSystemByHandle( + IN HANDLE PartitionHandle, + IN UCHAR PartitionType, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize) +{ + NTSTATUS Status; - DPRINT1("File system not found, try to guess one...\n"); + if (FileSystemNameSize < sizeof(WCHAR)) + return STATUS_BUFFER_TOO_SMALL; - CurrentFileSystem = NULL; + *FileSystemName = L'\0'; - /* - * We don't have one... - * - * Try to infer a file system using NT file system recognition. - */ - Status = _MyGetFileSystem(PartEntry, FsRecFileSystemName, sizeof(FsRecFileSystemName)); - if (NT_SUCCESS(Status) && *FsRecFileSystemName) + /* Try to infer a file system using NT file system recognition */ + Status = GetFileSystemNameByHandle(PartitionHandle, + FileSystemName, + FileSystemNameSize); + if (NT_SUCCESS(Status) && *FileSystemName) { - /* Temporary HACK: map FAT32 back to FAT */ - if (wcscmp(FsRecFileSystemName, L"FAT32") == 0) - RtlStringCbCopyW(FsRecFileSystemName, sizeof(FsRecFileSystemName), L"FAT"); - - FileSystemName = FsRecFileSystemName; goto Quit; } /* - * We don't have one... - * * Try to infer a preferred file system for this partition, given its ID. * * WARNING: This is partly a hack, since partitions with the same ID can @@ -224,131 +257,313 @@ GetFileSystem( * On the contrary, for unformatted partitions with a given ID, the * following code is OK. */ - if ((PartEntry->PartitionType == PARTITION_FAT_12) || - (PartEntry->PartitionType == PARTITION_FAT_16) || - (PartEntry->PartitionType == PARTITION_HUGE ) || - (PartEntry->PartitionType == PARTITION_XINT13) || - (PartEntry->PartitionType == PARTITION_FAT32 ) || - (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) + if ((PartitionType == PARTITION_FAT_12) || + (PartitionType == PARTITION_FAT_16) || + (PartitionType == PARTITION_HUGE ) || + (PartitionType == PARTITION_XINT13)) { - FileSystemName = L"FAT"; + /* FAT12 or FAT16 */ + Status = RtlStringCbCopyW(FileSystemName, FileSystemNameSize, L"FAT"); } - else if (PartEntry->PartitionType == PARTITION_LINUX) + else if ((PartitionType == PARTITION_FAT32) || + (PartitionType == PARTITION_FAT32_XINT13)) + { + Status = RtlStringCbCopyW(FileSystemName, FileSystemNameSize, L"FAT32"); + } + else if (PartitionType == PARTITION_LINUX) { // WARNING: See the warning above. /* Could also be EXT2/3/4, ReiserFS, ... */ - FileSystemName = L"BTRFS"; + Status = RtlStringCbCopyW(FileSystemName, FileSystemNameSize, L"BTRFS"); } - else if (PartEntry->PartitionType == PARTITION_IFS) + else if (PartitionType == PARTITION_IFS) { // WARNING: See the warning above. /* Could also be HPFS */ - FileSystemName = L"NTFS"; + Status = RtlStringCbCopyW(FileSystemName, FileSystemNameSize, L"NTFS"); } Quit: - // HACK: WARNING: We cannot write on this FS yet! - if (FileSystemName) + if (*FileSystemName) { - if (PartEntry->PartitionType == PARTITION_IFS) - DPRINT1("Recognized file system %S that doesn't support write support yet!\n", FileSystemName); + // WARNING: We cannot write on this FS yet! + if (PartitionType == PARTITION_IFS) + { + DPRINT1("Recognized file system '%S' that doesn't have write support yet!\n", + FileSystemName); + } } - DPRINT1("GetFileSystem -- PartitionType: 0x%02X ; FileSystemName (guessed): %S\n", - PartEntry->PartitionType, FileSystemName ? FileSystemName : L"None"); + DPRINT1("InferFileSystem -- PartitionType: 0x%02X ; FileSystem (guessed): %S\n", + PartitionType, *FileSystemName ? FileSystemName : L"None"); - if (FileSystemName) - CurrentFileSystem = GetFileSystemByName(FileSystemName); + return Status; +} - return CurrentFileSystem; +NTSTATUS +InferFileSystem( + IN PCWSTR Partition, + IN UCHAR PartitionType, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize) +{ + NTSTATUS Status; + UNICODE_STRING PartitionPath; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE PartitionHandle; + IO_STATUS_BLOCK IoStatusBlock; + + /* Open the partition */ + RtlInitUnicodeString(&PartitionPath, Partition); + InitializeObjectAttributes(&ObjectAttributes, + &PartitionPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&PartitionHandle, + FILE_GENERIC_READ /* | SYNCHRONIZE */, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + 0 /* FILE_SYNCHRONOUS_IO_NONALERT */); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open partition '%wZ', Status 0x%08lx\n", &PartitionPath, Status); + return Status; + } + + /* Retrieve the FS */ + Status = InferFileSystemByHandle(PartitionHandle, + PartitionType, + FileSystemName, + FileSystemNameSize); + + /* Close the partition */ + NtClose(PartitionHandle); + + return Status; } +/** ChkdskEx() **/ +NTSTATUS +ChkdskFileSystem_UStr( + IN PUNICODE_STRING DriveRoot, + IN PCWSTR FileSystemName, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback) +{ + PFILE_SYSTEM FileSystem; -// -// Formatting routines -// + FileSystem = GetFileSystemByName(FileSystemName); -BOOLEAN -PreparePartitionForFormatting( - IN struct _PARTENTRY* PartEntry, - IN PFILE_SYSTEM FileSystem) + if (!FileSystem || !FileSystem->ChkdskFunc) + { + // BOOLEAN Argument = FALSE; + // Callback(DONE, 0, &Argument); + return STATUS_NOT_SUPPORTED; + } + + return FileSystem->ChkdskFunc(DriveRoot, + FixErrors, + Verbose, + CheckOnlyIfDirty, + ScanDrive, + Callback); +} + +NTSTATUS +ChkdskFileSystem( + IN PCWSTR DriveRoot, + IN PCWSTR FileSystemName, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback) +{ + UNICODE_STRING DriveRootU; + + RtlInitUnicodeString(&DriveRootU, DriveRoot); + return ChkdskFileSystem_UStr(&DriveRootU, + FileSystemName, + FixErrors, + Verbose, + CheckOnlyIfDirty, + ScanDrive, + Callback); +} + + +/** FormatEx() **/ +NTSTATUS +FormatFileSystem_UStr( + IN PUNICODE_STRING DriveRoot, + IN PCWSTR FileSystemName, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PUNICODE_STRING Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback) { - if (!FileSystem) + PFILE_SYSTEM FileSystem; + + FileSystem = GetFileSystemByName(FileSystemName); + + if (!FileSystem || !FileSystem->FormatFunc) { - DPRINT1("No file system specified?\n"); - return FALSE; + // BOOLEAN Argument = FALSE; + // Callback(DONE, 0, &Argument); + return STATUS_NOT_SUPPORTED; } - if (wcscmp(FileSystem->FileSystemName, L"FAT") == 0) + return FileSystem->FormatFunc(DriveRoot, + MediaFlag, + Label, + QuickFormat, + ClusterSize, + Callback); +} + +NTSTATUS +FormatFileSystem( + IN PCWSTR DriveRoot, + IN PCWSTR FileSystemName, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PCWSTR Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback) +{ + UNICODE_STRING DriveRootU; + UNICODE_STRING LabelU; + + RtlInitUnicodeString(&DriveRootU, DriveRoot); + RtlInitUnicodeString(&LabelU, Label); + + return FormatFileSystem_UStr(&DriveRootU, + FileSystemName, + MediaFlag, + &LabelU, + QuickFormat, + ClusterSize, + Callback); +} + + +UCHAR +FileSystemToPartitionType( + IN PCWSTR FileSystem, + IN PULARGE_INTEGER StartSector, + IN PULARGE_INTEGER SectorCount) +{ + ASSERT(FileSystem && StartSector && SectorCount); + + if (wcsicmp(FileSystem, L"FAT") == 0 || + wcsicmp(FileSystem, L"FAT32") == 0 || + wcsicmp(FileSystem, L"RAW") == 0) { - if (PartEntry->SectorCount.QuadPart < 8192) + if (SectorCount->QuadPart < 8192) { /* FAT12 CHS partition (disk is smaller than 4.1MB) */ - SetPartitionType(PartEntry, PARTITION_FAT_12); + return PARTITION_FAT_12; } - else if (PartEntry->StartSector.QuadPart < 1450560) + else if (StartSector->QuadPart < 1450560) { /* Partition starts below the 8.4GB boundary ==> CHS partition */ - if (PartEntry->SectorCount.QuadPart < 65536) + if (SectorCount->QuadPart < 65536) { /* FAT16 CHS partition (partition size < 32MB) */ - SetPartitionType(PartEntry, PARTITION_FAT_16); + return PARTITION_FAT_16; } - else if (PartEntry->SectorCount.QuadPart < 1048576) + else if (SectorCount->QuadPart < 1048576) { /* FAT16 CHS partition (partition size < 512MB) */ - SetPartitionType(PartEntry, PARTITION_HUGE); + return PARTITION_HUGE; } else { /* FAT32 CHS partition (partition size >= 512MB) */ - SetPartitionType(PartEntry, PARTITION_FAT32); + return PARTITION_FAT32; } } else { /* Partition starts above the 8.4GB boundary ==> LBA partition */ - if (PartEntry->SectorCount.QuadPart < 1048576) + if (SectorCount->QuadPart < 1048576) { /* FAT16 LBA partition (partition size < 512MB) */ - SetPartitionType(PartEntry, PARTITION_XINT13); + return PARTITION_XINT13; } else { /* FAT32 LBA partition (partition size >= 512MB) */ - SetPartitionType(PartEntry, PARTITION_FAT32_XINT13); + return PARTITION_FAT32_XINT13; } } } - else if (wcscmp(FileSystem->FileSystemName, L"BTRFS") == 0) + else if (wcsicmp(FileSystem, L"NTFS") == 0) { - SetPartitionType(PartEntry, PARTITION_LINUX); + return PARTITION_IFS; } -#if 0 - else if (wcscmp(FileSystem->FileSystemName, L"EXT2") == 0) + else if (wcsicmp(FileSystem, L"BTRFS") == 0 || + wcsicmp(FileSystem, L"EXT2") == 0 || + wcsicmp(FileSystem, L"EXT3") == 0 || + wcsicmp(FileSystem, L"EXT4") == 0 || + wcsicmp(FileSystem, L"FFS") == 0 || + wcsicmp(FileSystem, L"REISERFS") == 0) { - SetPartitionType(PartEntry, PARTITION_LINUX); + return PARTITION_LINUX; } - else if (wcscmp(FileSystem->FileSystemName, L"NTFS") == 0) + else { - SetPartitionType(PartEntry, PARTITION_IFS); + /* Unknown file system */ + DPRINT1("Unknown file system '%S'\n", FileSystem); + return PARTITION_ENTRY_UNUSED; } -#endif - else +} + + +// +// Formatting routines +// + +BOOLEAN +PreparePartitionForFormatting( + IN struct _PARTENTRY* PartEntry, + IN PCWSTR FileSystemName) +{ + UCHAR PartitionType; + + if (!FileSystemName || !*FileSystemName) + { + DPRINT1("No file system specified?\n"); + return FALSE; + } + + PartitionType = FileSystemToPartitionType(FileSystemName, + &PartEntry->StartSector, + &PartEntry->SectorCount); + if (PartitionType == PARTITION_ENTRY_UNUSED) { - /* Unknown file system? */ - DPRINT1("Unknown file system \"%S\"?\n", FileSystem->FileSystemName); + /* Unknown file system */ + DPRINT1("Unknown file system '%S'\n", FileSystemName); return FALSE; } + SetPartitionType(PartEntry, PartitionType); + // // FIXME: Do this now, or after the partition was actually formatted?? // /* Set the new partition's file system proper */ - PartEntry->FormatState = Formatted; // Well... This may be set after the real formatting takes place (in which case we should change the FormatState to another value) - PartEntry->FileSystem = FileSystem; + RtlStringCbCopyW(PartEntry->FileSystem, + sizeof(PartEntry->FileSystem), + FileSystemName); return TRUE; } diff --git a/base/setup/lib/fsutil.h b/base/setup/lib/fsutil.h index bb10c4a0f6..f6c83e953f 100644 --- a/base/setup/lib/fsutil.h +++ b/base/setup/lib/fsutil.h @@ -2,40 +2,113 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Filesystem support functions - * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Copyright 2017-2018 Hermes Belusca-Maito + * COPYRIGHT: Copyright 2003-2019 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Copyright 2017-2019 Hermes Belusca-Maito */ #pragma once #include <fmifs/fmifs.h> -typedef struct _FILE_SYSTEM -{ - PCWSTR FileSystemName; - FORMATEX FormatFunc; - CHKDSKEX ChkdskFunc; -} FILE_SYSTEM, *PFILE_SYSTEM; +/** QueryAvailableFileSystemFormat() **/ +BOOLEAN +GetRegisteredFileSystems( + IN ULONG Index, + OUT PCWSTR* FileSystemName); -PFILE_SYSTEM -GetRegisteredFileSystems(OUT PULONG Count); +NTSTATUS +GetFileSystemNameByHandle( + IN HANDLE PartitionHandle, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize); -PFILE_SYSTEM -GetFileSystemByName( - // IN PFILE_SYSTEM_LIST List, - IN PCWSTR FileSystemName); +NTSTATUS +GetFileSystemName_UStr( + IN PUNICODE_STRING PartitionPath, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize); -struct _PARTENTRY; // Defined in partlist.h +NTSTATUS +GetFileSystemName( + IN PCWSTR Partition, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize); + +NTSTATUS +InferFileSystemByHandle( + IN HANDLE PartitionHandle, + IN UCHAR PartitionType, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize); + +NTSTATUS +InferFileSystem( + IN PCWSTR Partition, + IN UCHAR PartitionType, + IN OUT PWSTR FileSystemName, + IN SIZE_T FileSystemNameSize); + + +/** ChkdskEx() **/ +NTSTATUS +ChkdskFileSystem_UStr( + IN PUNICODE_STRING DriveRoot, + IN PCWSTR FileSystemName, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback); + +NTSTATUS +ChkdskFileSystem( + IN PCWSTR DriveRoot, + IN PCWSTR FileSystemName, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback); -PFILE_SYSTEM -GetFileSystem( - // IN PFILE_SYSTEM_LIST FileSystemList, - IN struct _PARTENTRY* PartEntry); +/** FormatEx() **/ +NTSTATUS +FormatFileSystem_UStr( + IN PUNICODE_STRING DriveRoot, + IN PCWSTR FileSystemName, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PUNICODE_STRING Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback); + +NTSTATUS +FormatFileSystem( + IN PCWSTR DriveRoot, + IN PCWSTR FileSystemName, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PCWSTR Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback); + + +UCHAR +FileSystemToPartitionType( + IN PCWSTR FileSystem, + IN PULARGE_INTEGER StartSector, + IN PULARGE_INTEGER SectorCount); + + +// +// Formatting routines +// + +struct _PARTENTRY; // Defined in partlist.h BOOLEAN PreparePartitionForFormatting( IN struct _PARTENTRY* PartEntry, - IN PFILE_SYSTEM FileSystem); + IN PCWSTR FileSystemName); /* EOF */ diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index aee3c3c161..5c20c4bf36 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -2,7 +2,8 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Partition list functions - * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2003-2019 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Copyright 2018-2019 Hermes Belusca-Maito */ #include "precomp.h" @@ -752,18 +753,19 @@ CreateInsertBlankRegion( NewPartEntry->DiskEntry = DiskEntry; - NewPartEntry->IsPartitioned = FALSE; - NewPartEntry->FormatState = Unformatted; - NewPartEntry->FileSystem = NULL; - NewPartEntry->StartSector.QuadPart = StartSector; NewPartEntry->SectorCount.QuadPart = SectorCount; + NewPartEntry->IsPartitioned = FALSE; + NewPartEntry->PartitionType = PARTITION_ENTRY_UNUSED; + NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystem[0] = L'\0'; + DPRINT1("First Sector : %I64u\n", NewPartEntry->StartSector.QuadPart); DPRINT1("Last Sector : %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); - /* Insert the table into the list */ + /* Insert the new entry into the list */ InsertTailList(ListHead, &NewPartEntry->ListEntry); return NewPartEntry; @@ -788,17 +790,8 @@ InitializePartitionEntry( { DPRINT1("Convert existing partition entry\n"); - /* Convert current entry to 'new (unformatted)' */ - PartEntry->IsPartitioned = TRUE; - PartEntry->New = TRUE; - PartEntry->PartitionType = PARTITION_ENTRY_UNUSED; - PartEntry->FormatState = Unformatted; - PartEntry->FileSystem = NULL; - PartEntry->AutoCreate = AutoCreate; - PartEntry->BootIndicator = FALSE; - PartEntry->LogicalPartition = FALSE; - NewPartEntry = PartEntry; + NewPartEntry->AutoCreate = AutoCreate; } else { @@ -811,28 +804,32 @@ InitializePartitionEntry( if (NewPartEntry == NULL) return NULL; - /* Insert the new entry into the list */ - InsertTailList(&PartEntry->ListEntry, - &NewPartEntry->ListEntry); - NewPartEntry->DiskEntry = DiskEntry; - NewPartEntry->IsPartitioned = TRUE; - NewPartEntry->New = TRUE; - NewPartEntry->PartitionType = PARTITION_ENTRY_UNUSED; - NewPartEntry->FormatState = Unformatted; - NewPartEntry->FileSystem = NULL; - NewPartEntry->BootIndicator = FALSE; - NewPartEntry->LogicalPartition = FALSE; - NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; PartEntry->StartSector.QuadPart = NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart; PartEntry->SectorCount.QuadPart -= (PartEntry->StartSector.QuadPart - NewPartEntry->StartSector.QuadPart); + + /* Insert the new entry into the list */ + InsertTailList(&PartEntry->ListEntry, &NewPartEntry->ListEntry); } + /* Create entry as 'New (Unformatted)' */ + NewPartEntry->New = TRUE; + NewPartEntry->IsPartitioned = TRUE; + + NewPartEntry->PartitionType = FileSystemToPartitionType(L"RAW", &NewPartEntry->StartSector, &NewPartEntry->SectorCount); + ASSERT(NewPartEntry->PartitionType != PARTITION_ENTRY_UNUSED); + + NewPartEntry->FormatState = Unformatted; + NewPartEntry->FileSystem[0] = L'\0'; + // NewPartEntry->AutoCreate = AutoCreate; + NewPartEntry->BootIndicator = FALSE; + NewPartEntry->LogicalPartition = FALSE; + DPRINT1("First Sector : %I64u\n", NewPartEntry->StartSector.QuadPart); DPRINT1("Last Sector : %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); @@ -852,10 +849,10 @@ AddPartitionToDisk( NTSTATUS Status; PPARTITION_INFORMATION PartitionInfo; PPARTENTRY PartEntry; - HANDLE FileHandle; + HANDLE PartitionHandle; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - WCHAR Buffer[MAX_PATH]; + WCHAR PathBuffer[MAX_PATH]; UNICODE_STRING Name; UCHAR LabelBuffer[sizeof(FILE_FS_VOLUME_INFORMATION) + 256 * sizeof(WCHAR)]; PFILE_FS_VOLUME_INFORMATION LabelInfo = (PFILE_FS_VOLUME_INFORMATION)LabelBuffer; @@ -889,10 +886,16 @@ AddPartitionToDisk( PartEntry->PartitionNumber = PartitionInfo->PartitionNumber; PartEntry->PartitionIndex = PartitionIndex; + /* Specify the partition as initially unformatted */ + PartEntry->FormatState = Unformatted; + PartEntry->FileSystem[0] = L'\0'; + + /* Initialize the partition volume label */ + RtlZeroMemory(PartEntry->VolumeLabel, sizeof(PartEntry->VolumeLabel)); + if (IsContainerPartition(PartEntry->PartitionType)) { PartEntry->FormatState = Unformatted; - PartEntry->FileSystem = NULL; if (LogicalPartition == FALSE && DiskEntry->ExtendedPartition == NULL) DiskEntry->ExtendedPartition = PartEntry; @@ -901,67 +904,81 @@ AddPartitionToDisk( { ASSERT(PartitionInfo->RecognizedPartition); - PartEntry->FileSystem = GetFileSystem(PartEntry); - if (PartEntry->FileSystem) - PartEntry->FormatState = Preformatted; - else - PartEntry->FormatState = Unformatted; - // PartEntry->FormatState = UnknownFormat; - } - else - { - /* Unknown partition, hence unknown partition format (may or may not be actually formatted) */ - PartEntry->FormatState = UnknownFormat; - } + /* Open the volume, ignore any errors */ + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlInitUnicodeString(&Name, PathBuffer); - /* Initialize the partition volume label */ - RtlZeroMemory(PartEntry->VolumeLabel, sizeof(PartEntry->VolumeLabel)); - - /* Open the volume, ignore any errors */ - RtlStringCchPrintfW(Buffer, ARRAYSIZE(Buffer), - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskEntry->DiskNumber, - PartEntry->PartitionNumber); - RtlInitUnicodeString(&Name, Buffer); + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); + PartitionHandle = NULL; + Status = NtOpenFile(&PartitionHandle, + FILE_READ_DATA | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenFile() failed, Status 0x%08lx\n", Status); + } - Status = NtOpenFile(&FileHandle, - FILE_READ_DATA | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT); - if (NT_SUCCESS(Status)) - { - /* Retrieve the partition volume label */ - Status = NtQueryVolumeInformationFile(FileHandle, - &IoStatusBlock, - &LabelBuffer, - sizeof(LabelBuffer), - FileFsVolumeInformation); - /* Close the handle */ - NtClose(FileHandle); - - /* Check for success */ - if (NT_SUCCESS(Status)) + if (/* NT_SUCCESS(Status) && */ PartitionHandle) + { + /* We don't have a FS, try to guess one */ + Status = InferFileSystemByHandle(PartitionHandle, + PartEntry->PartitionType, + PartEntry->FileSystem, + sizeof(PartEntry->FileSystem)); + if (!NT_SUCCESS(Status)) + DPRINT1("InferFileSystemByHandle() failed, Status 0x%08lx\n", Status); + } + if (*PartEntry->FileSystem) { - /* Copy the (possibly truncated) volume label and NULL-terminate it */ - RtlStringCbCopyNW(PartEntry->VolumeLabel, sizeof(PartEntry->VolumeLabel), - LabelInfo->VolumeLabel, LabelInfo->VolumeLabelLength); + if (wcsicmp(PartEntry->FileSystem, L"RAW") == 0) + PartEntry->FormatState = Unformatted; + else + PartEntry->FormatState = Preformatted; } else { - DPRINT1("NtQueryVolumeInformationFile() failed, Status 0x%08lx\n", Status); + PartEntry->FormatState = UnknownFormat; + } + + /* Retrieve the partition volume label */ + if (PartitionHandle) + { + Status = NtQueryVolumeInformationFile(PartitionHandle, + &IoStatusBlock, + &LabelBuffer, + sizeof(LabelBuffer), + FileFsVolumeInformation); + if (NT_SUCCESS(Status)) + { + /* Copy the (possibly truncated) volume label and NULL-terminate it */ + RtlStringCbCopyNW(PartEntry->VolumeLabel, sizeof(PartEntry->VolumeLabel), + LabelInfo->VolumeLabel, LabelInfo->VolumeLabelLength); + } + else + { + DPRINT1("NtQueryVolumeInformationFile() failed, Status 0x%08lx\n", Status); + } } + + /* Close the partition */ + if (PartitionHandle) + NtClose(PartitionHandle); } else { - DPRINT1("NtOpenFile() failed, Status 0x%08lx\n", Status); + /* Unknown partition, hence unknown partition format (may or may not be actually formatted) */ + PartEntry->FormatState = UnknownFormat; } InsertDiskRegion(DiskEntry, PartEntry, LogicalPartition); @@ -2784,7 +2801,7 @@ DismountVolume( IsContainerPartition(PartEntry->PartitionType) || !IsRecognizedPartition(PartEntry->PartitionType) || PartEntry->FormatState == Unformatted /* || PartEntry->FormatState == UnknownFormat */ || - PartEntry->FileSystem == NULL || + !*PartEntry->FileSystem || PartEntry->PartitionNumber == 0) { /* The partition is not mounted, so just return success */ @@ -2981,7 +2998,7 @@ DeleteCurrentPartition( PartEntry->IsPartitioned = FALSE; PartEntry->PartitionType = PARTITION_ENTRY_UNUSED; PartEntry->FormatState = Unformatted; - PartEntry->FileSystem = NULL; + PartEntry->FileSystem[0] = L'\0'; PartEntry->DriveLetter = 0; PartEntry->OnDiskPartitionNumber = 0; PartEntry->PartitionNumber = 0; @@ -2993,6 +3010,84 @@ DeleteCurrentPartition( AssignDriveLetters(List); } +static +BOOLEAN +IsSupportedActivePartition( + IN PPARTENTRY PartEntry) +{ + /* Check the type and the filesystem of this partition */ + + /* + * We do not support extended partition containers (on MBR disks) marked + * as active, and containing code inside their extended boot records. + */ + if (IsContainerPartition(PartEntry->PartitionType)) + { + DPRINT1("System partition %lu in disk %lu is an extended partition container?!\n", + PartEntry->PartitionNumber, PartEntry->DiskEntry->DiskNumber); + return FALSE; + } + + /* + * ADDITIONAL CHECKS / BIG HACK: + * + * Retrieve its file system and check whether we have + * write support for it. If that is the case we are fine + * and we can use it directly. However if we don't have + * write support we will need to change the active system + * partition. + * + * NOTE that this is completely useless on architectures + * where a real system partition is required, as on these + * architectures the partition uses the FAT FS, for which + * we do have write support. + * NOTE also that for those architectures looking for a + * partition boot indicator is insufficient. + */ + if ((PartEntry->FormatState == Unformatted ) || + (PartEntry->FormatState == Preformatted) || + (PartEntry->FormatState == Formatted )) + { + ASSERT(*PartEntry->FileSystem); + + /* NOTE: Please keep in sync with the RegisteredFileSystems list! */ + if (wcsicmp(PartEntry->FileSystem, L"FAT") == 0 || + wcsicmp(PartEntry->FileSystem, L"FAT32") == 0 || + // wcsicmp(PartEntry->FileSystem, L"NTFS") == 0 || + wcsicmp(PartEntry->FileSystem, L"BTRFS") == 0 || + wcsicmp(PartEntry->FileSystem, L"RAW") == 0) + { + return TRUE; + } + else + { + // WARNING: We cannot write on this FS yet! + DPRINT1("Recognized file system '%S' that doesn't have write support yet!\n", + PartEntry->FileSystem); + return FALSE; + } + } + else // if (PartEntry->FormatState == UnknownFormat) + { + ASSERT(!*PartEntry->FileSystem); + + DPRINT1("System partition %lu in disk %lu with no or unknown FS?!\n", + PartEntry->PartitionNumber, PartEntry->DiskEntry->DiskNumber); + return FALSE; + } + + // HACK: WARNING: We cannot write on this FS yet! + // See fsutil.c:InferFileSystem() + if (PartEntry->PartitionType == PARTITION_IFS) + { + DPRINT1("Recognized file system '%S' that doesn't have write support yet!\n", + PartEntry->FileSystem); + return FALSE; + } + + return TRUE; +} + VOID CheckActiveSystemPartition( IN PPARTLIST List) @@ -3001,8 +3096,6 @@ CheckActiveSystemPartition( PPARTENTRY PartEntry; PLIST_ENTRY ListEntry; - PFILE_SYSTEM FileSystem; - /* Check for empty disk list */ if (IsListEmpty(&List->DiskListHead)) { @@ -3154,36 +3247,9 @@ CheckActiveSystemPartition( /* Save it */ List->OriginalSystemPartition = List->SystemPartition; - /* - * ADDITIONAL CHECKS / BIG HACK: - * - * Retrieve its file system and check whether we have - * write support for it. If that is the case we are fine - * and we can use it directly. However if we don't have - * write support we will need to change the active system - * partition. - * - * NOTE that this is completely useless on architectures - * where a real system partition is required, as on these - * architectures the partition uses the FAT FS, for which - * we do have write support. - * NOTE also that for those architectures looking for a - * partition boot indicator is insufficient. - */ - FileSystem = GetFileSystem(List->OriginalSystemPartition); - if (FileSystem == NULL) - { - DPRINT1("System partition %lu in disk %lu with no FS?!\n", - List->OriginalSystemPartition->PartitionNumber, - List->OriginalSystemPartition->DiskEntry->DiskNumber); - goto FindAndUseAlternativeSystemPartition; - } - // HACK: WARNING: We cannot write on this FS yet! - // See fsutil.c:GetFileSystem() - if (List->OriginalSystemPartition->PartitionType == PARTITION_IFS) + /* If we get a candidate active partition, validate it */ + if (!IsSupportedActivePartition(List->OriginalSystemPartition)) { - DPRINT1("Recognized file system %S that doesn't support write support yet!\n", - FileSystem->FileSystemName); goto FindAndUseAlternativeSystemPartition; } diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index a27454b4aa..57873a444e 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -2,7 +2,8 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Partition list functions - * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2003-2019 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Copyright 2018-2019 Hermes Belusca-Maito */ #pragma once @@ -30,8 +31,6 @@ typedef enum _FORMATSTATE Formatted } FORMATSTATE, *PFORMATSTATE; -struct _FILE_SYSTEM; - typedef struct _PARTENTRY { LIST_ENTRY ListEntry; @@ -52,13 +51,16 @@ typedef struct _PARTENTRY WCHAR DriveLetter; WCHAR VolumeLabel[20]; - // CHAR FileSystemName[9]; // NOTE: Superseded by the FileSystem member + WCHAR FileSystem[MAX_PATH+1]; + FORMATSTATE FormatState; BOOLEAN LogicalPartition; /* Partition is partitioned disk space */ BOOLEAN IsPartitioned; +/** The following three properties may be replaced by flags **/ + /* Partition is new, table does not exist on disk yet */ BOOLEAN New; @@ -68,9 +70,6 @@ typedef struct _PARTENTRY /* Partition must be checked */ BOOLEAN NeedsCheck; - FORMATSTATE FormatState; - struct _FILE_SYSTEM* FileSystem; - } PARTENTRY, *PPARTENTRY; diff --git a/base/setup/usetup/chkdsk.c b/base/setup/usetup/chkdsk.c index 26f9b79c58..615e7022c0 100644 --- a/base/setup/usetup/chkdsk.c +++ b/base/setup/usetup/chkdsk.c @@ -56,14 +56,9 @@ ChkdskCallback( NTSTATUS ChkdskPartition( IN PUNICODE_STRING DriveRoot, - /*IN PFILE_SYSTEM_ITEM FileSystemItem*/ - IN PFILE_SYSTEM FileSystem) + IN PCWSTR FileSystemName) { NTSTATUS Status; - // PFILE_SYSTEM FileSystem = FileSystemItem->FileSystem; - - if (!FileSystem || !FileSystem->ChkdskFunc) - return STATUS_NOT_SUPPORTED; ChkdskProgressBar = CreateProgressBar(6, yScreen - 14, @@ -76,12 +71,13 @@ ChkdskPartition( ProgressSetStepCount(ChkdskProgressBar, 100); - Status = FileSystem->ChkdskFunc(DriveRoot, - TRUE, /* FixErrors */ - FALSE, /* Verbose */ - TRUE, /* CheckOnlyIfDirty */ - FALSE, /* ScanDrive */ - ChkdskCallback); /* Callback */ + Status = ChkdskFileSystem_UStr(DriveRoot, + FileSystemName, + TRUE, /* FixErrors */ + FALSE, /* Verbose */ + TRUE, /* CheckOnlyIfDirty */ + FALSE, /* ScanDrive */ + ChkdskCallback); /* Callback */ DestroyProgressBar(ChkdskProgressBar); ChkdskProgressBar = NULL; diff --git a/base/setup/usetup/chkdsk.h b/base/setup/usetup/chkdsk.h index 0eb2bed372..3207d2f7f6 100644 --- a/base/setup/usetup/chkdsk.h +++ b/base/setup/usetup/chkdsk.h @@ -28,7 +28,6 @@ NTSTATUS ChkdskPartition( IN PUNICODE_STRING DriveRoot, - /*IN PFILE_SYSTEM_ITEM FileSystemItem*/ - IN PFILE_SYSTEM FileSystem); + IN PCWSTR FileSystemName); /* EOF */ diff --git a/base/setup/usetup/format.c b/base/setup/usetup/format.c index db8c14dcca..08e029ce54 100644 --- a/base/setup/usetup/format.c +++ b/base/setup/usetup/format.c @@ -88,13 +88,10 @@ FormatCallback( NTSTATUS FormatPartition( IN PUNICODE_STRING DriveRoot, - IN PFILE_SYSTEM_ITEM FileSystemItem) + IN PCWSTR FileSystemName, + IN BOOLEAN QuickFormat) { NTSTATUS Status; - PFILE_SYSTEM FileSystem = FileSystemItem->FileSystem; - - if (!FileSystem || !FileSystem->FormatFunc) - return STATUS_NOT_SUPPORTED; FormatProgressBar = CreateProgressBar(6, yScreen - 14, @@ -107,12 +104,13 @@ FormatPartition( ProgressSetStepCount(FormatProgressBar, 100); - Status = FileSystem->FormatFunc(DriveRoot, - FMIFS_HARDDISK, /* MediaFlag */ - NULL, /* Label */ - FileSystemItem->QuickFormat, /* QuickFormat */ - 0, /* ClusterSize */ - FormatCallback); /* Callback */ + Status = FormatFileSystem_UStr(DriveRoot, + FileSystemName, + FMIFS_HARDDISK, /* MediaFlag */ + NULL, /* Label */ + QuickFormat, /* QuickFormat */ + 0, /* ClusterSize */ + FormatCallback); /* Callback */ DestroyProgressBar(FormatProgressBar); FormatProgressBar = NULL; diff --git a/base/setup/usetup/format.h b/base/setup/usetup/format.h index 3032f49651..b84ae57559 100644 --- a/base/setup/usetup/format.h +++ b/base/setup/usetup/format.h @@ -29,6 +29,7 @@ NTSTATUS FormatPartition( IN PUNICODE_STRING DriveRoot, - IN PFILE_SYSTEM_ITEM FileSystemItem); + IN PCWSTR FileSystemName, + IN BOOLEAN QuickFormat); /* EOF */ diff --git a/base/setup/usetup/fslist.c b/base/setup/usetup/fslist.c index 6aa8c4e193..75c9fbfaf0 100644 --- a/base/setup/usetup/fslist.c +++ b/base/setup/usetup/fslist.c @@ -34,8 +34,7 @@ static VOID AddProvider( IN OUT PFILE_SYSTEM_LIST List, - IN PCWSTR FileSystemName, // Redundant, I need to check whether this is reaaaaally needed.... - IN PFILE_SYSTEM FileSystem) + IN PCWSTR FileSystem) { PFILE_SYSTEM_ITEM Item; @@ -43,7 +42,6 @@ AddProvider( if (!Item) return; - Item->FileSystemName = FileSystemName; Item->FileSystem = FileSystem; Item->QuickFormat = TRUE; InsertTailList(&List->ListHead, &Item->ListEntry); @@ -55,7 +53,6 @@ AddProvider( if (!Item) return; - Item->FileSystemName = FileSystemName; Item->FileSystem = FileSystem; Item->QuickFormat = FALSE; InsertTailList(&List->ListHead, &Item->ListEntry); @@ -63,19 +60,21 @@ AddProvider( static VOID InitializeFileSystemList( - IN PFILE_SYSTEM_LIST List) + IN PFILE_SYSTEM_LIST List, + IN BOOLEAN ForceFormat) { - ULONG Count; - PFILE_SYSTEM FileSystems; + ULONG Index = 0; + PCWSTR FileSystemName; - FileSystems = GetRegisteredFileSystems(&Count); - if (!FileSystems || Count == 0) - return; + while (GetRegisteredFileSystems(Index++, &FileSystemName)) + { + AddProvider(List, FileSystemName); + } - while (Count--) + if (!ForceFormat) { - AddProvider(List, FileSystems->FileSystemName, FileSystems); - ++FileSystems; + /* Add the 'Keep existing filesystem' dummy provider */ + AddProvider(List, NULL); } } @@ -99,19 +98,14 @@ CreateFileSystemList( List->Selected = NULL; InitializeListHead(&List->ListHead); - InitializeFileSystemList(List); - if (!ForceFormat) - { - /* Add the 'Keep existing filesystem' dummy provider */ - AddProvider(List, NULL, NULL); - } + InitializeFileSystemList(List, ForceFormat); /* Search for SelectFileSystem in list */ ListEntry = List->ListHead.Flink; while (ListEntry != &List->ListHead) { Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); - if (Item->FileSystemName && wcscmp(SelectFileSystem, Item->FileSystemName) == 0) + if (Item->FileSystem && wcsicmp(SelectFileSystem, Item->FileSystem) == 0) { List->Selected = Item; break; @@ -171,12 +165,12 @@ DrawFileSystemList( coPos, &Written); - if (Item->FileSystemName) + if (Item->FileSystem) { - if (Item->QuickFormat) - snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK1), Item->FileSystemName); - else - snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK2), Item->FileSystemName); + snprintf(Buffer, sizeof(Buffer), + MUIGetString(Item->QuickFormat ? STRING_FORMATDISK1 + : STRING_FORMATDISK2), + Item->FileSystem); } else { @@ -184,13 +178,17 @@ DrawFileSystemList( } if (ListEntry == &List->Selected->ListEntry) + { CONSOLE_SetInvertedTextXY(List->Left, List->Top + (SHORT)Index, Buffer); + } else + { CONSOLE_SetTextXY(List->Left, List->Top + (SHORT)Index, Buffer); + } Index++; ListEntry = ListEntry->Flink; } diff --git a/base/setup/usetup/fslist.h b/base/setup/usetup/fslist.h index d5f8b4c5ce..fc4a8b2f2d 100644 --- a/base/setup/usetup/fslist.h +++ b/base/setup/usetup/fslist.h @@ -16,7 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/fslist.h * PURPOSE: Filesystem list functions @@ -30,8 +31,7 @@ typedef struct _FILE_SYSTEM_ITEM { LIST_ENTRY ListEntry; - PCWSTR FileSystemName; /* Not owned by the item */ // Redundant, I need to check whether this is reaaaaally needed.... - PFILE_SYSTEM FileSystem; + PCWSTR FileSystem; BOOLEAN QuickFormat; } FILE_SYSTEM_ITEM, *PFILE_SYSTEM_ITEM; diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index f10effde10..b8df7c9261 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -22,7 +22,7 @@ * FILE: base/setup/usetup/usetup.c * PURPOSE: Text-mode setup * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Herv� Poussineau (hpoussin(a)reactos.org) + * Hervé Poussineau (hpoussin(a)reactos.org) */ #include <usetup.h> @@ -3071,7 +3071,8 @@ FormatPartitionPage(PINPUT_RECORD Ir) if (SelectedFileSystem->FileSystem) { Status = FormatPartition(&PartitionRootPath, - SelectedFileSystem); + SelectedFileSystem->FileSystem, + SelectedFileSystem->QuickFormat); if (Status == STATUS_NOT_SUPPORTED) { sprintf(Buffer, @@ -3079,7 +3080,7 @@ FormatPartitionPage(PINPUT_RECORD Ir) "\n" " \x07 Press ENTER to continue Setup.\n" " \x07 Press F3 to quit Setup.", - SelectedFileSystem->FileSystem->FileSystemName); + SelectedFileSystem->FileSystem); PopupError(Buffer, MUIGetString(STRING_QUITCONTINUE), @@ -3147,7 +3148,6 @@ CheckFileSystemPage(PINPUT_RECORD Ir) NTSTATUS Status; PDISKENTRY DiskEntry; PPARTENTRY PartEntry; - PFILE_SYSTEM CurrentFileSystem; UNICODE_STRING PartitionRootPath; WCHAR PathBuffer[MAX_PATH]; CHAR Buffer[MAX_PATH]; @@ -3163,38 +3163,44 @@ CheckFileSystemPage(PINPUT_RECORD Ir) return INSTALL_DIRECTORY_PAGE; } - /* Set PartitionRootPath */ - RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskEntry->DiskNumber, - PartEntry->PartitionNumber); - RtlInitUnicodeString(&PartitionRootPath, PathBuffer); - DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); - CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHECKINGPART)); CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - CurrentFileSystem = PartEntry->FileSystem; - DPRINT1("CheckFileSystemPage -- PartitionType: 0x%02X ; FileSystemName: %S\n", - PartEntry->PartitionType, (CurrentFileSystem ? CurrentFileSystem->FileSystemName : L"n/a")); + DPRINT1("CheckFileSystemPage -- PartitionType: 0x%02X ; FileSystem: %S\n", + PartEntry->PartitionType, (*PartEntry->FileSystem ? PartEntry->FileSystem : L"n/a")); /* HACK: Do not try to check a partition with an unknown filesystem */ - if (CurrentFileSystem == NULL) + if (!*PartEntry->FileSystem) { PartEntry->NeedsCheck = FALSE; return CHECK_FILE_SYSTEM_PAGE; } - Status = ChkdskPartition(&PartitionRootPath, CurrentFileSystem); + /* Set PartitionRootPath */ + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlInitUnicodeString(&PartitionRootPath, PathBuffer); + DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); + + /* Check the partition */ + Status = ChkdskPartition(&PartitionRootPath, PartEntry->FileSystem); if (Status == STATUS_NOT_SUPPORTED) { + /* + * Partition checking is not supported with the current filesystem, + * so disable FS checks on it. + */ + PartEntry->NeedsCheck = FALSE; + sprintf(Buffer, "Setup is currently unable to check a partition formatted in %S.\n" "\n" " \x07 Press ENTER to continue Setup.\n" " \x07 Press F3 to quit Setup.", - CurrentFileSystem->FileSystemName); + PartEntry->FileSystem); PopupError(Buffer, MUIGetString(STRING_QUITCONTINUE), @@ -4204,7 +4210,7 @@ BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) if (!NT_SUCCESS(Status)) { MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, - PartitionList->SystemPartition->FileSystem->FileSystemName); + PartitionList->SystemPartition->FileSystem); return QUIT_PAGE; } @@ -4241,7 +4247,7 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) if (!NT_SUCCESS(Status)) { MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER, - PartitionList->SystemPartition->FileSystem->FileSystemName); + PartitionList->SystemPartition->FileSystem); return QUIT_PAGE; }

1 0

[reactos] 03/03: [ACLAYERS] Implement the ForceDXSetupSuccess shim This shim is used on older installers that try to install DirectX, but encounter errors doing so with the bundled setup. CORE-15814
by Mark Jansen 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b18da6730ee2b6f0a3859… commit b18da6730ee2b6f0a385963fe2f8ed535a094353 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Mar 8 00:32:20 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 10 12:45:35 2019 +0100 [ACLAYERS] Implement the ForceDXSetupSuccess shim This shim is used on older installers that try to install DirectX, but encounter errors doing so with the bundled setup. CORE-15814 --- dll/appcompat/shims/layer/CMakeLists.txt | 1 + dll/appcompat/shims/layer/forcedxsetupsuccess.c | 268 +++++++++++++++++++++++ dll/appcompat/shims/shimlib/shimlib.c | 9 +- dll/appcompat/shims/shimlib/shimlib.h | 2 +- media/sdb/sysmain.xml | 9 + modules/rostests/apitests/appshim/CMakeLists.txt | 1 + 6 files changed, 288 insertions(+), 2 deletions(-) diff --git a/dll/appcompat/shims/layer/CMakeLists.txt b/dll/appcompat/shims/layer/CMakeLists.txt index 9567315c2c..92b168f85d 100644 --- a/dll/appcompat/shims/layer/CMakeLists.txt +++ b/dll/appcompat/shims/layer/CMakeLists.txt @@ -5,6 +5,7 @@ spec2def(aclayers.dll layer.spec) list(APPEND SOURCE dispmode.c + forcedxsetupsuccess.c versionlie.c vmhorizon.c main.c diff --git a/dll/appcompat/shims/layer/forcedxsetupsuccess.c b/dll/appcompat/shims/layer/forcedxsetupsuccess.c new file mode 100644 index 0000000000..f86339e078 --- /dev/null +++ b/dll/appcompat/shims/layer/forcedxsetupsuccess.c @@ -0,0 +1,268 @@ +/* + * PROJECT: ReactOS 'Layers' Shim library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: ForceDxSetupSuccess shim + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <shimlib.h> +#include "ntndk.h" + +typedef HMODULE(WINAPI* LOADLIBRARYAPROC)(LPCSTR lpLibFileName); +typedef HMODULE(WINAPI* LOADLIBRARYWPROC)(LPCWSTR lpLibFileName); +typedef HMODULE(WINAPI* LOADLIBRARYEXAPROC)(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); +typedef HMODULE(WINAPI* LOADLIBRARYEXWPROC)(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags); +typedef FARPROC(WINAPI* GETPROCADDRESSPROC)(HMODULE hModule, LPCSTR lpProcName); +typedef BOOL (WINAPI* FREELIBRARYPROC)(HINSTANCE hLibModule); + + +#define SHIM_NS ForceDxSetupSuccess +#include <setup_shim.inl> + + +#define DSETUPERR_SUCCESS 0 + +INT WINAPI DirectXSetup(HWND hWnd, LPSTR lpszRootPath, DWORD dwFlags) +{ + SHIM_MSG("Returning DSETUPERR_SUCCESS\n"); + return DSETUPERR_SUCCESS; +} + +INT WINAPI DirectXSetupA(HWND hWnd, LPSTR lpszRootPath, DWORD dwFlags) +{ + SHIM_MSG("Returning DSETUPERR_SUCCESS\n"); + return DSETUPERR_SUCCESS; +} + +INT WINAPI DirectXSetupW(HWND hWnd, LPWSTR lpszRootPath, DWORD dwFlags) +{ + SHIM_MSG("Returning DSETUPERR_SUCCESS\n"); + return DSETUPERR_SUCCESS; +} + +INT WINAPI DirectXSetupGetVersion(DWORD *lpdwVersion, DWORD *lpdwMinorVersion) +{ + if (lpdwVersion) + *lpdwVersion = MAKELONG(7, 4); // DirectX 7.0 + if (lpdwMinorVersion) + *lpdwMinorVersion = MAKELONG(1792, 0); + + return TRUE; +} + + +static +BOOLEAN +IsCharInAnsiString( + IN CHAR Char, + IN const STRING* MatchString) +{ + USHORT i; + + for (i = 0; i < MatchString->Length; i++) + { + if (Char == MatchString->Buffer[i]) + return TRUE; + } + + return FALSE; +} + + +NTSTATUS +NTAPI +FindCharInAnsiString( + IN const STRING* SearchString, + IN const STRING* MatchString, + OUT PUSHORT Position) +{ + BOOLEAN Found; + ULONG i, Length; + + *Position = 0; + + /* Search */ + Length = SearchString->Length; + for (i = Length - 1; (LONG)i >= 0; i--) + { + Found = IsCharInAnsiString(SearchString->Buffer[i], MatchString); + if (Found) + { + *Position = i; + return STATUS_SUCCESS; + } + } + + return STATUS_NOT_FOUND; +} + + +static BOOL IsDxSetupA(const PSTRING LibraryPath) +{ + static const STRING DxSetupDlls[] = { + RTL_CONSTANT_STRING("dsetup.dll"), + RTL_CONSTANT_STRING("dsetup32.dll"), + RTL_CONSTANT_STRING("dsetup"), + RTL_CONSTANT_STRING("dsetup32"), + }; + static const STRING PathDividerFind = RTL_CONSTANT_STRING("\\/"); + STRING LibraryName; + USHORT PathDivider; + DWORD n; + + if (!NT_SUCCESS(FindCharInAnsiString(LibraryPath, &PathDividerFind, &PathDivider))) + PathDivider = 0; + + if (PathDivider) + PathDivider += sizeof(CHAR); + + LibraryName.Buffer = LibraryPath->Buffer + PathDivider; + LibraryName.Length = LibraryPath->Length - PathDivider; + LibraryName.MaximumLength = LibraryPath->MaximumLength - PathDivider; + + for (n = 0; n < ARRAYSIZE(DxSetupDlls); ++n) + { + if (RtlEqualString(&LibraryName, DxSetupDlls + n, TRUE)) + { + SHIM_MSG("Found %Z\n", DxSetupDlls + n); + return TRUE; + } + } + return FALSE; +} + +static BOOL IsDxSetupW(PCUNICODE_STRING LibraryPath) +{ + static const UNICODE_STRING DxSetupDlls[] = { + RTL_CONSTANT_STRING(L"dsetup.dll"), + RTL_CONSTANT_STRING(L"dsetup32.dll"), + RTL_CONSTANT_STRING(L"dsetup"), + RTL_CONSTANT_STRING(L"dsetup32"), + }; + static const UNICODE_STRING PathDividerFind = RTL_CONSTANT_STRING(L"\\/"); + UNICODE_STRING LibraryName; + USHORT PathDivider; + DWORD n; + + if (!NT_SUCCESS(RtlFindCharInUnicodeString(RTL_FIND_CHAR_IN_UNICODE_STRING_START_AT_END, LibraryPath, &PathDividerFind, &PathDivider))) + PathDivider = 0; + + if (PathDivider) + PathDivider += sizeof(WCHAR); + + LibraryName.Buffer = LibraryPath->Buffer + PathDivider / sizeof(WCHAR); + LibraryName.Length = LibraryPath->Length - PathDivider; + LibraryName.MaximumLength = LibraryPath->MaximumLength - PathDivider; + + for (n = 0; n < ARRAYSIZE(DxSetupDlls); ++n) + { + if (RtlEqualUnicodeString(&LibraryName, DxSetupDlls + n, TRUE)) + { + SHIM_MSG("Found %wZ\n", DxSetupDlls + n); + return TRUE; + } + } + return FALSE; +} + +HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryA)(LPCSTR lpLibFileName) +{ + STRING Library; + + RtlInitAnsiString(&Library, lpLibFileName); + if (IsDxSetupA(&Library)) + return ShimLib_Instance(); + + return CALL_SHIM(0, LOADLIBRARYAPROC)(lpLibFileName); +} + +HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryW)(LPCWSTR lpLibFileName) +{ + UNICODE_STRING Library; + + RtlInitUnicodeString(&Library, lpLibFileName); + if (IsDxSetupW(&Library)) + return ShimLib_Instance(); + + return CALL_SHIM(1, LOADLIBRARYWPROC)(lpLibFileName); +} + +HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryExA)(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags) +{ + STRING Library; + + RtlInitAnsiString(&Library, lpLibFileName); + if (IsDxSetupA(&Library)) + return ShimLib_Instance(); + + return CALL_SHIM(2, LOADLIBRARYEXAPROC)(lpLibFileName, hFile, dwFlags); +} + +HMODULE WINAPI SHIM_OBJ_NAME(APIHook_LoadLibraryExW)(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags) +{ + UNICODE_STRING Library; + + RtlInitUnicodeString(&Library, lpLibFileName); + if (IsDxSetupW(&Library)) + return ShimLib_Instance(); + + return CALL_SHIM(3, LOADLIBRARYEXWPROC)(lpLibFileName, hFile, dwFlags); +} + +FARPROC WINAPI SHIM_OBJ_NAME(APIHook_GetProcAddress)(HMODULE hModule, LPCSTR lpProcName) +{ + static const STRING DxSetupFunctions[] = { + RTL_CONSTANT_STRING("DirectXSetup"), + RTL_CONSTANT_STRING("DirectXSetupA"), + RTL_CONSTANT_STRING("DirectXSetupW"), + RTL_CONSTANT_STRING("DirectXSetupGetVersion"), + }; + static const FARPROC DxSetupRedirections[] = { + DirectXSetup, + DirectXSetupA, + DirectXSetupW, + DirectXSetupGetVersion, + }; + DWORD n; + + if (hModule == ShimLib_Instance() && ((ULONG_PTR)lpProcName > MAXUSHORT)) + { + STRING ProcName; + RtlInitAnsiString(&ProcName, lpProcName); + for (n = 0; n < ARRAYSIZE(DxSetupFunctions); ++n) + { + if (RtlEqualString(&ProcName, DxSetupFunctions + n, TRUE)) + { + SHIM_MSG("Intercepted %Z\n", DxSetupFunctions + n); + return DxSetupRedirections[n]; + } + } + } + return CALL_SHIM(4, GETPROCADDRESSPROC)(hModule, lpProcName); +} + +BOOL WINAPI SHIM_OBJ_NAME(APIHook_FreeLibrary)(HINSTANCE hLibModule) +{ + if (hLibModule == ShimLib_Instance()) + { + SHIM_MSG("Intercepted\n"); + return TRUE; + } + + return CALL_SHIM(5, FREELIBRARYPROC)(hLibModule); +} + + +#define SHIM_NUM_HOOKS 6 +#define SHIM_SETUP_HOOKS \ + SHIM_HOOK(0, "KERNEL32.DLL", "LoadLibraryA", SHIM_OBJ_NAME(APIHook_LoadLibraryA)) \ + SHIM_HOOK(1, "KERNEL32.DLL", "LoadLibraryW", SHIM_OBJ_NAME(APIHook_LoadLibraryW)) \ + SHIM_HOOK(2, "KERNEL32.DLL", "LoadLibraryExA", SHIM_OBJ_NAME(APIHook_LoadLibraryExA)) \ + SHIM_HOOK(3, "KERNEL32.DLL", "LoadLibraryExW", SHIM_OBJ_NAME(APIHook_LoadLibraryExW)) \ + SHIM_HOOK(4, "KERNEL32.DLL", "GetProcAddress", SHIM_OBJ_NAME(APIHook_GetProcAddress)) \ + SHIM_HOOK(5, "KERNEL32.DLL", "FreeLibrary", SHIM_OBJ_NAME(APIHook_FreeLibrary)) + +#include <implement_shim.inl> diff --git a/dll/appcompat/shims/shimlib/shimlib.c b/dll/appcompat/shims/shimlib/shimlib.c index b9c2652ab6..fa3b22675e 100644 --- a/dll/appcompat/shims/shimlib/shimlib.c +++ b/dll/appcompat/shims/shimlib/shimlib.c @@ -23,18 +23,20 @@ typedef struct UsedShim ULONG g_ShimEngDebugLevel = 0xffffffff; +static HINSTANCE g_ShimLib_hInstance; static HANDLE g_ShimLib_Heap; static PSLIST_HEADER g_UsedShims; void ShimLib_Init(HINSTANCE hInstance) { + g_ShimLib_hInstance = hInstance; g_ShimLib_Heap = HeapCreate(0, 0x10000, 0); g_UsedShims = (PSLIST_HEADER)ShimLib_ShimMalloc(sizeof(SLIST_HEADER)); RtlInitializeSListHead(g_UsedShims); } -void ShimLib_Deinit() +void ShimLib_Deinit(VOID) { // Is this a good idea? HeapDestroy(g_ShimLib_Heap); @@ -50,6 +52,11 @@ void ShimLib_ShimFree(PVOID pData) HeapFree(g_ShimLib_Heap, 0, pData); } +HINSTANCE ShimLib_Instance(VOID) +{ + return g_ShimLib_hInstance; +} + PCSTR ShimLib_StringNDuplicateA(PCSTR szString, SIZE_T stringLengthIncludingNullTerm) { PSTR NewString = ShimLib_ShimMalloc(stringLengthIncludingNullTerm); diff --git a/dll/appcompat/shims/shimlib/shimlib.h b/dll/appcompat/shims/shimlib/shimlib.h index 443f0b7964..0f016ac205 100644 --- a/dll/appcompat/shims/shimlib/shimlib.h +++ b/dll/appcompat/shims/shimlib/shimlib.h @@ -28,7 +28,7 @@ VOID ShimLib_ShimFree(PVOID pData); PCSTR ShimLib_StringDuplicateA(PCSTR szString); PCSTR ShimLib_StringNDuplicateA(PCSTR szString, SIZE_T stringLength); BOOL ShimLib_StrAEqualsW(PCSTR szString, PCWSTR wszString); - +HINSTANCE ShimLib_Instance(VOID); /* Forward events to generic handlers */ VOID ShimLib_Init(HINSTANCE hInstance); diff --git a/media/sdb/sysmain.xml b/media/sdb/sysmain.xml index 472cded8f6..c5123e9d9a 100644 --- a/media/sdb/sysmain.xml +++ b/media/sdb/sysmain.xml @@ -215,6 +215,10 @@ <SHIM NAME="DisableThemes"> <DLLFILE>acgenral.dll</DLLFILE> </SHIM> + <SHIM NAME="ForceDXSetupSuccess"> + <DLLFILE>aclayers.dll</DLLFILE> + <DESCRIPTION>Some application using an older version of DirectX may encounter problems when calling LoadLibrary or GetProcAddress to use DSETUP.DLL or DSETUP32.DLL</DESCRIPTION> + </SHIM> <SHIM NAME="IgnoreFreeLibrary"> <DLLFILE>acgenral.dll</DLLFILE> </SHIM> @@ -239,10 +243,12 @@ <LAYER NAME="WIN95"> <SHIM_REF NAME="Win95VersionLie" /> + <SHIM_REF NAME="ForceDXSetupSuccess" />  </LAYER> <LAYER NAME="WIN98"> <SHIM_REF NAME="Win98VersionLie" /> + <SHIM_REF NAME="ForceDXSetupSuccess" />  </LAYER> <LAYER NAME="NT4SP5"> @@ -363,6 +369,9 @@ <LAYER NAME="DisableThemes"> <SHIM_REF NAME="DisableThemes" /> </LAYER> + <LAYER NAME="ForceDXSetupSuccess"> + <SHIM_REF NAME="ForceDXSetupSuccess" /> + </LAYER> <LAYER NAME="VMHorizonSetup">  <SHIM_REF NAME="VMHorizonSetup" /> diff --git a/modules/rostests/apitests/appshim/CMakeLists.txt b/modules/rostests/apitests/appshim/CMakeLists.txt index b48600ceaa..f853119e50 100644 --- a/modules/rostests/apitests/appshim/CMakeLists.txt +++ b/modules/rostests/apitests/appshim/CMakeLists.txt @@ -3,6 +3,7 @@ add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE dispmode.c + forcedxsetup.c genral_hooks.c ignorefreelib.c layer_hooks.c

1 0

[reactos] 02/03: [APPSHIM_APITEST] Add tests for ForceDXSetupSuccess
by Mark Jansen 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=854af7f332381499fc4e8… commit 854af7f332381499fc4e8686aedb79a73d03b201 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Mar 7 21:18:52 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 10 12:45:34 2019 +0100 [APPSHIM_APITEST] Add tests for ForceDXSetupSuccess --- modules/rostests/apitests/appshim/forcedxsetup.c | 226 +++++++++++++++++++++++ modules/rostests/apitests/appshim/layer_hooks.c | 14 +- modules/rostests/apitests/appshim/testlist.c | 2 + 3 files changed, 241 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/appshim/forcedxsetup.c b/modules/rostests/apitests/appshim/forcedxsetup.c new file mode 100644 index 0000000000..a2b73149c5 --- /dev/null +++ b/modules/rostests/apitests/appshim/forcedxsetup.c @@ -0,0 +1,226 @@ +/* + * PROJECT: appshim_apitest + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for ForceDxSetupSuccess shim + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include "wine/test.h" + +#include "appshim_apitest.h" + +static HMODULE g_hShimDll; +static HMODULE g_hSentinelModule = (HMODULE)&g_hShimDll; /* Not a valid hmodule, so a nice sentinel */ +static tGETHOOKAPIS pGetHookAPIs; + +static INT (WINAPI *DirectXSetupGetVersion)(DWORD *lpdwVersion, DWORD *lpdwMinorVersion); + + +typedef HMODULE(WINAPI* LOADLIBRARYAPROC)(PCSTR); +typedef HMODULE(WINAPI* LOADLIBRARYWPROC)(PCWSTR); +typedef FARPROC(WINAPI* GETPROCADDRESSPROC)(HMODULE, PCSTR); +typedef BOOL(WINAPI* FREELIBRARYPROC)(HMODULE); + + +static HMODULE WINAPI my_LoadLibraryA(PCSTR Name) +{ + return g_hSentinelModule; +} + +static void test_LoadLibraryA(PHOOKAPI hook) +{ + LOADLIBRARYAPROC proc; + + ok_str(hook->LibraryName, "KERNEL32.DLL"); + hook->OriginalFunction = my_LoadLibraryA; + proc = hook->ReplacementFunction; + + /* Original function is not called */ + ok_ptr(proc("dsetup"), g_hShimDll); + ok_ptr(proc("dsetup.dll"), g_hShimDll); + ok_ptr(proc("DSETUP.DLL"), g_hShimDll); + ok_ptr(proc("DSeTuP.DlL"), g_hShimDll); + + ok_ptr(proc("dsetup32"), g_hShimDll); + ok_ptr(proc("dsetup32.dll"), g_hShimDll); + ok_ptr(proc("DSETUP32.DLL"), g_hShimDll); + ok_ptr(proc("DSeTuP32.DlL"), g_hShimDll); + + ok_ptr(proc("c:\\bogus/dsetup"), g_hShimDll); + ok_ptr(proc("c:\\bogus\\dsetup.dll"), g_hShimDll); + ok_ptr(proc("c:/bogus/DSETUP.DLL"), g_hShimDll); + ok_ptr(proc("c:\\bogus\\DSeTuP.DlL"), g_hShimDll); + + ok_ptr(proc("////////////////////dsetup32"), g_hShimDll); + ok_ptr(proc("\\\\\\\\\\\\\\dsetup32.dll"), g_hShimDll); + ok_ptr(proc("xxxxxxxxxxx\\DSETUP32.DLL"), g_hShimDll); + ok_ptr(proc("xxxxxxxxxxx//DSeTuP32.DlL"), g_hShimDll); + + /* Original function is called */ + ok_ptr(proc(NULL), g_hSentinelModule); + ok_ptr(proc("dsetup\\something"), g_hSentinelModule); + ok_ptr(proc("dsetup.dl"), g_hSentinelModule); + ok_ptr(proc("c:\\DSETUP.DLL."), g_hSentinelModule); + ok_ptr(proc("DSeTuP.D"), g_hSentinelModule); +} + +static HMODULE WINAPI my_LoadLibraryW(PCWSTR Name) +{ + return g_hSentinelModule; +} + +static void test_LoadLibraryW(PHOOKAPI hook) +{ + LOADLIBRARYWPROC proc; + + ok_str(hook->LibraryName, "KERNEL32.DLL"); + + hook->OriginalFunction = my_LoadLibraryW; + proc = hook->ReplacementFunction; + + /* Original function is not called */ + ok_ptr(proc(L"dsetup"), g_hShimDll); + ok_ptr(proc(L"dsetup.dll"), g_hShimDll); + ok_ptr(proc(L"DSETUP.DLL"), g_hShimDll); + ok_ptr(proc(L"DSeTuP.DlL"), g_hShimDll); + + ok_ptr(proc(L"dsetup32"), g_hShimDll); + ok_ptr(proc(L"dsetup32.dll"), g_hShimDll); + ok_ptr(proc(L"DSETUP32.DLL"), g_hShimDll); + ok_ptr(proc(L"DSeTuP32.DlL"), g_hShimDll); + + ok_ptr(proc(L"c:\\bogus/dsetup"), g_hShimDll); + ok_ptr(proc(L"c:\\bogus\\dsetup.dll"), g_hShimDll); + ok_ptr(proc(L"c:/bogus/DSETUP.DLL"), g_hShimDll); + ok_ptr(proc(L"c:\\bogus\\DSeTuP.DlL"), g_hShimDll); + + ok_ptr(proc(L"////////////////////dsetup32"), g_hShimDll); + ok_ptr(proc(L"\\\\\\\\\\\\\\dsetup32.dll"), g_hShimDll); + ok_ptr(proc(L"xxxxxxxxxxx\\DSETUP32.DLL"), g_hShimDll); + ok_ptr(proc(L"xxxxxxxxxxx//DSeTuP32.DlL"), g_hShimDll); + + /* Original function is called */ + ok_ptr(proc(NULL), g_hSentinelModule); + ok_ptr(proc(L"dsetup\\something"), g_hSentinelModule); + ok_ptr(proc(L"dsetup.dl"), g_hSentinelModule); + ok_ptr(proc(L"c:\\DSETUP.DLL."), g_hSentinelModule); + ok_ptr(proc(L"DSeTuP.D"), g_hSentinelModule); +} + +static void test_GetProcAddress(PHOOKAPI hook) +{ + GETPROCADDRESSPROC proc; + DWORD n; + PCSTR Functions[] = { + "DirectXSetup", + "DirectXSetupA", + "DirectXSetupW", + "DirectXSetupGetVersion", + /* And not case sensitive? */ + "directxsetup", + "DIRECTXSETUPA", + "DiReCtXsEtUpW", + NULL + }; + HMODULE mod = GetModuleHandleA("kernel32.dll"); + + ok_str(hook->LibraryName, "KERNEL32.DLL"); + hook->OriginalFunction = GetProcAddress; /* Some versions seem to call GetProcAddress regardless of what is put here.. */ + proc = hook->ReplacementFunction; + + ok_ptr(proc(mod, "CreateFileA"), GetProcAddress(mod, "CreateFileA")); + ok_ptr(proc(g_hShimDll, "CreateFileA"), NULL); + + for (n = 0; Functions[n]; ++n) + { + FARPROC fn = proc(g_hShimDll, Functions[n]); + ok(fn != NULL, "Got NULL for %s\n", Functions[n]); + /* And yet, no export! */ + ok_ptr(GetProcAddress(g_hShimDll, Functions[n]), NULL); + } + + /* Not every function is shimmed */ + ok_ptr(proc(g_hShimDll, "DirectXSetupShowEULA"), NULL); + /* Retrieve a pointer for our next test */ + DirectXSetupGetVersion = (PVOID)proc(g_hShimDll, "DirectXSetupGetVersion"); +} + +static int g_NumShim = 0; +static int g_NumSentinel = 0; +static int g_NumCalls = 0; +BOOL WINAPI my_FreeLibrary(HMODULE module) +{ + if (module == g_hSentinelModule) + ++g_NumSentinel; + else if (module == g_hShimDll) + ++g_NumShim; + ++g_NumCalls; + return 33; +} + +static void test_FreeLibrary(PHOOKAPI hook) +{ + FREELIBRARYPROC proc; + + ok_str(hook->LibraryName, "KERNEL32.DLL"); + hook->OriginalFunction = my_FreeLibrary; + proc = hook->ReplacementFunction; + + ok_int(proc(NULL), 33); + ok_int(proc(NULL), 33); + ok_int(proc(g_hSentinelModule), 33); + ok_int(proc(g_hSentinelModule), 33); + ok_int(proc(g_hShimDll), TRUE); + ok_int(proc(g_hShimDll), TRUE); + + ok_int(g_NumShim, 0); + ok_int(g_NumSentinel, 2); + ok_int(g_NumCalls, 4); +} + + +START_TEST(forcedxsetup) +{ + DWORD num_shims = 0, n; + PHOOKAPI hook; + + if (!LoadShimDLL(L"aclayers.dll", &g_hShimDll, &pGetHookAPIs)) + return; + + hook = pGetHookAPIs("", L"ForceDxSetupSuccess", &num_shims); + + ok(hook != NULL, "Expected hook to be a valid pointer\n"); + ok(num_shims == 6, "Expected num_shims to be 6, was: %u\n", num_shims); + + if (!hook || !num_shims) + return; + + for (n = 0; n < num_shims; ++n) + { + if (!_stricmp(hook[n].FunctionName, "LoadLibraryA")) + test_LoadLibraryA(hook + n); + else if (!_stricmp(hook[n].FunctionName, "LoadLibraryW")) + test_LoadLibraryW(hook + n); + else if (!_stricmp(hook[n].FunctionName, "GetProcAddress")) + test_GetProcAddress(hook + n); + else if (!_stricmp(hook[n].FunctionName, "FreeLibrary")) + test_FreeLibrary(hook + n); + } + + ok(DirectXSetupGetVersion != NULL, "No DirectXSetupGetVersion\n"); + if (DirectXSetupGetVersion) + { + DWORD dwVersion = 0xdeadbeef; + DWORD dwMinorVersion = 0xbeefdead; + INT Res = DirectXSetupGetVersion(&dwVersion, &dwMinorVersion); + ok_int(Res, 1); + ok_hex(dwVersion, MAKELONG(7, 4)); // DirectX 7.0 + ok_hex(dwMinorVersion, MAKELONG(1792, 0)); + + Res = DirectXSetupGetVersion(NULL, NULL); + ok_int(Res, 1); + } +} diff --git a/modules/rostests/apitests/appshim/layer_hooks.c b/modules/rostests/apitests/appshim/layer_hooks.c index e1568629bf..715de78df2 100644 --- a/modules/rostests/apitests/appshim/layer_hooks.c +++ b/modules/rostests/apitests/appshim/layer_hooks.c @@ -27,12 +27,24 @@ typedef struct expect_shim_data { const WCHAR* ShimName; DWORD MinVersion; - expect_shim_hook hooks[4]; + expect_shim_hook hooks[6]; } expect_shim_data; static expect_shim_data data[] = { + { + L"ForceDXSetupSuccess", + 0, + { + { "KERNEL32.DLL", "LoadLibraryA" }, + { "KERNEL32.DLL", "LoadLibraryW" }, + { "KERNEL32.DLL", "LoadLibraryExA" }, + { "KERNEL32.DLL", "LoadLibraryExW" }, + { "KERNEL32.DLL", "GetProcAddress" }, + { "KERNEL32.DLL", "FreeLibrary" }, + } + }, { L"VerifyVersionInfoLite", 0, diff --git a/modules/rostests/apitests/appshim/testlist.c b/modules/rostests/apitests/appshim/testlist.c index a3e7b7132d..78bf621b9d 100644 --- a/modules/rostests/apitests/appshim/testlist.c +++ b/modules/rostests/apitests/appshim/testlist.c @@ -4,6 +4,7 @@ #include <wine/test.h> extern void func_dispmode(void); +extern void func_forcedxsetup(void); extern void func_genral_hooks(void); extern void func_ignorefreelib(void); extern void func_layer_hooks(void); @@ -12,6 +13,7 @@ extern void func_versionlie(void); const struct test winetest_testlist[] = { { "dispmode", func_dispmode }, + { "forcedxsetup", func_forcedxsetup }, { "genral_hooks", func_genral_hooks }, { "ignorefreelib", func_ignorefreelib }, { "layer_hooks", func_layer_hooks },

1 0

[reactos] 01/03: [ACLAYERS][ACGENRAL] Do not use the crt entrypoint.
by Mark Jansen 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76af1fb019029a3cd1292… commit 76af1fb019029a3cd12928b6d971ece20490e42e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Oct 10 00:19:54 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 10 12:45:22 2019 +0100 [ACLAYERS][ACGENRAL] Do not use the crt entrypoint. --- dll/appcompat/shims/genral/CMakeLists.txt | 4 ++-- dll/appcompat/shims/layer/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/appcompat/shims/genral/CMakeLists.txt b/dll/appcompat/shims/genral/CMakeLists.txt index 86db9bbc91..b0e98edcec 100644 --- a/dll/appcompat/shims/genral/CMakeLists.txt +++ b/dll/appcompat/shims/genral/CMakeLists.txt @@ -14,7 +14,7 @@ add_library(acgenral SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/acgenral.def) -set_module_type(acgenral win32dll) +set_module_type(acgenral win32dll ENTRYPOINT DllMain 12) target_link_libraries(acgenral shimlib) -add_importlibs(acgenral uxtheme msvcrt kernel32 ntdll) +add_importlibs(acgenral uxtheme kernel32 ntdll) add_cd_file(TARGET acgenral DESTINATION reactos/AppPatch FOR all) diff --git a/dll/appcompat/shims/layer/CMakeLists.txt b/dll/appcompat/shims/layer/CMakeLists.txt index f62c8dd13c..9567315c2c 100644 --- a/dll/appcompat/shims/layer/CMakeLists.txt +++ b/dll/appcompat/shims/layer/CMakeLists.txt @@ -14,7 +14,7 @@ add_library(aclayers SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/aclayers.def) -set_module_type(aclayers win32dll) +set_module_type(aclayers win32dll ENTRYPOINT DllMain 12) target_link_libraries(aclayers shimlib) -add_importlibs(aclayers user32 msvcrt kernel32 ntdll) +add_importlibs(aclayers user32 kernel32 ntdll) add_cd_file(TARGET aclayers DESTINATION reactos/AppPatch FOR all)

1 0

[reactos] 01/01: [AFD] Don't reallocate buffers if windows sizes didn't change
by Pierre Schweitzer 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e07b3b9f9448ff17c636… commit 4e07b3b9f9448ff17c636bd2de9b72d9f1e403f2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Mar 10 12:27:30 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Mar 10 12:27:30 2019 +0100 [AFD] Don't reallocate buffers if windows sizes didn't change --- drivers/network/afd/afd/info.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/network/afd/afd/info.c b/drivers/network/afd/afd/info.c index c780eb86a2..78e0cb0851 100644 --- a/drivers/network/afd/afd/info.c +++ b/drivers/network/afd/afd/info.c @@ -128,7 +128,8 @@ AfdSetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp, FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS) { /* FIXME: likely not right, check tcpip.sys for TDI_QUERY_MAX_DATAGRAM_INFO */ - if (InfoReq->Information.Ulong > 0 && InfoReq->Information.Ulong < 0xFFFF) + if (InfoReq->Information.Ulong > 0 && InfoReq->Information.Ulong < 0xFFFF && + InfoReq->Information.Ulong != FCB->Recv.Size) { NewBuffer = ExAllocatePoolWithTag(PagedPool, InfoReq->Information.Ulong, @@ -172,7 +173,8 @@ AfdSetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp, if (FCB->State == SOCKET_STATE_CONNECTED || FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS) { - if (InfoReq->Information.Ulong > 0 && InfoReq->Information.Ulong < 0xFFFF) + if (InfoReq->Information.Ulong > 0 && InfoReq->Information.Ulong < 0xFFFF && + InfoReq->Information.Ulong != FCB->Send.Size) { NewBuffer = ExAllocatePoolWithTag(PagedPool, InfoReq->Information.Ulong,

1 0

[reactos] 01/01: [WIN32K] Keep a reference on an ETHREAD while THREADINFO exists
by Timo Kreuzer 10 Mar '19

10 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba893e11723adbea6923a… commit ba893e11723adbea6923a1899b700e8223020eda Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Mar 13 23:00:17 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Mar 10 11:14:40 2019 +0100 [WIN32K] Keep a reference on an ETHREAD while THREADINFO exists --- win32ss/user/ntuser/main.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 318a7ea70e..b790fd84ef 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -89,13 +89,6 @@ AllocW32Process(IN PEPROCESS Process, return STATUS_SUCCESS; } -#define FreeW32Process(/*Process*/ W32Process) \ -do { \ - /*PPROCESSINFO W32Process = PsGetProcessWin32Process(Process);*/ \ - /*ASSERT(W32Process);*/ \ - IntDereferenceProcessInfo(W32Process); \ -} while(0) - /* * Called from IntDereferenceProcessInfo */ @@ -332,7 +325,7 @@ ExitProcessCallback(PEPROCESS Process) ppiCurrent->peProcess = NULL; /* Finally, dereference */ - FreeW32Process(/*Process*/ ppiCurrent); // IntDereferenceProcessInfo(ppiCurrent); + IntDereferenceProcessInfo(ppiCurrent); return STATUS_SUCCESS; } @@ -397,19 +390,13 @@ AllocW32Thread(IN PETHREAD Thread, RtlZeroMemory(ptiCurrent, sizeof(*ptiCurrent)); PsSetThreadWin32Thread(Thread, ptiCurrent, NULL); + ObReferenceObject(Thread); IntReferenceThreadInfo(ptiCurrent); *W32Thread = ptiCurrent; return STATUS_SUCCESS; } -#define FreeW32Thread(/*Thread*/ W32Thread) \ -do { \ - /*PTHREADINFO W32Thread = PsGetThreadWin32Thread(Thread);*/ \ - /*ASSERT(W32Thread);*/ \ - IntDereferenceThreadInfo(W32Thread); \ -} while(0) - /* * Called from IntDereferenceThreadInfo */ @@ -428,6 +415,8 @@ UserDeleteW32Thread(PTHREADINFO pti) MsqCleanupThreadMsgs(pti); + ObDereferenceObject(pti->pEThread); + ExFreePoolWithTag(pti, USERTAG_THREADINFO); IntDereferenceProcessInfo(ppi); @@ -845,10 +834,9 @@ ExitThreadCallback(PETHREAD Thread) /* The thread is dying */ PsSetThreadWin32Thread(Thread /*ptiCurrent->pEThread*/, NULL, ptiCurrent); - ptiCurrent->pEThread = NULL; - /* Free the THREADINFO */ - FreeW32Thread(/*Thread*/ ptiCurrent); // IntDereferenceThreadInfo(ptiCurrent); + /* Dereference the THREADINFO */ + IntDereferenceThreadInfo(ptiCurrent); return STATUS_SUCCESS; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs