Skip to content

Commit

Permalink
ROS -> Windivs in Setup
Browse files Browse the repository at this point in the history
  • Loading branch information
errortek committed Mar 31, 2024
1 parent e5e6eec commit 9a76340
Show file tree
Hide file tree
Showing 75 changed files with 298 additions and 298 deletions.
2 changes: 1 addition & 1 deletion base/setup/lib/bootcode.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: BootCode support functions.
* COPYRIGHT: Copyright 2020 Hermes Belusca-Maito
Expand Down
2 changes: 1 addition & 1 deletion base/setup/lib/bootcode.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: BootCode support functions.
* COPYRIGHT: Copyright 2020 Hermes Belusca-Maito
Expand Down
158 changes: 79 additions & 79 deletions base/setup/lib/bootsup.c

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions base/setup/lib/bootsup.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* ReactOS kernel
* Copyright (C) 2002 ReactOS Team
* Windivs kernel
* Copyright (C) 2002 Windivs Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -18,7 +18,7 @@
*/
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* FILE: base/setup/lib/bootsup.h
* PURPOSE: Bootloader support functions
* PROGRAMMER:
Expand Down
2 changes: 1 addition & 1 deletion base/setup/lib/errorcode.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Setup error codes
* COPYRIGHT: Copyright 2007-2018 Johannes Anderwald <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions base/setup/lib/fsutil.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Filesystem Format and ChkDsk support functions.
* COPYRIGHT: Copyright 2003-2019 Casper S. Hornstrup ([email protected])
Expand Down Expand Up @@ -155,7 +155,7 @@ typedef struct _FILE_SYSTEM
PULIB_CHKDSK ChkdskFunc;
} FILE_SYSTEM, *PFILE_SYSTEM;

