Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 20:55:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USETUP]

Browse source 
Fix installation directories set into unattend.inf,
they were ignored and installed always into \ReactOS.

svn path=/trunk/; revision=55884
This commit is contained in:
Sylvain Petreolle 2012-02-27 16:37:48 +00:00
parent aaa881ed5a
commit 806732f98e
1 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
reactos/base/setup/usetup/interface/usetup.c
View file

@ -506,10 +506,10 @@ CheckUnattendedSetup(VOID)
UnattendDestinationPartitionNumber = IntValue; UnattendDestinationPartitionNumber = IntValue;
/* Search for 'DestinationPartitionNumber' in the 'Unattend' section */ /* Search for 'InstallationDirectory' in the 'Unattend' section */
if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"DestinationPartitionNumber", &Context)) if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"InstallationDirectory", &Context))
{ {
DPRINT("SetupFindFirstLine() failed for key 'DestinationPartitionNumber'\n"); DPRINT("SetupFindFirstLine() failed for key 'InstallationDirectory'\n");
SetupCloseInfFile(UnattendInf); SetupCloseInfFile(UnattendInf);
return; return;
} }
@ -2594,8 +2594,6 @@ InstallDirectoryPage(PINPUT_RECORD Ir)
PDISKENTRY DiskEntry; PDISKENTRY DiskEntry;
PPARTENTRY PartEntry; PPARTENTRY PartEntry;
WCHAR InstallDir[51]; WCHAR InstallDir[51];
PWCHAR DefaultPath;
INFCONTEXT Context;
ULONG Length; ULONG Length;
if (PartitionList == NULL || if (PartitionList == NULL ||
@ -2609,22 +2607,10 @@ InstallDirectoryPage(PINPUT_RECORD Ir)
DiskEntry = PartitionList->CurrentDisk; DiskEntry = PartitionList->CurrentDisk;
PartEntry = PartitionList->CurrentPartition; PartEntry = PartitionList->CurrentPartition;
/* Search for 'DefaultPath' in the 'SetupData' section */ if (IsUnattendedSetup)
if (!SetupFindFirstLineW(SetupInf, L"SetupData", L"DefaultPath", &Context)) wcscpy(InstallDir, UnattendInstallationDirectory);
{
MUIDisplayError(ERROR_FIND_SETUPDATA, Ir, POPUP_WAIT_ENTER);
return QUIT_PAGE;
}
/* Read the 'DefaultPath' data */
if (INF_GetData(&Context, NULL, &DefaultPath))
{
wcscpy(InstallDir, DefaultPath);
}
else else
{
wcscpy(InstallDir, L"\\ReactOS"); wcscpy(InstallDir, L"\\ReactOS");
}
Length = wcslen(InstallDir); Length = wcslen(InstallDir);
CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); CONSOLE_SetInputTextXY(8, 11, 51, InstallDir);