[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.
This commit is contained in:
Hermès Bélusca-Maïto 2018-01-15 18:09:53 +01:00
parent 42758b303b
commit 86f31289ef
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
14 changed files with 42 additions and 20 deletions

View file

@ -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;