Ros-diffs

ros-diffs@reactos.org

81390 discussions

07/13: [REACTOS] Add helpers and modify ConvertNtPathToWin32Path() to make it use a cache of NT/Win32 path mappings.
by Hermès Bélusca-Maïto 05 Nov '18

05 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c3570f9f5362309a6681… commit 7c3570f9f5362309a668172c913f2ff339e4467e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jan 9 03:21:38 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 6 00:04:30 2018 +0100 [REACTOS] Add helpers and modify ConvertNtPathToWin32Path() to make it use a cache of NT/Win32 path mappings. This increases performance for each time the SETUPLIB calls (using NT paths) Win32 SetupAPI functions which of course only accept Win32 paths. - Handle also the fact that a NT path to convert may start with \Device\HarddiskX\PartitionY\..., which can be a symlink to \Device\HarddiskVolumeN\... on some systems. In that case, the Win32 path mapping should be done slightly differently. - Add support for network mapped drives. --- base/setup/reactos/reactos.c | 198 ++++++++++++++++++++++++++++----- base/setup/reactos/reactos.h | 34 ++++++ base/setup/reactos/spapisup/fileqsup.c | 17 ++- base/setup/reactos/spapisup/infsupp.c | 3 +- 4 files changed, 220 insertions(+), 32 deletions(-) diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 626b0ad9f8..230eafa38c 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -1192,37 +1192,99 @@ BOOL LoadSetupData( return ret; } +VOID +InitNtToWin32PathMappingList( + IN OUT PNT_WIN32_PATH_MAPPING_LIST MappingList) +{ + InitializeListHead(&MappingList->List); + MappingList->MappingsCount = 0; +} + +VOID +FreeNtToWin32PathMappingList( + IN OUT PNT_WIN32_PATH_MAPPING_LIST MappingList) +{ + PLIST_ENTRY ListEntry; + PVOID Entry; + + while (!IsListEmpty(&MappingList->List)) + { + ListEntry = RemoveHeadList(&MappingList->List); + Entry = (PVOID)CONTAINING_RECORD(ListEntry, NT_WIN32_PATH_MAPPING, ListEntry); + HeapFree(ProcessHeap, 0, Entry); + } + + MappingList->MappingsCount = 0; +} + /* * Attempts to convert a pure NT file path into a corresponding Win32 path. * Adapted from GetInstallSourceWin32() in dll/win32/syssetup/wizard.c */ BOOL ConvertNtPathToWin32Path( + IN OUT PNT_WIN32_PATH_MAPPING_LIST MappingList, OUT PWSTR pwszPath, IN DWORD cchPathMax, IN PCWSTR pwszNTPath) { BOOL FoundDrive = FALSE, RetryOnce = FALSE; + PLIST_ENTRY ListEntry; + PNT_WIN32_PATH_MAPPING Entry; + PCWSTR pwszNtPathToMap = pwszNTPath; + PCWSTR pwszRemaining = NULL; DWORD cchDrives; PWCHAR pwszDrive; - PCWSTR pwszRemaining = NULL; WCHAR wszDrives[512]; WCHAR wszNTPath[MAX_PATH]; - WCHAR TargetPath[MAX_PATH] = L""; + WCHAR TargetPath[MAX_PATH]; *pwszPath = UNICODE_NULL; + /* + * We find first a mapping inside the MappingList. If one is found, use it + * to build the Win32 path. If there is none, we need to create one by + * checking the Win32 drives (and possibly NT symlinks too). + * In case of success, add the newly found mapping to the list and use it + * to build the Win32 path. + */ + + for (ListEntry = MappingList->List.Flink; + ListEntry != &MappingList->List; + ListEntry = ListEntry->Flink) + { + Entry = CONTAINING_RECORD(ListEntry, NT_WIN32_PATH_MAPPING, ListEntry); + + DPRINT("Testing '%S' --> '%S'\n", Entry->Win32Path, Entry->NtPath); + + /* Check whether the queried NT path prefixes the user-provided NT path */ + FoundDrive = !_wcsnicmp(pwszNtPathToMap, Entry->NtPath, wcslen(Entry->NtPath)); + if (FoundDrive) + { + /* Found it! */ + + /* Set the pointers and go build the Win32 path */ + pwszDrive = Entry->Win32Path; + pwszRemaining = pwszNTPath + wcslen(Entry->NtPath); + goto Quit; + } + } + + /* + * No mapping exists for this path yet: try to find one now. + */ + /* Retrieve the mounted drives (available drive letters) */ cchDrives = GetLogicalDriveStringsW(_countof(wszDrives) - 1, wszDrives); if (cchDrives == 0 || cchDrives >= _countof(wszDrives)) { /* Buffer too small or failure */ - DPRINT1("GetLogicalDriveStringsW failed\n"); + DPRINT1("ConvertNtPathToWin32Path: GetLogicalDriveStringsW failed\n"); return FALSE; } - -Retry: // We go back there once if RetryOnce == TRUE +/* We go back there once if RetryOnce == TRUE */ +Retry: /* Enumerate the mounted drives */ for (pwszDrive = wszDrives; *pwszDrive; pwszDrive += wcslen(pwszDrive) + 1) @@ -1235,25 +1297,87 @@ Retry: // We go back there once if RetryOnce == TRUE DPRINT("Testing '%S' --> '%S'\n", pwszDrive, wszNTPath); /* Check whether the queried NT path prefixes the user-provided NT path */ - if (!_wcsnicmp(wszNTPath, pwszNTPath, wcslen(wszNTPath))) + FoundDrive = !_wcsnicmp(pwszNtPathToMap, wszNTPath, wcslen(wszNTPath)); + if (!FoundDrive) + { + PWCHAR ptr, ptr2; + + /* + * Check whether this was a network share that has a drive letter, + * but the user-provided NT path points to this share without + * mentioning the drive letter. + * + * The format is: \Device\<network_redirector>\;X:<data>\share\path + * The corresponding drive letter is 'X'. + * A system-provided network redirector (LanManRedirector or Mup) + * or a 3rd-party one may be used. + * + * We check whether the user-provided NT path has the form: + * \Device\<network_redirector>\<data>\share\path + * as it obviously did not have the full form (the previous check + * would have been OK otherwise). + */ + if (!_wcsnicmp(wszNTPath, L"\\Device\\", _countof(L"\\Device\\")-1) && + (ptr = wcschr(wszNTPath + _countof(L"\\Device\\")-1, L'\\')) && + wcslen(++ptr) >= 3 && ptr[0] == L';' && ptr[2] == L':') + { + /* + * Normally the specified drive letter should correspond + * to the one used for the mapping. But we will ignore + * if it happens not to be the case. + */ + if (pwszDrive[0] != ptr[1]) + { + DPRINT1("Peculiar: expected network share drive letter %C different from actual one %C\n", + pwszDrive[0], ptr[1]); + } + + /* Remove the drive letter from the NT network share path */ + ptr2 = ptr + 3; + /* Swallow as many possible consecutive backslashes as there could be */ + while (*ptr2 == L'\\') ++ptr2; + + memmove(ptr, ptr2, (wcslen(ptr2) + 1) * sizeof(WCHAR)); + + /* Now do the check again */ + FoundDrive = !_wcsnicmp(pwszNtPathToMap, wszNTPath, wcslen(wszNTPath)); + } + } + if (FoundDrive) { /* Found it! */ - FoundDrive = TRUE; - if (!RetryOnce && pwszNTPath != TargetPath) + + pwszDrive[2] = UNICODE_NULL; // Remove the backslash + + if (pwszNtPathToMap == pwszNTPath) + { + ASSERT(!RetryOnce && pwszNTPath != TargetPath); pwszRemaining = pwszNTPath + wcslen(wszNTPath); + } break; } } if (FoundDrive) { - pwszDrive[2] = UNICODE_NULL; // Remove the backslash - StringCchPrintfW(pwszPath, cchPathMax, - L"%s%s", - pwszDrive, - pwszRemaining); - DPRINT1("ConvertNtPathToWin32Path: %S\n", pwszPath); - return TRUE; + /* A mapping was found, add it to the cache */ + Entry = HeapAlloc(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(*Entry)); + if (!Entry) + { + DPRINT1("ConvertNtPathToWin32Path: Cannot allocate memory\n"); + return FALSE; + } + StringCchCopyNW(Entry->NtPath, _countof(Entry->NtPath), + pwszNTPath, pwszRemaining - pwszNTPath); + StringCchCopyW(Entry->Win32Path, _countof(Entry->Win32Path), pwszDrive); + + /* Insert it as the most recent entry */ + InsertHeadList(&MappingList->List, &Entry->ListEntry); + MappingList->MappingsCount++; + + /* Set the pointers and go build the Win32 path */ + pwszDrive = Entry->Win32Path; + goto Quit; } /* @@ -1309,10 +1433,12 @@ Retry: // We go back there once if RetryOnce == TRUE if (!NT_SUCCESS(Status)) { /* Not a symlink, or something else happened: bail out */ - DPRINT1("NtOpenSymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", &SymLink, Status); + DPRINT1("ConvertNtPathToWin32Path: NtOpenSymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", + &SymLink, Status); return FALSE; } + *TargetPath = UNICODE_NULL; RtlInitEmptyUnicodeString(&Target, TargetPath, sizeof(TargetPath)); /* Resolve the link and close its handle */ @@ -1323,25 +1449,41 @@ Retry: // We go back there once if RetryOnce == TRUE if (!NT_SUCCESS(Status)) { /* Not a symlink, or something else happened: bail out */ - DPRINT1("NtQuerySymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", &SymLink, Status); + DPRINT1("ConvertNtPathToWin32Path: NtQuerySymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", + &SymLink, Status); return FALSE; } - /* Set pointers */ + /* Set the pointers */ pwszRemaining = pwszNTPath + Length; - pwszNTPath = TargetPath; + pwszNtPathToMap = TargetPath; // Point to our local buffer /* Retry once */ RetryOnce = TRUE; goto Retry; } + ASSERT(!FoundDrive); + +Quit: + if (FoundDrive) + { + StringCchPrintfW(pwszPath, cchPathMax, + L"%s%s", + pwszDrive, + pwszRemaining); + DPRINT("ConvertNtPathToWin32Path: %S\n", pwszPath); + return TRUE; + } + return FALSE; } /* Used to enable and disable the shutdown privilege */ /* static */ BOOL -EnablePrivilege(LPCWSTR lpszPrivilegeName, BOOL bEnablePrivilege) +EnablePrivilege( + IN LPCWSTR lpszPrivilegeName, + IN BOOL bEnablePrivilege) { BOOL Success; HANDLE hToken; @@ -1382,6 +1524,14 @@ _tWinMain(HINSTANCE hInst, ProcessHeap = GetProcessHeap(); + SetupData.hInstance = hInst; + SetupData.hInstallThread = NULL; + SetupData.hHaltInstallEvent = NULL; + SetupData.bStopInstall = FALSE; + + /* Initialize the NT to Win32 path prefix mapping list */ + InitNtToWin32PathMappingList(&SetupData.MappingList); + /* Initialize Setup, phase 0 */ InitializeSetup(&SetupData.USetupData, 0); @@ -1406,11 +1556,6 @@ _tWinMain(HINSTANCE hInst, if (!LoadSetupData(&SetupData)) goto Quit; - SetupData.hInstance = hInst; - SetupData.hInstallThread = NULL; - SetupData.hHaltInstallEvent = NULL; - SetupData.bStopInstall = FALSE; - CheckUnattendedSetup(&SetupData.USetupData); SetupData.bUnattend = IsUnattendedSetup; // FIXME :-) @@ -1544,6 +1689,9 @@ Quit: /* Setup has finished */ FinishSetup(&SetupData.USetupData); + /* Free the NT to Win32 path prefix mapping list */ + FreeNtToWin32PathMappingList(&SetupData.MappingList); + #if 0 // NOTE: Disabled for testing purposes only! EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); ExitWindowsEx(EWX_REBOOT, 0); diff --git a/base/setup/reactos/reactos.h b/base/setup/reactos/reactos.h index 0c4a76eb40..ded1d85f74 100644 --- a/base/setup/reactos/reactos.h +++ b/base/setup/reactos/reactos.h @@ -66,6 +66,35 @@ typedef struct _KBLAYOUT #endif +/* + * A mapping entry that maps an NT path to a corresponding Win32 path. + * + * Example is: + * NT path: "\Device\Harddisk0\Partition1\some\path1" + * Win32 path: "C:\some\path1" + * + * Here, the NT path prefix to be cached is only + * "\Device\Harddisk0\Partition1\", to be mapped with "C:\". + * + * Then the same entry would be reused if one wants to convert + * the NT path "\Device\Harddisk0\Partition1\another\path2", + * which converts to the Win32 path "C:\another\path2" . + */ +typedef struct _NT_WIN32_PATH_MAPPING +{ + LIST_ENTRY ListEntry; + WCHAR NtPath[MAX_PATH]; // MAX_PATH for both entries should be more than enough. + WCHAR Win32Path[MAX_PATH]; +} NT_WIN32_PATH_MAPPING, *PNT_WIN32_PATH_MAPPING; + +/* The list of NT to Win32 path prefix mappings */ +typedef struct _NT_WIN32_PATH_MAPPING_LIST +{ + LIST_ENTRY List; + ULONG MappingsCount; +} NT_WIN32_PATH_MAPPING_LIST, *PNT_WIN32_PATH_MAPPING_LIST; + + typedef struct _SETUPDATA { /* General */ @@ -81,6 +110,8 @@ typedef struct _SETUPDATA TCHAR szAbortMessage[512]; TCHAR szAbortTitle[64]; + NT_WIN32_PATH_MAPPING_LIST MappingList; + USETUP_DATA USetupData; BOOLEAN RepairUpdateFlag; // flag for update/repair an installed reactos @@ -113,6 +144,8 @@ typedef struct _SETUPDATA extern HANDLE ProcessHeap; extern BOOLEAN IsUnattendedSetup; +extern SETUPDATA SetupData; + typedef struct _IMGINFO { @@ -128,6 +161,7 @@ typedef struct _IMGINFO */ BOOL ConvertNtPathToWin32Path( + IN OUT PNT_WIN32_PATH_MAPPING_LIST MappingList, OUT PWSTR pwszPath, IN DWORD cchPathMax, IN PCWSTR pwszNTPath); diff --git a/base/setup/reactos/spapisup/fileqsup.c b/base/setup/reactos/spapisup/fileqsup.c index 9c15f8cdac..ea46c03f75 100644 --- a/base/setup/reactos/spapisup/fileqsup.c +++ b/base/setup/reactos/spapisup/fileqsup.c @@ -38,7 +38,8 @@ SpFileQueueCopy_NtToWin32( * the Win32 SetupQueueCopyW API only takes Win32 paths. We therefore * map the NT path to Win32 path and then call the Win32 API. */ - if (!ConvertNtPathToWin32Path(Win32SourceRootPath, + if (!ConvertNtPathToWin32Path(&SetupData.MappingList, + Win32SourceRootPath, _countof(Win32SourceRootPath), SourceRootPath)) { @@ -46,7 +47,8 @@ SpFileQueueCopy_NtToWin32( } /* SourcePath, SourceFileName and SourceCabinet are appended to SourceRootPath by the SetupApi function */ - if (!ConvertNtPathToWin32Path(Win32TargetDirectory, + if (!ConvertNtPathToWin32Path(&SetupData.MappingList, + Win32TargetDirectory, _countof(Win32TargetDirectory), TargetDirectory)) { @@ -64,7 +66,7 @@ SpFileQueueCopy_NtToWin32( SourcePath, SourceFileName, // Undocumented on MSDN is the fact that this parameter is mandatory *IF* one wants to take the TagFile into account! - L"foobar", + L"ReactOS", // SourceTagFile -- Special behaviour: use cabinet file present in ArchiveDir path! The API does not check for a ".cab" extension. SourceCabinet, Win32TargetDirectory, @@ -88,7 +90,8 @@ SpFileQueueDelete_NtToWin32( * the Win32 SetupQueueDeleteW API only takes Win32 paths. We therefore * map the NT path to Win32 path and then call the Win32 API. */ - if (!ConvertNtPathToWin32Path(Win32PathPart1, + if (!ConvertNtPathToWin32Path(&SetupData.MappingList, + Win32PathPart1, _countof(Win32PathPart1), PathPart1)) { @@ -116,7 +119,8 @@ SpFileQueueRename_NtToWin32( * the Win32 SetupQueueRenameW API only takes Win32 paths. We therefore * map the NT path to Win32 path and then call the Win32 API. */ - if (!ConvertNtPathToWin32Path(Win32SourcePath, + if (!ConvertNtPathToWin32Path(&SetupData.MappingList, + Win32SourcePath, _countof(Win32SourcePath), SourcePath)) { @@ -126,7 +130,8 @@ SpFileQueueRename_NtToWin32( if (TargetPath) { - if (!ConvertNtPathToWin32Path(Win32TargetPath, + if (!ConvertNtPathToWin32Path(&SetupData.MappingList, + Win32TargetPath, _countof(Win32TargetPath), TargetPath)) { diff --git a/base/setup/reactos/spapisup/infsupp.c b/base/setup/reactos/spapisup/infsupp.c index 7c40e8421e..98e48b07bb 100644 --- a/base/setup/reactos/spapisup/infsupp.c +++ b/base/setup/reactos/spapisup/infsupp.c @@ -48,7 +48,8 @@ SetupOpenInfFileExW( * the Win32 SetupOpenInfFileW API only takes Win32 paths. We therefore * map the NT path to Win32 path and then call the Win32 API. */ - if (!ConvertNtPathToWin32Path(Win32FileName, + if (!ConvertNtPathToWin32Path(&SetupData.MappingList, + Win32FileName, _countof(Win32FileName), FileName)) {

1 0

06/13: [REACTOS] Diverse UI improvements.
by Hermès Bélusca-Maïto 05 Nov '18

05 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd2fe4e12630073aa2074… commit dd2fe4e12630073aa2074e02bfe914a0a064ef10 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 7 01:35:48 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 6 00:04:29 2018 +0100 [REACTOS] Diverse UI improvements. - Improve UI usage and wizard transitions (Work In Progress). - Add interfacing code that display installation status. - When the user attempts to cancel the installation during file copying, pause the file copying, and restart it if the user changes it mind and wants to continue the installation. Otherwise file copying is properly halted. --- base/setup/reactos/drivepage.c | 53 ++-- base/setup/reactos/reactos.c | 535 +++++++++++++++++++++++++++++--- base/setup/reactos/reactos.exe.manifest | 26 ++ base/setup/reactos/reactos.h | 4 + base/setup/reactos/reactos.rc | 8 +- 5 files changed, 551 insertions(+), 75 deletions(-) diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index b58557cf1e..cf79aa3847 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -48,33 +48,37 @@ MoreOptDlgProc(HWND hwndDlg, PSETUPDATA pSetupData; /* Retrieve pointer to the global setup data */ - pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); + pSetupData = (PSETUPDATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: + { /* Save pointer to the global setup data */ - pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); + pSetupData = (PSETUPDATA)lParam; + SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); CheckDlgButton(hwndDlg, IDC_INSTFREELDR, BST_CHECKED); - SendMessage(GetDlgItem(hwndDlg, IDC_PATH), - WM_SETTEXT, - (WPARAM)0, - (LPARAM)pSetupData->USetupData.InstallationDirectory); + SendMessageW(GetDlgItem(hwndDlg, IDC_PATH), + WM_SETTEXT, + (WPARAM)0, + (LPARAM)pSetupData->USetupData.InstallationDirectory); break; + } case WM_COMMAND: switch(LOWORD(wParam)) { case IDOK: - SendMessage(GetDlgItem(hwndDlg, IDC_PATH), - WM_GETTEXT, - (WPARAM)ARRAYSIZE(pSetupData->USetupData.InstallationDirectory), - (LPARAM)pSetupData->USetupData.InstallationDirectory); + { + SendMessageW(GetDlgItem(hwndDlg, IDC_PATH), + WM_GETTEXT, + (WPARAM)ARRAYSIZE(pSetupData->USetupData.InstallationDirectory), + (LPARAM)pSetupData->USetupData.InstallationDirectory); EndDialog(hwndDlg, IDOK); return TRUE; + } case IDCANCEL: EndDialog(hwndDlg, IDCANCEL); @@ -164,7 +168,7 @@ DriveDlgProc( #endif /* Retrieve pointer to the global setup data */ - pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); + pSetupData = (PSETUPDATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); switch (uMsg) { @@ -172,7 +176,7 @@ DriveDlgProc( { /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); + SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); CreateListViewColumns(pSetupData->hInstance, GetDlgItem(hwndDlg, IDC_PARTITION), @@ -211,7 +215,7 @@ DriveDlgProc( } if (buffer) { - SendMessage(hList, LB_ADDSTRING, (WPARAM) 0, (LPARAM) buffer); + SendMessageW(hList, LB_ADDSTRING, (WPARAM) 0, (LPARAM) buffer); LocalFree(buffer); } } @@ -251,17 +255,24 @@ DriveDlgProc( switch (lpnm->code) { case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); break; case PSN_QUERYCANCEL: - SetWindowLongPtr(hwndDlg, - DWLP_MSGRESULT, - MessageBox(GetParent(hwndDlg), - pSetupData->szAbortMessage, - pSetupData->szAbortTitle, - MB_YESNO | MB_ICONQUESTION) != IDYES); + { + if (MessageBoxW(GetParent(hwndDlg), + pSetupData->szAbortMessage, + pSetupData->szAbortTitle, + MB_YESNO | MB_ICONQUESTION) == IDYES) + { + /* Go to the Terminate page */ + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE); + } + + /* Do not close the wizard too soon */ + SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, TRUE); return TRUE; + } default: break; diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 261d5b2d4b..626b0ad9f8 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -25,6 +25,10 @@ */ #include "reactos.h" + +#define NTOS_MODE_USER +#include <ndk/obfuncs.h> + #include "resource.h" #define NDEBUG @@ -115,6 +119,7 @@ StartDlgProc( switch (uMsg) { case WM_INITDIALOG: + { /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); @@ -129,6 +134,7 @@ StartDlgProc( (WPARAM)pSetupData->hTitleFont, (LPARAM)TRUE); break; + } case WM_NOTIFY: { @@ -203,17 +209,24 @@ TypeDlgProc( switch (lpnm->code) { case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); break; case PSN_QUERYCANCEL: - SetWindowLongPtrW(hwndDlg, - DWLP_MSGRESULT, - MessageBoxW(GetParent(hwndDlg), - pSetupData->szAbortMessage, - pSetupData->szAbortTitle, - MB_YESNO | MB_ICONQUESTION) != IDYES); + { + if (MessageBoxW(GetParent(hwndDlg), + pSetupData->szAbortMessage, + pSetupData->szAbortTitle, + MB_YESNO | MB_ICONQUESTION) == IDYES) + { + /* Go to the Terminate page */ + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE); + } + + /* Do not close the wizard too soon */ + SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, TRUE); return TRUE; + } case PSN_WIZNEXT: /* Set the selected data */ { @@ -501,17 +514,24 @@ UpgradeRepairDlgProc( switch (lpnm->code) { case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); break; case PSN_QUERYCANCEL: - SetWindowLongPtrW(hwndDlg, - DWLP_MSGRESULT, - MessageBoxW(GetParent(hwndDlg), - pSetupData->szAbortMessage, - pSetupData->szAbortTitle, - MB_YESNO | MB_ICONQUESTION) != IDYES); + { + if (MessageBoxW(GetParent(hwndDlg), + pSetupData->szAbortMessage, + pSetupData->szAbortTitle, + MB_YESNO | MB_ICONQUESTION) == IDYES) + { + /* Go to the Terminate page */ + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE); + } + + /* Do not close the wizard too soon */ + SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, TRUE); return TRUE; + } case PSN_WIZNEXT: /* Set the selected data */ pSetupData->RepairUpdateFlag = @@ -576,17 +596,24 @@ DeviceDlgProc( switch (lpnm->code) { case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); break; case PSN_QUERYCANCEL: - SetWindowLongPtrW(hwndDlg, - DWLP_MSGRESULT, - MessageBoxW(GetParent(hwndDlg), - pSetupData->szAbortMessage, - pSetupData->szAbortTitle, - MB_YESNO | MB_ICONQUESTION) != IDYES); + { + if (MessageBoxW(GetParent(hwndDlg), + pSetupData->szAbortMessage, + pSetupData->szAbortTitle, + MB_YESNO | MB_ICONQUESTION) == IDYES) + { + /* Go to the Terminate page */ + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE); + } + + /* Do not close the wizard too soon */ + SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, TRUE); return TRUE; + } case PSN_WIZNEXT: /* Set the selected data */ { @@ -642,17 +669,24 @@ SummaryDlgProc( switch (lpnm->code) { case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); break; case PSN_QUERYCANCEL: - SetWindowLongPtrW(hwndDlg, - DWLP_MSGRESULT, - MessageBoxW(GetParent(hwndDlg), - pSetupData->szAbortMessage, - pSetupData->szAbortTitle, - MB_YESNO | MB_ICONQUESTION) != IDYES); + { + if (MessageBoxW(GetParent(hwndDlg), + pSetupData->szAbortMessage, + pSetupData->szAbortTitle, + MB_YESNO | MB_ICONQUESTION) == IDYES) + { + /* Go to the Terminate page */ + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE); + } + + /* Do not close the wizard too soon */ + SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, TRUE); return TRUE; + } default: break; @@ -667,6 +701,221 @@ SummaryDlgProc( return FALSE; } + +typedef struct _COPYCONTEXT +{ + PSETUPDATA pSetupData; + HWND hWndItem; + HWND hWndProgress; + ULONG TotalOperations; + ULONG CompletedOperations; +} COPYCONTEXT, *PCOPYCONTEXT; + +static UINT +CALLBACK +FileCopyCallback(PVOID Context, + UINT Notification, + UINT_PTR Param1, + UINT_PTR Param2) +{ + PCOPYCONTEXT CopyContext = (PCOPYCONTEXT)Context; + PFILEPATHS_W FilePathInfo; + PCWSTR SrcFileName, DstFileName; + WCHAR Status[1024]; + + WaitForSingleObject(CopyContext->pSetupData->hHaltInstallEvent, INFINITE); + if (CopyContext->pSetupData->bStopInstall) + return FILEOP_ABORT; // Stop committing files + + switch (Notification) + { + case SPFILENOTIFY_STARTSUBQUEUE: + { + CopyContext->TotalOperations = (ULONG)Param2; + CopyContext->CompletedOperations = 0; + + SendMessageW(CopyContext->hWndProgress, + PBM_SETRANGE, 0, + MAKELPARAM(0, CopyContext->TotalOperations)); + SendMessageW(CopyContext->hWndProgress, + PBM_SETSTEP, 1, 0); + break; + } + + case SPFILENOTIFY_STARTDELETE: + case SPFILENOTIFY_STARTRENAME: + case SPFILENOTIFY_STARTCOPY: + { + FilePathInfo = (PFILEPATHS_W)Param1; + + if (Notification == SPFILENOTIFY_STARTDELETE) + { + /* Display delete message */ + ASSERT(Param2 == FILEOP_DELETE); + + DstFileName = wcsrchr(FilePathInfo->Target, L'\\'); + if (DstFileName) ++DstFileName; + else DstFileName = FilePathInfo->Target; + + // STRING_DELETING + StringCchPrintfW(Status, ARRAYSIZE(Status), L"Deleting %s", DstFileName); + SetWindowTextW(CopyContext->hWndItem, Status); + } + else if (Notification == SPFILENOTIFY_STARTRENAME) + { + /* Display move/rename message */ + ASSERT(Param2 == FILEOP_RENAME); + + SrcFileName = wcsrchr(FilePathInfo->Source, L'\\'); + if (SrcFileName) ++SrcFileName; + else SrcFileName = FilePathInfo->Source; + + DstFileName = wcsrchr(FilePathInfo->Target, L'\\'); + if (DstFileName) ++DstFileName; + else DstFileName = FilePathInfo->Target; + + // STRING_MOVING or STRING_RENAMING + if (!wcsicmp(SrcFileName, DstFileName)) + StringCchPrintfW(Status, ARRAYSIZE(Status), L"Moving %s to %s", SrcFileName, DstFileName); + else + StringCchPrintfW(Status, ARRAYSIZE(Status), L"Renaming %s to %s", SrcFileName, DstFileName); + + SetWindowTextW(CopyContext->hWndItem, Status); + } + else if (Notification == SPFILENOTIFY_STARTCOPY) + { + /* Display copy message */ + ASSERT(Param2 == FILEOP_COPY); + + DstFileName = wcsrchr(FilePathInfo->Target, L'\\'); + if (DstFileName) ++DstFileName; + else DstFileName = FilePathInfo->Target; + + // STRING_COPYING + StringCchPrintfW(Status, ARRAYSIZE(Status), L"Copying %s", DstFileName); + SetWindowTextW(CopyContext->hWndItem, Status); + } + break; + } + + case SPFILENOTIFY_ENDDELETE: + case SPFILENOTIFY_ENDRENAME: + case SPFILENOTIFY_ENDCOPY: + { + CopyContext->CompletedOperations++; + + /* SYSREG checkpoint */ + if (CopyContext->TotalOperations >> 1 == CopyContext->CompletedOperations) + DPRINT1("CHECKPOINT:HALF_COPIED\n"); + + SendMessageW(CopyContext->hWndProgress, PBM_STEPIT, 0, 0); + break; + } + } + + return FILEOP_DOIT; +} + +static DWORD +WINAPI +PrepareAndDoCopyThread( + IN LPVOID Param) +{ + PSETUPDATA pSetupData; + HWND hwndDlg = (HWND)Param; + HWND hWndProgress; + LONG_PTR dwStyle; + // ERROR_NUMBER ErrorNumber; + BOOLEAN Success; + COPYCONTEXT CopyContext; + + /* Retrieve pointer to the global setup data */ + pSetupData = (PSETUPDATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); + + /* Set status text */ + SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Preparing the list of files to be copied, please wait..."); + SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); + + /* Get the progress handle */ + hWndProgress = GetDlgItem(hwndDlg, IDC_PROCESSPROGRESS); + + /* Set progress marquee style */ + dwStyle = GetWindowLongPtrW(hWndProgress, GWL_STYLE); + SetWindowLongPtrW(hWndProgress, GWL_STYLE, dwStyle | PBS_MARQUEE); + + /* Start it up */ + SendMessageW(hWndProgress, PBM_SETMARQUEE, TRUE, 0); + + /* Prepare the list of files */ + /* ErrorNumber = */ Success = PrepareFileCopy(&pSetupData->USetupData, NULL); + if (/*ErrorNumber != ERROR_SUCCESS*/ !Success) + { + /* Display an error only if an unexpected failure happened, and not because the user cancelled the installation */ + if (!pSetupData->bStopInstall) + MessageBoxW(GetParent(hwndDlg), L"Failed to prepare the list of files!", L"Error", MB_ICONERROR); + + /* Stop it */ + SendMessageW(hWndProgress, PBM_SETMARQUEE, FALSE, 0); + + /* Restore progress style */ + SetWindowLongPtrW(hWndProgress, GWL_STYLE, dwStyle); + + /* + * If we failed due to an unexpected error, keep on the copy page to view the current state, + * but enable the "Next" button to allow the user to continue to the terminate page. + * Otherwise we have been cancelled by the user, who has already switched to the Terminate page. + */ + if (!pSetupData->bStopInstall) + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + return 1; + } + + /* Stop it */ + SendMessageW(hWndProgress, PBM_SETMARQUEE, FALSE, 0); + + /* Restore progress style */ + SetWindowLongPtrW(hWndProgress, GWL_STYLE, dwStyle); + + /* Set status text */ + SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Copying the files..."); + + /* Create context for the copy process */ + CopyContext.pSetupData = pSetupData; + CopyContext.hWndItem = GetDlgItem(hwndDlg, IDC_ITEM); + CopyContext.hWndProgress = hWndProgress; + CopyContext.TotalOperations = 0; + CopyContext.CompletedOperations = 0; + + /* Do the file copying - The callback handles whether or not we should stop file copying */ + if (!DoFileCopy(&pSetupData->USetupData, FileCopyCallback, &CopyContext)) + { + /* Display an error only if an unexpected failure happened, and not because the user cancelled the installation */ + if (!pSetupData->bStopInstall) + MessageBoxW(GetParent(hwndDlg), L"Failed to copy the files!", L"Error", MB_ICONERROR); + + /* + * If we failed due to an unexpected error, keep on the copy page to view the current state, + * but enable the "Next" button to allow the user to continue to the terminate page. + * Otherwise we have been cancelled by the user, who has already switched to the Terminate page. + */ + if (!pSetupData->bStopInstall) + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + return 1; + } + + /* Set status text */ + SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L"Finalizing the installation..."); + SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); + + /* Create the $winnt$.inf file */ + InstallSetupInfFile(&pSetupData->USetupData); + + /* We are done! Switch to the Terminate page */ + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE); + return 0; +} + + static INT_PTR CALLBACK ProcessDlgProc( IN HWND hwndDlg, @@ -682,10 +931,31 @@ ProcessDlgProc( switch (uMsg) { case WM_INITDIALOG: + { + NTSTATUS Status; + /****/ + // FIXME: This is my disk encoding! + DISKENTRY DiskEntry; + PARTENTRY PartEntry; + DiskEntry.DiskNumber = 1; + DiskEntry.BiosDiskNumber = 1; + PartEntry.PartitionNumber = 4; + /****/ + /* Save pointer to the global setup data */ pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pSetupData); + + /* Reset status text */ + SetDlgItemTextW(hwndDlg, IDC_ACTIVITY, L""); + SetDlgItemTextW(hwndDlg, IDC_ITEM, L""); + + Status = InitDestinationPaths(&pSetupData->USetupData, NULL /*InstallDir*/, &DiskEntry, &PartEntry); + // TODO: Check Status + UNREFERENCED_PARAMETER(Status); + break; + } case WM_NOTIFY: { @@ -694,21 +964,79 @@ ProcessDlgProc( switch (lpnm->code) { case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); - // disable all buttons during installation process - // PropSheet_SetWizButtons(GetParent(hwndDlg), 0 ); - break; + { + /* Create the file-copy halt (manual-reset) event */ + pSetupData->hHaltInstallEvent = CreateEventW(NULL, TRUE, TRUE, NULL); + if (!pSetupData->hHaltInstallEvent) + break; + pSetupData->bStopInstall = FALSE; + + /* Start the prepare-and-copy files thread */ + pSetupData->hInstallThread = + CreateThread(NULL, 0, + PrepareAndDoCopyThread, + (PVOID)hwndDlg, + CREATE_SUSPENDED, + NULL); + if (!pSetupData->hInstallThread) + { + CloseHandle(pSetupData->hHaltInstallEvent); + pSetupData->hHaltInstallEvent = NULL; + + MessageBoxW(GetParent(hwndDlg), L"Cannot create the prepare-and-copy files thread!", L"Error", MB_ICONERROR); + break; + } + + /* Disable all buttons during installation process - buttons will be reenabled by the installation thread */ + PropSheet_SetWizButtons(GetParent(hwndDlg), 0); + + /* Resume the installation thread */ + ResumeThread(pSetupData->hInstallThread); + + break; + } + case PSN_QUERYCANCEL: - SetWindowLongPtrW(hwndDlg, - DWLP_MSGRESULT, - MessageBoxW(GetParent(hwndDlg), - pSetupData->szAbortMessage, - pSetupData->szAbortTitle, - MB_YESNO | MB_ICONQUESTION) != IDYES); + { + /* Halt the on-going file copy */ + ResetEvent(pSetupData->hHaltInstallEvent); + + if (MessageBoxW(GetParent(hwndDlg), + pSetupData->szAbortMessage, + pSetupData->szAbortTitle, + MB_YESNO | MB_ICONQUESTION) == IDYES) + { + /* Stop the file copy thread */ + pSetupData->bStopInstall = TRUE; + SetEvent(pSetupData->hHaltInstallEvent); + +#if 0 + /* Wait for any pending installation */ + WaitForSingleObject(pSetupData->hInstallThread, INFINITE); + CloseHandle(pSetupData->hInstallThread); + pSetupData->hInstallThread = NULL; + CloseHandle(pSetupData->hHaltInstallEvent); + pSetupData->hHaltInstallEvent = NULL; +#endif + + // TODO: Unwind installation?! + + /* Go to the Terminate page */ + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE); + } + else + { + /* We don't stop installation, resume file copy */ + SetEvent(pSetupData->hHaltInstallEvent); + } + + /* Do not close the wizard too soon */ + SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, TRUE); return TRUE; + } default: - break; + break; } } break; @@ -874,13 +1202,17 @@ ConvertNtPathToWin32Path( IN DWORD cchPathMax, IN PCWSTR pwszNTPath) { - WCHAR wszDrives[512]; - WCHAR wszNTPath[512]; // MAX_PATH ? + BOOL FoundDrive = FALSE, RetryOnce = FALSE; DWORD cchDrives; PWCHAR pwszDrive; + PCWSTR pwszRemaining = NULL; + WCHAR wszDrives[512]; + WCHAR wszNTPath[MAX_PATH]; + WCHAR TargetPath[MAX_PATH] = L""; *pwszPath = UNICODE_NULL; + /* Retrieve the mounted drives (available drive letters) */ cchDrives = GetLogicalDriveStringsW(_countof(wszDrives) - 1, wszDrives); if (cchDrives == 0 || cchDrives >= _countof(wszDrives)) { @@ -889,6 +1221,10 @@ ConvertNtPathToWin32Path( return FALSE; } + +Retry: // We go back there once if RetryOnce == TRUE + + /* Enumerate the mounted drives */ for (pwszDrive = wszDrives; *pwszDrive; pwszDrive += wcslen(pwszDrive) + 1) { /* Retrieve the NT path corresponding to the current Win32 DOS path */ @@ -896,21 +1232,110 @@ ConvertNtPathToWin32Path( QueryDosDeviceW(pwszDrive, wszNTPath, _countof(wszNTPath)); pwszDrive[2] = L'\\'; // Restore the backslash - wcscat(wszNTPath, L"\\"); // Concat a backslash + DPRINT("Testing '%S' --> '%S'\n", pwszDrive, wszNTPath); - DPRINT1("Testing '%S' --> '%S'\n", pwszDrive, wszNTPath); - - /* Check whether the NT path corresponds to the NT installation source path */ + /* Check whether the queried NT path prefixes the user-provided NT path */ if (!_wcsnicmp(wszNTPath, pwszNTPath, wcslen(wszNTPath))) { /* Found it! */ - wsprintf(pwszPath, L"%s%s", // cchPathMax - pwszDrive, pwszNTPath + wcslen(wszNTPath)); - DPRINT1("ConvertNtPathToWin32Path: %S\n", pwszPath); - return TRUE; + FoundDrive = TRUE; + if (!RetryOnce && pwszNTPath != TargetPath) + pwszRemaining = pwszNTPath + wcslen(wszNTPath); + break; } } + if (FoundDrive) + { + pwszDrive[2] = UNICODE_NULL; // Remove the backslash + StringCchPrintfW(pwszPath, cchPathMax, + L"%s%s", + pwszDrive, + pwszRemaining); + DPRINT1("ConvertNtPathToWin32Path: %S\n", pwszPath); + return TRUE; + } + + /* + * We failed, perhaps because the beginning of the NT path used a symlink. + * Try to see whether this is the case by attempting to resolve it. + * If the symlink resolution gives nothing, or we already failed once, + * there is no hope in converting the path to Win32. + * Otherwise, symlink resolution succeeds but we need to recheck again + * the drives list. + */ + + /* + * In theory we would have to parse each element in the NT path and going + * until finding a symlink object (otherwise we would fail straight away). + * However here we can use guessing instead, since we know which kind of + * NT paths we are likely to manipulate: \Device\HarddiskX\PartitionY\ and + * the like (including \Device\HarddiskVolumeX\) and the other ones that + * are supported in setuplib\utils\arcname.c . + * + * But actually, all the supported names in arcname.c are real devices, + * and only \Device\HarddiskX\PartitionY\ may refer to a symlink, so we + * just check for it. + */ + if (!RetryOnce && !FoundDrive) + { + ULONG DiskNumber, PartitionNumber; + INT Length; + + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE LinkHandle; + UNICODE_STRING SymLink, Target; + + if (swscanf(pwszNTPath, L"\\Device\\Harddisk%lu\\Partition%lu%n", + &DiskNumber, &PartitionNumber, &Length) != 2) + { + /* Definitively not a recognized path, bail out */ + return FALSE; + } + + /* Check whether \Device\HarddiskX\PartitionY is a symlink */ + RtlInitEmptyUnicodeString(&SymLink, (PWCHAR)pwszNTPath, Length * sizeof(WCHAR)); + SymLink.Length = SymLink.MaximumLength; + + InitializeObjectAttributes(&ObjectAttributes, + &SymLink, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + /* Not a symlink, or something else happened: bail out */ + DPRINT1("NtOpenSymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", &SymLink, Status); + return FALSE; + } + + RtlInitEmptyUnicodeString(&Target, TargetPath, sizeof(TargetPath)); + + /* Resolve the link and close its handle */ + Status = NtQuerySymbolicLinkObject(LinkHandle, &Target, NULL); + NtClose(LinkHandle); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* Not a symlink, or something else happened: bail out */ + DPRINT1("NtQuerySymbolicLinkObject(%wZ) failed, Status 0x%08lx\n", &SymLink, Status); + return FALSE; + } + + /* Set pointers */ + pwszRemaining = pwszNTPath + Length; + pwszNTPath = TargetPath; + + /* Retry once */ + RetryOnce = TRUE; + goto Retry; + } + return FALSE; } @@ -982,6 +1407,9 @@ _tWinMain(HINSTANCE hInst, goto Quit; SetupData.hInstance = hInst; + SetupData.hInstallThread = NULL; + SetupData.hHaltInstallEvent = NULL; + SetupData.bStopInstall = FALSE; CheckUnattendedSetup(&SetupData.USetupData); SetupData.bUnattend = IsUnattendedSetup; // FIXME :-) @@ -994,7 +1422,7 @@ _tWinMain(HINSTANCE hInst, * you must call InitCommonControlsEx() to register the classes * for those controls. */ iccx.dwSize = sizeof(iccx); - iccx.dwICC = ICC_LISTVIEW_CLASSES | ICC_TREEVIEW_CLASSES /* | ICC_PROGRESS_CLASS */; + iccx.dwICC = ICC_LISTVIEW_CLASSES | ICC_TREEVIEW_CLASSES | ICC_PROGRESS_CLASS; InitCommonControlsEx(&iccx); /* Create title font */ @@ -1106,6 +1534,13 @@ _tWinMain(HINSTANCE hInst, DeleteObject(SetupData.hTitleFont); Quit: + /* Wait for any pending installation */ + WaitForSingleObject(SetupData.hInstallThread, INFINITE); + CloseHandle(SetupData.hInstallThread); + SetupData.hInstallThread = NULL; + CloseHandle(SetupData.hHaltInstallEvent); + SetupData.hHaltInstallEvent = NULL; + /* Setup has finished */ FinishSetup(&SetupData.USetupData); diff --git a/base/setup/reactos/reactos.exe.manifest b/base/setup/reactos/reactos.exe.manifest new file mode 100644 index 0000000000..2b7970cb66 --- /dev/null +++ b/base/setup/reactos/reactos.exe.manifest @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<description>ReactOS Setup</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="requireAdministrator" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> diff --git a/base/setup/reactos/reactos.h b/base/setup/reactos/reactos.h index 508d9652c0..0c4a76eb40 100644 --- a/base/setup/reactos/reactos.h +++ b/base/setup/reactos/reactos.h @@ -74,6 +74,10 @@ typedef struct _SETUPDATA HFONT hTitleFont; + HANDLE hInstallThread; + HANDLE hHaltInstallEvent; + BOOL bStopInstall; + TCHAR szAbortMessage[512]; TCHAR szAbortTitle[64]; diff --git a/base/setup/reactos/reactos.rc b/base/setup/reactos/reactos.rc index a1f7ac5eab..2b794d83a6 100644 --- a/base/setup/reactos/reactos.rc +++ b/base/setup/reactos/reactos.rc @@ -4,9 +4,9 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup" -#define REACTOS_STR_INTERNAL_NAME "reactos" -#define REACTOS_STR_ORIGINAL_FILENAME "reactos.exe" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup" +#define REACTOS_STR_INTERNAL_NAME "reactos" +#define REACTOS_STR_ORIGINAL_FILENAME "reactos.exe" #include <reactos/version.rc> LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -20,7 +20,7 @@ IDI_WINICON ICON "res/winlogo.ico" IDB_WATERMARK BITMAP "res/watermark.bmp" IDB_HEADER BITMAP "res/header.bmp" -#include <reactos/manifest_exe.rc> +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "reactos.exe.manifest" /* UTF-8 */ #pragma code_page(65001)

1 0

05/13: [BOOTDATA][SETUPLIB][REACTOS] INF support fixes.
by Hermès Bélusca-Maïto 05 Nov '18

05 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86f31289ef9c05d59e1f2… commit 86f31289ef9c05d59e1f285d2a364ac5b52aaa0c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 15 18:09:53 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 6 00:04:19 2018 +0100 [BOOTDATA][SETUPLIB][REACTOS] INF support fixes. - BOOTDATA: Use standard INF signature string, so that they can be opened successfully using ReactOS' or Windows' setupapi.dll with the INF_STYLE_WIN4 style. - SETUPLIB: Use the correct INF_STYLE_* INF styles in SpInfOpenInfFile() calls. - REACTOS : Switch thread locale to user-specified LocaleId when calling SetupOpenInfFileW(), so that the correct localized strings are used. --- base/setup/lib/install.c | 2 +- base/setup/lib/setuplib.c | 5 +++-- base/setup/reactos/spapisup/infsupp.c | 31 +++++++++++++++++++++++++------ boot/bootdata/caroots.inf | 2 +- boot/bootdata/hivebcd.inf | 2 +- boot/bootdata/hivecls.inf | 2 +- boot/bootdata/hivedef.inf | 2 +- boot/bootdata/hiveinst.inf | 2 +- boot/bootdata/hivesft.inf | 2 +- boot/bootdata/hivesys.inf | 2 +- boot/bootdata/livecd.inf | 2 +- boot/bootdata/packages/reactos.dff.in | 3 ++- boot/bootdata/setupreg.inf | 2 +- boot/bootdata/txtsetup.sif | 3 ++- 14 files changed, 42 insertions(+), 20 deletions(-) diff --git a/base/setup/lib/install.c b/base/setup/lib/install.c index f2875d0716..a9a489bf8c 100644 --- a/base/setup/lib/install.c +++ b/base/setup/lib/install.c @@ -783,7 +783,7 @@ PrepareFileCopy( InfHandle = SpInfOpenInfFile(PathBuffer, NULL, - INF_STYLE_OLDNT, // INF_STYLE_WIN4, + INF_STYLE_WIN4, pSetupData->LanguageId, &ErrorLine); } diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 9a7ea88a9a..c63c5dfb87 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -516,7 +516,7 @@ LoadSetupInf( pSetupData->SetupInf = SpInfOpenInfFile(FileNameBuffer, NULL, - /* INF_STYLE_WIN4 | */ INF_STYLE_OLDNT, + INF_STYLE_WIN4, pSetupData->LanguageId, &ErrorLine); if (pSetupData->SetupInf == INVALID_HANDLE_VALUE) @@ -531,7 +531,8 @@ LoadSetupInf( return ERROR_CORRUPT_TXTSETUPSIF; /* Check 'Signature' string */ - if (_wcsicmp(Value, L"$ReactOS$") != 0) + if (_wcsicmp(Value, L"$ReactOS$") != 0 && + _wcsicmp(Value, L"$Windows NT$") != 0) { INF_FreeData(Value); return ERROR_SIGNATURE_TXTSETUPSIF; diff --git a/base/setup/reactos/spapisup/infsupp.c b/base/setup/reactos/spapisup/infsupp.c index c95aad8e6e..7c40e8421e 100644 --- a/base/setup/reactos/spapisup/infsupp.c +++ b/base/setup/reactos/spapisup/infsupp.c @@ -10,6 +10,7 @@ /* INCLUDES ******************************************************************/ #include "reactos.h" +#include <winnls.h> #define NDEBUG #include <debug.h> @@ -38,10 +39,10 @@ SetupOpenInfFileExW( IN LCID LocaleId, OUT PUINT ErrorLine) { + HINF InfHandle; + LCID OldLocaleId; WCHAR Win32FileName[MAX_PATH]; - UNREFERENCED_PARAMETER(LocaleId); - /* * SetupOpenInfFileExW is called within setuplib with NT paths, however * the Win32 SetupOpenInfFileW API only takes Win32 paths. We therefore @@ -54,10 +55,28 @@ SetupOpenInfFileExW( return INVALID_HANDLE_VALUE; } - return SetupOpenInfFileW(Win32FileName, - InfClass, - InfStyle, - ErrorLine); + /* + * Because SetupAPI's SetupOpenInfFileW() function does not allow the user + * to specify a given LCID to use to load localized string substitutions, + * we temporarily change the current thread locale before calling + * SetupOpenInfFileW(). When we have finished we restore the original + * thread locale. + */ + OldLocaleId = GetThreadLocale(); + if (OldLocaleId != LocaleId) + SetThreadLocale(LocaleId); + + /* Load the INF file */ + InfHandle = SetupOpenInfFileW(Win32FileName, + InfClass, + InfStyle, + ErrorLine); + + /* Restore the original thread locale */ + if (OldLocaleId != LocaleId) + SetThreadLocale(OldLocaleId); + + return InfHandle; } diff --git a/boot/bootdata/caroots.inf b/boot/bootdata/caroots.inf index a7d09f9477..4c30bc9751 100644 --- a/boot/bootdata/caroots.inf +++ b/boot/bootdata/caroots.inf @@ -5,7 +5,7 @@ ; Data licensed under MPL 2.0 <https://mozilla.org/MPL/2.0/> [Version] -Signature = "$ReactOS$" +Signature = "$Windows NT$" [AddReg] ; "SSL.com EV Root Certification Authority ECC" (664 bytes) diff --git a/boot/bootdata/hivebcd.inf b/boot/bootdata/hivebcd.inf index a7d904a3c6..0782558eb0 100644 --- a/boot/bootdata/hivebcd.inf +++ b/boot/bootdata/hivebcd.inf @@ -1,5 +1,5 @@ [Version] -Signature = "$ReactOS$" +Signature = "$Windows NT$" [AddReg] BCD,"BCD00000000\Description\Control","System",0x00010001,1 diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index 4a953a1f86..446da70253 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$" +Signature = "$Windows NT$" [AddReg] HKLM,"SOFTWARE\Classes",,0x00000010 diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 618635a7d7..91ce76e328 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$" +Signature = "$Windows NT$" [AddReg] diff --git a/boot/bootdata/hiveinst.inf b/boot/bootdata/hiveinst.inf index d815185b3a..e4066a7401 100644 --- a/boot/bootdata/hiveinst.inf +++ b/boot/bootdata/hiveinst.inf @@ -1,5 +1,5 @@ [Version] -Signature = "$ReactOS$" +Signature = "$Windows NT$" [AddReg] ; Enable _one_ driver per section by removing the leading semicolon. diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index e96e5de938..6ccd294c22 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -1,5 +1,5 @@ [Version] -Signature="$ReactOS$" +Signature = "$Windows NT$" [AddReg] diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 76491a5d2e..41da57681e 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1,5 +1,5 @@ [Version] -Signature = "$ReactOS$" +Signature = "$Windows NT$" [AddReg] diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index f826a7f6c4..fda2356a97 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -1,5 +1,5 @@ [Version] -Signature = "$ReactOS$" +Signature = "$Windows NT$" [DelReg] diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index f122a8f528..9424840238 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -11,7 +11,8 @@ .InfBegin [Version] -Signature = "$ReactOS$" +Signature = "$Windows NT$" +;Signature = "$ReactOS$" ; Directories relative to the installation directory. ; For specifying absolute directories, use the SystemPartitionFiles section, diff --git a/boot/bootdata/setupreg.inf b/boot/bootdata/setupreg.inf index 7dbf932b56..197918f13b 100644 --- a/boot/bootdata/setupreg.inf +++ b/boot/bootdata/setupreg.inf @@ -1,5 +1,5 @@ [Version] -Signature = "$ReactOS$" +Signature = "$Windows NT$" [DelReg] diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 808c2e2bc7..03609d2fcf 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -1,5 +1,6 @@ [Version] -Signature = "$ReactOS$" +Signature = "$Windows NT$" +;Signature = "$ReactOS$" ; ; The [SourceDisksNames] section lists all the available installation media

1 0

04/13: [SETUPLIB] Fixes and improvements for the file copying code.
by Hermès Bélusca-Maïto 05 Nov '18

05 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42758b303bd006f8a1ef4… commit 42758b303bd006f8a1ef4a362357e5d040d896ea Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 7 01:35:48 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 5 23:35:14 2018 +0100 [SETUPLIB] Fixes and improvements for the file copying code. - In PrepareCopyInfFile(), explicitly use AddSectionToCopyQueueCab() to retrieve the files from the CAB INF. Otherwise if one continued to use and rely on AddSectionToCopyQueue() to do this job instead, bad things could happen like, re-enumerating twice or more (and adding them to the file queue) the same files. This is because in the new code AddSectionToCopyQueue() can be called many times to deal with different SIF file sections. The old code then called AddSectionToCopyQueueCab() in turn, but on the same list... Now the steps performed are clear, and everything works as intended. - Simplify the code that computes the full source and destination paths for the files to be copied and directories to be created, using helper functions. - Compute the source file and target location from the TXTSETUP.SIF entries in a NT-compatible manner. --- base/setup/lib/install.c | 651 ++++++++++++++++++++++++++++++----------------- 1 file changed, 422 insertions(+), 229 deletions(-) diff --git a/base/setup/lib/install.c b/base/setup/lib/install.c index 31ece47b0d..f2875d0716 100644 --- a/base/setup/lib/install.c +++ b/base/setup/lib/install.c @@ -23,6 +23,256 @@ /* FUNCTIONS ****************************************************************/ +static BOOL +LookupDirectoryById( + IN HINF InfHandle, + IN OUT PINFCONTEXT InfContext, + IN PCWSTR DirId, + OUT PCWSTR* pDirectory) +{ + BOOL Success; + + // ReactOS-specific + Success = SpInfFindFirstLine(InfHandle, L"Directories", DirId, InfContext); + if (!Success) + { + // Windows-compatible + Success = SpInfFindFirstLine(InfHandle, L"WinntDirectories", DirId, InfContext); + if (!Success) + DPRINT1("SpInfFindFirstLine() failed\n"); + } + if (Success) + { + Success = INF_GetData(InfContext, NULL, pDirectory); + if (!Success) + DPRINT1("INF_GetData() failed\n"); + } + + if (!Success) + DPRINT1("LookupDirectoryById(%S) - directory not found!\n", DirId); + + return Success; +} + +/* + * Note: Modeled after SetupGetSourceFileLocation(), SetupGetSourceInfo() + * and SetupGetTargetPath() APIs. + * Technically the target path is the same for a given file section, + * but here we try to remove this constraint. + * + * TXTSETUP.SIF entries syntax explained at: + * http://www.msfn.org/board/topic/125480-txtsetupsif-syntax/ + */ +static NTSTATUS +GetSourceFileAndTargetLocation( + IN HINF InfHandle, + IN PINFCONTEXT InfContext OPTIONAL, + IN PCWSTR SourceFileName OPTIONAL, + OUT PCWSTR* pSourceRootPath, + OUT PCWSTR* pSourcePath, + OUT PCWSTR* pTargetDirectory, + OUT PCWSTR* pTargetFileName) +{ + BOOL Success; + INFCONTEXT FileContext; + INFCONTEXT DirContext; + PCWSTR SourceRootDirId; + PCWSTR SourceRootDir; + PCWSTR SourceRelativePath; + PCWSTR TargetDirId; + PCWSTR TargetDir; + PCWSTR TargetFileName; + + /* Either InfContext or SourceFileName must be specified */ + if (!InfContext && !SourceFileName) + return STATUS_INVALID_PARAMETER; + + /* InfContext to a file was not given, retrieve one corresponding to SourceFileName */ + if (!InfContext) + { + /* Search for the SourceDisksFiles section */ + + /* Search in the optional platform-specific first (currently hardcoded; make it runtime-dependent?) */ + Success = SpInfFindFirstLine(InfHandle, L"SourceDisksFiles." INF_ARCH, SourceFileName, &FileContext); + if (!Success) + { + /* Search in the global section */ + Success = SpInfFindFirstLine(InfHandle, L"SourceDisksFiles", SourceFileName, &FileContext); + } + if (!Success) + { + // pSetupData->LastErrorNumber = ERROR_TXTSETUP_SECTION; + // if (pSetupData->ErrorRoutine) + // pSetupData->ErrorRoutine(pSetupData, SectionName); + return STATUS_NOT_FOUND; + } + InfContext = &FileContext; + } + // else, InfContext != NULL and ignore SourceFileName (that may or may not be == NULL). + + /* + * Getting Source File Location -- SetupGetSourceFileLocation() + */ + + /* Get source root directory id */ + if (!INF_GetDataField(InfContext, 1, &SourceRootDirId)) + { + /* FIXME: Handle error! */ + DPRINT1("INF_GetData() failed\n"); + return STATUS_NOT_FOUND; + } + + /* Lookup source root directory -- SetupGetSourceInfo() */ + /* Search in the optional platform-specific first (currently hardcoded; make it runtime-dependent?) */ + Success = SpInfFindFirstLine(InfHandle, L"SourceDisksNames." INF_ARCH, SourceRootDirId, &DirContext); + if (!Success) + { + /* Search in the global section */ + Success = SpInfFindFirstLine(InfHandle, L"SourceDisksNames", SourceRootDirId, &DirContext); + if (!Success) + DPRINT1("SpInfFindFirstLine(\"SourceDisksNames\", \"%S\") failed\n", SourceRootDirId); + } + INF_FreeData(SourceRootDirId); + if (!Success) + { + /* FIXME: Handle error! */ + // pSetupData->LastErrorNumber = ERROR_TXTSETUP_SECTION; + // if (pSetupData->ErrorRoutine) + // pSetupData->ErrorRoutine(pSetupData, SectionName); + return STATUS_NOT_FOUND; + } + if (!INF_GetDataField(&DirContext, 4, &SourceRootDir)) + { + /* FIXME: Handle error! */ + DPRINT1("INF_GetData() failed\n"); + return STATUS_NOT_FOUND; + } + + /* Get optional source relative directory */ + if (!INF_GetDataField(InfContext, 2, &SourceRelativePath)) + { + SourceRelativePath = NULL; + } + else if (!*SourceRelativePath) + { + INF_FreeData(SourceRelativePath); + SourceRelativePath = NULL; + } + if (!SourceRelativePath) + { + /* Use WinPE directory instead */ + if (INF_GetDataField(InfContext, 13, &TargetDirId)) + { + /* Lookup directory */ + Success = LookupDirectoryById(InfHandle, &DirContext, TargetDirId, &SourceRelativePath); + INF_FreeData(TargetDirId); + if (!Success) + { + SourceRelativePath = NULL; + } + else if (!*SourceRelativePath) + { + INF_FreeData(SourceRelativePath); + SourceRelativePath = NULL; + } + } + } + + /* + * Getting Target File Location -- SetupGetTargetPath() + */ + + /* Get target directory id */ + if (!INF_GetDataField(InfContext, 8, &TargetDirId)) + { + /* FIXME: Handle error! */ + DPRINT1("INF_GetData() failed\n"); + INF_FreeData(SourceRelativePath); + INF_FreeData(SourceRootDir); + return STATUS_NOT_FOUND; + } + + /* Lookup target directory */ + Success = LookupDirectoryById(InfHandle, &DirContext, TargetDirId, &TargetDir); + INF_FreeData(TargetDirId); + if (!Success) + { + /* FIXME: Handle error! */ + INF_FreeData(SourceRelativePath); + INF_FreeData(SourceRootDir); + return STATUS_NOT_FOUND; + } + + /* Get optional target file name */ + if (!INF_GetDataField(InfContext, 11, &TargetFileName)) + TargetFileName = NULL; + else if (!*TargetFileName) + TargetFileName = NULL; + + DPRINT("GetSourceFileAndTargetLocation(%S) = " + "SrcRootDir: '%S', SrcRelPath: '%S' --> TargetDir: '%S', TargetFileName: '%S'\n", + SourceFileName, SourceRootDir, SourceRelativePath, TargetDir, TargetFileName); + +#if 0 + INF_FreeData(TargetDir); + INF_FreeData(TargetFileName); + INF_FreeData(SourceRelativePath); + INF_FreeData(SourceRootDir); +#endif + + *pSourceRootPath = SourceRootDir; + *pSourcePath = SourceRelativePath; + *pTargetDirectory = TargetDir; + *pTargetFileName = TargetFileName; + + return STATUS_SUCCESS; +} + +static NTSTATUS +BuildFullDirectoryPath( + IN PCWSTR RootPath, + IN PCWSTR BasePath, + IN PCWSTR RelativePath, + OUT PWSTR FullPath, + IN SIZE_T cchFullPathSize) +{ + NTSTATUS Status; + + if ((RelativePath[0] == UNICODE_NULL) || (RelativePath[0] == L'\\' && RelativePath[1] == UNICODE_NULL)) + { + /* Installation path */ + DPRINT("InstallationPath: '%S'\n", RelativePath); + + Status = CombinePaths(FullPath, cchFullPathSize, 2, + RootPath, BasePath); + + DPRINT("InstallationPath(2): '%S'\n", FullPath); + } + else if (RelativePath[0] == L'\\') + { + /* Absolute path */ + DPRINT("AbsolutePath: '%S'\n", RelativePath); + + Status = CombinePaths(FullPath, cchFullPathSize, 2, + RootPath, RelativePath); + + DPRINT("AbsolutePath(2): '%S'\n", FullPath); + } + else // if (RelativePath[0] != L'\\') + { + /* Path relative to the installation path */ + DPRINT("RelativePath: '%S'\n", RelativePath); + + Status = CombinePaths(FullPath, cchFullPathSize, 3, + RootPath, BasePath, RelativePath); + + DPRINT("RelativePath(2): '%S'\n", FullPath); + } + + return Status; +} + + /* * This code enumerates the list of files in reactos.dff / reactos.inf * that need to be extracted from reactos.cab and be installed in their @@ -40,20 +290,20 @@ AddSectionToCopyQueueCab( IN PCWSTR SourceCabinet, IN PCUNICODE_STRING DestinationPath) { + BOOLEAN Success; + NTSTATUS Status; INFCONTEXT FilesContext; INFCONTEXT DirContext; - PCWSTR FileKeyName; - PCWSTR FileKeyValue; - PCWSTR DirKeyValue; + PCWSTR SourceFileName; + PCWSTR TargetDirId; + PCWSTR TargetDir; PCWSTR TargetFileName; WCHAR FileDstPath[MAX_PATH]; /* Search for the SectionName section */ if (!SpInfFindFirstLine(InfFile, SectionName, NULL, &FilesContext)) { - pSetupData->LastErrorNumber = ERROR_TXTSETUP_SECTION; - if (pSetupData->ErrorRoutine) - pSetupData->ErrorRoutine(pSetupData, SectionName); + DPRINT1("AddSectionToCopyQueueCab(): Unable to find section '%S' in cabinet file\n", SectionName); return FALSE; } @@ -63,7 +313,7 @@ AddSectionToCopyQueueCab( do { /* Get source file name and target directory id */ - if (!INF_GetData(&FilesContext, &FileKeyName, &FileKeyValue)) + if (!INF_GetData(&FilesContext, &SourceFileName, &TargetDirId)) { /* FIXME: Handle error! */ DPRINT1("INF_GetData() failed\n"); @@ -72,70 +322,45 @@ AddSectionToCopyQueueCab( /* Get optional target file name */ if (!INF_GetDataField(&FilesContext, 2, &TargetFileName)) + { TargetFileName = NULL; - - DPRINT("FileKeyName: '%S' FileKeyValue: '%S'\n", FileKeyName, FileKeyValue); - - /* Lookup target directory */ - if (!SpInfFindFirstLine(InfFile, L"Directories", FileKeyValue, &DirContext)) + } + else if (!*TargetFileName) { - /* FIXME: Handle error! */ - DPRINT1("SetupFindFirstLine() failed\n"); - INF_FreeData(FileKeyName); - INF_FreeData(FileKeyValue); INF_FreeData(TargetFileName); - break; + TargetFileName = NULL; } - INF_FreeData(FileKeyValue); - - if (!INF_GetData(&DirContext, NULL, &DirKeyValue)) + /* Lookup target directory */ + Success = LookupDirectoryById(InfFile, &DirContext, TargetDirId, &TargetDir); + INF_FreeData(TargetDirId); + if (!Success) { /* FIXME: Handle error! */ - DPRINT1("INF_GetData() failed\n"); - INF_FreeData(FileKeyName); INF_FreeData(TargetFileName); + INF_FreeData(SourceFileName); break; } -#if 1 // HACK moved! (r66604) - { - ULONG Length = wcslen(DirKeyValue); - if ((Length > 0) && (DirKeyValue[Length - 1] == L'\\')) - Length--; - *((PWSTR)DirKeyValue + Length) = UNICODE_NULL; - } - - /* Build the full target path */ - RtlStringCchCopyW(FileDstPath, ARRAYSIZE(FileDstPath), - pSetupData->DestinationRootPath.Buffer); - if (DirKeyValue[0] == UNICODE_NULL) - { - /* Installation path */ + DPRINT("GetSourceTargetFromCab(%S) = " + "SrcRootDir: '%S', SrcRelPath: '%S' --> TargetDir: '%S', TargetFileName: '%S'\n", + SourceFileName, + pSetupData->SourcePath.Buffer, + pSetupData->SourceRootDir.Buffer, + TargetDir, TargetFileName); - /* Add the installation path */ - ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, pSetupData->InstallPath.Buffer); - } - else if (DirKeyValue[0] == L'\\') - { - /* Absolute path */ - // if (DirKeyValue[1] != UNICODE_NULL) - ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, DirKeyValue); - } - else // if (DirKeyValue[0] != L'\\') - { - /* Path relative to the installation path */ + Status = CombinePaths(FileDstPath, ARRAYSIZE(FileDstPath), 2, + pSetupData->DestinationPath.Buffer, + TargetDir); + UNREFERENCED_PARAMETER(Status); + DPRINT(" --> FileDstPath = '%S'\n", FileDstPath); - /* Add the installation path */ - ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 2, - pSetupData->InstallPath.Buffer, DirKeyValue); - } -#endif + INF_FreeData(TargetDir); if (!SpFileQueueCopy((HSPFILEQ)pSetupData->SetupFileQueue, - pSetupData->SourceRootPath.Buffer, - pSetupData->SourceRootDir.Buffer, - FileKeyName, + pSetupData->SourcePath.Buffer, // SourcePath == SourceRootPath ++ SourceRootDir + NULL, + SourceFileName, NULL, SourceCabinet, NULL, @@ -147,9 +372,9 @@ AddSectionToCopyQueueCab( DPRINT1("SpFileQueueCopy() failed\n"); } - INF_FreeData(FileKeyName); INF_FreeData(TargetFileName); - INF_FreeData(DirKeyValue); + INF_FreeData(SourceFileName); + } while (SpInfFindNextLine(&FilesContext, &FilesContext)); return TRUE; @@ -171,21 +396,18 @@ AddSectionToCopyQueue( IN PUSETUP_DATA pSetupData, IN HINF InfFile, IN PCWSTR SectionName, - IN PCWSTR SourceCabinet, IN PCUNICODE_STRING DestinationPath) { + NTSTATUS Status; INFCONTEXT FilesContext; - INFCONTEXT DirContext; - PCWSTR FileKeyName; - PCWSTR FileKeyValue; - PCWSTR DirKeyValue; + PCWSTR SourceFileName; + PCWSTR SourceRootPath; + PCWSTR SourcePath; + PCWSTR TargetDirectory; PCWSTR TargetFileName; - WCHAR CompleteOrigDirName[512]; // FIXME: MAX_PATH is not enough? + WCHAR FileSrcRootPath[MAX_PATH]; WCHAR FileDstPath[MAX_PATH]; - if (SourceCabinet) - return AddSectionToCopyQueueCab(pSetupData, InfFile, L"SourceFiles", SourceCabinet, DestinationPath); - /* * This code enumerates the list of files in txtsetup.sif * that need to be installed in their respective directories. @@ -194,9 +416,7 @@ AddSectionToCopyQueue( /* Search for the SectionName section */ if (!SpInfFindFirstLine(InfFile, SectionName, NULL, &FilesContext)) { - pSetupData->LastErrorNumber = ERROR_TXTSETUP_SECTION; - if (pSetupData->ErrorRoutine) - pSetupData->ErrorRoutine(pSetupData, SectionName); + DPRINT1("AddSectionToCopyQueue(): Unable to find section '%S' in TXTSETUP.SIF\n", SectionName); return FALSE; } @@ -206,123 +426,62 @@ AddSectionToCopyQueue( do { /* Get source file name */ - if (!INF_GetDataField(&FilesContext, 0, &FileKeyName)) + if (!INF_GetDataField(&FilesContext, 0, &SourceFileName)) { /* FIXME: Handle error! */ DPRINT1("INF_GetData() failed\n"); break; } - /* Get target directory id */ - if (!INF_GetDataField(&FilesContext, 13, &FileKeyValue)) - { - /* FIXME: Handle error! */ - DPRINT1("INF_GetData() failed\n"); - INF_FreeData(FileKeyName); - break; - } - - /* Get optional target file name */ - if (!INF_GetDataField(&FilesContext, 11, &TargetFileName)) - TargetFileName = NULL; - else if (!*TargetFileName) - TargetFileName = NULL; - - DPRINT("FileKeyName: '%S' FileKeyValue: '%S'\n", FileKeyName, FileKeyValue); - - /* Lookup target directory */ - if (!SpInfFindFirstLine(InfFile, L"Directories", FileKeyValue, &DirContext)) - { - /* FIXME: Handle error! */ - DPRINT1("SetupFindFirstLine() failed\n"); - INF_FreeData(FileKeyName); - INF_FreeData(FileKeyValue); - INF_FreeData(TargetFileName); - break; - } - - INF_FreeData(FileKeyValue); - - if (!INF_GetData(&DirContext, NULL, &DirKeyValue)) + Status = GetSourceFileAndTargetLocation(InfFile, + &FilesContext, + SourceFileName, + &SourceRootPath, // SourceRootDir + &SourcePath, + &TargetDirectory, + &TargetFileName); + if (!NT_SUCCESS(Status)) { - /* FIXME: Handle error! */ - DPRINT1("INF_GetData() failed\n"); - INF_FreeData(FileKeyName); - INF_FreeData(TargetFileName); - break; - } + DPRINT1("Could not find source and target location for file '%S'\n", SourceFileName); + INF_FreeData(SourceFileName); - if ((DirKeyValue[0] == UNICODE_NULL) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == UNICODE_NULL)) - { - /* Installation path */ - DPRINT("InstallationPath: '%S'\n", DirKeyValue); - - RtlStringCchCopyW(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), - pSetupData->SourceRootDir.Buffer); - - DPRINT("InstallationPath(2): '%S'\n", CompleteOrigDirName); - } - else if (DirKeyValue[0] == L'\\') - { - /* Absolute path */ - DPRINT("AbsolutePath: '%S'\n", DirKeyValue); - - RtlStringCchCopyW(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), - DirKeyValue); - - DPRINT("AbsolutePath(2): '%S'\n", CompleteOrigDirName); - } - else // if (DirKeyValue[0] != L'\\') - { - /* Path relative to the installation path */ - DPRINT("RelativePath: '%S'\n", DirKeyValue); - - CombinePaths(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), 2, - pSetupData->SourceRootDir.Buffer, DirKeyValue); - - DPRINT("RelativePath(2): '%S'\n", CompleteOrigDirName); - } - -#if 1 // HACK moved! (r66604) - { - ULONG Length = wcslen(DirKeyValue); - if ((Length > 0) && (DirKeyValue[Length - 1] == L'\\')) - Length--; - *((PWSTR)DirKeyValue + Length) = UNICODE_NULL; - } - - /* Build the full target path */ - RtlStringCchCopyW(FileDstPath, ARRAYSIZE(FileDstPath), - pSetupData->DestinationRootPath.Buffer); - if (DirKeyValue[0] == UNICODE_NULL) - { - /* Installation path */ - - /* Add the installation path */ - ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, pSetupData->InstallPath.Buffer); - } - else if (DirKeyValue[0] == L'\\') - { - /* Absolute path */ - // if (DirKeyValue[1] != UNICODE_NULL) - ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, DirKeyValue); - } - else // if (DirKeyValue[0] != L'\\') - { - /* Path relative to the installation path */ - - /* Add the installation path */ - ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 2, - pSetupData->InstallPath.Buffer, DirKeyValue); + // FIXME: Another error? + pSetupData->LastErrorNumber = ERROR_TXTSETUP_SECTION; + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData, SectionName); + return FALSE; + // break; } -#endif + /* + * SourcePath: '\Device\CdRom0\I386' + * SourceRootPath: '\Device\CdRom0' + * SourceRootDir: '\I386' + */ + + Status = CombinePaths(FileSrcRootPath, ARRAYSIZE(FileSrcRootPath), 2, + pSetupData->SourceRootPath.Buffer, + SourceRootPath); + UNREFERENCED_PARAMETER(Status); + // DPRINT1("Could not build the full path for '%S', skipping...\n", SourceRootPath); + DPRINT(" --> FileSrcRootPath = '%S'\n", FileSrcRootPath); + + INF_FreeData(SourceRootPath); + + Status = CombinePaths(FileDstPath, ARRAYSIZE(FileDstPath), 2, + pSetupData->DestinationPath.Buffer, + TargetDirectory); + UNREFERENCED_PARAMETER(Status); + // DPRINT1("Could not build the full path for '%S', skipping...\n", TargetDirectory); + DPRINT(" --> FileDstPath = '%S'\n", FileDstPath); + + INF_FreeData(TargetDirectory); if (!SpFileQueueCopy((HSPFILEQ)pSetupData->SetupFileQueue, - pSetupData->SourceRootPath.Buffer, - CompleteOrigDirName, - FileKeyName, + FileSrcRootPath, + SourcePath, + SourceFileName, NULL, - SourceCabinet, + NULL, // No SourceCabinet NULL, FileDstPath, TargetFileName, @@ -332,9 +491,10 @@ AddSectionToCopyQueue( DPRINT1("SpFileQueueCopy() failed\n"); } - INF_FreeData(FileKeyName); INF_FreeData(TargetFileName); - INF_FreeData(DirKeyValue); + INF_FreeData(SourcePath); + INF_FreeData(SourceFileName); + } while (SpInfFindNextLine(&FilesContext, &FilesContext)); return TRUE; @@ -346,31 +506,77 @@ PrepareCopyInfFile( IN HINF InfFile, IN PCWSTR SourceCabinet OPTIONAL) { + BOOLEAN Success; NTSTATUS Status; INFCONTEXT DirContext; PWCHAR AdditionalSectionName = NULL; PCWSTR DirKeyValue; WCHAR PathBuffer[MAX_PATH]; - /* Add common files */ - if (!AddSectionToCopyQueue(pSetupData, InfFile, L"SourceDisksFiles", SourceCabinet, &pSetupData->DestinationPath)) - return FALSE; - - /* Add specific files depending of computer type */ if (SourceCabinet == NULL) { + /* Add common files -- Search for the SourceDisksFiles section */ + /* Search in the optional platform-specific first (currently hardcoded; make it runtime-dependent?) */ + Success = AddSectionToCopyQueue(pSetupData, InfFile, + L"SourceDisksFiles." INF_ARCH, + &pSetupData->DestinationPath); + if (!Success) + { + DPRINT1("AddSectionToCopyQueue(%S) failed!\n", L"SourceDisksFiles." INF_ARCH); + } + /* Search in the global section */ + Success = AddSectionToCopyQueue(pSetupData, InfFile, + L"SourceDisksFiles", + &pSetupData->DestinationPath); + if (!Success) + { + DPRINT1("AddSectionToCopyQueue(%S) failed!\n", L"SourceDisksFiles"); + pSetupData->LastErrorNumber = ERROR_TXTSETUP_SECTION; + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData, L"SourceDisksFiles"); + return FALSE; + } + + /* Add specific files depending of computer type */ if (!ProcessComputerFiles(InfFile, pSetupData->ComputerList, &AdditionalSectionName)) return FALSE; - if (AdditionalSectionName) + if (AdditionalSectionName && + !AddSectionToCopyQueue(pSetupData, InfFile, + AdditionalSectionName, + &pSetupData->DestinationPath)) { - if (!AddSectionToCopyQueue(pSetupData, InfFile, AdditionalSectionName, SourceCabinet, &pSetupData->DestinationPath)) - return FALSE; + pSetupData->LastErrorNumber = ERROR_TXTSETUP_SECTION; + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData, AdditionalSectionName); + return FALSE; + } + } + else + { + /* Process a cabinet INF */ + Success = AddSectionToCopyQueueCab(pSetupData, InfFile, + L"SourceFiles", + SourceCabinet, + &pSetupData->DestinationPath); + if (!Success) + { + DPRINT1("AddSectionToCopyQueueCab(%S) failed!\n", SourceCabinet); + pSetupData->LastErrorNumber = ERROR_CABINET_SECTION; + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData, L"SourceFiles"); + return FALSE; } } /* Create directories */ + /* + * NOTE: This is technically optional since SpFileQueueCommit() + * does that. This is however needed if one wants to create + * empty directories. + */ + /* * FIXME: * Copying files to pSetupData->DestinationRootPath should be done from within @@ -380,7 +586,8 @@ PrepareCopyInfFile( */ /* Get destination path */ - RtlStringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), pSetupData->DestinationPath.Buffer); + RtlStringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), + pSetupData->DestinationPath.Buffer); DPRINT("FullPath(1): '%S'\n", PathBuffer); @@ -396,16 +603,21 @@ PrepareCopyInfFile( } /* Search for the 'Directories' section */ + // ReactOS-specific if (!SpInfFindFirstLine(InfFile, L"Directories", NULL, &DirContext)) { - if (SourceCabinet) - pSetupData->LastErrorNumber = ERROR_CABINET_SECTION; - else - pSetupData->LastErrorNumber = ERROR_TXTSETUP_SECTION; + // Windows-compatible + if (!SpInfFindFirstLine(InfFile, L"WinntDirectories", NULL, &DirContext)) + { + if (SourceCabinet) + pSetupData->LastErrorNumber = ERROR_CABINET_SECTION; + else + pSetupData->LastErrorNumber = ERROR_TXTSETUP_SECTION; - if (pSetupData->ErrorRoutine) - pSetupData->ErrorRoutine(pSetupData, L"Directories"); - return FALSE; + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData, L"Directories"); + return FALSE; + } } /* Enumerate the directory values and create the subdirectories */ @@ -417,47 +629,28 @@ PrepareCopyInfFile( break; } - if ((DirKeyValue[0] == UNICODE_NULL) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == UNICODE_NULL)) + Status = BuildFullDirectoryPath(pSetupData->DestinationRootPath.Buffer, + pSetupData->InstallPath.Buffer, + DirKeyValue, + PathBuffer, + ARRAYSIZE(PathBuffer)); + if (!NT_SUCCESS(Status)) { - /* Installation path */ - DPRINT("InstallationPath: '%S'\n", DirKeyValue); - - RtlStringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), - pSetupData->DestinationPath.Buffer); - - DPRINT("InstallationPath(2): '%S'\n", PathBuffer); + DPRINT1("Could not build the full path for '%S', skipping...\n", DirKeyValue); + INF_FreeData(DirKeyValue); + continue; } - else if (DirKeyValue[0] == L'\\') - { - /* Absolute path */ - DPRINT("AbsolutePath: '%S'\n", DirKeyValue); - - CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, - pSetupData->DestinationRootPath.Buffer, DirKeyValue); - DPRINT("AbsolutePath(2): '%S'\n", PathBuffer); - - Status = SetupCreateDirectory(PathBuffer); - if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) - { - INF_FreeData(DirKeyValue); - DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); - pSetupData->LastErrorNumber = ERROR_CREATE_DIR; - if (pSetupData->ErrorRoutine) - pSetupData->ErrorRoutine(pSetupData, PathBuffer); - return FALSE; - } + if ((DirKeyValue[0] == UNICODE_NULL) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == UNICODE_NULL)) + { + /* + * Installation path -- No need to create it + * because it has been already created above. + */ } - else // if (DirKeyValue[0] != L'\\') + else { - /* Path relative to the installation path */ - DPRINT("RelativePath: '%S'\n", DirKeyValue); - - CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, - pSetupData->DestinationPath.Buffer, DirKeyValue); - - DPRINT("RelativePath(2): '%S'\n", PathBuffer); - + /* Arbitrary path -- Create it */ Status = SetupCreateDirectory(PathBuffer); if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) {

1 0

03/13: [BOOTDATA] Use a Win2k3-compatible TXTSETUP.SIF layout for the specification of the files list.
by Hermès Bélusca-Maïto 05 Nov '18

05 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81c0d8a256dc223aba357… commit 81c0d8a256dc223aba35750134a3d4ff83929755 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 7 01:47:52 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 5 23:35:12 2018 +0100 [BOOTDATA] Use a Win2k3-compatible TXTSETUP.SIF layout for the specification of the files list. Also add detailed documentation about the meaning of each field, obtained from: - my own tests; - http://www.msfn.org/board/topic/125480-txtsetupsif-syntax/ - http://www.msfn.org/board/topic/127677-txtsetupsif-layoutinf-reference/ In addition, add a spreadsheet that helps generating the files list. Note that the files source directory is "\reactos", until we use per-architecture directories in the installation medium. --- boot/bootdata/txtsetup.sif | 192 +++++++++++++++++++--------- boot/bootdata/txtsetup_sourcedisksfiles.ods | Bin 0 -> 6085 bytes 2 files changed, 133 insertions(+), 59 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index f7f44d8f9b..808c2e2bc7 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -1,11 +1,36 @@ [Version] Signature = "$ReactOS$" -; Directories relative to the installation directory. +; +; The [SourceDisksNames] section lists all the available installation media +; where the installation files can be found. It can specifies media common +; to all architectures, or media specific to a given architecture (x86, amd64, +; and so on...) within [SourceDisksNames.x86] (etc...) sections. +; +; The format of each line is as follows: +; <disk_id> = <description>,<tagfile>,<unused>,<subdirectory>,<flags>,<tagfile> +; +[SourceDisksNames] +_1 = %cdname%,%cdtagfile%,,"" + +[SourceDisksNames.x86] +;1 = %cdname%,%cdtagfilei%,,\i386 +1 = %cdname%,%cdtagfilei%,,\reactos + +[SourceDisksNames.amd64] +1 = %cdname%,%cdtagfilea%,,\amd64 + +; +; The directories listed in the [Directories] or [WinntDirectories] sections +; are relative to the installation source or destination directories. +; +; The format of each line is as follows: +; <directory_id> = <path> +; ; For specifying absolute directories, use the SystemPartitionFiles section, ; or use names starting with \. +; [Directories] -; <directory_id> = <path> 1 = "\" 2 = system32 3 = system32\config @@ -18,57 +43,106 @@ Signature = "$ReactOS$" ; Required free system partition disk space in MB FreeSysPartDiskSpace=450 +; +; The [SourceDisksFiles] section lists all the files available to the +; installer. It can specifies files common to all architectures, or files +; specific to a given architecture (x86, amd64, and so on...) within +; [SourceDisksFiles.x86] (etc...) sections. +; +; Each line provides the location of a file in the installation media +; and its destination when being installed on a target architecture. +; The format of each line is as follows: +; +; <source_filename> = +; <disk_id>,<subdirectory>,<file_size>,<checksum>,<unused>,<unused>, +; NT-specific fields: +; <boot_media_id>,<destination_dir_id>,<upgrade_dispo>,<install_dispo>, +; <destination_filename>, +; WinPE(MiniNT)-specific optional fields: +; <WinPE_disk_id>,<WinPE_directory_id> +; +; The 'disk_id', 'boot_media_id' and 'WinPE_disk_id' media IDs refer to +; source media listed in the [SourceDisksNames] section. The 'boot_media_id' +; value specifies any additional boot/installation media. +; +; The values for the disposition flags 'upgrade_dispo' (used when upgrading) +; or 'install_dispo' (used when installing, usually by the text-mode installer) +; are: +; 0: always copy (default); +; 1: copy if present; +; 2: copy if not present; +; 3: never copy. +; +; The 'destination_dir_id' and 'WinPE_directory_id' directory IDs refer to +; the directories listed in the [Directories] section. +; +; ReactOS-specific: we don't use 'boot_media_id' yet and instead, we use +; an identifier 'x' to signal the SetupLdr that it has to load the file. +; This must be replaced by handling the "DiskDrivers.Load", "FileSystems.Load", +; ("Hal.Load", "Display.Load"), "SCSI.Load", "BootBusExtenders.Load", +; "BusExtenders.Load", "InputDevicesSupport.Load", "Keyboard.Load", +; "ScsiClass.Load", "FloppyDrivers.Load", "CdRomDrivers.Load", and +; "MouseDrivers.Load" sections. +; [SourceDisksFiles] -acpi.sys=,,,,,,,,,,,,4 -nmidebug.sys=,,,,,,x,,,,,,4 -sacdrv.sys=,,,,,,x,,,,,,4 -uniata.sys=,,,,,,x,,,,,,4 -buslogic.sys=,,,,,,x,,,,,,4 -storahci.sys=,,,,,,x,,,,,,4 -blue.sys=,,,,,,x,,,,,,4 -vgafonts.cab=,,,,,,,,,,,,1 -bootvid.dll=,,,,,,,,,,,,2 -c_437.nls=,,,,,,,,,,,,2 -c_1252.nls=,,,,,,,,,,,,2 -cdfs.sys=,,,,,,x,,,,,,4 -cdrom.sys=,,,,,,x,,,,,,4 -class2.sys=,,,,,,x,,,,,,4 -isapnp.sys=,,,,,,,,,,,,4 -kdcom.dll=,,,,,,,,,,,,2 -kdvbox.dll=,,,,,,,,,,,,2 -disk.sys=,,,,,,x,,,,,,4 -floppy.sys=,,,,,,x,,,,,,4 -i8042prt.sys=,,,,,,,,,,,,4 -hidclass.sys=,,,,,,,,,,,,4 -hidparse.sys=,,,,,,,,,,,,4 -hidusb.sys=,,,,,,,,,,,,4 -usbccgp.sys=,,,,,,x,,,,,,4 -usbd.sys=,,,,,,x,,,,,,4 -usbhub.sys=,,,,,,x,,,,,,4 -usbuhci.sys=,,,,,,x,,,,,,4 -usbohci.sys=,,,,,,x,,,,,,4 -usbehci.sys=,,,,,,x,,,,,,4 -usbstor.sys=,,,,,,x,,,,,,4 -kbdhid.sys=,,,,,,,,,,,,4 -kbdclass.sys=,,,,,,x,,,,,,4 -l_intl.nls=,,,,,,,,,,,,2 -pci.sys=,,,,,,,,,,,,4 -scsiport.sys=,,,,,,x,,,,,,4 -storport.sys=,,,,,,x,,,,,,4 -fastfat.sys=,,,,,,x,,,,,,4 -btrfs.sys=,,,,,,x,,,,,,4 -ramdisk.sys=,,,,,,x,,,,,,4 -classpnp.sys=,,,,,,,,,,,,4 -pciide.sys=,,,,,,,,,,,,4 -pciidex.sys=,,,,,,,,,,,,4 -pcix.sys=,,,,,,,,,,,,4 -pcmcia.sys=,,,,,,,,,,,,4 -swenum.sys=,,,,,,,,,,,,4 -ntdll.dll=,,,,,,,,,,,,2 -wmilib.sys=,,,,,,,,,,,,4 -ksecdd.sys=,,,,,,,,,,,,4 -mountmgr.sys=,,,,,,x,,,,,,4 +acpi.sys = 1,,,,,,,4,1,,,1,4 +nmidebug.sys = 1,,,,,,x,4,,,,1,4 +sacdrv.sys = 1,,,,,,x,4,,,,1,4 +uniata.sys = 1,,,,,,x,4,,,,1,4 +buslogic.sys = 1,,,,,,x,4,,,,1,4 +storahci.sys = 1,,,,,,x,4,,,,1,4 +blue.sys = 1,,,,,,x,4,,,,1,4 +vgafonts.cab = 1,,,,,,,1,,,,1,1 +bootvid.dll = 1,,,,,,,2,,,,1,2 +c_437.nls = 1,,,,,,,2,,,,1,2 +c_1252.nls = 1,,,,,,,2,,,,1,2 +cdfs.sys = 1,,,,,,x,4,,,,1,4 +cdrom.sys = 1,,,,,,x,4,,,,1,4 +class2.sys = 1,,,,,,x,4,,,,1,4 +isapnp.sys = 1,,,,,,,4,,,,1,4 +kdcom.dll = 1,,,,,,,2,,,,1,2 +kdvbox.dll = 1,,,,,,,2,,,,1,2 +disk.sys = 1,,,,,,x,4,,,,1,4 +floppy.sys = 1,,,,,,x,4,,,,1,4 +i8042prt.sys = 1,,,,,,,4,,,,1,4 +hidclass.sys = 1,,,,,,,4,,,,1,4 +hidparse.sys = 1,,,,,,,4,,,,1,4 +hidusb.sys = 1,,,,,,,4,,,,1,4 +usbccgp.sys = 1,,,,,,x,4,,,,1,4 +usbd.sys = 1,,,,,,x,4,,,,1,4 +usbhub.sys = 1,,,,,,x,4,,,,1,4 +usbuhci.sys = 1,,,,,,x,4,,,,1,4 +usbohci.sys = 1,,,,,,x,4,,,,1,4 +usbehci.sys = 1,,,,,,x,4,,,,1,4 +usbstor.sys = 1,,,,,,x,4,,,,1,4 +kbdhid.sys = 1,,,,,,,4,,,,1,4 +kbdclass.sys = 1,,,,,,x,4,,,,1,4 +l_intl.nls = 1,,,,,,,2,,,,1,2 +pci.sys = 1,,,,,,,4,,,,1,4 +scsiport.sys = 1,,,,,,x,4,,,,1,4 +storport.sys = 1,,,,,,x,4,,,,1,4 +fastfat.sys = 1,,,,,,x,4,,,,1,4 +btrfs.sys = 1,,,,,,x,4,,,,1,4 +ramdisk.sys = 1,,,,,,x,4,,,,1,4 +classpnp.sys = 1,,,,,,,4,,,,1,4 +pciide.sys = 1,,,,,,,4,,,,1,4 +pciidex.sys = 1,,,,,,,4,,,,1,4 +pcix.sys = 1,,,,,,,4,,,,1,4 +pcmcia.sys = 1,,,,,,,4,,,,1,4 +swenum.sys = 1,,,,,,,4,,,,1,4 +ntdll.dll = 1,,,,,,,2,,,,1,2 +wmilib.sys = 1,,,,,,,4,,,,1,4 +ksecdd.sys = 1,,,,,,,4,,,,1,4 +mountmgr.sys = 1,,,,,,x,4,,,,1,4 + +[SourceDisksFiles.x86] + +[SourceDisksFiles.amd64] +; +; The [SystemPartitionFiles] section lists all the files +; that should be installed in the System Partition. +; [SystemPartitionFiles] [HardwareIdsDatabase] @@ -158,20 +232,20 @@ acpi_up = "ACPI UP" ;acpi_mp = "ACPI MP" [Files.pci_up] -ntoskrnl.exe=,,,,,,,,,,,,2 -hal.dll=,,,,,,,,,,,,2 +ntoskrnl.exe = 1,,,,,,,2,,,,1,2 +hal.dll = 1,,,,,,,2,,,,1,2 ;[Files.pci_mp] -;ntkrnlmp.exe=,,,,,,,,,,ntoskrnl.exe,,2 -;halmps.dll=,,,,,,,,,,hal.dll,,2 +;ntkrnlmp.exe = 1,,,,,,,2,,,ntoskrnl.exe,1,2 +;halmps.dll = 1,,,,,,,2,,,hal.dll,1,2 [Files.acpi_up] -ntoskrnl.exe=,,,,,,,,,,,,2 -halacpi.dll=,,,,,,,,,,hal.dll,,2 +ntoskrnl.exe = 1,,,,,,,2,,,,1,2 +halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 ;[Files.acpi_mp] -;ntkrnlmp.exe=,,,,,,,,,,ntoskrnl.exe,,2 -;halacpi.dll=,,,,,,,,,,hal.dll,,2 +;ntkrnlmp.exe = 1,,,,,,,2,,,ntoskrnl.exe,1,2 +;halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 [Display] ;<id> = <user friendly name>,<spare>,<service key name>,<height>,<width>,<bpp> diff --git a/boot/bootdata/txtsetup_sourcedisksfiles.ods b/boot/bootdata/txtsetup_sourcedisksfiles.ods new file mode 100644 index 0000000000..5303c9ea39 Binary files /dev/null and b/boot/bootdata/txtsetup_sourcedisksfiles.ods differ

1 0

02/13: [SETUPLIB][USETUP] Move all the code that performs file copying into the SETUPLIB.
by Hermès Bélusca-Maïto 05 Nov '18

05 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d137b05d16dfbd8a2c93… commit 3d137b05d16dfbd8a2c93e6485d28374acd3aeee Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 7 01:35:48 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 5 23:18:47 2018 +0100 [SETUPLIB][USETUP] Move all the code that performs file copying into the SETUPLIB. --- base/setup/lib/CMakeLists.txt | 1 + base/setup/lib/install.c | 643 ++++++++++++++++++++++++++++++++++++++++++ base/setup/lib/install.h | 40 +++ base/setup/lib/setuplib.h | 6 + base/setup/usetup/usetup.c | 539 +---------------------------------- 5 files changed, 699 insertions(+), 530 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index 7c23e24045..0d2f3a8aeb 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -17,6 +17,7 @@ list(APPEND SOURCE utils/regutil.c bootsup.c fsutil.c + install.c mui.c registry.c settings.c diff --git a/base/setup/lib/install.c b/base/setup/lib/install.c new file mode 100644 index 0000000000..31ece47b0d --- /dev/null +++ b/base/setup/lib/install.c @@ -0,0 +1,643 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Setup Library + * FILE: base/setup/lib/install.c + * PURPOSE: Installation functions + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" +#include "filesup.h" +#include "infsupp.h" + +#include "setuplib.h" // HAXX for USETUP_DATA!! + +#include "install.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ****************************************************************/ + +/* + * This code enumerates the list of files in reactos.dff / reactos.inf + * that need to be extracted from reactos.cab and be installed in their + * respective directories. + */ +/* + * IMPORTANT NOTE: The INF file specification used for the .CAB in ReactOS + * is not compliant with respect to TXTSETUP.SIF syntax or the standard syntax. + */ +static BOOLEAN +AddSectionToCopyQueueCab( + IN PUSETUP_DATA pSetupData, + IN HINF InfFile, + IN PCWSTR SectionName, + IN PCWSTR SourceCabinet, + IN PCUNICODE_STRING DestinationPath) +{ + INFCONTEXT FilesContext; + INFCONTEXT DirContext; + PCWSTR FileKeyName; + PCWSTR FileKeyValue; + PCWSTR DirKeyValue; + PCWSTR TargetFileName; + WCHAR FileDstPath[MAX_PATH]; + + /* Search for the SectionName section */ + if (!SpInfFindFirstLine(InfFile, SectionName, NULL, &FilesContext)) + { + pSetupData->LastErrorNumber = ERROR_TXTSETUP_SECTION; + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData, SectionName); + return FALSE; + } + + /* + * Enumerate the files in the section and add them to the file queue. + */ + do + { + /* Get source file name and target directory id */ + if (!INF_GetData(&FilesContext, &FileKeyName, &FileKeyValue)) + { + /* FIXME: Handle error! */ + DPRINT1("INF_GetData() failed\n"); + break; + } + + /* Get optional target file name */ + if (!INF_GetDataField(&FilesContext, 2, &TargetFileName)) + TargetFileName = NULL; + + DPRINT("FileKeyName: '%S' FileKeyValue: '%S'\n", FileKeyName, FileKeyValue); + + /* Lookup target directory */ + if (!SpInfFindFirstLine(InfFile, L"Directories", FileKeyValue, &DirContext)) + { + /* FIXME: Handle error! */ + DPRINT1("SetupFindFirstLine() failed\n"); + INF_FreeData(FileKeyName); + INF_FreeData(FileKeyValue); + INF_FreeData(TargetFileName); + break; + } + + INF_FreeData(FileKeyValue); + + if (!INF_GetData(&DirContext, NULL, &DirKeyValue)) + { + /* FIXME: Handle error! */ + DPRINT1("INF_GetData() failed\n"); + INF_FreeData(FileKeyName); + INF_FreeData(TargetFileName); + break; + } + +#if 1 // HACK moved! (r66604) + { + ULONG Length = wcslen(DirKeyValue); + if ((Length > 0) && (DirKeyValue[Length - 1] == L'\\')) + Length--; + *((PWSTR)DirKeyValue + Length) = UNICODE_NULL; + } + + /* Build the full target path */ + RtlStringCchCopyW(FileDstPath, ARRAYSIZE(FileDstPath), + pSetupData->DestinationRootPath.Buffer); + if (DirKeyValue[0] == UNICODE_NULL) + { + /* Installation path */ + + /* Add the installation path */ + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, pSetupData->InstallPath.Buffer); + } + else if (DirKeyValue[0] == L'\\') + { + /* Absolute path */ + // if (DirKeyValue[1] != UNICODE_NULL) + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, DirKeyValue); + } + else // if (DirKeyValue[0] != L'\\') + { + /* Path relative to the installation path */ + + /* Add the installation path */ + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 2, + pSetupData->InstallPath.Buffer, DirKeyValue); + } +#endif + + if (!SpFileQueueCopy((HSPFILEQ)pSetupData->SetupFileQueue, + pSetupData->SourceRootPath.Buffer, + pSetupData->SourceRootDir.Buffer, + FileKeyName, + NULL, + SourceCabinet, + NULL, + FileDstPath, + TargetFileName, + 0 /* FIXME */)) + { + /* FIXME: Handle error! */ + DPRINT1("SpFileQueueCopy() failed\n"); + } + + INF_FreeData(FileKeyName); + INF_FreeData(TargetFileName); + INF_FreeData(DirKeyValue); + } while (SpInfFindNextLine(&FilesContext, &FilesContext)); + + return TRUE; +} + +// Note: Modeled after the SetupQueueCopySection() API +/* +BOOL SetupQueueCopySection( + _In_ HSPFILEQ QueueHandle, + _In_ PCTSTR SourceRootPath, + _In_ HINF InfHandle, + _In_ HINF ListInfHandle, + _In_ PCTSTR Section, + _In_ DWORD CopyStyle +); +*/ +static BOOLEAN +AddSectionToCopyQueue( + IN PUSETUP_DATA pSetupData, + IN HINF InfFile, + IN PCWSTR SectionName, + IN PCWSTR SourceCabinet, + IN PCUNICODE_STRING DestinationPath) +{ + INFCONTEXT FilesContext; + INFCONTEXT DirContext; + PCWSTR FileKeyName; + PCWSTR FileKeyValue; + PCWSTR DirKeyValue; + PCWSTR TargetFileName; + WCHAR CompleteOrigDirName[512]; // FIXME: MAX_PATH is not enough? + WCHAR FileDstPath[MAX_PATH]; + + if (SourceCabinet) + return AddSectionToCopyQueueCab(pSetupData, InfFile, L"SourceFiles", SourceCabinet, DestinationPath); + + /* + * This code enumerates the list of files in txtsetup.sif + * that need to be installed in their respective directories. + */ + + /* Search for the SectionName section */ + if (!SpInfFindFirstLine(InfFile, SectionName, NULL, &FilesContext)) + { + pSetupData->LastErrorNumber = ERROR_TXTSETUP_SECTION; + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData, SectionName); + return FALSE; + } + + /* + * Enumerate the files in the section and add them to the file queue. + */ + do + { + /* Get source file name */ + if (!INF_GetDataField(&FilesContext, 0, &FileKeyName)) + { + /* FIXME: Handle error! */ + DPRINT1("INF_GetData() failed\n"); + break; + } + + /* Get target directory id */ + if (!INF_GetDataField(&FilesContext, 13, &FileKeyValue)) + { + /* FIXME: Handle error! */ + DPRINT1("INF_GetData() failed\n"); + INF_FreeData(FileKeyName); + break; + } + + /* Get optional target file name */ + if (!INF_GetDataField(&FilesContext, 11, &TargetFileName)) + TargetFileName = NULL; + else if (!*TargetFileName) + TargetFileName = NULL; + + DPRINT("FileKeyName: '%S' FileKeyValue: '%S'\n", FileKeyName, FileKeyValue); + + /* Lookup target directory */ + if (!SpInfFindFirstLine(InfFile, L"Directories", FileKeyValue, &DirContext)) + { + /* FIXME: Handle error! */ + DPRINT1("SetupFindFirstLine() failed\n"); + INF_FreeData(FileKeyName); + INF_FreeData(FileKeyValue); + INF_FreeData(TargetFileName); + break; + } + + INF_FreeData(FileKeyValue); + + if (!INF_GetData(&DirContext, NULL, &DirKeyValue)) + { + /* FIXME: Handle error! */ + DPRINT1("INF_GetData() failed\n"); + INF_FreeData(FileKeyName); + INF_FreeData(TargetFileName); + break; + } + + if ((DirKeyValue[0] == UNICODE_NULL) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == UNICODE_NULL)) + { + /* Installation path */ + DPRINT("InstallationPath: '%S'\n", DirKeyValue); + + RtlStringCchCopyW(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), + pSetupData->SourceRootDir.Buffer); + + DPRINT("InstallationPath(2): '%S'\n", CompleteOrigDirName); + } + else if (DirKeyValue[0] == L'\\') + { + /* Absolute path */ + DPRINT("AbsolutePath: '%S'\n", DirKeyValue); + + RtlStringCchCopyW(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), + DirKeyValue); + + DPRINT("AbsolutePath(2): '%S'\n", CompleteOrigDirName); + } + else // if (DirKeyValue[0] != L'\\') + { + /* Path relative to the installation path */ + DPRINT("RelativePath: '%S'\n", DirKeyValue); + + CombinePaths(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), 2, + pSetupData->SourceRootDir.Buffer, DirKeyValue); + + DPRINT("RelativePath(2): '%S'\n", CompleteOrigDirName); + } + +#if 1 // HACK moved! (r66604) + { + ULONG Length = wcslen(DirKeyValue); + if ((Length > 0) && (DirKeyValue[Length - 1] == L'\\')) + Length--; + *((PWSTR)DirKeyValue + Length) = UNICODE_NULL; + } + + /* Build the full target path */ + RtlStringCchCopyW(FileDstPath, ARRAYSIZE(FileDstPath), + pSetupData->DestinationRootPath.Buffer); + if (DirKeyValue[0] == UNICODE_NULL) + { + /* Installation path */ + + /* Add the installation path */ + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, pSetupData->InstallPath.Buffer); + } + else if (DirKeyValue[0] == L'\\') + { + /* Absolute path */ + // if (DirKeyValue[1] != UNICODE_NULL) + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, DirKeyValue); + } + else // if (DirKeyValue[0] != L'\\') + { + /* Path relative to the installation path */ + + /* Add the installation path */ + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 2, + pSetupData->InstallPath.Buffer, DirKeyValue); + } +#endif + + if (!SpFileQueueCopy((HSPFILEQ)pSetupData->SetupFileQueue, + pSetupData->SourceRootPath.Buffer, + CompleteOrigDirName, + FileKeyName, + NULL, + SourceCabinet, + NULL, + FileDstPath, + TargetFileName, + 0 /* FIXME */)) + { + /* FIXME: Handle error! */ + DPRINT1("SpFileQueueCopy() failed\n"); + } + + INF_FreeData(FileKeyName); + INF_FreeData(TargetFileName); + INF_FreeData(DirKeyValue); + } while (SpInfFindNextLine(&FilesContext, &FilesContext)); + + return TRUE; +} + +BOOLEAN // ERROR_NUMBER +PrepareCopyInfFile( + IN OUT PUSETUP_DATA pSetupData, + IN HINF InfFile, + IN PCWSTR SourceCabinet OPTIONAL) +{ + NTSTATUS Status; + INFCONTEXT DirContext; + PWCHAR AdditionalSectionName = NULL; + PCWSTR DirKeyValue; + WCHAR PathBuffer[MAX_PATH]; + + /* Add common files */ + if (!AddSectionToCopyQueue(pSetupData, InfFile, L"SourceDisksFiles", SourceCabinet, &pSetupData->DestinationPath)) + return FALSE; + + /* Add specific files depending of computer type */ + if (SourceCabinet == NULL) + { + if (!ProcessComputerFiles(InfFile, pSetupData->ComputerList, &AdditionalSectionName)) + return FALSE; + + if (AdditionalSectionName) + { + if (!AddSectionToCopyQueue(pSetupData, InfFile, AdditionalSectionName, SourceCabinet, &pSetupData->DestinationPath)) + return FALSE; + } + } + + /* Create directories */ + + /* + * FIXME: + * Copying files to pSetupData->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 pSetupData->DestinationPath specify just '\' . + */ + + /* Get destination path */ + RtlStringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), pSetupData->DestinationPath.Buffer); + + DPRINT("FullPath(1): '%S'\n", PathBuffer); + + /* Create the install directory */ + Status = SetupCreateDirectory(PathBuffer); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) + { + DPRINT1("Creating directory '%S' failed: Status = 0x%08lx\n", PathBuffer, Status); + pSetupData->LastErrorNumber = ERROR_CREATE_INSTALL_DIR; + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData, PathBuffer); + return FALSE; + } + + /* Search for the 'Directories' section */ + if (!SpInfFindFirstLine(InfFile, L"Directories", NULL, &DirContext)) + { + if (SourceCabinet) + pSetupData->LastErrorNumber = ERROR_CABINET_SECTION; + else + pSetupData->LastErrorNumber = ERROR_TXTSETUP_SECTION; + + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData, L"Directories"); + return FALSE; + } + + /* Enumerate the directory values and create the subdirectories */ + do + { + if (!INF_GetData(&DirContext, NULL, &DirKeyValue)) + { + DPRINT1("break\n"); + break; + } + + if ((DirKeyValue[0] == UNICODE_NULL) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == UNICODE_NULL)) + { + /* Installation path */ + DPRINT("InstallationPath: '%S'\n", DirKeyValue); + + RtlStringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), + pSetupData->DestinationPath.Buffer); + + DPRINT("InstallationPath(2): '%S'\n", PathBuffer); + } + else if (DirKeyValue[0] == L'\\') + { + /* Absolute path */ + DPRINT("AbsolutePath: '%S'\n", DirKeyValue); + + CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, + pSetupData->DestinationRootPath.Buffer, DirKeyValue); + + DPRINT("AbsolutePath(2): '%S'\n", PathBuffer); + + Status = SetupCreateDirectory(PathBuffer); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) + { + INF_FreeData(DirKeyValue); + DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); + pSetupData->LastErrorNumber = ERROR_CREATE_DIR; + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData, PathBuffer); + return FALSE; + } + } + else // if (DirKeyValue[0] != L'\\') + { + /* Path relative to the installation path */ + DPRINT("RelativePath: '%S'\n", DirKeyValue); + + CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, + pSetupData->DestinationPath.Buffer, DirKeyValue); + + DPRINT("RelativePath(2): '%S'\n", PathBuffer); + + Status = SetupCreateDirectory(PathBuffer); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) + { + INF_FreeData(DirKeyValue); + DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); + pSetupData->LastErrorNumber = ERROR_CREATE_DIR; + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData, PathBuffer); + return FALSE; + } + } + + INF_FreeData(DirKeyValue); + } while (SpInfFindNextLine(&DirContext, &DirContext)); + + return TRUE; +} + + +// #define USE_CABINET_INF + +BOOLEAN // ERROR_NUMBER +PrepareFileCopy( + IN OUT PUSETUP_DATA pSetupData, + IN PFILE_COPY_STATUS_ROUTINE StatusRoutine OPTIONAL) +{ + HINF InfHandle; + INFCONTEXT CabinetsContext; + PCWSTR CabinetName; + UINT ErrorLine; +#if defined(__REACTOS__) && defined(USE_CABINET_INF) + ULONG InfFileSize; + PVOID InfFileData; + CABINET_CONTEXT CabinetContext; +#endif + WCHAR PathBuffer[MAX_PATH]; + + /* Create the file queue */ + pSetupData->SetupFileQueue = (PVOID)SpFileQueueOpen(); + if (pSetupData->SetupFileQueue == NULL) + { + pSetupData->LastErrorNumber = ERROR_COPY_QUEUE; + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData); + return FALSE; + } + + /* Prepare the copy of the common files that are not in installation cabinets */ + if (!PrepareCopyInfFile(pSetupData, pSetupData->SetupInf, NULL)) + { + /* FIXME: show an error dialog */ + return FALSE; + } + + /* Search for the 'Cabinets' section */ + if (!SpInfFindFirstLine(pSetupData->SetupInf, L"Cabinets", NULL, &CabinetsContext)) + { + /* Skip this step and return success if no cabinet file is listed */ + return TRUE; + } + + /* + * Enumerate the installation cabinets listed in the + * 'Cabinets' section and parse their inf files. + */ + do + { + if (!INF_GetData(&CabinetsContext, NULL, &CabinetName)) + break; + + CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, + pSetupData->SourcePath.Buffer, CabinetName); + +#if defined(__REACTOS__) && defined(USE_CABINET_INF) + INF_FreeData(CabinetName); + + CabinetInitialize(&CabinetContext); + CabinetSetEventHandlers(&CabinetContext, NULL, NULL, NULL); + CabinetSetCabinetName(&CabinetContext, PathBuffer); + + if (CabinetOpen(&CabinetContext) == CAB_STATUS_SUCCESS) + { + DPRINT("Cabinet %S\n", PathBuffer); + + InfFileData = CabinetGetCabinetReservedArea(&CabinetContext, &InfFileSize); + if (InfFileData == NULL) + { + CabinetCleanup(&CabinetContext); + + pSetupData->LastErrorNumber = ERROR_CABINET_SCRIPT; + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData, PathBuffer); + return FALSE; + } + } + else + { + DPRINT("Cannot open cabinet: %S.\n", PathBuffer); + CabinetCleanup(&CabinetContext); + + pSetupData->LastErrorNumber = ERROR_CABINET_MISSING; + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData, PathBuffer); + return FALSE; + } + + InfHandle = INF_OpenBufferedFileA((PSTR)InfFileData, + InfFileSize, + NULL, + INF_STYLE_WIN4, + pSetupData->LanguageId, + &ErrorLine); + + CabinetCleanup(&CabinetContext); +#else + { + PWCHAR ptr; + + /* First find the filename */ + ptr = wcsrchr(PathBuffer, L'\\'); + if (!ptr) ptr = PathBuffer; + + /* Then find its extension */ + ptr = wcsrchr(ptr, L'.'); + if (!ptr) + ptr = PathBuffer + wcslen(PathBuffer); + + /* Replace it by '.inf' */ + wcscpy(ptr, L".inf"); + + InfHandle = SpInfOpenInfFile(PathBuffer, + NULL, + INF_STYLE_OLDNT, // INF_STYLE_WIN4, + pSetupData->LanguageId, + &ErrorLine); + } +#endif + + if (InfHandle == INVALID_HANDLE_VALUE) + { + pSetupData->LastErrorNumber = ERROR_INVALID_CABINET_INF; + if (pSetupData->ErrorRoutine) + pSetupData->ErrorRoutine(pSetupData, PathBuffer); + return FALSE; + } + + if (!PrepareCopyInfFile(pSetupData, InfHandle, CabinetName)) + { +#if !(defined(__REACTOS__) && defined(USE_CABINET_INF)) + SpInfCloseInfFile(InfHandle); +#endif + /* FIXME: show an error dialog */ + return FALSE; + } + +#if !(defined(__REACTOS__) && defined(USE_CABINET_INF)) + SpInfCloseInfFile(InfHandle); +#endif + } while (SpInfFindNextLine(&CabinetsContext, &CabinetsContext)); + + return TRUE; +} + +BOOLEAN +DoFileCopy( + IN OUT PUSETUP_DATA pSetupData, + IN PSP_FILE_CALLBACK_W MsgHandler, + IN PVOID Context OPTIONAL) +{ + BOOLEAN Success; + + Success = SpFileQueueCommit(NULL, + (HSPFILEQ)pSetupData->SetupFileQueue, + MsgHandler, + Context); + + SpFileQueueClose((HSPFILEQ)pSetupData->SetupFileQueue); + pSetupData->SetupFileQueue = NULL; + + return Success; +} + +/* EOF */ diff --git a/base/setup/lib/install.h b/base/setup/lib/install.h new file mode 100644 index 0000000000..8c3e84b325 --- /dev/null +++ b/base/setup/lib/install.h @@ -0,0 +1,40 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Setup Library + * FILE: base/setup/lib/install.c + * PURPOSE: Installation functions + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#pragma once + +typedef enum _FILE_COPY_STATUS +{ + None = 0, + // Success = 0, +} FILE_COPY_STATUS; + +typedef VOID +(__cdecl *PFILE_COPY_STATUS_ROUTINE)(IN FILE_COPY_STATUS, ...); + +#if 0 +BOOLEAN // ERROR_NUMBER +PrepareCopyInfFile( + IN OUT PUSETUP_DATA pSetupData, + IN HINF InfFile, + IN PCWSTR SourceCabinet OPTIONAL); +#endif + +BOOLEAN // ERROR_NUMBER +PrepareFileCopy( + IN OUT PUSETUP_DATA pSetupData, + IN PFILE_COPY_STATUS_ROUTINE StatusRoutine OPTIONAL); + +BOOLEAN +DoFileCopy( + IN OUT PUSETUP_DATA pSetupData, + IN PSP_FILE_CALLBACK_W MsgHandler, + IN PVOID Context OPTIONAL); + +/* EOF */ diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 837633a7e7..4bd5981ff2 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -44,6 +44,8 @@ extern HANDLE ProcessHeap; #include "mui.h" #include "settings.h" +// #include "install.h" // See at the end... + /* DEFINES ******************************************************************/ @@ -124,6 +126,10 @@ typedef struct _USETUP_DATA WCHAR InstallationDirectory[MAX_PATH]; } USETUP_DATA, *PUSETUP_DATA; + +#include "install.h" + + // HACK!! extern BOOLEAN IsUnattendedSetup; diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 4dbf3885c3..518194937f 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -69,19 +69,6 @@ static PNTOS_INSTALLATION CurrentInstallation = NULL; static PGENERIC_LIST NtOsInstallsList = NULL; -// HACK: Temporary compatibility code. -#if 1 - static CABINET_CONTEXT CabinetContext; - #define CabinetInitialize() (CabinetInitialize(&CabinetContext)) - #define CabinetSetEventHandlers(a,b,c) (CabinetSetEventHandlers(&CabinetContext,(a),(b),(c))) - #define CabinetSetCabinetName(a) (CabinetSetCabinetName(&CabinetContext,(a))) - #define CabinetOpen() (CabinetOpen(&CabinetContext)) - #define CabinetGetCabinetName() (CabinetGetCabinetName(&CabinetContext)) - #define CabinetGetCabinetReservedArea(a) (CabinetGetCabinetReservedArea(&CabinetContext,(a))) - #define CabinetCleanup() (CabinetCleanup(&CabinetContext)) -#endif - - /* FUNCTIONS ****************************************************************/ static VOID @@ -3503,434 +3490,6 @@ USetupErrorRoutine( va_end(arg_ptr); } - -static BOOLEAN -AddSectionToCopyQueueCab(HINF InfFile, - PCWSTR SectionName, - PCWSTR SourceCabinet, - PCUNICODE_STRING DestinationPath, - PINPUT_RECORD Ir) -{ - INFCONTEXT FilesContext; - INFCONTEXT DirContext; - PCWSTR FileKeyName; - PCWSTR FileKeyValue; - PCWSTR DirKeyValue; - PCWSTR TargetFileName; - WCHAR FileDstPath[MAX_PATH]; - - /* - * This code enumerates the list of files in reactos.dff / reactos.inf - * that need to be extracted from reactos.cab and be installed in their - * respective directories. - */ - - /* Search for the SectionName section */ - if (!SpInfFindFirstLine(InfFile, SectionName, NULL, &FilesContext)) - { - MUIDisplayError(ERROR_TXTSETUP_SECTION, Ir, POPUP_WAIT_ENTER, SectionName); - return FALSE; - } - - /* - * Enumerate the files in the section and add them to the file queue. - */ - do - { - /* Get source file name and target directory id */ - if (!INF_GetData(&FilesContext, &FileKeyName, &FileKeyValue)) - { - /* FIXME: Handle error! */ - DPRINT1("INF_GetData() failed\n"); - break; - } - - /* Get optional target file name */ - if (!INF_GetDataField(&FilesContext, 2, &TargetFileName)) - TargetFileName = NULL; - - DPRINT("FileKeyName: '%S' FileKeyValue: '%S'\n", FileKeyName, FileKeyValue); - - /* Lookup target directory */ - if (!SpInfFindFirstLine(InfFile, L"Directories", FileKeyValue, &DirContext)) - { - /* FIXME: Handle error! */ - DPRINT1("SetupFindFirstLine() failed\n"); - INF_FreeData(FileKeyName); - INF_FreeData(FileKeyValue); - INF_FreeData(TargetFileName); - break; - } - - INF_FreeData(FileKeyValue); - - if (!INF_GetData(&DirContext, NULL, &DirKeyValue)) - { - /* FIXME: Handle error! */ - DPRINT1("INF_GetData() failed\n"); - INF_FreeData(FileKeyName); - INF_FreeData(TargetFileName); - break; - } - -#if 1 // HACK moved! (r66604) - { - ULONG Length = wcslen(DirKeyValue); - if ((Length > 0) && (DirKeyValue[Length - 1] == L'\\')) - Length--; - *((PWSTR)DirKeyValue + Length) = UNICODE_NULL; - } - - /* Build the full target path */ - RtlStringCchCopyW(FileDstPath, ARRAYSIZE(FileDstPath), - USetupData.DestinationRootPath.Buffer); - if (DirKeyValue[0] == UNICODE_NULL) - { - /* Installation path */ - - /* Add the installation path */ - ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, USetupData.InstallPath.Buffer); - } - else if (DirKeyValue[0] == L'\\') - { - /* Absolute path */ - // if (DirKeyValue[1] != UNICODE_NULL) - ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, DirKeyValue); - } - else // if (DirKeyValue[0] != L'\\') - { - /* Path relative to the installation path */ - - /* Add the installation path */ - ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 2, - USetupData.InstallPath.Buffer, DirKeyValue); - } -#endif - - if (!SpFileQueueCopy((HSPFILEQ)USetupData.SetupFileQueue, - USetupData.SourceRootPath.Buffer, - USetupData.SourceRootDir.Buffer, - FileKeyName, - NULL, - SourceCabinet, - NULL, - FileDstPath, - TargetFileName, - 0 /* FIXME */)) - { - /* FIXME: Handle error! */ - DPRINT1("SpFileQueueCopy() failed\n"); - } - - INF_FreeData(FileKeyName); - INF_FreeData(TargetFileName); - INF_FreeData(DirKeyValue); - } while (SpInfFindNextLine(&FilesContext, &FilesContext)); - - return TRUE; -} - - -static BOOLEAN -AddSectionToCopyQueue(HINF InfFile, - PCWSTR SectionName, - PCWSTR SourceCabinet, - PCUNICODE_STRING DestinationPath, - PINPUT_RECORD Ir) -{ - INFCONTEXT FilesContext; - INFCONTEXT DirContext; - PCWSTR FileKeyName; - PCWSTR FileKeyValue; - PCWSTR DirKeyValue; - PCWSTR TargetFileName; - WCHAR CompleteOrigDirName[512]; // FIXME: MAX_PATH is not enough? - WCHAR FileDstPath[MAX_PATH]; - - if (SourceCabinet) - return AddSectionToCopyQueueCab(InfFile, L"SourceFiles", SourceCabinet, DestinationPath, Ir); - - /* - * This code enumerates the list of files in txtsetup.sif - * that need to be installed in their respective directories. - */ - - /* Search for the SectionName section */ - if (!SpInfFindFirstLine(InfFile, SectionName, NULL, &FilesContext)) - { - MUIDisplayError(ERROR_TXTSETUP_SECTION, Ir, POPUP_WAIT_ENTER, SectionName); - return FALSE; - } - - /* - * Enumerate the files in the section and add them to the file queue. - */ - do - { - /* Get source file name */ - if (!INF_GetDataField(&FilesContext, 0, &FileKeyName)) - { - /* FIXME: Handle error! */ - DPRINT1("INF_GetData() failed\n"); - break; - } - - /* Get target directory id */ - if (!INF_GetDataField(&FilesContext, 13, &FileKeyValue)) - { - /* FIXME: Handle error! */ - DPRINT1("INF_GetData() failed\n"); - INF_FreeData(FileKeyName); - break; - } - - /* Get optional target file name */ - if (!INF_GetDataField(&FilesContext, 11, &TargetFileName)) - TargetFileName = NULL; - else if (!*TargetFileName) - TargetFileName = NULL; - - DPRINT("FileKeyName: '%S' FileKeyValue: '%S'\n", FileKeyName, FileKeyValue); - - /* Lookup target directory */ - if (!SpInfFindFirstLine(InfFile, L"Directories", FileKeyValue, &DirContext)) - { - /* FIXME: Handle error! */ - DPRINT1("SetupFindFirstLine() failed\n"); - INF_FreeData(FileKeyName); - INF_FreeData(FileKeyValue); - INF_FreeData(TargetFileName); - break; - } - - INF_FreeData(FileKeyValue); - - if (!INF_GetData(&DirContext, NULL, &DirKeyValue)) - { - /* FIXME: Handle error! */ - DPRINT1("INF_GetData() failed\n"); - INF_FreeData(FileKeyName); - INF_FreeData(TargetFileName); - break; - } - - if ((DirKeyValue[0] == UNICODE_NULL) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == UNICODE_NULL)) - { - /* Installation path */ - DPRINT("InstallationPath: '%S'\n", DirKeyValue); - - RtlStringCchCopyW(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), - USetupData.SourceRootDir.Buffer); - - DPRINT("InstallationPath(2): '%S'\n", CompleteOrigDirName); - } - else if (DirKeyValue[0] == L'\\') - { - /* Absolute path */ - DPRINT("AbsolutePath: '%S'\n", DirKeyValue); - - RtlStringCchCopyW(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), - DirKeyValue); - - DPRINT("AbsolutePath(2): '%S'\n", CompleteOrigDirName); - } - else // if (DirKeyValue[0] != L'\\') - { - /* Path relative to the installation path */ - DPRINT("RelativePath: '%S'\n", DirKeyValue); - - CombinePaths(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), 2, - USetupData.SourceRootDir.Buffer, DirKeyValue); - - DPRINT("RelativePath(2): '%S'\n", CompleteOrigDirName); - } - -#if 1 // HACK moved! (r66604) - { - ULONG Length = wcslen(DirKeyValue); - if ((Length > 0) && (DirKeyValue[Length - 1] == L'\\')) - Length--; - *((PWSTR)DirKeyValue + Length) = UNICODE_NULL; - } - - /* Build the full target path */ - RtlStringCchCopyW(FileDstPath, ARRAYSIZE(FileDstPath), - USetupData.DestinationRootPath.Buffer); - if (DirKeyValue[0] == UNICODE_NULL) - { - /* Installation path */ - - /* Add the installation path */ - ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, USetupData.InstallPath.Buffer); - } - else if (DirKeyValue[0] == L'\\') - { - /* Absolute path */ - // if (DirKeyValue[1] != UNICODE_NULL) - ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, DirKeyValue); - } - else // if (DirKeyValue[0] != L'\\') - { - /* Path relative to the installation path */ - - /* Add the installation path */ - ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 2, - USetupData.InstallPath.Buffer, DirKeyValue); - } -#endif - - if (!SpFileQueueCopy((HSPFILEQ)USetupData.SetupFileQueue, - USetupData.SourceRootPath.Buffer, - CompleteOrigDirName, - FileKeyName, - NULL, - SourceCabinet, - NULL, - FileDstPath, - TargetFileName, - 0 /* FIXME */)) - { - /* FIXME: Handle error! */ - DPRINT1("SpFileQueueCopy() failed\n"); - } - - INF_FreeData(FileKeyName); - INF_FreeData(TargetFileName); - INF_FreeData(DirKeyValue); - } while (SpInfFindNextLine(&FilesContext, &FilesContext)); - - return TRUE; -} - - -static BOOLEAN -PrepareCopyPageInfFile(HINF InfFile, - PCWSTR SourceCabinet, - PINPUT_RECORD Ir) -{ - NTSTATUS Status; - INFCONTEXT DirContext; - PWCHAR AdditionalSectionName = NULL; - PCWSTR DirKeyValue; - WCHAR PathBuffer[MAX_PATH]; - - /* Add common files */ - if (!AddSectionToCopyQueue(InfFile, L"SourceDisksFiles", SourceCabinet, &USetupData.DestinationPath, Ir)) - return FALSE; - - /* Add specific files depending of computer type */ - if (SourceCabinet == NULL) - { - if (!ProcessComputerFiles(InfFile, USetupData.ComputerList, &AdditionalSectionName)) - return FALSE; - - if (AdditionalSectionName) - { - if (!AddSectionToCopyQueue(InfFile, AdditionalSectionName, SourceCabinet, &USetupData.DestinationPath, Ir)) - return FALSE; - } - } - - /* Create directories */ - - /* - * FIXME: - * 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 USetupData.DestinationPath specify just '\' . - */ - - /* Get destination path */ - RtlStringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), USetupData.DestinationPath.Buffer); - - DPRINT("FullPath(1): '%S'\n", PathBuffer); - - /* Create the install directory */ - Status = SetupCreateDirectory(PathBuffer); - if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) - { - DPRINT1("Creating directory '%S' failed: Status = 0x%08lx\n", PathBuffer, Status); - MUIDisplayError(ERROR_CREATE_INSTALL_DIR, Ir, POPUP_WAIT_ENTER); - return FALSE; - } - - /* Search for the 'Directories' section */ - if (!SpInfFindFirstLine(InfFile, L"Directories", NULL, &DirContext)) - { - if (SourceCabinet) - MUIDisplayError(ERROR_CABINET_SECTION, Ir, POPUP_WAIT_ENTER, L"Directories"); - else - MUIDisplayError(ERROR_TXTSETUP_SECTION, Ir, POPUP_WAIT_ENTER, L"Directories"); - - return FALSE; - } - - /* Enumerate the directory values and create the subdirectories */ - do - { - if (!INF_GetData(&DirContext, NULL, &DirKeyValue)) - { - DPRINT1("break\n"); - break; - } - - if ((DirKeyValue[0] == UNICODE_NULL) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == UNICODE_NULL)) - { - /* Installation path */ - DPRINT("InstallationPath: '%S'\n", DirKeyValue); - - RtlStringCchCopyW(PathBuffer, ARRAYSIZE(PathBuffer), - USetupData.DestinationPath.Buffer); - - DPRINT("InstallationPath(2): '%S'\n", PathBuffer); - } - else if (DirKeyValue[0] == L'\\') - { - /* Absolute path */ - DPRINT("AbsolutePath: '%S'\n", DirKeyValue); - - CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, - USetupData.DestinationRootPath.Buffer, DirKeyValue); - - DPRINT("AbsolutePath(2): '%S'\n", PathBuffer); - - Status = SetupCreateDirectory(PathBuffer); - if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) - { - INF_FreeData(DirKeyValue); - DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); - MUIDisplayError(ERROR_CREATE_DIR, Ir, POPUP_WAIT_ENTER); - return FALSE; - } - } - else // if (DirKeyValue[0] != L'\\') - { - /* Path relative to the installation path */ - DPRINT("RelativePath: '%S'\n", DirKeyValue); - - CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, - USetupData.DestinationPath.Buffer, DirKeyValue); - - DPRINT("RelativePath(2): '%S'\n", PathBuffer); - - Status = SetupCreateDirectory(PathBuffer); - if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) - { - INF_FreeData(DirKeyValue); - DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); - MUIDisplayError(ERROR_CREATE_DIR, Ir, POPUP_WAIT_ENTER); - return FALSE; - } - } - - INF_FreeData(DirKeyValue); - } while (SpInfFindNextLine(&DirContext, &DirContext)); - - return TRUE; -} - - /* * Displays the PrepareCopyPage. * @@ -3939,8 +3498,7 @@ PrepareCopyPageInfFile(HINF InfFile, * QuitPage * * SIDEEFFECTS - * Inits SetupFileQueue - * Calls PrepareCopyPageInfFile + * Calls PrepareFileCopy * * RETURNS * Number of the next page. @@ -3948,92 +3506,18 @@ PrepareCopyPageInfFile(HINF InfFile, static PAGE_NUMBER PrepareCopyPage(PINPUT_RECORD Ir) { - HINF InfHandle; - WCHAR PathBuffer[MAX_PATH]; - INFCONTEXT CabinetsContext; - ULONG InfFileSize; - PCWSTR KeyValue; - UINT ErrorLine; - PVOID InfFileData; + // ERROR_NUMBER ErrorNumber; + BOOLEAN Success; MUIDisplayPage(PREPARE_COPY_PAGE); - /* Create the file queue */ - USetupData.SetupFileQueue = SpFileQueueOpen(); - if (USetupData.SetupFileQueue == NULL) - { - MUIDisplayError(ERROR_COPY_QUEUE, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - - if (!PrepareCopyPageInfFile(USetupData.SetupInf, NULL, Ir)) + /* ErrorNumber = */ Success = PrepareFileCopy(&USetupData, NULL); + if (/*ErrorNumber != ERROR_SUCCESS*/ !Success) { - /* FIXME: show an error dialog */ + // MUIDisplayError(ErrorNumber, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } - /* Search for the 'Cabinets' section */ - if (!SpInfFindFirstLine(USetupData.SetupInf, L"Cabinets", NULL, &CabinetsContext)) - { - return FILE_COPY_PAGE; - } - - /* - * Enumerate the directory values in the 'Cabinets' - * section and parse their inf files. - */ - do - { - if (!INF_GetData(&CabinetsContext, NULL, &KeyValue)) - break; - - CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, - USetupData.SourcePath.Buffer, KeyValue); - - CabinetInitialize(); - CabinetSetEventHandlers(NULL, NULL, NULL); - CabinetSetCabinetName(PathBuffer); - - if (CabinetOpen() == CAB_STATUS_SUCCESS) - { - DPRINT("Cabinet %S\n", CabinetGetCabinetName()); - - InfFileData = CabinetGetCabinetReservedArea(&InfFileSize); - if (InfFileData == NULL) - { - MUIDisplayError(ERROR_CABINET_SCRIPT, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - } - else - { - DPRINT("Cannot open cabinet: %S.\n", CabinetGetCabinetName()); - MUIDisplayError(ERROR_CABINET_MISSING, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - - InfHandle = INF_OpenBufferedFileA((PSTR)InfFileData, - InfFileSize, - NULL, - INF_STYLE_WIN4, - USetupData.LanguageId, - &ErrorLine); - - if (InfHandle == INVALID_HANDLE_VALUE) - { - MUIDisplayError(ERROR_INVALID_CABINET_INF, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - - CabinetCleanup(); - - if (!PrepareCopyPageInfFile(InfHandle, KeyValue, Ir)) - { - /* FIXME: show an error dialog */ - return QUIT_PAGE; - } - } while (SpInfFindNextLine(&CabinetsContext, &CabinetsContext)); - return FILE_COPY_PAGE; } @@ -4188,8 +3672,7 @@ FileCopyCallback(PVOID Context, * RegistryPage(At once) * * SIDEEFFECTS - * Calls SetupCommitFileQueueW - * Calls SpFileQueueClose + * Calls DoFileCopy * * RETURNS * Number of the next page. @@ -4251,13 +3734,9 @@ FileCopyPage(PINPUT_RECORD Ir) "Free Memory"); /* Do the file copying */ - SpFileQueueCommit(NULL, - USetupData.SetupFileQueue, - FileCopyCallback, - &CopyContext); + DoFileCopy(&USetupData, FileCopyCallback, &CopyContext); - /* If we get here, we're done, so cleanup the queue and progress bar */ - SpFileQueueClose(USetupData.SetupFileQueue); + /* If we get here, we're done, so cleanup the progress bar */ DestroyProgressBar(CopyContext.ProgressBar); DestroyProgressBar(CopyContext.MemoryBars[0]); DestroyProgressBar(CopyContext.MemoryBars[1]);

1 0

01/13: [SETUPLIB][USETUP] Add support for setup error handling.
by Hermès Bélusca-Maïto 05 Nov '18

05 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f894631472a436f02f1b8… commit f894631472a436f02f1b80c31b2a6a04a215f10f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 28 22:51:33 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 5 12:03:19 2018 +0100 [SETUPLIB][USETUP] Add support for setup error handling. --- base/setup/lib/setuplib.c | 4 ++++ base/setup/lib/setuplib.h | 7 +++++++ base/setup/usetup/usetup.c | 24 ++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 915acd5a36..9a7ea88a9a 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -675,6 +675,10 @@ InitializeSetup( // pSetupData->LayoutList = NULL; // pSetupData->LanguageList = NULL; + /* Initialize error handling */ + pSetupData->LastErrorNumber = ERROR_SUCCESS; + pSetupData->ErrorRoutine = NULL; + /* Initialize global unicode strings */ RtlInitUnicodeString(&pSetupData->SourcePath, NULL); RtlInitUnicodeString(&pSetupData->SourceRootPath, NULL); diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 585808f6fa..837633a7e7 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -58,8 +58,15 @@ extern HANDLE ProcessHeap; struct _USETUP_DATA; +typedef VOID +(__cdecl *PSETUP_ERROR_ROUTINE)(IN struct _USETUP_DATA*, ...); + typedef struct _USETUP_DATA { +/* Error handling *****/ + ERROR_NUMBER LastErrorNumber; + PSETUP_ERROR_ROUTINE ErrorRoutine; + /* Setup INFs *****/ HINF SetupInf; diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index d951a65a86..4dbf3885c3 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3481,6 +3481,29 @@ InstallDirectoryPage(PINPUT_RECORD Ir) } +// PSETUP_ERROR_ROUTINE +static VOID +__cdecl +USetupErrorRoutine( + IN PUSETUP_DATA pSetupData, + ...) +{ + INPUT_RECORD Ir; + va_list arg_ptr; + + va_start(arg_ptr, pSetupData); + + if (pSetupData->LastErrorNumber >= ERROR_SUCCESS && + pSetupData->LastErrorNumber < ERROR_LAST_ERROR_CODE) + { + // Note: the "POPUP_WAIT_ENTER" actually depends on the LastErrorNumber... + MUIDisplayErrorV(pSetupData->LastErrorNumber, &Ir, POPUP_WAIT_ENTER, arg_ptr); + } + + va_end(arg_ptr); +} + + static BOOLEAN AddSectionToCopyQueueCab(HINF InfFile, PCWSTR SectionName, @@ -5001,6 +5024,7 @@ RunUSetup(VOID) /* Initialize Setup, phase 0 */ InitializeSetup(&USetupData, 0); + USetupData.ErrorRoutine = USetupErrorRoutine; /* Hide the cursor */ CONSOLE_SetCursorType(TRUE, FALSE);

1 0

01/01: [WIN32SS][FONT] Fix regression of #1004 (#1012)
by Katayama Hirofumi MZ 05 Nov '18

05 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64e217e97ced9315d0a39… commit 64e217e97ced9315d0a394576d95182d4634e770 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 5 16:24:23 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 5 16:24:23 2018 +0900 [WIN32SS][FONT] Fix regression of #1004 (#1012) Signed-off-by: Doug Lyons <douglyons(a)douglyons.com> CORE-15333 --- win32ss/gdi/ntgdi/freetype.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index ee242a39ce..ce655c5d3e 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1053,7 +1053,8 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, return 0; /* failure */ } - IntUnicodeStringToBuffer(FontGDI->Filename, sizeof(FontGDI->Filename), pFileName); + RtlCopyMemory(FontGDI->Filename, pFileName->Buffer, pFileName->Length); + FontGDI->Filename[pFileName->Length / sizeof(WCHAR)] = UNICODE_NULL; } else {

1 0

01/01: [SCHEDSVC] Start jobs on timeout
by Eric Kohl 04 Nov '18

04 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d4591c6722361a1778d4… commit 0d4591c6722361a1778d4284306462df54f60925 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Nov 5 00:22:30 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Nov 5 00:24:16 2018 +0100 [SCHEDSVC] Start jobs on timeout - Start jobs on timeout - Add job flags to the idl file --- base/services/schedsvc/job.c | 45 ++++++++++++++++++++++----------------- base/services/schedsvc/precomp.h | 2 ++ sdk/include/reactos/idl/atsvc.idl | 8 +++++++ 3 files changed, 36 insertions(+), 19 deletions(-) diff --git a/base/services/schedsvc/job.c b/base/services/schedsvc/job.c index 0d6a29ea6a..e1a8f013b2 100644 --- a/base/services/schedsvc/job.c +++ b/base/services/schedsvc/job.c @@ -91,8 +91,8 @@ ReScheduleJob( /* Remove the job from the start list */ RemoveEntryList(&pJob->StartEntry); - /* No repetition, remove the job */ - if (pJob->DaysOfMonth == 0 && pJob->DaysOfWeek == 0) + /* Non-periodical job, remove it */ + if ((pJob->Flags & JOB_RUN_PERIODICALLY) == 0) { /* Remove the job from the registry */ DeleteJob(pJob); @@ -120,12 +120,9 @@ ReScheduleJob( VOID RunNextJob(VOID) { -#if 0 PROCESS_INFORMATION ProcessInformation; STARTUPINFOW StartupInfo; - WCHAR CommandLine[256]; BOOL bRet; -#endif PJOB pNextJob; if (IsListEmpty(&StartListHead)) @@ -136,29 +133,39 @@ RunNextJob(VOID) pNextJob = CONTAINING_RECORD((&StartListHead)->Flink, JOB, StartEntry); - ERR("Run job %ld: %S\n", pNextJob->JobId, pNextJob->Command); + TRACE("Run job %ld: %S\n", pNextJob->JobId, pNextJob->Command); -#if 0 - bRet = CreateProcess(NULL, - CommandLine, - NULL, - NULL, - FALSE, - CREATE_NEW_CONSOLE | CREATE_SEPARATE_WOW_VDM, - NULL, - NULL, - &StartupInfo, - &ProcessInformation); + ZeroMemory(&StartupInfo, sizeof(StartupInfo)); + StartupInfo.cb = sizeof(StartupInfo); + StartupInfo.lpTitle = pNextJob->Command; + StartupInfo.dwFlags = STARTF_USESHOWWINDOW; + StartupInfo.wShowWindow = SW_SHOWDEFAULT; + + if ((pNextJob->Flags & JOB_NONINTERACTIVE) == 0) + { + StartupInfo.dwFlags |= STARTF_INHERITDESKTOP; + StartupInfo.lpDesktop = L"WinSta0\\Default"; + } + + bRet = CreateProcessW(NULL, + pNextJob->Command, + NULL, + NULL, + FALSE, + CREATE_NEW_CONSOLE, + NULL, + NULL, + &StartupInfo, + &ProcessInformation); if (bRet == FALSE) { - // FIXME: Log the failure! + ERR("CreateProcessW() failed (Error %lu)\n", GetLastError()); } else { CloseHandle(ProcessInformation.hThread); CloseHandle(ProcessInformation.hProcess); } -#endif ReScheduleJob(pNextJob); } diff --git a/base/services/schedsvc/precomp.h b/base/services/schedsvc/precomp.h index 8fc590ba7f..992e16796d 100644 --- a/base/services/schedsvc/precomp.h +++ b/base/services/schedsvc/precomp.h @@ -11,6 +11,8 @@ #include <winbase.h> #include <winreg.h> #include <winsvc.h> +#include <winuser.h> +#include <undocuser.h> #include <ndk/rtlfuncs.h> diff --git a/sdk/include/reactos/idl/atsvc.idl b/sdk/include/reactos/idl/atsvc.idl index b91dbfcc86..7dc6dc6cd0 100644 --- a/sdk/include/reactos/idl/atsvc.idl +++ b/sdk/include/reactos/idl/atsvc.idl @@ -31,6 +31,14 @@ typedef struct _AT_ENUM_CONTAINER [size_is( EntriesRead)] LPAT_ENUM Buffer; } AT_ENUM_CONTAINER, *PAT_ENUM_CONTAINER, *LPAT_ENUM_CONTAINER; +cpp_quote("#define JOB_RUN_PERIODICALLY 1") +cpp_quote("#define JOB_EXEC_ERROR 2") +cpp_quote("#define JOB_RUNS_TODAY 4") +cpp_quote("#define JOB_ADD_CURRENT_DATE 8") +cpp_quote("#define JOB_NONINTERACTIVE 16") +cpp_quote("#define JOB_INPUT_FLAGS (JOB_RUN_PERIODICALLY|JOB_ADD_CURRENT_DATE|JOB_NONINTERACTIVE)") +cpp_quote("#define JOB_OUTPUT_FLAGS (JOB_RUN_PERIODICALLY|JOB_EXEC_ERROR|JOB_RUNS_TODAY|JOB_NONINTERACTIVE)") + [ uuid(1FF70682-0A51-30E8-076D-740BE8CEE98B), version(1.0),

1 0

01/01: [WIN32SS][FONT] Fix ntmCellHeight value to usWinAscent + usWinDescent (#1010)
by Katayama Hirofumi MZ 04 Nov '18

04 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f679a116b92f55e6f436… commit 7f679a116b92f55e6f4364c689958a984595027f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 5 06:03:53 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 5 06:03:53 2018 +0900 [WIN32SS][FONT] Fix ntmCellHeight value to usWinAscent + usWinDescent (#1010) CORE-15331 --- win32ss/gdi/ntgdi/freetype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 55efa4ecc5..ee242a39ce 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -2583,10 +2583,6 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, if (0 == Ntm->ntmFlags) Ntm->ntmFlags = NTM_REGULAR; - Ntm->ntmSizeEM = Otm->otmEMSquare; - Ntm->ntmCellHeight = Otm->otmEMSquare; - Ntm->ntmAvgWidth = 0; - Info->FontType = (0 != (TM->tmPitchAndFamily & TMPF_TRUETYPE) ? TRUETYPE_FONTTYPE : 0); @@ -2629,6 +2625,10 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, return; } + Ntm->ntmSizeEM = Otm->otmEMSquare; + Ntm->ntmCellHeight = pOS2->usWinAscent + pOS2->usWinDescent; + Ntm->ntmAvgWidth = 0; + fs.fsCsb[0] = pOS2->ulCodePageRange1; fs.fsCsb[1] = pOS2->ulCodePageRange2; fs.fsUsb[0] = pOS2->ulUnicodeRange1;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs