Minor thingies...

HBelusca · Oct 14, 2023 · 19b5e9c · 19b5e9c
1 parent 5c2ec83
commit 19b5e9c
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 12 deletions.
diff --git a/base/setup/lib/install.c b/base/setup/lib/install.c
@@ -3,7 +3,8 @@
  * PROJECT:         ReactOS Setup Library
  * FILE:            base/setup/lib/install.c
  * PURPOSE:         Installation functions
- * PROGRAMMERS:     Hervé Poussineau ([email protected])
+ * PROGRAMMERS:     Eric Kohl
+ *                  Hervé Poussineau ([email protected])
  *                  Hermes Belusca-Maito ([email protected])
  */
 
@@ -539,7 +540,7 @@ PrepareCopyInfFile(
 
         /* Add specific files depending of computer type */
         if (!ProcessComputerFiles(InfFile, pSetupData->ComputerList, &AdditionalSectionName))
-            return FALSE;
+            return FALSE; // return ERROR_LOAD_COMPUTER;
 
         if (AdditionalSectionName &&
             !AddSectionToCopyQueue(pSetupData, InfFile,

diff --git a/base/setup/lib/registry.c b/base/setup/lib/registry.c
@@ -21,7 +21,7 @@
  * PROJECT:         ReactOS Setup Library
  * FILE:            base/setup/lib/registry.c
  * PURPOSE:         Registry creation functions
- * PROGRAMMERS:     ...
+ * PROGRAMMERS:     Eric Kohl
  *                  Hermes Belusca-Maito ([email protected])
  */
 

diff --git a/base/setup/lib/registry.h b/base/setup/lib/registry.h
@@ -21,7 +21,7 @@
  * PROJECT:         ReactOS Setup Library
  * FILE:            base/setup/lib/registry.h
  * PURPOSE:         Registry creation functions
- * PROGRAMMERS:     ...
+ * PROGRAMMERS:     Eric Kohl
  *                  Hermes Belusca-Maito ([email protected])
  */
 

diff --git a/base/setup/lib/settings.c b/base/setup/lib/settings.c
@@ -20,7 +20,8 @@
  * PROJECT:         ReactOS text-mode setup
  * FILE:            base/setup/usetup/settings.c
  * PURPOSE:         Device settings support functions
- * PROGRAMMERS:     Colin Finck
+ * PROGRAMMERS:     Eric Kohl
+ *                  Colin Finck
  */
 
 /* INCLUDES *****************************************************************/

diff --git a/base/setup/lib/settings.h b/base/setup/lib/settings.h
@@ -21,7 +21,8 @@
  * PROJECT:         ReactOS text-mode setup
  * FILE:            base/setup/usetup/settings.h
  * PURPOSE:         Device settings support functions
- * PROGRAMMERS:     Colin Finck
+ * PROGRAMMERS:     Eric Kohl
+ *                  Colin Finck
  */
 
 #pragma once

diff --git a/base/setup/lib/spapisup/fileqsup.h b/base/setup/lib/spapisup/fileqsup.h
@@ -3,7 +3,8 @@
  * PROJECT:         ReactOS Setup Library
  * FILE:            base/setup/lib/fileqsup.h
  * PURPOSE:         Interfacing with Setup* API File Queue support functions
- * PROGRAMMERS:     Casper S. Hornstrup ([email protected])
+ * PROGRAMMERS:     Eric Kohl
+ *                  Casper S. Hornstrup ([email protected])
  *                  Hermes Belusca-Maito ([email protected])
  */
 

diff --git a/base/setup/lib/utils/filesup.c b/base/setup/lib/utils/filesup.c
@@ -2,7 +2,8 @@
  * PROJECT:     ReactOS Setup Library
  * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
  * PURPOSE:     File support functions.
- * COPYRIGHT:   Casper S. Hornstrup ([email protected])
+ * COPYRIGHT:   Eric Kohl
+ *              Casper S. Hornstrup ([email protected])
  *              Copyright 2017-2018 Hermes Belusca-Maito
  */
 

diff --git a/base/setup/lib/utils/filesup.h b/base/setup/lib/utils/filesup.h
@@ -3,6 +3,8 @@
  * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
  * PURPOSE:     File support functions.
  * COPYRIGHT:   Casper S. Hornstrup ([email protected])
+ * COPYRIGHT:   Eric Kohl
+ *              Casper S. Hornstrup ([email protected])
  *              Copyright 2017-2018 Hermes Belusca-Maito
  */
 

diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c
@@ -1086,6 +1086,39 @@ FileCopyCallback(PVOID Context,
     return FILEOP_DOIT;
 }
 
+#if 0
+static VOID
+__cdecl
+RegistryStatus(IN REGISTRY_STATUS RegStatus, ...)
+{
+    /* WARNING: Please keep this lookup table in sync with the resources! */
+    static const UINT StringIDs[] =
+    {
+        STRING_DONE,                    /* Success */
+        STRING_REGHIVEUPDATE,           /* RegHiveUpdate */
+        STRING_IMPORTFILE,              /* ImportRegHive */
+        STRING_DISPLAYSETTINGSUPDATE,   /* DisplaySettingsUpdate */
+        STRING_LOCALESETTINGSUPDATE,    /* LocaleSettingsUpdate */
+        STRING_ADDKBLAYOUTS,            /* KeybLayouts */
+        STRING_KEYBOARDSETTINGSUPDATE,  /* KeybSettingsUpdate */
+        STRING_CODEPAGEINFOUPDATE,      /* CodePageInfoUpdate */
+    };
+
+    va_list args;
+
+    if (RegStatus < ARRAYSIZE(StringIDs))
+    {
+        va_start(args, RegStatus);
+        CONSOLE_SetStatusTextV(MUIGetString(StringIDs[RegStatus]), args);
+        va_end(args);
+    }
+    else
+    {
+        CONSOLE_SetStatusText("Unknown status %d", RegStatus);
+    }
+}
+#endif
+
 static DWORD
 WINAPI
 PrepareAndDoCopyThread(
@@ -1191,6 +1224,26 @@ PrepareAndDoCopyThread(
     /* Create the $winnt$.inf file */
     InstallSetupInfFile(&pSetupData->USetupData);
 
+
+    /*
+     * Create or update the registry hives
+     */
+
+    /* Set status text */
+    SetDlgItemTextW(hwndDlg, IDC_ACTIVITY,
+                    pSetupData->RepairUpdateFlag
+                        ? L"Updating the registry..."
+                        : L"Creating the registry...");
+    SetDlgItemTextW(hwndDlg, IDC_ITEM, L"");
+
+    ErrorNumber = UpdateRegistry(&pSetupData->USetupData,
+                                 pSetupData->RepairUpdateFlag,
+                                 pSetupData->PartitionList,
+                                 L'D', // DestinationDriveLetter,   // FIXME!!
+                                 pSetupData->SelectedLanguageId,
+                                 NULL /*RegistryStatus*/);
+
+
     /* We are done! Switch to the Terminate page */
     PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_RESTARTPAGE);
     return 0;

diff --git a/base/setup/usetup/spapisup/fileqsup.c b/base/setup/usetup/spapisup/fileqsup.c
@@ -21,7 +21,8 @@
  * PROJECT:         ReactOS text-mode setup
  * FILE:            base/setup/lib/fileqsup.c
  * PURPOSE:         Interfacing with Setup* API File Queue support functions
- * PROGRAMMERS:     Casper S. Hornstrup ([email protected])
+ * PROGRAMMERS:     Eric Kohl
+ *                  Casper S. Hornstrup ([email protected])
  *                  Hermes Belusca-Maito ([email protected])
  */
 

diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c
@@ -21,7 +21,8 @@
  * PROJECT:         ReactOS text-mode setup
  * FILE:            base/setup/usetup/usetup.c
  * PURPOSE:         Text-mode setup
- * PROGRAMMERS:     Casper S. Hornstrup ([email protected])
+ * PROGRAMMERS:     Eric Kohl
+ *                  Casper S. Hornstrup ([email protected])
  *                  Hervé Poussineau ([email protected])
  */
 

diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
@@ -15,8 +15,7 @@ Signature = "$Windows NT$"
 _1 = %cdname%,%cdtagfile%,,""
 
 [SourceDisksNames.x86]
-;1 = %cdname%,%cdtagfilei%,,\i386
-1 = %cdname%,%cdtagfilei%,,\reactos
+1 = %cdname%,%cdtagfilei%,,\i386
 
 [SourceDisksNames.amd64]
 ;1 = %cdname%,%cdtagfilea%,,\amd64