Ros-diffs May 2018

ros-diffs@reactos.org

23 participants
218 discussions

01/01: [SYSSETUP][INF] Add the 'Registry Values' section to the default security settings and apply it to the registry
by Eric Kohl 28 May '18

28 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd9f22e9e5857e0235fbd… commit cd9f22e9e5857e0235fbd70ff7908e8840168c09 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon May 28 19:26:02 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon May 28 19:26:02 2018 +0200 [SYSSETUP][INF] Add the 'Registry Values' section to the default security settings and apply it to the registry --- dll/win32/syssetup/security.c | 222 +++++++++++++++++++++++++++++++++++++++++- media/inf/defltws.inf | 17 ++++ 2 files changed, 235 insertions(+), 4 deletions(-) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index 221d0152af..385fde1b36 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -245,7 +245,7 @@ InstallBuiltinAccounts(VOID) return; } - for (i = 0; i < 10; i++) + for (i = 0; i < ARRAYSIZE(BuiltinAccounts); i++) { if (!ConvertStringSidToSid(BuiltinAccounts[i], &AccountSid)) { @@ -314,7 +314,7 @@ InstallPrivileges(VOID) NULL, &InfContext)) { - DPRINT1("SetupFindfirstLineW failed\n"); + DPRINT1("SetupFindFirstLineW failed\n"); goto done; } @@ -324,7 +324,7 @@ InstallPrivileges(VOID) if (!SetupGetStringFieldW(&InfContext, 0, szPrivilegeString, - 256, + ARRAYSIZE(szPrivilegeString), NULL)) { DPRINT1("SetupGetStringFieldW() failed\n"); @@ -337,7 +337,7 @@ InstallPrivileges(VOID) if (!SetupGetStringFieldW(&InfContext, i + 1, szSidString, - 256, + ARRAYSIZE(szSidString), NULL)) { DPRINT1("SetupGetStringFieldW() failed\n"); @@ -400,11 +400,225 @@ done: } +static +VOID +ApplyRegistryValues(VOID) +{ + HINF hSecurityInf = INVALID_HANDLE_VALUE; + WCHAR szRegistryPath[MAX_PATH]; + WCHAR szRootName[MAX_PATH]; + WCHAR szKeyName[MAX_PATH]; + WCHAR szValueName[MAX_PATH]; + INFCONTEXT InfContext; + DWORD dwLength, dwType; + HKEY hRootKey, hKey; + PWSTR Ptr1, Ptr2; + DWORD dwError; + PVOID pBuffer; + + DPRINT("ApplyRegistryValues()\n"); + + hSecurityInf = SetupOpenInfFileW(L"defltws.inf", //szNameBuffer, + NULL, + INF_STYLE_WIN4, + NULL); + if (hSecurityInf == INVALID_HANDLE_VALUE) + { + DPRINT1("SetupOpenInfFileW failed\n"); + return; + } + + if (!SetupFindFirstLineW(hSecurityInf, + L"Registry Values", + NULL, + &InfContext)) + { + DPRINT1("SetupFindFirstLineW failed\n"); + goto done; + } + + do + { + /* Retrieve the privilege name */ + if (!SetupGetStringFieldW(&InfContext, + 0, + szRegistryPath, + ARRAYSIZE(szRegistryPath), + NULL)) + { + DPRINT1("SetupGetStringFieldW() failed\n"); + goto done; + } + + DPRINT("RegistryPath: %S\n", szRegistryPath); + + Ptr1 = wcschr(szRegistryPath, L'\\'); + Ptr2 = wcsrchr(szRegistryPath, L'\\'); + if (Ptr1 != NULL && Ptr2 != NULL && Ptr1 != Ptr2) + { + dwLength = (DWORD)(((ULONG_PTR)Ptr1 - (ULONG_PTR)szRegistryPath) / sizeof(WCHAR)); + wcsncpy(szRootName, szRegistryPath, dwLength); + szRootName[dwLength] = UNICODE_NULL; + + Ptr1++; + dwLength = (DWORD)(((ULONG_PTR)Ptr2 - (ULONG_PTR)Ptr1) / sizeof(WCHAR)); + wcsncpy(szKeyName, Ptr1, dwLength); + szKeyName[dwLength] = UNICODE_NULL; + + Ptr2++; + wcscpy(szValueName, Ptr2); + + DPRINT("RootName: %S\n", szRootName); + DPRINT("KeyName: %S\n", szKeyName); + DPRINT("ValueName: %S\n", szValueName); + + if (_wcsicmp(szRootName, L"Machine") == 0) + { + hRootKey = HKEY_LOCAL_MACHINE; + } + else + { + DPRINT1("Unsupported root key %S\n", szRootName); + break; + } + + if (!SetupGetIntField(&InfContext, + 1, + (PINT)&dwType)) + { + DPRINT1("Failed to create the key %S (Error %lu)\n", szKeyName, dwError); + break; + } + + if (dwType != REG_SZ && dwType != REG_EXPAND_SZ && dwType != REG_BINARY && + dwType != REG_DWORD && dwType != REG_MULTI_SZ) + { + DPRINT1("Invalid value type %lu\n", dwType); + break; + } + + dwLength = 0; + switch (dwType) + { + case REG_SZ: + case REG_EXPAND_SZ: + SetupGetStringField(&InfContext, + 2, + NULL, + 0, + &dwLength); + dwLength *= sizeof(WCHAR); + break; + + case REG_BINARY: + SetupGetBinaryField(&InfContext, + 2, + NULL, + 0, + &dwLength); + break; + + case REG_DWORD: + dwLength = sizeof(INT); + break; + + case REG_MULTI_SZ: + SetupGetMultiSzField(&InfContext, + 2, + NULL, + 0, + &dwLength); + dwLength *= sizeof(WCHAR); + break; + } + + if (dwLength == 0) + { + DPRINT1("Failed to determine the required buffer size!\n"); + break; + } + + dwError = RegCreateKeyExW(hRootKey, + szKeyName, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + NULL); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to create the key %S (Error %lu)\n", szKeyName, dwError); + break; + } + + pBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength); + if (pBuffer) + { + switch (dwType) + { + case REG_SZ: + case REG_EXPAND_SZ: + SetupGetStringField(&InfContext, + 2, + pBuffer, + dwLength / sizeof(WCHAR), + &dwLength); + dwLength *= sizeof(WCHAR); + break; + + case REG_BINARY: + SetupGetBinaryField(&InfContext, + 2, + pBuffer, + dwLength, + &dwLength); + break; + + case REG_DWORD: + SetupGetIntField(&InfContext, + 2, + pBuffer); + break; + + case REG_MULTI_SZ: + SetupGetMultiSzField(&InfContext, + 2, + pBuffer, + dwLength / sizeof(WCHAR), + &dwLength); + dwLength *= sizeof(WCHAR); + break; + } + + RegSetValueEx(hKey, + szValueName, + 0, + dwType, + pBuffer, + dwLength); + + HeapFree(GetProcessHeap(), 0, pBuffer); + } + + RegCloseKey(hKey); + } + } + while (SetupFindNextLine(&InfContext, &InfContext)); + +done: + if (hSecurityInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hSecurityInf); +} + + VOID InstallSecurity(VOID) { InstallBuiltinAccounts(); InstallPrivileges(); + ApplyRegistryValues(); /* Hack */ SetPrimaryDomain(L"WORKGROUP", NULL); diff --git a/media/inf/defltws.inf b/media/inf/defltws.inf index cccca5baba..a2039441f3 100644 --- a/media/inf/defltws.inf +++ b/media/inf/defltws.inf @@ -44,3 +44,20 @@ SeSystemTimePrivilege = *S-1-5-32-544 SeTakeOwnershipPrivilege = *S-1-5-32-544 SeTcbPrivilege = SeUndockPrivilege = *S-1-5-32-544, *S-1-5-32-545 + + +[Registry Values] +; Full registry path = Type, Value +; +; Type: +; 1: REG_SZ +; 2: REG_EXPAND_SZ +; 3: REG_BINARY +; 4: REG_DWORD +; 7: REG_MULTI_SZ + +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\DontDisplayLastUserName = 4, 0 +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\LegalNoticeCaption = 1, "" +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\LegalNoticeText = 7, "" +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\ShutdownWithoutLogon = 4, 1 +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\UndockWithoutLogon = 4, 1 \ No newline at end of file

1 0

01/01: [USERENV] Implement CopySystemProfile Part 2 (Create the profile directory)
by Eric Kohl 28 May '18

28 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f9543940c432f0738d91… commit 1f9543940c432f0738d914f4ff2834966d3ce67a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon May 28 02:13:22 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon May 28 02:13:22 2018 +0200 [USERENV] Implement CopySystemProfile Part 2 (Create the profile directory) --- dll/win32/userenv/profile.c | 86 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 4 deletions(-) diff --git a/dll/win32/userenv/profile.c b/dll/win32/userenv/profile.c index 8acbb90a91..0b49d7a869 100644 --- a/dll/win32/userenv/profile.c +++ b/dll/win32/userenv/profile.c @@ -112,13 +112,16 @@ CopySystemProfile( IN ULONG Unused) { WCHAR szKeyName[MAX_PATH]; - WCHAR szImagePath[MAX_PATH]; + WCHAR szRawProfilePath[MAX_PATH]; + WCHAR szProfilePath[MAX_PATH]; + WCHAR szDefaultProfilePath[MAX_PATH]; UNICODE_STRING SidString = {0, 0, NULL}; HANDLE hToken = NULL; PSID pUserSid = NULL; HKEY hProfileKey = NULL; DWORD dwDisposition; BOOL bResult = FALSE; + DWORD cchSize; DWORD dwError; DPRINT1("CopySystemProfile()\n"); @@ -177,21 +180,96 @@ CopySystemProfile( goto done; } - wcscpy(szImagePath, + wcscpy(szRawProfilePath, L"%systemroot%\\system32\\config\\systemprofile"); dwError = RegSetValueExW(hProfileKey, L"ProfileImagePath", 0, REG_EXPAND_SZ, - (PBYTE)szImagePath, - (wcslen(szImagePath) + 1) * sizeof(WCHAR)); + (PBYTE)szRawProfilePath, + (wcslen(szRawProfilePath) + 1) * sizeof(WCHAR)); if (dwError != ERROR_SUCCESS) { DPRINT1("Failed to set the ProfileImagePath value (Error %lu)\n", dwError); goto done; } + /* Expand the raw profile path */ + if (!ExpandEnvironmentStringsW(szRawProfilePath, + szProfilePath, + ARRAYSIZE(szProfilePath))) + { + DPRINT1("Failled to expand the raw profile path (Error %lu)\n", GetLastError()); + goto done; + } + + /* Create the profile directory if it does not exist yet */ + // FIXME: Security! + if (!CreateDirectoryW(szProfilePath, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Failed to create the profile directory (Error %lu)\n", GetLastError()); + goto done; + } + } + + /* Get the path of the default profile */ + cchSize = ARRAYSIZE(szDefaultProfilePath); + if (!GetDefaultUserProfileDirectoryW(szDefaultProfilePath, &cchSize)) + { + DPRINT1("Failed to create the default profile path (Error %lu)\n", GetLastError()); + goto done; + } + + /* Copy the default profile into the new profile directory */ + // FIXME: Security! + if (!CopyDirectory(szProfilePath, szDefaultProfilePath)) + { + DPRINT1("Failed to copy the default profile directory (Error %lu)\n", GetLastError()); + goto done; + } + + /* Create user hive file */ + +#if 0 + /* Use the default hive file name */ +// StringCbCopyW(szBuffer, sizeof(szBuffer), szProfilePath); + StringCbCatW(szProfilePath, sizeof(szProfilePath), L"\\ntuser.dat"); + + /* Acquire restore privilege */ + if (!AcquireRemoveRestorePrivilege(TRUE)) + { + DPRINT1("Failed to acquire the restore privilege (Error %lu)\n", GetLastError()); + goto done; + } + + /* Load the user hive */ + dwError = RegLoadKeyW(HKEY_USERS, + SidString.Buffer, + szProfilePath); + AcquireRemoveRestorePrivilege(FALSE); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to load the new registry hive (Error %lu)\n", dwError); + goto done; + } + + bResult = TRUE; + + /* Initialize the user hive */ + if (!CreateUserHive(SidString.Buffer, szProfilePath)) + { + DPRINT1("Failed to create the new hive (Error %lu)\n", GetLastError()); + bResult = FALSE; + } + + /* Unload the user hive */ + AcquireRemoveRestorePrivilege(TRUE); + RegUnLoadKeyW(HKEY_USERS, SidString.Buffer); + AcquireRemoveRestorePrivilege(FALSE); +#endif bResult = TRUE;

1 0

01/01: [SETUP] Remove myself from the 1st stage setup code
by Eric Kohl 27 May '18

27 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=975b7d427d6428d57e356… commit 975b7d427d6428d57e3562d2bc4d9683d8319541 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 27 21:33:07 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 27 21:33:07 2018 +0200 [SETUP] Remove myself from the 1st stage setup code Congratulations Hermès! You just earned yourself full maintainership of the 1st stage setup. It's yours now. I'm out! --- base/setup/lib/fsutil.c | 3 +-- base/setup/lib/fsutil.h | 3 +-- base/setup/lib/genlist.c | 3 +-- base/setup/lib/genlist.h | 3 +-- base/setup/lib/partlist.c | 3 +-- base/setup/lib/partlist.h | 3 +-- base/setup/reactos/drivepage.c | 3 +-- base/setup/reactos/reactos.c | 3 +-- base/setup/reactos/reactos.h | 3 +-- base/setup/usetup/bootsup.c | 2 +- base/setup/usetup/bootsup.h | 2 +- base/setup/usetup/cmdcons.c | 2 +- base/setup/usetup/cmdcons.h | 2 +- base/setup/usetup/console.c | 2 +- base/setup/usetup/console.h | 2 +- base/setup/usetup/consup.c | 2 +- base/setup/usetup/consup.h | 2 +- base/setup/usetup/drivesup.c | 2 +- base/setup/usetup/drivesup.h | 2 +- base/setup/usetup/filequeue.c | 3 +-- base/setup/usetup/filequeue.h | 2 +- base/setup/usetup/filesup.c | 3 +-- base/setup/usetup/filesup.h | 2 +- base/setup/usetup/fslist.c | 3 +-- base/setup/usetup/fslist.h | 3 +-- base/setup/usetup/genlist.c | 3 +-- base/setup/usetup/genlist.h | 2 +- base/setup/usetup/inicache.c | 1 - base/setup/usetup/inicache.h | 1 - base/setup/usetup/partlist.c | 3 +-- base/setup/usetup/partlist.h | 2 +- base/setup/usetup/progress.h | 2 +- base/setup/usetup/registry.c | 2 +- base/setup/usetup/registry.h | 2 +- base/setup/usetup/settings.c | 3 +-- base/setup/usetup/settings.h | 2 +- base/setup/usetup/usetup.c | 3 +-- base/setup/usetup/usetup.h | 2 +- 38 files changed, 36 insertions(+), 55 deletions(-) diff --git a/base/setup/lib/fsutil.c b/base/setup/lib/fsutil.c index 16da7f5a56..b1f498a5ad 100644 --- a/base/setup/lib/fsutil.c +++ b/base/setup/lib/fsutil.c @@ -2,8 +2,7 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Filesystem support functions - * COPYRIGHT: Copyright 2002-2018 Eric Kohl - * Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Copyright 2017-2018 Hermes Belusca-Maito */ diff --git a/base/setup/lib/fsutil.h b/base/setup/lib/fsutil.h index 6fbd864f83..46fe556d8f 100644 --- a/base/setup/lib/fsutil.h +++ b/base/setup/lib/fsutil.h @@ -2,8 +2,7 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Filesystem support functions - * COPYRIGHT: Copyright 2002-2018 Eric Kohl - * Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Copyright 2017-2018 Hermes Belusca-Maito */ diff --git a/base/setup/lib/genlist.c b/base/setup/lib/genlist.c index dc09ac0a37..1795895a78 100644 --- a/base/setup/lib/genlist.c +++ b/base/setup/lib/genlist.c @@ -2,8 +2,7 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Generic list functions - * COPYRIGHT: Copyright 2004-2018 Eric Kohl - * Copyright 2008-2018 Christoph von Wittich <christoph at reactos.org> + * COPYRIGHT: Copyright 2008-2018 Christoph von Wittich <christoph at reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/lib/genlist.h b/base/setup/lib/genlist.h index 9623d3aba1..56210891c1 100644 --- a/base/setup/lib/genlist.h +++ b/base/setup/lib/genlist.h @@ -2,8 +2,7 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Generic list functions - * COPYRIGHT: Copyright 2004-2018 Eric Kohl - * Copyright 2008-2018 Christoph von Wittich <christoph at reactos.org> + * COPYRIGHT: Copyright 2008-2018 Christoph von Wittich <christoph at reactos.org> */ #pragma once diff --git a/base/setup/lib/partlist.c b/base/setup/lib/partlist.c index 583544b96c..9861c241f8 100644 --- a/base/setup/lib/partlist.c +++ b/base/setup/lib/partlist.c @@ -2,8 +2,7 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Partition list functions - * COPYRIGHT: Copyright 2002-2018 Eric Kohl - * Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #include "precomp.h" diff --git a/base/setup/lib/partlist.h b/base/setup/lib/partlist.h index 7a6cec9487..5d2b62535f 100644 --- a/base/setup/lib/partlist.h +++ b/base/setup/lib/partlist.h @@ -2,8 +2,7 @@ * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Partition list functions - * COPYRIGHT: Copyright 2002-2018 Eric Kohl - * Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #pragma once diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index d117ae8144..5cda85e288 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -20,8 +20,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS GUI first stage setup application * FILE: base/setup/reactos/drivepage.c - * PROGRAMMERS: Eric Kohl - * Matthias Kupfer + * PROGRAMMERS: Matthias Kupfer * Dmitry Chapyshev (dmitry(a)reactos.org) */ diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 051071ad12..c7fcbee2fe 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -20,8 +20,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS GUI first stage setup application * FILE: base/setup/reactos/reactos.c - * PROGRAMMERS: Eric Kohl - * Matthias Kupfer + * PROGRAMMERS: Matthias Kupfer * Dmitry Chapyshev (dmitry(a)reactos.org) */ diff --git a/base/setup/reactos/reactos.h b/base/setup/reactos/reactos.h index bb507032c0..c7bcfdc89d 100644 --- a/base/setup/reactos/reactos.h +++ b/base/setup/reactos/reactos.h @@ -20,8 +20,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS GUI first stage setup application * FILE: base/setup/reactos/reactos.c - * PROGRAMMERS: Eric Kohl - * Matthias Kupfer + * PROGRAMMERS: Matthias Kupfer * Dmitry Chapyshev (dmitry(a)reactos.org) */ diff --git a/base/setup/usetup/bootsup.c b/base/setup/usetup/bootsup.c index cd5794025c..dd681f4787 100644 --- a/base/setup/usetup/bootsup.c +++ b/base/setup/usetup/bootsup.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/bootsup.c * PURPOSE: Bootloader support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #include "usetup.h" diff --git a/base/setup/usetup/bootsup.h b/base/setup/usetup/bootsup.h index 0bdeb37bdd..33de23d7dc 100644 --- a/base/setup/usetup/bootsup.h +++ b/base/setup/usetup/bootsup.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/bootsup.h * PURPOSE: Bootloader support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/cmdcons.c b/base/setup/usetup/cmdcons.c index 38a00d71e3..0307c11ca1 100644 --- a/base/setup/usetup/cmdcons.c +++ b/base/setup/usetup/cmdcons.c @@ -3,7 +3,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/cmdcons.c * PURPOSE: Recovery console - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #include "usetup.h" diff --git a/base/setup/usetup/cmdcons.h b/base/setup/usetup/cmdcons.h index dadf90f096..3db7538b4d 100644 --- a/base/setup/usetup/cmdcons.h +++ b/base/setup/usetup/cmdcons.h @@ -3,7 +3,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/cmdcons.h * PURPOSE: Recovery console - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ VOID diff --git a/base/setup/usetup/console.c b/base/setup/usetup/console.c index 858e83433e..1c35375dd6 100644 --- a/base/setup/usetup/console.c +++ b/base/setup/usetup/console.c @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/console.c * PURPOSE: Console support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ /* INCLUDES ******************************************************************/ diff --git a/base/setup/usetup/console.h b/base/setup/usetup/console.h index 8578afc11d..df8bcc8a26 100644 --- a/base/setup/usetup/console.h +++ b/base/setup/usetup/console.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/console.h * PURPOSE: Console support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/consup.c b/base/setup/usetup/consup.c index cec8c5ab5e..461cd7cbac 100644 --- a/base/setup/usetup/consup.c +++ b/base/setup/usetup/consup.c @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/consup.c * PURPOSE: Console support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ /* INCLUDES ******************************************************************/ diff --git a/base/setup/usetup/consup.h b/base/setup/usetup/consup.h index 546e78864a..e00ebcd098 100644 --- a/base/setup/usetup/consup.h +++ b/base/setup/usetup/consup.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/consup.h * PURPOSE: Console support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/drivesup.c b/base/setup/usetup/drivesup.c index a1f6e65761..c81b987fc1 100644 --- a/base/setup/usetup/drivesup.c +++ b/base/setup/usetup/drivesup.c @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/drivesup.c * PURPOSE: Drive support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/usetup/drivesup.h b/base/setup/usetup/drivesup.h index 2093a75ac9..5cd200d8fc 100644 --- a/base/setup/usetup/drivesup.h +++ b/base/setup/usetup/drivesup.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/drivesup.h * PURPOSE: Drive support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/filequeue.c b/base/setup/usetup/filequeue.c index 65a271f435..e5d55908c3 100644 --- a/base/setup/usetup/filequeue.c +++ b/base/setup/usetup/filequeue.c @@ -20,8 +20,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/filequeue.c * PURPOSE: File queue functions - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/usetup/filequeue.h b/base/setup/usetup/filequeue.h index 912e4a7ebb..ebc05e282b 100644 --- a/base/setup/usetup/filequeue.h +++ b/base/setup/usetup/filequeue.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/filequeue.h * PURPOSE: File queue functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index 49defff553..b7fdf692f1 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -20,8 +20,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/filesup.c * PURPOSE: File support functions - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/usetup/filesup.h b/base/setup/usetup/filesup.h index 317fad93be..87ab8354fe 100644 --- a/base/setup/usetup/filesup.h +++ b/base/setup/usetup/filesup.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/filesup.h * PURPOSE: File support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/fslist.c b/base/setup/usetup/fslist.c index d29d0df331..6aa8c4e193 100644 --- a/base/setup/usetup/fslist.c +++ b/base/setup/usetup/fslist.c @@ -21,8 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/fslist.c * PURPOSE: Filesystem list functions - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #include "usetup.h" diff --git a/base/setup/usetup/fslist.h b/base/setup/usetup/fslist.h index 16388e2df2..d5f8b4c5ce 100644 --- a/base/setup/usetup/fslist.h +++ b/base/setup/usetup/fslist.h @@ -20,8 +20,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/fslist.h * PURPOSE: Filesystem list functions - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #pragma once diff --git a/base/setup/usetup/genlist.c b/base/setup/usetup/genlist.c index 991d6d0fa2..67f12edebe 100644 --- a/base/setup/usetup/genlist.c +++ b/base/setup/usetup/genlist.c @@ -20,8 +20,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/genlist.c * PURPOSE: Generic list functions - * PROGRAMMER: Eric Kohl - * Christoph von Wittich <christoph at reactos.org> + * PROGRAMMER: Christoph von Wittich <christoph at reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/usetup/genlist.h b/base/setup/usetup/genlist.h index ebe406960e..f6cdde32fd 100644 --- a/base/setup/usetup/genlist.h +++ b/base/setup/usetup/genlist.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/genlist.h * PURPOSE: Generic list functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/inicache.c b/base/setup/usetup/inicache.c index f509e59606..38dd44fefd 100644 --- a/base/setup/usetup/inicache.c +++ b/base/setup/usetup/inicache.c @@ -22,7 +22,6 @@ * FILE: base/setup/usetup/inicache.c * PURPOSE: INI file parser that caches contents of INI file in memory * PROGRAMMER: Royce Mitchell III - * Eric Kohl */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/usetup/inicache.h b/base/setup/usetup/inicache.h index 8e12103e28..33db2a38e9 100644 --- a/base/setup/usetup/inicache.h +++ b/base/setup/usetup/inicache.h @@ -22,7 +22,6 @@ * FILE: base/setup/usetup/inicache.h * PURPOSE: INI file parser that caches contents of INI file in memory * PROGRAMMER: Royce Mitchell III - * Eric Kohl */ #pragma once diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index ca8f13239f..6feb52b80f 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -20,8 +20,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/partlist.c * PURPOSE: Partition list functions - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #include "usetup.h" diff --git a/base/setup/usetup/partlist.h b/base/setup/usetup/partlist.h index b8caf457d4..ebb38167b9 100644 --- a/base/setup/usetup/partlist.h +++ b/base/setup/usetup/partlist.h @@ -20,7 +20,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/partlist.h * PURPOSE: Partition list functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/progress.h b/base/setup/usetup/progress.h index 79c21959d7..4799225e33 100644 --- a/base/setup/usetup/progress.h +++ b/base/setup/usetup/progress.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/progress.h * PURPOSE: Partition list functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/registry.c b/base/setup/usetup/registry.c index 3ee3382678..d86705b3d5 100644 --- a/base/setup/usetup/registry.c +++ b/base/setup/usetup/registry.c @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/registry.c * PURPOSE: Registry creation functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/usetup/registry.h b/base/setup/usetup/registry.h index fc0f4f7edd..5064bb97f3 100644 --- a/base/setup/usetup/registry.h +++ b/base/setup/usetup/registry.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/registry.h * PURPOSE: Registry creation functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/settings.c b/base/setup/usetup/settings.c index 6de24b0ef4..a6dc2ed0fb 100644 --- a/base/setup/usetup/settings.c +++ b/base/setup/usetup/settings.c @@ -20,8 +20,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/settings.c * PURPOSE: Device settings support functions - * PROGRAMMERS: Eric Kohl - * Colin Finck + * PROGRAMMERS: Colin Finck */ /* INCLUDES *****************************************************************/ diff --git a/base/setup/usetup/settings.h b/base/setup/usetup/settings.h index af1577e643..1fce8f7735 100644 --- a/base/setup/usetup/settings.h +++ b/base/setup/usetup/settings.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/settings.h * PURPOSE: Device settings support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #pragma once diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 888c73fce0..bb12f96970 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -21,8 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/usetup.c * PURPOSE: Text-mode setup - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Herv� Poussineau (hpoussin(a)reactos.org) */ diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index 5b74ec6f10..4b7d7de339 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/usetup.h * PURPOSE: Text-mode setup - * PROGRAMMER: Eric Kohl + * PROGRAMMER: */ #ifndef _USETUP_PCH_

1 0

05/05: [USETUP] Improve the inicache module.
by Hermès Bélusca-Maïto 27 May '18

27 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8ea82d67b7bd65b63316… commit c8ea82d67b7bd65b633164d94e577c9dddd54bb6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 21 23:48:09 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 27 20:18:53 2018 +0200 [USETUP] Improve the inicache module. From the existing IniCacheLoad() function, introduce a IniCacheLoadFromMemory() function that just does the same (initialize an INI file cache and parse the INI file), but takes the input from a memory buffer. Then, rewrite the IniCacheLoad() function to just open the file given in input, and then fall back to calling IniCacheLoadFromMemory. The IniCacheLoadFromMemory() function will be used later. svn path=/branches/setup_improvements/; revision=74620 --- base/setup/usetup/inicache.c | 182 +++++++++++++++++++++++-------------------- base/setup/usetup/inicache.h | 7 ++ 2 files changed, 106 insertions(+), 83 deletions(-) diff --git a/base/setup/usetup/inicache.c b/base/setup/usetup/inicache.c index 16f3e2e4e0..f509e59606 100644 --- a/base/setup/usetup/inicache.c +++ b/base/setup/usetup/inicache.c @@ -467,21 +467,13 @@ IniCacheGetKeyValue( /* PUBLIC FUNCTIONS *********************************************************/ NTSTATUS -IniCacheLoad( +IniCacheLoadFromMemory( PINICACHE *Cache, - PWCHAR FileName, + PCHAR FileBuffer, + ULONG FileLength, BOOLEAN String) { - UNICODE_STRING Name; - OBJECT_ATTRIBUTES ObjectAttributes; - FILE_STANDARD_INFORMATION FileInfo; - IO_STATUS_BLOCK IoStatusBlock; - HANDLE FileHandle; - NTSTATUS Status; - PCHAR FileBuffer; - ULONG FileLength; PCHAR Ptr; - LARGE_INTEGER FileOffset; PINICACHESECTION Section; PINICACHEKEY Key; @@ -495,6 +487,96 @@ IniCacheLoad( PCHAR KeyValue; ULONG KeyValueSize; + /* Allocate inicache header */ + *Cache = (PINICACHE)RtlAllocateHeap(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(INICACHE)); + if (*Cache == NULL) + { + DPRINT("RtlAllocateHeap() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Parse ini file */ + Section = NULL; + Ptr = FileBuffer; + while (Ptr != NULL && *Ptr != 0) + { + Ptr = IniCacheSkipWhitespace(Ptr); + if (Ptr == NULL) + continue; + + if (*Ptr == '[') + { + Section = NULL; + Ptr++; + + Ptr = IniCacheGetSectionName(Ptr, + &SectionName, + &SectionNameSize); + + DPRINT1("[%.*s]\n", SectionNameSize, SectionName); + + Section = IniCacheAddSection(*Cache, + SectionName, + SectionNameSize); + if (Section == NULL) + { + DPRINT("IniCacheAddSection() failed\n"); + Ptr = IniCacheSkipToNextSection(Ptr); + continue; + } + } + else + { + if (Section == NULL) + { + Ptr = IniCacheSkipToNextSection(Ptr); + continue; + } + + Ptr = IniCacheGetKeyName(Ptr, + &KeyName, + &KeyNameSize); + + Ptr = IniCacheGetKeyValue(Ptr, + &KeyValue, + &KeyValueSize, + String); + + DPRINT1("'%.*s' = '%.*s'\n", KeyNameSize, KeyName, KeyValueSize, KeyValue); + + Key = IniCacheAddKey(Section, + KeyName, + KeyNameSize, + KeyValue, + KeyValueSize); + if (Key == NULL) + { + DPRINT("IniCacheAddKey() failed\n"); + } + } + } + + return STATUS_SUCCESS; +} + +NTSTATUS +IniCacheLoad( + PINICACHE *Cache, + PWCHAR FileName, + BOOLEAN String) +{ + UNICODE_STRING Name; + OBJECT_ATTRIBUTES ObjectAttributes; + FILE_STANDARD_INFORMATION FileInfo; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE FileHandle; + NTSTATUS Status; + PCHAR FileBuffer; + ULONG FileLength; + LARGE_INTEGER FileOffset; + *Cache = NULL; /* Open ini file */ @@ -568,84 +650,18 @@ IniCacheLoad( if (!NT_SUCCESS(Status)) { DPRINT("NtReadFile() failed (Status %lx)\n", Status); - RtlFreeHeap(ProcessHeap, 0, FileBuffer); - return Status; + goto Quit; } - /* Allocate inicache header */ - *Cache = (PINICACHE)RtlAllocateHeap(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(INICACHE)); - if (*Cache == NULL) - { - DPRINT("RtlAllocateHeap() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Parse ini file */ - Section = NULL; - Ptr = FileBuffer; - while (Ptr != NULL && *Ptr != 0) + Status = IniCacheLoadFromMemory(Cache, FileBuffer, FileLength, String); + if (!NT_SUCCESS(Status)) { - Ptr = IniCacheSkipWhitespace(Ptr); - if (Ptr == NULL) - continue; - - if (*Ptr == '[') - { - Section = NULL; - Ptr++; - - Ptr = IniCacheGetSectionName(Ptr, - &SectionName, - &SectionNameSize); - - DPRINT1("[%.*s]\n", SectionNameSize, SectionName); - - Section = IniCacheAddSection(*Cache, - SectionName, - SectionNameSize); - if (Section == NULL) - { - DPRINT("IniCacheAddSection() failed\n"); - Ptr = IniCacheSkipToNextSection(Ptr); - continue; - } - } - else - { - if (Section == NULL) - { - Ptr = IniCacheSkipToNextSection(Ptr); - continue; - } - - Ptr = IniCacheGetKeyName(Ptr, - &KeyName, - &KeyNameSize); - - Ptr = IniCacheGetKeyValue(Ptr, - &KeyValue, - &KeyValueSize, - String); - - DPRINT1("'%.*s' = '%.*s'\n", KeyNameSize, KeyName, KeyValueSize, KeyValue); - - Key = IniCacheAddKey(Section, - KeyName, - KeyNameSize, - KeyValue, - KeyValueSize); - if (Key == NULL) - { - DPRINT("IniCacheAddKey() failed\n"); - } - } + DPRINT1("IniCacheLoadFromMemory() failed (Status %lx)\n", Status); } - /* Free file buffer */ +Quit: + /* Free the file buffer, and return */ RtlFreeHeap(ProcessHeap, 0, FileBuffer); - return Status; } diff --git a/base/setup/usetup/inicache.h b/base/setup/usetup/inicache.h index 3a26332ab9..8e12103e28 100644 --- a/base/setup/usetup/inicache.h +++ b/base/setup/usetup/inicache.h @@ -73,6 +73,13 @@ typedef enum /* FUNCTIONS ****************************************************************/ +NTSTATUS +IniCacheLoadFromMemory( + PINICACHE *Cache, + PCHAR FileBuffer, + ULONG FileLength, + BOOLEAN String); + NTSTATUS IniCacheLoad( PINICACHE *Cache,

1 0

04/05: [USETUP] Improve the FileSup module.
by Hermès Bélusca-Maïto 27 May '18

27 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38e988ace7a68e1890bdd… commit 38e988ace7a68e1890bdd3625fe73a5341cc1bad Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 21 23:45:43 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 27 20:18:53 2018 +0200 [USETUP] Improve the FileSup module. - Add a NtPathToDiskPartComponents() helper, that takes in input a fully qualified NT path to a file on hard disk, e.g.: \Device\Harddisk1\Partition2\foo\bar, and returns in output the disk number ('1'), the partition number ('2'), and the the path component "\foo\bar" that is after the device-harddisk-partition identifier. - Make the OpenAndMapFile() return the file size of the opened file. Both of these additions will be used soon. - Turn a isspace() call into a iswspace() one. svn path=/branches/setup_improvements/; revision=74619 --- base/setup/usetup/filesup.c | 141 +++++++++++++++++++++++++++++++++++++++++++- base/setup/usetup/filesup.h | 10 +++- 2 files changed, 148 insertions(+), 3 deletions(-) diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index 293e590b76..49defff553 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -501,7 +501,7 @@ IsValidPath( /* Path must not contain whitespace characters */ for (i = 0; i < Length; i++) { - if (isspace(InstallDir[i])) + if (iswspace(InstallDir[i])) return FALSE; } @@ -633,6 +633,117 @@ DoesFileExist( return NT_SUCCESS(Status); } +/* + * The format of NtPath should be: + * \Device\HarddiskXXX\PartitionYYY[\path] , + * where XXX and YYY respectively represent the hard disk and partition numbers, + * and [\path] represent an optional path (separated by '\\'). + * + * If a NT path of such a form is correctly parsed, the function returns respectively: + * - in pDiskNumber: the hard disk number XXX, + * - in pPartNumber: the partition number YYY, + * - in PathComponent: pointer value (inside NtPath) to the beginning of \path. + * + * NOTE: The function does not accept leading whitespace. + */ +BOOLEAN +NtPathToDiskPartComponents( + IN PCWSTR NtPath, + OUT PULONG pDiskNumber, + OUT PULONG pPartNumber, + OUT PCWSTR* PathComponent OPTIONAL) +{ + ULONG DiskNumber, PartNumber; + PCWSTR Path; + + *pDiskNumber = 0; + *pPartNumber = 0; + if (PathComponent) *PathComponent = NULL; + + Path = NtPath; + + if (_wcsnicmp(Path, L"\\Device\\Harddisk", 16) != 0) + { + /* The NT path doesn't start with the prefix string, thus it cannot be a hard disk device path */ + DPRINT1("'%S' : Not a possible hard disk device.\n", NtPath); + return FALSE; + } + + Path += 16; + + /* A number must be present now */ + if (!iswdigit(*Path)) + { + DPRINT1("'%S' : expected a number! Not a regular hard disk device.\n", Path); + return FALSE; + } + DiskNumber = wcstoul(Path, (PWSTR*)&Path, 10); + + /* Either NULL termination, or a path separator must be present now */ + if (!Path) + { + DPRINT1("An error happened!\n"); + return FALSE; + } + else if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) + { + DPRINT1("'%S' : expected a path separator!\n", Path); + return FALSE; + } + + if (!*Path) + { + DPRINT1("The path only specified a hard disk (and nothing else, like a partition...), so we stop there.\n"); + goto Quit; + } + + /* Here, *Path == L'\\' */ + + if (_wcsnicmp(Path, L"\\Partition", 10) != 0) + { + /* Actually, \Partition is optional so, if we don't have it, we still return success. Or should we? */ + DPRINT1("'%S' : unexpected format!\n", NtPath); + goto Quit; + } + + Path += 10; + + /* A number must be present now */ + if (!iswdigit(*Path)) + { + /* If we don't have a number it means this part of path is actually not a partition specifier, so we shouldn't fail either. Or should we? */ + DPRINT1("'%S' : expected a number!\n", Path); + goto Quit; + } + PartNumber = wcstoul(Path, (PWSTR*)&Path, 10); + + /* Either NULL termination, or a path separator must be present now */ + if (!Path) + { + /* We fail here because wcstoul failed for whatever reason */ + DPRINT1("An error happened!\n"); + return FALSE; + } + else if (*Path && *Path != OBJ_NAME_PATH_SEPARATOR) + { + /* We shouldn't fail here because it just means this part of path is actually not a partition specifier. Or should we? */ + DPRINT1("'%S' : expected a path separator!\n", Path); + goto Quit; + } + + /* OK, here we really have a partition specifier: return its number */ + *pPartNumber = PartNumber; + +Quit: + /* Return the disk number */ + *pDiskNumber = DiskNumber; + + /* Return the path component also, if the user wants it */ + if (PathComponent) *PathComponent = Path; + + return TRUE; +} + NTSTATUS OpenAndMapFile( IN HANDLE RootDirectory OPTIONAL, @@ -640,7 +751,8 @@ OpenAndMapFile( IN PCWSTR FileName, // OPTIONAL OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL OUT PHANDLE SectionHandle, - OUT PVOID* BaseAddress) + OUT PVOID* BaseAddress, + OUT PULONG FileSize OPTIONAL) { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; @@ -681,6 +793,31 @@ OpenAndMapFile( return Status; } + if (FileSize) + { + /* Query the file size */ + FILE_STANDARD_INFORMATION FileInfo; + Status = NtQueryInformationFile(*FileHandle, + &IoStatusBlock, + &FileInfo, + sizeof(FileInfo), + FileStandardInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtQueryInformationFile() failed (Status %lx)\n", Status); + NtClose(*FileHandle); + *FileHandle = NULL; + return Status; + } + + if (FileInfo.EndOfFile.HighPart != 0) + DPRINT1("WARNING!! The file %wZ is too large!\n", Name); + + *FileSize = FileInfo.EndOfFile.LowPart; + + DPRINT("File size: %lu\n", *FileSize); + } + /* Map the file in memory */ /* Create the section */ diff --git a/base/setup/usetup/filesup.h b/base/setup/usetup/filesup.h index 492dff0e87..317fad93be 100644 --- a/base/setup/usetup/filesup.h +++ b/base/setup/usetup/filesup.h @@ -63,6 +63,13 @@ DoesFileExist( IN PCWSTR PathName OPTIONAL, IN PCWSTR FileName); +BOOLEAN +NtPathToDiskPartComponents( + IN PCWSTR NtPath, + OUT PULONG pDiskNumber, + OUT PULONG pPartNumber, + OUT PCWSTR* PathComponent OPTIONAL); + NTSTATUS OpenAndMapFile( IN HANDLE RootDirectory OPTIONAL, @@ -70,7 +77,8 @@ OpenAndMapFile( IN PCWSTR FileName, // OPTIONAL OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL OUT PHANDLE SectionHandle, - OUT PVOID* BaseAddress); + OUT PVOID* BaseAddress, + OUT PULONG FileSize OPTIONAL); BOOLEAN UnMapFile(

1 0

03/05: [USETUP] Code fixups after the introduction of the SetupLib.
by Hermès Bélusca-Maïto 27 May '18

27 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ed0e1c84a78d91fb3c18… commit 1ed0e1c84a78d91fb3c18cb8bccc44e4e3e32ff0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu May 18 01:05:39 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 27 20:18:52 2018 +0200 [USETUP] Code fixups after the introduction of the SetupLib. - Use the previously-introduced 'PreparePartitionForFormatting()' function; set the FormatState of the newly-formatted partition to Formatted. - Remove the hackish call to CreateFileSystemList() in SelectFileSystemPage(). - Move 'TempPartition' and 'FormatState' back to USETUP. - Put large "case"-blocks into brackets. svn path=/branches/setup_improvements/; revision=74575 svn path=/branches/setup_improvements/; revision=74576 --- base/setup/usetup/usetup.c | 162 +++++++++++++++------------------------------ 1 file changed, 54 insertions(+), 108 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 6d1378ca7b..888c73fce0 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -59,7 +59,11 @@ WCHAR DefaultLanguage[20]; WCHAR DefaultKBLayout[20]; BOOLEAN RepairUpdateFlag = FALSE; HANDLE hPnpThread = INVALID_HANDLE_VALUE; + PPARTLIST PartitionList = NULL; +PPARTENTRY TempPartition = NULL; +FORMATMACHINESTATE FormatState = Start; + /* LOCALS *******************************************************************/ @@ -87,7 +91,7 @@ static UNICODE_STRING DestinationPath; static UNICODE_STRING DestinationArcPath; static UNICODE_STRING DestinationRootPath; -static WCHAR DestinationDriveLetter; +static WCHAR DestinationDriveLetter; // FIXME: Is it really useful?? static HINF SetupInf; @@ -1528,6 +1532,9 @@ SelectPartitionPage(PINPUT_RECORD Ir) MUIDisplayError(ERROR_NO_HDD, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } + + TempPartition = NULL; + FormatState = Start; } InitPartitionListUi(&ListUi, PartitionList, @@ -2631,100 +2638,95 @@ SelectFileSystemPage(PINPUT_RECORD Ir) return QUIT_PAGE; } -#if 0 - /*** HACK! ***/ - if (FileSystemList == NULL) - { - FileSystemList = CreateFileSystemList(6, 26, PartitionList->CurrentPartition->New, L"FAT"); - if (FileSystemList == NULL) - { - /* FIXME: show an error dialog */ - return QUIT_PAGE; - } - - /* FIXME: Add file systems to list */ - } -#endif - /* Find or set the active system partition */ - CheckActiveSystemPartition(PartitionList /*, FileSystemList*/); + CheckActiveSystemPartition(PartitionList); if (PartitionList->SystemPartition == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; } - PreviousFormatState = PartitionList->FormatState; - switch (PartitionList->FormatState) + PreviousFormatState = FormatState; + switch (FormatState) { case Start: + { if (PartitionList->CurrentPartition != PartitionList->SystemPartition) { - PartitionList->TempPartition = PartitionList->SystemPartition; - PartitionList->TempPartition->NeedsCheck = TRUE; + TempPartition = PartitionList->SystemPartition; + TempPartition->NeedsCheck = TRUE; - PartitionList->FormatState = FormatSystemPartition; + FormatState = FormatSystemPartition; DPRINT1("FormatState: Start --> FormatSystemPartition\n"); } else { - PartitionList->TempPartition = PartitionList->CurrentPartition; - PartitionList->TempPartition->NeedsCheck = TRUE; + TempPartition = PartitionList->CurrentPartition; + TempPartition->NeedsCheck = TRUE; - PartitionList->FormatState = FormatInstallPartition; + FormatState = FormatInstallPartition; DPRINT1("FormatState: Start --> FormatInstallPartition\n"); } break; + } case FormatSystemPartition: - PartitionList->TempPartition = PartitionList->CurrentPartition; - PartitionList->TempPartition->NeedsCheck = TRUE; + { + TempPartition = PartitionList->CurrentPartition; + TempPartition->NeedsCheck = TRUE; - PartitionList->FormatState = FormatInstallPartition; + FormatState = FormatInstallPartition; DPRINT1("FormatState: FormatSystemPartition --> FormatInstallPartition\n"); break; + } case FormatInstallPartition: + { if (GetNextUnformattedPartition(PartitionList, NULL, - &PartitionList->TempPartition)) + &TempPartition)) { - PartitionList->FormatState = FormatOtherPartition; - PartitionList->TempPartition->NeedsCheck = TRUE; + FormatState = FormatOtherPartition; + TempPartition->NeedsCheck = TRUE; DPRINT1("FormatState: FormatInstallPartition --> FormatOtherPartition\n"); } else { - PartitionList->FormatState = FormatDone; + FormatState = FormatDone; DPRINT1("FormatState: FormatInstallPartition --> FormatDone\n"); return CHECK_FILE_SYSTEM_PAGE; } break; + } case FormatOtherPartition: + { if (GetNextUnformattedPartition(PartitionList, NULL, - &PartitionList->TempPartition)) + &TempPartition)) { - PartitionList->FormatState = FormatOtherPartition; - PartitionList->TempPartition->NeedsCheck = TRUE; + FormatState = FormatOtherPartition; + TempPartition->NeedsCheck = TRUE; DPRINT1("FormatState: FormatOtherPartition --> FormatOtherPartition\n"); } else { - PartitionList->FormatState = FormatDone; + FormatState = FormatDone; DPRINT1("FormatState: FormatOtherPartition --> FormatDone\n"); return CHECK_FILE_SYSTEM_PAGE; } break; + } default: - DPRINT1("FormatState: Invalid value %ld\n", PartitionList->FormatState); + { + DPRINT1("FormatState: Invalid value %ld\n", FormatState); /* FIXME: show an error dialog */ return QUIT_PAGE; + } } - PartEntry = PartitionList->TempPartition; + PartEntry = TempPartition; DiskEntry = PartEntry->DiskEntry; /* Adjust disk size */ @@ -2785,7 +2787,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) } else if (PartEntry->New != FALSE) { - switch (PartitionList->FormatState) + switch (FormatState) { case FormatSystemPartition: CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDSYSTEMPART)); @@ -2851,8 +2853,6 @@ SelectFileSystemPage(PINPUT_RECORD Ir) /* FIXME: show an error dialog */ return QUIT_PAGE; } - - /* FIXME: Add file systems to list */ } DrawFileSystemList(FileSystemList); @@ -2874,7 +2874,6 @@ SelectFileSystemPage(PINPUT_RECORD Ir) * which file system to use in unattended installations, in the * txtsetup.sif file. */ - // PartEntry->FileSystem = GetFileSystemByName(FileSystemList, L"FAT"); return FORMAT_PARTITION_PAGE; } @@ -2896,7 +2895,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ { - PartitionList->FormatState = Start; + FormatState = Start; return SELECT_PARTITION_PAGE; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && @@ -2912,18 +2911,13 @@ SelectFileSystemPage(PINPUT_RECORD Ir) else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { if (!FileSystemList->Selected->FileSystem) - { return SELECT_FILE_SYSTEM_PAGE; - } else - { - // PartEntry->FileSystem = FileSystemList->Selected; return FORMAT_PARTITION_PAGE; - } } } - PartitionList->FormatState = PreviousFormatState; + FormatState = PreviousFormatState; return SELECT_FILE_SYSTEM_PAGE; } @@ -2964,17 +2958,16 @@ FormatPartitionPage(PINPUT_RECORD Ir) MUIDisplayPage(FORMAT_PARTITION_PAGE); - if (PartitionList == NULL || - PartitionList->TempPartition == NULL) + if (PartitionList == NULL || TempPartition == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; } - PartEntry = PartitionList->TempPartition; + PartEntry = TempPartition; DiskEntry = PartEntry->DiskEntry; - SelectedFileSystem = FileSystemList->Selected; // PartEntry->FileSystem; // FIXME!!!! + SelectedFileSystem = FileSystemList->Selected; while (TRUE) { @@ -2995,60 +2988,7 @@ FormatPartitionPage(PINPUT_RECORD Ir) { CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - if (wcscmp(SelectedFileSystem->FileSystemName, L"FAT") == 0) - { - if (PartEntry->SectorCount.QuadPart < 8192) - { - /* FAT12 CHS partition (disk is smaller than 4.1MB) */ - SetPartitionType(PartEntry, PARTITION_FAT_12); - } - else if (PartEntry->StartSector.QuadPart < 1450560) - { - /* Partition starts below the 8.4GB boundary ==> CHS partition */ - - if (PartEntry->SectorCount.QuadPart < 65536) - { - /* FAT16 CHS partition (partition size < 32MB) */ - SetPartitionType(PartEntry, PARTITION_FAT_16); - } - else if (PartEntry->SectorCount.QuadPart < 1048576) - { - /* FAT16 CHS partition (partition size < 512MB) */ - SetPartitionType(PartEntry, PARTITION_HUGE); - } - else - { - /* FAT32 CHS partition (partition size >= 512MB) */ - SetPartitionType(PartEntry, PARTITION_FAT32); - } - } - else - { - /* Partition starts above the 8.4GB boundary ==> LBA partition */ - - if (PartEntry->SectorCount.QuadPart < 1048576) - { - /* FAT16 LBA partition (partition size < 512MB) */ - SetPartitionType(PartEntry, PARTITION_XINT13); - } - else - { - /* FAT32 LBA partition (partition size >= 512MB) */ - SetPartitionType(PartEntry, PARTITION_FAT32_XINT13); - } - } - } -#if 0 - else if (wcscmp(SelectedFileSystem->FileSystemName, L"EXT2") == 0) - { - SetPartitionType(PartEntry, PARTITION_EXT2); - } - else if (wcscmp(SelectedFileSystem->FileSystemName, L"NTFS") == 0) - { - SetPartitionType(PartEntry, PARTITION_IFS); - } -#endif - else if (!SelectedFileSystem->FileSystem) + if (!PreparePartitionForFormatting(PartEntry, SelectedFileSystem->FileSystem)) { /* FIXME: show an error dialog */ return QUIT_PAGE; @@ -3081,7 +3021,8 @@ FormatPartitionPage(PINPUT_RECORD Ir) } #endif - if (WritePartitionsToDisk(PartitionList) == FALSE) + /* Commit the partition changes to the disk */ + if (!WritePartitionsToDisk(PartitionList)) { DPRINT("WritePartitionsToDisk() failed\n"); MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); @@ -3097,6 +3038,7 @@ FormatPartitionPage(PINPUT_RECORD Ir) PathBuffer); DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); + /* Format the partition */ if (SelectedFileSystem->FileSystem) { Status = FormatPartition(&PartitionRootPath, @@ -3108,6 +3050,8 @@ FormatPartitionPage(PINPUT_RECORD Ir) return QUIT_PAGE; } + PartEntry->FormatState = Formatted; + // PartEntry->FileSystem = FileSystem; PartEntry->New = FALSE; } @@ -4598,6 +4542,8 @@ QuitPage(PINPUT_RECORD Ir) DestroyPartitionList(PartitionList); PartitionList = NULL; } + TempPartition = NULL; + FormatState = Start; /* Destroy the filesystem list */ if (FileSystemList != NULL)

1 0

02/05: [SETUPLIB] Consolidate the FsUtil and PartList modules of the SetupLib.
by Hermès Bélusca-Maïto 27 May '18

27 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1716749bcbc33c24a9983… commit 1716749bcbc33c24a9983849dd7c88e408de0cf5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed May 17 23:31:52 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 27 20:18:51 2018 +0200 [SETUPLIB] Consolidate the FsUtil and PartList modules of the SetupLib. - Add a PreparePartitionForFormatting routine that sets the partition ID depending on the chosen filesystem. - The 'FORMATMACHINESTATE FormatState' machine-state and the 'TempPartition' members of the partition list structure is purely a USETUP convenience, so remove them from the PARTLIST structure and move them back into USETUP. - Attempt to recognize the filesystem (set the 'FileSystem' member of PARTENTRY) of partitions we are adding into the PARTLIST list. - Fix the return value of the SelectPartition function, which is by the way completely broken (it doesn't do what it is supposed to do; alternatively its naming is completely wrong...). svn path=/branches/setup_improvements/; revision=74572 svn path=/branches/setup_improvements/; revision=74573 --- base/setup/lib/fsutil.c | 142 +++++++++++++++++++++++++++++++++++++++++-- base/setup/lib/fsutil.h | 6 ++ base/setup/lib/partlist.c | 83 ++++--------------------- base/setup/lib/partlist.h | 22 +------ base/setup/usetup/partlist.h | 2 - 5 files changed, 155 insertions(+), 100 deletions(-) diff --git a/base/setup/lib/fsutil.c b/base/setup/lib/fsutil.c index 468fed9284..16da7f5a56 100644 --- a/base/setup/lib/fsutil.c +++ b/base/setup/lib/fsutil.c @@ -24,23 +24,28 @@ #include "fsutil.h" #include "partlist.h" -/** For FileSystems **/ #include <fslib/vfatlib.h> -#include <fslib/ext2lib.h> +// #include <fslib/ext2lib.h> // #include <fslib/ntfslib.h> #define NDEBUG #include <debug.h> - FILE_SYSTEM RegisteredFileSystems[] = { { L"FAT" , VfatFormat, VfatChkdsk }, // { L"FAT32", VfatFormat, VfatChkdsk }, #if 0 + { L"FATX" , VfatxFormat, VfatxChkdsk }, + { L"NTFS" , NtfsFormat, NtfsChkdsk }, + { L"EXT2" , Ext2Format, Ext2Chkdsk }, - { L"NTFS" , NtfsFormat, NtfsChkdsk } + { L"EXT3" , Ext2Format, Ext2Chkdsk }, + { L"EXT4" , Ext2Format, Ext2Chkdsk }, + { L"BTRFS", BtrfsFormatEx, BtrfsChkdskEx }, + { L"FFS" , FfsFormat , FfsChkdsk }, + { L"REISERFS", ReiserfsFormat, ReiserfsChkdsk }, #endif }; @@ -198,7 +203,44 @@ GetFileSystem( CurrentFileSystem = NULL; -#if 0 // FIXME: To be fully enabled when our storage stack & al. will work better! +#if 0 // This is an example of old code... + + 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 (CheckFatFormat()) + FileSystemName = L"FAT"; + else + FileSystemName = NULL; + } + else if (PartEntry->PartitionType == PARTITION_EXT2) + { + if (CheckExt2Format()) + FileSystemName = L"EXT2"; + else + FileSystemName = NULL; + } + else if (PartEntry->PartitionType == PARTITION_IFS) + { + if (CheckNtfsFormat()) + FileSystemName = L"NTFS"; + else if (CheckHpfsFormat()) + FileSystemName = L"HPFS"; + else + FileSystemName = NULL; + } + else + { + FileSystemName = NULL; + } + +#endif + +#if 0 // FIXME: To be fully enabled when our storage stack & al. work better! /* * We don't have one... @@ -246,11 +288,13 @@ GetFileSystem( { // WARNING: See the warning above. FileSystemName = L"EXT2"; + // FIXME: We may have EXT3, 4 too... } else if (PartEntry->PartitionType == PARTITION_IFS) { // WARNING: See the warning above. FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */ + // FIXME: We may have HPFS too... } #if 0 @@ -268,9 +312,95 @@ Quit: // For code temporarily disabled above PartEntry->PartitionType, FileSystemName ? FileSystemName : L"None"); if (FileSystemName != NULL) - CurrentFileSystem = GetFileSystemByName(/*FileSystemList,*/ FileSystemName); + CurrentFileSystem = GetFileSystemByName(FileSystemName); return CurrentFileSystem; } + +// +// Formatting routines +// + +BOOLEAN +PreparePartitionForFormatting( + IN struct _PARTENTRY* PartEntry, + IN PFILE_SYSTEM FileSystem) +{ + if (!FileSystem) + { + DPRINT1("No file system specified?\n"); + return FALSE; + } + + if (wcscmp(FileSystem->FileSystemName, L"FAT") == 0) + { + if (PartEntry->SectorCount.QuadPart < 8192) + { + /* FAT12 CHS partition (disk is smaller than 4.1MB) */ + SetPartitionType(PartEntry, PARTITION_FAT_12); + } + else if (PartEntry->StartSector.QuadPart < 1450560) + { + /* Partition starts below the 8.4GB boundary ==> CHS partition */ + + if (PartEntry->SectorCount.QuadPart < 65536) + { + /* FAT16 CHS partition (partition size < 32MB) */ + SetPartitionType(PartEntry, PARTITION_FAT_16); + } + else if (PartEntry->SectorCount.QuadPart < 1048576) + { + /* FAT16 CHS partition (partition size < 512MB) */ + SetPartitionType(PartEntry, PARTITION_HUGE); + } + else + { + /* FAT32 CHS partition (partition size >= 512MB) */ + SetPartitionType(PartEntry, PARTITION_FAT32); + } + } + else + { + /* Partition starts above the 8.4GB boundary ==> LBA partition */ + + if (PartEntry->SectorCount.QuadPart < 1048576) + { + /* FAT16 LBA partition (partition size < 512MB) */ + SetPartitionType(PartEntry, PARTITION_XINT13); + } + else + { + /* FAT32 LBA partition (partition size >= 512MB) */ + SetPartitionType(PartEntry, PARTITION_FAT32_XINT13); + } + } + } +#if 0 + else if (wcscmp(FileSystem->FileSystemName, L"EXT2") == 0) + { + SetPartitionType(PartEntry, PARTITION_EXT2); + } + else if (wcscmp(FileSystem->FileSystemName, L"NTFS") == 0) + { + SetPartitionType(PartEntry, PARTITION_IFS); + } +#endif + else + { + /* Unknown file system? */ + DPRINT1("Unknown file system \"%S\"?\n", FileSystem->FileSystemName); + return FALSE; + } + +// +// 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; + + return TRUE; +} + /* EOF */ diff --git a/base/setup/lib/fsutil.h b/base/setup/lib/fsutil.h index 9d6d4a0a92..6fbd864f83 100644 --- a/base/setup/lib/fsutil.h +++ b/base/setup/lib/fsutil.h @@ -31,4 +31,10 @@ GetFileSystem( // IN PFILE_SYSTEM_LIST FileSystemList, IN struct _PARTENTRY* PartEntry); + +BOOLEAN +PreparePartitionForFormatting( + IN struct _PARTENTRY* PartEntry, + IN PFILE_SYSTEM FileSystem); + /* EOF */ diff --git a/base/setup/lib/partlist.c b/base/setup/lib/partlist.c index 40661b0126..583544b96c 100644 --- a/base/setup/lib/partlist.c +++ b/base/setup/lib/partlist.c @@ -487,6 +487,7 @@ AddPartitionToDisk( PPARTENTRY PartEntry; PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartitionIndex]; + if (PartitionInfo->PartitionType == PARTITION_ENTRY_UNUSED || ((LogicalPartition != FALSE) && IsContainerPartition(PartitionInfo->PartitionType))) { @@ -497,9 +498,7 @@ AddPartitionToDisk( HEAP_ZERO_MEMORY, sizeof(PARTENTRY)); if (PartEntry == NULL) - { return; - } PartEntry->DiskEntry = DiskEntry; @@ -523,12 +522,10 @@ AddPartitionToDisk( if (LogicalPartition == FALSE && DiskEntry->ExtendedPartition == NULL) DiskEntry->ExtendedPartition = PartEntry; } -#if 0 else if (IsRecognizedPartition(PartEntry->PartitionType)) { - // FIXME FIXME! We should completely rework how we get this 'FileSystemList' available... - PartEntry->FileSystem = GetFileSystem(/*FileSystemList,*/ PartEntry); - if (!PartEntry->FileSystem) + PartEntry->FileSystem = GetFileSystem(PartEntry); + if (PartEntry->FileSystem) PartEntry->FormatState = Preformatted; else PartEntry->FormatState = Unformatted; @@ -536,63 +533,7 @@ AddPartitionToDisk( } else { - /* Unknown partition, so unknown partition format (may or may not be actually formatted) */ - PartEntry->FormatState = UnknownFormat; - } -#endif - else 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 0 - if (CheckFatFormat()) - { - PartEntry->FormatState = Preformatted; - } - else - { - PartEntry->FormatState = Unformatted; - } -#endif - PartEntry->FormatState = Preformatted; - } - else if (PartEntry->PartitionType == PARTITION_EXT2) - { -#if 0 - if (CheckExt2Format()) - { - PartEntry->FormatState = Preformatted; - } - else - { - PartEntry->FormatState = Unformatted; - } -#endif - PartEntry->FormatState = Preformatted; - } - else if (PartEntry->PartitionType == PARTITION_IFS) - { -#if 0 - if (CheckNtfsFormat()) - { - PartEntry->FormatState = Preformatted; - } - else if (CheckHpfsFormat()) - { - PartEntry->FormatState = Preformatted; - } - else - { - PartEntry->FormatState = Unformatted; - } -#endif - PartEntry->FormatState = Preformatted; - } - else - { + /* Unknown partition, hence unknown partition format (may or may not be actually formatted) */ PartEntry->FormatState = UnknownFormat; } @@ -1257,9 +1198,6 @@ CreatePartitionList(VOID) List->SystemPartition = NULL; List->OriginalSystemPartition = NULL; - List->TempPartition = NULL; - List->FormatState = Start; - InitializeListHead(&List->DiskListHead); InitializeListHead(&List->BiosDiskListHead); @@ -1392,7 +1330,10 @@ DestroyPartitionList( RtlFreeHeap(ProcessHeap, 0, List); } -ULONG +// +// FIXME: This function is COMPLETELY BROKEN!!!! +// +BOOLEAN SelectPartition( IN PPARTLIST List, IN ULONG DiskNumber, @@ -2396,9 +2337,7 @@ DeleteCurrentPartition( VOID CheckActiveSystemPartition( - IN PPARTLIST List // , - // IN PFILE_SYSTEM_LIST FileSystemList /* Needed for checking the FS of the candidate system partition */ - ) + IN PPARTLIST List) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -2575,7 +2514,7 @@ CheckActiveSystemPartition( * NOTE also that for those architectures looking for a * partition boot indicator is insufficient. */ - FileSystem = GetFileSystem(/*FileSystemList,*/ List->OriginalSystemPartition); + FileSystem = GetFileSystem(List->OriginalSystemPartition); if (FileSystem == NULL) { DPRINT1("System partition %lu in disk %lu with no FS?!\n", @@ -2584,7 +2523,7 @@ CheckActiveSystemPartition( goto FindAndUseAlternativeSystemPartition; } // HACK: WARNING: We cannot write on this FS yet! - // See fslist.c:GetFileSystem() + // See fsutil.c:GetFileSystem() if (List->OriginalSystemPartition->PartitionType == PARTITION_EXT2 || List->OriginalSystemPartition->PartitionType == PARTITION_IFS) { diff --git a/base/setup/lib/partlist.h b/base/setup/lib/partlist.h index 80a8823fb5..7a6cec9487 100644 --- a/base/setup/lib/partlist.h +++ b/base/setup/lib/partlist.h @@ -17,19 +17,6 @@ typedef enum _FORMATSTATE Formatted } FORMATSTATE, *PFORMATSTATE; -typedef enum _FORMATMACHINESTATE -{ - Start, - FormatSystemPartition, - FormatInstallPartition, - FormatOtherPartition, - FormatDone, - CheckSystemPartition, - CheckInstallPartition, - CheckOtherPartition, - CheckDone -} FORMATMACHINESTATE, *PFORMATMACHINESTATE; - struct _FILE_SYSTEM; typedef struct _PARTENTRY @@ -163,9 +150,6 @@ typedef struct _PARTLIST */ PPARTENTRY OriginalSystemPartition; - PPARTENTRY TempPartition; - FORMATMACHINESTATE FormatState; - LIST_ENTRY DiskListHead; LIST_ENTRY BiosDiskListHead; @@ -234,7 +218,7 @@ VOID DestroyPartitionList( IN PPARTLIST List); -ULONG +BOOLEAN SelectPartition( IN PPARTLIST List, IN ULONG DiskNumber, @@ -271,9 +255,7 @@ DeleteCurrentPartition( VOID CheckActiveSystemPartition( - IN PPARTLIST List // , - // IN PFILE_SYSTEM_LIST FileSystemList /* Needed for checking the FS of the candidate system partition */ - ); + IN PPARTLIST List); BOOLEAN WritePartitionsToDisk( diff --git a/base/setup/usetup/partlist.h b/base/setup/usetup/partlist.h index 2ad6041d33..b8caf457d4 100644 --- a/base/setup/usetup/partlist.h +++ b/base/setup/usetup/partlist.h @@ -27,7 +27,6 @@ #include "../lib/partlist.h" -#if 0 typedef enum _FORMATMACHINESTATE { Start, @@ -40,7 +39,6 @@ typedef enum _FORMATMACHINESTATE CheckOtherPartition, CheckDone } FORMATMACHINESTATE, *PFORMATMACHINESTATE; -#endif typedef struct _PARTLIST_UI {

1 0

01/05: [SETUPLIB][USETUP] Introduce a 'SetupLib' library. CORE-13544
by Hermès Bélusca-Maïto 27 May '18

27 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a19ee6a9613e5408691f… commit 3a19ee6a9613e5408691f4b43028c4fd11e6c92d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed May 17 23:37:41 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 27 20:18:50 2018 +0200 [SETUPLIB][USETUP] Introduce a 'SetupLib' library. CORE-13544 - Create the beginnings of a "setuplib" library, whose aim is to be shared between the (currently existing) 1st-stage text-mode installer, and the (future) 1st-stage GUI installer. - Finish to split the GenList and PartList codes into their UI part, which remain in usetup, and their algorithmic part, which go into setuplib. - Move SetMountedDeviceValue into the PartList module. - Split the FileSystem list code into its UI and the algorithmic part (which goes into setuplib under the name fsutil.c). * The algo part is meant to be able to manage the filesystems available on the running system, similarly to what is mostly done (in scattered form) in fmifs, format, chkdsk / autochk codes... It also manages the partition filesystem recognition, using OS routines. * The UI part manages the FS list as it appears on screen, showing only the possible FSes that can be used to format the selected partition (a bit similar to what we do in the shell32's drive.c, etc...). - Adapt the calling code to these changes. - Remove some "host" code that was dating back from the dark old times. svn path=/branches/setup_improvements/; revision=74570 svn path=/branches/setup_improvements/; revision=74659 --- base/setup/CMakeLists.txt | 1 + base/setup/lib/CMakeLists.txt | 10 + base/setup/lib/errorcode.h | 59 + base/setup/{usetup/fslist.c => lib/fsutil.c} | 283 +- base/setup/lib/fsutil.h | 34 + base/setup/lib/genlist.c | 182 ++ base/setup/lib/genlist.h | 87 + base/setup/lib/linklist.h | 26 + base/setup/{usetup => lib}/partlist.c | 940 +------ base/setup/{usetup => lib}/partlist.h | 114 +- base/setup/lib/precomp.h | 62 + base/setup/lib/setuplib.h | 34 + base/setup/usetup/CMakeLists.txt | 6 +- base/setup/usetup/bootsup.c | 19 +- base/setup/usetup/chkdsk.c | 6 +- base/setup/usetup/chkdsk.h | 3 +- base/setup/usetup/format.c | 15 +- base/setup/usetup/format.h | 2 +- base/setup/usetup/fslist.c | 241 +- base/setup/usetup/fslist.h | 23 +- base/setup/usetup/genlist.c | 318 +-- base/setup/usetup/genlist.h | 64 +- base/setup/usetup/partlist.c | 3884 +++----------------------- base/setup/usetup/partlist.h | 288 +- base/setup/usetup/registry.c | 71 - base/setup/usetup/registry.h | 6 - base/setup/usetup/usetup.c | 37 +- base/setup/usetup/usetup.h | 26 +- 28 files changed, 1302 insertions(+), 5539 deletions(-) diff --git a/base/setup/CMakeLists.txt b/base/setup/CMakeLists.txt index 91c62d8d39..ee5a90d0bc 100644 --- a/base/setup/CMakeLists.txt +++ b/base/setup/CMakeLists.txt @@ -1,4 +1,5 @@ +add_subdirectory(lib) add_subdirectory(reactos) add_subdirectory(setup) add_subdirectory(usetup) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt new file mode 100644 index 0000000000..e44b2f71c7 --- /dev/null +++ b/base/setup/lib/CMakeLists.txt @@ -0,0 +1,10 @@ + +list(APPEND SOURCE + fsutil.c + genlist.c + partlist.c + precomp.h) + +add_library(setuplib ${SOURCE}) +add_pch(setuplib precomp.h SOURCE) +add_dependencies(setuplib xdk) # psdk diff --git a/base/setup/lib/errorcode.h b/base/setup/lib/errorcode.h new file mode 100644 index 0000000000..963e137bcd --- /dev/null +++ b/base/setup/lib/errorcode.h @@ -0,0 +1,59 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Setup error codes + * COPYRIGHT: Copyright 2007-2018 Johannes Anderwald <johannes.anderwald(a)reactos.org> + */ + +#pragma once + +typedef enum +{ + NOT_AN_ERROR = 0, // ERROR_SUCCESS, + ERROR_NOT_INSTALLED, + ERROR_NO_HDD, + ERROR_NO_SOURCE_DRIVE, + ERROR_LOAD_TXTSETUPSIF, + ERROR_CORRUPT_TXTSETUPSIF, + ERROR_SIGNATURE_TXTSETUPSIF, + ERROR_DRIVE_INFORMATION, + ERROR_WRITE_BOOT, + ERROR_LOAD_COMPUTER, + ERROR_LOAD_DISPLAY, + ERROR_LOAD_KEYBOARD, + ERROR_LOAD_KBLAYOUT, + ERROR_WARN_PARTITION, + ERROR_NEW_PARTITION, + ERROR_DELETE_SPACE, + ERROR_INSTALL_BOOTCODE, + ERROR_NO_FLOPPY, + ERROR_UPDATE_KBSETTINGS, + ERROR_UPDATE_DISPLAY_SETTINGS, + ERROR_IMPORT_HIVE, + ERROR_FIND_REGISTRY, + ERROR_CREATE_HIVE, + ERROR_INITIALIZE_REGISTRY, + ERROR_INVALID_CABINET_INF, + ERROR_CABINET_MISSING, + ERROR_CABINET_SCRIPT, + ERROR_COPY_QUEUE, + ERROR_CREATE_DIR, + ERROR_TXTSETUP_SECTION, + ERROR_CABINET_SECTION, + ERROR_CREATE_INSTALL_DIR, + ERROR_FIND_SETUPDATA, + ERROR_WRITE_PTABLE, + ERROR_ADDING_CODEPAGE, + ERROR_UPDATE_LOCALESETTINGS, + ERROR_ADDING_KBLAYOUTS, + ERROR_UPDATE_GEOID, + ERROR_DIRECTORY_NAME, + ERROR_INSUFFICIENT_PARTITION_SIZE, + ERROR_PARTITION_TABLE_FULL, + ERROR_ONLY_ONE_EXTENDED, + ERROR_FORMATTING_PARTITION, + + ERROR_LAST_ERROR_CODE +} ERROR_NUMBER; + +/* EOF */ diff --git a/base/setup/usetup/fslist.c b/base/setup/lib/fsutil.c similarity index 50% copy from base/setup/usetup/fslist.c copy to base/setup/lib/fsutil.c index 1eb158b777..468fed9284 100644 --- a/base/setup/usetup/fslist.c +++ b/base/setup/lib/fsutil.c @@ -1,76 +1,66 @@ /* - * ReactOS kernel - * Copyright (C) 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * 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 - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/fslist.c - * PURPOSE: Filesystem list functions - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Filesystem support functions + * COPYRIGHT: Copyright 2002-2018 Eric Kohl + * Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Copyright 2017-2018 Hermes Belusca-Maito */ -#include "usetup.h" +// +// This is basically the code for listing available FileSystem providers +// (currently hardcoded in a list), and for performing a basic FileSystem +// recognition for a given disk partition. +// +// See also: https://git.reactos.org/?p=reactos.git;a=blob;f=reactos/dll/win32/fmifs/ini… +// for how to get FS providers in a dynamic way. In the (near) future we may +// consider merging some of this code with us into a fmifs / fsutil / fslib library... +// + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#include "fsutil.h" +#include "partlist.h" + +/** For FileSystems **/ +#include <fslib/vfatlib.h> +#include <fslib/ext2lib.h> +// #include <fslib/ntfslib.h> #define NDEBUG #include <debug.h> -/* FUNCTIONS ****************************************************************/ -VOID -AddProvider( - IN OUT PFILE_SYSTEM_LIST List, - IN PCWSTR FileSystemName, - IN FORMATEX FormatFunc, - IN CHKDSKEX ChkdskFunc) -{ - PFILE_SYSTEM_ITEM Item; - Item = (PFILE_SYSTEM_ITEM)RtlAllocateHeap(ProcessHeap, 0, sizeof(FILE_SYSTEM_ITEM)); - if (!Item) - return; - - Item->FileSystemName = FileSystemName; - Item->FormatFunc = FormatFunc; - Item->ChkdskFunc = ChkdskFunc; - Item->QuickFormat = TRUE; - InsertTailList(&List->ListHead, &Item->ListEntry); +FILE_SYSTEM RegisteredFileSystems[] = +{ + { L"FAT" , VfatFormat, VfatChkdsk }, +// { L"FAT32", VfatFormat, VfatChkdsk }, +#if 0 + { L"EXT2" , Ext2Format, Ext2Chkdsk }, + { L"NTFS" , NtfsFormat, NtfsChkdsk } +#endif +}; - if (!FormatFunc) - return; - Item = (PFILE_SYSTEM_ITEM)RtlAllocateHeap(ProcessHeap, 0, sizeof(FILE_SYSTEM_ITEM)); - if (!Item) - return; +/* FUNCTIONS ****************************************************************/ - Item->FileSystemName = FileSystemName; - Item->FormatFunc = FormatFunc; - Item->ChkdskFunc = ChkdskFunc; - Item->QuickFormat = FALSE; - InsertTailList(&List->ListHead, &Item->ListEntry); +PFILE_SYSTEM +GetRegisteredFileSystems(OUT PULONG Count) +{ + *Count = ARRAYSIZE(RegisteredFileSystems); + return RegisteredFileSystems; } - -PFILE_SYSTEM_ITEM +PFILE_SYSTEM GetFileSystemByName( - IN PFILE_SYSTEM_LIST List, - IN PWSTR FileSystemName) + // IN PFILE_SYSTEM_LIST List, + IN PCWSTR FileSystemName) { +#if 0 // Reenable when the list of registered FSes will again be dynamic + PLIST_ENTRY ListEntry; PFILE_SYSTEM_ITEM Item; @@ -84,9 +74,33 @@ GetFileSystemByName( ListEntry = ListEntry->Flink; } +#else + + ULONG Count; + PFILE_SYSTEM FileSystems; + + FileSystems = GetRegisteredFileSystems(&Count); + if (!FileSystems || Count == 0) + return NULL; + + while (Count--) + { + if (FileSystems->FileSystemName && wcsicmp(FileSystemName, FileSystems->FileSystemName) == 0) + return FileSystems; + + ++FileSystems; + } + +#endif + return NULL; } + +// +// FileSystem recognition (using NT OS functionality) +// + #if 0 // FIXME: To be fully enabled when our storage stack & al. will work better! /* NOTE: Ripped & adapted from base/system/autochk/autochk.c */ @@ -162,12 +176,12 @@ _MyGetFileSystem( #endif -PFILE_SYSTEM_ITEM +PFILE_SYSTEM GetFileSystem( - IN PFILE_SYSTEM_LIST FileSystemList, + // IN PFILE_SYSTEM_LIST FileSystemList, IN struct _PARTENTRY* PartEntry) { - PFILE_SYSTEM_ITEM CurrentFileSystem; + PFILE_SYSTEM CurrentFileSystem; PWSTR FileSystemName = NULL; #if 0 // For code temporarily disabled below NTSTATUS Status; @@ -254,156 +268,9 @@ Quit: // For code temporarily disabled above PartEntry->PartitionType, FileSystemName ? FileSystemName : L"None"); if (FileSystemName != NULL) - CurrentFileSystem = GetFileSystemByName(FileSystemList, FileSystemName); + CurrentFileSystem = GetFileSystemByName(/*FileSystemList,*/ FileSystemName); return CurrentFileSystem; } - -PFILE_SYSTEM_LIST -CreateFileSystemList( - IN SHORT Left, - IN SHORT Top, - IN BOOLEAN ForceFormat, - IN PCWSTR SelectFileSystem) -{ - PFILE_SYSTEM_LIST List; - PFILE_SYSTEM_ITEM Item; - PLIST_ENTRY ListEntry; - - List = (PFILE_SYSTEM_LIST)RtlAllocateHeap(ProcessHeap, 0, sizeof(FILE_SYSTEM_LIST)); - if (List == NULL) - return NULL; - - List->Left = Left; - List->Top = Top; - List->Selected = NULL; - InitializeListHead(&List->ListHead); - - AddProvider(List, L"FAT", VfatFormat, VfatChkdsk); -#if 0 - AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk); - AddProvider(List, L"NTFS", NtfsFormat, NtfsChkdsk); -#endif - - if (!ForceFormat) - { - /* Add the 'Keep existing filesystem' dummy provider */ - AddProvider(List, NULL, NULL, NULL); - } - - /* 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) - { - List->Selected = Item; - break; - } - ListEntry = ListEntry->Flink; - } - if (!List->Selected) - List->Selected = CONTAINING_RECORD(List->ListHead.Flink, FILE_SYSTEM_ITEM, ListEntry); - - return List; -} - -VOID -DestroyFileSystemList( - IN PFILE_SYSTEM_LIST List) -{ - PLIST_ENTRY ListEntry = List->ListHead.Flink; - PFILE_SYSTEM_ITEM Item; - PLIST_ENTRY Next; - - while (ListEntry != &List->ListHead) - { - Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); - Next = ListEntry->Flink; - - RtlFreeHeap(ProcessHeap, 0, Item); - - ListEntry = Next; - } - RtlFreeHeap(ProcessHeap, 0, List); -} - -VOID -DrawFileSystemList( - IN PFILE_SYSTEM_LIST List) -{ - PLIST_ENTRY ListEntry; - PFILE_SYSTEM_ITEM Item; - COORD coPos; - DWORD Written; - ULONG Index = 0; - CHAR Buffer[128]; - - ListEntry = List->ListHead.Flink; - while (ListEntry != &List->ListHead) - { - Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); - - coPos.X = List->Left; - coPos.Y = List->Top + (SHORT)Index; - FillConsoleOutputAttribute(StdOutput, - FOREGROUND_WHITE | BACKGROUND_BLUE, - sizeof(Buffer), - coPos, - &Written); - FillConsoleOutputCharacterA(StdOutput, - ' ', - sizeof(Buffer), - coPos, - &Written); - - if (Item->FileSystemName) - { - if (Item->QuickFormat) - snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK1), Item->FileSystemName); - else - snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK2), Item->FileSystemName); - } - else - { - snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_KEEPFORMAT)); - } - - 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; - } -} - -VOID -ScrollDownFileSystemList( - IN PFILE_SYSTEM_LIST List) -{ - if (List->Selected->ListEntry.Flink != &List->ListHead) - { - List->Selected = CONTAINING_RECORD(List->Selected->ListEntry.Flink, FILE_SYSTEM_ITEM, ListEntry); - DrawFileSystemList(List); - } -} - -VOID -ScrollUpFileSystemList( - IN PFILE_SYSTEM_LIST List) -{ - if (List->Selected->ListEntry.Blink != &List->ListHead) - { - List->Selected = CONTAINING_RECORD(List->Selected->ListEntry.Blink, FILE_SYSTEM_ITEM, ListEntry); - DrawFileSystemList(List); - } -} - /* EOF */ diff --git a/base/setup/lib/fsutil.h b/base/setup/lib/fsutil.h new file mode 100644 index 0000000000..9d6d4a0a92 --- /dev/null +++ b/base/setup/lib/fsutil.h @@ -0,0 +1,34 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Filesystem support functions + * COPYRIGHT: Copyright 2002-2018 Eric Kohl + * Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Copyright 2017-2018 Hermes Belusca-Maito + */ + +#include <fmifs/fmifs.h> + +typedef struct _FILE_SYSTEM +{ + PCWSTR FileSystemName; + FORMATEX FormatFunc; + CHKDSKEX ChkdskFunc; +} FILE_SYSTEM, *PFILE_SYSTEM; + +PFILE_SYSTEM +GetRegisteredFileSystems(OUT PULONG Count); + +PFILE_SYSTEM +GetFileSystemByName( + // IN PFILE_SYSTEM_LIST List, + IN PCWSTR FileSystemName); + +struct _PARTENTRY; // Defined in partlist.h + +PFILE_SYSTEM +GetFileSystem( + // IN PFILE_SYSTEM_LIST FileSystemList, + IN struct _PARTENTRY* PartEntry); + +/* EOF */ diff --git a/base/setup/lib/genlist.c b/base/setup/lib/genlist.c new file mode 100644 index 0000000000..dc09ac0a37 --- /dev/null +++ b/base/setup/lib/genlist.c @@ -0,0 +1,182 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Generic list functions + * COPYRIGHT: Copyright 2004-2018 Eric Kohl + * Copyright 2008-2018 Christoph von Wittich <christoph at reactos.org> + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#include "genlist.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + +PGENERIC_LIST +CreateGenericList(VOID) +{ + PGENERIC_LIST List; + + List = (PGENERIC_LIST)RtlAllocateHeap(ProcessHeap, + 0, + sizeof(GENERIC_LIST)); + if (List == NULL) + return NULL; + + InitializeListHead(&List->ListHead); + List->NumOfEntries = 0; + + List->CurrentEntry = NULL; + List->BackupEntry = NULL; + + return List; +} + +VOID +DestroyGenericList( + IN OUT PGENERIC_LIST List, + IN BOOLEAN FreeUserData) +{ + PGENERIC_LIST_ENTRY ListEntry; + PLIST_ENTRY Entry; + + /* Release list entries */ + while (!IsListEmpty(&List->ListHead)) + { + Entry = RemoveHeadList(&List->ListHead); + ListEntry = CONTAINING_RECORD(Entry, GENERIC_LIST_ENTRY, Entry); + + /* Release user data */ + if (FreeUserData && ListEntry->UserData != NULL) + RtlFreeHeap(ProcessHeap, 0, ListEntry->UserData); + + /* Release list entry */ + RtlFreeHeap(ProcessHeap, 0, ListEntry); + } + + /* Release list head */ + RtlFreeHeap(ProcessHeap, 0, List); +} + +BOOLEAN +AppendGenericListEntry( + IN OUT PGENERIC_LIST List, + IN PCHAR Text, + IN PVOID UserData, + IN BOOLEAN Current) +{ + PGENERIC_LIST_ENTRY Entry; + + Entry = (PGENERIC_LIST_ENTRY)RtlAllocateHeap(ProcessHeap, + 0, + sizeof(GENERIC_LIST_ENTRY) + strlen(Text)); + if (Entry == NULL) + return FALSE; + + strcpy (Entry->Text, Text); + Entry->List = List; + Entry->UserData = UserData; + + InsertTailList(&List->ListHead, &Entry->Entry); + List->NumOfEntries++; + + if (Current || List->CurrentEntry == NULL) + { + List->CurrentEntry = Entry; + } + + return TRUE; +} + +VOID +SetCurrentListEntry( + IN PGENERIC_LIST List, + IN PGENERIC_LIST_ENTRY Entry) +{ + if (Entry->List != List) + return; + List->CurrentEntry = Entry; +} + +PGENERIC_LIST_ENTRY +GetCurrentListEntry( + IN PGENERIC_LIST List) +{ + return List->CurrentEntry; +} + +PGENERIC_LIST_ENTRY +GetFirstListEntry( + IN PGENERIC_LIST List) +{ + PLIST_ENTRY Entry = List->ListHead.Flink; + + if (Entry == &List->ListHead) + return NULL; + return CONTAINING_RECORD(Entry, GENERIC_LIST_ENTRY, Entry); +} + +PGENERIC_LIST_ENTRY +GetNextListEntry( + IN PGENERIC_LIST_ENTRY Entry) +{ + PLIST_ENTRY Next = Entry->Entry.Flink; + + if (Next == &Entry->List->ListHead) + return NULL; + return CONTAINING_RECORD(Next, GENERIC_LIST_ENTRY, Entry); +} + +PVOID +GetListEntryUserData( + IN PGENERIC_LIST_ENTRY Entry) +{ + return Entry->UserData; +} + +LPCSTR +GetListEntryText( + IN PGENERIC_LIST_ENTRY Entry) +{ + return Entry->Text; +} + +ULONG +GetNumberOfListEntries( + IN PGENERIC_LIST List) +{ + return List->NumOfEntries; +} + +VOID +SaveGenericListState( + IN PGENERIC_LIST List) +{ + List->BackupEntry = List->CurrentEntry; +} + +VOID +RestoreGenericListState( + IN PGENERIC_LIST List) +{ + List->CurrentEntry = List->BackupEntry; +} + +BOOLEAN +GenericListHasSingleEntry( + IN PGENERIC_LIST List) +{ + if (!IsListEmpty(&List->ListHead) && List->ListHead.Flink == List->ListHead.Blink) + return TRUE; + + /* if both list head pointers (which normally point to the first and last list member, respectively) + point to the same entry then it means that there's just a single thing in there, otherwise... false! */ + return FALSE; +} + +/* EOF */ diff --git a/base/setup/lib/genlist.h b/base/setup/lib/genlist.h new file mode 100644 index 0000000000..9623d3aba1 --- /dev/null +++ b/base/setup/lib/genlist.h @@ -0,0 +1,87 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Generic list functions + * COPYRIGHT: Copyright 2004-2018 Eric Kohl + * Copyright 2008-2018 Christoph von Wittich <christoph at reactos.org> + */ + +#pragma once + +typedef struct _GENERIC_LIST_ENTRY +{ + LIST_ENTRY Entry; + struct _GENERIC_LIST* List; + PVOID UserData; + CHAR Text[1]; // FIXME: UI stuff + +} GENERIC_LIST_ENTRY, *PGENERIC_LIST_ENTRY; + +typedef struct _GENERIC_LIST +{ + LIST_ENTRY ListHead; + ULONG NumOfEntries; + + PGENERIC_LIST_ENTRY CurrentEntry; + PGENERIC_LIST_ENTRY BackupEntry; + +} GENERIC_LIST, *PGENERIC_LIST; + + +PGENERIC_LIST +CreateGenericList(VOID); + +VOID +DestroyGenericList( + IN OUT PGENERIC_LIST List, + IN BOOLEAN FreeUserData); + +BOOLEAN +AppendGenericListEntry( + IN OUT PGENERIC_LIST List, + IN PCHAR Text, + IN PVOID UserData, + IN BOOLEAN Current); + +VOID +SetCurrentListEntry( + IN PGENERIC_LIST List, + IN PGENERIC_LIST_ENTRY Entry); + +PGENERIC_LIST_ENTRY +GetCurrentListEntry( + IN PGENERIC_LIST List); + +PGENERIC_LIST_ENTRY +GetFirstListEntry( + IN PGENERIC_LIST List); + +PGENERIC_LIST_ENTRY +GetNextListEntry( + IN PGENERIC_LIST_ENTRY Entry); + +PVOID +GetListEntryUserData( + IN PGENERIC_LIST_ENTRY Entry); + +LPCSTR +GetListEntryText( + IN PGENERIC_LIST_ENTRY Entry); + +ULONG +GetNumberOfListEntries( + IN PGENERIC_LIST List); + +VOID +SaveGenericListState( + IN PGENERIC_LIST List); + +VOID +RestoreGenericListState( + IN PGENERIC_LIST List); + +BOOLEAN +GenericListHasSingleEntry( + IN PGENERIC_LIST List); + +/* EOF */ diff --git a/base/setup/lib/linklist.h b/base/setup/lib/linklist.h new file mode 100644 index 0000000000..37f837c1db --- /dev/null +++ b/base/setup/lib/linklist.h @@ -0,0 +1,26 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Linked list support macros + * COPYRIGHT: Copyright 2005-2018 ReactOS Team + */ + +#pragma once + +#define InsertAscendingList(ListHead, NewEntry, Type, ListEntryField, SortField) \ +do { \ + PLIST_ENTRY current = (ListHead)->Flink; \ + while (current != (ListHead)) \ + { \ + if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField >= \ + (NewEntry)->SortField) \ + { \ + break; \ + } \ + current = current->Flink; \ + } \ +\ + InsertTailList(current, &((NewEntry)->ListEntryField)); \ +} while (0) + +/* EOF */ diff --git a/base/setup/usetup/partlist.c b/base/setup/lib/partlist.c similarity index 80% copy from base/setup/usetup/partlist.c copy to base/setup/lib/partlist.c index 31c657f702..40661b0126 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/lib/partlist.c @@ -1,211 +1,32 @@ /* - * ReactOS kernel - * Copyright (C) 2002, 2003, 2004, 2005 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Partition list functions + * COPYRIGHT: Copyright 2002-2018 Eric Kohl + * Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ -/* COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/partlist.c - * PURPOSE: Partition list functions - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) - */ - -#include "usetup.h" +#include "precomp.h" #include <ntddscsi.h> +#include "partlist.h" +#include "fsutil.h" + #define NDEBUG #include <debug.h> //#define DUMP_PARTITION_TABLE -/* HELPERS FOR PARTITION TYPES **********************************************/ - -typedef struct _PARTITION_TYPE -{ - UCHAR Type; - PCHAR Description; -} PARTITION_TYPE, *PPARTITION_TYPE; - -/* - * This partition type list was ripped off the kernelDisk.c module from: - * - * Visopsys Operating System - * Copyright (C) 1998-2015 J. Andrew McLaughlin - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * - * See also https://en.wikipedia.org/wiki/Partition_type#List_of_partition_IDs - * and http://www.win.tue.nl/~aeb/partitions/partition_types-1.html - * for a complete list. - */ +#include <pshpack1.h> -/* This is a table for keeping known partition type codes and descriptions */ -static PARTITION_TYPE PartitionTypes[] = +typedef struct _REG_DISK_MOUNT_INFO { - { 0x00, "(Empty)" }, - { 0x01, "FAT12" }, - { 0x02, "XENIX root" }, - { 0x03, "XENIX /usr" }, - { 0x04, "FAT16 (small)" }, - { 0x05, "Extended" }, - { 0x06, "FAT16" }, - { 0x07, "NTFS/HPFS/exFAT" }, - { 0x08, "OS/2 or AIX boot" }, - { 0x09, "AIX data" }, - { 0x0A, "OS/2 Boot Manager" }, - { 0x0B, "FAT32" }, - { 0x0C, "FAT32 (LBA)" }, - { 0x0E, "FAT16 (LBA)" }, - { 0x0F, "Extended (LBA)" }, - { 0x11, "Hidden FAT12" }, - { 0x12, "FAT diagnostic" }, - { 0x14, "Hidden FAT16 (small)" }, - { 0x16, "Hidden FAT16" }, - { 0x17, "Hidden HPFS or NTFS" }, - { 0x1B, "Hidden FAT32" }, - { 0x1C, "Hidden FAT32 (LBA)" }, - { 0x1E, "Hidden FAT16 (LBA)" }, - { 0x35, "JFS" }, - { 0x39, "Plan 9" }, - { 0x3C, "PartitionMagic" }, - { 0x3D, "Hidden Netware" }, - { 0x41, "PowerPC PReP" }, - { 0x42, "Win2K dynamic extended" }, - { 0x43, "Old Linux" }, - { 0x44, "GoBack" }, - { 0x4D, "QNX4.x" }, - { 0x4D, "QNX4.x 2nd" }, - { 0x4D, "QNX4.x 3rd" }, - { 0x50, "Ontrack R/O" }, - { 0x51, "Ontrack R/W or Novell" }, - { 0x52, "CP/M" }, - { 0x63, "GNU HURD or UNIX SysV" }, - { 0x64, "Netware 2" }, - { 0x65, "Netware 3/4" }, - { 0x66, "Netware SMS" }, - { 0x67, "Novell" }, - { 0x68, "Novell" }, - { 0x69, "Netware 5+" }, - { 0x7E, "Veritas VxVM public" }, - { 0x7F, "Veritas VxVM private" }, - { 0x80, "Minix" }, - { 0x81, "Linux or Minix" }, - { 0x82, "Linux swap or Solaris" }, - { 0x83, "Linux" }, - { 0x84, "Hibernation" }, - { 0x85, "Linux extended" }, - { 0x86, "HPFS or NTFS mirrored" }, - { 0x87, "HPFS or NTFS mirrored" }, - { 0x8E, "Linux LVM" }, - { 0x93, "Hidden Linux" }, - { 0x96, "CDFS/ISO-9660" }, - { 0x9F, "BSD/OS" }, - { 0xA0, "Laptop hibernation" }, - { 0xA1, "Laptop hibernation" }, - { 0xA5, "BSD, NetBSD, FreeBSD" }, - { 0xA6, "OpenBSD" }, - { 0xA7, "NeXTSTEP" }, - { 0xA8, "OS-X UFS" }, - { 0xA9, "NetBSD" }, - { 0xAB, "OS-X boot" }, - { 0xAF, "OS-X HFS" }, - { 0xB6, "NT corrupt mirror" }, - { 0xB7, "BSDI" }, - { 0xB8, "BSDI swap" }, - { 0xBE, "Solaris 8 boot" }, - { 0xBF, "Solaris x86" }, - { 0xC0, "NTFT" }, - { 0xC1, "DR-DOS FAT12" }, - { 0xC2, "Hidden Linux" }, - { 0xC3, "Hidden Linux swap" }, - { 0xC4, "DR-DOS FAT16 (small)" }, - { 0xC5, "DR-DOS Extended" }, - { 0xC6, "DR-DOS FAT16" }, - { 0xC7, "HPFS mirrored" }, - { 0xCB, "DR-DOS FAT32" }, - { 0xCC, "DR-DOS FAT32 (LBA)" }, - { 0xCE, "DR-DOS FAT16 (LBA)" }, - { 0xD0, "MDOS" }, - { 0xD1, "MDOS FAT12" }, - { 0xD4, "MDOS FAT16 (small)" }, - { 0xD5, "MDOS Extended" }, - { 0xD6, "MDOS FAT16" }, - { 0xD8, "CP/M-86" }, - { 0xDF, "BootIt EMBRM(FAT16/32)" }, - { 0xEB, "BeOS BFS" }, - { 0xEE, "EFI GPT protective" }, - { 0xEF, "EFI filesystem" }, - { 0xF0, "Linux/PA-RISC boot" }, - { 0xF2, "DOS 3.3+ second" }, - { 0xFA, "Bochs" }, - { 0xFB, "VmWare" }, - { 0xFC, "VmWare swap" }, - { 0xFD, "Linux RAID" }, - { 0xFE, "NT hidden" }, -}; + ULONG Signature; + LARGE_INTEGER StartingOffset; +} REG_DISK_MOUNT_INFO, *PREG_DISK_MOUNT_INFO; -VOID -GetPartTypeStringFromPartitionType( - IN UCHAR partitionType, - OUT PCHAR strPartType, - IN ULONG cchPartType) -{ - /* Determine partition type */ +#include <poppack.h> - if (IsContainerPartition(partitionType)) - { - RtlStringCchCopyA(strPartType, cchPartType, MUIGetString(STRING_EXTENDED_PARTITION)); - } - else if (partitionType == PARTITION_ENTRY_UNUSED) - { - RtlStringCchCopyA(strPartType, cchPartType, MUIGetString(STRING_FORMATUNUSED)); - } - else - { - UINT i; - - /* Do the table lookup */ - for (i = 0; i < ARRAYSIZE(PartitionTypes); i++) - { - if (partitionType == PartitionTypes[i].Type) - { - RtlStringCchCopyA(strPartType, cchPartType, PartitionTypes[i].Description); - return; - } - } - - /* We are here because the partition type is unknown */ - RtlStringCchCopyA(strPartType, cchPartType, MUIGetString(STRING_FORMATUNKNOWN)); - } -} /* FUNCTIONS ****************************************************************/ @@ -312,7 +133,6 @@ GetDriverName( } } - static VOID AssignDriveLetters( @@ -394,7 +214,6 @@ AssignDriveLetters( } } - static NTSTATUS NTAPI DiskIdentifierQueryRoutine( @@ -424,7 +243,6 @@ DiskIdentifierQueryRoutine( return STATUS_UNSUCCESSFUL; } - static NTSTATUS NTAPI DiskConfigurationDataQueryRoutine( @@ -468,7 +286,6 @@ DiskConfigurationDataQueryRoutine( return STATUS_UNSUCCESSFUL; } - static NTSTATUS NTAPI SystemConfigurationDataQueryRoutine( @@ -658,7 +475,6 @@ EnumerateBiosDiskEntries( RtlFreeHeap(ProcessHeap, 0, Int13Drives); } - static VOID AddPartitionToDisk( @@ -673,7 +489,9 @@ AddPartitionToDisk( PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartitionIndex]; if (PartitionInfo->PartitionType == PARTITION_ENTRY_UNUSED || ((LogicalPartition != FALSE) && IsContainerPartition(PartitionInfo->PartitionType))) + { return; + } PartEntry = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, @@ -709,7 +527,7 @@ AddPartitionToDisk( else if (IsRecognizedPartition(PartEntry->PartitionType)) { // FIXME FIXME! We should completely rework how we get this 'FileSystemList' available... - PartEntry->FileSystem = GetFileSystem(FileSystemList, PartEntry); + PartEntry->FileSystem = GetFileSystem(/*FileSystemList,*/ PartEntry); if (!PartEntry->FileSystem) PartEntry->FormatState = Preformatted; else @@ -786,7 +604,6 @@ AddPartitionToDisk( &PartEntry->ListEntry); } - static VOID ScanForUnpartitionedDiskSpace( @@ -1047,7 +864,6 @@ ScanForUnpartitionedDiskSpace( DPRINT("ScanForUnpartitionedDiskSpace() done\n"); } - static VOID SetDiskSignature( @@ -1099,7 +915,6 @@ SetDiskSignature( } } - static VOID UpdateDiskSignatures( @@ -1125,7 +940,6 @@ UpdateDiskSignatures( } } - static VOID AddDiskToList( @@ -1417,7 +1231,6 @@ AddDiskToList( ScanForUnpartitionedDiskSpace(DiskEntry); } - PPARTLIST CreatePartitionList(VOID) { @@ -1522,7 +1335,6 @@ CreatePartitionList(VOID) return List; } - VOID DestroyPartitionList( IN PPARTLIST List) @@ -1563,7 +1375,6 @@ DestroyPartitionList( if (DiskEntry->LayoutBuffer != NULL) RtlFreeHeap(ProcessHeap, 0, DiskEntry->LayoutBuffer); - /* Release disk entry */ RtlFreeHeap(ProcessHeap, 0, DiskEntry); } @@ -1581,590 +1392,6 @@ DestroyPartitionList( RtlFreeHeap(ProcessHeap, 0, List); } - -VOID -InitPartitionListUi( - IN OUT PPARTLIST_UI ListUi, - IN PPARTLIST List, - IN SHORT Left, - IN SHORT Top, - IN SHORT Right, - IN SHORT Bottom) -{ - ListUi->List = List; - // ListUi->FirstShown = NULL; - // ListUi->LastShown = NULL; - - ListUi->Left = Left; - ListUi->Top = Top; - ListUi->Right = Right; - ListUi->Bottom = Bottom; - - ListUi->Line = 0; - ListUi->Offset = 0; - - // ListUi->Redraw = TRUE; -} - -static -VOID -PrintEmptyLine( - IN PPARTLIST_UI ListUi) -{ - COORD coPos; - ULONG Written; - USHORT Width; - USHORT Height; - - Width = ListUi->Right - ListUi->Left - 1; - Height = ListUi->Bottom - ListUi->Top - 2; - - coPos.X = ListUi->Left + 1; - coPos.Y = ListUi->Top + 1 + ListUi->Line; - - if (ListUi->Line >= 0 && ListUi->Line <= Height) - { - FillConsoleOutputAttribute(StdOutput, - FOREGROUND_WHITE | BACKGROUND_BLUE, - Width, - coPos, - &Written); - - FillConsoleOutputCharacterA(StdOutput, - ' ', - Width, - coPos, - &Written); - } - - ListUi->Line++; -} - - -static -VOID -PrintPartitionData( - IN PPARTLIST_UI ListUi, - IN PDISKENTRY DiskEntry, - IN PPARTENTRY PartEntry) -{ - PPARTLIST List = ListUi->List; - CHAR LineBuffer[128]; - COORD coPos; - ULONG Written; - USHORT Width; - USHORT Height; - LARGE_INTEGER PartSize; - PCHAR Unit; - UCHAR Attribute; - CHAR PartTypeString[32]; - PCHAR PartType = PartTypeString; - - Width = ListUi->Right - ListUi->Left - 1; - Height = ListUi->Bottom - ListUi->Top - 2; - - coPos.X = ListUi->Left + 1; - coPos.Y = ListUi->Top + 1 + ListUi->Line; - - if (PartEntry->IsPartitioned == FALSE) - { - PartSize.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; -#if 0 - if (PartSize.QuadPart >= 10737418240) /* 10 GB */ - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1073741824); - Unit = MUIGetString(STRING_GB); - } - else -#endif - if (PartSize.QuadPart >= 10485760) /* 10 MB */ - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1048576); - Unit = MUIGetString(STRING_MB); - } - else - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1024); - Unit = MUIGetString(STRING_KB); - } - - sprintf(LineBuffer, - MUIGetString(STRING_UNPSPACE), - PartEntry->LogicalPartition ? " " : "", - PartEntry->LogicalPartition ? "" : " ", - PartSize.u.LowPart, - Unit); - } - else - { - /* Determine partition type */ - PartTypeString[0] = '\0'; - if (PartEntry->New != FALSE) - { - PartType = MUIGetString(STRING_UNFORMATTED); - } - else if (PartEntry->IsPartitioned != FALSE) - { - GetPartTypeStringFromPartitionType(PartEntry->PartitionType, - PartTypeString, - ARRAYSIZE(PartTypeString)); - PartType = PartTypeString; - } - - PartSize.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; -#if 0 - if (PartSize.QuadPart >= 10737418240) /* 10 GB */ - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1073741824); - Unit = MUIGetString(STRING_GB); - } - else -#endif - if (PartSize.QuadPart >= 10485760) /* 10 MB */ - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1048576); - Unit = MUIGetString(STRING_MB); - } - else - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1024); - Unit = MUIGetString(STRING_KB); - } - - if (strcmp(PartType, MUIGetString(STRING_FORMATUNKNOWN)) == 0) - { - sprintf(LineBuffer, - MUIGetString(STRING_HDDINFOUNK5), - (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, - (PartEntry->DriveLetter == 0) ? '-' : ':', - PartEntry->BootIndicator ? '*' : ' ', - PartEntry->LogicalPartition ? " " : "", - PartEntry->PartitionType, - PartEntry->LogicalPartition ? "" : " ", - PartSize.u.LowPart, - Unit); - } - else - { - sprintf(LineBuffer, - "%c%c %c %s%-24s%s %6lu %s", - (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, - (PartEntry->DriveLetter == 0) ? '-' : ':', - PartEntry->BootIndicator ? '*' : ' ', - PartEntry->LogicalPartition ? " " : "", - PartType, - PartEntry->LogicalPartition ? "" : " ", - PartSize.u.LowPart, - Unit); - } - } - - Attribute = (List->CurrentDisk == DiskEntry && - List->CurrentPartition == PartEntry) ? - FOREGROUND_BLUE | BACKGROUND_WHITE : - FOREGROUND_WHITE | BACKGROUND_BLUE; - - if (ListUi->Line >= 0 && ListUi->Line <= Height) - { - FillConsoleOutputCharacterA(StdOutput, - ' ', - Width, - coPos, - &Written); - } - coPos.X += 4; - Width -= 8; - if (ListUi->Line >= 0 && ListUi->Line <= Height) - { - FillConsoleOutputAttribute(StdOutput, - Attribute, - Width, - coPos, - &Written); - } - coPos.X++; - Width -= 2; - if (ListUi->Line >= 0 && ListUi->Line <= Height) - { - WriteConsoleOutputCharacterA(StdOutput, - LineBuffer, - min(strlen(LineBuffer), Width), - coPos, - &Written); - } - - ListUi->Line++; -} - - -static -VOID -PrintDiskData( - IN PPARTLIST_UI ListUi, - IN PDISKENTRY DiskEntry) -{ - // PPARTLIST List = ListUi->List; - PPARTENTRY PrimaryPartEntry, LogicalPartEntry; - PLIST_ENTRY PrimaryEntry, LogicalEntry; - CHAR LineBuffer[128]; - COORD coPos; - ULONG Written; - USHORT Width; - USHORT Height; - ULARGE_INTEGER DiskSize; - PCHAR Unit; - - Width = ListUi->Right - ListUi->Left - 1; - Height = ListUi->Bottom - ListUi->Top - 2; - - coPos.X = ListUi->Left + 1; - coPos.Y = ListUi->Top + 1 + ListUi->Line; - - DiskSize.QuadPart = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - if (DiskSize.QuadPart >= 10737418240) /* 10 GB */ - { - DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, 1073741824); - Unit = MUIGetString(STRING_GB); - } - else - { - DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, 1048576); - if (DiskSize.QuadPart == 0) - DiskSize.QuadPart = 1; - Unit = MUIGetString(STRING_MB); - } - - if (DiskEntry->DriverName.Length > 0) - { - sprintf(LineBuffer, - MUIGetString(STRING_HDINFOPARTSELECT), - DiskSize.u.LowPart, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - DiskEntry->DriverName.Buffer); - } - else - { - sprintf(LineBuffer, - MUIGetString(STRING_HDDINFOUNK6), - DiskSize.u.LowPart, - Unit, - DiskEntry->DiskNumber, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id); - } - - if (ListUi->Line >= 0 && ListUi->Line <= Height) - { - FillConsoleOutputAttribute(StdOutput, - FOREGROUND_WHITE | BACKGROUND_BLUE, - Width, - coPos, - &Written); - - FillConsoleOutputCharacterA(StdOutput, - ' ', - Width, - coPos, - &Written); - } - - coPos.X++; - if (ListUi->Line >= 0 && ListUi->Line <= Height) - { - WriteConsoleOutputCharacterA(StdOutput, - LineBuffer, - min((USHORT)strlen(LineBuffer), Width - 2), - coPos, - &Written); - } - - ListUi->Line++; - - /* Print separator line */ - PrintEmptyLine(ListUi); - - /* Print partition lines */ - PrimaryEntry = DiskEntry->PrimaryPartListHead.Flink; - while (PrimaryEntry != &DiskEntry->PrimaryPartListHead) - { - PrimaryPartEntry = CONTAINING_RECORD(PrimaryEntry, PARTENTRY, ListEntry); - - PrintPartitionData(ListUi, - DiskEntry, - PrimaryPartEntry); - - if (IsContainerPartition(PrimaryPartEntry->PartitionType)) - { - LogicalEntry = DiskEntry->LogicalPartListHead.Flink; - while (LogicalEntry != &DiskEntry->LogicalPartListHead) - { - LogicalPartEntry = CONTAINING_RECORD(LogicalEntry, PARTENTRY, ListEntry); - - PrintPartitionData(ListUi, - DiskEntry, - LogicalPartEntry); - - LogicalEntry = LogicalEntry->Flink; - } - } - - PrimaryEntry = PrimaryEntry->Flink; - } - - /* Print separator line */ - PrintEmptyLine(ListUi); -} - - -VOID -DrawPartitionList( - IN PPARTLIST_UI ListUi) -{ - PPARTLIST List = ListUi->List; - PLIST_ENTRY Entry, Entry2; - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry = NULL; - COORD coPos; - ULONG Written; - SHORT i; - SHORT CurrentDiskLine; - SHORT CurrentPartLine; - SHORT LastLine; - BOOLEAN CurrentPartLineFound = FALSE; - BOOLEAN CurrentDiskLineFound = FALSE; - - /* Calculate the line of the current disk and partition */ - CurrentDiskLine = 0; - CurrentPartLine = 0; - LastLine = 0; - - Entry = List->DiskListHead.Flink; - while (Entry != &List->DiskListHead) - { - DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); - - LastLine += 2; - if (CurrentPartLineFound == FALSE) - { - CurrentPartLine += 2; - } - - Entry2 = DiskEntry->PrimaryPartListHead.Flink; - while (Entry2 != &DiskEntry->PrimaryPartListHead) - { - PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - if (PartEntry == List->CurrentPartition) - { - CurrentPartLineFound = TRUE; - } - - Entry2 = Entry2->Flink; - if (CurrentPartLineFound == FALSE) - { - CurrentPartLine++; - } - - LastLine++; - } - - if (CurrentPartLineFound == FALSE) - { - Entry2 = DiskEntry->LogicalPartListHead.Flink; - while (Entry2 != &DiskEntry->LogicalPartListHead) - { - PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - if (PartEntry == List->CurrentPartition) - { - CurrentPartLineFound = TRUE; - } - - Entry2 = Entry2->Flink; - if (CurrentPartLineFound == FALSE) - { - CurrentPartLine++; - } - - LastLine++; - } - } - - if (DiskEntry == List->CurrentDisk) - { - CurrentDiskLineFound = TRUE; - } - - Entry = Entry->Flink; - if (Entry != &List->DiskListHead) - { - if (CurrentDiskLineFound == FALSE) - { - CurrentPartLine ++; - CurrentDiskLine = CurrentPartLine; - } - - LastLine++; - } - else - { - LastLine--; - } - } - - /* If it possible, make the disk name visible */ - if (CurrentPartLine < ListUi->Offset) - { - ListUi->Offset = CurrentPartLine; - } - else if (CurrentPartLine - ListUi->Offset > ListUi->Bottom - ListUi->Top - 2) - { - ListUi->Offset = CurrentPartLine - (ListUi->Bottom - ListUi->Top - 2); - } - - if (CurrentDiskLine < ListUi->Offset && CurrentPartLine - CurrentDiskLine < ListUi->Bottom - ListUi->Top - 2) - { - ListUi->Offset = CurrentDiskLine; - } - - /* Draw upper left corner */ - coPos.X = ListUi->Left; - coPos.Y = ListUi->Top; - FillConsoleOutputCharacterA(StdOutput, - 0xDA, // '+', - 1, - coPos, - &Written); - - /* Draw upper edge */ - coPos.X = ListUi->Left + 1; - coPos.Y = ListUi->Top; - if (ListUi->Offset == 0) - { - FillConsoleOutputCharacterA(StdOutput, - 0xC4, // '-', - ListUi->Right - ListUi->Left - 1, - coPos, - &Written); - } - else - { - FillConsoleOutputCharacterA(StdOutput, - 0xC4, // '-', - ListUi->Right - ListUi->Left - 5, - coPos, - &Written); - coPos.X = ListUi->Right - 5; - WriteConsoleOutputCharacterA(StdOutput, - "(\x18)", // "(up)" - 3, - coPos, - &Written); - coPos.X = ListUi->Right - 2; - FillConsoleOutputCharacterA(StdOutput, - 0xC4, // '-', - 2, - coPos, - &Written); - } - - /* Draw upper right corner */ - coPos.X = ListUi->Right; - coPos.Y = ListUi->Top; - FillConsoleOutputCharacterA(StdOutput, - 0xBF, // '+', - 1, - coPos, - &Written); - - /* Draw left and right edge */ - for (i = ListUi->Top + 1; i < ListUi->Bottom; i++) - { - coPos.X = ListUi->Left; - coPos.Y = i; - FillConsoleOutputCharacterA(StdOutput, - 0xB3, // '|', - 1, - coPos, - &Written); - - coPos.X = ListUi->Right; - FillConsoleOutputCharacterA(StdOutput, - 0xB3, //'|', - 1, - coPos, - &Written); - } - - /* Draw lower left corner */ - coPos.X = ListUi->Left; - coPos.Y = ListUi->Bottom; - FillConsoleOutputCharacterA(StdOutput, - 0xC0, // '+', - 1, - coPos, - &Written); - - /* Draw lower edge */ - coPos.X = ListUi->Left + 1; - coPos.Y = ListUi->Bottom; - if (LastLine - ListUi->Offset <= ListUi->Bottom - ListUi->Top - 2) - { - FillConsoleOutputCharacterA(StdOutput, - 0xC4, // '-', - ListUi->Right - ListUi->Left - 1, - coPos, - &Written); - } - else - { - FillConsoleOutputCharacterA(StdOutput, - 0xC4, // '-', - ListUi->Right - ListUi->Left - 5, - coPos, - &Written); - coPos.X = ListUi->Right - 5; - WriteConsoleOutputCharacterA(StdOutput, - "(\x19)", // "(down)" - 3, - coPos, - &Written); - coPos.X = ListUi->Right - 2; - FillConsoleOutputCharacterA(StdOutput, - 0xC4, // '-', - 2, - coPos, - &Written); - } - - /* Draw lower right corner */ - coPos.X = ListUi->Right; - coPos.Y = ListUi->Bottom; - FillConsoleOutputCharacterA(StdOutput, - 0xD9, // '+', - 1, - coPos, - &Written); - - /* print list entries */ - ListUi->Line = - ListUi->Offset; - - Entry = List->DiskListHead.Flink; - while (Entry != &List->DiskListHead) - { - DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); - - /* Print disk entry */ - PrintDiskData(ListUi, DiskEntry); - - Entry = Entry->Flink; - } -} - - ULONG SelectPartition( IN PPARTLIST List, @@ -2211,7 +1438,6 @@ SelectPartition( return FALSE; } - PPARTENTRY GetNextPartition( IN PPARTLIST List) @@ -2221,7 +1447,7 @@ GetNextPartition( PDISKENTRY DiskEntry; PPARTENTRY PartEntry; - /* Fail, if no disks are available */ + /* Fail if no disks are available */ if (IsListEmpty(&List->DiskListHead)) return NULL; @@ -2316,7 +1542,7 @@ GetPrevPartition( PDISKENTRY DiskEntry; PPARTENTRY PartEntry; - /* Fail, if no disks are available */ + /* Fail if no disks are available */ if (IsListEmpty(&List->DiskListHead)) return NULL; @@ -2401,25 +1627,6 @@ GetPrevPartition( return NULL; } - - -VOID -ScrollDownPartitionList( - IN PPARTLIST_UI ListUi) -{ - if (GetNextPartition(ListUi->List)) - DrawPartitionList(ListUi); -} - -VOID -ScrollUpPartitionList( - IN PPARTLIST_UI ListUi) -{ - if (GetPrevPartition(ListUi->List)) - DrawPartitionList(ListUi); -} - - static BOOLEAN IsEmptyLayoutEntry( @@ -2427,12 +1634,13 @@ IsEmptyLayoutEntry( { if (PartitionInfo->StartingOffset.QuadPart == 0 && PartitionInfo->PartitionLength.QuadPart == 0) + { return TRUE; + } return FALSE; } - static BOOLEAN IsSamePrimaryLayoutEntry( @@ -2444,12 +1652,13 @@ IsSamePrimaryLayoutEntry( PartitionInfo->PartitionLength.QuadPart == PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) // PartitionInfo->PartitionNumber = PartEntry->PartitionNumber && // PartitionInfo->PartitionType == PartEntry->PartitionType + { return TRUE; + } return FALSE; } - static ULONG GetPrimaryPartitionCount( @@ -2463,7 +1672,7 @@ GetPrimaryPartitionCount( while (Entry != &DiskEntry->PrimaryPartListHead) { PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); - if (PartEntry->IsPartitioned == TRUE) + if (PartEntry->IsPartitioned) Count++; Entry = Entry->Flink; @@ -2472,7 +1681,6 @@ GetPrimaryPartitionCount( return Count; } - static ULONG GetLogicalPartitionCount( @@ -2495,7 +1703,6 @@ GetLogicalPartitionCount( return Count; } - static BOOLEAN ReAllocateLayoutBuffer( @@ -2545,7 +1752,6 @@ ReAllocateLayoutBuffer( return TRUE; } - static VOID UpdateDiskLayout( @@ -2706,7 +1912,6 @@ UpdateDiskLayout( #endif } - static PPARTENTRY GetPrevUnpartitionedEntry( @@ -2733,7 +1938,6 @@ GetPrevUnpartitionedEntry( return NULL; } - static PPARTENTRY GetNextUnpartitionedEntry( @@ -2760,7 +1964,6 @@ GetNextUnpartitionedEntry( return NULL; } - VOID CreatePrimaryPartition( IN PPARTLIST List, @@ -2847,7 +2050,6 @@ CreatePrimaryPartition( AssignDriveLetters(List); } - static VOID AddLogicalDiskSpace( @@ -2882,7 +2084,6 @@ AddLogicalDiskSpace( &NewPartEntry->ListEntry); } - VOID CreateExtendedPartition( IN PPARTLIST List, @@ -2993,7 +2194,6 @@ CreateExtendedPartition( AssignDriveLetters(List); } - VOID CreateLogicalPartition( IN PPARTLIST List, @@ -3019,8 +2219,8 @@ CreateLogicalPartition( DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart); - if (AutoCreate == TRUE || - AlignDown(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) + if ((AutoCreate != FALSE) || + (AlignDown(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart)) { DPRINT1("Convert existing partition entry\n"); @@ -3082,7 +2282,6 @@ CreateLogicalPartition( AssignDriveLetters(List); } - VOID DeleteCurrentPartition( IN PPARTLIST List) @@ -3195,18 +2394,17 @@ DeleteCurrentPartition( AssignDriveLetters(List); } - VOID CheckActiveSystemPartition( - IN PPARTLIST List, - IN PFILE_SYSTEM_LIST FileSystemList /* Needed for checking the FS of the candidate system partition */ + IN PPARTLIST List // , + // IN PFILE_SYSTEM_LIST FileSystemList /* Needed for checking the FS of the candidate system partition */ ) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; PLIST_ENTRY ListEntry; - PFILE_SYSTEM_ITEM FileSystem; + PFILE_SYSTEM FileSystem; /* Check for empty disk list */ if (IsListEmpty(&List->DiskListHead)) @@ -3377,7 +2575,7 @@ CheckActiveSystemPartition( * NOTE also that for those architectures looking for a * partition boot indicator is insufficient. */ - FileSystem = GetFileSystem(FileSystemList, List->OriginalSystemPartition); + FileSystem = GetFileSystem(/*FileSystemList,*/ List->OriginalSystemPartition); if (FileSystem == NULL) { DPRINT1("System partition %lu in disk %lu with no FS?!\n", @@ -3434,7 +2632,6 @@ SetSystemPartition: List->SystemPartition->DiskEntry->Dirty = TRUE; } - static NTSTATUS WritePartitions( @@ -3511,7 +2708,6 @@ WritePartitions( return Status; } - BOOLEAN WritePartitionsToDisk( IN PPARTLIST List) @@ -3539,6 +2735,65 @@ WritePartitionsToDisk( return TRUE; } +BOOLEAN +SetMountedDeviceValue( + IN CHAR Letter, + IN ULONG Signature, + IN LARGE_INTEGER StartingOffset) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + WCHAR ValueNameBuffer[16]; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\MountedDevices"); + UNICODE_STRING ValueName; + REG_DISK_MOUNT_INFO MountInfo; + NTSTATUS Status; + HANDLE KeyHandle; + + swprintf(ValueNameBuffer, L"\\DosDevices\\%C:", Letter); + RtlInitUnicodeString(&ValueName, ValueNameBuffer); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + Status = NtCreateKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + NULL); + } + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); + return FALSE; + } + + MountInfo.Signature = Signature; + MountInfo.StartingOffset = StartingOffset; + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_BINARY, + (PVOID)&MountInfo, + sizeof(MountInfo)); + NtClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + return FALSE; + } + + return TRUE; +} BOOLEAN SetMountedDeviceValues( @@ -3623,7 +2878,7 @@ SetPartitionType( DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE; } -ULONG +ERROR_NUMBER PrimaryPartitionCreationChecks( IN PPARTLIST List) { @@ -3633,7 +2888,7 @@ PrimaryPartitionCreationChecks( DiskEntry = List->CurrentDisk; PartEntry = List->CurrentPartition; - /* Fail if partition is already in use */ + /* Fail if the partition is already in use */ if (PartEntry->IsPartitioned != FALSE) return ERROR_NEW_PARTITION; @@ -3644,8 +2899,7 @@ PrimaryPartitionCreationChecks( return ERROR_SUCCESS; } - -ULONG +ERROR_NUMBER ExtendedPartitionCreationChecks( IN PPARTLIST List) { @@ -3655,7 +2909,7 @@ ExtendedPartitionCreationChecks( DiskEntry = List->CurrentDisk; PartEntry = List->CurrentPartition; - /* Fail if partition is already in use */ + /* Fail if the partition is already in use */ if (PartEntry->IsPartitioned != FALSE) return ERROR_NEW_PARTITION; @@ -3670,8 +2924,7 @@ ExtendedPartitionCreationChecks( return ERROR_SUCCESS; } - -ULONG +ERROR_NUMBER LogicalPartitionCreationChecks( IN PPARTLIST List) { @@ -3681,14 +2934,13 @@ LogicalPartitionCreationChecks( // DiskEntry = List->CurrentDisk; PartEntry = List->CurrentPartition; - /* Fail if partition is already in use */ + /* Fail if the partition is already in use */ if (PartEntry->IsPartitioned != FALSE) return ERROR_NEW_PARTITION; return ERROR_SUCCESS; } - BOOLEAN GetNextUnformattedPartition( IN PPARTLIST List, diff --git a/base/setup/usetup/partlist.h b/base/setup/lib/partlist.h similarity index 78% copy from base/setup/usetup/partlist.h copy to base/setup/lib/partlist.h index e434959437..80a8823fb5 100644 --- a/base/setup/usetup/partlist.h +++ b/base/setup/lib/partlist.h @@ -1,26 +1,9 @@ /* - * ReactOS kernel - * Copyright (C) 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * 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 - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/partlist.h - * PURPOSE: Partition list functions - * PROGRAMMER: Eric Kohl + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Partition list functions + * COPYRIGHT: Copyright 2002-2018 Eric Kohl + * Copyright 2003-2018 Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #pragma once @@ -47,6 +30,8 @@ typedef enum _FORMATMACHINESTATE CheckDone } FORMATMACHINESTATE, *PFORMATMACHINESTATE; +struct _FILE_SYSTEM; + typedef struct _PARTENTRY { LIST_ENTRY ListEntry; @@ -81,7 +66,7 @@ typedef struct _PARTENTRY BOOLEAN NeedsCheck; FORMATSTATE FormatState; - struct _FILE_SYSTEM_ITEM *FileSystem; + struct _FILE_SYSTEM* FileSystem; } PARTENTRY, *PPARTENTRY; @@ -223,11 +208,24 @@ typedef struct ULONG Signature; } BIOS_DISK, *PBIOS_DISK; -VOID -GetPartTypeStringFromPartitionType( - IN UCHAR partitionType, - OUT PCHAR strPartType, - IN ULONG cchPartType); + + +ULONGLONG +AlignDown( + IN ULONGLONG Value, + IN ULONG Alignment); + +ULONGLONG +AlignUp( + IN ULONGLONG Value, + IN ULONG Alignment); + +ULONGLONG +RoundingDivide( + IN ULONGLONG Dividend, + IN ULONGLONG Divisor); + + PPARTLIST CreatePartitionList(VOID); @@ -273,13 +271,20 @@ DeleteCurrentPartition( VOID CheckActiveSystemPartition( - IN PPARTLIST List, - IN PFILE_SYSTEM_LIST FileSystemList); + IN PPARTLIST List // , + // IN PFILE_SYSTEM_LIST FileSystemList /* Needed for checking the FS of the candidate system partition */ + ); BOOLEAN WritePartitionsToDisk( IN PPARTLIST List); +BOOLEAN +SetMountedDeviceValue( + IN CHAR Letter, + IN ULONG Signature, + IN LARGE_INTEGER StartingOffset); + BOOLEAN SetMountedDeviceValues( IN PPARTLIST List); @@ -289,15 +294,15 @@ SetPartitionType( IN PPARTENTRY PartEntry, IN UCHAR PartitionType); -ULONG +ERROR_NUMBER PrimaryPartitionCreationChecks( IN PPARTLIST List); -ULONG +ERROR_NUMBER ExtendedPartitionCreationChecks( IN PPARTLIST List); -ULONG +ERROR_NUMBER LogicalPartitionCreationChecks( IN PPARTLIST List); @@ -313,47 +318,4 @@ GetNextUncheckedPartition( OUT PDISKENTRY *pDiskEntry OPTIONAL, OUT PPARTENTRY *pPartEntry); - - - - -typedef struct _PARTLIST_UI -{ - PPARTLIST List; - - // PLIST_ENTRY FirstShown; - // PLIST_ENTRY LastShown; - - SHORT Left; - SHORT Top; - SHORT Right; - SHORT Bottom; - - SHORT Line; - SHORT Offset; - - // BOOL Redraw; -} PARTLIST_UI, *PPARTLIST_UI; - -VOID -InitPartitionListUi( - IN OUT PPARTLIST_UI ListUi, - IN PPARTLIST List, - IN SHORT Left, - IN SHORT Top, - IN SHORT Right, - IN SHORT Bottom); - -VOID -ScrollDownPartitionList( - IN PPARTLIST_UI ListUi); - -VOID -ScrollUpPartitionList( - IN PPARTLIST_UI ListUi); - -VOID -DrawPartitionList( - IN PPARTLIST_UI ListUi); - /* EOF */ diff --git a/base/setup/lib/precomp.h b/base/setup/lib/precomp.h new file mode 100644 index 0000000000..1f84862e1b --- /dev/null +++ b/base/setup/lib/precomp.h @@ -0,0 +1,62 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Precompiled header + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ + +/* C Headers */ +#include <stdio.h> +#include <stdlib.h> + +/* PSDK/NDK Headers */ +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winuser.h> + +#include <strsafe.h> + +#define NTOS_MODE_USER +#include <ndk/cmfuncs.h> +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/setypes.h> + +/* Filesystem headers */ +#include <reactos/rosioctl.h> // For extra partition IDs + +/** For FileSystems **/ +// #include <fslib/vfatlib.h> +// #include <fslib/ext2lib.h> +// // #include <fslib/ntfslib.h> + +// +///* Internal Headers */ +//#include "interface/consup.h" +//#include "inffile.h" +//#include "inicache.h" +//#include "progress.h" +//#ifdef __REACTOS__ +//#include "infros.h" +//#include "filequeue.h" +//#endif + +//#include "registry.h" +//#include "fslist.h" +//#include "partlist.h" +//#include "cabinet.h" +//#include "filesup.h" +//#include "genlist.h" + + +extern HANDLE ProcessHeap; + +#include "errorcode.h" +#include "linklist.h" diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h new file mode 100644 index 0000000000..f9ed75ebda --- /dev/null +++ b/base/setup/lib/setuplib.h @@ -0,0 +1,34 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Public header + * COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito + */ + +#pragma once + +/* Needed PSDK headers when using this library */ +#if 0 + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <wingdi.h> // For LF_FACESIZE and TranslateCharsetInfo() +#include <wincon.h> +#include <winnls.h> // For code page support +#include <winreg.h> + +#endif + +/* NOTE: Please keep the header inclusion order! */ + +extern HANDLE ProcessHeap; + +#include "errorcode.h" +#include "linklist.h" +#include "fsutil.h" +#include "genlist.h" +#include "partlist.h" + +/* EOF */ diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 8dff7a5ab1..69d1e6b4e3 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -3,6 +3,8 @@ add_definitions(${I18N_DEFS}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../lib +# ${REACTOS_SOURCE_DIR}/base/setup/lib ${REACTOS_SOURCE_DIR}/sdk/lib/inflib ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers) @@ -38,8 +40,8 @@ if(USE_CLANG_CL) add_target_compile_flags(usetup "-Wno-invalid-source-encoding") endif() -target_link_libraries(usetup zlib_solo inflib ext2lib vfatlib) +add_pch(usetup usetup.h SOURCE) set_module_type(usetup nativecui) +target_link_libraries(usetup inflib setuplib zlib_solo ext2lib vfatlib) add_importlibs(usetup ntdll) -add_pch(usetup usetup.h SOURCE) add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest) diff --git a/base/setup/usetup/bootsup.c b/base/setup/usetup/bootsup.c index 674808ace7..cd5794025c 100644 --- a/base/setup/usetup/bootsup.c +++ b/base/setup/usetup/bootsup.c @@ -2659,17 +2659,24 @@ InstallFatBootcodeToFloppy( PUNICODE_STRING DestinationArcPath) { NTSTATUS Status; + PFILE_SYSTEM FatFS; UNICODE_STRING FloppyDevice = RTL_CONSTANT_STRING(L"\\Device\\Floppy0"); WCHAR SrcPath[MAX_PATH]; WCHAR DstPath[MAX_PATH]; /* Format the floppy first */ - Status = VfatFormat(&FloppyDevice, - FMIFS_FLOPPY, - NULL, - TRUE, - 0, - NULL); + 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); if (!NT_SUCCESS(Status)) { DPRINT1("VfatFormat() failed (Status %lx)\n", Status); diff --git a/base/setup/usetup/chkdsk.c b/base/setup/usetup/chkdsk.c index 6d8df5d214..26f9b79c58 100644 --- a/base/setup/usetup/chkdsk.c +++ b/base/setup/usetup/chkdsk.c @@ -56,11 +56,13 @@ ChkdskCallback( NTSTATUS ChkdskPartition( IN PUNICODE_STRING DriveRoot, - IN PFILE_SYSTEM_ITEM FileSystem) + /*IN PFILE_SYSTEM_ITEM FileSystemItem*/ + IN PFILE_SYSTEM FileSystem) { NTSTATUS Status; + // PFILE_SYSTEM FileSystem = FileSystemItem->FileSystem; - if (!FileSystem->ChkdskFunc) + if (!FileSystem || !FileSystem->ChkdskFunc) return STATUS_NOT_SUPPORTED; ChkdskProgressBar = CreateProgressBar(6, diff --git a/base/setup/usetup/chkdsk.h b/base/setup/usetup/chkdsk.h index 95894e3907..0eb2bed372 100644 --- a/base/setup/usetup/chkdsk.h +++ b/base/setup/usetup/chkdsk.h @@ -28,6 +28,7 @@ NTSTATUS ChkdskPartition( IN PUNICODE_STRING DriveRoot, - IN PFILE_SYSTEM_ITEM FileSystem); + /*IN PFILE_SYSTEM_ITEM FileSystemItem*/ + IN PFILE_SYSTEM FileSystem); /* EOF */ diff --git a/base/setup/usetup/format.c b/base/setup/usetup/format.c index 5dab49f851..db8c14dcca 100644 --- a/base/setup/usetup/format.c +++ b/base/setup/usetup/format.c @@ -88,11 +88,12 @@ FormatCallback( NTSTATUS FormatPartition( IN PUNICODE_STRING DriveRoot, - IN PFILE_SYSTEM_ITEM FileSystem) + IN PFILE_SYSTEM_ITEM FileSystemItem) { NTSTATUS Status; + PFILE_SYSTEM FileSystem = FileSystemItem->FileSystem; - if (!FileSystem->FormatFunc) + if (!FileSystem || !FileSystem->FormatFunc) return STATUS_NOT_SUPPORTED; FormatProgressBar = CreateProgressBar(6, @@ -107,11 +108,11 @@ FormatPartition( ProgressSetStepCount(FormatProgressBar, 100); Status = FileSystem->FormatFunc(DriveRoot, - FMIFS_HARDDISK, /* MediaFlag */ - NULL, /* Label */ - FileSystem->QuickFormat, /* QuickFormat */ - 0, /* ClusterSize */ - FormatCallback); /* Callback */ + FMIFS_HARDDISK, /* MediaFlag */ + NULL, /* Label */ + FileSystemItem->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 7da0f15c32..3032f49651 100644 --- a/base/setup/usetup/format.h +++ b/base/setup/usetup/format.h @@ -29,6 +29,6 @@ NTSTATUS FormatPartition( IN PUNICODE_STRING DriveRoot, - IN PFILE_SYSTEM_ITEM FileSystem); + IN PFILE_SYSTEM_ITEM FileSystemItem); /* EOF */ diff --git a/base/setup/usetup/fslist.c b/base/setup/usetup/fslist.c index 1eb158b777..d29d0df331 100644 --- a/base/setup/usetup/fslist.c +++ b/base/setup/usetup/fslist.c @@ -32,234 +32,54 @@ /* FUNCTIONS ****************************************************************/ -VOID +static VOID AddProvider( IN OUT PFILE_SYSTEM_LIST List, - IN PCWSTR FileSystemName, - IN FORMATEX FormatFunc, - IN CHKDSKEX ChkdskFunc) + IN PCWSTR FileSystemName, // Redundant, I need to check whether this is reaaaaally needed.... + IN PFILE_SYSTEM FileSystem) { PFILE_SYSTEM_ITEM Item; - Item = (PFILE_SYSTEM_ITEM)RtlAllocateHeap(ProcessHeap, 0, sizeof(FILE_SYSTEM_ITEM)); + Item = (PFILE_SYSTEM_ITEM)RtlAllocateHeap(ProcessHeap, 0, sizeof(*Item)); if (!Item) return; Item->FileSystemName = FileSystemName; - Item->FormatFunc = FormatFunc; - Item->ChkdskFunc = ChkdskFunc; + Item->FileSystem = FileSystem; Item->QuickFormat = TRUE; InsertTailList(&List->ListHead, &Item->ListEntry); - if (!FormatFunc) + if (!FileSystem) return; - Item = (PFILE_SYSTEM_ITEM)RtlAllocateHeap(ProcessHeap, 0, sizeof(FILE_SYSTEM_ITEM)); + Item = (PFILE_SYSTEM_ITEM)RtlAllocateHeap(ProcessHeap, 0, sizeof(*Item)); if (!Item) return; Item->FileSystemName = FileSystemName; - Item->FormatFunc = FormatFunc; - Item->ChkdskFunc = ChkdskFunc; + Item->FileSystem = FileSystem; Item->QuickFormat = FALSE; InsertTailList(&List->ListHead, &Item->ListEntry); } - -PFILE_SYSTEM_ITEM -GetFileSystemByName( - IN PFILE_SYSTEM_LIST List, - IN PWSTR FileSystemName) -{ - PLIST_ENTRY ListEntry; - PFILE_SYSTEM_ITEM Item; - - ListEntry = List->ListHead.Flink; - while (ListEntry != &List->ListHead) - { - Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); - if (Item->FileSystemName && wcsicmp(FileSystemName, Item->FileSystemName) == 0) - return Item; - - ListEntry = ListEntry->Flink; - } - - return NULL; -} - -#if 0 // FIXME: To be fully enabled when our storage stack & al. will work better! - -/* NOTE: Ripped & adapted from base/system/autochk/autochk.c */ -static NTSTATUS -_MyGetFileSystem( - IN struct _PARTENTRY* PartEntry, - IN OUT PWSTR FileSystemName, - IN SIZE_T FileSystemNameSize) -{ - NTSTATUS Status; - HANDLE FileHandle; - IO_STATUS_BLOCK IoStatusBlock; - PFILE_FS_ATTRIBUTE_INFORMATION FileFsAttribute; - UCHAR Buffer[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; - - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING PartitionRootPath; - WCHAR PathBuffer[MAX_PATH]; - - FileFsAttribute = (PFILE_FS_ATTRIBUTE_INFORMATION)Buffer; - - /* Set PartitionRootPath */ - swprintf(PathBuffer, - // L"\\Device\\Harddisk%lu\\Partition%lu", // Should work! But because ReactOS sucks atm. it actually doesn't work!! - L"\\Device\\Harddisk%lu\\Partition%lu\\", // HACK: Use this as a temporary hack! - PartEntry->DiskEntry->DiskNumber, - PartEntry->PartitionNumber); - RtlInitUnicodeString(&PartitionRootPath, PathBuffer); - DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); - - /* Open the partition */ - InitializeObjectAttributes(&ObjectAttributes, - &PartitionRootPath, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenFile(&FileHandle, // PartitionHandle, - FILE_GENERIC_READ /* | SYNCHRONIZE */, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ, - 0 /* FILE_SYNCHRONOUS_IO_NONALERT */); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to open partition %wZ, Status 0x%08lx\n", &PartitionRootPath, Status); - return Status; - } - - /* Retrieve the FS attributes */ - Status = NtQueryVolumeInformationFile(FileHandle, - &IoStatusBlock, - FileFsAttribute, - sizeof(Buffer), - FileFsAttributeInformation); - NtClose(FileHandle); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtQueryVolumeInformationFile failed for partition %wZ, Status 0x%08lx\n", &PartitionRootPath, Status); - return Status; - } - - if (FileSystemNameSize * sizeof(WCHAR) < FileFsAttribute->FileSystemNameLength + sizeof(WCHAR)) - return STATUS_BUFFER_TOO_SMALL; - - RtlCopyMemory(FileSystemName, - FileFsAttribute->FileSystemName, - FileFsAttribute->FileSystemNameLength); - FileSystemName[FileFsAttribute->FileSystemNameLength / sizeof(WCHAR)] = UNICODE_NULL; - - return STATUS_SUCCESS; -} - -#endif - -PFILE_SYSTEM_ITEM -GetFileSystem( - IN PFILE_SYSTEM_LIST FileSystemList, - IN struct _PARTENTRY* PartEntry) +static VOID +InitializeFileSystemList( + IN PFILE_SYSTEM_LIST List) { - PFILE_SYSTEM_ITEM CurrentFileSystem; - PWSTR FileSystemName = NULL; -#if 0 // For code temporarily disabled below - NTSTATUS Status; - WCHAR FsRecFileSystemName[MAX_PATH]; -#endif - - CurrentFileSystem = PartEntry->FileSystem; - - /* We have a file system, return it */ - if (CurrentFileSystem != NULL && CurrentFileSystem->FileSystemName != NULL) - return CurrentFileSystem; - - DPRINT1("File system not found, try to guess one...\n"); - - CurrentFileSystem = NULL; - -#if 0 // FIXME: To be fully enabled when our storage stack & al. will work better! - - /* - * We don't have one... - * - * Try to infer one using NT file system recognition. - */ - Status = _MyGetFileSystem(PartEntry, FsRecFileSystemName, ARRAYSIZE(FsRecFileSystemName)); - if (NT_SUCCESS(Status) && *FsRecFileSystemName) - { - /* Temporary HACK: map FAT32 back to FAT */ - if (wcscmp(FsRecFileSystemName, L"FAT32") == 0) - wcscpy(FsRecFileSystemName, L"FAT"); - - FileSystemName = FsRecFileSystemName; - goto Quit; - } - -#endif - - /* - * 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 - * be formatted with different file systems: for example, usual Linux - * partitions that are formatted in EXT2/3/4, ReiserFS, etc... have the - * same partition ID 0x83. - * - * The proper fix is to make a function that detects the existing FS - * from a given partition (not based on the partition ID). - * 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)) - { - FileSystemName = L"FAT"; - } - else if (PartEntry->PartitionType == PARTITION_EXT2) - { - // WARNING: See the warning above. - FileSystemName = L"EXT2"; - } - else if (PartEntry->PartitionType == PARTITION_IFS) - { - // WARNING: See the warning above. - FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */ - } + ULONG Count; + PFILE_SYSTEM FileSystems; -#if 0 -Quit: // For code temporarily disabled above -#endif + FileSystems = GetRegisteredFileSystems(&Count); + if (!FileSystems || Count == 0) + return; - // HACK: WARNING: We cannot write on this FS yet! - if (FileSystemName) + while (Count--) { - if (PartEntry->PartitionType == PARTITION_EXT2 || PartEntry->PartitionType == PARTITION_IFS) - DPRINT1("Recognized file system %S that doesn't support write support yet!\n", FileSystemName); + AddProvider(List, FileSystems->FileSystemName, FileSystems); + ++FileSystems; } - - DPRINT1("GetFileSystem -- PartitionType: 0x%02X ; FileSystemName (guessed): %S\n", - PartEntry->PartitionType, FileSystemName ? FileSystemName : L"None"); - - if (FileSystemName != NULL) - CurrentFileSystem = GetFileSystemByName(FileSystemList, FileSystemName); - - return CurrentFileSystem; } - PFILE_SYSTEM_LIST CreateFileSystemList( IN SHORT Left, @@ -271,7 +91,7 @@ CreateFileSystemList( PFILE_SYSTEM_ITEM Item; PLIST_ENTRY ListEntry; - List = (PFILE_SYSTEM_LIST)RtlAllocateHeap(ProcessHeap, 0, sizeof(FILE_SYSTEM_LIST)); + List = (PFILE_SYSTEM_LIST)RtlAllocateHeap(ProcessHeap, 0, sizeof(*List)); if (List == NULL) return NULL; @@ -280,16 +100,11 @@ CreateFileSystemList( List->Selected = NULL; InitializeListHead(&List->ListHead); - AddProvider(List, L"FAT", VfatFormat, VfatChkdsk); -#if 0 - AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk); - AddProvider(List, L"NTFS", NtfsFormat, NtfsChkdsk); -#endif - + InitializeFileSystemList(List); if (!ForceFormat) { /* Add the 'Keep existing filesystem' dummy provider */ - AddProvider(List, NULL, NULL, NULL); + AddProvider(List, NULL, NULL); } /* Search for SelectFileSystem in list */ @@ -314,19 +129,17 @@ VOID DestroyFileSystemList( IN PFILE_SYSTEM_LIST List) { - PLIST_ENTRY ListEntry = List->ListHead.Flink; + PLIST_ENTRY ListEntry; PFILE_SYSTEM_ITEM Item; - PLIST_ENTRY Next; - while (ListEntry != &List->ListHead) + ListEntry = List->ListHead.Flink; + while (!IsListEmpty(&List->ListHead)) { + ListEntry = RemoveHeadList(&List->ListHead); Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); - Next = ListEntry->Flink; - RtlFreeHeap(ProcessHeap, 0, Item); - - ListEntry = Next; } + RtlFreeHeap(ProcessHeap, 0, List); } diff --git a/base/setup/usetup/fslist.h b/base/setup/usetup/fslist.h index 4433d381ba..16388e2df2 100644 --- a/base/setup/usetup/fslist.h +++ b/base/setup/usetup/fslist.h @@ -31,9 +31,8 @@ typedef struct _FILE_SYSTEM_ITEM { LIST_ENTRY ListEntry; - PCWSTR FileSystemName; /* Not owned by the item */ - FORMATEX FormatFunc; - CHKDSKEX ChkdskFunc; + PCWSTR FileSystemName; /* Not owned by the item */ // Redundant, I need to check whether this is reaaaaally needed.... + PFILE_SYSTEM FileSystem; BOOLEAN QuickFormat; } FILE_SYSTEM_ITEM, *PFILE_SYSTEM_ITEM; @@ -45,24 +44,6 @@ typedef struct _FILE_SYSTEM_LIST LIST_ENTRY ListHead; /* List of FILE_SYSTEM_ITEM */ } FILE_SYSTEM_LIST, *PFILE_SYSTEM_LIST; -VOID -AddProvider( - IN OUT PFILE_SYSTEM_LIST List, - IN PCWSTR FileSystemName, - IN FORMATEX FormatFunc, - IN CHKDSKEX ChkdskFunc); - -PFILE_SYSTEM_ITEM -GetFileSystemByName( - IN PFILE_SYSTEM_LIST List, - IN PWSTR FileSystemName); - -struct _PARTENTRY; // Defined in partlist.h -PFILE_SYSTEM_ITEM -GetFileSystem( - IN PFILE_SYSTEM_LIST FileSystemList, - IN struct _PARTENTRY* PartEntry); - PFILE_SYSTEM_LIST CreateFileSystemList( IN SHORT Left, diff --git a/base/setup/usetup/genlist.c b/base/setup/usetup/genlist.c index 1ff2275aa3..991d6d0fa2 100644 --- a/base/setup/usetup/genlist.c +++ b/base/setup/usetup/genlist.c @@ -33,103 +33,6 @@ /* FUNCTIONS ****************************************************************/ -typedef struct _GENERIC_LIST_ENTRY -{ - LIST_ENTRY Entry; - PGENERIC_LIST List; - PVOID UserData; - CHAR Text[1]; // FIXME: UI stuff -} GENERIC_LIST_ENTRY; - - -typedef struct _GENERIC_LIST -{ - LIST_ENTRY ListHead; - ULONG NumOfEntries; - - PGENERIC_LIST_ENTRY CurrentEntry; - PGENERIC_LIST_ENTRY BackupEntry; -} GENERIC_LIST; - - -PGENERIC_LIST -CreateGenericList(VOID) -{ - PGENERIC_LIST List; - - List = (PGENERIC_LIST)RtlAllocateHeap(ProcessHeap, - 0, - sizeof(GENERIC_LIST)); - if (List == NULL) - return NULL; - - InitializeListHead(&List->ListHead); - List->NumOfEntries = 0; - - List->CurrentEntry = NULL; - List->BackupEntry = NULL; - - return List; -} - -VOID -DestroyGenericList( - IN OUT PGENERIC_LIST List, - IN BOOLEAN FreeUserData) -{ - PGENERIC_LIST_ENTRY ListEntry; - PLIST_ENTRY Entry; - - /* Release list entries */ - while (!IsListEmpty (&List->ListHead)) - { - Entry = RemoveHeadList (&List->ListHead); - ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - - /* Release user data */ - if (FreeUserData && ListEntry->UserData != NULL) - RtlFreeHeap (ProcessHeap, 0, ListEntry->UserData); - - /* Release list entry */ - RtlFreeHeap (ProcessHeap, 0, ListEntry); - } - - /* Release list head */ - RtlFreeHeap (ProcessHeap, 0, List); -} - -BOOLEAN -AppendGenericListEntry( - IN OUT PGENERIC_LIST List, - IN PCHAR Text, - IN PVOID UserData, - IN BOOLEAN Current) -{ - PGENERIC_LIST_ENTRY Entry; - - Entry = (PGENERIC_LIST_ENTRY)RtlAllocateHeap(ProcessHeap, - 0, - sizeof(GENERIC_LIST_ENTRY) + strlen(Text)); - if (Entry == NULL) - return FALSE; - - strcpy (Entry->Text, Text); - Entry->List = List; - Entry->UserData = UserData; - - InsertTailList(&List->ListHead, - &Entry->Entry); - List->NumOfEntries++; - - if (Current || List->CurrentEntry == NULL) - { - List->CurrentEntry = Entry; - } - - return TRUE; -} - - VOID InitGenericListUi( IN OUT PGENERIC_LIST_UI ListUi, @@ -229,7 +132,6 @@ DrawListFrame( &Written); } - static VOID DrawListEntries( @@ -249,7 +151,7 @@ DrawListEntries( Entry = ListUi->FirstShown; while (Entry != &List->ListHead) { - ListEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); + ListEntry = CONTAINING_RECORD(Entry, GENERIC_LIST_ENTRY, Entry); if (coPos.Y == ListUi->Bottom) break; @@ -298,7 +200,6 @@ DrawListEntries( } } - static VOID DrawScrollBarGenericList( @@ -347,7 +248,6 @@ DrawScrollBarGenericList( } } - static VOID CenterCurrentListItem( @@ -398,7 +298,6 @@ CenterCurrentListItem( } } - VOID DrawGenericList( IN PGENERIC_LIST_UI ListUi, @@ -426,6 +325,61 @@ DrawGenericList( DrawScrollBarGenericList(ListUi); } +VOID +ScrollDownGenericList( + IN PGENERIC_LIST_UI ListUi) +{ + PGENERIC_LIST List = ListUi->List; + PLIST_ENTRY Entry; + + if (List->CurrentEntry == NULL) + return; + + if (List->CurrentEntry->Entry.Flink != &List->ListHead) + { + Entry = List->CurrentEntry->Entry.Flink; + if (ListUi->LastShown == &List->CurrentEntry->Entry) + { + ListUi->FirstShown = ListUi->FirstShown->Flink; + ListUi->LastShown = ListUi->LastShown->Flink; + } + List->CurrentEntry = CONTAINING_RECORD(Entry, GENERIC_LIST_ENTRY, Entry); + + if (ListUi->Redraw) + { + DrawListEntries(ListUi); + DrawScrollBarGenericList(ListUi); + } + } +} + +VOID +ScrollUpGenericList( + IN PGENERIC_LIST_UI ListUi) +{ + PGENERIC_LIST List = ListUi->List; + PLIST_ENTRY Entry; + + if (List->CurrentEntry == NULL) + return; + + if (List->CurrentEntry->Entry.Blink != &List->ListHead) + { + Entry = List->CurrentEntry->Entry.Blink; + if (ListUi->FirstShown == &List->CurrentEntry->Entry) + { + ListUi->FirstShown = ListUi->FirstShown->Blink; + ListUi->LastShown = ListUi->LastShown->Blink; + } + List->CurrentEntry = CONTAINING_RECORD(Entry, GENERIC_LIST_ENTRY, Entry); + + if (ListUi->Redraw) + { + DrawListEntries(ListUi); + DrawScrollBarGenericList(ListUi); + } + } +} VOID ScrollPageDownGenericList( @@ -449,7 +403,6 @@ ScrollPageDownGenericList( ListUi->Redraw = TRUE; } - VOID ScrollPageUpGenericList( IN PGENERIC_LIST_UI ListUi) @@ -472,36 +425,6 @@ ScrollPageUpGenericList( ListUi->Redraw = TRUE; } - -VOID -ScrollDownGenericList( - IN PGENERIC_LIST_UI ListUi) -{ - PGENERIC_LIST List = ListUi->List; - PLIST_ENTRY Entry; - - if (List->CurrentEntry == NULL) - return; - - if (List->CurrentEntry->Entry.Flink != &List->ListHead) - { - Entry = List->CurrentEntry->Entry.Flink; - if (ListUi->LastShown == &List->CurrentEntry->Entry) - { - ListUi->FirstShown = ListUi->FirstShown->Flink; - ListUi->LastShown = ListUi->LastShown->Flink; - } - List->CurrentEntry = CONTAINING_RECORD(Entry, GENERIC_LIST_ENTRY, Entry); - - if (ListUi->Redraw) - { - DrawListEntries(ListUi); - DrawScrollBarGenericList(ListUi); - } - } -} - - VOID ScrollToPositionGenericList( IN PGENERIC_LIST_UI ListUi, @@ -537,36 +460,6 @@ ScrollToPositionGenericList( } } - -VOID -ScrollUpGenericList( - IN PGENERIC_LIST_UI ListUi) -{ - PGENERIC_LIST List = ListUi->List; - PLIST_ENTRY Entry; - - if (List->CurrentEntry == NULL) - return; - - if (List->CurrentEntry->Entry.Blink != &List->ListHead) - { - Entry = List->CurrentEntry->Entry.Blink; - if (ListUi->FirstShown == &List->CurrentEntry->Entry) - { - ListUi->FirstShown = ListUi->FirstShown->Blink; - ListUi->LastShown = ListUi->LastShown->Blink; - } - List->CurrentEntry = CONTAINING_RECORD(Entry, GENERIC_LIST_ENTRY, Entry); - - if (ListUi->Redraw) - { - DrawListEntries(ListUi); - DrawScrollBarGenericList(ListUi); - } - } -} - - VOID RedrawGenericList( IN PGENERIC_LIST_UI ListUi) @@ -581,76 +474,6 @@ RedrawGenericList( } } - - -VOID -SetCurrentListEntry( - IN PGENERIC_LIST List, - IN PGENERIC_LIST_ENTRY Entry) -{ - if (Entry->List != List) - return; - List->CurrentEntry = Entry; -} - - -PGENERIC_LIST_ENTRY -GetCurrentListEntry( - IN PGENERIC_LIST List) -{ - return List->CurrentEntry; -} - - -PGENERIC_LIST_ENTRY -GetFirstListEntry( - IN PGENERIC_LIST List) -{ - PLIST_ENTRY Entry = List->ListHead.Flink; - - if (Entry == &List->ListHead) - return NULL; - return CONTAINING_RECORD(Entry, GENERIC_LIST_ENTRY, Entry); -} - - -PGENERIC_LIST_ENTRY -GetNextListEntry( - IN PGENERIC_LIST_ENTRY Entry) -{ - PLIST_ENTRY Next = Entry->Entry.Flink; - - if (Next == &Entry->List->ListHead) - return NULL; - return CONTAINING_RECORD(Next, GENERIC_LIST_ENTRY, Entry); -} - - -PVOID -GetListEntryUserData( - IN PGENERIC_LIST_ENTRY Entry) -{ - return Entry->UserData; -} - - -LPCSTR -GetListEntryText( - IN PGENERIC_LIST_ENTRY Entry) -{ - return Entry->Text; -} - - -ULONG -GetNumberOfListEntries( - IN PGENERIC_LIST List) -{ - return List->NumOfEntries; -} - - - VOID GenericListKeyPress( IN PGENERIC_LIST_UI ListUi, @@ -714,33 +537,4 @@ End: ListUi->Redraw = TRUE; } - -VOID -SaveGenericListState( - IN PGENERIC_LIST List) -{ - List->BackupEntry = List->CurrentEntry; -} - - -VOID -RestoreGenericListState( - IN PGENERIC_LIST List) -{ - List->CurrentEntry = List->BackupEntry; -} - - -BOOLEAN -GenericListHasSingleEntry( - IN PGENERIC_LIST List) -{ - if (!IsListEmpty(&List->ListHead) && List->ListHead.Flink == List->ListHead.Blink) - return TRUE; - - /* if both list head pointers (which normally point to the first and last list member, respectively) - point to the same entry then it means that there's just a single thing in there, otherwise... false! */ - return FALSE; -} - /* EOF */ diff --git a/base/setup/usetup/genlist.h b/base/setup/usetup/genlist.h index 1c07ec3c3d..ebe406960e 100644 --- a/base/setup/usetup/genlist.h +++ b/base/setup/usetup/genlist.h @@ -26,69 +26,7 @@ #pragma once -struct _GENERIC_LIST_ENTRY; -typedef struct _GENERIC_LIST_ENTRY *PGENERIC_LIST_ENTRY; -struct _GENERIC_LIST; -typedef struct _GENERIC_LIST *PGENERIC_LIST; - -PGENERIC_LIST -CreateGenericList(VOID); - -VOID -DestroyGenericList( - IN OUT PGENERIC_LIST List, - IN BOOLEAN FreeUserData); - -BOOLEAN -AppendGenericListEntry( - IN OUT PGENERIC_LIST List, - IN PCHAR Text, - IN PVOID UserData, - IN BOOLEAN Current); - -VOID -SetCurrentListEntry( - IN PGENERIC_LIST List, - IN PGENERIC_LIST_ENTRY Entry); - -PGENERIC_LIST_ENTRY -GetCurrentListEntry( - IN PGENERIC_LIST List); - -PGENERIC_LIST_ENTRY -GetFirstListEntry( - IN PGENERIC_LIST List); - -PGENERIC_LIST_ENTRY -GetNextListEntry( - IN PGENERIC_LIST_ENTRY Entry); - -PVOID -GetListEntryUserData( - IN PGENERIC_LIST_ENTRY Entry); - -LPCSTR -GetListEntryText( - IN PGENERIC_LIST_ENTRY Entry); - -ULONG -GetNumberOfListEntries( - IN PGENERIC_LIST List); - -VOID -SaveGenericListState( - IN PGENERIC_LIST List); - -VOID -RestoreGenericListState( - IN PGENERIC_LIST List); - -BOOLEAN -GenericListHasSingleEntry( - IN PGENERIC_LIST List); - - - +#include "../lib/genlist.h" typedef struct _GENERIC_LIST_UI { diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index 31c657f702..ca8f13239f 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -26,13 +26,9 @@ #include "usetup.h" -#include <ntddscsi.h> - #define NDEBUG #include <debug.h> -//#define DUMP_PARTITION_TABLE - /* HELPERS FOR PARTITION TYPES **********************************************/ typedef struct _PARTITION_TYPE @@ -207,3598 +203,602 @@ GetPartTypeStringFromPartitionType( } } + /* FUNCTIONS ****************************************************************/ -#ifdef DUMP_PARTITION_TABLE -static VOID -DumpPartitionTable( - PDISKENTRY DiskEntry) -{ - PPARTITION_INFORMATION PartitionInfo; - ULONG i; - - DbgPrint("\n"); - DbgPrint("Index Start Length Hidden Nr Type Boot RW\n"); - DbgPrint("----- ------------ ------------ ---------- -- ---- ---- --\n"); - - for (i = 0; i < DiskEntry->LayoutBuffer->PartitionCount; i++) - { - PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[i]; - DbgPrint(" %3lu %12I64u %12I64u %10lu %2lu %2x %c %c\n", - i, - PartitionInfo->StartingOffset.QuadPart / DiskEntry->BytesPerSector, - PartitionInfo->PartitionLength.QuadPart / DiskEntry->BytesPerSector, - PartitionInfo->HiddenSectors, - PartitionInfo->PartitionNumber, - PartitionInfo->PartitionType, - PartitionInfo->BootIndicator ? '*': ' ', - PartitionInfo->RewritePartition ? 'Y': 'N'); - } - - DbgPrint("\n"); -} -#endif - - -ULONGLONG -AlignDown( - IN ULONGLONG Value, - IN ULONG Alignment) -{ - ULONGLONG Temp; - - Temp = Value / Alignment; - - return Temp * Alignment; -} - -ULONGLONG -AlignUp( - IN ULONGLONG Value, - IN ULONG Alignment) +InitPartitionListUi( + IN OUT PPARTLIST_UI ListUi, + IN PPARTLIST List, + IN SHORT Left, + IN SHORT Top, + IN SHORT Right, + IN SHORT Bottom) { - ULONGLONG Temp, Result; - - Temp = Value / Alignment; - - Result = Temp * Alignment; - if (Value % Alignment) - Result += Alignment; - - return Result; -} + ListUi->List = List; + // ListUi->FirstShown = NULL; + // ListUi->LastShown = NULL; -ULONGLONG -RoundingDivide( - IN ULONGLONG Dividend, - IN ULONGLONG Divisor) -{ - return (Dividend + Divisor / 2) / Divisor; -} + ListUi->Left = Left; + ListUi->Top = Top; + ListUi->Right = Right; + ListUi->Bottom = Bottom; + ListUi->Line = 0; + ListUi->Offset = 0; -static -VOID -GetDriverName( - IN PDISKENTRY DiskEntry) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - WCHAR KeyName[32]; - NTSTATUS Status; - - RtlInitUnicodeString(&DiskEntry->DriverName, - NULL); - - swprintf(KeyName, - L"\\Scsi\\Scsi Port %hu", - DiskEntry->Port); - - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].Name = L"Driver"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[0].EntryContext = &DiskEntry->DriverName; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_DEVICEMAP, - KeyName, - QueryTable, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlQueryRegistryValues() failed (Status %lx)\n", Status); - } + // ListUi->Redraw = TRUE; } - static VOID -AssignDriveLetters( - IN PPARTLIST List) -{ - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - PLIST_ENTRY Entry1; - PLIST_ENTRY Entry2; - CHAR Letter; - - Letter = 'C'; - - /* Assign drive letters to primary partitions */ - Entry1 = List->DiskListHead.Flink; - while (Entry1 != &List->DiskListHead) - { - DiskEntry = CONTAINING_RECORD(Entry1, DISKENTRY, ListEntry); - - Entry2 = DiskEntry->PrimaryPartListHead.Flink; - while (Entry2 != &DiskEntry->PrimaryPartListHead) - { - PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - - PartEntry->DriveLetter = 0; - - if (PartEntry->IsPartitioned && - !IsContainerPartition(PartEntry->PartitionType)) - { - if (IsRecognizedPartition(PartEntry->PartitionType) || - (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED && - PartEntry->SectorCount.QuadPart != 0LL)) - { - if (Letter <= 'Z') - { - PartEntry->DriveLetter = Letter; - Letter++; - } - } - } - - Entry2 = Entry2->Flink; - } - - Entry1 = Entry1->Flink; - } - - /* Assign drive letters to logical drives */ - Entry1 = List->DiskListHead.Flink; - while (Entry1 != &List->DiskListHead) - { - DiskEntry = CONTAINING_RECORD(Entry1, DISKENTRY, ListEntry); - - Entry2 = DiskEntry->LogicalPartListHead.Flink; - while (Entry2 != &DiskEntry->LogicalPartListHead) - { - PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - - PartEntry->DriveLetter = 0; - - if (PartEntry->IsPartitioned) - { - if (IsRecognizedPartition(PartEntry->PartitionType) || - (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED && - PartEntry->SectorCount.QuadPart != 0LL)) - { - if (Letter <= 'Z') - { - PartEntry->DriveLetter = Letter; - Letter++; - } - } - } - - Entry2 = Entry2->Flink; - } - - Entry1 = Entry1->Flink; - } -} - - -static NTSTATUS -NTAPI -DiskIdentifierQueryRoutine( - PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) -{ - PBIOSDISKENTRY BiosDiskEntry = (PBIOSDISKENTRY)Context; - UNICODE_STRING NameU; - - if (ValueType == REG_SZ && - ValueLength == 20 * sizeof(WCHAR)) - { - NameU.Buffer = (PWCHAR)ValueData; - NameU.Length = NameU.MaximumLength = 8 * sizeof(WCHAR); - RtlUnicodeStringToInteger(&NameU, 16, &BiosDiskEntry->Checksum); - - NameU.Buffer = (PWCHAR)ValueData + 9; - RtlUnicodeStringToInteger(&NameU, 16, &BiosDiskEntry->Signature); - - return STATUS_SUCCESS; - } - - return STATUS_UNSUCCESSFUL; -} - - -static NTSTATUS -NTAPI -DiskConfigurationDataQueryRoutine( - PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) -{ - PBIOSDISKENTRY BiosDiskEntry = (PBIOSDISKENTRY)Context; - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; - PCM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; - ULONG i; - - if (ValueType != REG_FULL_RESOURCE_DESCRIPTOR || - ValueLength < sizeof(CM_FULL_RESOURCE_DESCRIPTOR)) - return STATUS_UNSUCCESSFUL; - - FullResourceDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)ValueData; - - /* Hm. Version and Revision are not set on Microsoft Windows XP... */ -#if 0 - if (FullResourceDescriptor->PartialResourceList.Version != 1 || - FullResourceDescriptor->PartialResourceList.Revision != 1) - return STATUS_UNSUCCESSFUL; -#endif - - for (i = 0; i < FullResourceDescriptor->PartialResourceList.Count; i++) - { - if (FullResourceDescriptor->PartialResourceList.PartialDescriptors[i].Type != CmResourceTypeDeviceSpecific || - FullResourceDescriptor->PartialResourceList.PartialDescriptors[i].u.DeviceSpecificData.DataSize != sizeof(CM_DISK_GEOMETRY_DEVICE_DATA)) - continue; - - DiskGeometry = (PCM_DISK_GEOMETRY_DEVICE_DATA)&FullResourceDescriptor->PartialResourceList.PartialDescriptors[i + 1]; - BiosDiskEntry->DiskGeometry = *DiskGeometry; - - return STATUS_SUCCESS; - } - - return STATUS_UNSUCCESSFUL; -} - - -static NTSTATUS -NTAPI -SystemConfigurationDataQueryRoutine( - PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) +PrintEmptyLine( + IN PPARTLIST_UI ListUi) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; - PCM_INT13_DRIVE_PARAMETER* Int13Drives = (PCM_INT13_DRIVE_PARAMETER*)Context; - ULONG i; - - if (ValueType != REG_FULL_RESOURCE_DESCRIPTOR || - ValueLength < sizeof(CM_FULL_RESOURCE_DESCRIPTOR)) - return STATUS_UNSUCCESSFUL; - - FullResourceDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)ValueData; - - /* Hm. Version and Revision are not set on Microsoft Windows XP... */ -#if 0 - if (FullResourceDescriptor->PartialResourceList.Version != 1 || - FullResourceDescriptor->PartialResourceList.Revision != 1) - return STATUS_UNSUCCESSFUL; -#endif - - for (i = 0; i < FullResourceDescriptor->PartialResourceList.Count; i++) - { - if (FullResourceDescriptor->PartialResourceList.PartialDescriptors[i].Type != CmResourceTypeDeviceSpecific || - FullResourceDescriptor->PartialResourceList.PartialDescriptors[i].u.DeviceSpecificData.DataSize % sizeof(CM_INT13_DRIVE_PARAMETER) != 0) - continue; - - *Int13Drives = (CM_INT13_DRIVE_PARAMETER*)RtlAllocateHeap(ProcessHeap, 0, - FullResourceDescriptor->PartialResourceList.PartialDescriptors[i].u.DeviceSpecificData.DataSize); - if (*Int13Drives == NULL) - return STATUS_NO_MEMORY; - - memcpy(*Int13Drives, - &FullResourceDescriptor->PartialResourceList.PartialDescriptors[i + 1], - FullResourceDescriptor->PartialResourceList.PartialDescriptors[i].u.DeviceSpecificData.DataSize); - return STATUS_SUCCESS; - } - - return STATUS_UNSUCCESSFUL; -} - + COORD coPos; + ULONG Written; + USHORT Width; + USHORT Height; -#define ROOT_NAME L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter" + Width = ListUi->Right - ListUi->Left - 1; + Height = ListUi->Bottom - ListUi->Top - 2; -static VOID -EnumerateBiosDiskEntries( - IN PPARTLIST PartList) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[3]; - WCHAR Name[120]; - ULONG AdapterCount; - ULONG DiskCount; - NTSTATUS Status; - PCM_INT13_DRIVE_PARAMETER Int13Drives; - PBIOSDISKENTRY BiosDiskEntry; - - memset(QueryTable, 0, sizeof(QueryTable)); - - QueryTable[1].Name = L"Configuration Data"; - QueryTable[1].QueryRoutine = SystemConfigurationDataQueryRoutine; - Int13Drives = NULL; - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System", - &QueryTable[1], - (PVOID)&Int13Drives, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to query the 'Configuration Data' key in '\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System', status=%lx\n", Status); - return; - } + coPos.X = ListUi->Left + 1; + coPos.Y = ListUi->Top + 1 + ListUi->Line; - AdapterCount = 0; - while (1) + if (ListUi->Line >= 0 && ListUi->Line <= Height) { - swprintf(Name, L"%s\\%lu", ROOT_NAME, AdapterCount); - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - Name, - &QueryTable[2], - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - break; - } - - swprintf(Name, L"%s\\%lu\\DiskController", ROOT_NAME, AdapterCount); - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - Name, - &QueryTable[2], - NULL, - NULL); - if (NT_SUCCESS(Status)) - { - while (1) - { - swprintf(Name, L"%s\\%lu\\DiskController\\0", ROOT_NAME, AdapterCount); - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - Name, - &QueryTable[2], - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(ProcessHeap, 0, Int13Drives); - return; - } - - swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral", ROOT_NAME, AdapterCount); - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - Name, - &QueryTable[2], - NULL, - NULL); - if (NT_SUCCESS(Status)) - { - QueryTable[0].Name = L"Identifier"; - QueryTable[0].QueryRoutine = DiskIdentifierQueryRoutine; - QueryTable[1].Name = L"Configuration Data"; - QueryTable[1].QueryRoutine = DiskConfigurationDataQueryRoutine; - - DiskCount = 0; - while (1) - { - BiosDiskEntry = (BIOSDISKENTRY*)RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(BIOSDISKENTRY)); - if (BiosDiskEntry == NULL) - { - break; - } - - swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral\\%lu", ROOT_NAME, AdapterCount, DiskCount); - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - Name, - QueryTable, - (PVOID)BiosDiskEntry, - NULL); - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(ProcessHeap, 0, BiosDiskEntry); - break; - } - - BiosDiskEntry->DiskNumber = DiskCount; - BiosDiskEntry->Recognized = FALSE; - - if (DiskCount < Int13Drives[0].NumberDrives) - { - BiosDiskEntry->Int13DiskData = Int13Drives[DiskCount]; - } - else - { - DPRINT1("Didn't find int13 drive datas for disk %u\n", DiskCount); - } - - InsertTailList(&PartList->BiosDiskListHead, &BiosDiskEntry->ListEntry); - - DPRINT("DiskNumber: %lu\n", BiosDiskEntry->DiskNumber); - DPRINT("Signature: %08lx\n", BiosDiskEntry->Signature); - DPRINT("Checksum: %08lx\n", BiosDiskEntry->Checksum); - DPRINT("BytesPerSector: %lu\n", BiosDiskEntry->DiskGeometry.BytesPerSector); - DPRINT("NumberOfCylinders: %lu\n", BiosDiskEntry->DiskGeometry.NumberOfCylinders); - DPRINT("NumberOfHeads: %lu\n", BiosDiskEntry->DiskGeometry.NumberOfHeads); - DPRINT("DriveSelect: %02x\n", BiosDiskEntry->Int13DiskData.DriveSelect); - DPRINT("MaxCylinders: %lu\n", BiosDiskEntry->Int13DiskData.MaxCylinders); - DPRINT("SectorsPerTrack: %d\n", BiosDiskEntry->Int13DiskData.SectorsPerTrack); - DPRINT("MaxHeads: %d\n", BiosDiskEntry->Int13DiskData.MaxHeads); - DPRINT("NumberDrives: %d\n", BiosDiskEntry->Int13DiskData.NumberDrives); - - DiskCount++; - } - } - - RtlFreeHeap(ProcessHeap, 0, Int13Drives); - return; - } - } + FillConsoleOutputAttribute(StdOutput, + FOREGROUND_WHITE | BACKGROUND_BLUE, + Width, + coPos, + &Written); - AdapterCount++; + FillConsoleOutputCharacterA(StdOutput, + ' ', + Width, + coPos, + &Written); } - RtlFreeHeap(ProcessHeap, 0, Int13Drives); + ListUi->Line++; } - static VOID -AddPartitionToDisk( - IN ULONG DiskNumber, +PrintPartitionData( + IN PPARTLIST_UI ListUi, IN PDISKENTRY DiskEntry, - IN ULONG PartitionIndex, - IN BOOLEAN LogicalPartition) + IN PPARTENTRY PartEntry) { - PPARTITION_INFORMATION PartitionInfo; - PPARTENTRY PartEntry; - - PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartitionIndex]; - if (PartitionInfo->PartitionType == PARTITION_ENTRY_UNUSED || - ((LogicalPartition != FALSE) && IsContainerPartition(PartitionInfo->PartitionType))) - return; - - PartEntry = RtlAllocateHeap(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(PARTENTRY)); - if (PartEntry == NULL) - { - return; - } - - PartEntry->DiskEntry = DiskEntry; - - PartEntry->StartSector.QuadPart = (ULONGLONG)PartitionInfo->StartingOffset.QuadPart / DiskEntry->BytesPerSector; - PartEntry->SectorCount.QuadPart = (ULONGLONG)PartitionInfo->PartitionLength.QuadPart / DiskEntry->BytesPerSector; + PPARTLIST List = ListUi->List; + CHAR LineBuffer[128]; + COORD coPos; + ULONG Written; + USHORT Width; + USHORT Height; + LARGE_INTEGER PartSize; + PCHAR Unit; + UCHAR Attribute; + CHAR PartTypeString[32]; + PCHAR PartType = PartTypeString; - PartEntry->BootIndicator = PartitionInfo->BootIndicator; - PartEntry->PartitionType = PartitionInfo->PartitionType; - PartEntry->HiddenSectors = PartitionInfo->HiddenSectors; + Width = ListUi->Right - ListUi->Left - 1; + Height = ListUi->Bottom - ListUi->Top - 2; - PartEntry->LogicalPartition = LogicalPartition; - PartEntry->IsPartitioned = TRUE; - PartEntry->PartitionNumber = PartitionInfo->PartitionNumber; - PartEntry->PartitionIndex = PartitionIndex; + coPos.X = ListUi->Left + 1; + coPos.Y = ListUi->Top + 1 + ListUi->Line; - if (IsContainerPartition(PartEntry->PartitionType)) + if (PartEntry->IsPartitioned == FALSE) { - PartEntry->FormatState = Unformatted; - PartEntry->FileSystem = NULL; - - if (LogicalPartition == FALSE && DiskEntry->ExtendedPartition == NULL) - DiskEntry->ExtendedPartition = PartEntry; - } + PartSize.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; #if 0 - else if (IsRecognizedPartition(PartEntry->PartitionType)) - { - // FIXME FIXME! We should completely rework how we get this 'FileSystemList' available... - PartEntry->FileSystem = GetFileSystem(FileSystemList, PartEntry); - if (!PartEntry->FileSystem) - PartEntry->FormatState = Preformatted; + if (PartSize.QuadPart >= 10737418240) /* 10 GB */ + { + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1073741824); + Unit = MUIGetString(STRING_GB); + } else - PartEntry->FormatState = Unformatted; - // PartEntry->FormatState = UnknownFormat; - } - else - { - /* Unknown partition, so unknown partition format (may or may not be actually formatted) */ - PartEntry->FormatState = UnknownFormat; - } #endif - else 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 0 - if (CheckFatFormat()) + if (PartSize.QuadPart >= 10485760) /* 10 MB */ { - PartEntry->FormatState = Preformatted; + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1048576); + Unit = MUIGetString(STRING_MB); } else { - PartEntry->FormatState = Unformatted; + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1024); + Unit = MUIGetString(STRING_KB); } -#endif - PartEntry->FormatState = Preformatted; + + sprintf(LineBuffer, + MUIGetString(STRING_UNPSPACE), + PartEntry->LogicalPartition ? " " : "", + PartEntry->LogicalPartition ? "" : " ", + PartSize.u.LowPart, + Unit); } - else if (PartEntry->PartitionType == PARTITION_EXT2) + else { -#if 0 - if (CheckExt2Format()) + /* Determine partition type */ + PartTypeString[0] = '\0'; + if (PartEntry->New != FALSE) { - PartEntry->FormatState = Preformatted; + PartType = MUIGetString(STRING_UNFORMATTED); } - else + else if (PartEntry->IsPartitioned != FALSE) { - PartEntry->FormatState = Unformatted; + GetPartTypeStringFromPartitionType(PartEntry->PartitionType, + PartTypeString, + ARRAYSIZE(PartTypeString)); + PartType = PartTypeString; } -#endif - PartEntry->FormatState = Preformatted; - } - else if (PartEntry->PartitionType == PARTITION_IFS) - { + + PartSize.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; #if 0 - if (CheckNtfsFormat()) + if (PartSize.QuadPart >= 10737418240) /* 10 GB */ { - PartEntry->FormatState = Preformatted; + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1073741824); + Unit = MUIGetString(STRING_GB); } - else if (CheckHpfsFormat()) + else +#endif + if (PartSize.QuadPart >= 10485760) /* 10 MB */ { - PartEntry->FormatState = Preformatted; + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1048576); + Unit = MUIGetString(STRING_MB); } else { - PartEntry->FormatState = Unformatted; + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1024); + Unit = MUIGetString(STRING_KB); } -#endif - PartEntry->FormatState = Preformatted; - } - else - { - PartEntry->FormatState = UnknownFormat; - } - - if (LogicalPartition) - InsertTailList(&DiskEntry->LogicalPartListHead, - &PartEntry->ListEntry); - else - InsertTailList(&DiskEntry->PrimaryPartListHead, - &PartEntry->ListEntry); -} - - -static -VOID -ScanForUnpartitionedDiskSpace( - IN PDISKENTRY DiskEntry) -{ - ULONGLONG LastStartSector; - ULONGLONG LastSectorCount; - ULONGLONG LastUnusedSectorCount; - PPARTENTRY PartEntry; - PPARTENTRY NewPartEntry; - PLIST_ENTRY Entry; - - DPRINT("ScanForUnpartitionedDiskSpace()\n"); - - if (IsListEmpty(&DiskEntry->PrimaryPartListHead)) - { - DPRINT1("No primary partition!\n"); - /* Create a partition entry that represents the empty disk */ - NewPartEntry = RtlAllocateHeap(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(PARTENTRY)); - if (NewPartEntry == NULL) - return; - - NewPartEntry->DiskEntry = DiskEntry; - - NewPartEntry->IsPartitioned = FALSE; - NewPartEntry->StartSector.QuadPart = (ULONGLONG)DiskEntry->SectorAlignment; - NewPartEntry->SectorCount.QuadPart = AlignDown(DiskEntry->SectorCount.QuadPart, DiskEntry->SectorAlignment) - - NewPartEntry->StartSector.QuadPart; - - 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); - - NewPartEntry->FormatState = Unformatted; - NewPartEntry->FileSystem = NULL; - - InsertTailList(&DiskEntry->PrimaryPartListHead, - &NewPartEntry->ListEntry); - - return; + if (strcmp(PartType, MUIGetString(STRING_FORMATUNKNOWN)) == 0) + { + sprintf(LineBuffer, + MUIGetString(STRING_HDDINFOUNK5), + (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, + (PartEntry->DriveLetter == 0) ? '-' : ':', + PartEntry->BootIndicator ? '*' : ' ', + PartEntry->LogicalPartition ? " " : "", + PartEntry->PartitionType, + PartEntry->LogicalPartition ? "" : " ", + PartSize.u.LowPart, + Unit); + } + else + { + sprintf(LineBuffer, + "%c%c %c %s%-24s%s %6lu %s", + (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, + (PartEntry->DriveLetter == 0) ? '-' : ':', + PartEntry->BootIndicator ? '*' : ' ', + PartEntry->LogicalPartition ? " " : "", + PartType, + PartEntry->LogicalPartition ? "" : " ", + PartSize.u.LowPart, + Unit); + } } - /* Start partition at head 1, cylinder 0 */ - LastStartSector = DiskEntry->SectorAlignment; - LastSectorCount = 0ULL; - LastUnusedSectorCount = 0ULL; + Attribute = (List->CurrentDisk == DiskEntry && + List->CurrentPartition == PartEntry) ? + FOREGROUND_BLUE | BACKGROUND_WHITE : + FOREGROUND_WHITE | BACKGROUND_BLUE; - Entry = DiskEntry->PrimaryPartListHead.Flink; - while (Entry != &DiskEntry->PrimaryPartListHead) + if (ListUi->Line >= 0 && ListUi->Line <= Height) { - PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); - - if (PartEntry->PartitionType != PARTITION_ENTRY_UNUSED || - PartEntry->SectorCount.QuadPart != 0ULL) - { - LastUnusedSectorCount = - PartEntry->StartSector.QuadPart - (LastStartSector + LastSectorCount); - - if (PartEntry->StartSector.QuadPart > (LastStartSector + LastSectorCount) && - LastUnusedSectorCount >= (ULONGLONG)DiskEntry->SectorAlignment) - { - DPRINT("Unpartitioned disk space %I64u sectors\n", LastUnusedSectorCount); - - NewPartEntry = RtlAllocateHeap(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(PARTENTRY)); - if (NewPartEntry == NULL) - return; - - NewPartEntry->DiskEntry = DiskEntry; - - NewPartEntry->IsPartitioned = FALSE; - NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; - NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - - NewPartEntry->StartSector.QuadPart; - - 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); - - NewPartEntry->FormatState = Unformatted; - NewPartEntry->FileSystem = NULL; - - /* Insert the table into the list */ - InsertTailList(&PartEntry->ListEntry, - &NewPartEntry->ListEntry); - } - - LastStartSector = PartEntry->StartSector.QuadPart; - LastSectorCount = PartEntry->SectorCount.QuadPart; - } - - Entry = Entry->Flink; + FillConsoleOutputCharacterA(StdOutput, + ' ', + Width, + coPos, + &Written); } - - /* Check for trailing unpartitioned disk space */ - if ((LastStartSector + LastSectorCount) < DiskEntry->SectorCount.QuadPart) + coPos.X += 4; + Width -= 8; + if (ListUi->Line >= 0 && ListUi->Line <= Height) { - LastUnusedSectorCount = AlignDown(DiskEntry->SectorCount.QuadPart - (LastStartSector + LastSectorCount), DiskEntry->SectorAlignment); - - if (LastUnusedSectorCount >= (ULONGLONG)DiskEntry->SectorAlignment) - { - DPRINT("Unpartitioned disk space: %I64u sectors\n", LastUnusedSectorCount); - - NewPartEntry = RtlAllocateHeap(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(PARTENTRY)); - if (NewPartEntry == NULL) - return; + FillConsoleOutputAttribute(StdOutput, + Attribute, + Width, + coPos, + &Written); + } + coPos.X++; + Width -= 2; + if (ListUi->Line >= 0 && ListUi->Line <= Height) + { + WriteConsoleOutputCharacterA(StdOutput, + LineBuffer, + min(strlen(LineBuffer), Width), + coPos, + &Written); + } - NewPartEntry->DiskEntry = DiskEntry; + ListUi->Line++; +} - NewPartEntry->IsPartitioned = FALSE; - NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; - NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - - NewPartEntry->StartSector.QuadPart; +static +VOID +PrintDiskData( + IN PPARTLIST_UI ListUi, + IN PDISKENTRY DiskEntry) +{ + // PPARTLIST List = ListUi->List; + PPARTENTRY PrimaryPartEntry, LogicalPartEntry; + PLIST_ENTRY PrimaryEntry, LogicalEntry; + CHAR LineBuffer[128]; + COORD coPos; + ULONG Written; + USHORT Width; + USHORT Height; + ULARGE_INTEGER DiskSize; + PCHAR Unit; - DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); - DPRINT("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); - DPRINT("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + Width = ListUi->Right - ListUi->Left - 1; + Height = ListUi->Bottom - ListUi->Top - 2; - NewPartEntry->FormatState = Unformatted; - NewPartEntry->FileSystem = NULL; + coPos.X = ListUi->Left + 1; + coPos.Y = ListUi->Top + 1 + ListUi->Line; - /* Append the table to the list */ - InsertTailList(&DiskEntry->PrimaryPartListHead, - &NewPartEntry->ListEntry); - } + DiskSize.QuadPart = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + if (DiskSize.QuadPart >= 10737418240) /* 10 GB */ + { + DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, 1073741824); + Unit = MUIGetString(STRING_GB); } - - if (DiskEntry->ExtendedPartition != NULL) + else { - if (IsListEmpty(&DiskEntry->LogicalPartListHead)) - { - DPRINT1("No logical partition!\n"); + DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, 1048576); + if (DiskSize.QuadPart == 0) + DiskSize.QuadPart = 1; + Unit = MUIGetString(STRING_MB); + } - /* Create a partition entry that represents the empty extended partition */ - NewPartEntry = RtlAllocateHeap(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(PARTENTRY)); - if (NewPartEntry == NULL) - return; + if (DiskEntry->DriverName.Length > 0) + { + sprintf(LineBuffer, + MUIGetString(STRING_HDINFOPARTSELECT), + DiskSize.u.LowPart, + Unit, + DiskEntry->DiskNumber, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id, + DiskEntry->DriverName.Buffer); + } + else + { + sprintf(LineBuffer, + MUIGetString(STRING_HDDINFOUNK6), + DiskSize.u.LowPart, + Unit, + DiskEntry->DiskNumber, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id); + } - NewPartEntry->DiskEntry = DiskEntry; - NewPartEntry->LogicalPartition = TRUE; + if (ListUi->Line >= 0 && ListUi->Line <= Height) + { + FillConsoleOutputAttribute(StdOutput, + FOREGROUND_WHITE | BACKGROUND_BLUE, + Width, + coPos, + &Written); - NewPartEntry->IsPartitioned = FALSE; - NewPartEntry->StartSector.QuadPart = DiskEntry->ExtendedPartition->StartSector.QuadPart + (ULONGLONG)DiskEntry->SectorAlignment; - NewPartEntry->SectorCount.QuadPart = DiskEntry->ExtendedPartition->SectorCount.QuadPart - (ULONGLONG)DiskEntry->SectorAlignment; + FillConsoleOutputCharacterA(StdOutput, + ' ', + Width, + coPos, + &Written); + } - 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); + coPos.X++; + if (ListUi->Line >= 0 && ListUi->Line <= Height) + { + WriteConsoleOutputCharacterA(StdOutput, + LineBuffer, + min((USHORT)strlen(LineBuffer), Width - 2), + coPos, + &Written); + } - NewPartEntry->FormatState = Unformatted; - NewPartEntry->FileSystem = NULL; + ListUi->Line++; - InsertTailList(&DiskEntry->LogicalPartListHead, - &NewPartEntry->ListEntry); + /* Print separator line */ + PrintEmptyLine(ListUi); - return; - } + /* Print partition lines */ + PrimaryEntry = DiskEntry->PrimaryPartListHead.Flink; + while (PrimaryEntry != &DiskEntry->PrimaryPartListHead) + { + PrimaryPartEntry = CONTAINING_RECORD(PrimaryEntry, PARTENTRY, ListEntry); - /* Start partition at head 1, cylinder 0 */ - LastStartSector = DiskEntry->ExtendedPartition->StartSector.QuadPart + (ULONGLONG)DiskEntry->SectorAlignment; - LastSectorCount = 0ULL; - LastUnusedSectorCount = 0ULL; + PrintPartitionData(ListUi, + DiskEntry, + PrimaryPartEntry); - Entry = DiskEntry->LogicalPartListHead.Flink; - while (Entry != &DiskEntry->LogicalPartListHead) + if (IsContainerPartition(PrimaryPartEntry->PartitionType)) { - PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); - - if (PartEntry->PartitionType != PARTITION_ENTRY_UNUSED || - PartEntry->SectorCount.QuadPart != 0ULL) + LogicalEntry = DiskEntry->LogicalPartListHead.Flink; + while (LogicalEntry != &DiskEntry->LogicalPartListHead) { - LastUnusedSectorCount = - PartEntry->StartSector.QuadPart - (ULONGLONG)DiskEntry->SectorAlignment - (LastStartSector + LastSectorCount); - - if ((PartEntry->StartSector.QuadPart - (ULONGLONG)DiskEntry->SectorAlignment) > (LastStartSector + LastSectorCount) && - LastUnusedSectorCount >= (ULONGLONG)DiskEntry->SectorAlignment) - { - DPRINT("Unpartitioned disk space %I64u sectors\n", LastUnusedSectorCount); - - NewPartEntry = RtlAllocateHeap(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(PARTENTRY)); - if (NewPartEntry == NULL) - return; - - NewPartEntry->DiskEntry = DiskEntry; - NewPartEntry->LogicalPartition = TRUE; - - NewPartEntry->IsPartitioned = FALSE; - NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; - NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - - NewPartEntry->StartSector.QuadPart; - - DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); - DPRINT("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); - DPRINT("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); - - NewPartEntry->FormatState = Unformatted; - NewPartEntry->FileSystem = NULL; + LogicalPartEntry = CONTAINING_RECORD(LogicalEntry, PARTENTRY, ListEntry); - /* Insert the table into the list */ - InsertTailList(&PartEntry->ListEntry, - &NewPartEntry->ListEntry); - } + PrintPartitionData(ListUi, + DiskEntry, + LogicalPartEntry); - LastStartSector = PartEntry->StartSector.QuadPart; - LastSectorCount = PartEntry->SectorCount.QuadPart; + LogicalEntry = LogicalEntry->Flink; } - - Entry = Entry->Flink; } - /* Check for trailing unpartitioned disk space */ - if ((LastStartSector + LastSectorCount) < DiskEntry->ExtendedPartition->StartSector.QuadPart + DiskEntry->ExtendedPartition->SectorCount.QuadPart) - { - LastUnusedSectorCount = AlignDown(DiskEntry->ExtendedPartition->StartSector.QuadPart + DiskEntry->ExtendedPartition->SectorCount.QuadPart - (LastStartSector + LastSectorCount), DiskEntry->SectorAlignment); - - if (LastUnusedSectorCount >= (ULONGLONG)DiskEntry->SectorAlignment) - { - DPRINT("Unpartitioned disk space: %I64u sectors\n", LastUnusedSectorCount); - - NewPartEntry = RtlAllocateHeap(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(PARTENTRY)); - if (NewPartEntry == NULL) - return; - - NewPartEntry->DiskEntry = DiskEntry; - NewPartEntry->LogicalPartition = TRUE; - - NewPartEntry->IsPartitioned = FALSE; - NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; - NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - - NewPartEntry->StartSector.QuadPart; - - DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); - DPRINT("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); - DPRINT("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); - - NewPartEntry->FormatState = Unformatted; - NewPartEntry->FileSystem = NULL; - - /* Append the table to the list */ - InsertTailList(&DiskEntry->LogicalPartListHead, - &NewPartEntry->ListEntry); - } - } + PrimaryEntry = PrimaryEntry->Flink; } - DPRINT("ScanForUnpartitionedDiskSpace() done\n"); + /* Print separator line */ + PrintEmptyLine(ListUi); } - -static VOID -SetDiskSignature( - IN PPARTLIST List, - IN PDISKENTRY DiskEntry) +DrawPartitionList( + IN PPARTLIST_UI ListUi) { - LARGE_INTEGER SystemTime; - TIME_FIELDS TimeFields; - PLIST_ENTRY Entry2; - PDISKENTRY DiskEntry2; - PUCHAR Buffer; + PPARTLIST List = ListUi->List; + PLIST_ENTRY Entry, Entry2; + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry = NULL; + COORD coPos; + ULONG Written; + SHORT i; + SHORT CurrentDiskLine; + SHORT CurrentPartLine; + SHORT LastLine; + BOOLEAN CurrentPartLineFound = FALSE; + BOOLEAN CurrentDiskLineFound = FALSE; - Buffer = (PUCHAR)&DiskEntry->LayoutBuffer->Signature; + /* Calculate the line of the current disk and partition */ + CurrentDiskLine = 0; + CurrentPartLine = 0; + LastLine = 0; - while (1) + Entry = List->DiskListHead.Flink; + while (Entry != &List->DiskListHead) { - NtQuerySystemTime(&SystemTime); - RtlTimeToTimeFields(&SystemTime, &TimeFields); - - Buffer[0] = (UCHAR)(TimeFields.Year & 0xFF) + (UCHAR)(TimeFields.Hour & 0xFF); - Buffer[1] = (UCHAR)(TimeFields.Year >> 8) + (UCHAR)(TimeFields.Minute & 0xFF); - Buffer[2] = (UCHAR)(TimeFields.Month & 0xFF) + (UCHAR)(TimeFields.Second & 0xFF); - Buffer[3] = (UCHAR)(TimeFields.Day & 0xFF) + (UCHAR)(TimeFields.Milliseconds & 0xFF); + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); - if (DiskEntry->LayoutBuffer->Signature == 0) + LastLine += 2; + if (CurrentPartLineFound == FALSE) { - continue; + CurrentPartLine += 2; } - /* check if the signature already exist */ - /* FIXME: - * Check also signatures from disks, which are - * not visible (bootable) by the bios. - */ - Entry2 = List->DiskListHead.Flink; - while (Entry2 != &List->DiskListHead) + Entry2 = DiskEntry->PrimaryPartListHead.Flink; + while (Entry2 != &DiskEntry->PrimaryPartListHead) { - DiskEntry2 = CONTAINING_RECORD(Entry2, DISKENTRY, ListEntry); - - if (DiskEntry != DiskEntry2 && - DiskEntry->LayoutBuffer->Signature == DiskEntry2->LayoutBuffer->Signature) - break; + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + if (PartEntry == List->CurrentPartition) + { + CurrentPartLineFound = TRUE; + } Entry2 = Entry2->Flink; - } - - if (Entry2 == &List->DiskListHead) - break; - } -} + if (CurrentPartLineFound == FALSE) + { + CurrentPartLine++; + } + LastLine++; + } -static -VOID -UpdateDiskSignatures( - IN PPARTLIST List) -{ - PLIST_ENTRY Entry; - PDISKENTRY DiskEntry; + if (CurrentPartLineFound == FALSE) + { + Entry2 = DiskEntry->LogicalPartListHead.Flink; + while (Entry2 != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + if (PartEntry == List->CurrentPartition) + { + CurrentPartLineFound = TRUE; + } - /* Print partition lines */ - Entry = List->DiskListHead.Flink; - while (Entry != &List->DiskListHead) - { - DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + Entry2 = Entry2->Flink; + if (CurrentPartLineFound == FALSE) + { + CurrentPartLine++; + } + + LastLine++; + } + } - if (DiskEntry->LayoutBuffer && - DiskEntry->LayoutBuffer->Signature == 0) + if (DiskEntry == List->CurrentDisk) { - SetDiskSignature(List, DiskEntry); - DiskEntry->LayoutBuffer->PartitionEntry[0].RewritePartition = TRUE; + CurrentDiskLineFound = TRUE; } Entry = Entry->Flink; - } -} - - -static -VOID -AddDiskToList( - IN HANDLE FileHandle, - IN ULONG DiskNumber, - IN PPARTLIST List) -{ - DISK_GEOMETRY DiskGeometry; - SCSI_ADDRESS ScsiAddress; - PDISKENTRY DiskEntry; - IO_STATUS_BLOCK Iosb; - NTSTATUS Status; - PPARTITION_SECTOR Mbr; - PULONG Buffer; - LARGE_INTEGER FileOffset; - WCHAR Identifier[20]; - ULONG Checksum; - ULONG Signature; - ULONG i; - PLIST_ENTRY ListEntry; - PBIOSDISKENTRY BiosDiskEntry; - ULONG LayoutBufferSize; - PDRIVE_LAYOUT_INFORMATION NewLayoutBuffer; - - Status = NtDeviceIoControlFile(FileHandle, - NULL, - NULL, - NULL, - &Iosb, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - sizeof(DISK_GEOMETRY)); - if (!NT_SUCCESS(Status)) - return; - - if (DiskGeometry.MediaType != FixedMedia && - DiskGeometry.MediaType != RemovableMedia) - { - return; - } - - Status = NtDeviceIoControlFile(FileHandle, - NULL, - NULL, - NULL, - &Iosb, - IOCTL_SCSI_GET_ADDRESS, - NULL, - 0, - &ScsiAddress, - sizeof(SCSI_ADDRESS)); - if (!NT_SUCCESS(Status)) - return; - - /* - * Check whether the disk is initialized, by looking at its MBR. - * NOTE that this must be generalized to GPT disks as well! - */ - - Mbr = (PARTITION_SECTOR*)RtlAllocateHeap(ProcessHeap, - 0, - DiskGeometry.BytesPerSector); - if (Mbr == NULL) - return; - - FileOffset.QuadPart = 0; - Status = NtReadFile(FileHandle, - NULL, - NULL, - NULL, - &Iosb, - (PVOID)Mbr, - DiskGeometry.BytesPerSector, - &FileOffset, - NULL); - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(ProcessHeap, 0, Mbr); - DPRINT1("NtReadFile failed, status=%x\n", Status); - return; - } - Signature = Mbr->Signature; - - /* Calculate the MBR checksum */ - Checksum = 0; - Buffer = (PULONG)Mbr; - for (i = 0; i < 128; i++) - { - Checksum += Buffer[i]; - } - Checksum = ~Checksum + 1; - - swprintf(Identifier, L"%08x-%08x-A", Checksum, Signature); - DPRINT("Identifier: %S\n", Identifier); - - DiskEntry = RtlAllocateHeap(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(DISKENTRY)); - if (DiskEntry == NULL) - { - return; - } - -// DiskEntry->Checksum = Checksum; -// DiskEntry->Signature = Signature; - DiskEntry->BiosFound = FALSE; - - /* Check if this disk has a valid MBR */ - // FIXME: Check for the MBR signature as well, etc... - if (Mbr->BootCode[0] == 0 && Mbr->BootCode[1] == 0) - DiskEntry->NoMbr = TRUE; - else - DiskEntry->NoMbr = FALSE; - - /* Free the MBR sector buffer */ - RtlFreeHeap(ProcessHeap, 0, Mbr); - - - ListEntry = List->BiosDiskListHead.Flink; - while (ListEntry != &List->BiosDiskListHead) - { - BiosDiskEntry = CONTAINING_RECORD(ListEntry, BIOSDISKENTRY, ListEntry); - /* FIXME: - * Compare the size from bios and the reported size from driver. - * If we have more than one disk with a zero or with the same signature - * we must create new signatures and reboot. After the reboot, - * it is possible to identify the disks. - */ - if (BiosDiskEntry->Signature == Signature && - BiosDiskEntry->Checksum == Checksum && - !BiosDiskEntry->Recognized) + if (Entry != &List->DiskListHead) { - if (!DiskEntry->BiosFound) - { - DiskEntry->BiosDiskNumber = BiosDiskEntry->DiskNumber; - DiskEntry->BiosFound = TRUE; - BiosDiskEntry->Recognized = TRUE; - } - else + if (CurrentDiskLineFound == FALSE) { + CurrentPartLine ++; + CurrentDiskLine = CurrentPartLine; } - } - ListEntry = ListEntry->Flink; - } - - if (!DiskEntry->BiosFound) - { -#if 0 - RtlFreeHeap(ProcessHeap, 0, DiskEntry); - return; -#else - DPRINT1("WARNING: Setup could not find a matching BIOS disk entry. Disk %d is not be bootable by the BIOS!\n", DiskNumber); -#endif - } - - InitializeListHead(&DiskEntry->PrimaryPartListHead); - InitializeListHead(&DiskEntry->LogicalPartListHead); - - DiskEntry->Cylinders = DiskGeometry.Cylinders.QuadPart; - DiskEntry->TracksPerCylinder = DiskGeometry.TracksPerCylinder; - DiskEntry->SectorsPerTrack = DiskGeometry.SectorsPerTrack; - DiskEntry->BytesPerSector = DiskGeometry.BytesPerSector; - - DPRINT("Cylinders %I64u\n", DiskEntry->Cylinders); - DPRINT("TracksPerCylinder %lu\n", DiskEntry->TracksPerCylinder); - DPRINT("SectorsPerTrack %lu\n", DiskEntry->SectorsPerTrack); - DPRINT("BytesPerSector %lu\n", DiskEntry->BytesPerSector); - - DiskEntry->SectorCount.QuadPart = DiskGeometry.Cylinders.QuadPart * - (ULONGLONG)DiskGeometry.TracksPerCylinder * - (ULONGLONG)DiskGeometry.SectorsPerTrack; - - DiskEntry->SectorAlignment = DiskGeometry.SectorsPerTrack; - DiskEntry->CylinderAlignment = DiskGeometry.TracksPerCylinder * - DiskGeometry.SectorsPerTrack; - - DPRINT("SectorCount %I64u\n", DiskEntry->SectorCount.QuadPart); - DPRINT("SectorAlignment %lu\n", DiskEntry->SectorAlignment); - - DiskEntry->DiskNumber = DiskNumber; - DiskEntry->Port = ScsiAddress.PortNumber; - DiskEntry->Bus = ScsiAddress.PathId; - DiskEntry->Id = ScsiAddress.TargetId; - - GetDriverName(DiskEntry); - - InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry, DiskNumber); - - /* Allocate a layout buffer with 4 partition entries first */ - LayoutBufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + - ((4 - ANYSIZE_ARRAY) * sizeof(PARTITION_INFORMATION)); - DiskEntry->LayoutBuffer = RtlAllocateHeap(ProcessHeap, - HEAP_ZERO_MEMORY, - LayoutBufferSize); - if (DiskEntry->LayoutBuffer == NULL) - { - DPRINT1("Failed to allocate the disk layout buffer!\n"); - return; - } - for (;;) - { - DPRINT1("Buffer size: %lu\n", LayoutBufferSize); - Status = NtDeviceIoControlFile(FileHandle, - NULL, - NULL, - NULL, - &Iosb, - IOCTL_DISK_GET_DRIVE_LAYOUT, - NULL, - 0, - DiskEntry->LayoutBuffer, - LayoutBufferSize); - if (NT_SUCCESS(Status)) - break; - - if (Status != STATUS_BUFFER_TOO_SMALL) - { - DPRINT1("NtDeviceIoControlFile() failed (Status: 0x%08lx)\n", Status); - return; + LastLine++; } - - LayoutBufferSize += 4 * sizeof(PARTITION_INFORMATION); - NewLayoutBuffer = RtlReAllocateHeap(ProcessHeap, - HEAP_ZERO_MEMORY, - DiskEntry->LayoutBuffer, - LayoutBufferSize); - if (NewLayoutBuffer == NULL) + else { - DPRINT1("Failed to reallocate the disk layout buffer!\n"); - return; + LastLine--; } - - DiskEntry->LayoutBuffer = NewLayoutBuffer; } - DPRINT1("PartitionCount: %lu\n", DiskEntry->LayoutBuffer->PartitionCount); - -#ifdef DUMP_PARTITION_TABLE - DumpPartitionTable(DiskEntry); -#endif - - if (DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart != 0 && - DiskEntry->LayoutBuffer->PartitionEntry[0].PartitionLength.QuadPart != 0 && - DiskEntry->LayoutBuffer->PartitionEntry[0].PartitionType != PARTITION_ENTRY_UNUSED) + /* If it possible, make the disk name visible */ + if (CurrentPartLine < ListUi->Offset) { - if ((DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart / DiskEntry->BytesPerSector) % DiskEntry->SectorsPerTrack == 0) - { - DPRINT("Use %lu Sector alignment!\n", DiskEntry->SectorsPerTrack); - } - else if (DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart % (1024 * 1024) == 0) - { - DPRINT1("Use megabyte (%lu Sectors) alignment!\n", (1024 * 1024) / DiskEntry->BytesPerSector); - } - else - { - DPRINT1("No matching alignment found! Partition 1 starts at %I64u\n", DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart); - } + ListUi->Offset = CurrentPartLine; } - else + else if (CurrentPartLine - ListUi->Offset > ListUi->Bottom - ListUi->Top - 2) { - DPRINT1("No valid partition table found! Use megabyte (%lu Sectors) alignment!\n", (1024 * 1024) / DiskEntry->BytesPerSector); + ListUi->Offset = CurrentPartLine - (ListUi->Bottom - ListUi->Top - 2); } - - if (DiskEntry->LayoutBuffer->PartitionCount == 0) + if (CurrentDiskLine < ListUi->Offset && CurrentPartLine - CurrentDiskLine < ListUi->Bottom - ListUi->Top - 2) { - DiskEntry->NewDisk = TRUE; - DiskEntry->LayoutBuffer->PartitionCount = 4; + ListUi->Offset = CurrentDiskLine; + } + + /* Draw upper left corner */ + coPos.X = ListUi->Left; + coPos.Y = ListUi->Top; + FillConsoleOutputCharacterA(StdOutput, + 0xDA, // '+', + 1, + coPos, + &Written); - for (i = 0; i < 4; i++) - DiskEntry->LayoutBuffer->PartitionEntry[i].RewritePartition = TRUE; + /* Draw upper edge */ + coPos.X = ListUi->Left + 1; + coPos.Y = ListUi->Top; + if (ListUi->Offset == 0) + { + FillConsoleOutputCharacterA(StdOutput, + 0xC4, // '-', + ListUi->Right - ListUi->Left - 1, + coPos, + &Written); } else { - for (i = 0; i < 4; i++) - { - AddPartitionToDisk(DiskNumber, DiskEntry, i, FALSE); - } - - for (i = 4; i < DiskEntry->LayoutBuffer->PartitionCount; i += 4) - { - AddPartitionToDisk(DiskNumber, DiskEntry, i, TRUE); - } + FillConsoleOutputCharacterA(StdOutput, + 0xC4, // '-', + ListUi->Right - ListUi->Left - 5, + coPos, + &Written); + coPos.X = ListUi->Right - 5; + WriteConsoleOutputCharacterA(StdOutput, + "(\x18)", // "(up)" + 3, + coPos, + &Written); + coPos.X = ListUi->Right - 2; + FillConsoleOutputCharacterA(StdOutput, + 0xC4, // '-', + 2, + coPos, + &Written); } - ScanForUnpartitionedDiskSpace(DiskEntry); -} - - -PPARTLIST -CreatePartitionList(VOID) -{ - PPARTLIST List; - OBJECT_ATTRIBUTES ObjectAttributes; - SYSTEM_DEVICE_INFORMATION Sdi; - IO_STATUS_BLOCK Iosb; - ULONG ReturnSize; - NTSTATUS Status; - ULONG DiskNumber; - WCHAR Buffer[MAX_PATH]; - UNICODE_STRING Name; - HANDLE FileHandle; - - List = (PPARTLIST)RtlAllocateHeap(ProcessHeap, - 0, ... 3058 lines suppressed ...

1 0

01/01: [USERSRV] Romanian translation update
by Bișoc George 27 May '18

27 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=739e72b6ed9ea008fdd47… commit 739e72b6ed9ea008fdd473552f4ea28bbaf19281 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun May 27 15:19:14 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 27 17:35:47 2018 +0200 [USERSRV] Romanian translation update --- win32ss/user/winsrv/usersrv/lang/ro-RO.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/win32ss/user/winsrv/usersrv/lang/ro-RO.rc b/win32ss/user/winsrv/usersrv/lang/ro-RO.rc index 9ad34941d2..1e9b8a52ae 100644 --- a/win32ss/user/winsrv/usersrv/lang/ro-RO.rc +++ b/win32ss/user/winsrv/usersrv/lang/ro-RO.rc @@ -28,16 +28,16 @@ END STRINGTABLE BEGIN - IDS_SEVERITY_SUCCESS "Success" - IDS_SEVERITY_INFORMATIONAL "System Information" - IDS_SEVERITY_WARNING "System Warning" - IDS_SEVERITY_ERROR "System Error" + IDS_SEVERITY_SUCCESS "Succes" + IDS_SEVERITY_INFORMATIONAL "Informație sistem" + IDS_SEVERITY_WARNING "Avertizare sistem" + IDS_SEVERITY_ERROR "Eroare sistem" END STRINGTABLE BEGIN - IDS_SYSTEM_PROCESS "System Process" - IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" - IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." - IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." + IDS_SYSTEM_PROCESS "Proces sistem" + IDS_UNKNOWN_SOFTWARE_EXCEPT "excepție software necunoscut" + IDS_OK_TERMINATE_PROGRAM "Apăsați OK pentru terminarea programului." + IDS_CANCEL_DEBUG_PROGRAM "Apăsați Anulează pentru depanarea programului." END

1 0

01/01: [USERENV] Implement CopySystemProfile Part 1 (Add a new profile subkey and values to the profile list)
by Eric Kohl 27 May '18

27 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=334fe302a1899d3d049ad… commit 334fe302a1899d3d049adf08a166c7830aba86e1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 27 15:29:31 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 27 15:31:43 2018 +0200 [USERENV] Implement CopySystemProfile Part 1 (Add a new profile subkey and values to the profile list) CORE-12541 --- dll/win32/userenv/profile.c | 107 ++++++++++++++++++++++++++++++++++++++++- dll/win32/userenv/userenv.spec | 2 +- sdk/include/psdk/userenv.h | 1 + 3 files changed, 108 insertions(+), 2 deletions(-) diff --git a/dll/win32/userenv/profile.c b/dll/win32/userenv/profile.c index 975a71f08c..8acbb90a91 100644 --- a/dll/win32/userenv/profile.c +++ b/dll/win32/userenv/profile.c @@ -106,6 +106,111 @@ AcquireRemoveRestorePrivilege(IN BOOL bAcquire) } +BOOL +WINAPI +CopySystemProfile( + IN ULONG Unused) +{ + WCHAR szKeyName[MAX_PATH]; + WCHAR szImagePath[MAX_PATH]; + UNICODE_STRING SidString = {0, 0, NULL}; + HANDLE hToken = NULL; + PSID pUserSid = NULL; + HKEY hProfileKey = NULL; + DWORD dwDisposition; + BOOL bResult = FALSE; + DWORD dwError; + + DPRINT1("CopySystemProfile()\n"); + + if (!OpenProcessToken(GetCurrentProcess(), + TOKEN_QUERY | TOKEN_IMPERSONATE, + &hToken)) + { + DPRINT1("Failed to open the process token (Error %lu)\n", GetLastError()); + return FALSE; + } + + pUserSid = GetUserSid(hToken); + if (pUserSid == NULL) + { + DPRINT1("Failed to get the users SID (Error %lu)\n", GetLastError()); + goto done; + } + + /* Get the user SID string */ + if (!GetUserSidStringFromToken(hToken, &SidString)) + { + DPRINT1("GetUserSidStringFromToken() failed\n"); + goto done; + } + + StringCbCopyW(szKeyName, sizeof(szKeyName), + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\"); + StringCbCatW(szKeyName, sizeof(szKeyName), SidString.Buffer); + + RtlFreeUnicodeString(&SidString); + + dwError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + szKeyName, + 0, NULL, 0, + KEY_WRITE, + NULL, + &hProfileKey, + &dwDisposition); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to create the profile key for the %s profile (Error %lu)\n", + SidString.Buffer, dwError); + goto done; + } + + dwError = RegSetValueExW(hProfileKey, + L"Sid", + 0, + REG_BINARY, + (PBYTE)pUserSid, + RtlLengthSid(pUserSid)); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to set the SID value (Error %lu)\n", dwError); + goto done; + } + + wcscpy(szImagePath, + L"%systemroot%\\system32\\config\\systemprofile"); + + dwError = RegSetValueExW(hProfileKey, + L"ProfileImagePath", + 0, + REG_EXPAND_SZ, + (PBYTE)szImagePath, + (wcslen(szImagePath) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to set the ProfileImagePath value (Error %lu)\n", dwError); + goto done; + } + + + bResult = TRUE; + +done: + if (hProfileKey != NULL) + RegCloseKey(hProfileKey); + + RtlFreeUnicodeString(&SidString); + + if (pUserSid != NULL) + LocalFree(pUserSid); + + if (hToken != NULL) + CloseHandle(hToken); + + return bResult; +} + + BOOL WINAPI CreateUserProfileA( @@ -1030,7 +1135,7 @@ GetUserProfileDirectoryW( szImagePath, ARRAYSIZE(szImagePath))) { - DPRINT1 ("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", GetLastError()); return FALSE; } diff --git a/dll/win32/userenv/userenv.spec b/dll/win32/userenv/userenv.spec index 0de19c7dd5..b8826bcfef 100644 --- a/dll/win32/userenv/userenv.spec +++ b/dll/win32/userenv/userenv.spec @@ -98,7 +98,7 @@ 152 stub -noname IsSyncForegroundPolicyRefresh #stdcall -noname IsSyncForegroundPolicyRefresh(8) 153 stdcall -noname CreateUserProfileExA(ptr str str str long long) 154 stdcall -noname CreateUserProfileExW(ptr wstr wstr wstr long long) -155 stub -noname CopySystemProfile #stdcall -noname CopySystemProfile(4) +155 stdcall -noname CopySystemProfile(long) 156 stub -noname GetUserProfileDirFromSidA #stdcall -noname GetUserProfileDirFromSidA(12) 157 stub -noname GetUserProfileDirFromSidW #stdcall -noname GetUserProfileDirFromSidW(12) 158 stub -noname SetNextFgPolicyRefreshInfo #stdcall -noname SetNextFgPolicyRefreshInfo(12) diff --git a/sdk/include/psdk/userenv.h b/sdk/include/psdk/userenv.h index 836de5c3a0..3b5054e0f1 100644 --- a/sdk/include/psdk/userenv.h +++ b/sdk/include/psdk/userenv.h @@ -106,6 +106,7 @@ BOOL WINAPI DeleteItemW (LPCWSTR, BOOL, LPCWSTR, BOOL); BOOL WINAPI CopyProfileDirectoryA(LPCSTR, LPCSTR, DWORD); BOOL WINAPI CopyProfileDirectoryW(LPCWSTR, LPCWSTR, DWORD); PSID WINAPI GetUserSid(HANDLE); +BOOL WINAPI CopySystemProfile(ULONG); /* end private */ BOOL WINAPI LoadUserProfileA (HANDLE, LPPROFILEINFOA); BOOL WINAPI LoadUserProfileW (HANDLE, LPPROFILEINFOW);

1 0

← Newer
1
2
3
4
5
6
7
...
22
Older →

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 May 2018