Ros-diffs October 2018

ros-diffs@reactos.org

21 participants
354 discussions

01/01: [MKHIVE] Minor additional functionality.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=efbe071e02e10a29e173b… commit efbe071e02e10a29e173b7f4c44959aaea5cf857 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Oct 9 00:09:27 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 9 00:15:14 2018 +0200 [MKHIVE] Minor additional functionality. - Add support for '/' switch characters. - Add '-?' switch. TEMPORARY: - Add a '-u' switch to generate hive file names in uppercase (by default we keep these in lowercase). Should help in fixing GCCLin builder. [CMAKE] Fix expected file name case. Should help in fixing GCCLin builder. --- sdk/cmake/CMakeMacros.cmake | 6 +++--- sdk/tools/mkhive/mkhive.c | 34 +++++++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index e86b639529..95fbf2b5fd 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -810,15 +810,15 @@ function(create_registry_hives) # BootCD setup system hive add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV + OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/setupreg.hiv COMMAND native-mkhive -h:SETUPREG -d:${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf DEPENDS native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf) add_custom_target(bootcd_hives - DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV) + DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/setupreg.hiv) add_cd_file( - FILE ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV + FILE ${CMAKE_BINARY_DIR}/boot/bootdata/setupreg.hiv TARGET bootcd_hives DESTINATION reactos NO_CAB diff --git a/sdk/tools/mkhive/mkhive.c b/sdk/tools/mkhive/mkhive.c index 39a443b32a..ad667fd43f 100644 --- a/sdk/tools/mkhive/mkhive.c +++ b/sdk/tools/mkhive/mkhive.c @@ -51,11 +51,13 @@ void usage(void) { - printf("Usage: mkhive -h:hive1[,hiveN...] -d:<dstdir> <inffiles>\n\n" + printf("Usage: mkhive [-?] -h:hive1[,hiveN...] [-u] -d:<dstdir> <inffiles>\n\n" " -h:hiveN - Comma-separated list of hives to create. Possible values are:\n" " SETUPREG, SYSTEM, SOFTWARE, DEFAULT, SAM, SECURITY, BCD.\n" + " -u - Generate file names in uppercase (default: lowercase) (TEMPORARY FLAG!).\n" " -d:dstdir - The binary hive files are created in this directory.\n" - " inffiles - List of INF files with full path.\n"); + " inffiles - List of INF files with full path.\n" + " -? - Displays this help screen.\n"); } void convert_path(char *dst, char *src) @@ -90,6 +92,7 @@ int main(int argc, char *argv[]) { INT ret; UINT i; + BOOL UpperCaseFileName = FALSE; PCSTR HiveList = NULL; CHAR DestPath[PATH_MAX] = ""; CHAR FileName[PATH_MAX]; @@ -103,8 +106,19 @@ int main(int argc, char *argv[]) printf("Binary hive maker\n"); /* Read the options */ - for (i = 1; i < argc && *argv[i] == '-'; i++) + for (i = 1; i < argc && (*argv[i] == '-' || *argv[i] == '/'); i++) { + if (argv[i][1] == '?' && argv[i][1] == 0) + { + usage(); + return 0; + } + + if (argv[i][1] == 'u' && argv[i][1] == 0) + { + UpperCaseFileName = TRUE; + } + else if (argv[i][1] == 'h' && (argv[i][2] == ':' || argv[i][2] == '=')) { HiveList = argv[i] + 3; @@ -166,6 +180,20 @@ int main(int argc, char *argv[]) if (i == 0) strcat(FileName, ".HIV"); + /* Adjust file name case if needed */ + if (UpperCaseFileName) + { + PSTR ptr = FileName; + while (*ptr) + *ptr++ = toupper(*ptr); + } + else + { + PSTR ptr = FileName; + while (*ptr) + *ptr++ = tolower(*ptr); + } + if (!ExportBinaryHive(FileName, RegistryHives[i].CmHive)) goto Quit;

5 years, 11 months