/* The list of file systems on which we can install ReactOS */
/* The list of file systems on which we can install Windivs */
static FILE_SYSTEM RegisteredFileSystems[] =
{
/* NOTE: The FAT formatter will automatically
Expand Down
2 changes: 1 addition & 1 deletion base/setup/lib/fsutil.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Filesystem Format and ChkDsk support functions.
* COPYRIGHT: Copyright 2003-2019 Casper S. Hornstrup ([email protected])
Expand Down
8 changes: 4 additions & 4 deletions base/setup/lib/install.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* FILE: base/setup/lib/install.c
* PURPOSE: Installation functions
* PROGRAMMERS: Hervé Poussineau ([email protected])
Expand Down Expand Up @@ -32,7 +32,7 @@ LookupDirectoryById(
{
BOOL Success;

// ReactOS-specific
// Windivs-specific
Success = SpInfFindFirstLine(InfHandle, L"Directories", DirId, InfContext);
if (!Success)
{
Expand Down Expand Up @@ -279,7 +279,7 @@ BuildFullDirectoryPath(
* respective directories.
*/
/*
* IMPORTANT NOTE: The INF file specification used for the .CAB in ReactOS
* IMPORTANT NOTE: The INF file specification used for the .CAB in Windivs
* is not compliant with respect to TXTSETUP.SIF syntax or the standard syntax.
*/
static BOOLEAN
Expand Down Expand Up @@ -611,7 +611,7 @@ PrepareCopyInfFile(
}

/* Search for the 'Directories' section */
// ReactOS-specific
// Windivs-specific
if (!SpInfFindFirstLine(InfFile, L"Directories", NULL, &DirContext))
{
// Windows-compatible
Expand Down
2 changes: 1 addition & 1 deletion base/setup/lib/install.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* FILE: base/setup/lib/install.c
* PURPOSE: Installation functions
* PROGRAMMERS: Hervé Poussineau ([email protected])
Expand Down
6 changes: 3 additions & 3 deletions base/setup/lib/mui.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* ReactOS kernel
* Copyright (C) 2008 ReactOS Team
* Windivs kernel
* Copyright (C) 2008 Windivs Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -18,7 +18,7 @@
*/
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS text-mode setup
* PROJECT: Windivs text-mode setup
* FILE: base/setup/usetup/mui.c
* PURPOSE: Text-mode setup
* PROGRAMMER:
Expand Down
2 changes: 1 addition & 1 deletion base/setup/lib/precomp.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Precompiled header
* COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito
Expand Down
12 changes: 6 additions & 6 deletions base/setup/lib/registry.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* ReactOS kernel
* Copyright (C) 2003 ReactOS Team
* Windivs kernel
* Copyright (C) 2003 Windivs Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -18,7 +18,7 @@
*/
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* FILE: base/setup/lib/registry.c
* PURPOSE: Registry creation functions
* PROGRAMMERS: ...
Expand Down Expand Up @@ -780,7 +780,7 @@ RegInitializeRegistry(
0,
NULL,
// FIXME: Using REG_OPTION_VOLATILE works OK on Windows,
// but I need to check whether it works OK on ReactOS too.
// but I need to check whether it works OK on Windivs too.
REG_OPTION_NON_VOLATILE, // REG_OPTION_VOLATILE,
&Disposition);
if (!NT_SUCCESS(Status))
Expand All @@ -804,7 +804,7 @@ RegInitializeRegistry(
0,
NULL,
// FIXME: Using REG_OPTION_VOLATILE works OK on Windows,
// but I need to check whether it works OK on ReactOS too.
// but I need to check whether it works OK on Windivs too.
REG_OPTION_NON_VOLATILE, // REG_OPTION_VOLATILE,
&Disposition);
if (!NT_SUCCESS(Status))
Expand Down Expand Up @@ -863,7 +863,7 @@ RegInitializeRegistry(
0,
NULL,
// FIXME: Using REG_OPTION_VOLATILE works OK on Windows,
// but I need to check whether it works OK on ReactOS too.
// but I need to check whether it works OK on Windivs too.
REG_OPTION_NON_VOLATILE, // REG_OPTION_VOLATILE,
&Disposition);
if (!NT_SUCCESS(Status))
Expand Down
6 changes: 3 additions & 3 deletions base/setup/lib/registry.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* ReactOS kernel
* Copyright (C) 2003 ReactOS Team
* Windivs kernel
* Copyright (C) 2003 Windivs Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -18,7 +18,7 @@
*/
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* FILE: base/setup/lib/registry.h
* PURPOSE: Registry creation functions
* PROGRAMMERS: ...
Expand Down
6 changes: 3 additions & 3 deletions base/setup/lib/settings.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* ReactOS kernel
* Copyright (C) 2004 ReactOS Team
* Windivs kernel
* Copyright (C) 2004 Windivs Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS text-mode setup
* PROJECT: Windivs text-mode setup
* FILE: base/setup/usetup/settings.c
* PURPOSE: Device settings support functions
* PROGRAMMERS: Colin Finck
Expand Down
6 changes: 3 additions & 3 deletions base/setup/lib/settings.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* ReactOS kernel
* Copyright (C) 2004 ReactOS Team
* Windivs kernel
* Copyright (C) 2004 Windivs Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -18,7 +18,7 @@
*/
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS text-mode setup
* PROJECT: Windivs text-mode setup
* FILE: base/setup/usetup/settings.h
* PURPOSE: Device settings support functions
* PROGRAMMERS: Colin Finck
Expand Down
10 changes: 5 additions & 5 deletions base/setup/lib/setuplib.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* FILE: base/setup/lib/setuplib.c
* PURPOSE: Setup Library - Main initialization helpers
* PROGRAMMERS: Casper S. Hornstrup ([email protected])
Expand Down Expand Up @@ -73,9 +73,9 @@ CheckUnattendedSetup(
}

/* Check 'Signature' string */
if (_wcsicmp(Value, L"$ReactOS$") != 0)
if (_wcsicmp(Value, L"$Windivs$") != 0)
{
DPRINT("Signature not $ReactOS$\n");
DPRINT("Signature not $Windivs$\n");
INF_FreeData(Value);
goto Quit;
}
Expand Down Expand Up @@ -544,7 +544,7 @@ LoadSetupInf(
return ERROR_CORRUPT_TXTSETUPSIF;

/* Check 'Signature' string */
if (_wcsicmp(Value, L"$ReactOS$") != 0 &&
if (_wcsicmp(Value, L"$Windivs$") != 0 &&
_wcsicmp(Value, L"$Windows NT$") != 0)
{
INF_FreeData(Value);
Expand Down Expand Up @@ -978,7 +978,7 @@ UpdateRegistry(

Success = SpInfFindFirstLine(pSetupData->SetupInf, L"HiveInfs.Fresh", NULL, &InfContext); // Windows-compatible
if (!Success)
Success = SpInfFindFirstLine(pSetupData->SetupInf, L"HiveInfs.Install", NULL, &InfContext); // ReactOS-specific
Success = SpInfFindFirstLine(pSetupData->SetupInf, L"HiveInfs.Install", NULL, &InfContext); // Windivs-specific

if (!Success)
{
Expand Down
4 changes: 2 additions & 2 deletions base/setup/lib/setuplib.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Public header
* COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito
Expand Down Expand Up @@ -99,7 +99,7 @@ typedef struct _USETUP_DATA
*/
UNICODE_STRING SystemRootPath;

/* Path to the installation directory inside the ReactOS boot partition */
/* Path to the installation directory inside the Windivs boot partition */
UNICODE_STRING DestinationArcPath; /** Equivalent of 'NTOS_INSTALLATION::SystemArcPath' **/
UNICODE_STRING DestinationPath; /** Equivalent of 'NTOS_INSTALLATION::SystemNtPath' **/
UNICODE_STRING DestinationRootPath;
Expand Down
2 changes: 1 addition & 1 deletion base/setup/lib/spapisup/fileqsup.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* FILE: base/setup/lib/fileqsup.c
* PURPOSE: Interfacing with Setup* API File Queue support functions
* PROGRAMMERS: Hermes Belusca-Maito ([email protected])
Expand Down
2 changes: 1 addition & 1 deletion base/setup/lib/spapisup/fileqsup.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* FILE: base/setup/lib/fileqsup.h
* PURPOSE: Interfacing with Setup* API File Queue support functions
* PROGRAMMERS: Casper S. Hornstrup ([email protected])
Expand Down
2 changes: 1 addition & 1 deletion base/setup/lib/spapisup/infsupp.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* FILE: base/setup/lib/infsupp.c
* PURPOSE: Interfacing with Setup* API .INF Files support functions
* PROGRAMMERS: Hervé Poussineau
Expand Down
2 changes: 1 addition & 1 deletion base/setup/lib/spapisup/infsupp.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* FILE: base/setup/lib/infsupp.h
* PURPOSE: Interfacing with Setup* API .INF Files support functions
* PROGRAMMERS: Hermes Belusca-Maito ([email protected])
Expand Down
2 changes: 1 addition & 1 deletion base/setup/lib/spapisup/spapisup.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* FILE: base/setup/lib/spapisup.h
* PURPOSE: Interfacing with Setup* API support functions
* PROGRAMMERS: Hermes Belusca-Maito ([email protected])
Expand Down
2 changes: 1 addition & 1 deletion base/setup/lib/utils/arcname.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: ARC path to-and-from NT path resolver.
* COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito
Expand Down
2 changes: 1 addition & 1 deletion base/setup/lib/utils/arcname.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: ARC path to-and-from NT path resolver.
* COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito
Expand Down
6 changes: 3 additions & 3 deletions base/setup/lib/utils/arcname_tests.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Tests for the arcname.c functions:
* ArcPathNormalize(), ArcPathToNtPath().
Expand All @@ -26,7 +26,7 @@

int _tmain(int argc, _TCHAR* argv[])
{
WCHAR ArcPath[MAX_PATH] = L"multi(5)disk()rdisk(1)partition()\\ReactOS";
WCHAR ArcPath[MAX_PATH] = L"multi(5)disk()rdisk(1)partition()\\Windivs";
WCHAR NormalizedArcPathBuffer[MAX_PATH];
UNICODE_STRING NormalizedArcPath;
WCHAR NtPathBuffer[MAX_PATH];
Expand All @@ -48,7 +48,7 @@ int _tmain(int argc, _TCHAR* argv[])
wprintf(L"NtPath = '%wZ'\n", &NtPath);
ArcPathToNtPath(&NtPath, L"ramdisk(0)"); // OK
wprintf(L"NtPath = '%wZ'\n", &NtPath);
ArcPathToNtPath(&NtPath, L"ramdisk(0)\\ReactOS\\system32\\ntoskrnl.exe"); // OK
ArcPathToNtPath(&NtPath, L"ramdisk(0)\\Windivs\\system32\\ntoskrnl.exe"); // OK
wprintf(L"NtPath = '%wZ'\n", &NtPath);
ArcPathToNtPath(&NtPath, L"net(0)\\Foobar"); // OK but not supported
wprintf(L"NtPath = '%wZ'\n", &NtPath);
Expand Down
10 changes: 5 additions & 5 deletions base/setup/lib/utils/bldrsup.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* PROJECT: ReactOS Setup Library
* PROJECT: Windivs Setup Library
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Boot Stores Management functionality, with support for
* NT 5.x family (MS Windows <= 2003, and ReactOS) bootloaders.
* NT 5.x family (MS Windows <= 2003, and Windivs) bootloaders.
* COPYRIGHT: Copyright 2017-2018 Hermes Belusca-Maito
*/

Expand Down Expand Up @@ -237,7 +237,7 @@ CreateCommonFreeLdrSections(

/* TitleText */
IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
L"TitleText", L"ReactOS Boot Manager");
L"TitleText", L"Windivs Boot Manager");

/* MinimalUI */
IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
Expand Down Expand Up @@ -1251,12 +1251,12 @@ FreeLdrEnumerateBootEntries(
Status = IniCacheGetKey(OsIniSection, L"BootType", &KeyData);
if (!NT_SUCCESS(Status) || (KeyData == NULL))
{
/* Certainly not a ReactOS installation */
/* Certainly not a Windivs installation */
DPRINT1("No BootType value present!\n");
goto DoEnum;
}

// TODO: What to do with "Windows" ; "WindowsNT40" ; "ReactOSSetup" ?
// TODO: What to do with "Windows" ; "WindowsNT40" ; "WindivsSetup" ?
if ((_wcsicmp(KeyData, L"Windows2003") == 0) ||
(_wcsicmp(KeyData, L"\"Windows2003\"") == 0))
{
Expand Down
Loading

0 comments on commit 9a76340

Please sign in to comment.