Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 04:33:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Send the right inf file handle to SetupCloseInfFile().

Browse source 
svn path=/trunk/; revision=29130
This commit is contained in:
Hervé Poussineau 2007-09-21 13:00:16 +00:00
parent b733bd322e
commit 1c9e99b2cc
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -474,7 +474,7 @@ CheckUnattendedSetup(VOID)
if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"Signature", &Context)) if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"Signature", &Context))
{ {
DPRINT("SetupFindFirstLineW() failed for section 'Unattend'\n"); DPRINT("SetupFindFirstLineW() failed for section 'Unattend'\n");
SetupCloseInfFile(&UnattendInf); SetupCloseInfFile(UnattendInf);
return; return;
} }
@ -482,7 +482,7 @@ CheckUnattendedSetup(VOID)
if (!INF_GetData(&Context, NULL, &Value)) if (!INF_GetData(&Context, NULL, &Value))
{ {
DPRINT("INF_GetData() failed for key 'Signature'\n"); DPRINT("INF_GetData() failed for key 'Signature'\n");
SetupCloseInfFile(&UnattendInf); SetupCloseInfFile(UnattendInf);
return; return;
} }
@ -490,7 +490,7 @@ CheckUnattendedSetup(VOID)
if (_wcsicmp(Value, L"$ReactOS$") != 0) if (_wcsicmp(Value, L"$ReactOS$") != 0)
{ {
DPRINT("Signature not $ReactOS$\n"); DPRINT("Signature not $ReactOS$\n");
SetupCloseInfFile(&UnattendInf); SetupCloseInfFile(UnattendInf);
return; return;
} }
@ -498,19 +498,19 @@ CheckUnattendedSetup(VOID)
if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"UnattendSetupEnabled", &Context)) if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"UnattendSetupEnabled", &Context))
{ {
DPRINT("Can't find key 'UnattendSetupEnabled'\n"); DPRINT("Can't find key 'UnattendSetupEnabled'\n");
SetupCloseInfFile(&UnattendInf); SetupCloseInfFile(UnattendInf);
return; return;
} }
if (!INF_GetData(&Context, NULL, &Value)) if (!INF_GetData(&Context, NULL, &Value))
{ {
DPRINT("Can't read key 'UnattendSetupEnabled'\n"); DPRINT("Can't read key 'UnattendSetupEnabled'\n");
SetupCloseInfFile(&UnattendInf); SetupCloseInfFile(UnattendInf);
return; return;
} }
if (_wcsicmp(Value, L"yes") != 0) if (_wcsicmp(Value, L"yes") != 0)
{ {
DPRINT("Unattend setup is disabled by 'UnattendSetupEnabled' key!\n"); DPRINT("Unattend setup is disabled by 'UnattendSetupEnabled' key!\n");
SetupCloseInfFile(&UnattendInf); SetupCloseInfFile(UnattendInf);
return; return;
} }
@ -518,13 +518,13 @@ CheckUnattendedSetup(VOID)
if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"DestinationDiskNumber", &Context)) if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"DestinationDiskNumber", &Context))
{ {
DPRINT("SetupFindFirstLine() failed for key 'DestinationDiskNumber'\n"); DPRINT("SetupFindFirstLine() failed for key 'DestinationDiskNumber'\n");
SetupCloseInfFile(&UnattendInf); SetupCloseInfFile(UnattendInf);
return; return;
} }
if (!SetupGetIntField(&Context, 1, &IntValue)) if (!SetupGetIntField(&Context, 1, &IntValue))
{ {
DPRINT("SetupGetIntField() failed for key 'DestinationDiskNumber'\n"); DPRINT("SetupGetIntField() failed for key 'DestinationDiskNumber'\n");
SetupCloseInfFile(&UnattendInf); SetupCloseInfFile(UnattendInf);
return; return;
} }
UnattendDestinationDiskNumber = (LONG)IntValue; UnattendDestinationDiskNumber = (LONG)IntValue;