02/02: [MKHIVE] Improve dprint output (delimiting where strings start & end: is useful for empty strings).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c069ca17971f15487b195… commit c069ca17971f15487b195c8a9ebd42712b071d1b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 3 16:41:00 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 21:23:39 2018 +0200 [MKHIVE] Improve dprint output (delimiting where strings start & end: is useful for empty strings). svn path=/branches/setup_improvements/; revision=74768 --- sdk/tools/mkhive/reginf.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sdk/tools/mkhive/reginf.c b/sdk/tools/mkhive/reginf.c index 931fc2feab..c6087a96ba 100644 --- a/sdk/tools/mkhive/reginf.c +++ b/sdk/tools/mkhive/reginf.c @@ -172,7 +172,7 @@ append_multi_sz_value( if (Total != Size) { - DPRINT("setting value %S to %S\n", ValueName, Buffer); + DPRINT("setting value '%S' to '%S'\n", ValueName, Buffer); RegSetValueExW(KeyHandle, ValueName, 0, @@ -290,6 +290,7 @@ do_reg_operation( if (Str == NULL) return TRUE; + DPRINT("append_multi_sz_value(ValueName = '%S')\n", ValueName); append_multi_sz_value(KeyHandle, ValueName, Str, @@ -319,7 +320,7 @@ do_reg_operation( { ULONG dw = Str ? strtoulW(Str, NULL, 0) : 0; - DPRINT("setting dword %S to %x\n", ValueName, dw); + DPRINT("setting dword '%S' to %x\n", ValueName, dw); RegSetValueExW(KeyHandle, ValueName, @@ -330,7 +331,7 @@ do_reg_operation( } else { - DPRINT("setting value %S to %S\n", ValueName, Str); + DPRINT("setting value '%S' to '%S'\n", ValueName, Str); if (Str) { @@ -366,7 +367,7 @@ do_reg_operation( if (Data == NULL) return FALSE; - DPRINT("setting binary data %S len %d\n", ValueName, Size); + DPRINT("setting binary data '%S' len %d\n", ValueName, Size); InfHostGetBinaryField(Context, 5, Data, Size, NULL); } @@ -400,7 +401,6 @@ registry_callback(HINF hInf, PWCHAR Section, BOOL Delete) HKEY KeyHandle; BOOL Ok; - Ok = InfHostFindFirstLine(hInf, Section, NULL, &Context) == 0; if (!Ok) return TRUE; /* Don't fail if the section isn't present */ @@ -501,7 +501,6 @@ ImportRegistryFile(PCHAR FileName) } InfHostCloseFile(hInf); - return TRUE; }

5 years, 11 months

01/02: [MKHIVE][CMAKE] Make mkhive a bit more flexible, so that it can generate only specific hives on-demand (and not all of them always at once).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84d2264d9bfa6e56b9430… commit 84d2264d9bfa6e56b94302ccd9bf2c7548306eb8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jun 2 00:34:10 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 21:23:38 2018 +0200 [MKHIVE][CMAKE] Make mkhive a bit more flexible, so that it can generate only specific hives on-demand (and not all of them always at once). This commit is needed for building a single bootcd registry hive. It will also enable 1-st stage setup to have a proper registry present as done on Windows. CORE-13347 [CMAKE] Note that the mkhive commands should really depend on the generated UTF16 INF files since the latter are those that are actually used as input for mkhive. Otherwise, the mkhive calls & the UTF16 INF file conversion is not serialized and we can generate "corrupted" hives due to the fact that mkhive is using INF files that are in the process of being (and therefore, only partially) generated. svn path=/branches/setup_improvements/; revision=74741 svn path=/branches/setup_improvements/; revision=74749 --- sdk/cmake/CMakeMacros.cmake | 63 ++++++++----- sdk/tools/mkhive/mkhive.c | 138 +++++++++++++++++------------ sdk/tools/mkhive/mkhive.h | 8 +- sdk/tools/mkhive/registry.c | 211 +++++++++++++++++++++++++++----------------- sdk/tools/mkhive/registry.h | 20 +++-- 5 files changed, 277 insertions(+), 163 deletions(-) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index d3214158a9..e86b639529 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -808,43 +808,66 @@ function(create_registry_hives) NO_CAB FOR bootcd regtest) - # livecd hives + # BootCD setup system hive + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV + COMMAND native-mkhive -h:SETUPREG -d:${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf + DEPENDS native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf) + + add_custom_target(bootcd_hives + DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV) + + add_cd_file( + FILE ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV + TARGET bootcd_hives + DESTINATION reactos + NO_CAB + FOR bootcd regtest) + + # LiveCD hives list(APPEND _livecd_inf_files ${_registry_inf} ${CMAKE_SOURCE_DIR}/boot/bootdata/livecd.inf ${CMAKE_SOURCE_DIR}/boot/bootdata/hiveinst.inf) add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/sam - ${CMAKE_BINARY_DIR}/boot/bootdata/default - ${CMAKE_BINARY_DIR}/boot/bootdata/security - ${CMAKE_BINARY_DIR}/boot/bootdata/software - ${CMAKE_BINARY_DIR}/boot/bootdata/system - ${CMAKE_BINARY_DIR}/boot/bootdata/BCD - COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata ${_livecd_inf_files} + OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/system + ${CMAKE_BINARY_DIR}/boot/bootdata/software + ${CMAKE_BINARY_DIR}/boot/bootdata/default + ${CMAKE_BINARY_DIR}/boot/bootdata/sam + ${CMAKE_BINARY_DIR}/boot/bootdata/security + COMMAND native-mkhive -h:SYSTEM,SOFTWARE,DEFAULT,SAM,SECURITY -d:${CMAKE_BINARY_DIR}/boot/bootdata ${_livecd_inf_files} DEPENDS native-mkhive ${_livecd_inf_files}) add_custom_target(livecd_hives - DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/sam - ${CMAKE_BINARY_DIR}/boot/bootdata/default - ${CMAKE_BINARY_DIR}/boot/bootdata/security - ${CMAKE_BINARY_DIR}/boot/bootdata/software - ${CMAKE_BINARY_DIR}/boot/bootdata/system - ${CMAKE_BINARY_DIR}/boot/bootdata/BCD) + DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/system + ${CMAKE_BINARY_DIR}/boot/bootdata/software + ${CMAKE_BINARY_DIR}/boot/bootdata/default + ${CMAKE_BINARY_DIR}/boot/bootdata/sam + ${CMAKE_BINARY_DIR}/boot/bootdata/security) add_cd_file( - FILE ${CMAKE_BINARY_DIR}/boot/bootdata/sam - ${CMAKE_BINARY_DIR}/boot/bootdata/default - ${CMAKE_BINARY_DIR}/boot/bootdata/security - ${CMAKE_BINARY_DIR}/boot/bootdata/software - ${CMAKE_BINARY_DIR}/boot/bootdata/system + FILE ${CMAKE_BINARY_DIR}/boot/bootdata/system + ${CMAKE_BINARY_DIR}/boot/bootdata/software + ${CMAKE_BINARY_DIR}/boot/bootdata/default + ${CMAKE_BINARY_DIR}/boot/bootdata/sam + ${CMAKE_BINARY_DIR}/boot/bootdata/security TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) + # BCD Hive + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/BCD + COMMAND native-mkhive -h:BCD -d:${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf + DEPENDS native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf) + + add_custom_target(bcd_hive + DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/BCD) + add_cd_file( FILE ${CMAKE_BINARY_DIR}/boot/bootdata/BCD - TARGET livecd_hives + TARGET bcd_hive DESTINATION efi/boot NO_CAB FOR bootcd regtest livecd) diff --git a/sdk/tools/mkhive/mkhive.c b/sdk/tools/mkhive/mkhive.c index a1d6ef4474..39a443b32a 100644 --- a/sdk/tools/mkhive/mkhive.c +++ b/sdk/tools/mkhive/mkhive.c @@ -21,8 +21,9 @@ * PROJECT: ReactOS hive maker * FILE: tools/mkhive/mkhive.c * PURPOSE: Hive maker - * PROGRAMMER: Eric Kohl - * Herv� Poussineau + * PROGRAMMERS: Eric Kohl + * Hervé Poussineau + * Hermès Bélusca-Maïto */ #include <limits.h> @@ -48,11 +49,13 @@ #endif -void usage (void) +void usage(void) { - printf ("Usage: mkhive <dstdir> <inffiles>\n\n"); - printf (" dstdir - binary hive files are created in this directory\n"); - printf (" inffiles - inf files with full path\n"); + printf("Usage: mkhive -h:hive1[,hiveN...] -d:<dstdir> <inffiles>\n\n" + " -h:hiveN - Comma-separated list of hives to create. Possible values are:\n" + " SETUPREG, SYSTEM, SOFTWARE, DEFAULT, SAM, SECURITY, BCD.\n" + " -d:dstdir - The binary hive files are created in this directory.\n" + " inffiles - List of INF files with full path.\n"); } void convert_path(char *dst, char *src) @@ -83,83 +86,106 @@ void convert_path(char *dst, char *src) dst[i] = 0; } -int main (int argc, char *argv[]) +int main(int argc, char *argv[]) { - char FileName[PATH_MAX]; - int i; + INT ret; + UINT i; + PCSTR HiveList = NULL; + CHAR DestPath[PATH_MAX] = ""; + CHAR FileName[PATH_MAX]; - if (argc < 3) + if (argc < 4) { - usage (); - return 1; + usage(); + return -1; } - printf ("Binary hive maker\n"); - - RegInitializeRegistry (); + printf("Binary hive maker\n"); - for (i = 2; i < argc; i++) + /* Read the options */ + for (i = 1; i < argc && *argv[i] == '-'; i++) { - convert_path (FileName, argv[i]); - if (!ImportRegistryFile (FileName)) + if (argv[i][1] == 'h' && (argv[i][2] == ':' || argv[i][2] == '=')) + { + HiveList = argv[i] + 3; + } + else if (argv[i][1] == 'd' && (argv[i][2] == ':' || argv[i][2] == '=')) + { + convert_path(DestPath, argv[i] + 3); + } + else { - return 1; + fprintf(stderr, "Unrecognized option: %s\n", argv[i]); + return -1; } } - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "default"); - if (!ExportBinaryHive (FileName, &DefaultHive)) + /* Check whether we have all the parameters needed */ + if (!HiveList || !*HiveList) { - return 1; + fprintf(stderr, "The mandatory list of hives is missing.\n"); + return -1; } - - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "sam"); - if (!ExportBinaryHive (FileName, &SamHive)) + if (!*DestPath) { - return 1; + fprintf(stderr, "The mandatory output directory is missing.\n"); + return -1; } - - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "security"); - if (!ExportBinaryHive (FileName, &SecurityHive)) + if (i >= argc) { - return 1; + fprintf(stderr, "Not enough parameters, or the list of INF files is missing.\n"); + return -1; } - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "software"); - if (!ExportBinaryHive (FileName, &SoftwareHive)) - { - return 1; - } + /* Initialize the registry */ + RegInitializeRegistry(HiveList); + + /* Default to failure */ + ret = -1; - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "system"); - if (!ExportBinaryHive (FileName, &SystemHive)) + /* Now we should have the list of INF files: parse it */ + for (; i < argc; ++i) { - return 1; + convert_path(FileName, argv[i]); + if (!ImportRegistryFile(FileName)) + goto Quit; } - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "BCD"); - if (!ExportBinaryHive (FileName, &BcdHive)) + for (i = 0; i < MAX_NUMBER_OF_REGISTRY_HIVES; ++i) { - return 1; + /* Skip this registry hive if it's not in the list */ + if (!strstr(HiveList, RegistryHives[i].HiveName)) + continue; + + strcpy(FileName, DestPath); + strcat(FileName, DIR_SEPARATOR_STRING); + strcat(FileName, RegistryHives[i].HiveName); + + /* Exception for the special setup registry hive */ + // if (strcmp(RegistryHives[i].HiveName, "SETUPREG") == 0) + if (i == 0) + strcat(FileName, ".HIV"); + + if (!ExportBinaryHive(FileName, RegistryHives[i].CmHive)) + goto Quit; + + /* If we happen to deal with the special setup registry hive, stop there */ + // if (strcmp(RegistryHives[i].HiveName, "SETUPREG") == 0) + if (i == 0) + break; } - RegShutdownRegistry (); + /* Success */ + ret = 0; + +Quit: + /* Shut down the registry */ + RegShutdownRegistry(); - printf (" Done.\n"); + if (ret == 0) + printf(" Done.\n"); - return 0; + return ret; } /* EOF */ diff --git a/sdk/tools/mkhive/mkhive.h b/sdk/tools/mkhive/mkhive.h index 519ee91758..517925a6b6 100644 --- a/sdk/tools/mkhive/mkhive.h +++ b/sdk/tools/mkhive/mkhive.h @@ -21,7 +21,7 @@ * PROJECT: ReactOS hive maker * FILE: tools/mkhive/mkhive.h * PURPOSE: Hive maker - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl * Herv� Poussineau */ @@ -32,6 +32,12 @@ #include <typedefs.h> +#ifndef _MSC_VER +#ifndef _countof +#define _countof(_Array) (sizeof(_Array) / sizeof(_Array[0])) +#endif +#endif + // Definitions copied from <ntstatus.h> // We only want to include host headers, so we define them manually #define STATUS_SUCCESS ((NTSTATUS)0x00000000) diff --git a/sdk/tools/mkhive/registry.c b/sdk/tools/mkhive/registry.c index e7a8cc9100..17030bb209 100644 --- a/sdk/tools/mkhive/registry.c +++ b/sdk/tools/mkhive/registry.c @@ -21,7 +21,8 @@ * PROJECT: ReactOS hive maker * FILE: tools/mkhive/registry.c * PURPOSE: Registry code - * PROGRAMMER: Hervé Poussineau + * PROGRAMMERS: Hervé Poussineau + * Hermès Bélusca-Maïto */ /* @@ -38,12 +39,13 @@ static CMHIVE RootHive; static PMEMKEY RootKey; -CMHIVE DefaultHive; /* \Registry\User\.DEFAULT */ -CMHIVE SamHive; /* \Registry\Machine\SAM */ -CMHIVE SecurityHive; /* \Registry\Machine\SECURITY */ -CMHIVE SoftwareHive; /* \Registry\Machine\SOFTWARE */ -CMHIVE SystemHive; /* \Registry\Machine\SYSTEM */ -CMHIVE BcdHive; /* \Registry\Machine\BCD00000000 */ + +static CMHIVE SystemHive; /* \Registry\Machine\SYSTEM */ +static CMHIVE SoftwareHive; /* \Registry\Machine\SOFTWARE */ +static CMHIVE DefaultHive; /* \Registry\User\.DEFAULT */ +static CMHIVE SamHive; /* \Registry\Machine\SAM */ +static CMHIVE SecurityHive; /* \Registry\Machine\SECURITY */ +static CMHIVE BcdHive; /* \Registry\Machine\BCD00000000 */ // // TODO: Write these values in a more human-readable form. @@ -56,7 +58,7 @@ CMHIVE BcdHive; /* \Registry\Machine\BCD00000000 */ // A cross-check was subsequently done with the system hives to verify that // the security descriptors were the same. // -UCHAR BcdSecurity[] = +static UCHAR BcdSecurity[] = { // SECURITY_DESCRIPTOR_RELATIVE 0x01, // Revision @@ -118,7 +120,7 @@ UCHAR BcdSecurity[] = 0x01, 0x02, 0x00, 0x00 }; -UCHAR SoftwareSecurity[] = +static UCHAR SoftwareSecurity[] = { // SECURITY_DESCRIPTOR_RELATIVE 0x01, // Revision @@ -234,7 +236,7 @@ UCHAR SoftwareSecurity[] = }; // Same security for SYSTEM, SAM and .DEFAULT -UCHAR SystemSecurity[] = +static UCHAR SystemSecurity[] = { // SECURITY_DESCRIPTOR_RELATIVE 0x01, // Revision @@ -330,6 +332,24 @@ UCHAR SystemSecurity[] = 0x01, 0x02, 0x00, 0x00 }; + +HIVE_LIST_ENTRY RegistryHives[/*MAX_NUMBER_OF_REGISTRY_HIVES*/] = +{ + /* Special Setup system registry hive */ + // WARNING: Please *keep* it in first position! + { "SETUPREG", L"Registry\\Machine\\SYSTEM" , &SystemHive , SystemSecurity , sizeof(SystemSecurity) }, + + /* Regular registry hives */ + { "SYSTEM" , L"Registry\\Machine\\SYSTEM" , &SystemHive , SystemSecurity , sizeof(SystemSecurity) }, + { "SOFTWARE", L"Registry\\Machine\\SOFTWARE" , &SoftwareHive, SoftwareSecurity, sizeof(SoftwareSecurity) }, + { "DEFAULT" , L"Registry\\User\\.DEFAULT" , &DefaultHive , SystemSecurity , sizeof(SystemSecurity) }, + { "SAM" , L"Registry\\Machine\\SAM" , &SamHive , SystemSecurity , sizeof(SystemSecurity) }, + { "SECURITY", L"Registry\\Machine\\SECURITY" , &SecurityHive, NULL , 0 }, + { "BCD" , L"Registry\\Machine\\BCD00000000", &BcdHive , BcdSecurity , sizeof(BcdSecurity) }, +}; +C_ASSERT(_countof(RegistryHives) == MAX_NUMBER_OF_REGISTRY_HIVES); + + static PMEMKEY CreateInMemoryStructure( IN PCMHIVE RegistryHive, @@ -346,6 +366,7 @@ CreateInMemoryStructure( return Key; } +LIST_ENTRY CmiHiveListHead; LIST_ENTRY CmiReparsePointsHead; static LONG @@ -671,9 +692,9 @@ VOID RepGetValueData( IN PHHIVE Hive, IN PCM_KEY_VALUE ValueCell, - OUT ULONG* Type OPTIONAL, + OUT PULONG Type OPTIONAL, OUT PUCHAR Data OPTIONAL, - IN OUT ULONG* DataSize OPTIONAL) + IN OUT PULONG DataSize OPTIONAL) { ULONG DataLength; PVOID DataCell; @@ -759,16 +780,16 @@ static BOOL ConnectRegistry( IN HKEY RootKey, IN PCMHIVE HiveToConnect, - IN PUCHAR Descriptor, - IN ULONG DescriptorLength, - IN LPCWSTR Path) + IN PUCHAR SecurityDescriptor, + IN ULONG SecurityDescriptorLength, + IN PCWSTR Path) { NTSTATUS Status; PREPARSE_POINT ReparsePoint; PMEMKEY NewKey; LONG rc; - ReparsePoint = (PREPARSE_POINT)malloc(sizeof(REPARSE_POINT)); + ReparsePoint = (PREPARSE_POINT)malloc(sizeof(*ReparsePoint)); if (!ReparsePoint) return FALSE; @@ -794,7 +815,7 @@ ConnectRegistry( */ Status = CmiCreateSecurityKey(&HiveToConnect->Hive, HiveToConnect->Hive.BaseBlock->RootCell, - Descriptor, DescriptorLength); + SecurityDescriptor, SecurityDescriptorLength); if (!NT_SUCCESS(Status)) DPRINT1("Failed to add security for root key '%S'\n", Path); @@ -821,18 +842,64 @@ ConnectRegistry( ReparsePoint->DestinationHive = NewKey->RegistryHive; ReparsePoint->DestinationKeyCellOffset = NewKey->KeyCellOffset; InsertTailList(&CmiReparsePointsHead, &ReparsePoint->ListEntry); + return TRUE; } -LIST_ENTRY CmiHiveListHead; +static BOOL +CreateSymLink( + IN PCWSTR LinkKeyPath OPTIONAL, + IN OUT PHKEY LinkKeyHandle OPTIONAL, + // IN PCWSTR TargetKeyPath OPTIONAL, + IN HKEY TargetKeyHandle) +{ + PMEMKEY LinkKey, TargetKey; + PREPARSE_POINT ReparsePoint; + + ReparsePoint = (PREPARSE_POINT)malloc(sizeof(*ReparsePoint)); + if (!ReparsePoint) + return FALSE; + + if (LinkKeyPath && !(LinkKeyHandle && *LinkKeyHandle)) + { + /* Create the link key */ + RegCreateKeyExW(NULL, + LinkKeyPath, + 0, + NULL, + REG_OPTION_VOLATILE, + 0, + NULL, + (HKEY*)&LinkKey, + NULL); + } + else if (LinkKeyHandle) + { + /* Use the user-provided link key handle */ + LinkKey = HKEY_TO_MEMKEY(*LinkKeyHandle); + } + + if (LinkKeyHandle) + *LinkKeyHandle = MEMKEY_TO_HKEY(LinkKey); + + TargetKey = HKEY_TO_MEMKEY(TargetKeyHandle); + + ReparsePoint->SourceHive = LinkKey->RegistryHive; + ReparsePoint->SourceKeyCellOffset = LinkKey->KeyCellOffset; + ReparsePoint->DestinationHive = TargetKey->RegistryHive; + ReparsePoint->DestinationKeyCellOffset = TargetKey->KeyCellOffset; + InsertTailList(&CmiReparsePointsHead, &ReparsePoint->ListEntry); + + return TRUE; +} VOID -RegInitializeRegistry(VOID) +RegInitializeRegistry( + IN PCSTR HiveList) { - UNICODE_STRING RootKeyName = RTL_CONSTANT_STRING(L"\\"); NTSTATUS Status; - PMEMKEY ControlSetKey, CurrentControlSetKey; - PREPARSE_POINT ReparsePoint; + UINT i; + HKEY ControlSetKey; InitializeListHead(&CmiHiveListHead); InitializeListHead(&CmiReparsePointsHead); @@ -847,70 +914,56 @@ RegInitializeRegistry(VOID) RootKey = CreateInMemoryStructure(&RootHive, RootHive.Hive.BaseBlock->RootCell); - /* Create DEFAULT key */ - ConnectRegistry(NULL, - &DefaultHive, - SystemSecurity, sizeof(SystemSecurity), - L"Registry\\User\\.DEFAULT"); - - /* Create SAM key */ - ConnectRegistry(NULL, - &SamHive, - SystemSecurity, sizeof(SystemSecurity), - L"Registry\\Machine\\SAM"); - - /* Create SECURITY key */ - ConnectRegistry(NULL, - &SecurityHive, - NULL, 0, - L"Registry\\Machine\\SECURITY"); - - /* Create SOFTWARE key */ - ConnectRegistry(NULL, - &SoftwareHive, - SoftwareSecurity, sizeof(SoftwareSecurity), - L"Registry\\Machine\\SOFTWARE"); - - /* Create BCD key */ - ConnectRegistry(NULL, - &BcdHive, - BcdSecurity, sizeof(BcdSecurity), - L"Registry\\Machine\\BCD00000000"); - - /* Create SYSTEM key */ - ConnectRegistry(NULL, - &SystemHive, - SystemSecurity, sizeof(SystemSecurity), - L"Registry\\Machine\\SYSTEM"); - - /* Create 'ControlSet001' key */ + for (i = 0; i < _countof(RegistryHives); ++i) + { + /* Skip this registry hive if it's not in the list */ + if (!strstr(HiveList, RegistryHives[i].HiveName)) + continue; + + /* Create the registry key */ + ConnectRegistry(NULL, + RegistryHives[i].CmHive, + RegistryHives[i].SecurityDescriptor, + RegistryHives[i].SecurityDescriptorLength, + RegistryHives[i].HiveRegistryPath); + + /* If we happen to deal with the special setup registry hive, stop there */ + // if (strcmp(RegistryHives[i].HiveName, "SETUPREG") == 0) + if (i == 0) + break; + } + + /* Create the 'ControlSet001' key */ RegCreateKeyW(NULL, L"Registry\\Machine\\SYSTEM\\ControlSet001", - (HKEY*)&ControlSetKey); - - /* Create 'CurrentControlSet' key */ - RegCreateKeyExW(NULL, - L"Registry\\Machine\\SYSTEM\\CurrentControlSet", - 0, - NULL, - REG_OPTION_VOLATILE, - 0, - NULL, - (HKEY*)&CurrentControlSetKey, - NULL); - - /* Connect 'CurrentControlSet' to 'ControlSet001' */ - ReparsePoint = (PREPARSE_POINT)malloc(sizeof(REPARSE_POINT)); - ReparsePoint->SourceHive = CurrentControlSetKey->RegistryHive; - ReparsePoint->SourceKeyCellOffset = CurrentControlSetKey->KeyCellOffset; - ReparsePoint->DestinationHive = ControlSetKey->RegistryHive; - ReparsePoint->DestinationKeyCellOffset = ControlSetKey->KeyCellOffset; - InsertTailList(&CmiReparsePointsHead, &ReparsePoint->ListEntry); + &ControlSetKey); + + /* Create the 'CurrentControlSet' key as a symlink to 'ControlSet001' */ + CreateSymLink(L"Registry\\Machine\\SYSTEM\\CurrentControlSet", + NULL, ControlSetKey); + +#if 0 + /* Link SECURITY to SAM */ + CmpLinkKeyToHive(L"\\Registry\\Machine\\Security\\SAM", L"\\Registry\\Machine\\SAM\\SAM"); + /* Link S-1-5-18 to .Default */ + CmpLinkKeyToHive(L"\\Registry\\User\\S-1-5-18", L"\\Registry\\User\\.Default"); +#endif } VOID RegShutdownRegistry(VOID) { + PLIST_ENTRY Entry; + PREPARSE_POINT ReparsePoint; + + /* Clean up the reparse points list */ + while (!IsListEmpty(&CmiReparsePointsHead)) + { + Entry = RemoveHeadList(&CmiReparsePointsHead); + ReparsePoint = CONTAINING_RECORD(Entry, REPARSE_POINT, ListEntry); + free(ReparsePoint); + } + /* FIXME: clean up the complete hive */ free(RootKey); diff --git a/sdk/tools/mkhive/registry.h b/sdk/tools/mkhive/registry.h index 0215a319a4..7712de9d55 100644 --- a/sdk/tools/mkhive/registry.h +++ b/sdk/tools/mkhive/registry.h @@ -26,12 +26,17 @@ typedef struct _MEMKEY #define HKEY_TO_MEMKEY(hKey) ((PMEMKEY)(hKey)) #define MEMKEY_TO_HKEY(memKey) ((HKEY)(memKey)) -extern CMHIVE DefaultHive; /* \Registry\User\.DEFAULT */ -extern CMHIVE SamHive; /* \Registry\Machine\SAM */ -extern CMHIVE SecurityHive; /* \Registry\Machine\SECURITY */ -extern CMHIVE SoftwareHive; /* \Registry\Machine\SOFTWARE */ -extern CMHIVE SystemHive; /* \Registry\Machine\SYSTEM */ -extern CMHIVE BcdHive; /* \Registry\Machine\BCD00000000 */ +typedef struct _HIVE_LIST_ENTRY +{ + PCSTR HiveName; + PCWSTR HiveRegistryPath; + PCMHIVE CmHive; + PUCHAR SecurityDescriptor; + ULONG SecurityDescriptorLength; +} HIVE_LIST_ENTRY, *PHIVE_LIST_ENTRY; + +#define MAX_NUMBER_OF_REGISTRY_HIVES 7 +extern HIVE_LIST_ENTRY RegistryHives[]; #define ERROR_SUCCESS 0L #define ERROR_UNSUCCESSFUL 1L @@ -57,7 +62,8 @@ extern CMHIVE BcdHive; /* \Registry\Machine\BCD00000000 */ #define REG_QWORD_LITTLE_ENDIAN 11 VOID -RegInitializeRegistry(VOID); +RegInitializeRegistry( + IN PCSTR HiveList); VOID RegShutdownRegistry(VOID);

5 years, 11 months

08/08: [BOOTDATA][CMAKE] Enumerate the four first installation directories in 'canonical' order, to keep compatibility with Windows' txtsetup.sif/layout.inf.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=287d35b84d9d35ec5c576… commit 287d35b84d9d35ec5c5767fd3c9498223c09e5ab Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 7 01:46:31 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 21:16:58 2018 +0200 [BOOTDATA][CMAKE] Enumerate the four first installation directories in 'canonical' order, to keep compatibility with Windows' txtsetup.sif/layout.inf. --- boot/bootdata/packages/reactos.dff.in | 8 ++++---- sdk/cmake/CMakeMacros.cmake | 13 +++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index cd3c0de558..b0561522b6 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -17,10 +17,10 @@ Signature = "$ReactOS$" ; For specifying absolute directories, use the SystemPartitionFiles section, ; or use names starting with \. [Directories] -1 = system32 -2 = system32\drivers -3 = Fonts -4 = "\" +1 = "\" +2 = system32 +3 = system32\drivers +4 = Fonts 5 = system32\drivers\etc 6 = inf 7 = bin diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 8258247290..d3214158a9 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -162,14 +162,19 @@ function(add_link) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_LINK_NAME}.lnk PROPERTIES GENERATED TRUE) endfunction() +# +# WARNING! +# Please keep the numbering in this list in sync with +# boot/bootdata/packages/reactos.dff.in +# macro(dir_to_num dir var) - if(${dir} STREQUAL reactos/system32) + if(${dir} STREQUAL reactos) set(${var} 1) - elseif(${dir} STREQUAL reactos/system32/drivers) + elseif(${dir} STREQUAL reactos/system32) set(${var} 2) - elseif(${dir} STREQUAL reactos/Fonts) + elseif(${dir} STREQUAL reactos/system32/drivers) set(${var} 3) - elseif(${dir} STREQUAL reactos) + elseif(${dir} STREQUAL reactos/Fonts) set(${var} 4) elseif(${dir} STREQUAL reactos/system32/drivers/etc) set(${var} 5)

5 years, 11 months

07/08: [SYSSETUP] Delete the created fonts when needed.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8468ad5cf4c14c36729bb… commit 8468ad5cf4c14c36729bb5a63ad2976f6ff32cbb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 20 20:35:56 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 21:16:58 2018 +0200 [SYSSETUP] Delete the created fonts when needed. --- dll/win32/syssetup/wizard.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index aa26296af0..2eafef7874 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -2655,6 +2655,9 @@ InstallWizard(VOID) } } + DeleteObject(pSetupData->hBoldFont); + DeleteObject(pSetupData->hTitleFont); + if (pSetupData->hUnattendedInf != INVALID_HANDLE_VALUE) SetupCloseInfFile(pSetupData->hUnattendedInf); @@ -2666,11 +2669,7 @@ done: FreeLibrary(hNetShell); if (pSetupData != NULL) - { - DeleteObject(pSetupData->hBoldFont); - DeleteObject(pSetupData->hTitleFont); HeapFree(GetProcessHeap(), 0, pSetupData); - } LogItem(L"END_SECTION", L"InstallWizard"); }

5 years, 11 months

06/08: [SYSSETUP] Use ARRAYSIZE / _countof instead of sizeof ratios.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6267898583b92415d0b14… commit 6267898583b92415d0b1460446705fae51e2e833 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 10 18:59:26 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 21:16:57 2018 +0200 [SYSSETUP] Use ARRAYSIZE / _countof instead of sizeof ratios. svn path=/branches/setup_improvements/; revision=75523 --- dll/win32/syssetup/wizard.c | 88 ++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 45 deletions(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index c1c8b06b4e..aa26296af0 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -488,11 +488,11 @@ OwnerPageDlgProc(HWND hwndDlg, OwnerName[0] = 0; if (GetDlgItemTextW(hwndDlg, IDC_OWNERNAME, OwnerName, 50) == 0) { - if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, sizeof(Title) / sizeof(Title[0]))) + if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, ARRAYSIZE(Title))) { wcscpy(Title, L"ReactOS Setup"); } - if (0 == LoadStringW(hDllInstance, IDS_WZD_NAME, ErrorName, sizeof(ErrorName) / sizeof(ErrorName[0]))) + if (0 == LoadStringW(hDllInstance, IDS_WZD_NAME, ErrorName, ARRAYSIZE(ErrorName))) { wcscpy(ErrorName, L"Setup cannot continue until you enter your name."); } @@ -542,12 +542,12 @@ WriteComputerSettings(WCHAR * ComputerName, HWND hwndDlg) { if (hwndDlg != NULL) { - if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, sizeof(Title) / sizeof(Title[0]))) + if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, ARRAYSIZE(Title))) { wcscpy(Title, L"ReactOS Setup"); } if (0 == LoadStringW(hDllInstance, IDS_WZD_SETCOMPUTERNAME, ErrorComputerName, - sizeof(ErrorComputerName) / sizeof(ErrorComputerName[0]))) + ARRAYSIZE(ErrorComputerName))) { wcscpy(ErrorComputerName, L"Setup failed to set the computer name."); } @@ -578,7 +578,7 @@ WriteDefaultLogonData(LPWSTR Domain) if (LoadStringW(hDllInstance, IDS_ADMINISTRATOR_NAME, szAdministratorName, - sizeof(szAdministratorName) / sizeof(WCHAR)) == 0) + ARRAYSIZE(szAdministratorName)) == 0) { wcscpy(szAdministratorName, L"Administrator"); } @@ -655,7 +655,7 @@ ComputerPageDlgProc(HWND hwndDlg, pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); - if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, sizeof(Title) / sizeof(Title[0]))) + if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, ARRAYSIZE(Title))) { wcscpy(Title, L"ReactOS Setup"); } @@ -713,7 +713,7 @@ ComputerPageDlgProc(HWND hwndDlg, if (0 == GetDlgItemTextW(hwndDlg, IDC_COMPUTERNAME, ComputerName, MAX_COMPUTERNAME_LENGTH + 1)) { if (0 == LoadStringW(hDllInstance, IDS_WZD_COMPUTERNAME, EmptyComputerName, - sizeof(EmptyComputerName) / sizeof(EmptyComputerName[0]))) + ARRAYSIZE(EmptyComputerName))) { wcscpy(EmptyComputerName, L"Setup cannot continue until you enter the name of your computer."); } @@ -739,7 +739,7 @@ ComputerPageDlgProc(HWND hwndDlg, (GetDlgItemText(hwndDlg, IDC_ADMINPASSWORD2, Password2, 128) == 0)) { if (0 == LoadStringW(hDllInstance, IDS_WZD_PASSWORDEMPTY, EmptyPassword, - sizeof(EmptyPassword) / sizeof(EmptyPassword[0]))) + ARRAYSIZE(EmptyPassword))) { wcscpy(EmptyPassword, L"You must enter a password !"); } @@ -755,7 +755,7 @@ ComputerPageDlgProc(HWND hwndDlg, if (wcscmp(Password1, Password2)) { if (0 == LoadStringW(hDllInstance, IDS_WZD_PASSWORDMATCH, NotMatchPassword, - sizeof(NotMatchPassword) / sizeof(NotMatchPassword[0]))) + ARRAYSIZE(NotMatchPassword))) { wcscpy(NotMatchPassword, L"The passwords you entered do not match. Please enter the desired password again."); } @@ -771,7 +771,7 @@ ComputerPageDlgProc(HWND hwndDlg, if (!isprint(*Password)) { if (0 == LoadStringW(hDllInstance, IDS_WZD_PASSWORDCHAR, WrongPassword, - sizeof(WrongPassword) / sizeof(WrongPassword[0]))) + ARRAYSIZE(WrongPassword))) { wcscpy(WrongPassword, L"The password you entered contains invalid characters. Please enter a cleaned password."); } @@ -919,7 +919,7 @@ WriteUserLocale(VOID) lcid = GetSystemDefaultLCID(); - if (GetLocaleInfoW(MAKELCID(lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, Locale, sizeof(Locale) / sizeof(Locale[0])) != 0) + if (GetLocaleInfoW(MAKELCID(lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, Locale, ARRAYSIZE(Locale)) != 0) { if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Control Panel\\International", 0, NULL, REG_OPTION_NON_VOLATILE, @@ -1500,12 +1500,12 @@ WriteDateTimeSettings(HWND hwndDlg, PSETUPDATA SetupData) SetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT)); if (!SetSystemLocalTime(hwndDlg, SetupData)) { - if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, sizeof(Title) / sizeof(Title[0]))) + if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, ARRAYSIZE(Title))) { wcscpy(Title, L"ReactOS Setup"); } if (0 == LoadStringW(hDllInstance, IDS_WZD_LOCALTIME, ErrorLocalTime, - sizeof(ErrorLocalTime) / sizeof(ErrorLocalTime[0]))) + ARRAYSIZE(ErrorLocalTime))) { wcscpy(ErrorLocalTime, L"Setup was unable to set the local time."); } @@ -1753,8 +1753,7 @@ RegistrationNotificationProc(PVOID Context, } if (0 == LoadStringW(hDllInstance, MessageID, ErrorMessage, - sizeof(ErrorMessage) / - sizeof(ErrorMessage[0]))) + ARRAYSIZE(ErrorMessage))) { ErrorMessage[0] = L'\0'; } @@ -1763,8 +1762,8 @@ RegistrationNotificationProc(PVOID Context, FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, StatusInfo->Win32Error, 0, ErrorMessage + wcslen(ErrorMessage), - sizeof(ErrorMessage) / sizeof(ErrorMessage[0]) - - wcslen(ErrorMessage), NULL); + ARRAYSIZE(ErrorMessage) - wcslen(ErrorMessage), + NULL); } RegistrationNotify.ErrorMessage = ErrorMessage; } @@ -1847,8 +1846,7 @@ RegistrationProc(LPVOID Parameter) { if (0 == LoadStringW(hDllInstance, IDS_UNKNOWN_ERROR, UnknownError, - sizeof(UnknownError) / sizeof(UnknownError[0]) - - 20)) + ARRAYSIZE(UnknownError) - 20)) { wcscpy(UnknownError, L"Unknown error"); } @@ -1898,7 +1896,7 @@ StartComponentRegistration(HWND hwndDlg, PULONG MaxProgress) return FALSE; } if (!SetupGetStringFieldW(&Context, 1, SectionName, - sizeof(SectionName) / sizeof(SectionName[0]), + ARRAYSIZE(SectionName), NULL)) { DPRINT1("Unable to retrieve section name\n"); @@ -2013,7 +2011,7 @@ ProcessPageDlgProc(HWND hwndDlg, { if (0 != LoadStringW(hDllInstance, RegistrationNotify->ActivityID, Activity, - sizeof(Activity) / sizeof(Activity[0]))) + ARRAYSIZE(Activity))) { SendDlgItemMessageW(hwndDlg, IDC_ACTIVITY, WM_SETTEXT, 0, (LPARAM) Activity); @@ -2028,7 +2026,7 @@ ProcessPageDlgProc(HWND hwndDlg, if (NULL != RegistrationNotify->ErrorMessage) { if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, - Title, sizeof(Title) / sizeof(Title[0]))) + Title, ARRAYSIZE(Title))) { wcscpy(Title, L"ReactOS Setup"); } @@ -2200,14 +2198,14 @@ ProcessUnattendInf( if (!SetupGetStringFieldW(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(WCHAR), + ARRAYSIZE(szValue), &LineLength)) { DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); return; } - if (wcscmp(szValue, L"yes") != 0) + if (_wcsicmp(szValue, L"yes") != 0) { DPRINT("Unattend setup was disabled by UnattendSetupEnabled key.\n"); return; @@ -2229,7 +2227,7 @@ ProcessUnattendInf( if (!SetupGetStringFieldW(&InfContext, 0, szName, - sizeof(szName) / sizeof(WCHAR), + ARRAYSIZE(szName), &LineLength)) { DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); @@ -2239,52 +2237,52 @@ ProcessUnattendInf( if (!SetupGetStringFieldW(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(WCHAR), + ARRAYSIZE(szValue), &LineLength)) { DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); return; } DPRINT1("Name %S Value %S\n", szName, szValue); - if (!wcscmp(szName, L"FullName")) + if (!_wcsicmp(szName, L"FullName")) { - if ((sizeof(pSetupData->OwnerName) / sizeof(TCHAR)) > LineLength) + if (ARRAYSIZE(pSetupData->OwnerName) > LineLength) { wcscpy(pSetupData->OwnerName, szValue); } } - else if (!wcscmp(szName, L"OrgName")) + else if (!_wcsicmp(szName, L"OrgName")) { - if ((sizeof(pSetupData->OwnerOrganization) / sizeof(WCHAR)) > LineLength) + if (ARRAYSIZE(pSetupData->OwnerOrganization) > LineLength) { wcscpy(pSetupData->OwnerOrganization, szValue); } } - else if (!wcscmp(szName, L"ComputerName")) + else if (!_wcsicmp(szName, L"ComputerName")) { - if ((sizeof(pSetupData->ComputerName) / sizeof(WCHAR)) > LineLength) + if (ARRAYSIZE(pSetupData->ComputerName) > LineLength) { wcscpy(pSetupData->ComputerName, szValue); } } - else if (!wcscmp(szName, L"AdminPassword")) + else if (!_wcsicmp(szName, L"AdminPassword")) { - if ((sizeof(pSetupData->AdminPassword) / sizeof(WCHAR)) > LineLength) + if (ARRAYSIZE(pSetupData->AdminPassword) > LineLength) { wcscpy(pSetupData->AdminPassword, szValue); } } - else if (!wcscmp(szName, L"TimeZoneIndex")) + else if (!_wcsicmp(szName, L"TimeZoneIndex")) { pSetupData->TimeZoneIndex = _wtoi(szValue); } - else if (!wcscmp(szName, L"DisableAutoDaylightTimeSet")) + else if (!_wcsicmp(szName, L"DisableAutoDaylightTimeSet")) { pSetupData->DisableAutoDaylightTimeSet = _wtoi(szValue); } - else if (!wcscmp(szName, L"DisableGeckoInst")) + else if (!_wcsicmp(szName, L"DisableGeckoInst")) { - if(!wcscmp(szValue, L"yes")) + if (!_wcsicmp(szValue, L"yes")) pSetupData->DisableGeckoInst = TRUE; else pSetupData->DisableGeckoInst = FALSE; @@ -2307,7 +2305,7 @@ ProcessUnattendInf( if (!SetupGetStringFieldW(&InfContext, 0, szName, - sizeof(szName) / sizeof(WCHAR), + ARRAYSIZE(szName), &LineLength)) { DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); @@ -2317,7 +2315,7 @@ ProcessUnattendInf( if (!SetupGetStringFieldW(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(WCHAR), + ARRAYSIZE(szValue), &LineLength)) { DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); @@ -2329,22 +2327,22 @@ ProcessUnattendInf( if (!iValue) continue; - if (!wcscmp(szName, L"BitsPerPel")) + if (!_wcsicmp(szName, L"BitsPerPel")) { dm.dmFields |= DM_BITSPERPEL; dm.dmBitsPerPel = iValue; } - else if (!wcscmp(szName, L"XResolution")) + else if (!_wcsicmp(szName, L"XResolution")) { dm.dmFields |= DM_PELSWIDTH; dm.dmPelsWidth = iValue; } - else if (!wcscmp(szName, L"YResolution")) + else if (!_wcsicmp(szName, L"YResolution")) { dm.dmFields |= DM_PELSHEIGHT; dm.dmPelsHeight = iValue; } - else if (!wcscmp(szName, L"VRefresh")) + else if (!_wcsicmp(szName, L"VRefresh")) { dm.dmFields |= DM_DISPLAYFREQUENCY; dm.dmDisplayFrequency = iValue; @@ -2376,7 +2374,7 @@ ProcessUnattendInf( if (SetupGetStringFieldW(&InfContext, 0, szValue, - sizeof(szValue) / sizeof(WCHAR), + ARRAYSIZE(szValue), NULL)) { WCHAR szPath[MAX_PATH];

5 years, 11 months

05/08: [SYSSETUP] Code formatting.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e9893906a7e4c204159b4… commit e9893906a7e4c204159b4177ed0921f8c4cc0318 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 10 18:56:15 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 21:16:56 2018 +0200 [SYSSETUP] Code formatting. svn path=/branches/setup_improvements/; revision=75522 --- dll/win32/syssetup/wizard.c | 121 ++++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 65 deletions(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 6e34d35783..c1c8b06b4e 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -296,7 +296,7 @@ AckPageDlgProc(HWND hwndDlg, Projects = NULL; ProjectsSize = 256; - do + while (TRUE) { Projects = HeapAlloc(GetProcessHeap(), 0, ProjectsSize * sizeof(WCHAR)); if (NULL == Projects) @@ -316,9 +316,9 @@ AckPageDlgProc(HWND hwndDlg, HeapFree(GetProcessHeap(), 0, Projects); ProjectsSize *= 2; } - while (1); + CurrentProject = Projects; - while (L'\0' != *CurrentProject) + while (*CurrentProject != L'\0') { End = wcschr(CurrentProject, L'\n'); if (NULL != End) @@ -388,8 +388,6 @@ WriteOwnerSettings(WCHAR * OwnerName, HKEY hKey; LONG res; - - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", 0, @@ -867,50 +865,49 @@ static BOOL RunControlPanelApplet(HWND hwnd, PCWSTR pwszCPLParameters) { MSG msg; - if (pwszCPLParameters) + STARTUPINFOW StartupInfo; + PROCESS_INFORMATION ProcessInformation; + WCHAR CmdLine[MAX_PATH] = L"rundll32.exe shell32.dll,Control_RunDLL "; + + if (!pwszCPLParameters) { - STARTUPINFOW StartupInfo; - PROCESS_INFORMATION ProcessInformation; - WCHAR CmdLine[MAX_PATH] = L"rundll32.exe shell32.dll,Control_RunDLL "; + MessageBoxW(hwnd, L"Error: Failed to launch the Control Panel Applet.", NULL, MB_ICONERROR); + return FALSE; + } - ZeroMemory(&StartupInfo, sizeof(StartupInfo)); - StartupInfo.cb = sizeof(StartupInfo); + ZeroMemory(&StartupInfo, sizeof(StartupInfo)); + StartupInfo.cb = sizeof(StartupInfo); + ZeroMemory(&ProcessInformation, sizeof(ProcessInformation)); - ASSERT(_countof(CmdLine) > wcslen(CmdLine) + wcslen(pwszCPLParameters)); - wcscat(CmdLine, pwszCPLParameters); + ASSERT(_countof(CmdLine) > wcslen(CmdLine) + wcslen(pwszCPLParameters)); + wcscat(CmdLine, pwszCPLParameters); - if (!CreateProcessW(NULL, - CmdLine, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &StartupInfo, - &ProcessInformation)) - { - MessageBoxW(hwnd, L"Error: Failed to launch the Control Panel Applet.", NULL, MB_ICONERROR); - return FALSE; - } - - while((MsgWaitForMultipleObjects(1, &ProcessInformation.hProcess, FALSE, INFINITE, QS_ALLINPUT|QS_ALLPOSTMESSAGE )) != WAIT_OBJECT_0) - { - while(PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) - { - TranslateMessage(&msg); - DispatchMessageW(&msg); - } - } - CloseHandle(ProcessInformation.hThread); - CloseHandle(ProcessInformation.hProcess); - return TRUE; - } - else + if (!CreateProcessW(NULL, + CmdLine, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &StartupInfo, + &ProcessInformation)) { MessageBoxW(hwnd, L"Error: Failed to launch the Control Panel Applet.", NULL, MB_ICONERROR); return FALSE; } + + while ((MsgWaitForMultipleObjects(1, &ProcessInformation.hProcess, FALSE, INFINITE, QS_ALLINPUT|QS_ALLPOSTMESSAGE )) != WAIT_OBJECT_0) + { + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + CloseHandle(ProcessInformation.hThread); + CloseHandle(ProcessInformation.hProcess); + return TRUE; } static VOID @@ -1501,7 +1498,7 @@ WriteDateTimeSettings(HWND hwndDlg, PSETUPDATA SetupData) SetupData); SetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT)); - if(!SetSystemLocalTime(hwndDlg, SetupData)) + if (!SetSystemLocalTime(hwndDlg, SetupData)) { if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, sizeof(Title) / sizeof(Title[0]))) { @@ -1894,15 +1891,15 @@ StartComponentRegistration(HWND hwndDlg, PULONG MaxProgress) PREGISTRATIONDATA RegistrationData; DllCount = -1; - if (! SetupFindFirstLineW(hSysSetupInf, L"RegistrationPhase2", - L"RegisterDlls", &Context)) + if (!SetupFindFirstLineW(hSysSetupInf, L"RegistrationPhase2", + L"RegisterDlls", &Context)) { DPRINT1("No RegistrationPhase2 section found\n"); return FALSE; } - if (! SetupGetStringFieldW(&Context, 1, SectionName, - sizeof(SectionName) / sizeof(SectionName[0]), - NULL)) + if (!SetupGetStringFieldW(&Context, 1, SectionName, + sizeof(SectionName) / sizeof(SectionName[0]), + NULL)) { DPRINT1("Unable to retrieve section name\n"); return FALSE; @@ -2196,7 +2193,7 @@ ProcessUnattendInf( L"UnattendSetupEnabled", &InfContext)) { - DPRINT1("Error: Cant find UnattendSetupEnabled Key! %d\n", GetLastError()); + DPRINT1("Error: Cannot find UnattendSetupEnabled Key! %d\n", GetLastError()); return; } @@ -2288,13 +2285,12 @@ ProcessUnattendInf( else if (!wcscmp(szName, L"DisableGeckoInst")) { if(!wcscmp(szValue, L"yes")) - pSetupData->DisableGeckoInst = 1; + pSetupData->DisableGeckoInst = TRUE; else - pSetupData->DisableGeckoInst = 0; + pSetupData->DisableGeckoInst = FALSE; } - } - while (SetupFindNextLine(&InfContext, &InfContext)); + } while (SetupFindNextLine(&InfContext, &InfContext)); if (SetupFindFirstLineW(pSetupData->hUnattendedInf, L"Display", @@ -2353,8 +2349,7 @@ ProcessUnattendInf( dm.dmFields |= DM_DISPLAYFREQUENCY; dm.dmDisplayFrequency = iValue; } - } - while (SetupFindNextLine(&InfContext, &InfContext)); + } while (SetupFindNextLine(&InfContext, &InfContext)); ChangeDisplaySettingsW(&dm, CDS_UPDATEREGISTRY); } @@ -2375,15 +2370,14 @@ ProcessUnattendInf( NULL, &InfContext)) { - int i = 0; do { - if(SetupGetStringFieldW(&InfContext, - 0, - szValue, - sizeof(szValue) / sizeof(WCHAR), - NULL)) + if (SetupGetStringFieldW(&InfContext, + 0, + szValue, + sizeof(szValue) / sizeof(WCHAR), + NULL)) { WCHAR szPath[MAX_PATH]; swprintf(szName, L"%d", i); @@ -2403,7 +2397,7 @@ ProcessUnattendInf( } } } - } while(SetupFindNextLine(&InfContext, &InfContext)); + } while (SetupFindNextLine(&InfContext, &InfContext)); } RegCloseKey(hKey); @@ -2578,7 +2572,6 @@ InstallWizard(VOID) psp.pszTemplate = MAKEINTRESOURCE(IDD_LOCALEPAGE); phpage[nPages++] = CreatePropertySheetPage(&psp); - /* Create the Owner page */ psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_OWNERTITLE); @@ -2595,7 +2588,6 @@ InstallWizard(VOID) psp.pszTemplate = MAKEINTRESOURCE(IDD_COMPUTERPAGE); phpage[nPages++] = CreatePropertySheetPage(&psp); - /* Create the DateTime page */ psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_DATETIMETITLE); @@ -2629,7 +2621,6 @@ InstallWizard(VOID) psp.pszTemplate = MAKEINTRESOURCE(IDD_PROCESSPAGE); phpage[nPages++] = CreatePropertySheetPage(&psp); - /* Create the Finish page */ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; psp.pfnDlgProc = FinishDlgProc; @@ -2651,7 +2642,7 @@ InstallWizard(VOID) /* Create title font */ pSetupData->hTitleFont = CreateTitleFont(); - pSetupData->hBoldFont = CreateBoldFont(); + pSetupData->hBoldFont = CreateBoldFont(); /* Display the wizard */ hWnd = (HWND)PropertySheet(&psh);

5 years, 11 months

04/08: [USERINIT] Enhancements for starting ReactOS GUI installer or Explorer shell.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d788973842da2cfcb5f6… commit 8d788973842da2cfcb5f6340a8d9b74038cf90ed Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jul 13 19:10:27 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 21:16:46 2018 +0200 [USERINIT] Enhancements for starting ReactOS GUI installer or Explorer shell. - Transform TryToStartShell() into a StartProcess() function whose aim is just to start processes, since there is no extra initialization needed for starting a shell process. - Modify StartInstaller() to call StartProcess() for starting the ReactOS GUI installer found on the installation media, from a path automatically expanded depending on the ambient CPU architecture. svn path=/branches/setup_improvements/; revision=75331 --- base/system/userinit/userinit.c | 164 ++++++++++++++++++++++++++++++++-------- base/system/userinit/userinit.h | 17 +++-- 2 files changed, 141 insertions(+), 40 deletions(-) diff --git a/base/system/userinit/userinit.c b/base/system/userinit/userinit.c index 4369a499c2..182c823dce 100644 --- a/base/system/userinit/userinit.c +++ b/base/system/userinit/userinit.c @@ -183,14 +183,16 @@ GetShell( } static BOOL -TryToStartShell( - IN LPCWSTR Shell) +StartProcess( + IN LPCWSTR CommandLine) { STARTUPINFO si; PROCESS_INFORMATION pi; - WCHAR ExpandedShell[MAX_PATH]; + WCHAR ExpandedCmdLine[MAX_PATH]; - TRACE("(%s)\n", debugstr_w(Shell)); + TRACE("(%s)\n", debugstr_w(CommandLine)); + + ExpandEnvironmentStringsW(CommandLine, ExpandedCmdLine, ARRAYSIZE(ExpandedCmdLine)); ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); @@ -198,10 +200,8 @@ TryToStartShell( si.wShowWindow = SW_SHOWNORMAL; ZeroMemory(&pi, sizeof(pi)); - ExpandEnvironmentStringsW(Shell, ExpandedShell, ARRAYSIZE(ExpandedShell)); - if (!CreateProcessW(NULL, - ExpandedShell, + ExpandedCmdLine, NULL, NULL, FALSE, @@ -211,7 +211,7 @@ TryToStartShell( &si, &pi)) { - WARN("CreateProcess() failed with error %lu\n", GetLastError()); + WARN("CreateProcessW() failed with error %lu\n", GetLastError()); return FALSE; } @@ -267,7 +267,7 @@ StartShell(VOID) TRACE("Key located - %s\n", debugstr_w(Shell)); /* Try to run alternate shell */ - if (TryToStartShell(Shell)) + if (StartProcess(Shell)) { TRACE("Alternate shell started (Safe Mode)\n"); return TRUE; @@ -294,14 +294,14 @@ StartShell(VOID) } /* Try to run shell in user key */ - if (GetShell(Shell, HKEY_CURRENT_USER) && TryToStartShell(Shell)) + if (GetShell(Shell, HKEY_CURRENT_USER) && StartProcess(Shell)) { TRACE("Started shell from HKEY_CURRENT_USER\n"); return TRUE; } /* Try to run shell in local machine key */ - if (GetShell(Shell, HKEY_LOCAL_MACHINE) && TryToStartShell(Shell)) + if (GetShell(Shell, HKEY_LOCAL_MACHINE) && StartProcess(Shell)) { TRACE("Started shell from HKEY_LOCAL_MACHINE\n"); return TRUE; @@ -310,22 +310,22 @@ StartShell(VOID) /* Try default shell */ if (IsConsoleShell()) { + *Shell = UNICODE_NULL; if (GetSystemDirectoryW(Shell, ARRAYSIZE(Shell) - 8)) - wcscat(Shell, L"\\cmd.exe"); - else - wcscpy(Shell, L"cmd.exe"); + StringCchCatW(Shell, ARRAYSIZE(Shell), L"\\"); + StringCchCatW(Shell, ARRAYSIZE(Shell), L"cmd.exe"); } else { - if (GetWindowsDirectoryW(Shell, ARRAYSIZE(Shell) - 13)) - wcscat(Shell, L"\\explorer.exe"); - else - wcscpy(Shell, L"explorer.exe"); + *Shell = UNICODE_NULL; + if (GetSystemWindowsDirectoryW(Shell, ARRAYSIZE(Shell) - 13)) + StringCchCatW(Shell, ARRAYSIZE(Shell), L"\\"); + StringCchCatW(Shell, ARRAYSIZE(Shell), L"explorer.exe"); } - if (!TryToStartShell(Shell)) + if (!StartProcess(Shell)) { - WARN("Failed to start default shell %s\n", debugstr_w(Shell)); + WARN("Failed to start default shell '%s'\n", debugstr_w(Shell)); LoadStringW(GetModuleHandle(NULL), IDS_SHELL_FAIL, szMsg, ARRAYSIZE(szMsg)); MessageBoxW(NULL, szMsg, NULL, MB_OK); return FALSE; @@ -501,24 +501,124 @@ NotifyLogon(VOID) } static BOOL -StartInstaller(VOID) +StartInstaller(IN LPCTSTR lpInstallerName) { - WCHAR Shell[MAX_PATH]; + SYSTEM_INFO SystemInfo; + SIZE_T cchInstallerNameLen; + PWSTR ptr; + DWORD dwAttribs; + WCHAR Installer[MAX_PATH]; WCHAR szMsg[RC_STRING_MAX_SIZE]; - if (GetWindowsDirectoryW(Shell, ARRAYSIZE(Shell) - 12)) - wcscat(Shell, L"\\reactos.exe"); + cchInstallerNameLen = wcslen(lpInstallerName); + if (ARRAYSIZE(Installer) < cchInstallerNameLen) + { + /* The buffer is not large enough to contain the installer file name */ + return FALSE; + } + + /* + * First, try to find the installer using the default drive, under + * the directory whose name corresponds to the currently-running + * CPU architecture. + */ + GetSystemInfo(&SystemInfo); + + *Installer = UNICODE_NULL; + /* Alternatively one can use SharedUserData->NtSystemRoot */ + GetSystemWindowsDirectoryW(Installer, ARRAYSIZE(Installer) - cchInstallerNameLen - 1); + ptr = wcschr(Installer, L'\\'); + if (ptr) + *++ptr = UNICODE_NULL; else - wcscpy(Shell, L"reactos.exe"); + *Installer = UNICODE_NULL; - if (!TryToStartShell(Shell)) + /* Append the corresponding CPU architecture */ + switch (SystemInfo.wProcessorArchitecture) { - WARN("Failed to start the installer: %s\n", debugstr_w(Shell)); - LoadStringW(GetModuleHandle(NULL), IDS_INSTALLER_FAIL, szMsg, ARRAYSIZE(szMsg)); - MessageBoxW(NULL, szMsg, NULL, MB_OK); - return FALSE; + case PROCESSOR_ARCHITECTURE_INTEL: + StringCchCatW(Installer, ARRAYSIZE(Installer), L"I386"); + break; + + case PROCESSOR_ARCHITECTURE_MIPS: + StringCchCatW(Installer, ARRAYSIZE(Installer), L"MIPS"); + break; + + case PROCESSOR_ARCHITECTURE_ALPHA: + StringCchCatW(Installer, ARRAYSIZE(Installer), L"ALPHA"); + break; + + case PROCESSOR_ARCHITECTURE_PPC: + StringCchCatW(Installer, ARRAYSIZE(Installer), L"PPC"); + break; + + case PROCESSOR_ARCHITECTURE_SHX: + StringCchCatW(Installer, ARRAYSIZE(Installer), L"SHX"); + break; + + case PROCESSOR_ARCHITECTURE_ARM: + StringCchCatW(Installer, ARRAYSIZE(Installer), L"ARM"); + break; + + case PROCESSOR_ARCHITECTURE_IA64: + StringCchCatW(Installer, ARRAYSIZE(Installer), L"IA64"); + break; + + case PROCESSOR_ARCHITECTURE_ALPHA64: + StringCchCatW(Installer, ARRAYSIZE(Installer), L"ALPHA64"); + break; + + case PROCESSOR_ARCHITECTURE_AMD64: + StringCchCatW(Installer, ARRAYSIZE(Installer), L"AMD64"); + break; + + // case PROCESSOR_ARCHITECTURE_MSIL: /* .NET CPU-independent code */ + case PROCESSOR_ARCHITECTURE_UNKNOWN: + default: + WARN("Unknown processor architecture %lu\n", SystemInfo.wProcessorArchitecture); + SystemInfo.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_UNKNOWN; + break; } - return TRUE; + + if (SystemInfo.wProcessorArchitecture != PROCESSOR_ARCHITECTURE_UNKNOWN) + StringCchCatW(Installer, ARRAYSIZE(Installer), L"\\"); + StringCchCatW(Installer, ARRAYSIZE(Installer), lpInstallerName); + + dwAttribs = GetFileAttributesW(Installer); + if ((dwAttribs != INVALID_FILE_ATTRIBUTES) && + !(dwAttribs & FILE_ATTRIBUTE_DIRECTORY)) + { + /* We have found the installer */ + if (StartProcess(Installer)) + return TRUE; + } + + ERR("Failed to start the installer '%s', trying alternative.\n", debugstr_w(Installer)); + + /* + * We failed. Try to find the installer from either the current + * ReactOS installation directory, or from our current directory. + */ + *Installer = UNICODE_NULL; + /* Alternatively one can use SharedUserData->NtSystemRoot */ + if (GetSystemWindowsDirectoryW(Installer, ARRAYSIZE(Installer) - cchInstallerNameLen - 1)) + StringCchCatW(Installer, ARRAYSIZE(Installer), L"\\"); + StringCchCatW(Installer, ARRAYSIZE(Installer), lpInstallerName); + + dwAttribs = GetFileAttributesW(Installer); + if ((dwAttribs != INVALID_FILE_ATTRIBUTES) && + !(dwAttribs & FILE_ATTRIBUTE_DIRECTORY)) + { + /* We have found the installer */ + if (StartProcess(Installer)) + return TRUE; + } + + /* We failed. Display an error message and quit. */ + ERR("Failed to start the installer '%s'.\n", debugstr_w(Installer)); + LoadStringW(GetModuleHandle(NULL), IDS_INSTALLER_FAIL, szMsg, ARRAYSIZE(szMsg)); + MessageBoxW(NULL, szMsg, NULL, MB_OK); + return FALSE; } /* Used to get the shutdown privilege */ @@ -591,7 +691,7 @@ Restart: break; case INSTALLER: - Success = StartInstaller(); + Success = StartInstaller(L"reactos.exe"); break; case REBOOT: diff --git a/base/system/userinit/userinit.h b/base/system/userinit/userinit.h index bd22b60fee..46079756a6 100644 --- a/base/system/userinit/userinit.h +++ b/base/system/userinit/userinit.h @@ -4,22 +4,23 @@ #ifndef __USERINIT_H__ #define __USERINIT_H__ +#include <stdio.h> +#include <stdlib.h> + +/* PSDK/NDK Headers */ #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> #include <windef.h> #include <winbase.h> -#include <winreg.h> #include <wingdi.h> -#include <wincon.h> -#include <shellapi.h> +#include <winreg.h> #include <regstr.h> -#include <shlobj.h> -#include <shlwapi.h> -#include <undocuser.h> #include <winnls.h> -#include <stdio.h> +#include <winuser.h> +#include <undocuser.h> + +#include <strsafe.h> #include <ndk/exfuncs.h>

5 years, 11 months

03/08: [WELCOME] Minor usage improvements.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b14b6f58196fec0dc7c8… commit 5b14b6f58196fec0dc7c899c26c93a68d4c8542d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 8 20:54:59 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 21:00:14 2018 +0200 [WELCOME] Minor usage improvements. - Don't hardcode the installer file name in ExpandInstallerPath() but provide it from a parameter. Return TRUE/FALSE if the installer file is/is not found. - Expand any environment string present in the items command line. - Enable/disable the menu buttons depending on whether or not an associated command is present. - Enable mirroring from resources. --- base/setup/welcome/lang/he-IL.rc | 8 +++++ base/setup/welcome/welcome.c | 72 ++++++++++++++++++++++++++++++---------- 2 files changed, 63 insertions(+), 17 deletions(-) diff --git a/base/setup/welcome/lang/he-IL.rc b/base/setup/welcome/lang/he-IL.rc index 0ffdf1e900..31fe24ce79 100644 --- a/base/setup/welcome/lang/he-IL.rc +++ b/base/setup/welcome/lang/he-IL.rc @@ -2,6 +2,14 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT +/* + * Enable RTL mirroring by adding two left-to-right marks (LRMs) + * in front of the FileDescription value of the version stamping. + */ +#undef REACTOS_STR_FILE_DESCRIPTION +#define REACTOS_STR_FILE_DESCRIPTION L"\x200e\x200e" L"ReactOS-Welcome" +#include <reactos/version.rc> + /* String Tables */ /* Default settings */ diff --git a/base/setup/welcome/welcome.c b/base/setup/welcome/welcome.c index b4050d9941..921588bb26 100644 --- a/base/setup/welcome/welcome.c +++ b/base/setup/welcome/welcome.c @@ -214,16 +214,24 @@ VOID TranslateEscapes(IN OUT LPTSTR lpString) * Expands the path for the ReactOS Installer "reactos.exe". * See also base/system/userinit/userinit.c!StartInstaller() */ -VOID ExpandInstallerPath(IN OUT LPTSTR lpInstallerPath, IN SIZE_T PathSize) +BOOL +ExpandInstallerPath( + IN LPCTSTR lpInstallerName, + OUT LPTSTR lpInstallerPath, + IN SIZE_T PathSize) { SYSTEM_INFO SystemInfo; + SIZE_T cchInstallerNameLen; PTSTR ptr; DWORD dwAttribs; -#if 0 - if (_tcsicmp(lpInstallerPath, TEXT("reactos.exe")) != 0) - return; -#endif + cchInstallerNameLen = _tcslen(lpInstallerName); + if (PathSize < cchInstallerNameLen) + { + /* The buffer is not large enough to contain the installer file name */ + *lpInstallerPath = 0; + return FALSE; + } /* * First, try to find the installer using the default drive, under @@ -233,7 +241,7 @@ VOID ExpandInstallerPath(IN OUT LPTSTR lpInstallerPath, IN SIZE_T PathSize) GetSystemInfo(&SystemInfo); *lpInstallerPath = 0; - GetModuleFileName(NULL, lpInstallerPath, PathSize); + GetModuleFileName(NULL, lpInstallerPath, PathSize - cchInstallerNameLen - 1); ptr = _tcschr(lpInstallerPath, _T('\\')); if (ptr) *++ptr = 0; @@ -288,14 +296,14 @@ VOID ExpandInstallerPath(IN OUT LPTSTR lpInstallerPath, IN SIZE_T PathSize) if (SystemInfo.wProcessorArchitecture != PROCESSOR_ARCHITECTURE_UNKNOWN) StringCchCat(lpInstallerPath, PathSize, TEXT("\\")); - StringCchCat(lpInstallerPath, PathSize, TEXT("reactos.exe")); + StringCchCat(lpInstallerPath, PathSize, lpInstallerName); dwAttribs = GetFileAttributes(lpInstallerPath); if ((dwAttribs != INVALID_FILE_ATTRIBUTES) && !(dwAttribs & FILE_ATTRIBUTE_DIRECTORY)) { /* We have found the installer */ - return; + return TRUE; } /* @@ -303,9 +311,21 @@ VOID ExpandInstallerPath(IN OUT LPTSTR lpInstallerPath, IN SIZE_T PathSize) * ReactOS installation directory, or from our current directory. */ *lpInstallerPath = 0; - if (GetWindowsDirectory(lpInstallerPath, PathSize - 12)) + if (GetWindowsDirectory(lpInstallerPath, PathSize - cchInstallerNameLen - 1)) StringCchCat(lpInstallerPath, PathSize, TEXT("\\")); - StringCchCat(lpInstallerPath, PathSize, TEXT("reactos.exe")); + StringCchCat(lpInstallerPath, PathSize, lpInstallerName); + + dwAttribs = GetFileAttributes(lpInstallerPath); + if ((dwAttribs != INVALID_FILE_ATTRIBUTES) && + !(dwAttribs & FILE_ATTRIBUTE_DIRECTORY)) + { + /* We have found the installer */ + return TRUE; + } + + /* Installer not found */ + *lpInstallerPath = 0; + return FALSE; } VOID InitializeTopicList(VOID) @@ -337,7 +357,8 @@ PTOPIC AddNewTopic(VOID) return pTopic; } -PTOPIC AddNewTopicEx( +PTOPIC +AddNewTopicEx( IN LPTSTR szText OPTIONAL, IN LPTSTR szTitle OPTIONAL, IN LPTSTR szDesc OPTIONAL, @@ -372,11 +393,21 @@ PTOPIC AddNewTopicEx( if (szCommand && *szCommand) { pTopic->bIsCommand = TRUE; - StringCchCopy(pTopic->szCommand, ARRAYSIZE(pTopic->szCommand), szCommand); /* Check for special applications: ReactOS Installer */ - if (_tcsicmp(pTopic->szCommand, TEXT("reactos.exe")) == 0) - ExpandInstallerPath(pTopic->szCommand, ARRAYSIZE(pTopic->szCommand)); + if (_tcsicmp(szCommand, TEXT("reactos.exe")) == 0) + { + ExpandInstallerPath(szCommand, pTopic->szCommand, ARRAYSIZE(pTopic->szCommand)); + } + else + { + /* Expand any environment string in the command line */ + DWORD dwSize = ExpandEnvironmentStringsW(szCommand, NULL, 0); + if (dwSize <= ARRAYSIZE(pTopic->szCommand)) + ExpandEnvironmentStringsW(szCommand, pTopic->szCommand, ARRAYSIZE(pTopic->szCommand)); + else + StringCchCopy(pTopic->szCommand, ARRAYSIZE(pTopic->szCommand), szCommand); + } } else { @@ -759,6 +790,8 @@ _tWinMain(HINSTANCE hInst, return 0; } +#if 0 + /* Mirroring is enabled from within the resources */ switch (GetUserDefaultUILanguage()) { case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): @@ -768,6 +801,7 @@ _tWinMain(HINSTANCE hInst, default: break; } +#endif hInstance = hInst; @@ -1086,7 +1120,9 @@ OnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam) pTopics[i]->hWndButton = CreateWindow(TEXT("BUTTON"), pTopics[i]->szText, - WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | BS_MULTILINE | BS_OWNERDRAW, + (*pTopics[i]->szCommand ? 0 : WS_DISABLED) | + WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | + BS_MULTILINE | BS_OWNERDRAW, rcLeftPanel.left, dwTop, rcLeftPanel.right - rcLeftPanel.left, @@ -1120,7 +1156,8 @@ OnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam) hWndCheckButton = CreateWindow(TEXT("BUTTON"), szText, - WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | BS_AUTOCHECKBOX | BS_MULTILINE /**/| BS_FLAT/**/, + WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | + BS_AUTOCHECKBOX | BS_MULTILINE /**/| BS_FLAT/**/, rcLeftPanel.left + 8, rcLeftPanel.bottom - 8 - 13, rcLeftPanel.right - rcLeftPanel.left - 16, @@ -1419,7 +1456,8 @@ OnDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam) InflateRect(&lpDis->rcItem, -10, -4); OffsetRect(&lpDis->rcItem, 0, 1); GetWindowText(lpDis->hwndItem, szText, ARRAYSIZE(szText)); - SetTextColor(lpDis->hDC, GetSysColor(COLOR_WINDOWTEXT)); + SetTextColor(lpDis->hDC, GetSysColor(IsWindowEnabled(lpDis->hwndItem) ? + COLOR_WINDOWTEXT : COLOR_GRAYTEXT)); iBkMode = SetBkMode(lpDis->hDC, TRANSPARENT); DrawText(lpDis->hDC, szText, -1, &lpDis->rcItem, DT_TOP | DT_LEFT | DT_WORDBREAK); SetBkMode(lpDis->hDC, iBkMode);

5 years, 11 months

02/08: [WELCOME] Reduce Welcome's SUBSYSTEM requirements to WinNT 4 for x86 builds only, so that we can still show something in old NT OSes.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0dae6094e70bf2bee7d4… commit a0dae6094e70bf2bee7d49e061bf8162909408dc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 20 21:59:40 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 21:00:14 2018 +0200 [WELCOME] Reduce Welcome's SUBSYSTEM requirements to WinNT 4 for x86 builds only, so that we can still show something in old NT OSes. --- base/setup/welcome/CMakeLists.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/base/setup/welcome/CMakeLists.txt b/base/setup/welcome/CMakeLists.txt index e8b3f247fb..3ac8d946f4 100644 --- a/base/setup/welcome/CMakeLists.txt +++ b/base/setup/welcome/CMakeLists.txt @@ -4,4 +4,27 @@ add_rc_deps(welcome.rc ${welcome_rc_deps}) add_executable(welcome welcome.c welcome.rc) set_module_type(welcome win32gui UNICODE) add_importlibs(welcome gdi32 user32 shell32 msvcrt kernel32 ntdll) + +# Reduce the required subsystem to WinNT 4.0 for i386 builds only. +if(ARCH STREQUAL "i386") + if(MSVC) + # NOTE: We cannot use the following command: + # add_target_link_flags(welcome "/SUBSYSTEM:WINDOWS,4.00") + # because it would act at the level of the LINK.EXE linker flags, + # which only accepts a subsystem version >= 5.10 (Windows XP+) on + # latest MSVC versions. + # So to work around this problem, we use a post-build command by + # employing EDITBIN.EXE that does not check the subsystem version. + # + add_custom_command( + TARGET welcome POST_BUILD + COMMAND editbin.exe /NOLOGO /SUBSYSTEM:WINDOWS,4.00 $<TARGET_FILE:welcome> + VERBATIM) + else() + # The binutils linker does not set a lower limit on the subsystem. + # Otherwise we would use: objcopy --subsystem windows:4.00 $<TARGET_FILE:welcome> + add_target_link_flags(welcome "-Wl,--subsystem,windows:4.00") + endif() +endif() + add_cd_file(TARGET welcome DESTINATION reactos NO_CAB FOR bootcd)

5 years, 11 months

← Newer
1
...
23
24
25
26
27
28
29
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2018