Ros-diffs October 2018

ros-diffs@reactos.org

21 participants
354 discussions

04/14: [SETUPLIB] Factor out and introduce a ParseArcName() helper function that does its job.
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=518bea5f99ebb4c9fa7cc… commit 518bea5f99ebb4c9fa7cc4c217c08e0159f3aef4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 20 21:30:13 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 18:13:38 2018 +0200 [SETUPLIB] Factor out and introduce a ParseArcName() helper function that does its job. Used in exiting code and in later code in this file. svn path=/branches/setup_improvements/; revision=75632 svn path=/branches/setup_improvements/; revision=75652 --- base/setup/lib/arcname.c | 306 ++++++++++++++++++++++++++++------------------- 1 file changed, 186 insertions(+), 120 deletions(-) diff --git a/base/setup/lib/arcname.c b/base/setup/lib/arcname.c index 672044b809..2c2308a595 100644 --- a/base/setup/lib/arcname.c +++ b/base/setup/lib/arcname.c @@ -353,117 +353,26 @@ ArcPathNormalize( } -/* - * ArcName: - * ARC name (counted string) to be resolved into a NT device name. - * The caller should have already delimited it from within an ARC path - * (usually by finding where the first path separator appears in the path). - * - * NtName: - * Receives the resolved NT name. The buffer is NULL-terminated. - */ -static NTSTATUS -ResolveArcNameNtSymLink( - OUT PUNICODE_STRING NtName, - IN PUNICODE_STRING ArcName) -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE DirectoryHandle, LinkHandle; - UNICODE_STRING ArcNameDir; - - if (NtName->MaximumLength < sizeof(UNICODE_NULL)) - return STATUS_BUFFER_TOO_SMALL; - -#if 0 - *NtName->Buffer = UNICODE_NULL; - NtName->Length = 0; -#endif - - /* Open the \ArcName object directory */ - RtlInitUnicodeString(&ArcNameDir, L"\\ArcName"); - InitializeObjectAttributes(&ObjectAttributes, - &ArcNameDir, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenDirectoryObject(&DirectoryHandle, - DIRECTORY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenDirectoryObject(%wZ) failed, Status 0x%08lx\n", &ArcNameDir, Status); - return Status; - } - - /* Open the ARC name link */ - InitializeObjectAttributes(&ObjectAttributes, - ArcName, - OBJ_CASE_INSENSITIVE, - DirectoryHandle, - NULL); - Status = NtOpenSymbolicLinkObject(&LinkHandle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes); - - /* Close the \ArcName object directory handle */ - NtClose(DirectoryHandle); - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenSymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", ArcName, Status); - return Status; - } - - /* Reserve one WCHAR for the NULL-termination */ - NtName->MaximumLength -= sizeof(UNICODE_NULL); - - /* Resolve the link */ - Status = NtQuerySymbolicLinkObject(LinkHandle, NtName, NULL); - - /* Restore the NULL-termination */ - NtName->MaximumLength += sizeof(UNICODE_NULL); - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - /* We failed, don't touch NtName */ - DPRINT1("NtQuerySymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", ArcName, Status); - } - else - { - /* We succeeded, NULL-terminate NtName */ - NtName->Buffer[NtName->Length / sizeof(WCHAR)] = UNICODE_NULL; - } - - NtClose(LinkHandle); - return Status; -} - /* * ArcNamePath: - * In input, pointer to an ARC path (NULL-terminated) starting by an ARC name - * to be resolved into a NT device name. - * In opposition to ResolveArcNameNtSymLink(), the caller does not have to - * delimit the ARC name from within an ARC path. The real ARC name is deduced - * after parsing the ARC path, and, in output, ArcNamePath points to the - * beginning of the path after the ARC name part. - * - * NtName: - * Receives the resolved NT name. The buffer is NULL-terminated. - * - * PartList: - * (Optional) partition list that helps in resolving the paths pointing - * to hard disks. + * In input, pointer to an ARC path (NULL-terminated) starting by an + * ARC name to be parsed into its different components. + * In output, ArcNamePath points to the beginning of the path after + * the ARC name part. */ static NTSTATUS -ResolveArcNameManually( - OUT PUNICODE_STRING NtName, +ParseArcName( IN OUT PCWSTR* ArcNamePath, - IN PPARTLIST PartList OPTIONAL) + OUT PULONG pAdapterKey, + OUT PULONG pControllerKey, + OUT PULONG pPeripheralKey, + OUT PULONG pPartitionNumber, + OUT PADAPTER_TYPE pAdapterType, + OUT PCONTROLLER_TYPE pControllerType, + OUT PPERIPHERAL_TYPE pPeripheralType, + OUT PBOOLEAN pUseSignature) { - NTSTATUS Status; + // NTSTATUS Status; WCHAR TokenBuffer[50]; UNICODE_STRING Token; PCWSTR p, q; @@ -476,17 +385,6 @@ ResolveArcNameManually( PERIPHERAL_TYPE PeripheralType; BOOLEAN UseSignature = FALSE; - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry = NULL; - - if (NtName->MaximumLength < sizeof(UNICODE_NULL)) - return STATUS_BUFFER_TOO_SMALL; - -#if 0 - *NtName->Buffer = UNICODE_NULL; - NtName->Length = 0; -#endif - /* * The format of ArcName is: * adapter(www)[controller(xxx)peripheral(yyy)[partition(zzz)][filepath]] , @@ -538,8 +436,6 @@ ResolveArcNameManually( return STATUS_NOT_SUPPORTED; } - Status = RtlStringCbPrintfW(NtName->Buffer, NtName->MaximumLength, - L"\\Device\\Ramdisk%lu", AdapterKey); goto Quit; } } @@ -653,10 +549,182 @@ ResolveArcNameManually( PartitionNumber = 0; } + // TODO: Check the partition number in case of fdisks and cdroms?? + +Quit: + /* Return the results */ + *ArcNamePath = p; + *pAdapterKey = AdapterKey; + *pControllerKey = ControllerKey; + *pPeripheralKey = PeripheralKey; + *pPartitionNumber = PartitionNumber; + *pAdapterType = AdapterType; + *pControllerType = ControllerType; + *pPeripheralType = PeripheralType; + *pUseSignature = UseSignature; + + return STATUS_SUCCESS; +} + +/* + * ArcName: + * ARC name (counted string) to be resolved into a NT device name. + * The caller should have already delimited it from within an ARC path + * (usually by finding where the first path separator appears in the path). + * + * NtName: + * Receives the resolved NT name. The buffer is NULL-terminated. + */ +static NTSTATUS +ResolveArcNameNtSymLink( + OUT PUNICODE_STRING NtName, + IN PUNICODE_STRING ArcName) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE DirectoryHandle, LinkHandle; + UNICODE_STRING ArcNameDir; + + if (NtName->MaximumLength < sizeof(UNICODE_NULL)) + return STATUS_BUFFER_TOO_SMALL; + +#if 0 + *NtName->Buffer = UNICODE_NULL; + NtName->Length = 0; +#endif + + /* Open the \ArcName object directory */ + RtlInitUnicodeString(&ArcNameDir, L"\\ArcName"); + InitializeObjectAttributes(&ObjectAttributes, + &ArcNameDir, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenDirectoryObject(&DirectoryHandle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenDirectoryObject(%wZ) failed, Status 0x%08lx\n", &ArcNameDir, Status); + return Status; + } + + /* Open the ARC name link */ + InitializeObjectAttributes(&ObjectAttributes, + ArcName, + OBJ_CASE_INSENSITIVE, + DirectoryHandle, + NULL); + Status = NtOpenSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes); + + /* Close the \ArcName object directory handle */ + NtClose(DirectoryHandle); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenSymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", ArcName, Status); + return Status; + } + + /* Reserve one WCHAR for the NULL-termination */ + NtName->MaximumLength -= sizeof(UNICODE_NULL); + + /* Resolve the link */ + Status = NtQuerySymbolicLinkObject(LinkHandle, NtName, NULL); + + /* Restore the NULL-termination */ + NtName->MaximumLength += sizeof(UNICODE_NULL); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* We failed, don't touch NtName */ + DPRINT1("NtQuerySymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", ArcName, Status); + } + else + { + /* We succeeded, NULL-terminate NtName */ + NtName->Buffer[NtName->Length / sizeof(WCHAR)] = UNICODE_NULL; + } + + NtClose(LinkHandle); + return Status; +} + +/* + * ArcNamePath: + * In input, pointer to an ARC path (NULL-terminated) starting by an + * ARC name to be resolved into a NT device name. + * In opposition to ResolveArcNameNtSymLink(), the caller does not have + * to delimit the ARC name from within an ARC path. The real ARC name is + * deduced after parsing the ARC path, and, in output, ArcNamePath points + * to the beginning of the path after the ARC name part. + * + * NtName: + * Receives the resolved NT name. The buffer is NULL-terminated. + * + * PartList: + * (Optional) partition list that helps in resolving the paths pointing + * to hard disks. + */ +static NTSTATUS +ResolveArcNameManually( + OUT PUNICODE_STRING NtName, + IN OUT PCWSTR* ArcNamePath, + IN PPARTLIST PartList) +{ + NTSTATUS Status; + ULONG AdapterKey; + ULONG ControllerKey; + ULONG PeripheralKey; + ULONG PartitionNumber; + ADAPTER_TYPE AdapterType; + CONTROLLER_TYPE ControllerType; + PERIPHERAL_TYPE PeripheralType; + BOOLEAN UseSignature; + + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry = NULL; + + if (NtName->MaximumLength < sizeof(UNICODE_NULL)) + return STATUS_BUFFER_TOO_SMALL; + +#if 0 + *NtName->Buffer = UNICODE_NULL; + NtName->Length = 0; +#endif + + /* Parse the ARC path */ + Status = ParseArcName(ArcNamePath, + &AdapterKey, + &ControllerKey, + &PeripheralKey, + &PartitionNumber, + &AdapterType, + &ControllerType, + &PeripheralType, + &UseSignature); + if (!NT_SUCCESS(Status)) + return Status; // TODO: Check the partition number in case of fdisks and cdroms?? + /* Check for adapters that don't take any extra controller or peripheral nodes */ + if (AdapterType == NetAdapter || AdapterType == RamdiskAdapter) + { + if (AdapterType == NetAdapter) + { + DPRINT1("%S(%lu) path is not supported!\n", AdapterTypes_U[AdapterType], AdapterKey); + return STATUS_NOT_SUPPORTED; + } + Status = RtlStringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\Ramdisk%lu", AdapterKey); + } + else if (ControllerType == CdRomController) // and so, AdapterType == ScsiAdapter and PeripheralType == FDiskPeripheral { Status = RtlStringCbPrintfW(NtName->Buffer, NtName->MaximumLength, @@ -714,11 +782,9 @@ ResolveArcNameManually( } #endif -Quit: if (!NT_SUCCESS(Status)) return Status; - *ArcNamePath = p; return STATUS_SUCCESS; }

1 0

03/14: [SETUPLIB] Code formatting.
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ae3efd7381314e34f7f1… commit 1ae3efd7381314e34f7f13fe8dfe6a8862b9927f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 20 21:02:24 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 18:13:38 2018 +0200 [SETUPLIB] Code formatting. svn path=/branches/setup_improvements/; revision=75631 svn path=/branches/setup_improvements/; revision=75652 --- base/setup/lib/arcname.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/base/setup/lib/arcname.c b/base/setup/lib/arcname.c index 2a2f2a1076..672044b809 100644 --- a/base/setup/lib/arcname.c +++ b/base/setup/lib/arcname.c @@ -31,6 +31,8 @@ #include <debug.h> +/* TYPEDEFS *****************************************************************/ + /* Supported adapter types */ typedef enum _ADAPTER_TYPE { @@ -109,7 +111,7 @@ const PCWSTR PeripheralTypes_U[] = /* FUNCTIONS ****************************************************************/ -PCSTR +/* static */ PCSTR ArcGetNextTokenA( IN PCSTR ArcPath, OUT PANSI_STRING TokenSpecifier, @@ -170,7 +172,7 @@ ArcGetNextTokenA( return ++p; } -PCWSTR +static PCWSTR ArcGetNextTokenU( IN PCWSTR ArcPath, OUT PUNICODE_STRING TokenSpecifier, @@ -234,7 +236,7 @@ ArcGetNextTokenU( } -ULONG +/* static */ ULONG ArcMatchTokenA( IN PCSTR CandidateToken, IN const PCSTR* TokenTable) @@ -249,7 +251,7 @@ ArcMatchTokenA( return Index; } -ULONG +/* static */ ULONG ArcMatchTokenU( IN PCWSTR CandidateToken, IN const PCWSTR* TokenTable) @@ -264,7 +266,7 @@ ArcMatchTokenU( return Index; } -ULONG +static ULONG ArcMatchToken_UStr( IN PCUNICODE_STRING CandidateToken, IN const PCWSTR* TokenTable)

1 0

02/14: [SYSSETUP] Use a $winnt$.inf file to retrieve setup information for the 2nd-stage setup.
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8d37c1a0d1297b2daada… commit c8d37c1a0d1297b2daada64e1805f6705b52cb22 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 10 19:21:08 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 18:13:38 2018 +0200 [SYSSETUP] Use a $winnt$.inf file to retrieve setup information for the 2nd-stage setup. Following r75518, we use the $winnt$.inf file (created in System32 by the 1st-stage installer) as the setup information file for the 2nd-stage setup for: - retrieving the installation source media path; - retrieving the unattended information that was copied from the unattend.inf file from the installation source media. The installation source media path is converted from NT format to Win32 format for usage with Win32 functions and storage in the registry: this is done by GetInstallSourceWin32(), which replaces the hackish GetRosInstallCD() function. The $winnt$.inf file is also updated, and the registry values "SourcePath" and "ServicePackSourcePath" are created / updated in: HKLM\Software\Microsoft\Windows\CurrentVersion\Setup . svn path=/branches/setup_improvements/; revision=75524 --- dll/win32/syssetup/wizard.c | 264 +++++++++++++++++++-------- sdk/include/reactos/libs/syssetup/syssetup.h | 8 +- 2 files changed, 189 insertions(+), 83 deletions(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 2eafef7874..2d95f1cfe1 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -50,9 +50,6 @@ typedef struct _REGISTRATIONDATA extern void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); -BOOL -GetRosInstallCD(WCHAR *pwszPath, DWORD cchPathMax); - static VOID CenterWindow(HWND hWnd) @@ -983,16 +980,9 @@ LocalePageDlgProc(HWND hwndDlg, PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); if (SetupData->UnattendSetup) { - WCHAR wszPath[MAX_PATH]; - if (GetRosInstallCD(wszPath, _countof(wszPath))) - { - WCHAR wszParams[1024]; - swprintf(wszParams, L"intl.cpl,,/f:\"%sreactos\\unattend.inf\"", wszPath); - RunControlPanelApplet(hwndDlg, wszParams); - } - else + // if (!*SetupData->SourcePath) { - RunControlPanelApplet(hwndDlg, L"intl.cpl,,/f:\"unattend.inf\""); + RunControlPanelApplet(hwndDlg, L"intl.cpl,,/f:\"$winnt$.inf\""); // Should be in System32 } SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_OWNERPAGE); @@ -2176,9 +2166,70 @@ FinishDlgProc(HWND hwndDlg, } +/* + * GetInstallSourceWin32 retrieves the path to the ReactOS installation medium + * in Win32 format, for later use by syssetup and storage in the registry. + */ +static BOOL +GetInstallSourceWin32( + OUT PWSTR pwszPath, + IN DWORD cchPathMax, + IN PCWSTR pwszNTPath) +{ + WCHAR wszDrives[512]; + WCHAR wszNTPath[512]; // MAX_PATH ? + DWORD cchDrives; + PWCHAR pwszDrive; + + *pwszPath = UNICODE_NULL; + + cchDrives = GetLogicalDriveStringsW(_countof(wszDrives) - 1, wszDrives); + if (cchDrives == 0 || cchDrives >= _countof(wszDrives)) + { + /* Buffer too small or failure */ + LogItem(NULL, L"GetLogicalDriveStringsW failed"); + return FALSE; + } + + for (pwszDrive = wszDrives; *pwszDrive; pwszDrive += wcslen(pwszDrive) + 1) + { + WCHAR wszBuf[MAX_PATH]; + + /* Retrieve the NT path corresponding to the current Win32 DOS path */ + pwszDrive[2] = UNICODE_NULL; // Temporarily remove the backslash + QueryDosDeviceW(pwszDrive, wszNTPath, _countof(wszNTPath)); + pwszDrive[2] = L'\\'; // Restore the backslash + + wcscat(wszNTPath, L"\\"); // Concat a backslash + + /* Logging */ + wsprintf(wszBuf, L"Testing '%s' --> '%s' %s a CD", + pwszDrive, wszNTPath, + (GetDriveTypeW(pwszDrive) == DRIVE_CDROM) ? L"is" : L"is not"); + LogItem(NULL, wszBuf); + + /* Check whether the NT path corresponds to the NT installation source path */ + if (!_wcsicmp(wszNTPath, pwszNTPath)) + { + /* Found it! */ + wcscpy(pwszPath, pwszDrive); // cchPathMax + + /* Logging */ + wsprintf(wszBuf, L"GetInstallSourceWin32: %s", pwszPath); + LogItem(NULL, wszBuf); + wcscat(wszBuf, L"\n"); + OutputDebugStringW(wszBuf); + + return TRUE; + } + } + + return FALSE; +} + VOID -ProcessUnattendInf( - PSETUPDATA pSetupData) +ProcessUnattendSection( + IN OUT PSETUPDATA pSetupData) { INFCONTEXT InfContext; WCHAR szName[256]; @@ -2186,7 +2237,7 @@ ProcessUnattendInf( DWORD LineLength; HKEY hKey; - if (!SetupFindFirstLineW(pSetupData->hUnattendedInf, + if (!SetupFindFirstLineW(pSetupData->hSetupInf, L"Unattend", L"UnattendSetupEnabled", &InfContext)) @@ -2213,7 +2264,7 @@ ProcessUnattendInf( pSetupData->UnattendSetup = TRUE; - if (!SetupFindFirstLineW(pSetupData->hUnattendedInf, + if (!SetupFindFirstLineW(pSetupData->hSetupInf, L"Unattend", NULL, &InfContext)) @@ -2290,7 +2341,7 @@ ProcessUnattendInf( } while (SetupFindNextLine(&InfContext, &InfContext)); - if (SetupFindFirstLineW(pSetupData->hUnattendedInf, + if (SetupFindFirstLineW(pSetupData->hSetupInf, L"Display", NULL, &InfContext)) @@ -2363,7 +2414,7 @@ ProcessUnattendInf( return; } - if (SetupFindFirstLineW(pSetupData->hUnattendedInf, + if (SetupFindFirstLineW(pSetupData->hSetupInf, L"GuiRunOnce", NULL, &InfContext)) @@ -2401,84 +2452,135 @@ ProcessUnattendInf( RegCloseKey(hKey); } -/* - * GetRosInstallCD should find the path to ros installation medium - * BUG 1 - * If there are more than one CDDrive in it containing a ReactOS - * installation cd, then it will pick the first one regardless if - * it is really the installation cd - * - * The best way to implement this is to set the key - * HKLM\Software\Microsoft\Windows NT\CurrentVersion\SourcePath (REG_SZ) - */ - -BOOL -GetRosInstallCD(WCHAR *pwszPath, DWORD cchPathMax) +VOID +ProcessSetupInf( + IN OUT PSETUPDATA pSetupData) { - WCHAR wszDrives[512]; - DWORD cchDrives; - WCHAR *pwszDrive; + WCHAR szPath[MAX_PATH]; + WCHAR szValue[MAX_PATH]; + INFCONTEXT InfContext; + DWORD LineLength; + HKEY hKey; + LONG res; - cchDrives = GetLogicalDriveStringsW(_countof(wszDrives) - 1, wszDrives); - if (cchDrives == 0 || cchDrives >= _countof(wszDrives)) + pSetupData->hSetupInf = INVALID_HANDLE_VALUE; + + /* Retrieve the path of the setup INF */ + GetSystemDirectoryW(szPath, _countof(szPath)); + wcscat(szPath, L"\\$winnt$.inf"); + + /* Open the setup INF */ + pSetupData->hSetupInf = SetupOpenInfFileW(szPath, + NULL, + INF_STYLE_OLDNT, + NULL); + if (pSetupData->hSetupInf == INVALID_HANDLE_VALUE) { - /* buffer too small or failure */ - LogItem(NULL, L"GetLogicalDriveStringsW failed"); - return FALSE; + DPRINT1("Error: Cannot open the setup information file %S with error %d\n", szPath, GetLastError()); + return; } - for (pwszDrive = wszDrives; pwszDrive[0]; pwszDrive += wcslen(pwszDrive) + 1) + + /* Retrieve the NT source path from which the 1st-stage installer was run */ + if (!SetupFindFirstLineW(pSetupData->hSetupInf, + L"data", + L"sourcepath", + &InfContext)) { - if (GetDriveTypeW(pwszDrive) == DRIVE_CDROM) - { - WCHAR wszBuf[MAX_PATH]; - wsprintf(wszBuf, L"%sreactos\\system32\\ntoskrnl.exe", pwszDrive); - LogItem(NULL, wszBuf); - if (GetFileAttributesW(wszBuf) != INVALID_FILE_ATTRIBUTES) - { - /* the file exists, so this is the right drive */ - wcsncpy(pwszPath, pwszDrive, cchPathMax); - OutputDebugStringW(L"GetRosInstallCD: ");OutputDebugStringW(pwszPath);OutputDebugStringW(L"\n"); - return TRUE; - } - } + DPRINT1("Error: Cannot find UnattendSetupEnabled Key! %d\n", GetLastError()); + return; } - return FALSE; -} + if (!SetupGetStringFieldW(&InfContext, + 1, + szValue, + ARRAYSIZE(szValue), + &LineLength)) + { + DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); + return; + } + + *pSetupData->SourcePath = UNICODE_NULL; + + /* Close the setup INF as we are going to modify it manually */ + if (pSetupData->hSetupInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(pSetupData->hSetupInf); -VOID -ProcessUnattendSetup( - PSETUPDATA pSetupData) -{ - WCHAR szPath[MAX_PATH]; - DWORD dwLength; - if (!GetRosInstallCD(szPath, MAX_PATH)) + /* Find the installation source path in Win32 format */ + if (!GetInstallSourceWin32(pSetupData->SourcePath, + _countof(pSetupData->SourcePath), + szValue)) { - /* no cd drive found */ - return; + *pSetupData->SourcePath = UNICODE_NULL; } - dwLength = wcslen(szPath); - if (dwLength + 21 > MAX_PATH) + /* Save the path in Win32 format in the setup INF */ + swprintf(szValue, L"\"%s\"", pSetupData->SourcePath); + WritePrivateProfileStringW(L"data", L"dospath", szValue, szPath); + + /* + * Save it also in the registry, in the following keys: + * - HKLM\Software\Microsoft\Windows\CurrentVersion\Setup , + * values "SourcePath" and "ServicePackSourcePath" (REG_SZ); + * - HKLM\Software\Microsoft\Windows NT\CurrentVersion , + * value "SourcePath" (REG_SZ); set to the full path (e.g. D:\I386). + */ +#if 0 + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows NT\\CurrentVersion", + 0, + KEY_ALL_ACCESS, + &hKey); + + if (res != ERROR_SUCCESS) { - /* FIXME - * allocate bigger buffer - */ - return; + return FALSE; + } +#endif + + res = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Setup", + 0, NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, // KEY_WRITE + NULL, + &hKey, + NULL); + if (res == ERROR_SUCCESS) + { + res = RegSetValueExW(hKey, + L"SourcePath", + 0, + REG_SZ, + (LPBYTE)pSetupData->SourcePath, + (wcslen(pSetupData->SourcePath) + 1) * sizeof(WCHAR)); + + res = RegSetValueExW(hKey, + L"ServicePackSourcePath", + 0, + REG_SZ, + (LPBYTE)pSetupData->SourcePath, + (wcslen(pSetupData->SourcePath) + 1) * sizeof(WCHAR)); + + RegCloseKey(hKey); } - wcscat(szPath, L"reactos\\unattend.inf"); - pSetupData->hUnattendedInf = SetupOpenInfFileW(szPath, - NULL, - INF_STYLE_OLDNT, - NULL); - if (pSetupData->hUnattendedInf != INVALID_HANDLE_VALUE) + /* Now, re-open the setup INF (this must succeed) */ + pSetupData->hSetupInf = SetupOpenInfFileW(szPath, + NULL, + INF_STYLE_OLDNT, + NULL); + if (pSetupData->hSetupInf == INVALID_HANDLE_VALUE) { - ProcessUnattendInf(pSetupData); + DPRINT1("Error: Cannot open the setup information file %S with error %d\n", szPath, GetLastError()); + return; } + + /* Process the unattended section of the setup file */ + ProcessUnattendSection(pSetupData); } typedef DWORD(WINAPI *PFNREQUESTWIZARDPAGES)(PDWORD, HPROPSHEETPAGE *, PSETUPDATA); @@ -2542,8 +2644,8 @@ InstallWizard(VOID) goto done; } - pSetupData->hUnattendedInf = INVALID_HANDLE_VALUE; - ProcessUnattendSetup(pSetupData); + /* Process the $winnt$.inf setup file */ + ProcessSetupInf(pSetupData); /* Create the Welcome page */ psp.dwSize = sizeof(PROPSHEETPAGE); @@ -2658,8 +2760,8 @@ InstallWizard(VOID) DeleteObject(pSetupData->hBoldFont); DeleteObject(pSetupData->hTitleFont); - if (pSetupData->hUnattendedInf != INVALID_HANDLE_VALUE) - SetupCloseInfFile(pSetupData->hUnattendedInf); + if (pSetupData->hSetupInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(pSetupData->hSetupInf); done: if (phpage != NULL) diff --git a/sdk/include/reactos/libs/syssetup/syssetup.h b/sdk/include/reactos/libs/syssetup/syssetup.h index 03c7c70c5d..a29a342bb4 100644 --- a/sdk/include/reactos/libs/syssetup/syssetup.h +++ b/sdk/include/reactos/libs/syssetup/syssetup.h @@ -44,15 +44,19 @@ typedef struct _TIMEZONE_ENTRY ULONG Index; } TIMEZONE_ENTRY, *PTIMEZONE_ENTRY; +/* Private Setup data shared between syssetup.dll and netshell.dll */ typedef struct _SETUPDATA { HFONT hTitleFont; HFONT hBoldFont; + WCHAR SourcePath[MAX_PATH]; // PCWSTR + WCHAR UnattendFile[MAX_PATH]; // PCWSTR + WCHAR OwnerName[51]; WCHAR OwnerOrganization[51]; WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; /* max. 15 characters */ - WCHAR AdminPassword[128]; /* max. 127 characters */ + WCHAR AdminPassword[128]; /* max. 127 characters */ BOOL UnattendSetup; BOOL DisableGeckoInst; @@ -63,7 +67,7 @@ typedef struct _SETUPDATA DWORD DisableAutoDaylightTimeSet; LCID LocaleID; - HINF hUnattendedInf; + HINF hSetupInf; UINT uFirstNetworkWizardPage; UINT uPostNetworkWizardPage;

1 0

01/14: [USETUP][SETUPLIB] Code refactoring.
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e248feabf1ed10b7015e… commit 7e248feabf1ed10b7015e3a5a7bd6fcc4eb07cd4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 9 20:39:45 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 18:13:32 2018 +0200 [USETUP][SETUPLIB] Code refactoring. - Move several global setup variables into a structure "USETUP_DATA", similar to the syssetup structure "SETUPDATA" (or the WIP 1st-stage installer structure of the same name), so that these variables can be set easily by different helper setup functions; - Move CheckUnattendedSetup() and GetSourcePaths() to setuplib and make CheckUnattendedSetup() use the USETUP_DATA structure; - Add a LoadSetupInf() function that loads the txtsetup.sif file (factoring out the corresponding code in USETUP); - Add a InstallSetupInfFile() function (that I'll probably rename later on) whose purpose is to create a valid "$winnt$.inf" setup installation file in the ReactOS\system32 directory, which should help the 2nd-stage installer to correctly retrieve the source installation media we used during 1st-stage, and contain the unattended setup lines copied from unattend.inf. This is done in a Windows-compatible way. svn path=/branches/setup_improvements/; revision=75518 [USETUP] Close the txtsetup.sif file at the end of the operations. svn path=/branches/setup_improvements/; revision=75539 --- base/setup/lib/CMakeLists.txt | 1 + base/setup/lib/setuplib.c | 515 ++++++++++++++++++++++++++++++++ base/setup/lib/setuplib.h | 71 +++++ base/setup/usetup/usetup.c | 660 +++++++++++++----------------------------- 4 files changed, 786 insertions(+), 461 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index c1164c809d..cf3f2b8a2a 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -12,6 +12,7 @@ list(APPEND SOURCE partlist.c registry.c regutil.c + setuplib.c precomp.h) add_library(setuplib ${SOURCE}) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c new file mode 100644 index 0000000000..306065f99a --- /dev/null +++ b/base/setup/lib/setuplib.c @@ -0,0 +1,515 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Setup Library + * FILE: base/setup/lib/setuplib.c + * PURPOSE: Setup Library - Main initialization helpers + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" +#include "filesup.h" +#include "infsupp.h" +#include "inicache.h" + +#include "setuplib.h" + +// HACK! +#include <strsafe.h> + +#define NDEBUG +#include <debug.h> + + +/* GLOBALS ******************************************************************/ + +/* FUNCTIONS ****************************************************************/ + +VOID +CheckUnattendedSetup( + IN OUT PUSETUP_DATA pSetupData) +{ + INFCONTEXT Context; + HINF UnattendInf; + UINT ErrorLine; + INT IntValue; + PWCHAR Value; + WCHAR UnattendInfPath[MAX_PATH]; + + CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, + pSetupData->SourcePath.Buffer, L"unattend.inf"); + + if (DoesFileExist(NULL, UnattendInfPath) == FALSE) + { + DPRINT("Does not exist: %S\n", UnattendInfPath); + return; + } + + /* Load 'unattend.inf' from installation media */ + UnattendInf = SetupOpenInfFileExW(UnattendInfPath, + NULL, + INF_STYLE_WIN4, + pSetupData->LanguageId, + &ErrorLine); + + if (UnattendInf == INVALID_HANDLE_VALUE) + { + DPRINT("SetupOpenInfFileExW() failed\n"); + return; + } + + /* Open 'Unattend' section */ + if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"Signature", &Context)) + { + DPRINT("SetupFindFirstLineW() failed for section 'Unattend'\n"); + goto Quit; + } + + /* Get pointer 'Signature' key */ + if (!INF_GetData(&Context, NULL, &Value)) + { + DPRINT("INF_GetData() failed for key 'Signature'\n"); + goto Quit; + } + + /* Check 'Signature' string */ + if (_wcsicmp(Value, L"$ReactOS$") != 0) + { + DPRINT("Signature not $ReactOS$\n"); + INF_FreeData(Value); + goto Quit; + } + + INF_FreeData(Value); + + /* Check if Unattend setup is enabled */ + if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"UnattendSetupEnabled", &Context)) + { + DPRINT("Can't find key 'UnattendSetupEnabled'\n"); + goto Quit; + } + + if (!INF_GetData(&Context, NULL, &Value)) + { + DPRINT("Can't read key 'UnattendSetupEnabled'\n"); + goto Quit; + } + + if (_wcsicmp(Value, L"yes") != 0) + { + DPRINT("Unattend setup is disabled by 'UnattendSetupEnabled' key!\n"); + INF_FreeData(Value); + goto Quit; + } + + INF_FreeData(Value); + + /* Search for 'DestinationDiskNumber' in the 'Unattend' section */ + if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"DestinationDiskNumber", &Context)) + { + DPRINT("SetupFindFirstLine() failed for key 'DestinationDiskNumber'\n"); + goto Quit; + } + + if (!SetupGetIntField(&Context, 1, &IntValue)) + { + DPRINT("SetupGetIntField() failed for key 'DestinationDiskNumber'\n"); + goto Quit; + } + + pSetupData->DestinationDiskNumber = (LONG)IntValue; + + /* Search for 'DestinationPartitionNumber' in the 'Unattend' section */ + if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"DestinationPartitionNumber", &Context)) + { + DPRINT("SetupFindFirstLine() failed for key 'DestinationPartitionNumber'\n"); + goto Quit; + } + + if (!SetupGetIntField(&Context, 1, &IntValue)) + { + DPRINT("SetupGetIntField() failed for key 'DestinationPartitionNumber'\n"); + goto Quit; + } + + pSetupData->DestinationPartitionNumber = (LONG)IntValue; + + /* Search for 'InstallationDirectory' in the 'Unattend' section (optional) */ + if (SetupFindFirstLineW(UnattendInf, L"Unattend", L"InstallationDirectory", &Context)) + { + /* Get pointer 'InstallationDirectory' key */ + if (!INF_GetData(&Context, NULL, &Value)) + { + DPRINT("INF_GetData() failed for key 'InstallationDirectory'\n"); + goto Quit; + } + wcscpy(pSetupData->InstallationDirectory, Value); + INF_FreeData(Value); + } + + IsUnattendedSetup = TRUE; + DPRINT("Running unattended setup\n"); + + /* Search for 'MBRInstallType' in the 'Unattend' section */ + pSetupData->MBRInstallType = -1; + if (SetupFindFirstLineW(UnattendInf, L"Unattend", L"MBRInstallType", &Context)) + { + if (SetupGetIntField(&Context, 1, &IntValue)) + { + pSetupData->MBRInstallType = IntValue; + } + } + + /* Search for 'FormatPartition' in the 'Unattend' section */ + pSetupData->FormatPartition = 0; + if (SetupFindFirstLineW(UnattendInf, L"Unattend", L"FormatPartition", &Context)) + { + if (SetupGetIntField(&Context, 1, &IntValue)) + { + pSetupData->FormatPartition = IntValue; + } + } + + pSetupData->AutoPartition = 0; + if (SetupFindFirstLineW(UnattendInf, L"Unattend", L"AutoPartition", &Context)) + { + if (SetupGetIntField(&Context, 1, &IntValue)) + { + pSetupData->AutoPartition = IntValue; + } + } + + /* Search for LocaleID in the 'Unattend' section */ + if (SetupFindFirstLineW(UnattendInf, L"Unattend", L"LocaleID", &Context)) + { + if (INF_GetData(&Context, NULL, &Value)) + { + LONG Id = wcstol(Value, NULL, 16); + swprintf(pSetupData->LocaleID, L"%08lx", Id); + INF_FreeData(Value); + } + } + +Quit: + SetupCloseInfFile(UnattendInf); +} + +VOID +InstallSetupInfFile( + IN OUT PUSETUP_DATA pSetupData) +{ + NTSTATUS Status; + PINICACHE IniCache; + +#if 0 // HACK FIXME! + PINICACHE UnattendCache; + PINICACHEITERATOR Iterator; +#else + // PCWSTR CrLf = L"\r\n"; + PCSTR CrLf = "\r\n"; + HANDLE FileHandle, UnattendFileHandle, SectionHandle; + FILE_STANDARD_INFORMATION FileInfo; + ULONG FileSize; + PVOID ViewBase; + UNICODE_STRING FileName; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; +#endif + + PINICACHESECTION IniSection; + WCHAR PathBuffer[MAX_PATH]; + WCHAR UnattendInfPath[MAX_PATH]; + + /* Create a $winnt$.inf file with default entries */ + IniCache = IniCacheCreate(); + if (!IniCache) + return; + + IniSection = IniCacheAppendSection(IniCache, L"SetupParams"); + if (IniSection) + { + /* Key "skipmissingfiles" */ + // StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + // L"\"%s\"", L"WinNt5.2"); + // IniCacheInsertKey(IniSection, NULL, INSERT_LAST, + // L"Version", PathBuffer); + } + + IniSection = IniCacheAppendSection(IniCache, L"Data"); + if (IniSection) + { + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\"%s\"", IsUnattendedSetup ? L"yes" : L"no"); + IniCacheInsertKey(IniSection, NULL, INSERT_LAST, + L"UnattendedInstall", PathBuffer); + + // "floppylessbootpath" (yes/no) + + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\"%s\"", L"winnt"); + IniCacheInsertKey(IniSection, NULL, INSERT_LAST, + L"ProductType", PathBuffer); + + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\"%s\\\"", pSetupData->SourceRootPath.Buffer); + IniCacheInsertKey(IniSection, NULL, INSERT_LAST, + L"SourcePath", PathBuffer); + + // "floppyless" ("0") + } + +#if 0 + + /* TODO: Append the standard unattend.inf file */ + CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, pSetupData->SourcePath.Buffer, L"unattend.inf"); + if (DoesFileExist(NULL, UnattendInfPath) == FALSE) + { + DPRINT("Does not exist: %S\n", UnattendInfPath); + goto Quit; + } + + Status = IniCacheLoad(&UnattendCache, UnattendInfPath, FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Cannot load %S as an INI file!\n", UnattendInfPath); + goto Quit; + } + + IniCacheDestroy(UnattendCache); + +Quit: + CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, + pSetupData->DestinationPath.Buffer, L"System32\\$winnt$.inf"); + IniCacheSave(IniCache, PathBuffer); + IniCacheDestroy(IniCache); + +#else + + CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, + pSetupData->DestinationPath.Buffer, L"System32\\$winnt$.inf"); + IniCacheSave(IniCache, PathBuffer); + IniCacheDestroy(IniCache); + + /* TODO: Append the standard unattend.inf file */ + CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, + pSetupData->SourcePath.Buffer, L"unattend.inf"); + if (DoesFileExist(NULL, UnattendInfPath) == FALSE) + { + DPRINT("Does not exist: %S\n", UnattendInfPath); + return; + } + + RtlInitUnicodeString(&FileName, PathBuffer); + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + NULL, + NULL); + Status = NtOpenFile(&FileHandle, + FILE_APPEND_DATA | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Cannot load %S as an INI file!\n", PathBuffer); + return; + } + + /* Query the file size */ + Status = NtQueryInformationFile(FileHandle, + &IoStatusBlock, + &FileInfo, + sizeof(FileInfo), + FileStandardInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtQueryInformationFile() failed (Status %lx)\n", Status); + FileInfo.EndOfFile.QuadPart = 0ULL; + } + + Status = OpenAndMapFile(NULL, + UnattendInfPath, + &UnattendFileHandle, + &SectionHandle, + &ViewBase, + &FileSize, + FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Cannot load %S !\n", UnattendInfPath); + NtClose(FileHandle); + return; + } + + /* Write to the INI file */ + + /* "\r\n" */ + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + (PVOID)CrLf, + 2 * sizeof(CHAR), // 2 * sizeof(WCHAR), + &FileInfo.EndOfFile, + NULL); + + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + ViewBase, + FileSize, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + } + + /* Finally, unmap and close the file */ + UnMapFile(SectionHandle, ViewBase); + NtClose(UnattendFileHandle); + + NtClose(FileHandle); +#endif +} + + + +NTSTATUS +GetSourcePaths( + OUT PUNICODE_STRING SourcePath, + OUT PUNICODE_STRING SourceRootPath, + OUT PUNICODE_STRING SourceRootDir) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\SystemRoot"); + UNICODE_STRING SourceName; + WCHAR SourceBuffer[MAX_PATH] = L""; + HANDLE Handle; + ULONG Length; + PWCHAR Ptr; + + InitializeObjectAttributes(&ObjectAttributes, + &LinkName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenSymbolicLinkObject(&Handle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return Status; + + RtlInitEmptyUnicodeString(&SourceName, SourceBuffer, sizeof(SourceBuffer)); + + Status = NtQuerySymbolicLinkObject(Handle, + &SourceName, + &Length); + NtClose(Handle); + + if (!NT_SUCCESS(Status)) + return Status; + + RtlCreateUnicodeString(SourcePath, + SourceName.Buffer); + + /* Strip trailing directory */ + Ptr = wcsrchr(SourceName.Buffer, OBJ_NAME_PATH_SEPARATOR); + if (Ptr) + { + RtlCreateUnicodeString(SourceRootDir, Ptr); + *Ptr = UNICODE_NULL; + } + else + { + RtlCreateUnicodeString(SourceRootDir, L""); + } + + RtlCreateUnicodeString(SourceRootPath, + SourceName.Buffer); + + return STATUS_SUCCESS; +} + + +ERROR_NUMBER +LoadSetupInf( + OUT HINF* SetupInf, + IN OUT PUSETUP_DATA pSetupData) +{ + INFCONTEXT Context; + UINT ErrorLine; + INT IntValue; + PWCHAR Value; + WCHAR FileNameBuffer[MAX_PATH]; + + CombinePaths(FileNameBuffer, ARRAYSIZE(FileNameBuffer), 2, + pSetupData->SourcePath.Buffer, L"txtsetup.sif"); + + *SetupInf = SetupOpenInfFileExW(FileNameBuffer, + NULL, + INF_STYLE_WIN4, + pSetupData->LanguageId, + &ErrorLine); + + if (*SetupInf == INVALID_HANDLE_VALUE) + return ERROR_LOAD_TXTSETUPSIF; + + /* Open 'Version' section */ + if (!SetupFindFirstLineW(*SetupInf, L"Version", L"Signature", &Context)) + return ERROR_CORRUPT_TXTSETUPSIF; + + /* Get pointer 'Signature' key */ + if (!INF_GetData(&Context, NULL, &Value)) + return ERROR_CORRUPT_TXTSETUPSIF; + + /* Check 'Signature' string */ + if (_wcsicmp(Value, L"$ReactOS$") != 0) + { + INF_FreeData(Value); + return ERROR_SIGNATURE_TXTSETUPSIF; + } + + INF_FreeData(Value); + + /* Open 'DiskSpaceRequirements' section */ + if (!SetupFindFirstLineW(*SetupInf, L"DiskSpaceRequirements", L"FreeSysPartDiskSpace", &Context)) + return ERROR_CORRUPT_TXTSETUPSIF; + + pSetupData->RequiredPartitionDiskSpace = ~0; + + /* Get the 'FreeSysPartDiskSpace' value */ + if (!SetupGetIntField(&Context, 1, &IntValue)) + return ERROR_CORRUPT_TXTSETUPSIF; + + pSetupData->RequiredPartitionDiskSpace = (ULONG)IntValue; + + // + // TODO: Support "SetupSourceDevice" and "SetupSourcePath" in txtsetup.sif + // See CORE-9023 + // + + /* Search for 'DefaultPath' in the 'SetupData' section */ + if (SetupFindFirstLineW(*SetupInf, L"SetupData", L"DefaultPath", &Context)) + { + /* Get pointer 'DefaultPath' key */ + if (!INF_GetData(&Context, NULL, &Value)) + return ERROR_CORRUPT_TXTSETUPSIF; + + wcscpy(pSetupData->InstallationDirectory, Value); + INF_FreeData(Value); + } + + return ERROR_SUCCESS; +} + +/* EOF */ diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 223a1ac6d5..154b1d5f25 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -32,6 +32,7 @@ extern HANDLE ProcessHeap; #include "filesup.h" #include "fsutil.h" #include "genlist.h" +#include "infsupp.h" #include "inicache.h" #include "partlist.h" #include "arcname.h" @@ -49,4 +50,74 @@ extern HANDLE ProcessHeap; // #define PB (KB*KB*KB*KB*KB) +/* TYPEDEFS *****************************************************************/ + +typedef struct _USETUP_DATA +{ +/* SOURCE Paths *****/ + UNICODE_STRING SourceRootPath; + UNICODE_STRING SourceRootDir; + UNICODE_STRING SourcePath; + +/* DESTINATION Paths *****/ + /* + * Path to the system partition, where the boot manager resides. + * On x86 PCs, this is usually the active partition. + * On ARC, (u)EFI, ... platforms, this is a dedicated partition. + * + * For more information, see: + * https://en.wikipedia.org/wiki/System_partition_and_boot_partition + * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/boot-and-system-vo… + * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/arc-boot-process.h… + * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/efi-boot-process.h… + * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/determining-system… + * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/determining-boot-v… + */ + UNICODE_STRING SystemRootPath; + + /* Path to the installation directory inside the ReactOS boot partition */ + UNICODE_STRING DestinationPath; /** Equivalent of 'NTOS_INSTALLATION::SystemNtPath' **/ + UNICODE_STRING DestinationArcPath; /** Equivalent of 'NTOS_INSTALLATION::SystemArcPath' **/ + UNICODE_STRING DestinationRootPath; + + LONG DestinationDiskNumber; + LONG DestinationPartitionNumber; + LONG MBRInstallType; + + LONG FormatPartition; + LONG AutoPartition; + + WCHAR LocaleID[9]; + LANGID LanguageId; + + ULONG RequiredPartitionDiskSpace; + WCHAR InstallationDirectory[MAX_PATH]; +} USETUP_DATA, *PUSETUP_DATA; + +// HACK!! +extern BOOLEAN IsUnattendedSetup; + + +/* FUNCTIONS ****************************************************************/ + +VOID +CheckUnattendedSetup( + IN OUT PUSETUP_DATA pSetupData); + +VOID +InstallSetupInfFile( + IN OUT PUSETUP_DATA pSetupData); + +NTSTATUS +GetSourcePaths( + OUT PUNICODE_STRING SourcePath, + OUT PUNICODE_STRING SourceRootPath, + OUT PUNICODE_STRING SourceRootDir); + +ERROR_NUMBER +LoadSetupInf( + OUT HINF* SetupInf, + IN OUT PUSETUP_DATA pSetupData); + + /* EOF */ diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index c87a3fecc8..af5708ffc5 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -41,36 +41,12 @@ #include <strsafe.h> -/* GLOBALS ******************************************************************/ +/* GLOBALS & LOCALS *********************************************************/ HANDLE ProcessHeap; -static UNICODE_STRING SourceRootPath; -static UNICODE_STRING SourceRootDir; -static UNICODE_STRING SourcePath; - BOOLEAN IsUnattendedSetup = FALSE; -LONG UnattendDestinationDiskNumber; -LONG UnattendDestinationPartitionNumber; -LONG UnattendMBRInstallType = -1; -LONG UnattendFormatPartition = 0; -LONG AutoPartition = 0; -WCHAR UnattendInstallationDirectory[MAX_PATH]; -PWCHAR SelectedLanguageId; -WCHAR LocaleID[9]; -WCHAR DefaultLanguage[20]; -WCHAR DefaultKBLayout[20]; -static BOOLEAN RepairUpdateFlag = FALSE; -static HANDLE hPnpThread = INVALID_HANDLE_VALUE; - -static PPARTLIST PartitionList = NULL; -static PPARTENTRY TempPartition = NULL; -static FORMATMACHINESTATE FormatState = Start; - - -/* LOCALS *******************************************************************/ - -static PFILE_SYSTEM_LIST FileSystemList = NULL; +static USETUP_DATA USetupData; /* * NOTE: Technically only used for the COPYCONTEXT InstallPath member @@ -78,29 +54,27 @@ static PFILE_SYSTEM_LIST FileSystemList = NULL; */ static UNICODE_STRING InstallPath; -/* - * Path to the system partition, where the boot manager resides. - * On x86 PCs, this is usually the active partition. - * On ARC, (u)EFI, ... platforms, this is a dedicated partition. - * - * For more information, see: - * https://en.wikipedia.org/wiki/System_partition_and_boot_partition - * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/boot-and-system-vo… - * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/arc-boot-process.h… - * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/efi-boot-process.h… - * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/determining-system… - * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/determining-boot-v… - */ -static UNICODE_STRING SystemRootPath; - -/* Path to the installation directory inside the ReactOS boot partition */ -static UNICODE_STRING DestinationPath; -static UNICODE_STRING DestinationArcPath; -static UNICODE_STRING DestinationRootPath; - // FIXME: Is it really useful?? Just used for SetDefaultPagefile... static WCHAR DestinationDriveLetter; + +/* OTHER Stuff *****/ + +PWCHAR SelectedLanguageId; +static WCHAR DefaultLanguage[20]; // Copy of string inside LanguageList +static WCHAR DefaultKBLayout[20]; // Copy of string inside KeyboardList + +static BOOLEAN RepairUpdateFlag = FALSE; + +static HANDLE hPnpThread = NULL; + +static PPARTLIST PartitionList = NULL; +static PPARTENTRY TempPartition = NULL; +static PFILE_SYSTEM_LIST FileSystemList = NULL; +static FORMATMACHINESTATE FormatState = Start; + +/*****************************************************/ + static HINF SetupInf; static HSPFILEQ SetupFileQueue = NULL; @@ -114,9 +88,6 @@ static PGENERIC_LIST KeyboardList = NULL; static PGENERIC_LIST LayoutList = NULL; static PGENERIC_LIST LanguageList = NULL; -static LANGID LanguageId = 0; - -static ULONG RequiredPartitionDiskSpace = ~0; /* FUNCTIONS ****************************************************************/ @@ -273,7 +244,7 @@ PopupError(PCCH Text, if (Length > MaxLength) MaxLength = Length; - if (LastLine != FALSE) + if (LastLine) break; pnext = p + 1; @@ -339,7 +310,7 @@ PopupError(PCCH Text, &Written); } - if (LastLine != FALSE) + if (LastLine) break; coPos.Y++; @@ -429,178 +400,6 @@ ConfirmQuit(PINPUT_RECORD Ir) } -static VOID -CheckUnattendedSetup(VOID) -{ - WCHAR UnattendInfPath[MAX_PATH]; - INFCONTEXT Context; - HINF UnattendInf; - UINT ErrorLine; - INT IntValue; - PWCHAR Value; - - CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, SourcePath.Buffer, L"unattend.inf"); - - if (DoesFileExist(NULL, UnattendInfPath) == FALSE) - { - DPRINT("Does not exist: %S\n", UnattendInfPath); - return; - } - - /* Load 'unattend.inf' from install media. */ - UnattendInf = SetupOpenInfFileExW(UnattendInfPath, - NULL, - INF_STYLE_WIN4, - LanguageId, - &ErrorLine); - - if (UnattendInf == INVALID_HANDLE_VALUE) - { - DPRINT("SetupOpenInfFileExW() failed\n"); - return; - } - - /* Open 'Unattend' section */ - if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"Signature", &Context)) - { - DPRINT("SetupFindFirstLineW() failed for section 'Unattend'\n"); - SetupCloseInfFile(UnattendInf); - return; - } - - /* Get pointer 'Signature' key */ - if (!INF_GetData(&Context, NULL, &Value)) - { - DPRINT("INF_GetData() failed for key 'Signature'\n"); - SetupCloseInfFile(UnattendInf); - return; - } - - /* Check 'Signature' string */ - if (_wcsicmp(Value, L"$ReactOS$") != 0) - { - DPRINT("Signature not $ReactOS$\n"); - SetupCloseInfFile(UnattendInf); - return; - } - - /* Check if Unattend setup is enabled */ - if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"UnattendSetupEnabled", &Context)) - { - DPRINT("Can't find key 'UnattendSetupEnabled'\n"); - SetupCloseInfFile(UnattendInf); - return; - } - - if (!INF_GetData(&Context, NULL, &Value)) - { - DPRINT("Can't read key 'UnattendSetupEnabled'\n"); - SetupCloseInfFile(UnattendInf); - return; - } - - if (_wcsicmp(Value, L"yes") != 0) - { - DPRINT("Unattend setup is disabled by 'UnattendSetupEnabled' key!\n"); - SetupCloseInfFile(UnattendInf); - return; - } - - /* Search for 'DestinationDiskNumber' in the 'Unattend' section */ - if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"DestinationDiskNumber", &Context)) - { - DPRINT("SetupFindFirstLine() failed for key 'DestinationDiskNumber'\n"); - SetupCloseInfFile(UnattendInf); - return; - } - - if (!SetupGetIntField(&Context, 1, &IntValue)) - { - DPRINT("SetupGetIntField() failed for key 'DestinationDiskNumber'\n"); - SetupCloseInfFile(UnattendInf); - return; - } - - UnattendDestinationDiskNumber = (LONG)IntValue; - - /* Search for 'DestinationPartitionNumber' in the 'Unattend' section */ - if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"DestinationPartitionNumber", &Context)) - { - DPRINT("SetupFindFirstLine() failed for key 'DestinationPartitionNumber'\n"); - SetupCloseInfFile(UnattendInf); - return; - } - - if (!SetupGetIntField(&Context, 1, &IntValue)) - { - DPRINT("SetupGetIntField() failed for key 'DestinationPartitionNumber'\n"); - SetupCloseInfFile(UnattendInf); - return; - } - - UnattendDestinationPartitionNumber = (LONG)IntValue; - - /* Search for 'InstallationDirectory' in the 'Unattend' section */ - if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"InstallationDirectory", &Context)) - { - DPRINT("SetupFindFirstLine() failed for key 'InstallationDirectory'\n"); - SetupCloseInfFile(UnattendInf); - return; - } - - /* Get pointer 'InstallationDirectory' key */ - if (!INF_GetData(&Context, NULL, &Value)) - { - DPRINT("INF_GetData() failed for key 'InstallationDirectory'\n"); - SetupCloseInfFile(UnattendInf); - return; - } - - wcscpy(UnattendInstallationDirectory, Value); - - IsUnattendedSetup = TRUE; - DPRINT("Running unattended setup\n"); - - /* Search for 'MBRInstallType' in the 'Unattend' section */ - if (SetupFindFirstLineW(UnattendInf, L"Unattend", L"MBRInstallType", &Context)) - { - if (SetupGetIntField(&Context, 1, &IntValue)) - { - UnattendMBRInstallType = IntValue; - } - } - - /* Search for 'FormatPartition' in the 'Unattend' section */ - if (SetupFindFirstLineW(UnattendInf, L"Unattend", L"FormatPartition", &Context)) - { - if (SetupGetIntField(&Context, 1, &IntValue)) - { - UnattendFormatPartition = IntValue; - } - } - - if (SetupFindFirstLineW(UnattendInf, L"Unattend", L"AutoPartition", &Context)) - { - if (SetupGetIntField(&Context, 1, &IntValue)) - { - AutoPartition = IntValue; - } - } - - /* search for LocaleID in the 'Unattend' section*/ - if (SetupFindFirstLineW(UnattendInf, L"Unattend", L"LocaleID", &Context)) - { - if (INF_GetData(&Context, NULL, &Value)) - { - LONG Id = wcstol(Value, NULL, 16); - swprintf(LocaleID, L"%08lx", Id); - } - } - - SetupCloseInfFile(UnattendInf); -} - - static VOID UpdateKBLayout(VOID) { @@ -645,7 +444,7 @@ UpdateKBLayout(VOID) * * SIDEEFFECTS * Init SelectedLanguageId - * Init LanguageId + * Init USetupData.LanguageId * * RETURNS * Number of the next page. @@ -669,6 +468,7 @@ LanguagePage(PINPUT_RECORD Ir) } /* Load the font */ + USetupData.LanguageId = 0; SelectedLanguageId = DefaultLanguage; SetConsoleCodePage(); UpdateKBLayout(); @@ -677,7 +477,7 @@ LanguagePage(PINPUT_RECORD Ir) * the language selection process altogether! */ if (GenericListHasSingleEntry(LanguageList)) { - LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); + USetupData.LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); return WELCOME_PAGE; } @@ -723,7 +523,7 @@ LanguagePage(PINPUT_RECORD Ir) else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; else RedrawGenericList(&ListUi); @@ -732,7 +532,7 @@ LanguagePage(PINPUT_RECORD Ir) { SelectedLanguageId = (PWCHAR)GetListEntryUserData(GetCurrentListEntry(LanguageList)); - LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); + USetupData.LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); if (wcscmp(SelectedLanguageId, DefaultLanguage)) { @@ -777,65 +577,6 @@ LanguagePage(PINPUT_RECORD Ir) } -static NTSTATUS -GetSourcePaths( - OUT PUNICODE_STRING SourcePath, - OUT PUNICODE_STRING SourceRootPath, - OUT PUNICODE_STRING SourceRootDir) -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\SystemRoot"); - UNICODE_STRING SourceName; - WCHAR SourceBuffer[MAX_PATH] = L""; - HANDLE Handle; - ULONG Length; - PWCHAR Ptr; - - InitializeObjectAttributes(&ObjectAttributes, - &LinkName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtOpenSymbolicLinkObject(&Handle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - return Status; - - RtlInitEmptyUnicodeString(&SourceName, SourceBuffer, sizeof(SourceBuffer)); - - Status = NtQuerySymbolicLinkObject(Handle, - &SourceName, - &Length); - NtClose(Handle); - - if (!NT_SUCCESS(Status)) - return Status; - - RtlCreateUnicodeString(SourcePath, - SourceName.Buffer); - - /* Strip trailing directory */ - Ptr = wcsrchr(SourceName.Buffer, OBJ_NAME_PATH_SEPARATOR); - if (Ptr) - { - RtlCreateUnicodeString(SourceRootDir, Ptr); - *Ptr = UNICODE_NULL; - } - else - { - RtlCreateUnicodeString(SourceRootDir, L""); - } - - RtlCreateUnicodeString(SourceRootPath, - SourceName.Buffer); - - return STATUS_SUCCESS; -} - - /* * Start page * @@ -846,15 +587,15 @@ GetSourcePaths( * * SIDEEFFECTS * Init Sdi - * Init SourcePath - * Init SourceRootPath - * Init SourceRootDir + * Init USetupData.SourcePath + * Init USetupData.SourceRootPath + * Init USetupData.SourceRootDir * Init SetupInf - * Init RequiredPartitionDiskSpace + * Init USetupData.RequiredPartitionDiskSpace * Init IsUnattendedSetup * If unattended, init *List and sets the Codepage * If unattended, init SelectedLanguageId - * If unattended, init LanguageId + * If unattended, init USetupData.LanguageId * * RETURNS * Number of the next page. @@ -863,80 +604,33 @@ static PAGE_NUMBER SetupStartPage(PINPUT_RECORD Ir) { NTSTATUS Status; - WCHAR FileNameBuffer[MAX_PATH]; - INFCONTEXT Context; - PWCHAR Value; - UINT ErrorLine; + ULONG Error; PGENERIC_LIST_ENTRY ListEntry; - INT IntValue; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); /* Get the source path and source root path */ - Status = GetSourcePaths(&SourcePath, - &SourceRootPath, - &SourceRootDir); + Status = GetSourcePaths(&USetupData.SourcePath, + &USetupData.SourceRootPath, + &USetupData.SourceRootDir); if (!NT_SUCCESS(Status)) { CONSOLE_PrintTextXY(6, 15, "GetSourcePaths() failed (Status 0x%08lx)", Status); MUIDisplayError(ERROR_NO_SOURCE_DRIVE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } - DPRINT1("SourcePath: '%wZ'\n", &SourcePath); - DPRINT1("SourceRootPath: '%wZ'\n", &SourceRootPath); - DPRINT1("SourceRootDir: '%wZ'\n", &SourceRootDir); + DPRINT1("SourcePath: '%wZ'\n", &USetupData.SourcePath); + DPRINT1("SourceRootPath: '%wZ'\n", &USetupData.SourceRootPath); + DPRINT1("SourceRootDir: '%wZ'\n", &USetupData.SourceRootDir); - /* Load txtsetup.sif from install media. */ - CombinePaths(FileNameBuffer, ARRAYSIZE(FileNameBuffer), 2, SourcePath.Buffer, L"txtsetup.sif"); - SetupInf = SetupOpenInfFileExW(FileNameBuffer, - NULL, - INF_STYLE_WIN4, - LanguageId, - &ErrorLine); - - if (SetupInf == INVALID_HANDLE_VALUE) + /* Load 'txtsetup.sif' from the installation media */ + Error = LoadSetupInf(&SetupInf, &USetupData); + if (Error != ERROR_SUCCESS) { - MUIDisplayError(ERROR_LOAD_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); + MUIDisplayError(Error, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } - /* Open 'Version' section */ - if (!SetupFindFirstLineW(SetupInf, L"Version", L"Signature", &Context)) - { - MUIDisplayError(ERROR_CORRUPT_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - - /* Get pointer 'Signature' key */ - if (!INF_GetData(&Context, NULL, &Value)) - { - MUIDisplayError(ERROR_CORRUPT_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - - /* Check 'Signature' string */ - if (_wcsicmp(Value, L"$ReactOS$") != 0) - { - MUIDisplayError(ERROR_SIGNATURE_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - - /* Open 'DiskSpaceRequirements' section */ - if (!SetupFindFirstLineW(SetupInf, L"DiskSpaceRequirements", L"FreeSysPartDiskSpace", &Context)) - { - MUIDisplayError(ERROR_CORRUPT_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - - /* Get the 'FreeSysPartDiskSpace' value */ - if (!SetupGetIntField(&Context, 1, &IntValue)) - { - MUIDisplayError(ERROR_CORRUPT_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - - RequiredPartitionDiskSpace = (ULONG)IntValue; - /* Start the PnP thread */ if (hPnpThread != NULL) { @@ -944,7 +638,7 @@ SetupStartPage(PINPUT_RECORD Ir) hPnpThread = NULL; } - CheckUnattendedSetup(); + CheckUnattendedSetup(&USetupData); if (IsUnattendedSetup) { @@ -956,14 +650,14 @@ SetupStartPage(PINPUT_RECORD Ir) LanguageList = CreateLanguageList(SetupInf, DefaultLanguage); /* new part */ - wcscpy(SelectedLanguageId, LocaleID); - LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); + wcscpy(SelectedLanguageId, USetupData.LocaleID); + USetupData.LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); /* first we hack LanguageList */ ListEntry = GetFirstListEntry(LanguageList); while (ListEntry != NULL) { - if (!wcsicmp(LocaleID, GetListEntryUserData(ListEntry))) + if (!wcsicmp(USetupData.LocaleID, GetListEntryUserData(ListEntry))) { DPRINT("found %S in LanguageList\n",GetListEntryUserData(ListEntry)); SetCurrentListEntry(LanguageList, ListEntry); @@ -977,7 +671,7 @@ SetupStartPage(PINPUT_RECORD Ir) ListEntry = GetFirstListEntry(LayoutList); while (ListEntry != NULL) { - if (!wcsicmp(LocaleID, GetListEntryUserData(ListEntry))) + if (!wcsicmp(USetupData.LocaleID, GetListEntryUserData(ListEntry))) { DPRINT("found %S in LayoutList\n",GetListEntryUserData(ListEntry)); SetCurrentListEntry(LayoutList, ListEntry); @@ -1021,7 +715,7 @@ WelcomePage(PINPUT_RECORD Ir) if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; break; @@ -1199,7 +893,7 @@ UpgradeRepairPage(PINPUT_RECORD Ir) break; case VK_F3: /* F3 */ { - if (ConfirmQuit(Ir) == TRUE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; else RedrawGenericList(&ListUi); @@ -1286,7 +980,7 @@ InstallIntroPage(PINPUT_RECORD Ir) if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; break; @@ -1323,7 +1017,7 @@ ScsiControllerPage(PINPUT_RECORD Ir) if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; break; @@ -1355,7 +1049,7 @@ OemDriverPage(PINPUT_RECORD Ir) if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit(Ir) == TRUE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; break; @@ -1492,7 +1186,7 @@ DeviceSettingsPage(PINPUT_RECORD Ir) else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; break; @@ -1556,7 +1250,7 @@ HandleGenericList(PGENERIC_LIST_UI ListUi, else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; else RedrawGenericList(ListUi); @@ -1704,10 +1398,10 @@ IsDiskSizeValid(PPARTENTRY PartEntry) size = PartEntry->SectorCount.QuadPart * PartEntry->DiskEntry->BytesPerSector; size = (size + (512 * KB)) / MB; /* in MBytes */ - if (size < RequiredPartitionDiskSpace) + if (size < USetupData.RequiredPartitionDiskSpace) { /* Partition is too small so ask for another one */ - DPRINT1("Partition is too small (size: %I64u MB), required disk space is %lu MB\n", size, RequiredPartitionDiskSpace); + DPRINT1("Partition is too small (size: %I64u MB), required disk space is %lu MB\n", size, USetupData.RequiredPartitionDiskSpace); return FALSE; } else @@ -1786,9 +1480,11 @@ SelectPartitionPage(PINPUT_RECORD Ir) if (IsUnattendedSetup) { - if (!SelectPartition(PartitionList, UnattendDestinationDiskNumber, UnattendDestinationPartitionNumber)) + if (!SelectPartition(PartitionList, + USetupData.DestinationDiskNumber, + USetupData.DestinationPartitionNumber)) { - if (AutoPartition) + if (USetupData.AutoPartition) { if (PartitionList->CurrentPartition->LogicalPartition) { @@ -1807,7 +1503,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) if (!IsDiskSizeValid(PartitionList->CurrentPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, - RequiredPartitionDiskSpace); + USetupData.RequiredPartitionDiskSpace); return SELECT_PARTITION_PAGE; /* let the user select another partition */ } @@ -1822,7 +1518,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) if (!IsDiskSizeValid(PartitionList->CurrentPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, - RequiredPartitionDiskSpace); + USetupData.RequiredPartitionDiskSpace); return SELECT_PARTITION_PAGE; /* let the user select another partition */ } @@ -1872,7 +1568,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) { DestroyPartitionList(PartitionList); PartitionList = NULL; @@ -1916,7 +1612,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) if (!IsDiskSizeValid(PartitionList->CurrentPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, - RequiredPartitionDiskSpace); + USetupData.RequiredPartitionDiskSpace); return SELECT_PARTITION_PAGE; /* let the user select another partition */ } @@ -1952,7 +1648,7 @@ SelectPartitionPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'L') /* L */ { - if (PartitionList->CurrentPartition->LogicalPartition != FALSE) + if (PartitionList->CurrentPartition->LogicalPartition) { Error = LogicalPartitionCreationChecks(PartitionList); if (Error != NOT_AN_ERROR) @@ -2276,14 +1972,14 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, /* left, top, right, bottom */ MaxSize, InputBuffer, &Quit, &Cancel); - if (Quit != FALSE) + if (Quit) { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; break; } - else if (Cancel != FALSE) + else if (Cancel) { return SELECT_PARTITION_PAGE; } @@ -2435,14 +2131,14 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, /* left, top, right, bottom */ MaxSize, InputBuffer, &Quit, &Cancel); - if (Quit != FALSE) + if (Quit) { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; break; } - else if (Cancel != FALSE) + else if (Cancel) { return SELECT_PARTITION_PAGE; } @@ -2593,14 +2289,14 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, /* left, top, right, bottom */ MaxSize, InputBuffer, &Quit, &Cancel); - if (Quit != FALSE) + if (Quit) { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; break; } - else if (Cancel != FALSE) + else if (Cancel) { return SELECT_PARTITION_PAGE; } @@ -2672,7 +2368,7 @@ ConfirmDeleteSystemPartitionPage(PINPUT_RECORD Ir) if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit(Ir) == TRUE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; break; @@ -2819,7 +2515,7 @@ DeletePartitionPage(PINPUT_RECORD Ir) if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; break; @@ -2845,8 +2541,8 @@ DeletePartitionPage(PINPUT_RECORD Ir) * * Next pages: * CheckFileSystemPage (At once if RepairUpdate is selected) - * CheckFileSystemPage (At once if Unattended and not UnattendFormatPartition) - * FormatPartitionPage (At once if Unattended and UnattendFormatPartition) + * CheckFileSystemPage (At once if Unattended and not USetupData.FormatPartition) + * FormatPartitionPage (At once if Unattended and USetupData.FormatPartition) * SelectPartitionPage (If the user aborts) * FormatPartitionPage (Default) * QuitPage @@ -3009,7 +2705,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) PartTypeString, ARRAYSIZE(PartTypeString)); - if (PartEntry->AutoCreate != FALSE) + if (PartEntry->AutoCreate) { CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION)); @@ -3035,7 +2731,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) PartEntry->AutoCreate = FALSE; } - else if (PartEntry->New != FALSE) + else if (PartEntry->New) { switch (FormatState) { @@ -3114,7 +2810,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) if (IsUnattendedSetup) { - if (UnattendFormatPartition) + if (USetupData.FormatPartition) { /* * We use whatever currently selected file system we have @@ -3138,7 +2834,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; break; @@ -3184,7 +2880,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) * * SIDEEFFECTS * Sets PartitionList->CurrentPartition->FormatState - * Sets DestinationRootPath + * Sets USetupData.DestinationRootPath * * RETURNS * Number of the next page. @@ -3230,7 +2926,7 @@ FormatPartitionPage(PINPUT_RECORD Ir) if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; break; @@ -3443,31 +3139,31 @@ BuildInstallPaths(PWSTR InstallDir, RtlFreeUnicodeString(&InstallPath); RtlCreateUnicodeString(&InstallPath, InstallDir); - /* Create 'DestinationRootPath' string */ - RtlFreeUnicodeString(&DestinationRootPath); + /* Create 'USetupData.DestinationRootPath' string */ + RtlFreeUnicodeString(&USetupData.DestinationRootPath); StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu\\", DiskEntry->DiskNumber, PartEntry->PartitionNumber); - RtlCreateUnicodeString(&DestinationRootPath, PathBuffer); - DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); + RtlCreateUnicodeString(&USetupData.DestinationRootPath, PathBuffer); + DPRINT("DestinationRootPath: %wZ\n", &USetupData.DestinationRootPath); /** Equivalent of 'NTOS_INSTALLATION::SystemNtPath' **/ - /* Create 'DestinationPath' string */ - RtlFreeUnicodeString(&DestinationPath); + /* Create 'USetupData.DestinationPath' string */ + RtlFreeUnicodeString(&USetupData.DestinationPath); CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, - DestinationRootPath.Buffer, InstallDir); - RtlCreateUnicodeString(&DestinationPath, PathBuffer); + USetupData.DestinationRootPath.Buffer, InstallDir); + RtlCreateUnicodeString(&USetupData.DestinationPath, PathBuffer); /** Equivalent of 'NTOS_INSTALLATION::SystemArcPath' **/ - /* Create 'DestinationArcPath' */ - RtlFreeUnicodeString(&DestinationArcPath); + /* Create 'USetupData.DestinationArcPath' */ + RtlFreeUnicodeString(&USetupData.DestinationArcPath); StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"multi(0)disk(0)rdisk(%lu)partition(%lu)\\", DiskEntry->BiosDiskNumber, PartEntry->PartitionNumber); ConcatPaths(PathBuffer, ARRAYSIZE(PathBuffer), 1, InstallDir); - RtlCreateUnicodeString(&DestinationArcPath, PathBuffer); + RtlCreateUnicodeString(&USetupData.DestinationArcPath, PathBuffer); /* Initialize DestinationDriveLetter */ DestinationDriveLetter = (WCHAR)PartEntry->DriveLetter; @@ -3489,7 +3185,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; - WCHAR InstallDir[51]; + WCHAR InstallDir[MAX_PATH]; WCHAR c; ULONG Length, Pos; @@ -3511,10 +3207,11 @@ InstallDirectoryPage(PINPUT_RECORD Ir) DiskEntry = PartitionList->CurrentDisk; PartEntry = PartitionList->CurrentPartition; - if (IsUnattendedSetup) - wcscpy(InstallDir, UnattendInstallationDirectory); - else if (RepairUpdateFlag) + // if (IsUnattendedSetup) + if (RepairUpdateFlag) wcscpy(InstallDir, CurrentInstallation->PathComponent); // SystemNtPath + else if (USetupData.InstallationDirectory[0]) + wcscpy(InstallDir, USetupData.InstallationDirectory); else wcscpy(InstallDir, L"\\ReactOS"); @@ -3551,7 +3248,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) { CONSOLE_SetCursorType(TRUE, FALSE); - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; CONSOLE_SetCursorType(TRUE, TRUE); @@ -3737,8 +3434,8 @@ AddSectionToCopyQueueCab(HINF InfFile, if (!SetupQueueCopy(SetupFileQueue, SourceCabinet, - SourceRootPath.Buffer, - SourceRootDir.Buffer, + USetupData.SourceRootPath.Buffer, + USetupData.SourceRootDir.Buffer, FileKeyName, DirKeyValue, TargetFileName)) @@ -3846,7 +3543,7 @@ AddSectionToCopyQueue(HINF InfFile, DPRINT("InstallationPath: '%S'\n", DirKeyValue); StringCchCopyW(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), - SourceRootDir.Buffer); + USetupData.SourceRootDir.Buffer); DPRINT("InstallationPath(2): '%S'\n", CompleteOrigDirName); } @@ -3866,14 +3563,14 @@ AddSectionToCopyQueue(HINF InfFile, DPRINT("RelativePath: '%S'\n", DirKeyValue); CombinePaths(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), 2, - SourceRootDir.Buffer, DirKeyValue); + USetupData.SourceRootDir.Buffer, DirKeyValue); DPRINT("RelativePath(2): '%S'\n", CompleteOrigDirName); } if (!SetupQueueCopy(SetupFileQueue, SourceCabinet, - SourceRootPath.Buffer, + USetupData.SourceRootPath.Buffer, CompleteOrigDirName, FileKeyName, DirKeyValue, @@ -3904,7 +3601,7 @@ PrepareCopyPageInfFile(HINF InfFile, WCHAR PathBuffer[MAX_PATH]; /* Add common files */ - if (!AddSectionToCopyQueue(InfFile, L"SourceDisksFiles", SourceCabinet, &DestinationPath, Ir)) + if (!AddSectionToCopyQueue(InfFile, L"SourceDisksFiles", SourceCabinet, &USetupData.DestinationPath, Ir)) return FALSE; /* Add specific files depending of computer type */ @@ -3915,7 +3612,7 @@ PrepareCopyPageInfFile(HINF InfFile, if (AdditionalSectionName) { - if (!AddSectionToCopyQueue(InfFile, AdditionalSectionName, SourceCabinet, &DestinationPath, Ir)) + if (!AddSectionToCopyQueue(InfFile, AdditionalSectionName, SourceCabinet, &USetupData.DestinationPath, Ir)) return FALSE; } } @@ -3924,14 +3621,14 @@ PrepareCopyPageInfFile(HINF InfFile, /* * FIXME: - * Copying files to DestinationRootPath should be done from within + * Copying files to USetupData.DestinationRootPath should be done from within * the SystemPartitionFiles section. * At the moment we check whether we specify paths like '\foo' or '\\' for that. - * For installing to DestinationPath specify just '\' . + * For installing to USetupData.DestinationPath specify just '\' . */ /* Get destination path */ - StringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), DestinationPath.Buffer); + StringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), USetupData.DestinationPath.Buffer); DPRINT("FullPath(1): '%S'\n", PathBuffer); @@ -3974,7 +3671,7 @@ PrepareCopyPageInfFile(HINF InfFile, DPRINT("InstallationPath: '%S'\n", DirKeyValue); StringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), - DestinationPath.Buffer); + USetupData.DestinationPath.Buffer); DPRINT("InstallationPath(2): '%S'\n", PathBuffer); } @@ -3984,7 +3681,7 @@ PrepareCopyPageInfFile(HINF InfFile, DPRINT("AbsolutePath: '%S'\n", DirKeyValue); CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, - DestinationRootPath.Buffer, DirKeyValue); + USetupData.DestinationRootPath.Buffer, DirKeyValue); DPRINT("AbsolutePath(2): '%S'\n", PathBuffer); @@ -4003,7 +3700,7 @@ PrepareCopyPageInfFile(HINF InfFile, DPRINT("RelativePath: '%S'\n", DirKeyValue); CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, - DestinationPath.Buffer, DirKeyValue); + USetupData.DestinationPath.Buffer, DirKeyValue); DPRINT("RelativePath(2): '%S'\n", PathBuffer); @@ -4081,7 +3778,7 @@ PrepareCopyPage(PINPUT_RECORD Ir) break; CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, - SourcePath.Buffer, KeyValue); + USetupData.SourcePath.Buffer, KeyValue); CabinetInitialize(); CabinetSetEventHandlers(NULL, NULL, NULL); @@ -4109,7 +3806,7 @@ PrepareCopyPage(PINPUT_RECORD Ir) InfFileSize, NULL, INF_STYLE_WIN4, - LanguageId, + USetupData.LanguageId, &ErrorLine); if (InfHandle == INVALID_HANDLE_VALUE) @@ -4224,7 +3921,7 @@ FileCopyPage(PINPUT_RECORD Ir) MUIDisplayPage(FILE_COPY_PAGE); /* Create context for the copy process */ - CopyContext.DestinationRootPath = DestinationRootPath.Buffer; + CopyContext.DestinationRootPath = USetupData.DestinationRootPath.Buffer; CopyContext.InstallPath = InstallPath.Buffer; CopyContext.TotalOperations = 0; CopyContext.CompletedOperations = 0; @@ -4286,6 +3983,9 @@ FileCopyPage(PINPUT_RECORD Ir) DestroyProgressBar(CopyContext.MemoryBars[1]); DestroyProgressBar(CopyContext.MemoryBars[2]); + /* Create the $winnt$.inf file */ + InstallSetupInfFile(&USetupData); + /* Go display the next page */ return REGISTRY_PAGE; } @@ -4327,7 +4027,7 @@ RegistryPage(PINPUT_RECORD Ir) DPRINT1("TODO: Updating / repairing the registry is not completely implemented yet!\n"); /* Verify the registry hives and check whether we need to update or repair any of them */ - Status = VerifyRegistryHives(&DestinationPath, &ShouldRepairRegistry); + Status = VerifyRegistryHives(&USetupData.DestinationPath, &ShouldRepairRegistry); if (!NT_SUCCESS(Status)) { DPRINT1("VerifyRegistryHives failed, Status 0x%08lx\n", Status); @@ -4342,7 +4042,7 @@ DoUpdate: CONSOLE_SetStatusText(MUIGetString(STRING_REGHIVEUPDATE)); /* Initialize the registry and setup the registry hives */ - Status = RegInitializeRegistry(&DestinationPath); + Status = RegInitializeRegistry(&USetupData.DestinationPath); if (!NT_SUCCESS(Status)) { DPRINT1("RegInitializeRegistry() failed\n"); @@ -4431,7 +4131,7 @@ DoUpdate: CONSOLE_SetStatusText(MUIGetString(STRING_IMPORTFILE), File); - if (!ImportRegistryFile(SourcePath.Buffer, File, Section, LanguageId, Delete)) + if (!ImportRegistryFile(USetupData.SourcePath.Buffer, File, Section, USetupData.LanguageId, Delete)) { DPRINT1("Importing %S failed\n", File); INF_FreeData(File); @@ -4508,7 +4208,7 @@ Cleanup: // TODO: Unload all the registry stuff, perform cleanup, // and copy the created hive files into .sav files. // - RegCleanupRegistry(&DestinationPath); + RegCleanupRegistry(&USetupData.DestinationPath); /* * Check whether we were in update/repair mode but we were actually @@ -4564,28 +4264,30 @@ BootLoaderPage(PINPUT_RECORD Ir) CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - RtlFreeUnicodeString(&SystemRootPath); + RtlFreeUnicodeString(&USetupData.SystemRootPath); StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"\\Device\\Harddisk%lu\\Partition%lu\\", PartitionList->SystemPartition->DiskEntry->DiskNumber, PartitionList->SystemPartition->PartitionNumber); - RtlCreateUnicodeString(&SystemRootPath, PathBuffer); - DPRINT1("SystemRootPath: %wZ\n", &SystemRootPath); + RtlCreateUnicodeString(&USetupData.SystemRootPath, PathBuffer); + DPRINT1("SystemRootPath: %wZ\n", &USetupData.SystemRootPath); PartitionType = PartitionList->SystemPartition->PartitionType; + /* For unattended setup, skip MBR installation or install on floppy if needed */ if (IsUnattendedSetup) { - if (UnattendMBRInstallType == 0) /* skip MBR installation */ - { - return SUCCESS_PAGE; - } - else if (UnattendMBRInstallType == 1) /* install on floppy */ + if ((USetupData.MBRInstallType == 0) || + (USetupData.MBRInstallType == 1)) { - return BOOT_LOADER_FLOPPY_PAGE; + goto Quit; } } + /* + * We may install an MBR or VBR, but before that, check whether + * we need to actually install the VBR on floppy. + */ if (PartitionType == PARTITION_ENTRY_UNUSED) { DPRINT("Error: system partition invalid (unused)\n"); @@ -4628,15 +4330,21 @@ BootLoaderPage(PINPUT_RECORD Ir) InstallOnFloppy = TRUE; } - if (InstallOnFloppy != FALSE) + /* We should install on floppy */ + if (InstallOnFloppy) { - return BOOT_LOADER_FLOPPY_PAGE; + USetupData.MBRInstallType = 1; + goto Quit; } - /* Unattended install on hdd? */ - if (IsUnattendedSetup && UnattendMBRInstallType == 2) + /* Is it an unattended install on hdd? */ + if (IsUnattendedSetup) { - return BOOT_LOADER_HARDDISK_MBR_PAGE; + if ((USetupData.MBRInstallType == 2) || + (USetupData.MBRInstallType == 3)) + { + goto Quit; + } } MUIDisplayPage(BOOT_LOADER_PAGE); @@ -4677,7 +4385,7 @@ BootLoaderPage(PINPUT_RECORD Ir) else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; break; @@ -4686,25 +4394,53 @@ BootLoaderPage(PINPUT_RECORD Ir) { if (Line == 12) { - return BOOT_LOADER_HARDDISK_MBR_PAGE; + /* Install on both MBR and VBR */ + USetupData.MBRInstallType = 2; + break; } else if (Line == 13) { - return BOOT_LOADER_HARDDISK_VBR_PAGE; + /* Install on VBR only */ + USetupData.MBRInstallType = 3; + break; } else if (Line == 14) { - return BOOT_LOADER_FLOPPY_PAGE; + /* Install on floppy */ + USetupData.MBRInstallType = 1; + break; } else if (Line == 15) { - return SUCCESS_PAGE; + /* Skip MBR installation */ + USetupData.MBRInstallType = 0; + break; } return BOOT_LOADER_PAGE; } } +Quit: + switch (USetupData.MBRInstallType) + { + /* Skip MBR installation */ + case 0: + return SUCCESS_PAGE; + + /* Install on floppy */ + case 1: + return BOOT_LOADER_FLOPPY_PAGE; + + /* Install on both MBR and VBR */ + case 2: + return BOOT_LOADER_HARDDISK_MBR_PAGE; + + /* Install on VBR only */ + case 3: + return BOOT_LOADER_HARDDISK_VBR_PAGE; + } + return BOOT_LOADER_PAGE; } @@ -4738,7 +4474,7 @@ BootLoaderFloppyPage(PINPUT_RECORD Ir) if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { - if (ConfirmQuit(Ir) != FALSE) + if (ConfirmQuit(Ir)) return QUIT_PAGE; break; @@ -4751,7 +4487,7 @@ BootLoaderFloppyPage(PINPUT_RECORD Ir) return BOOT_LOADER_FLOPPY_PAGE; } - Status = InstallFatBootcodeToFloppy(&SourceRootPath, &DestinationArcPath); + Status = InstallFatBootcodeToFloppy(&USetupData.SourceRootPath, &USetupData.DestinationArcPath); if (!NT_SUCCESS(Status)) { /* Print error message */ @@ -4784,9 +4520,9 @@ BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) { NTSTATUS Status; - Status = InstallVBRToPartition(&SystemRootPath, - &SourceRootPath, - &DestinationArcPath, + Status = InstallVBRToPartition(&USetupData.SystemRootPath, + &USetupData.SourceRootPath, + &USetupData.DestinationArcPath, PartitionList->SystemPartition->PartitionType); if (!NT_SUCCESS(Status)) { @@ -4821,9 +4557,9 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) WCHAR DstPath[MAX_PATH]; /* Step 1: Write the VBR */ - Status = InstallVBRToPartition(&SystemRootPath, - &SourceRootPath, - &DestinationArcPath, + Status = InstallVBRToPartition(&USetupData.SystemRootPath, + &USetupData.SourceRootPath, + &USetupData.DestinationArcPath, PartitionList->SystemPartition->PartitionType); if (!NT_SUCCESS(Status)) { @@ -4836,12 +4572,12 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) L"\\Device\\Harddisk%d\\Partition0", PartitionList->SystemPartition->DiskEntry->DiskNumber); - CombinePaths(SourceMbrPathBuffer, ARRAYSIZE(SourceMbrPathBuffer), 2, SourceRootPath.Buffer, L"\\loader\\dosmbr.bin"); + CombinePaths(SourceMbrPathBuffer, ARRAYSIZE(SourceMbrPathBuffer), 2, USetupData.SourceRootPath.Buffer, L"\\loader\\dosmbr.bin"); if (IsThereAValidBootSector(DestinationDevicePathBuffer)) { /* Save current MBR */ - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath.Buffer, L"mbr.old"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, USetupData.SystemRootPath.Buffer, L"mbr.old"); DPRINT1("Save MBR: %S ==> %S\n", DestinationDevicePathBuffer, DstPath); Status = SaveBootSector(DestinationDevicePathBuffer, DstPath, sizeof(PARTITION_SECTOR)); @@ -5236,14 +4972,14 @@ RunUSetup(VOID) } /* Initialize global unicode strings */ - RtlInitUnicodeString(&SourcePath, NULL); - RtlInitUnicodeString(&SourceRootPath, NULL); - RtlInitUnicodeString(&SourceRootDir, NULL); + RtlInitUnicodeString(&USetupData.SourcePath, NULL); + RtlInitUnicodeString(&USetupData.SourceRootPath, NULL); + RtlInitUnicodeString(&USetupData.SourceRootDir, NULL); RtlInitUnicodeString(&InstallPath, NULL); - RtlInitUnicodeString(&DestinationPath, NULL); - RtlInitUnicodeString(&DestinationArcPath, NULL); - RtlInitUnicodeString(&DestinationRootPath, NULL); - RtlInitUnicodeString(&SystemRootPath, NULL); + RtlInitUnicodeString(&USetupData.DestinationPath, NULL); + RtlInitUnicodeString(&USetupData.DestinationArcPath, NULL); + RtlInitUnicodeString(&USetupData.DestinationRootPath, NULL); + RtlInitUnicodeString(&USetupData.SystemRootPath, NULL); /* Hide the cursor */ CONSOLE_SetCursorType(TRUE, FALSE); @@ -5408,6 +5144,8 @@ RunUSetup(VOID) } } + SetupCloseInfFile(SetupInf); + if (Page == RECOVERY_PAGE) RecoveryConsole();

1 0

02/02: [IDL] Fix coding style and indentation
by Eric Kohl 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11500a0033922394738a7… commit 11500a0033922394738a7b7f3adc624034300195 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Oct 27 16:34:37 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Oct 27 16:34:37 2018 +0200 [IDL] Fix coding style and indentation --- sdk/include/reactos/idl/lsa.idl | 308 +++++++++++++++++++++++++++---------- sdk/include/reactos/idl/wkssvc.idl | 22 +-- 2 files changed, 242 insertions(+), 88 deletions(-) diff --git a/sdk/include/reactos/idl/lsa.idl b/sdk/include/reactos/idl/lsa.idl index a7be25b1ea..9e049bd680 100644 --- a/sdk/include/reactos/idl/lsa.idl +++ b/sdk/include/reactos/idl/lsa.idl @@ -609,34 +609,46 @@ typedef struct _CREDPR_TARGET_INFORMATION interface lsarpc { /* Function 0 */ - NTSTATUS __stdcall LsarClose( + NTSTATUS + __stdcall + LsarClose( [in, out] LSAPR_HANDLE *ObjectHandle); /* Function 1 */ - NTSTATUS __stdcall LsarDelete( + NTSTATUS + __stdcall + LsarDelete( [in] LSAPR_HANDLE ObjectHandle); /* Function 2 */ - NTSTATUS __stdcall LsarEnumeratePrivileges( + NTSTATUS + __stdcall + LsarEnumeratePrivileges( [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_PRIVILEGE_ENUM_BUFFER EnumerationBuffer, [in] DWORD PreferedMaximumLength); /* Function 3 */ - NTSTATUS __stdcall LsarQuerySecurityObject( + NTSTATUS + __stdcall + LsarQuerySecurityObject( [in] LSAPR_HANDLE ObjectHandle, [in] SECURITY_INFORMATION SecurityInformation, [out] PLSAPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor); /* Function 4 */ - NTSTATUS __stdcall LsarSetSecurityObject( + NTSTATUS + __stdcall + LsarSetSecurityObject( [in] LSAPR_HANDLE ObjectHandle, [in] SECURITY_INFORMATION SecurityInformation, [in] PLSAPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor); /* Function 5 */ - NTSTATUS __stdcall LsarChangePassword( + NTSTATUS + __stdcall + LsarChangePassword( [in] PRPC_UNICODE_STRING String1, [in] PRPC_UNICODE_STRING String2, [in] PRPC_UNICODE_STRING String3, @@ -644,58 +656,76 @@ interface lsarpc [in] PRPC_UNICODE_STRING String5); /* Function 6 */ - NTSTATUS __stdcall LsarOpenPolicy( + NTSTATUS + __stdcall + LsarOpenPolicy( [in, unique] PLSAPR_SERVER_NAME SystemName, [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *PolicyHandle); /* Function 7 */ - NTSTATUS __stdcall LsarQueryInformationPolicy( + NTSTATUS + __stdcall + LsarQueryInformationPolicy( [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [out, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION *PolicyInformation); /* Function 8 */ - NTSTATUS __stdcall LsarSetInformationPolicy( + NTSTATUS + __stdcall + LsarSetInformationPolicy( [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [in, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION PolicyInformation); /* Function 9 */ - NTSTATUS __stdcall LsarClearAuditLog( + NTSTATUS + __stdcall + LsarClearAuditLog( [in] LSAPR_HANDLE ObjectHandle); /* Function 10 */ - NTSTATUS __stdcall LsarCreateAccount( + NTSTATUS + __stdcall + LsarCreateAccount( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *AccountHandle); /* Function 11 */ - NTSTATUS __stdcall LsarEnumerateAccounts( + NTSTATUS + __stdcall + LsarEnumerateAccounts( [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer, [in] DWORD PreferedMaximumLength); /* Function 12 */ - NTSTATUS __stdcall LsarCreateTrustedDomain( + NTSTATUS + __stdcall + LsarCreateTrustedDomain( [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_TRUST_INFORMATION TrustedDomainInformation, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *TrustedDomainHandle); /* Function 13 */ - NTSTATUS __stdcall LsarEnumerateTrustedDomains( + NTSTATUS + __stdcall + LsarEnumerateTrustedDomains( [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_TRUSTED_ENUM_BUFFER EnumerationBuffer, [in] DWORD PreferedMaximumLength); /* Function 14 */ - NTSTATUS __stdcall LsarLookupNames( + NTSTATUS + __stdcall + LsarLookupNames( [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, @@ -705,7 +735,9 @@ interface lsarpc [in, out] DWORD *MappedCount); /* Function 15 */ - NTSTATUS __stdcall LsarLookupSids( + NTSTATUS + __stdcall + LsarLookupSids( [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -714,89 +746,119 @@ interface lsarpc [in, out] DWORD *MappedCount); /* Function 16 */ - NTSTATUS __stdcall LsarCreateSecret( + NTSTATUS + __stdcall + LsarCreateSecret( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING SecretName, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *SecretHandle); /* Function 17 */ - NTSTATUS __stdcall LsarOpenAccount( + NTSTATUS + __stdcall + LsarOpenAccount( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *AccountHandle); /* Function 18 */ - NTSTATUS __stdcall LsarEnumeratePrivilegesAccount( + NTSTATUS + __stdcall + LsarEnumeratePrivilegesAccount( [in] LSAPR_HANDLE AccountHandle, [out] PLSAPR_PRIVILEGE_SET *Privileges); /* Function 19 */ - NTSTATUS __stdcall LsarAddPrivilegesToAccount( + NTSTATUS + __stdcall + LsarAddPrivilegesToAccount( [in] LSAPR_HANDLE AccountHandle, [in] PLSAPR_PRIVILEGE_SET Privileges); /* Function 20 */ - NTSTATUS __stdcall LsarRemovePrivilegesFromAccount( + NTSTATUS + __stdcall + LsarRemovePrivilegesFromAccount( [in] LSAPR_HANDLE AccountHandle, [in] BOOLEAN AllPrivileges, [in, unique] PLSAPR_PRIVILEGE_SET Privileges); /* Function 21 */ - NTSTATUS __stdcall LsarGetQuotasForAccount( + NTSTATUS + __stdcall + LsarGetQuotasForAccount( [in] LSAPR_HANDLE AccountHandle, [out] PQUOTA_LIMITS QuotaLimits); /* Function 22 */ - NTSTATUS __stdcall LsarSetQuotasForAccount( + NTSTATUS + __stdcall + LsarSetQuotasForAccount( [in] LSAPR_HANDLE AccountHandle, [in] PQUOTA_LIMITS QuotaLimits); /* Function 23 */ - NTSTATUS __stdcall LsarGetSystemAccessAccount( + NTSTATUS + __stdcall + LsarGetSystemAccessAccount( [in] LSAPR_HANDLE AccountHandle, [out] ACCESS_MASK *SystemAccess); /* Function 24 */ - NTSTATUS __stdcall LsarSetSystemAccessAccount( + NTSTATUS + __stdcall + LsarSetSystemAccessAccount( [in] LSAPR_HANDLE AccountHandle, [in] ACCESS_MASK SystemAccess); /* Function 25 */ - NTSTATUS __stdcall LsarOpenTrustedDomain( + NTSTATUS + __stdcall + LsarOpenTrustedDomain( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *TrustedDomainHandle); /* Function 26 */ - NTSTATUS __stdcall LsarQueryInfoTrustedDomain( + NTSTATUS + __stdcall + LsarQueryInfoTrustedDomain( [in] LSAPR_HANDLE TrustedDomainHandle, [in] TRUSTED_INFORMATION_CLASS InformationClass, [out, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation); /* Function 27 */ - NTSTATUS __stdcall LsarSetInformationTrustedDomain( + NTSTATUS + __stdcall + LsarSetInformationTrustedDomain( [in] LSAPR_HANDLE TrustedDomainHandle, [in] TRUSTED_INFORMATION_CLASS InformationClass, [in, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation); /* Function 28 */ - NTSTATUS __stdcall LsarOpenSecret( + NTSTATUS + __stdcall + LsarOpenSecret( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING SecretName, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *SecretHandle); /* Function 29 */ - NTSTATUS __stdcall LsarSetSecret( + NTSTATUS + __stdcall + LsarSetSecret( [in] LSAPR_HANDLE SecretHandle, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedOldValue); /* Function 30 */ - NTSTATUS __stdcall LsarQuerySecret( + NTSTATUS + __stdcall + LsarQuerySecret( [in] LSAPR_HANDLE SecretHandle, [in, out, unique] PLSAPR_CR_CIPHER_VALUE *EncryptedCurrentValue, [in, out, unique] PLARGE_INTEGER CurrentValueSetTime, @@ -804,19 +866,25 @@ interface lsarpc [in, out, unique] PLARGE_INTEGER OldValueSetTime); /* Function 31 */ - NTSTATUS __stdcall LsarLookupPrivilegeValue( + NTSTATUS + __stdcall + LsarLookupPrivilegeValue( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING Name, [out] PLUID Value); /* Function 32 */ - NTSTATUS __stdcall LsarLookupPrivilegeName( + NTSTATUS + __stdcall + LsarLookupPrivilegeName( [in] LSAPR_HANDLE PolicyHandle, [in] PLUID Value, [out] PRPC_UNICODE_STRING *Name); /* Function 33 */ - NTSTATUS __stdcall LsarLookupPrivilegeDisplayName( + NTSTATUS + __stdcall + LsarLookupPrivilegeDisplayName( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING Name, [in] USHORT ClientLanguage, @@ -825,76 +893,100 @@ interface lsarpc [out] USHORT *LanguageReturned); /* Function 34 */ - NTSTATUS __stdcall LsarDeleteObject( + NTSTATUS + __stdcall + LsarDeleteObject( [in, out] LSAPR_HANDLE *ObjectHandle); cpp_quote("#if _WIN32_WINNT >= 0x0351") /* Function 35 */ - NTSTATUS __stdcall LsarEnumerateAccountsWithUserRight( + NTSTATUS + __stdcall + LsarEnumerateAccountsWithUserRight( [in] LSAPR_HANDLE PolicyHandle, [in, unique] PRPC_UNICODE_STRING UserRight, [out] PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer); /* Function 36 */ - NTSTATUS __stdcall LsarEnumerateAccountRights( + NTSTATUS + __stdcall + LsarEnumerateAccountRights( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [out] PLSAPR_USER_RIGHT_SET UserRights); /* Function 37 */ - NTSTATUS __stdcall LsarAddAccountRights( + NTSTATUS + __stdcall + LsarAddAccountRights( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] PLSAPR_USER_RIGHT_SET UserRights); /* Function 38 */ - NTSTATUS __stdcall LsarRemoveAccountRights( + NTSTATUS + __stdcall + LsarRemoveAccountRights( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] BOOLEAN AllRights, [in] PLSAPR_USER_RIGHT_SET UserRights); /* Function 39 */ - NTSTATUS __stdcall LsarQueryTrustedDomainInfo( + NTSTATUS + __stdcall + LsarQueryTrustedDomainInfo( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid, [in] TRUSTED_INFORMATION_CLASS InformationClass, [out, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation); /* Function 40 */ - NTSTATUS __stdcall LsarSetTrustedDomainInfo( + NTSTATUS + __stdcall + LsarSetTrustedDomainInfo( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid, [in] TRUSTED_INFORMATION_CLASS InformationClass, [in, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation); /* Function 41 */ - NTSTATUS __stdcall LsarDeleteTrustedDomain( + NTSTATUS + __stdcall + LsarDeleteTrustedDomain( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid); /* Function 42 */ - NTSTATUS __stdcall LsarStorePrivateData( + NTSTATUS + __stdcall + LsarStorePrivateData( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING KeyName, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedData); /* Function 43 */ - NTSTATUS __stdcall LsarRetrievePrivateData( + NTSTATUS + __stdcall + LsarRetrievePrivateData( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING KeyName, [in, out] PLSAPR_CR_CIPHER_VALUE *EncryptedData); /* Function 44 */ - NTSTATUS __stdcall LsarOpenPolicy2( + NTSTATUS + __stdcall + LsarOpenPolicy2( [in, unique, string] PLSAPR_SERVER_NAME SystemName, [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *PolicyHandle); /* Function 45 */ - NTSTATUS __stdcall LsarGetUserName( + NTSTATUS + __stdcall + LsarGetUserName( [in, unique, string] PLSAPR_SERVER_NAME SystemName, [in, out] PRPC_UNICODE_STRING *UserName, [in, out, unique] PRPC_UNICODE_STRING *DomainName); @@ -902,40 +994,52 @@ cpp_quote("#if _WIN32_WINNT >= 0x0351") cpp_quote("#if _WIN32_WINNT >= 0x0500") /* Function 46 */ - NTSTATUS __stdcall LsarQueryInformationPolicy2( + NTSTATUS + __stdcall + LsarQueryInformationPolicy2( [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [out, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION *PolicyInformation); /* Function 47 */ - NTSTATUS __stdcall LsarSetInformationPolicy2( + NTSTATUS + __stdcall + LsarSetInformationPolicy2( [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [in, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION PolicyInformation); /* Function 48 */ - NTSTATUS __stdcall LsarQueryTrustedDomainInfoByName( + NTSTATUS + __stdcall + LsarQueryTrustedDomainInfoByName( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING TrustedDomainName, [in] POLICY_INFORMATION_CLASS InformationClass, [out, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO *PolicyInformation); /* Function 49 */ - NTSTATUS __stdcall LsarSetTrustedDomainInfoByName( + NTSTATUS + __stdcall + LsarSetTrustedDomainInfoByName( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING TrustedDomainName, [in] POLICY_INFORMATION_CLASS InformationClass, [in, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO PolicyInformation); /* Function 50 */ - NTSTATUS __stdcall LsarEnumerateTrustedDomainsEx( + NTSTATUS + __stdcall + LsarEnumerateTrustedDomainsEx( [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_TRUSTED_ENUM_BUFFER_EX EnumerationBuffer, [in] DWORD PreferedMaximumLength); /* Function 51 */ - NTSTATUS __stdcall LsarCreateTrustedDomainEx( + NTSTATUS + __stdcall + LsarCreateTrustedDomainEx( [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, [in] PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION AuthentificationInformation, @@ -943,34 +1047,46 @@ cpp_quote("#if _WIN32_WINNT >= 0x0500") [out] LSAPR_HANDLE *TrustedDomainHandle); /* Function 52 */ - NTSTATUS __stdcall LsarSetPolicyReplicationHandle( + NTSTATUS + __stdcall + LsarSetPolicyReplicationHandle( [in, out] PLSAPR_HANDLE PolicyHandle); /* Function 53 */ - NTSTATUS __stdcall LsarQueryDomainInformationPolicy( + NTSTATUS + __stdcall + LsarQueryDomainInformationPolicy( [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [out, switch_is(InformationClass)] PLSAPR_POLICY_DOMAIN_INFORMATION *PolicyInformation); /* Function 54 */ - NTSTATUS __stdcall LsarSetDomainInformationPolicy( + NTSTATUS + __stdcall + LsarSetDomainInformationPolicy( [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [in, switch_is(InformationClass)] PLSAPR_POLICY_DOMAIN_INFORMATION PolicyInformation); /* Function 55 */ - NTSTATUS __stdcall LsarOpenTrustedDomainByName( + NTSTATUS + __stdcall + LsarOpenTrustedDomainByName( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING TrustedDomainName, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *TrustedDomainHandle); /* Function 56 */ - NTSTATUS __stdcall LsarTestCall( + NTSTATUS + __stdcall + LsarTestCall( [in] handle_t hBinding); /* FIXME */ /* Function 57 */ - NTSTATUS __stdcall LsarLookupSids2( + NTSTATUS + __stdcall + LsarLookupSids2( [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -981,7 +1097,9 @@ cpp_quote("#if _WIN32_WINNT >= 0x0500") [in] DWORD ClientRevision); /* Function 58 */ - NTSTATUS __stdcall LsarLookupNames2( + NTSTATUS + __stdcall + LsarLookupNames2( [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, @@ -993,7 +1111,9 @@ cpp_quote("#if _WIN32_WINNT >= 0x0500") [in] DWORD ClientRevision); /* Function 59 */ - NTSTATUS __stdcall LsarCreateTrustedDomainEx2( + NTSTATUS + __stdcall + LsarCreateTrustedDomainEx2( [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, [in] PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL AuthentificationInformation, @@ -1003,23 +1123,33 @@ cpp_quote("#if _WIN32_WINNT >= 0x0500") cpp_quote("#if _WIN32_WINNT >= 0x0501") /* Function 60 */ - NTSTATUS __stdcall CredrWrite( + NTSTATUS + __stdcall + CredrWrite( [in] handle_t hBinding); /* FIXME */ /* Function 61 */ - NTSTATUS __stdcall CredrRead( + NTSTATUS + __stdcall + CredrRead( [in] handle_t hBinding); /* FIXME */ /* Function 62 */ - NTSTATUS __stdcall CredrEnumerate( + NTSTATUS + __stdcall + CredrEnumerate( [in] handle_t hBinding); /* FIXME */ /* Function 63 */ - NTSTATUS __stdcall CredrWriteDomainCredentials( + NTSTATUS + __stdcall + CredrWriteDomainCredentials( [in] handle_t hBinding); /* FIXME */ /* Function 64 */ - NTSTATUS __stdcall CredrReadDomainCredentials( + NTSTATUS + __stdcall + CredrReadDomainCredentials( [in] handle_t hBinding); /* FIXME */ /* Function 65 */ @@ -1047,7 +1177,9 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501") [in] handle_t hBinding); /* FIXME */ /* Function 68 */ - NTSTATUS __stdcall LsarLookupNames3( + NTSTATUS + __stdcall + LsarLookupNames3( [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, @@ -1067,26 +1199,36 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501") [out, size_is(MaximumPersistCount)] DWORD *MaximumPersist); /* FIXME */ /* Function 70 */ - NTSTATUS __stdcall LsarRegisterAuditEvent( + NTSTATUS + __stdcall + LsarRegisterAuditEvent( [in] handle_t hBinding); /* FIXME */ /* Function 71 */ - NTSTATUS __stdcall LsarGenAuditEvent( + NTSTATUS + __stdcall + LsarGenAuditEvent( [in] handle_t hBinding); /* FIXME */ /* Function 72 */ - NTSTATUS __stdcall LsarUnregisterAuditEvent( + NTSTATUS + __stdcall + LsarUnregisterAuditEvent( [in] handle_t hBinding); /* FIXME */ /* Function 73 */ - NTSTATUS __stdcall LsarQueryForestTrustInformation( + NTSTATUS + __stdcall + LsarQueryForestTrustInformation( [in] LSAPR_HANDLE PolicyHandle, [in] PLSA_UNICODE_STRING TrustedDomainName, [in] LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, [out] PLSA_FOREST_TRUST_INFORMATION *ForestTrustInfo); /* Function 74 */ - NTSTATUS __stdcall LsarSetForestTrustInformation( + NTSTATUS + __stdcall + LsarSetForestTrustInformation( [in] LSAPR_HANDLE PolicyHandle, [in] PLSA_UNICODE_STRING TrustedDomainName, [in] LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, @@ -1105,7 +1247,9 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501") [in] DWORD Flags); /* FIXME */ /* Function 76 */ - NTSTATUS __stdcall LsarLookupSids3( + NTSTATUS + __stdcall + LsarLookupSids3( [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -1116,7 +1260,9 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501") [in] DWORD ClientRevision); /* Function 77 */ - NTSTATUS __stdcall LsarLookupNames4( + NTSTATUS + __stdcall + LsarLookupNames4( [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, @@ -1128,22 +1274,30 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501") [in] DWORD ClientRevision); /* Function 78 */ - NTSTATUS __stdcall LsarOpenPolicySce( + NTSTATUS + __stdcall + LsarOpenPolicySce( [in, unique] PLSAPR_SERVER_NAME SystemName, [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *PolicyHandle); /* Function 79 */ - NTSTATUS __stdcall LsarAdtRegisterSecurityEventSource( + NTSTATUS + __stdcall + LsarAdtRegisterSecurityEventSource( [in] handle_t hBinding); /* FIXME */ /* Function 80 */ - NTSTATUS __stdcall LsarAdtUnregisterSecurityEventSource( + NTSTATUS + __stdcall + LsarAdtUnregisterSecurityEventSource( [in] handle_t hBinding); /* FIXME */ /* Function 81 */ - NTSTATUS __stdcall LsarAdtReportSecurityEvent( + NTSTATUS + __stdcall + LsarAdtReportSecurityEvent( [in] handle_t hBinding); /* FIXME */ cpp_quote("#endif /* _WIN32_WINNT >= 0x0501 */") diff --git a/sdk/include/reactos/idl/wkssvc.idl b/sdk/include/reactos/idl/wkssvc.idl index 32568a4138..fb5d86ce32 100644 --- a/sdk/include/reactos/idl/wkssvc.idl +++ b/sdk/include/reactos/idl/wkssvc.idl @@ -361,7 +361,7 @@ interface wkssvc /* Function 0 */ unsigned long __stdcall - NetrWkstaGetInfo ( + NetrWkstaGetInfo( [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, [in] unsigned long Level, [out, switch_is(Level)] LPWKSTA_INFO WkstaInfo); @@ -369,7 +369,7 @@ interface wkssvc /* Function 1 */ unsigned long __stdcall - NetrWkstaSetInfo ( + NetrWkstaSetInfo( [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, [in] unsigned long Level, [in, switch_is(Level)] LPWKSTA_INFO WkstaInfo, @@ -378,7 +378,7 @@ interface wkssvc /* Function 2 */ unsigned long __stdcall - NetrWkstaUserEnum ( + NetrWkstaUserEnum( [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, [in, out] LPWKSTA_USER_ENUM_STRUCT UserInfo, [in] unsigned long PreferredMaximumLength, @@ -396,7 +396,7 @@ interface wkssvc /* Function 4 */ unsigned long __stdcall - NetrWkstaUserSetInfo ( + NetrWkstaUserSetInfo( [in, string, unique] WKSSVC_IDENTIFY_HANDLE Unused, [in] unsigned long Level, [in, switch_is(Level)] LPWKSTA_USER_INFO UserInfo, @@ -405,7 +405,7 @@ interface wkssvc /* Function 5 */ unsigned long __stdcall - NetrWkstaTransportEnum ( + NetrWkstaTransportEnum( [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, [in, out] LPWKSTA_TRANSPORT_ENUM_STRUCT TransportInfo, [in] unsigned long PreferredMaximumLength, @@ -415,7 +415,7 @@ interface wkssvc /* Function 6 */ unsigned long __stdcall - NetrWkstaTransportAdd ( + NetrWkstaTransportAdd( [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, [in] unsigned long Level, [in] LPWKSTA_TRANSPORT_INFO_0 TransportInfo, @@ -424,7 +424,7 @@ interface wkssvc /* Function 7 */ unsigned long __stdcall - NetrWkstaTransportDel ( + NetrWkstaTransportDel( [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, [in, string, unique] wchar_t *TransportName, [in] unsigned long ForceLevel); @@ -432,7 +432,7 @@ interface wkssvc /* Function 8 */ unsigned long __stdcall - NetrUseAdd ( + NetrUseAdd( [in, string, unique] WKSSVC_IMPERSONATE_HANDLE ServerName, [in] unsigned long Level, [in, switch_is(Level)] LPUSE_INFO InfoStruct, @@ -441,7 +441,7 @@ interface wkssvc /* Function 9 */ unsigned long __stdcall - NetrUseGetInfo ( + NetrUseGetInfo( [in, string, unique] WKSSVC_IMPERSONATE_HANDLE ServerName, [in, string] wchar_t *UseName, [in] unsigned long Level, @@ -450,7 +450,7 @@ interface wkssvc /* Function 10 */ unsigned long __stdcall - NetrUseDel ( + NetrUseDel( [in, string, unique] WKSSVC_IMPERSONATE_HANDLE ServerName, [in, string] wchar_t *UseName, [in] unsigned long ForceLevel); @@ -458,7 +458,7 @@ interface wkssvc /* Function 11 */ unsigned long __stdcall - NetrUseEnum ( + NetrUseEnum( [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, [in, out] LPUSE_ENUM_STRUCT InfoStruct, [in] unsigned long PreferredMaximumLength,

1 0

01/02: [IDL] Fix coding style and indentation
by Eric Kohl 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc08438c7ae308ca997ff… commit bc08438c7ae308ca997ffd3143cf8b959c08178e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Oct 27 15:48:21 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Oct 27 15:48:21 2018 +0200 [IDL] Fix coding style and indentation --- sdk/include/reactos/idl/browser.idl | 8 +-- sdk/include/reactos/idl/pnp.idl | 2 +- sdk/include/reactos/idl/sam.idl | 108 +++++++++++++++++++----------------- 3 files changed, 62 insertions(+), 56 deletions(-) diff --git a/sdk/include/reactos/idl/browser.idl b/sdk/include/reactos/idl/browser.idl index a949ad0f0f..a38790471b 100644 --- a/sdk/include/reactos/idl/browser.idl +++ b/sdk/include/reactos/idl/browser.idl @@ -161,9 +161,9 @@ interface browser NET_API_STATUS __stdcall I_BrowserrQueryOtherDomains( - [in, string, unique] BROWSER_IDENTIFY_HANDLE ServerName, - [in, out] LPSERVER_ENUM_STRUCT EnumStruct, - [out] LPDWORD TotalEntries); + [in, string, unique] BROWSER_IDENTIFY_HANDLE ServerName, + [in, out] LPSERVER_ENUM_STRUCT EnumStruct, + [out] LPDWORD TotalEntries); /* Function 3 */ NET_API_STATUS @@ -189,7 +189,7 @@ interface browser NET_API_STATUS __stdcall I_BrowserrResetStatistics( - [in, string, unique] BROWSER_IDENTIFY_HANDLE ServerName); + [in, string, unique] BROWSER_IDENTIFY_HANDLE ServerName); /* Function 7 (NetrBrowserStatisticsClear) */ NET_API_STATUS diff --git a/sdk/include/reactos/idl/pnp.idl b/sdk/include/reactos/idl/pnp.idl index 2839017e03..844c694c1a 100644 --- a/sdk/include/reactos/idl/pnp.idl +++ b/sdk/include/reactos/idl/pnp.idl @@ -847,7 +847,7 @@ interface pnp __stdcall PNP_QueryArbitratorFreeData( [in] handle_t hBinding, - [out,size_is(DataLen)] BYTE *pData, + [out, size_is(DataLen)] BYTE *pData, [in] DWORD DataLen, [in, string, ref] LPWSTR pDeviceID, [in] RESOURCEID ResourceID, diff --git a/sdk/include/reactos/idl/sam.idl b/sdk/include/reactos/idl/sam.idl index ba43697a7c..89283c8dd2 100644 --- a/sdk/include/reactos/idl/sam.idl +++ b/sdk/include/reactos/idl/sam.idl @@ -852,7 +852,7 @@ interface samr NTSTATUS __stdcall SamrCloseHandle( - [in,out] SAMPR_HANDLE *SamHandle); + [in, out] SAMPR_HANDLE *SamHandle); /* Function 2 */ NTSTATUS @@ -889,7 +889,7 @@ interface samr __stdcall SamrEnumerateDomainsInSamServer( [in] SAMPR_HANDLE ServerHandle, - [in,out] unsigned long *EnumerationContext, + [in, out] unsigned long *EnumerationContext, [out] PSAMPR_ENUMERATION_BUFFER *Buffer, [in] unsigned long PreferedMaximumLength, [out] unsigned long *CountReturned); @@ -934,7 +934,7 @@ interface samr __stdcall SamrEnumerateGroupsInDomain( [in] SAMPR_HANDLE DomainHandle, - [in,out] unsigned long *EnumerationContext, + [in, out] unsigned long *EnumerationContext, [out] PSAMPR_ENUMERATION_BUFFER *Buffer, [in] unsigned long PreferedMaximumLength, [out] unsigned long *CountReturned); @@ -942,55 +942,61 @@ interface samr /* Function 12 */ NTSTATUS __stdcall - SamrCreateUserInDomain([in] SAMPR_HANDLE DomainHandle, - [in] PRPC_UNICODE_STRING Name, - [in] ACCESS_MASK DesiredAccess, - [out] SAMPR_HANDLE *UserHandle, - [out] unsigned long *RelativeId); + SamrCreateUserInDomain( + [in] SAMPR_HANDLE DomainHandle, + [in] PRPC_UNICODE_STRING Name, + [in] ACCESS_MASK DesiredAccess, + [out] SAMPR_HANDLE *UserHandle, + [out] unsigned long *RelativeId); /* Function 13 */ NTSTATUS __stdcall - SamrEnumerateUsersInDomain([in] SAMPR_HANDLE DomainHandle, - [in,out] unsigned long *EnumerationContext, - [in] unsigned long UserAccountControl, - [out] PSAMPR_ENUMERATION_BUFFER *Buffer, - [in] unsigned long PreferedMaximumLength, - [out] unsigned long *CountReturned); + SamrEnumerateUsersInDomain( + [in] SAMPR_HANDLE DomainHandle, + [in, out] unsigned long *EnumerationContext, + [in] unsigned long UserAccountControl, + [out] PSAMPR_ENUMERATION_BUFFER *Buffer, + [in] unsigned long PreferedMaximumLength, + [out] unsigned long *CountReturned); /* Function 14 */ NTSTATUS __stdcall - SamrCreateAliasInDomain([in] SAMPR_HANDLE DomainHandle, - [in] PRPC_UNICODE_STRING AccountName, - [in] ACCESS_MASK DesiredAccess, - [out] SAMPR_HANDLE *AliasHandle, - [out] unsigned long *RelativeId); + SamrCreateAliasInDomain( + [in] SAMPR_HANDLE DomainHandle, + [in] PRPC_UNICODE_STRING AccountName, + [in] ACCESS_MASK DesiredAccess, + [out] SAMPR_HANDLE *AliasHandle, + [out] unsigned long *RelativeId); /* Function 15 */ NTSTATUS __stdcall - SamrEnumerateAliasesInDomain([in] SAMPR_HANDLE DomainHandle, - [in,out] unsigned long *EnumerationContext, - [out] PSAMPR_ENUMERATION_BUFFER *Buffer, - [in] unsigned long PreferedMaximumLength, - [out] unsigned long *CountReturned); + SamrEnumerateAliasesInDomain( + [in] SAMPR_HANDLE DomainHandle, + [in, out] unsigned long *EnumerationContext, + [out] PSAMPR_ENUMERATION_BUFFER *Buffer, + [in] unsigned long PreferedMaximumLength, + [out] unsigned long *CountReturned); /* Function 16 */ NTSTATUS __stdcall - SamrGetAliasMembership([in] SAMPR_HANDLE DomainHandle, - [in] PSAMPR_PSID_ARRAY SidArray, - [out] PSAMPR_ULONG_ARRAY Membership); + SamrGetAliasMembership( + [in] SAMPR_HANDLE DomainHandle, + [in] PSAMPR_PSID_ARRAY SidArray, + [out] PSAMPR_ULONG_ARRAY Membership); /* Function 17 */ NTSTATUS __stdcall - SamrLookupNamesInDomain([in] SAMPR_HANDLE DomainHandle, - [in, range(0, 1000)] unsigned long Count, - [in, size_is(1000), length_is(Count)] RPC_UNICODE_STRING Names[*], - [out] PSAMPR_ULONG_ARRAY RelativeIds, - [out] PSAMPR_ULONG_ARRAY Use); + SamrLookupNamesInDomain( + [in] SAMPR_HANDLE DomainHandle, + [in, range(0, 1000)] unsigned long Count, + [in, size_is(1000), length_is(Count)] RPC_UNICODE_STRING Names[*], + [out] PSAMPR_ULONG_ARRAY RelativeIds, + [out] PSAMPR_ULONG_ARRAY Use); /* Function 18 */ NTSTATUS @@ -1039,7 +1045,7 @@ interface samr NTSTATUS __stdcall SamrDeleteGroup( - [in,out] SAMPR_HANDLE *GroupHandle); + [in, out] SAMPR_HANDLE *GroupHandle); /* Function 24 */ NTSTATUS @@ -1299,37 +1305,37 @@ interface samr __stdcall SamrOemChangePasswordUser2( [in] handle_t BindingHandle, - [in,unique] PRPC_STRING ServerName, + [in, unique] PRPC_STRING ServerName, [in] PRPC_STRING UserName, - [in,unique] PSAMPR_ENCRYPTED_USER_PASSWORD NewPasswordEncryptedWithOldLm, - [in,unique] PENCRYPTED_LM_OWF_PASSWORD OldLmOwfPasswordEncryptedWithNewLm); + [in, unique] PSAMPR_ENCRYPTED_USER_PASSWORD NewPasswordEncryptedWithOldLm, + [in, unique] PENCRYPTED_LM_OWF_PASSWORD OldLmOwfPasswordEncryptedWithNewLm); /* Function 55 */ NTSTATUS __stdcall SamrUnicodeChangePasswordUser2( [in] handle_t BindingHandle, - [in,unique] PRPC_UNICODE_STRING ServerName, + [in, unique] PRPC_UNICODE_STRING ServerName, [in] PRPC_UNICODE_STRING UserName, - [in,unique] PSAMPR_ENCRYPTED_USER_PASSWORD NewPasswordEncryptedWithOldNt, - [in,unique] PENCRYPTED_NT_OWF_PASSWORD OldNtOwfPasswordEncryptedWithNewNt, + [in, unique] PSAMPR_ENCRYPTED_USER_PASSWORD NewPasswordEncryptedWithOldNt, + [in, unique] PENCRYPTED_NT_OWF_PASSWORD OldNtOwfPasswordEncryptedWithNewNt, [in] unsigned char LmPresent, - [in,unique] PSAMPR_ENCRYPTED_USER_PASSWORD NewPasswordEncryptedWithOldLm, - [in,unique] PENCRYPTED_LM_OWF_PASSWORD OldLmOwfPasswordEncryptedWithNewNt); + [in, unique] PSAMPR_ENCRYPTED_USER_PASSWORD NewPasswordEncryptedWithOldLm, + [in, unique] PENCRYPTED_LM_OWF_PASSWORD OldLmOwfPasswordEncryptedWithNewNt); /* Function 56 */ NTSTATUS __stdcall SamrGetDomainPasswordInformation( [in] handle_t BindingHandle, - [in,unique] PRPC_UNICODE_STRING Unused, + [in, unique] PRPC_UNICODE_STRING Unused, [out] PUSER_DOMAIN_PASSWORD_INFORMATION PasswordInformation); /* Function 57 */ NTSTATUS __stdcall SamrConnect2( - [in,unique,string] PSAMPR_SERVER_NAME ServerName, + [in, unique, string] PSAMPR_SERVER_NAME ServerName, [out] SAMPR_HANDLE *ServerHandle, [in] ACCESS_MASK DesiredAccess); @@ -1363,7 +1369,7 @@ interface samr NTSTATUS __stdcall SamrConnect4( - [in,unique,string] PSAMPR_SERVER_NAME ServerName, + [in, unique, string] PSAMPR_SERVER_NAME ServerName, [out] SAMPR_HANDLE *ServerHandle, [in] unsigned long ClientRevision, [in] ACCESS_MASK DesiredAccess); @@ -1378,12 +1384,12 @@ interface samr NTSTATUS __stdcall SamrConnect5( - [in,unique,string] PSAMPR_SERVER_NAME ServerName, + [in, unique, string] PSAMPR_SERVER_NAME ServerName, [in] ACCESS_MASK DesiredAccess, [in] unsigned long InVersion, - [in,switch_is(InVersion)] SAMPR_REVISION_INFO *InRevisionInfo, + [in, switch_is(InVersion)] SAMPR_REVISION_INFO *InRevisionInfo, [out] unsigned long *OutVersion, - [out,switch_is(*OutVersion)] SAMPR_REVISION_INFO *OutRevisionInfo, + [out, switch_is(*OutVersion)] SAMPR_REVISION_INFO *OutRevisionInfo, [out] SAMPR_HANDLE *ServerHandle); /* Function 65 */ @@ -1399,9 +1405,9 @@ interface samr __stdcall SamrSetDSRMPassword( [in] handle_t BindingHandle, - [in,unique] PRPC_UNICODE_STRING Unused, + [in, unique] PRPC_UNICODE_STRING Unused, [in] unsigned long UserId, - [in,unique] PENCRYPTED_NT_OWF_PASSWORD EncryptedNtOwfPassword); + [in, unique] PENCRYPTED_NT_OWF_PASSWORD EncryptedNtOwfPassword); /* Function 67 */ NTSTATUS @@ -1409,6 +1415,6 @@ interface samr SamrValidatePassword( [in] handle_t Handle, [in] PASSWORD_POLICY_VALIDATION_TYPE ValidationType, - [in,switch_is(ValidationType)] PSAM_VALIDATE_INPUT_ARG InputArg, - [out,switch_is(ValidationType)] PSAM_VALIDATE_OUTPUT_ARG *OutputArg); + [in, switch_is(ValidationType)] PSAM_VALIDATE_INPUT_ARG InputArg, + [out, switch_is(ValidationType)] PSAM_VALIDATE_OUTPUT_ARG *OutputArg); }

1 0

01/01: [WIN32SS][USER32] Simplify CloseWindow (#986)
by Katayama Hirofumi MZ 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a9fe2b1bf5e40c0053e3… commit 3a9fe2b1bf5e40c0053e370b97428ac78186637d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 27 21:16:02 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 27 21:16:02 2018 +0900 [WIN32SS][USER32] Simplify CloseWindow (#986) --- win32ss/user/user32/windows/window.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index 1f8f5ca4cf..cad886129b 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -127,9 +127,7 @@ ChildWindowFromPointEx(HWND hwndParent, BOOL WINAPI CloseWindow(HWND hWnd) { - PostMessageW(hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); - - return ValidateHwnd(hWnd) != NULL; + return PostMessageW(hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); } FORCEINLINE

1 0

03/03: [BROWSEUI] CInternetToolbar: fix whitespace
by Giannis Adamopoulos 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e69213448d93c590fd5f0… commit e69213448d93c590fd5f061de9aaf94d1b4594f6 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Oct 27 15:01:54 2018 +0300 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Oct 27 15:08:31 2018 +0300 [BROWSEUI] CInternetToolbar: fix whitespace --- dll/win32/browseui/internettoolbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index 705739cd47..a48efd61e2 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -1116,7 +1116,7 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::QueryStatus(const GUID *pguidCmdGrou case ITID_TOOLBARBANDSHOWN: // toolbar visibility prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; if (IsBandVisible(ITBBID_TOOLSBAND) == S_OK) - prgCmds->cmdf |= OLECMDF_LATCHED; + prgCmds->cmdf |= OLECMDF_LATCHED; break; case ITID_ADDRESSBANDSHOWN: // address bar visibility prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED;

1 0

02/03: [BROWSEUI] Simplify toggling the search band In windows the toolbar itself creates the search shell extension. In ros we send a command to the CShellBrowser to let it handle it itself. Use the same command for showing and hiding it.
by Giannis Adamopoulos 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2bd9b44a9fcd1d48048b… commit a2bd9b44a9fcd1d48048bd071c4210f5e9f4b950 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Oct 27 14:01:20 2018 +0300 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Oct 27 15:08:28 2018 +0300 [BROWSEUI] Simplify toggling the search band In windows the toolbar itself creates the search shell extension. In ros we send a command to the CShellBrowser to let it handle it itself. Use the same command for showing and hiding it. --- dll/win32/browseui/internettoolbar.cpp | 9 ++------- dll/win32/browseui/shellbrowser.cpp | 18 ++++-------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index 6ea5f07393..705739cd47 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -1526,13 +1526,8 @@ LRESULT CInternetToolbar::OnUpLevel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BO LRESULT CInternetToolbar::OnSearch(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - OLECMD cmd; - cmd.cmdID = 0x1c; - IUnknown_QueryStatus(fSite, CGID_Explorer, 1, &cmd, NULL); - if (cmd.cmdf & OLECMDF_LATCHED) - return IUnknown_Exec(fSite, CGID_Explorer, 0x1c, 1, NULL, NULL); - else - return IUnknown_Exec(fSite, CLSID_CommonButtons, 0x123, 1, NULL, NULL); + IUnknown_Exec(fSite, CGID_Explorer, 0x1c, 1, NULL, NULL); + return 1; } LRESULT CInternetToolbar::OnFolders(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index b1d3902850..72421a456e 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -2020,6 +2020,10 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::Exec(const GUID *pguidCmdGroup, DWORD n memset(&fCurrentVertBar, 0, sizeof(fCurrentVertBar)); FireCommandStateChangeAll(); } + else + { + OnSearch(); + } return S_OK; case 0x1d: //Toggle History case 0x1e: //Toggle Favorites @@ -2140,20 +2144,6 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::Exec(const GUID *pguidCmdGroup, DWORD n break; } } - else if (IsEqualIID(*pguidCmdGroup, CLSID_CommonButtons)) - { - // Windows seems to use this as proxy for toolbar buttons. - // We use it for search band for now to remove code duplication, - // let's see if it could be useful in the future. - switch (nCmdID) - { - case 0x123: - // Show search band from toolbar - OnSearch(); - return S_OK; - } - return E_NOTIMPL; - } else { return E_NOTIMPL;

1 0

01/03: [BROWSEUI] Implement toggling the folders and search band with the toolbar and make their buttons appear pressed when they are shown. CBaseBarSite: Ask the CBaseBar to close itself when the x button is pressed. CBaseBar: Hide the bar and inform its site that it is closing when it gets the close command. CShellBrowser: Cache the guid of the current vertical bar and use it to report correct command status to the toolbar. Also implement toggling the Folders, Favorites, History and search com
by Giannis Adamopoulos 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0c5cafce58dfd8d248fb… commit a0c5cafce58dfd8d248fb596bf816ed754c4280f Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Oct 27 11:52:04 2018 +0300 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Oct 27 15:08:24 2018 +0300 [BROWSEUI] Implement toggling the folders and search band with the toolbar and make their buttons appear pressed when they are shown. CBaseBarSite: Ask the CBaseBar to close itself when the x button is pressed. CBaseBar: Hide the bar and inform its site that it is closing when it gets the close command. CShellBrowser: Cache the guid of the current vertical bar and use it to report correct command status to the toolbar. Also implement toggling the Folders, Favorites, History and search commands. CInternetToolbar: Query the Folders and Search command status from the site so that they can be properly be shown as pressed. --- dll/win32/browseui/basebarsite.cpp | 11 +----- dll/win32/browseui/internettoolbar.cpp | 32 +++++++++++++++- dll/win32/browseui/internettoolbar.h | 1 + dll/win32/browseui/shellbars/CBaseBar.cpp | 9 +++++ dll/win32/browseui/shellbrowser.cpp | 64 +++++++++++++++++++++++++++++-- 5 files changed, 103 insertions(+), 14 deletions(-) diff --git a/dll/win32/browseui/basebarsite.cpp b/dll/win32/browseui/basebarsite.cpp index 8d2675d996..292d897e87 100644 --- a/dll/win32/browseui/basebarsite.cpp +++ b/dll/win32/browseui/basebarsite.cpp @@ -692,17 +692,10 @@ LRESULT CBaseBarSite::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bH LRESULT CBaseBarSite::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - HRESULT hResult; - CComPtr<IDockingWindow> parentSite; - if (HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDM_BASEBAR_CLOSE) { - hResult = fDeskBarSite->QueryInterface(IID_PPV_ARG(IDockingWindow, &parentSite)); - if (!SUCCEEDED(hResult)) - { - return E_FAIL; - } - parentSite->ShowDW(FALSE); + /* Tell the base bar to hide */ + IUnknown_Exec(fDeskBarSite, IID_IDeskBarClient, 0, 0, NULL, NULL); bHandled = TRUE; } return 0; diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index ca043486e5..6ea5f07393 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -749,6 +749,16 @@ HRESULT CInternetToolbar::LockUnlockToolbars(bool locked) return S_OK; } +HRESULT CInternetToolbar::SetState(const GUID *pguidCmdGroup, long commandID, OLECMD* pcmd) +{ + long state = 0; + if (pcmd->cmdf & OLECMDF_ENABLED) + state |= TBSTATE_ENABLED; + if (pcmd->cmdf & OLECMDF_LATCHED) + state |= TBSTATE_CHECKED; + return SetState(pguidCmdGroup, commandID, state); +} + HRESULT CInternetToolbar::CommandStateChanged(bool newValue, int commandID) { HRESULT hResult; @@ -762,6 +772,18 @@ HRESULT CInternetToolbar::CommandStateChanged(bool newValue, int commandID) // if up, QueryStatus for up state and update it // //for buttons in fCommandCategory, update with QueryStatus of fCommandTarget + + OLECMD commandList[4]; + commandList[0].cmdID = 0x1c; + commandList[1].cmdID = 0x1d; + commandList[2].cmdID = 0x1e; + commandList[3].cmdID = 0x23; + IUnknown_QueryStatus(fSite, CGID_Explorer, 4, commandList, NULL); + SetState(&CLSID_CommonButtons, gSearchCommandID, &commandList[0]); + SetState(&CLSID_CommonButtons, gFoldersCommandID, &commandList[3]); + //SetState(&CLSID_CommonButtons, gFavoritesCommandID, &commandList[2]); + //SetState(&CLSID_CommonButtons, gHistoryCommandID, &commandList[1]); + break; case 1: // forward @@ -1504,7 +1526,13 @@ LRESULT CInternetToolbar::OnUpLevel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BO LRESULT CInternetToolbar::OnSearch(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - return IUnknown_Exec(fSite, CLSID_CommonButtons, 0x123, 1, NULL, NULL); + OLECMD cmd; + cmd.cmdID = 0x1c; + IUnknown_QueryStatus(fSite, CGID_Explorer, 1, &cmd, NULL); + if (cmd.cmdf & OLECMDF_LATCHED) + return IUnknown_Exec(fSite, CGID_Explorer, 0x1c, 1, NULL, NULL); + else + return IUnknown_Exec(fSite, CLSID_CommonButtons, 0x123, 1, NULL, NULL); } LRESULT CInternetToolbar::OnFolders(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) @@ -1523,7 +1551,7 @@ LRESULT CInternetToolbar::OnForwardToCommandTarget(WORD wNotifyCode, WORD wID, H } return 1; } - + LRESULT CInternetToolbar::OnMenuDropDown(UINT idControl, NMHDR *pNMHDR, BOOL &bHandled) { CComPtr<IBrowserService> browserService; diff --git a/dll/win32/browseui/internettoolbar.h b/dll/win32/browseui/internettoolbar.h index 0c47019b98..e824df72b1 100644 --- a/dll/win32/browseui/internettoolbar.h +++ b/dll/win32/browseui/internettoolbar.h @@ -104,6 +104,7 @@ public: HRESULT CreateAndInitBandProxy(); HRESULT IsBandVisible(int BandID); HRESULT ToggleBandVisibility(int BandID); + HRESULT SetState(const GUID *pguidCmdGroup, long commandID, OLECMD* pcmd); public: // *** IInputObject specific methods *** diff --git a/dll/win32/browseui/shellbars/CBaseBar.cpp b/dll/win32/browseui/shellbars/CBaseBar.cpp index 44d2ec5d15..ebc3d06f7b 100644 --- a/dll/win32/browseui/shellbars/CBaseBar.cpp +++ b/dll/win32/browseui/shellbars/CBaseBar.cpp @@ -261,8 +261,17 @@ HRESULT STDMETHODCALLTYPE CBaseBar::Exec(const GUID *pguidCmdGroup, DWORD nCmdID switch (nCmdID) { case 0: + { // hide current band + ShowDW(0); + + // Inform our site that we closed + VARIANT var; + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = static_cast<IDeskBar *>(this); + IUnknown_Exec(fSite, CGID_Explorer, 0x22, 0, &var, NULL); break; + } case 2: // switch bands break; diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 5345ef3285..b1d3902850 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -299,6 +299,7 @@ private: CComPtr<ITravelLog> fTravelLog; HMENU fCurrentMenuBar; CABINETSTATE fCabinetState; + GUID fCurrentVertBar; //The guid of the built in vertical bar that is being shown // The next three fields support persisted history for shell views. // They do not need to be reference counted. IOleObject *fHistoryObject; @@ -1276,6 +1277,12 @@ HRESULT CShellBrowser::ShowBand(const CLSID &classID, bool vertical) if (FAILED_UNEXPECTEDLY(hResult)) return hResult; + if (vertical) + { + fCurrentVertBar = classID; + FireCommandStateChangeAll(); + } + return S_OK; } @@ -1939,15 +1946,28 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::QueryStatus(const GUID *pguidCmdGroup, { case 0x1c: // search prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; + if (IsEqualCLSID(CLSID_SH_SearchBand, fCurrentVertBar) || + IsEqualCLSID(CLSID_SearchBand, fCurrentVertBar) || + IsEqualCLSID(CLSID_IE_SearchBand, fCurrentVertBar) || + IsEqualCLSID(CLSID_FileSearchBand, fCurrentVertBar)) + { + prgCmds->cmdf |= OLECMDF_LATCHED; + } break; case 0x1d: // history prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; + if (IsEqualCLSID(CLSID_SH_HistBand, fCurrentVertBar)) + prgCmds->cmdf |= OLECMDF_LATCHED; break; case 0x1e: // favorites prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; + if (IsEqualCLSID(CLSID_SH_FavBand, fCurrentVertBar)) + prgCmds->cmdf |= OLECMDF_LATCHED; break; case 0x23: // folders - prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED | OLECMDF_LATCHED; + prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; + if (IsEqualCLSID(CLSID_ExplorerBand, fCurrentVertBar)) + prgCmds->cmdf |= OLECMDF_LATCHED; break; default: prgCmds->cmdf = 0; @@ -1990,8 +2010,46 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::Exec(const GUID *pguidCmdGroup, DWORD n { switch (nCmdID) { - case 0x23: - hResult = ShowBand(CLSID_ExplorerBand, true); + case 0x1c: //Toggle Search + if (IsEqualCLSID(CLSID_SH_SearchBand, fCurrentVertBar) || + IsEqualCLSID(CLSID_SearchBand, fCurrentVertBar) || + IsEqualCLSID(CLSID_IE_SearchBand, fCurrentVertBar) || + IsEqualCLSID(CLSID_FileSearchBand, fCurrentVertBar)) + { + hResult = IUnknown_ShowDW(fClientBars[BIVerticalBaseBar].clientBar.p, FALSE); + memset(&fCurrentVertBar, 0, sizeof(fCurrentVertBar)); + FireCommandStateChangeAll(); + } + return S_OK; + case 0x1d: //Toggle History + case 0x1e: //Toggle Favorites + case 0x23: //Toggle Folders + const GUID* pclsid; + if (nCmdID == 0x1d) pclsid = &CLSID_SH_HistBand; + else if (nCmdID == 0x1e) pclsid = &CLSID_SH_FavBand; + else pclsid = &CLSID_ExplorerBand; + + if (IsEqualCLSID(*pclsid, fCurrentVertBar)) + { + hResult = IUnknown_ShowDW(fClientBars[BIVerticalBaseBar].clientBar.p, FALSE); + memset(&fCurrentVertBar, 0, sizeof(fCurrentVertBar)); + FireCommandStateChangeAll(); + } + else + { + hResult = ShowBand(*pclsid, true); + } + return S_OK; + case 0x22: + //Sent when a band closes + if (V_VT(pvaIn) != VT_UNKNOWN) + return E_INVALIDARG; + + if (IUnknownIsEqual(V_UNKNOWN(pvaIn), fClientBars[BIVerticalBaseBar].clientBar.p)) + { + memset(&fCurrentVertBar, 0, sizeof(fCurrentVertBar)); + FireCommandStateChangeAll(); + } return S_OK; case 0x27: if (nCmdexecopt == 1)

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2018