Ros-diffs October 2018

ros-diffs@reactos.org

21 participants
354 discussions

02/02: [CMAKE] Set CMAKE_OBJCOPY unconditionnally

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=806ec9344e7d2a6cf8348… commit 806ec9344e7d2a6cf8348a2bdf1ac5bf9160c256 Author: Jérôme Gardou <zefklop(a)users.noreply.github.com> AuthorDate: Fri Oct 26 10:16:26 2018 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Fri Oct 26 10:51:52 2018 +0200 [CMAKE] Set CMAKE_OBJCOPY unconditionnally --- toolchain-gcc.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain-gcc.cmake b/toolchain-gcc.cmake index 6ffe23d89b..f6ce3c2d74 100644 --- a/toolchain-gcc.cmake +++ b/toolchain-gcc.cmake @@ -53,6 +53,7 @@ set(CMAKE_MC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windmc) set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windres) set(CMAKE_DLLTOOL ${MINGW_TOOLCHAIN_PREFIX}dlltool) #set(CMAKE_AR ${MINGW_TOOLCHAIN_PREFIX}gcc-ar${MINGW_TOOLCHAIN_SUFFIX}) +set(CMAKE_OBJCOPY ${MINGW_TOOLCHAIN_PREFIX}objcopy) set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>") set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})

5 years, 10 months

01/02: Add Eclipse files to .gitignore

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=235ec3b7c957e4117df35… commit 235ec3b7c957e4117df3544a91e2fce7e77b0cbf Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Oct 23 19:18:47 2018 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Fri Oct 26 10:51:52 2018 +0200 Add Eclipse files to .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 1e7e8dc7bd..9bed1e86be 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,7 @@ modules/optional modules/bootcd_extras modules/livecd_extras modules/hybridcd_extras +.cproject +.project +.settings +build

5 years, 10 months

04/04: [USETUP] NT RTL thread functions use 'NULL' (instead of 'INVALID_HANDLE_VALUE' which is a Win32 thing) for thread handles that are "invalid" / uninitialized.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74be659c8b8650faf75f5… commit 74be659c8b8650faf75f55535e62d9ac3063873a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 9 20:43:02 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 26 02:16:05 2018 +0200 [USETUP] NT RTL thread functions use 'NULL' (instead of 'INVALID_HANDLE_VALUE' which is a Win32 thing) for thread handles that are "invalid" / uninitialized. svn path=/branches/setup_improvements/; revision=75519 --- base/setup/usetup/usetup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 79b8982430..d076a52475 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -938,10 +938,10 @@ SetupStartPage(PINPUT_RECORD Ir) RequiredPartitionDiskSpace = (ULONG)IntValue; /* Start the PnP thread */ - if (hPnpThread != INVALID_HANDLE_VALUE) + if (hPnpThread != NULL) { NtResumeThread(hPnpThread, NULL); - hPnpThread = INVALID_HANDLE_VALUE; + hPnpThread = NULL; } CheckUnattendedSetup(); @@ -5184,7 +5184,7 @@ RunUSetup(VOID) &hPnpThread, NULL); if (!NT_SUCCESS(Status)) - hPnpThread = INVALID_HANDLE_VALUE; + hPnpThread = NULL; if (!CONSOLE_Init()) {

5 years, 10 months

03/04: [USETUP] Moving around some code.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=397faf62bfc71249ac9ee… commit 397faf62bfc71249ac9ee39f54720d5465494d3c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jun 30 19:02:35 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 26 02:16:04 2018 +0200 [USETUP] Moving around some code. - As GetSourcePaths() is used once in USETUP to initialize global UNICODE_STRING path strings once, move it out of drivesup.c and put it in usetup.c. Then remove drivesup.c : 1 file less! - Move some INF file prototype declarations out of usetup.h and inside inffile.h where they should better be, as inffile.h and .c is the glue code for the INF library, defining similar functions as the ones in setupapi.dll. - I rename our local SetupOpenInfFileW() into SetupOpenInfFileExW() because the latter one takes an extra user-provided LCID parameter, and this is this one that we use in USETUP. - Make 'UNICODE_STRING SourcePath;' visible only inside usetup.c (not used elsewhere). - Implement installation path validity check in case we are either in repair/update, or unattended setup mode. If the path is detected as invalid, then we fall back into manual path specification (for now...; note that we could instead fail the installation too). svn path=/branches/setup_improvements/; revision=75246 --- base/setup/usetup/CMakeLists.txt | 1 - base/setup/usetup/drivesup.c | 76 --------------------- base/setup/usetup/drivesup.h | 17 ----- base/setup/usetup/inffile.h | 31 ++++++++- base/setup/usetup/registry.c | 13 ++-- base/setup/usetup/registry.h | 1 + base/setup/usetup/usetup.c | 138 +++++++++++++++++++++++++++------------ base/setup/usetup/usetup.h | 27 -------- 8 files changed, 136 insertions(+), 168 deletions(-) diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index db5b7d713b..21d15544f4 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -17,7 +17,6 @@ list(APPEND SOURCE console.c consup.c devinst.c - drivesup.c filesup.c filequeue.c format.c diff --git a/base/setup/usetup/drivesup.c b/base/setup/usetup/drivesup.c deleted file mode 100644 index b8561d77ed..0000000000 --- a/base/setup/usetup/drivesup.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/drivesup.c - * PURPOSE: Drive support functions - * PROGRAMMER: - */ - -/* INCLUDES *****************************************************************/ - -#include "usetup.h" - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -NTSTATUS -GetSourcePaths( - OUT PUNICODE_STRING SourcePath, - OUT PUNICODE_STRING SourceRootPath, - OUT PUNICODE_STRING SourceRootDir) -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\SystemRoot"); - UNICODE_STRING SourceName; - WCHAR SourceBuffer[MAX_PATH] = L""; - HANDLE Handle; - ULONG Length; - PWCHAR Ptr; - - InitializeObjectAttributes(&ObjectAttributes, - &LinkName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtOpenSymbolicLinkObject(&Handle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - return Status; - - RtlInitEmptyUnicodeString(&SourceName, SourceBuffer, sizeof(SourceBuffer)); - - Status = NtQuerySymbolicLinkObject(Handle, - &SourceName, - &Length); - NtClose(Handle); - - if (!NT_SUCCESS(Status)) - return Status; - - RtlCreateUnicodeString(SourcePath, - SourceName.Buffer); - - /* Strip trailing directory */ - Ptr = wcsrchr(SourceName.Buffer, OBJ_NAME_PATH_SEPARATOR); - if (Ptr) - { - RtlCreateUnicodeString(SourceRootDir, Ptr); - *Ptr = UNICODE_NULL; - } - else - { - RtlCreateUnicodeString(SourceRootDir, L""); - } - - RtlCreateUnicodeString(SourceRootPath, - SourceName.Buffer); - - return STATUS_SUCCESS; -} - -/* EOF */ diff --git a/base/setup/usetup/drivesup.h b/base/setup/usetup/drivesup.h deleted file mode 100644 index 01b38a3c57..0000000000 --- a/base/setup/usetup/drivesup.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/drivesup.h - * PURPOSE: Drive support functions - * PROGRAMMER: - */ - -#pragma once - -NTSTATUS -GetSourcePaths( - OUT PUNICODE_STRING SourcePath, - OUT PUNICODE_STRING SourceRootPath, - OUT PUNICODE_STRING SourceRootDir); - -/* EOF */ diff --git a/base/setup/usetup/inffile.h b/base/setup/usetup/inffile.h index 9ce8ce0b2c..610c9e23a3 100644 --- a/base/setup/usetup/inffile.h +++ b/base/setup/usetup/inffile.h @@ -28,10 +28,39 @@ #include <infcommon.h> +extern VOID InfSetHeap(PVOID Heap); +extern VOID InfCloseFile(HINF InfHandle); +extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn, + PINFCONTEXT ContextOut); +extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context, + ULONG FieldIndex, + PUCHAR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); +extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context, + ULONG FieldIndex, + PWSTR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); +extern BOOLEAN InfGetStringField(PINFCONTEXT Context, + ULONG FieldIndex, + PWSTR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); + +#define SetupCloseInfFile InfCloseFile +#define SetupFindNextLine InfFindNextLine +#define SetupGetBinaryField InfGetBinaryField +#define SetupGetMultiSzFieldW InfGetMultiSzField +#define SetupGetStringFieldW InfGetStringField + + #define SetupFindFirstLineW InfpFindFirstLineW #define SetupGetFieldCount InfGetFieldCount #define SetupGetIntField InfGetIntField -#define SetupOpenInfFileW InfpOpenInfFileW + +// SetupOpenInfFileW with support for a user-provided LCID +#define SetupOpenInfFileExW InfpOpenInfFileW #define INF_STYLE_WIN4 0x00000002 diff --git a/base/setup/usetup/registry.c b/base/setup/usetup/registry.c index 50fbb31d1d..749835c3d7 100644 --- a/base/setup/usetup/registry.c +++ b/base/setup/usetup/registry.c @@ -618,6 +618,7 @@ registry_callback(HINF hInf, PCWSTR Section, BOOLEAN Delete) BOOLEAN ImportRegistryFile( + PCWSTR SourcePath, PWSTR Filename, PWSTR Section, LCID LocaleId, @@ -629,13 +630,13 @@ ImportRegistryFile( /* Load inf file from install media. */ CombinePaths(FileNameBuffer, ARRAYSIZE(FileNameBuffer), 2, - SourcePath.Buffer, Filename); + SourcePath, Filename); - hInf = SetupOpenInfFileW(FileNameBuffer, - NULL, - INF_STYLE_WIN4, - LocaleId, - &ErrorLine); + hInf = SetupOpenInfFileExW(FileNameBuffer, + NULL, + INF_STYLE_WIN4, + LocaleId, + &ErrorLine); if (hInf == INVALID_HANDLE_VALUE) { DPRINT1("SetupOpenInfFile() failed\n"); diff --git a/base/setup/usetup/registry.h b/base/setup/usetup/registry.h index 0548061a35..b48777a126 100644 --- a/base/setup/usetup/registry.h +++ b/base/setup/usetup/registry.h @@ -38,6 +38,7 @@ GetRootKeyByName( BOOLEAN ImportRegistryFile( + PCWSTR SourcePath, PWSTR Filename, PWSTR Section, LCID LocaleId, diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index e1a382eafc..79b8982430 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -32,7 +32,6 @@ #include "chkdsk.h" #include "cmdcons.h" #include "format.h" -#include "drivesup.h" #include "settings.h" #define NDEBUG @@ -48,7 +47,7 @@ HANDLE ProcessHeap; static UNICODE_STRING SourceRootPath; static UNICODE_STRING SourceRootDir; -/* static */ UNICODE_STRING SourcePath; +static UNICODE_STRING SourcePath; BOOLEAN IsUnattendedSetup = FALSE; LONG UnattendDestinationDiskNumber; @@ -73,6 +72,10 @@ static FORMATMACHINESTATE FormatState = Start; static PFILE_SYSTEM_LIST FileSystemList = NULL; +/* + * NOTE: Technically only used for the COPYCONTEXT InstallPath member + * for the filequeue functionality. + */ static UNICODE_STRING InstallPath; /* @@ -90,7 +93,7 @@ static UNICODE_STRING InstallPath; */ static UNICODE_STRING SystemRootPath; -/* Path to the install directory inside the ReactOS boot partition */ +/* Path to the installation directory inside the ReactOS boot partition */ static UNICODE_STRING DestinationPath; static UNICODE_STRING DestinationArcPath; static UNICODE_STRING DestinationRootPath; @@ -445,15 +448,15 @@ CheckUnattendedSetup(VOID) } /* Load 'unattend.inf' from install media. */ - UnattendInf = SetupOpenInfFileW(UnattendInfPath, - NULL, - INF_STYLE_WIN4, - LanguageId, - &ErrorLine); + UnattendInf = SetupOpenInfFileExW(UnattendInfPath, + NULL, + INF_STYLE_WIN4, + LanguageId, + &ErrorLine); if (UnattendInf == INVALID_HANDLE_VALUE) { - DPRINT("SetupOpenInfFileW() failed\n"); + DPRINT("SetupOpenInfFileExW() failed\n"); return; } @@ -774,6 +777,65 @@ LanguagePage(PINPUT_RECORD Ir) } +static NTSTATUS +GetSourcePaths( + OUT PUNICODE_STRING SourcePath, + OUT PUNICODE_STRING SourceRootPath, + OUT PUNICODE_STRING SourceRootDir) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\SystemRoot"); + UNICODE_STRING SourceName; + WCHAR SourceBuffer[MAX_PATH] = L""; + HANDLE Handle; + ULONG Length; + PWCHAR Ptr; + + InitializeObjectAttributes(&ObjectAttributes, + &LinkName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenSymbolicLinkObject(&Handle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return Status; + + RtlInitEmptyUnicodeString(&SourceName, SourceBuffer, sizeof(SourceBuffer)); + + Status = NtQuerySymbolicLinkObject(Handle, + &SourceName, + &Length); + NtClose(Handle); + + if (!NT_SUCCESS(Status)) + return Status; + + RtlCreateUnicodeString(SourcePath, + SourceName.Buffer); + + /* Strip trailing directory */ + Ptr = wcsrchr(SourceName.Buffer, OBJ_NAME_PATH_SEPARATOR); + if (Ptr) + { + RtlCreateUnicodeString(SourceRootDir, Ptr); + *Ptr = UNICODE_NULL; + } + else + { + RtlCreateUnicodeString(SourceRootDir, L""); + } + + RtlCreateUnicodeString(SourceRootPath, + SourceName.Buffer); + + return STATUS_SUCCESS; +} + + /* * Start page * @@ -826,11 +888,11 @@ SetupStartPage(PINPUT_RECORD Ir) /* Load txtsetup.sif from install media. */ CombinePaths(FileNameBuffer, ARRAYSIZE(FileNameBuffer), 2, SourcePath.Buffer, L"txtsetup.sif"); - SetupInf = SetupOpenInfFileW(FileNameBuffer, - NULL, - INF_STYLE_WIN4, - LanguageId, - &ErrorLine); + SetupInf = SetupOpenInfFileExW(FileNameBuffer, + NULL, + INF_STYLE_WIN4, + LanguageId, + &ErrorLine); if (SetupInf == INVALID_HANDLE_VALUE) { @@ -3376,6 +3438,7 @@ BuildInstallPaths(PWSTR InstallDir, { WCHAR PathBuffer[MAX_PATH]; +/** Equivalent of 'NTOS_INSTALLATION::PathComponent' **/ /* Create 'InstallPath' string */ RtlFreeUnicodeString(&InstallPath); RtlCreateUnicodeString(&InstallPath, InstallDir); @@ -3389,12 +3452,14 @@ BuildInstallPaths(PWSTR InstallDir, RtlCreateUnicodeString(&DestinationRootPath, PathBuffer); DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); +/** Equivalent of 'NTOS_INSTALLATION::SystemNtPath' **/ /* Create 'DestinationPath' string */ RtlFreeUnicodeString(&DestinationPath); CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, DestinationRootPath.Buffer, InstallDir); RtlCreateUnicodeString(&DestinationPath, PathBuffer); +/** Equivalent of 'NTOS_INSTALLATION::SystemArcPath' **/ /* Create 'DestinationArcPath' */ RtlFreeUnicodeString(&DestinationArcPath); StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), @@ -3428,7 +3493,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) WCHAR c; ULONG Length, Pos; - /* We do not need the filesystem list any more */ + /* We do not need the filesystem list anymore */ if (FileSystemList != NULL) { DestroyFileSystemList(FileSystemList); @@ -3446,43 +3511,36 @@ InstallDirectoryPage(PINPUT_RECORD Ir) DiskEntry = PartitionList->CurrentDisk; PartEntry = PartitionList->CurrentPartition; - if (RepairUpdateFlag) - { - if (!IsValidPath(CurrentInstallation->PathComponent)) // SystemNtPath - { - /* FIXME: Log the error? */ - return QUIT_PAGE; - } - - BuildInstallPaths(CurrentInstallation->PathComponent, // SystemNtPath - DiskEntry, - PartEntry); - - return PREPARE_COPY_PAGE; - } if (IsUnattendedSetup) - { - if (!IsValidPath(UnattendInstallationDirectory)) - { - /* FIXME: Log the error? */ - return QUIT_PAGE; - } + wcscpy(InstallDir, UnattendInstallationDirectory); + else if (RepairUpdateFlag) + wcscpy(InstallDir, CurrentInstallation->PathComponent); // SystemNtPath + else + wcscpy(InstallDir, L"\\ReactOS"); - BuildInstallPaths(UnattendInstallationDirectory, + /* + * Check the validity of the predefined 'InstallDir'. If we are either + * in unattended setup or in update/repair mode, and the installation path + * is valid, just perform the installation. Otherwise (either in the case + * of an invalid path, or we are in regular setup), display the UI and allow + * the user to specify a new installation path. + */ + if ((RepairUpdateFlag || IsUnattendedSetup) && IsValidPath(InstallDir)) + { + BuildInstallPaths(InstallDir, DiskEntry, PartEntry); return PREPARE_COPY_PAGE; } - wcscpy(InstallDir, L"\\ReactOS"); - Length = wcslen(InstallDir); Pos = Length; + + MUIDisplayPage(INSTALL_DIRECTORY_PAGE); CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); CONSOLE_SetCursorXY(8 + Pos, 11); CONSOLE_SetCursorType(TRUE, TRUE); - MUIDisplayPage(INSTALL_DIRECTORY_PAGE); while (TRUE) { @@ -4336,7 +4394,7 @@ DoUpdate: CONSOLE_SetStatusText(MUIGetString(STRING_IMPORTFILE), File); - if (!ImportRegistryFile(File, Section, LanguageId, Delete)) + if (!ImportRegistryFile(SourcePath.Buffer, File, Section, LanguageId, Delete)) { DPRINT1("Importing %S failed\n", File); MUIDisplayError(ERROR_IMPORT_HIVE, Ir, POPUP_WAIT_ENTER); diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index d0ce275f75..6e95582ce7 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -72,36 +72,9 @@ #include "mui.h" extern HANDLE ProcessHeap; -extern UNICODE_STRING SourcePath; extern BOOLEAN IsUnattendedSetup; extern PWCHAR SelectedLanguageId; -extern VOID InfSetHeap(PVOID Heap); -extern VOID InfCloseFile(HINF InfHandle); -extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn, - PINFCONTEXT ContextOut); -extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context, - ULONG FieldIndex, - PUCHAR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); -extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context, - ULONG FieldIndex, - PWSTR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); -extern BOOLEAN InfGetStringField(PINFCONTEXT Context, - ULONG FieldIndex, - PWSTR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); - -#define SetupCloseInfFile InfCloseFile -#define SetupFindNextLine InfFindNextLine -#define SetupGetBinaryField InfGetBinaryField -#define SetupGetMultiSzFieldW InfGetMultiSzField -#define SetupGetStringFieldW InfGetStringField - typedef enum _PAGE_NUMBER { LANGUAGE_PAGE,

5 years, 10 months

02/04: [USETUP] Implement most of the "upgrade" page, where existing NTOS installations are listed.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49d3daf1af625e360145f… commit 49d3daf1af625e360145f4f4ada24a48427524d4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu May 31 16:38:06 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 26 02:16:03 2018 +0200 [USETUP] Implement most of the "upgrade" page, where existing NTOS installations are listed. - Modify a bit the page flow so that the upgrade page is inserted before the Device-settings page, and after the Install-Intro page. - Insert some extra 'RepairUpdateFlag' checks in SelectPartitionPage() and InstallDirectoryPage() to take specific actions in case the flag is TRUE. svn path=/branches/setup_improvements/; revision=74576 svn path=/branches/setup_improvements/; revision=75525 --- base/setup/usetup/usetup.c | 177 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 170 insertions(+), 7 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index a8e72676d3..e1a382eafc 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -102,6 +102,9 @@ static HINF SetupInf; static HSPFILEQ SetupFileQueue = NULL; +static PNTOS_INSTALLATION CurrentInstallation = NULL; +static PGENERIC_LIST NtOsInstallsList = NULL; + static PGENERIC_LIST ComputerList = NULL; static PGENERIC_LIST DisplayList = NULL; static PGENERIC_LIST KeyboardList = NULL; @@ -937,6 +940,7 @@ SetupStartPage(PINPUT_RECORD Ir) * Next pages: * InstallIntroPage (default) * RepairIntroPage + * RecoveryPage * LicensePage * QuitPage * @@ -966,7 +970,7 @@ WelcomePage(PINPUT_RECORD Ir) } else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'R') /* R */ { - return REPAIR_INTRO_PAGE; + return RECOVERY_PAGE; // REPAIR_INTRO_PAGE; } else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'L') /* L */ { @@ -1050,6 +1054,134 @@ RepairIntroPage(PINPUT_RECORD Ir) return REPAIR_INTRO_PAGE; } +/* + * Displays the UpgradeRepairPage. + * + * Next pages: + * RebootPage (default) + * InstallIntroPage + * RecoveryPage + * WelcomePage + * + * RETURNS + * Number of the next page. + */ +static PAGE_NUMBER +UpgradeRepairPage(PINPUT_RECORD Ir) +{ + GENERIC_LIST_UI ListUi; + +/*** HACK!! ***/ + if (PartitionList == NULL) + { + PartitionList = CreatePartitionList(); + if (PartitionList == NULL) + { + /* FIXME: show an error dialog */ + MUIDisplayError(ERROR_DRIVE_INFORMATION, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + else if (IsListEmpty(&PartitionList->DiskListHead)) + { + MUIDisplayError(ERROR_NO_HDD, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + + TempPartition = NULL; + FormatState = Start; + } +/**************/ + + NtOsInstallsList = CreateNTOSInstallationsList(PartitionList); + if (!NtOsInstallsList) + DPRINT1("Failed to get a list of NTOS installations; continue installation...\n"); + if (!NtOsInstallsList || GetNumberOfListEntries(NtOsInstallsList) == 0) + { + RepairUpdateFlag = FALSE; + + // return INSTALL_INTRO_PAGE; + return DEVICE_SETTINGS_PAGE; + // return SCSI_CONTROLLER_PAGE; + } + + MUIDisplayPage(UPGRADE_REPAIR_PAGE); + + InitGenericListUi(&ListUi, NtOsInstallsList); + DrawGenericList(&ListUi, + 2, 23, + xScreen - 3, + yScreen - 3); + + SaveGenericListState(NtOsInstallsList); + + // return HandleGenericList(&ListUi, DEVICE_SETTINGS_PAGE, Ir); + while (TRUE) + { + CONSOLE_ConInKey(Ir); + + if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) + { + switch (Ir->Event.KeyEvent.wVirtualKeyCode) + { + case VK_DOWN: /* DOWN */ + ScrollDownGenericList(&ListUi); + break; + case VK_UP: /* UP */ + ScrollUpGenericList(&ListUi); + break; + case VK_NEXT: /* PAGE DOWN */ + ScrollPageDownGenericList(&ListUi); + break; + case VK_PRIOR: /* PAGE UP */ + ScrollPageUpGenericList(&ListUi); + break; + case VK_F3: /* F3 */ + { + if (ConfirmQuit(Ir) == TRUE) + return QUIT_PAGE; + else + RedrawGenericList(&ListUi); + break; + } + case VK_ESCAPE: /* ESC */ + { + RestoreGenericListState(NtOsInstallsList); + // return nextPage; // prevPage; + + // return INSTALL_INTRO_PAGE; + return DEVICE_SETTINGS_PAGE; + // return SCSI_CONTROLLER_PAGE; + } + } + } + else + { + // switch (toupper(Ir->Event.KeyEvent.uChar.AsciiChar)) + // if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ + if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'U') /* U */ + { + /* Retrieve the current installation */ + CurrentInstallation = (PNTOS_INSTALLATION)GetListEntryUserData(GetCurrentListEntry(NtOsInstallsList)); + DPRINT1("Selected installation for repair: \"%S\" ; DiskNumber = %d , PartitionNumber = %d\n", + CurrentInstallation->InstallationName, CurrentInstallation->DiskNumber, CurrentInstallation->PartitionNumber); + + RepairUpdateFlag = TRUE; + + // return nextPage; + /***/return INSTALL_INTRO_PAGE;/***/ + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar > 0x60) && + (Ir->Event.KeyEvent.uChar.AsciiChar < 0x7b)) /* a-z */ + { + GenericListKeyPress(&ListUi, Ir->Event.KeyEvent.uChar.AsciiChar); + } + } + } + + return UPGRADE_REPAIR_PAGE; +} + + /* * Displays the InstallIntroPage. * @@ -1067,8 +1199,17 @@ InstallIntroPage(PINPUT_RECORD Ir) { if (RepairUpdateFlag) { - //return SELECT_PARTITION_PAGE; +#if 1 /* Old code that looks good */ + + // return SELECT_PARTITION_PAGE; return DEVICE_SETTINGS_PAGE; + +#else /* Possible new code? */ + + return DEVICE_SETTINGS_PAGE; + // return SCSI_CONTROLLER_PAGE; + +#endif } if (IsUnattendedSetup) @@ -1090,8 +1231,7 @@ InstallIntroPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - return DEVICE_SETTINGS_PAGE; - // return SCSI_CONTROLLER_PAGE; + return UPGRADE_REPAIR_PAGE; } } @@ -1559,6 +1699,20 @@ SelectPartitionPage(PINPUT_RECORD Ir) FormatState = Start; } + if (RepairUpdateFlag) + { + /* Determine the selected installation disk & partition */ + if (!SelectPartition(PartitionList, + CurrentInstallation->DiskNumber, + CurrentInstallation->PartitionNumber)) + { + DPRINT1("RepairUpdateFlag == TRUE, SelectPartition() returned FALSE, assert!\n"); + ASSERT(FALSE); + } + + return SELECT_FILE_SYSTEM_PAGE; + } + MUIDisplayPage(SELECT_PARTITION_PAGE); InitPartitionListUi(&ListUi, PartitionList, @@ -3259,7 +3413,7 @@ BuildInstallPaths(PWSTR InstallDir, * Displays the InstallDirectoryPage. * * Next pages: - * PrepareCopyPage (As the direct result of InstallDirectoryPage1) + * PrepareCopyPage * QuitPage * * RETURNS @@ -3292,7 +3446,6 @@ InstallDirectoryPage(PINPUT_RECORD Ir) DiskEntry = PartitionList->CurrentDisk; PartEntry = PartitionList->CurrentPartition; -#if 0 if (RepairUpdateFlag) { if (!IsValidPath(CurrentInstallation->PathComponent)) // SystemNtPath @@ -3307,7 +3460,6 @@ InstallDirectoryPage(PINPUT_RECORD Ir) return PREPARE_COPY_PAGE; } -#endif if (IsUnattendedSetup) { if (!IsValidPath(UnattendInstallationDirectory)) @@ -4831,6 +4983,13 @@ QuitPage(PINPUT_RECORD Ir) { MUIDisplayPage(QUIT_PAGE); + /* Destroy the NTOS installations list */ + if (NtOsInstallsList != NULL) + { + DestroyGenericList(NtOsInstallsList, TRUE); + NtOsInstallsList = NULL; + } + /* Destroy the partition list */ if (PartitionList != NULL) { @@ -5130,6 +5289,10 @@ RunUSetup(VOID) Page = RepairIntroPage(&Ir); break; + case UPGRADE_REPAIR_PAGE: + Page = UpgradeRepairPage(&Ir); + break; + case SUCCESS_PAGE: Page = SuccessPage(&Ir); break;

5 years, 10 months

01/04: [USETUP] Add an upgrade/repair installation page.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29ace9c0dcc4ca2a812ba… commit 29ace9c0dcc4ca2a812ba0e07bcccab99f80b2b0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 15 01:48:19 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 26 02:15:19 2018 +0200 [USETUP] Add an upgrade/repair installation page. Translators, please update the associated translations! svn path=/branches/setup_improvements/; revision=74548 --- base/setup/usetup/lang/bg-BG.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/bn-BD.h | 78 ++++++++++++++++++++++++++++++++++- base/setup/usetup/lang/cs-CZ.h | 78 ++++++++++++++++++++++++++++++++++- base/setup/usetup/lang/da-DK.h | 80 ++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/de-DE.h | 78 ++++++++++++++++++++++++++++++++++- base/setup/usetup/lang/el-GR.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/en-US.h | 81 +++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/es-ES.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/et-EE.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/fr-FR.h | 80 ++++++++++++++++++++++++++++++++++-- base/setup/usetup/lang/he-IL.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/it-IT.h | 92 +++++++++++++++++++++++++++++++++++++----- base/setup/usetup/lang/ja-JP.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/lt-LT.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/ms-MY.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/nl-NL.h | 78 ++++++++++++++++++++++++++++++++++- base/setup/usetup/lang/pl-PL.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/pt-BR.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/ro-RO.h | 84 ++++++++++++++++++++++++++++++++++---- base/setup/usetup/lang/ru-RU.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/sk-SK.h | 78 ++++++++++++++++++++++++++++++++++- base/setup/usetup/lang/sq-AL.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/sv-SE.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/tr-TR.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/lang/uk-UA.h | 76 +++++++++++++++++++++++++++++++++- base/setup/usetup/usetup.h | 1 + 26 files changed, 1897 insertions(+), 51 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 01fc9482e9..6191c1f857 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -84,7 +84,7 @@ static MUI_ENTRY bgBGWelcomePageEntries[] = { 8, 15, - "\x07 ��᭥� ENTER �� ᫠�� ⎑.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -488,6 +488,76 @@ static MUI_ENTRY bgBGRepairPageEntries[] = } }; +static MUI_ENTRY bgBGUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY bgBGComputerPageEntries[] = { { @@ -1648,6 +1718,10 @@ MUI_PAGE bgBGPages[] = REPAIR_INTRO_PAGE, bgBGRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + bgBGUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, bgBGComputerPageEntries diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 689e88c2e2..847c53b712 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -81,13 +81,13 @@ static MUI_ENTRY bnBDWelcomePageEntries[] = { 8, 15, - "\x07 Press ENTER to install ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press R to repair or update ReactOS.", + "\x07 Press R to repair a ReactOS installation.", TEXT_STYLE_NORMAL }, { @@ -479,6 +479,76 @@ static MUI_ENTRY bnBDRepairPageEntries[] = } }; +static MUI_ENTRY bnBDUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY bnBDComputerPageEntries[] = { { @@ -1635,6 +1705,10 @@ MUI_PAGE bnBDPages[] = REPAIR_INTRO_PAGE, bnBDRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + bnBDUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, bnBDComputerPageEntries diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 82a5691d78..7972b8603f 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -89,13 +89,13 @@ static MUI_ENTRY csCZWelcomePageEntries[] = { 8, 15, - "\x07 Stisknut�m kl�vesy ENTER zah�j�te instalaci ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Stisknut�m R zah�j�te opravu nebo aktualizaci ReactOS.", + "\x07 Stisknut�m R zah�j�te opravu ReactOS.", TEXT_STYLE_NORMAL }, { @@ -487,6 +487,76 @@ static MUI_ENTRY csCZRepairPageEntries[] = } }; +static MUI_ENTRY csCZUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY csCZComputerPageEntries[] = { { @@ -1643,6 +1713,10 @@ MUI_PAGE csCZPages[] = REPAIR_INTRO_PAGE, csCZRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + csCZUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, csCZComputerPageEntries diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index 5e5c1ba35c..a58f2db920 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -81,13 +81,13 @@ static MUI_ENTRY daDKWelcomePageEntries[] = { 8, 15, - "\x07 Tryk p� ENTER for at installere ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Tryk p� R reparere eller opdatere ReactOS.", + "\x07 Tryk p� R reparere ReactOS.", TEXT_STYLE_NORMAL }, { @@ -484,6 +484,77 @@ static MUI_ENTRY daDKRepairPageEntries[] = 0 } }; + +static MUI_ENTRY daDKUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY daDKComputerPageEntries[] = { { @@ -931,7 +1002,6 @@ static MUI_ENTRY daDKConfirmDeleteSystemPartitionEntries[] = } }; - static MUI_ENTRY daDKFormatPartitionEntries[] = { { @@ -1649,6 +1719,10 @@ MUI_PAGE daDKPages[] = REPAIR_INTRO_PAGE, daDKRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + daDKUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, daDKComputerPageEntries diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index abd84927c3..2e2d66ea7a 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -82,13 +82,13 @@ static MUI_ENTRY deDEWelcomePageEntries[] = { 8, 15, - "\x07 Dr�cken Sie die EINGABETASTE, um ReactOS zu installieren.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Dr�cken Sie R, um ReactOS zu reparieren oder aktualisieren.", + "\x07 Dr�cken Sie R, um ReactOS zu reparieren.", TEXT_STYLE_NORMAL }, { @@ -486,6 +486,76 @@ static MUI_ENTRY deDERepairPageEntries[] = } }; +static MUI_ENTRY deDEUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY deDEComputerPageEntries[] = { { @@ -1639,6 +1709,10 @@ MUI_PAGE deDEPages[] = REPAIR_INTRO_PAGE, deDERepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + deDEUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, deDEComputerPageEntries diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index 8431842f50..4052a8997d 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -82,7 +82,7 @@ static MUI_ENTRY elGRWelcomePageEntries[] = { 7, 15, - "\x07 ��㩫� ENTER �� 㩜�� ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -480,6 +480,76 @@ static MUI_ENTRY elGRRepairPageEntries[] = } }; +static MUI_ENTRY elGRUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY elGRComputerPageEntries[] = { { @@ -1652,6 +1722,10 @@ MUI_PAGE elGRPages[] = REPAIR_INTRO_PAGE, elGRRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + elGRUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, elGRComputerPageEntries diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 396a009a95..5905590a33 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -81,13 +81,14 @@ static MUI_ENTRY enUSWelcomePageEntries[] = { 8, 15, - "\x07 Press ENTER to install ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press R to repair or update ReactOS.", + // "\x07 Press R to repair a ReactOS installation using the Recovery Console.", + "\x07 Press R to repair a ReactOS installation.", TEXT_STYLE_NORMAL }, { @@ -478,6 +479,77 @@ static MUI_ENTRY enUSRepairPageEntries[] = 0 } }; + +static MUI_ENTRY enUSUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY enUSComputerPageEntries[] = { { @@ -924,7 +996,6 @@ static MUI_ENTRY enUSConfirmDeleteSystemPartitionEntries[] = } }; - static MUI_ENTRY enUSFormatPartitionEntries[] = { { @@ -1635,6 +1706,10 @@ MUI_PAGE enUSPages[] = REPAIR_INTRO_PAGE, enUSRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + enUSUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, enUSComputerPageEntries diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index 569fd5ef75..c60e0daddb 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -84,7 +84,7 @@ static MUI_ENTRY esESWelcomePageEntries[] = { 8, 15, - "\x07 Presione INTRO para instalar ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -482,6 +482,76 @@ static MUI_ENTRY esESRepairPageEntries[] = } }; +static MUI_ENTRY esESUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY esESComputerPageEntries[] = { { @@ -1639,6 +1709,10 @@ MUI_PAGE esESPages[] = REPAIR_INTRO_PAGE, esESRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + esESUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, esESComputerPageEntries diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index 87ccc8bcb5..ff36b11d59 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -81,7 +81,7 @@ static MUI_ENTRY etEEWelcomePageEntries[] = { 8, 15, - "\x07 Vajuta ENTER, et ReactOS paigaldada.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -479,6 +479,76 @@ static MUI_ENTRY etEERepairPageEntries[] = } }; +static MUI_ENTRY etEEUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY etEEComputerPageEntries[] = { { @@ -1633,6 +1703,10 @@ MUI_PAGE etEEPages[] = REPAIR_INTRO_PAGE, etEERepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + etEEUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, etEEComputerPageEntries diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index ed74aec94c..3cf8aa7600 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -82,7 +82,7 @@ static MUI_ENTRY frFRWelcomePageEntries[] = { 8, 15, - "\x07 Appuyer sur ENTR�E pour installer ReactOS.", + "\x07 Appuyer sur ENTR�E pour installer ou mettre � jour ReactOS.", TEXT_STYLE_NORMAL }, { @@ -463,7 +463,7 @@ static MUI_ENTRY frFRRepairPageEntries[] = { 8, 19, - "\x07 Appuyer sur �CHAP pour retourner � la page principale.", + "\x07 Appuyer sur �CHAP pour revenir � la page principale.", TEXT_STYLE_NORMAL }, { @@ -486,6 +486,76 @@ static MUI_ENTRY frFRRepairPageEntries[] = } }; +static MUI_ENTRY frFRUpgradePageEntries[] = +{ + { + 4, + 3, + " Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Le programme d'installation de ReactOS peut mettre � jour l'une des", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "installations de ReactOS list�es ci-dessous, ou bien, si l'une d'elles", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "est endommag�e, le programme d'installation peut essayer de la r�parer.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "Les fonctions de r�paration ne sont pas toutes impl�ment�es.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Appuyer sur HAUT ou BAS pour s�lectionner une installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Appuyer sur U pour mettre � jour l'installation s�lectionn�e.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Appuyer sur �CHAP pour effectuer une nouvelle installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Appuyer sur F3 pour quitter sans installer ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Mettre � jour �CHAP = Annuler F3 = Quitter", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY frFRComputerPageEntries[] = { { @@ -921,7 +991,7 @@ static MUI_ENTRY frFRConfirmDeleteSystemPartitionEntries[] = { 8, 26, - "\x07 Appuyer sur �CHAP pour retourner � la page principale. La partition", + "\x07 Appuyer sur �CHAP pour revenir � la page principale. La partition", TEXT_STYLE_NORMAL }, { @@ -1654,6 +1724,10 @@ MUI_PAGE frFRPages[] = REPAIR_INTRO_PAGE, frFRRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + frFRUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, frFRComputerPageEntries diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 75a192a864..29260ab128 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -82,7 +82,7 @@ static MUI_ENTRY heILWelcomePageEntries[] = { 8, 15, - "\x07 ReactOS �� ENTER ��", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -480,6 +480,76 @@ static MUI_ENTRY heILRepairPageEntries[] = } }; +static MUI_ENTRY heILUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY heILComputerPageEntries[] = { { @@ -1636,6 +1706,10 @@ MUI_PAGE heILPages[] = REPAIR_INTRO_PAGE, heILRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + heILUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, heILComputerPageEntries diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index e7da50725e..8d4987fcf3 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -82,7 +82,7 @@ static MUI_ENTRY itITWelcomePageEntries[] = { 8, 15, - "\x07 Premere INVIO per installare ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -425,49 +425,49 @@ static MUI_ENTRY itITRepairPageEntries[] = TEXT_STYLE_UNDERLINE }, { - 6, + 6, 8, "Il setup di ReactOS \x8A ancora in una fase preliminare.", TEXT_STYLE_NORMAL }, { - 6, + 6, 9, "Non ha ancora tutte le funzioni di installazione.", TEXT_STYLE_NORMAL }, { - 6, + 6, 12, "Le funzioni di ripristino non sono state ancora implementate.", TEXT_STYLE_NORMAL }, { - 8, + 8, 15, "\x07 Premere U per aggiornare il SO.", TEXT_STYLE_NORMAL }, { - 8, + 8, 17, "\x07 Premere R per la console di ripristino.", TEXT_STYLE_NORMAL }, { - 8, + 8, 19, "\x07 Premere ESC tornare al men\x97 principale.", TEXT_STYLE_NORMAL }, { - 8, + 8, 21, "\x07 Premere INVIO per riavviare il computer.", TEXT_STYLE_NORMAL }, { - 0, + 0, 0, "ESC = Men\x97 iniziale INVIO = Riavvio", TEXT_TYPE_STATUS @@ -480,6 +480,76 @@ static MUI_ENTRY itITRepairPageEntries[] = } }; +static MUI_ENTRY itITUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY itITComputerPageEntries[] = { { @@ -1642,6 +1712,10 @@ MUI_PAGE itITPages[] = REPAIR_INTRO_PAGE, itITRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + itITUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, itITComputerPageEntries diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 52fc2c785d..f71e340231 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -82,7 +82,7 @@ static MUI_ENTRY jaJPWelcomePageEntries[] = { 8, 15, - "\x07 ReactOS � �ݽİ� �� ENTER �� ޻��", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -480,6 +480,76 @@ static MUI_ENTRY jaJPRepairPageEntries[] = } }; +static MUI_ENTRY jaJPUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY jaJPComputerPageEntries[] = { { @@ -1637,6 +1707,10 @@ MUI_PAGE jaJPPages[] = REPAIR_INTRO_PAGE, jaJPRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + jaJPUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, jaJPComputerPageEntries diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index d5fc64768d..d2cb29527c 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -91,7 +91,7 @@ static MUI_ENTRY ltLTWelcomePageEntries[] = { 8, 15, - "\x07 Spauskite ENTER, jei norite diegti ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -489,6 +489,76 @@ static MUI_ENTRY ltLTRepairPageEntries[] = } }; +static MUI_ENTRY ltLTUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ltLTComputerPageEntries[] = { { @@ -1645,6 +1715,10 @@ MUI_PAGE ltLTPages[] = REPAIR_INTRO_PAGE, ltLTRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + ltLTUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, ltLTComputerPageEntries diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index e7ef24f2fb..e8ae583e4d 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -81,7 +81,7 @@ static MUI_ENTRY msMYWelcomePageEntries[] = { 8, 15, - "\x07 Tekan ENTER untuk memasang ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -479,6 +479,76 @@ static MUI_ENTRY msMYRepairPageEntries[] = } }; +static MUI_ENTRY msMYUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY msMYComputerPageEntries[] = { { @@ -1528,6 +1598,10 @@ MUI_PAGE msMYPages[] = REPAIR_INTRO_PAGE, msMYRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + msMYUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, msMYComputerPageEntries diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index d3872cc8f8..f8b6711972 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -91,13 +91,13 @@ static MUI_ENTRY nlNLWelcomePageEntries[] = { 8, 15, - "\x07 Druk op ENTER om ReactOS te installeren.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Druk op R om ReactOS te repareren of bij te werken.", + "\x07 Druk op R om ReactOS te repareren.", TEXT_STYLE_NORMAL }, { @@ -495,6 +495,76 @@ static MUI_ENTRY nlNLRepairPageEntries[] = } }; +static MUI_ENTRY nlNLUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY nlNLComputerPageEntries[] = { { @@ -1663,6 +1733,10 @@ MUI_PAGE nlNLPages[] = REPAIR_INTRO_PAGE, nlNLRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + nlNLUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, nlNLComputerPageEntries diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 5de776e8a9..1df2488272 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -92,7 +92,7 @@ static MUI_ENTRY plPLWelcomePageEntries[] = { 8, 15, - "\x07 Naci�nij ENTER, aby zainstalowa� system ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -490,6 +490,76 @@ static MUI_ENTRY plPLRepairPageEntries[] = } }; +static MUI_ENTRY plPLUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY plPLComputerPageEntries[] = { { @@ -1646,6 +1716,10 @@ MUI_PAGE plPLPages[] = REPAIR_INTRO_PAGE, plPLRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + plPLUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, plPLComputerPageEntries diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index a28ecefabb..6f3cba11ce 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -82,7 +82,7 @@ static MUI_ENTRY ptBRWelcomePageEntries[] = { 8, 15, - "\x07 Para instalar o ReactOS agora, pressione ENTER.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -474,6 +474,76 @@ static MUI_ENTRY ptBRRepairPageEntries[] = } }; +static MUI_ENTRY ptBRUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ptBRComputerPageEntries[] = { { @@ -1667,6 +1737,10 @@ MUI_PAGE ptBRPages[] = REPAIR_INTRO_PAGE, ptBRRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + ptBRUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, ptBRComputerPageEntries diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 443688b697..2a4f788617 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -89,19 +89,13 @@ static MUI_ENTRY roROWelcomePageEntries[] = { 8, 16, - "\x07 Ap�sa�i ENTER pentru a instala ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 18, - "\x07 Tasta�i R pentru a reface un sistem deteriorat sau pentru", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, - " a actualiza ReactOS.", + "\x07 Tasta�i R pentru a reface un sistem deteriorat.", TEXT_STYLE_NORMAL }, { @@ -518,6 +512,76 @@ static MUI_ENTRY roRORepairPageEntries[] = } }; +static MUI_ENTRY roROUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY roROComputerPageEntries[] = { { @@ -1689,6 +1753,10 @@ MUI_PAGE roROPages[] = REPAIR_INTRO_PAGE, roRORepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + roROUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, roROComputerPageEntries diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index bfb351b2fd..3d809a189d 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -82,7 +82,7 @@ static MUI_ENTRY ruRUWelcomePageEntries[] = { 8, 15, - "\x07 �� ENTER �� ⠭�� ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -480,6 +480,76 @@ static MUI_ENTRY ruRURepairPageEntries[] = } }; +static MUI_ENTRY ruRUUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ruRUComputerPageEntries[] = { { @@ -1636,6 +1706,10 @@ MUI_PAGE ruRUPages[] = REPAIR_INTRO_PAGE, ruRURepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + ruRUUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, ruRUComputerPageEntries diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index b347d8638e..efb9d0c9f0 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -89,13 +89,13 @@ static MUI_ENTRY skSKWelcomePageEntries[] = { 8, 15, - "\x07 Stla�te ENTER pre nain�talovanie syst�mu ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Stla�te R pre opravu alebo aktualiz�ciu syst�mu ReactOS.", + "\x07 Stla�te R pre opravu ciu syst�mu ReactOS.", TEXT_STYLE_NORMAL }, { @@ -487,6 +487,76 @@ static MUI_ENTRY skSKRepairPageEntries[] = } }; +static MUI_ENTRY skSKUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY skSKComputerPageEntries[] = { { @@ -1647,6 +1717,10 @@ MUI_PAGE skSKPages[] = REPAIR_INTRO_PAGE, skSKRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + skSKUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, skSKComputerPageEntries diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 2874983dca..01b6e61a5c 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -85,7 +85,7 @@ static MUI_ENTRY sqALWelcomePageEntries[] = { 8, 15, - "\x07 Kliko ENTER p�r instalimin e ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -483,6 +483,76 @@ static MUI_ENTRY sqALRepairPageEntries[] = } }; +static MUI_ENTRY sqALUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY sqALComputerPageEntries[] = { { @@ -1640,6 +1710,10 @@ MUI_PAGE sqALPages[] = REPAIR_INTRO_PAGE, sqALRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + sqALUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, sqALComputerPageEntries diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index b3a370e607..897fbcca62 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -88,7 +88,7 @@ static MUI_ENTRY svSEWelcomePageEntries[] = { 8, 15, - "\x07 Tryck p� ENTER f�r att installera ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -486,6 +486,76 @@ static MUI_ENTRY svSERepairPageEntries[] = } }; +static MUI_ENTRY svSEUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY svSEComputerPageEntries[] = { { @@ -1643,6 +1713,10 @@ MUI_PAGE svSEPages[] = REPAIR_INTRO_PAGE, svSERepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + svSEUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, svSEComputerPageEntries diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 63e780c64d..e9e3d8b6de 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -85,7 +85,7 @@ static MUI_ENTRY trTRWelcomePageEntries[] = { 8, 15, - "\x07 ReactOS'u kurmak i�in Giri�'e bas�n�z.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -478,6 +478,76 @@ static MUI_ENTRY trTRRepairPageEntries[] = } }; +static MUI_ENTRY trTRUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY trTRComputerPageEntries[] = { { @@ -1616,6 +1686,10 @@ MUI_PAGE trTRPages[] = REPAIR_INTRO_PAGE, trTRRepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + trTRUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, trTRComputerPageEntries diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index fdb4dcf692..eebea803ca 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -87,7 +87,7 @@ static MUI_ENTRY ukUAWelcomePageEntries[] = { 8, 15, - "\x07 ��i�� ENTER 鮡 ��⠭�� ReactOS.", + "\x07 Press ENTER to install or upgrade ReactOS.", TEXT_STYLE_NORMAL }, { @@ -485,6 +485,76 @@ static MUI_ENTRY ukUARepairPageEntries[] = } }; +static MUI_ENTRY ukUAUpgradePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The ReactOS Setup can upgrade one of the available ReactOS installations", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "listed below, or, if a ReactOS installation is damaged, the Setup program", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "can attempt to repair it.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not all implemented yet.", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 15, + "\x07 Press UP or DOWN to select an OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press U for upgrading the selected OS installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to continue with a new installation.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "U = Upgrade ESC = Do not upgrade F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + static MUI_ENTRY ukUAComputerPageEntries[] = { { @@ -1643,6 +1713,10 @@ MUI_PAGE ukUAPages[] = REPAIR_INTRO_PAGE, ukUARepairPageEntries }, + { + UPGRADE_REPAIR_PAGE, + ukUAUpgradePageEntries + }, { COMPUTER_SETTINGS_PAGE, ukUAComputerPageEntries diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index 2f548b57bc..d0ce275f75 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -113,6 +113,7 @@ typedef enum _PAGE_NUMBER // OEM_DRIVER_PAGE, REPAIR_INTRO_PAGE, + UPGRADE_REPAIR_PAGE, DEVICE_SETTINGS_PAGE, COMPUTER_SETTINGS_PAGE,

5 years, 10 months

01/01: [USER32] Fix Task Switcher (#976)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ccad609e0f07285dcf36… commit 4ccad609e0f07285dcf36c9a7bdad5b7c8dd8bad Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 25 22:59:44 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 25 22:59:44 2018 +0900 [USER32] Fix Task Switcher (#976) This fix is needed for the Delphi GUI programs. - Don't enumerate the windows whose owner window exists. - Use PostMessage SC_RESTORE instead of ShowWindowAsync SW_RESTORE. CORE-15165 --- win32ss/user/user32/controls/appswitch.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/win32ss/user/user32/controls/appswitch.c b/win32ss/user/user32/controls/appswitch.c index c776008ad0..c2898b9e13 100644 --- a/win32ss/user/user32/controls/appswitch.c +++ b/win32ss/user/user32/controls/appswitch.c @@ -125,7 +125,7 @@ void ResizeAndCenter(HWND hwnd, int width, int height) void MakeWindowActive(HWND hwnd) { if (IsIconic(hwnd)) - ShowWindowAsync(hwnd, SW_RESTORE); + PostMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); BringWindowToTop(hwnd); // same as: SetWindowPos(hwnd,HWND_TOP,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); ? SetForegroundWindow(hwnd); @@ -171,6 +171,9 @@ BOOL CALLBACK EnumerateCallback(HWND window, LPARAM lParam) if (!IsWindowVisible(window)) return TRUE; + if (GetWindow(window, GW_OWNER) != NULL) + return TRUE; + GetClassNameW(window, windowText, _countof(windowText)); if ((wcscmp(L"Shell_TrayWnd", windowText)==0) || (wcscmp(L"Progman", windowText)==0) )

5 years, 10 months

01/01: [SDK] Update baseaddresses

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea84aef66243179c04277… commit ea84aef66243179c0427747ea81237b33aa2b29e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Oct 25 06:59:15 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Oct 25 06:59:45 2018 +0200 [SDK] Update baseaddresses --- sdk/cmake/baseaddress.cmake | 749 +++++++++++++++++++------------------- sdk/cmake/baseaddress_dwarf.cmake | 583 ++++++++++++++--------------- sdk/cmake/baseaddress_msvc.cmake | 747 ++++++++++++++++++------------------- 3 files changed, 1041 insertions(+), 1038 deletions(-) diff --git a/sdk/cmake/baseaddress.cmake b/sdk/cmake/baseaddress.cmake index c0c69f3dcb..d82530e0e5 100644 --- a/sdk/cmake/baseaddress.cmake +++ b/sdk/cmake/baseaddress.cmake @@ -1,377 +1,378 @@ -# Generated from f:\reactos\build\mingw-x86-ninja-apps-tests +# Generated from R:\build\master\gcc # Generated by sdk/tools/gen_baseaddress.py set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c640000) -set(baseaddress_msvcrt 0x7c580000) -set(baseaddress_advapi32 0x7c4d0000) -set(baseaddress_gdi32 0x7c420000) +set(baseaddress_kernel32 0x7c5d0000) +set(baseaddress_msvcrt 0x7c510000) +set(baseaddress_advapi32 0x7c460000) +set(baseaddress_gdi32 0x7c3b0000) set(baseaddress_user32 0x77a20000) # reserved -set(baseaddress_dhcpcsvc 0x7c3d0000) -set(baseaddress_dnsapi 0x7c380000) -set(baseaddress_icmp 0x7c350000) -set(baseaddress_iphlpapi 0x7c300000) -set(baseaddress_ws2_32 0x7c2b0000) -set(baseaddress_ws2help 0x7c280000) -set(baseaddress_shlwapi 0x7c1d0000) -set(baseaddress_rpcrt4 0x7c100000) -set(baseaddress_comctl32 0x7bf20000) -set(baseaddress_ole32 0x7bd40000) -set(baseaddress_winspool 0x7bcf0000) -set(baseaddress_winmm 0x7bc30000) -set(baseaddress_comdlg32 0x7bb20000) -set(baseaddress_shell32 0x7b260000) -set(baseaddress_lz32 0x7b240000) -set(baseaddress_version 0x7b210000) -set(baseaddress_oleaut32 0x7b030000) -set(baseaddress_setupapi 0x7aeb0000) -set(baseaddress_mpr 0x7ae70000) -set(baseaddress_crypt32 0x7ad60000) -set(baseaddress_wininet 0x7aca0000) -set(baseaddress_urlmon 0x7aba0000) -set(baseaddress_psapi 0x7ab70000) -set(baseaddress_imm32 0x7ab30000) -set(baseaddress_msvfw32 0x7aae0000) -set(baseaddress_dbghelp 0x7aa30000) -set(baseaddress_devmgr 0x7a950000) -set(baseaddress_msacm32 0x7a910000) -set(baseaddress_netapi32 0x7a890000) -set(baseaddress_powrprof 0x7a860000) -set(baseaddress_secur32 0x7a810000) -set(baseaddress_wintrust 0x7a7b0000) -set(baseaddress_avicap32 0x7a780000) -set(baseaddress_cabinet 0x7a730000) -set(baseaddress_dsound 0x7a6b0000) -set(baseaddress_glu32 0x7a5b0000) -set(baseaddress_opengl32 0x7a3a0000) -set(baseaddress_riched20 0x7a2d0000) -set(baseaddress_smdll 0x7a2b0000) -set(baseaddress_userenv 0x7a260000) -set(baseaddress_uxtheme 0x7a200000) -set(baseaddress_cryptui 0x7a150000) -set(baseaddress_csrsrv 0x7a120000) -set(baseaddress_basesrv 0x7a0f0000) -set(baseaddress_winsrv 0x7a040000) -set(baseaddress_dplayx 0x79fd0000) -set(baseaddress_gdiplus 0x79ef0000) -set(baseaddress_msimg32 0x79ec0000) -set(baseaddress_mswsock 0x79e90000) -set(baseaddress_oledlg 0x79e40000) -set(baseaddress_rasapi32 0x79e10000) -set(baseaddress_rsaenh 0x79da0000) -set(baseaddress_samlib 0x79d60000) -set(baseaddress_sensapi 0x79d30000) -set(baseaddress_sfc_os 0x79d00000) -set(baseaddress_snmpapi 0x79cd0000) -set(baseaddress_spoolss 0x79c90000) -set(baseaddress_usp10 0x79c10000) -set(baseaddress_access 0x79b90000) -set(baseaddress_acgenral 0x79b60000) -set(baseaddress_aclayers 0x79b30000) -set(baseaddress_acledit 0x79b00000) -set(baseaddress_aclui 0x79ac0000) -set(baseaddress_acppage 0x79a50000) -set(baseaddress_activeds 0x79a20000) -set(baseaddress_actxprxy 0x79810000) -set(baseaddress_advapi32_vista 0x797f0000) -set(baseaddress_advpack 0x797b0000) -set(baseaddress_amstream 0x79750000) -set(baseaddress_apphelp 0x79710000) -set(baseaddress_appwiz 0x79690000) -set(baseaddress_atl 0x79650000) -set(baseaddress_atl100 0x79610000) -set(baseaddress_atl80 0x795d0000) -set(baseaddress_authz 0x795a0000) -set(baseaddress_avifil32 0x79520000) -set(baseaddress_batt 0x794f0000) -set(baseaddress_bcrypt 0x794c0000) -set(baseaddress_beepmidi 0x79490000) -set(baseaddress_browseui 0x79300000) -set(baseaddress_cards 0x79240000) -set(baseaddress_cfgmgr32 0x79210000) -set(baseaddress_clusapi 0x791e0000) -set(baseaddress_cmicpl 0x791a0000) -set(baseaddress_comcat 0x79170000) -set(baseaddress_compstui 0x79140000) -set(baseaddress_console 0x790e0000) -set(baseaddress_credui 0x790a0000) -set(baseaddress_crtdll 0x79030000) -set(baseaddress_cryptdlg 0x79000000) -set(baseaddress_cryptdll 0x78fd0000) -set(baseaddress_cryptnet 0x78fa0000) -set(baseaddress_custom 0x78f70000) -set(baseaddress_d3d8 0x78f10000) -set(baseaddress_d3d8thk 0x78ef0000) -set(baseaddress_d3d9 0x78e80000) -set(baseaddress_d3dcompiler_43 0x78dd0000) -set(baseaddress_d3drm 0x78d30000) -set(baseaddress_d3dwine 0x78b20000) -set(baseaddress_d3dx9_24 0x78af0000) -set(baseaddress_d3dx9_25 0x78ab0000) -set(baseaddress_d3dx9_26 0x78a80000) -set(baseaddress_d3dx9_27 0x78a50000) -set(baseaddress_d3dx9_28 0x78a20000) -set(baseaddress_d3dx9_29 0x789f0000) -set(baseaddress_d3dx9_30 0x789c0000) -set(baseaddress_d3dx9_31 0x78990000) -set(baseaddress_d3dx9_32 0x78960000) -set(baseaddress_d3dx9_33 0x78930000) -set(baseaddress_d3dx9_34 0x78900000) -set(baseaddress_d3dx9_35 0x788d0000) -set(baseaddress_d3dx9_36 0x787d0000) -set(baseaddress_d3dx9_37 0x787a0000) -set(baseaddress_d3dx9_38 0x78770000) -set(baseaddress_d3dx9_39 0x78740000) -set(baseaddress_d3dx9_40 0x78710000) -set(baseaddress_d3dx9_41 0x786e0000) -set(baseaddress_d3dx9_42 0x786b0000) -set(baseaddress_d3dx9_43 0x78680000) -set(baseaddress_d3dxof 0x78640000) -set(baseaddress_dciman32 0x78610000) -set(baseaddress_ddraw 0x78550000) -set(baseaddress_desk 0x784b0000) -set(baseaddress_deskadp 0x78480000) -set(baseaddress_deskmon 0x78450000) -set(baseaddress_devcpux 0x78420000) -set(baseaddress_devenum 0x783d0000) -set(baseaddress_dinput 0x78370000) -set(baseaddress_dinput8 0x78340000) -set(baseaddress_dmusic 0x782f0000) -set(baseaddress_dplay 0x782c0000) -set(baseaddress_dxdiagn 0x78270000) -set(baseaddress_dxtn 0x78250000) -set(baseaddress_esent 0x78220000) -set(baseaddress_faultrep 0x781f0000) -set(baseaddress_fltlib 0x781c0000) -set(baseaddress_fmifs 0x781a0000) -set(baseaddress_fontext 0x78170000) -set(baseaddress_fontsub 0x78140000) -set(baseaddress_framebuf 0x78120000) -set(baseaddress_framebuf_new 0x78100000) -set(baseaddress_framedyn 0x780c0000) -set(baseaddress_genincdata 0x78090000) -set(baseaddress_getuname 0x76e90000) -set(baseaddress_hdwwiz 0x76e10000) -set(baseaddress_hhctrl 0x76db0000) -set(baseaddress_hid 0x76d80000) -set(baseaddress_hlink 0x76d40000) -set(baseaddress_hnetcfg 0x76d00000) -set(baseaddress_httpapi 0x76cd0000) -set(baseaddress_iccvid 0x76ca0000) -set(baseaddress_ieframe 0x76ba0000) -set(baseaddress_iernonce 0x76b70000) -set(baseaddress_imaadp32.acm 0x76b40000) -set(baseaddress_imagehlp 0x76b10000) -set(baseaddress_inetcomm 0x76aa0000) -set(baseaddress_inetcpl 0x76a40000) -set(baseaddress_inetmib1 0x76a10000) -set(baseaddress_initpki 0x769e0000) -set(baseaddress_input 0x76980000) -set(baseaddress_inseng 0x76940000) -set(baseaddress_intl 0x768d0000) -set(baseaddress_iologmsg 0x768b0000) -set(baseaddress_itircl 0x76880000) -set(baseaddress_itss 0x76840000) -set(baseaddress_joy 0x76800000) -set(baseaddress_jscript 0x766f0000) -set(baseaddress_jsproxy 0x766c0000) -set(baseaddress_kbdeo 0x766a0000) -set(baseaddress_kbsdll 0x76670000) -set(baseaddress_kernel32_vista 0x76650000) -set(baseaddress_ksuser 0x76620000) -set(baseaddress_libjpeg 0x76590000) -set(baseaddress_libpng 0x76500000) -set(baseaddress_libtiff 0x76430000) -set(baseaddress_libtirpc 0x763d0000) -set(baseaddress_libxslt 0x76100000) -set(baseaddress_load_notifications 0x760e0000) -set(baseaddress_loadperf 0x760b0000) -set(baseaddress_localmon 0x76080000) -set(baseaddress_localspl 0x76040000) -set(baseaddress_localspl_apitest 0x76010000) -set(baseaddress_localui 0x75fe0000) -set(baseaddress_lpk 0x75fa0000) -set(baseaddress_lsasrv 0x75f30000) -set(baseaddress_main 0x75e90000) -set(baseaddress_mapi32 0x75e50000) -set(baseaddress_mbedtls 0x75dc0000) -set(baseaddress_mciavi32 0x75d80000) -set(baseaddress_mcicda 0x75d50000) -set(baseaddress_mciqtz32 0x75d10000) -set(baseaddress_mciseq 0x75ce0000) -set(baseaddress_mciwave 0x75cb0000) -set(baseaddress_mgmtapi 0x75c80000) -set(baseaddress_midimap 0x75c50000) -set(baseaddress_mlang 0x75c10000) -set(baseaddress_mmdrv 0x75be0000) -set(baseaddress_mmsys 0x75b10000) -set(baseaddress_modemui 0x75aa0000) -set(baseaddress_mprapi 0x75a70000) -set(baseaddress_msacm32.drv 0x75a40000) -set(baseaddress_msadp32.acm 0x75a10000) -set(baseaddress_msafd 0x759d0000) -set(baseaddress_mscat32 0x759a0000) -set(baseaddress_mscms 0x75970000) -set(baseaddress_mscoree 0x75920000) -set(baseaddress_msctf 0x758c0000) -set(baseaddress_msdmo 0x75890000) -set(baseaddress_msftedit 0x75860000) -set(baseaddress_msg711.acm 0x75830000) -set(baseaddress_msgina 0x75790000) -set(baseaddress_msgsm32.acm 0x75760000) -set(baseaddress_mshtml 0x75450000) -set(baseaddress_msi 0x752a0000) -set(baseaddress_msimtf 0x75270000) -set(baseaddress_msisip 0x75240000) -set(baseaddress_msisys 0x75210000) -set(baseaddress_mspatcha 0x751e0000) -set(baseaddress_msports 0x751b0000) -set(baseaddress_msrle32 0x75180000) -set(baseaddress_mssign32 0x75150000) -set(baseaddress_mssip32 0x75120000) -set(baseaddress_mstask 0x750e0000) -set(baseaddress_msv1_0 0x750b0000) -set(baseaddress_msvcrt20 0x74fe0000) -set(baseaddress_msvcrt40 0x74f10000) -set(baseaddress_msvcrt_crt_dll_startup 0x74ee0000) -set(baseaddress_msvidc32 0x74eb0000) -set(baseaddress_msxml 0x74e80000) -set(baseaddress_msxml2 0x74e50000) -set(baseaddress_msxml3 0x74a70000) -set(baseaddress_msxml4 0x74a30000) -set(baseaddress_msxml6 0x749f0000) -set(baseaddress_mycomput 0x749d0000) -set(baseaddress_ncpa 0x749a0000) -set(baseaddress_nddeapi 0x74970000) -set(baseaddress_netcfgx 0x748e0000) -set(baseaddress_netevent 0x748b0000) -set(baseaddress_netid 0x74860000) -set(baseaddress_netshell 0x747b0000) -set(baseaddress_newdev 0x74750000) -set(baseaddress_nfs41_np 0x74720000) -set(baseaddress_normaliz 0x746f0000) -set(baseaddress_notifyhook 0x746c0000) -set(baseaddress_npptools 0x74690000) -set(baseaddress_ntdll_vista 0x74670000) -set(baseaddress_ntdsapi 0x74640000) -set(baseaddress_ntlanman 0x74610000) -set(baseaddress_ntmarta 0x745e0000) -set(baseaddress_ntobjshex 0x74540000) -set(baseaddress_objsel 0x74510000) -set(baseaddress_odbc32 0x744d0000) -set(baseaddress_odbccp32 0x744a0000) -set(baseaddress_odbccp32i 0x74470000) -set(baseaddress_oleacc 0x743e0000) -set(baseaddress_olecli32 0x743b0000) -set(baseaddress_olepro32 0x74380000) -set(baseaddress_olesvr32 0x74350000) -set(baseaddress_olethk32 0x74320000) -set(baseaddress_openglcfg 0x742f0000) -set(baseaddress_pdh 0x742b0000) -set(baseaddress_pidgen 0x74280000) -set(baseaddress_pifmgr 0x74210000) -set(baseaddress_powercfg 0x741b0000) -set(baseaddress_printui 0x74180000) -set(baseaddress_propsys 0x74140000) -set(baseaddress_pstorec 0x74110000) -set(baseaddress_qedit 0x740c0000) -set(baseaddress_qmgr 0x74080000) -set(baseaddress_qmgrprxy 0x74020000) -set(baseaddress_quartz 0x73ea0000) -set(baseaddress_query 0x73e70000) -set(baseaddress_rasadhlp 0x73e40000) -set(baseaddress_rasdlg 0x73c70000) -set(baseaddress_rasman 0x73c40000) -set(baseaddress_redirtest1 0x73c10000) -set(baseaddress_redirtest2 0x73be0000) -set(baseaddress_resutils 0x73bb0000) -set(baseaddress_riched32 0x73b80000) -set(baseaddress_rsabase 0x73b60000) -set(baseaddress_rshell 0x73ab0000) -set(baseaddress_samsrv 0x73a40000) -set(baseaddress_sccbase 0x73a10000) -set(baseaddress_schannel 0x739d0000) -set(baseaddress_schedsvc 0x739a0000) -set(baseaddress_scrrun 0x73940000) -set(baseaddress_security 0x73920000) -set(baseaddress_serialui 0x738f0000) -set(baseaddress_sfc 0x738c0000) -set(baseaddress_shdoclc 0x73880000) -set(baseaddress_shdocvw 0x73830000) -set(baseaddress_shellbtrfs 0x736d0000) -set(baseaddress_shfolder 0x736b0000) -set(baseaddress_shimgvw 0x73660000) -set(baseaddress_shsvcs 0x73630000) -set(baseaddress_slbcsp 0x73600000) -set(baseaddress_sndblst 0x735d0000) -set(baseaddress_softpub 0x735b0000) -set(baseaddress_srclient 0x73580000) -set(baseaddress_srvsvc 0x73550000) -set(baseaddress_sti 0x73510000) -set(baseaddress_stobject 0x73480000) -set(baseaddress_streamci 0x73450000) -set(baseaddress_sxs 0x73420000) -set(baseaddress_sysdm 0x73340000) -set(baseaddress_syssetup 0x73250000) -set(baseaddress_t2embed 0x73220000) -set(baseaddress_tapi32 0x731e0000) -set(baseaddress_tapiui 0x73160000) -set(baseaddress_telephon 0x73130000) -set(baseaddress_testvdd 0x73100000) -set(baseaddress_themeui 0x730e0000) -set(baseaddress_timedate 0x73060000) -set(baseaddress_traffic 0x73030000) -set(baseaddress_twain_32 0x73000000) -set(baseaddress_ubtrfs 0x72fd0000) -set(baseaddress_ucdfs 0x72fb0000) -set(baseaddress_uext2 0x72f70000) -set(baseaddress_ufat 0x72f30000) -set(baseaddress_ufatx 0x72f10000) -set(baseaddress_uffs 0x72ef0000) -set(baseaddress_umpnpmgr 0x72ec0000) -set(baseaddress_untfs 0x72ea0000) -set(baseaddress_updspapi 0x72e70000) -set(baseaddress_ureiserfs 0x72e50000) -set(baseaddress_url 0x72e20000) -set(baseaddress_usrmgr 0x72dd0000) -set(baseaddress_vbscript 0x72d20000) -set(baseaddress_vdmdbg 0x72cf0000) -set(baseaddress_verifier 0x72cd0000) -set(baseaddress_vfd 0x72c60000) -set(baseaddress_vssapi 0x72c30000) -set(baseaddress_wbemdisp 0x72be0000) -set(baseaddress_wbemprox 0x72b80000) -set(baseaddress_wdmaud.drv 0x729c0000) -set(baseaddress_win32u 0x72990000) -set(baseaddress_win32u_2k3sp2 0x72960000) -set(baseaddress_win32u_xpsp2 0x72930000) -set(baseaddress_windowscodecs 0x727f0000) -set(baseaddress_windowscodecsext 0x727c0000) -set(baseaddress_wined3dcfg 0x72790000) -set(baseaddress_winemp3.acm 0x72710000) -set(baseaddress_winfax 0x726e0000) -set(baseaddress_wing32 0x726b0000) -set(baseaddress_winhttp 0x72640000) -set(baseaddress_winprint 0x72610000) -set(baseaddress_winscard 0x725e0000) -set(baseaddress_winsta 0x725b0000) -set(baseaddress_wkssvc 0x72580000) -set(baseaddress_wlanapi 0x72550000) -set(baseaddress_wldap32 0x72510000) -set(baseaddress_wlnotify 0x724e0000) -set(baseaddress_wmi 0x724c0000) -set(baseaddress_wmisvc 0x72490000) -set(baseaddress_wmiutils 0x72450000) -set(baseaddress_wmvcore 0x72400000) -set(baseaddress_wshirda 0x723d0000) -set(baseaddress_wshom 0x72380000) -set(baseaddress_wshtcpip 0x72350000) -set(baseaddress_wsock32 0x72320000) -set(baseaddress_wtsapi32 0x722f0000) -set(baseaddress_wuapi 0x722b0000) -set(baseaddress_wuauserv 0x72280000) -set(baseaddress_xinput1_1 0x72250000) -set(baseaddress_xinput1_2 0x72220000) -set(baseaddress_xinput1_3 0x721f0000) -set(baseaddress_xinput9_1_0 0x721c0000) -set(baseaddress_xmllite 0x72180000) -set(baseaddress_zipfldr 0x720e0000) +set(baseaddress_dhcpcsvc 0x7c360000) +set(baseaddress_dnsapi 0x7c310000) +set(baseaddress_icmp 0x7c2e0000) +set(baseaddress_iphlpapi 0x7c290000) +set(baseaddress_ws2_32 0x7c240000) +set(baseaddress_ws2help 0x7c210000) +set(baseaddress_shlwapi 0x7c160000) +set(baseaddress_rpcrt4 0x7c090000) +set(baseaddress_comctl32 0x7beb0000) +set(baseaddress_ole32 0x7bcd0000) +set(baseaddress_winspool 0x7bc80000) +set(baseaddress_winmm 0x7bbc0000) +set(baseaddress_comdlg32 0x7bab0000) +set(baseaddress_shell32 0x7b1e0000) +set(baseaddress_lz32 0x7b1c0000) +set(baseaddress_version 0x7b190000) +set(baseaddress_oleaut32 0x7afb0000) +set(baseaddress_setupapi 0x7ae30000) +set(baseaddress_mpr 0x7adf0000) +set(baseaddress_crypt32 0x7ace0000) +set(baseaddress_wininet 0x7ac20000) +set(baseaddress_urlmon 0x7ab20000) +set(baseaddress_psapi 0x7aaf0000) +set(baseaddress_imm32 0x7aab0000) +set(baseaddress_msvfw32 0x7aa60000) +set(baseaddress_dbghelp 0x7a9b0000) +set(baseaddress_devmgr 0x7a8d0000) +set(baseaddress_msacm32 0x7a890000) +set(baseaddress_netapi32 0x7a800000) +set(baseaddress_powrprof 0x7a7d0000) +set(baseaddress_secur32 0x7a780000) +set(baseaddress_wintrust 0x7a720000) +set(baseaddress_avicap32 0x7a6f0000) +set(baseaddress_cabinet 0x7a6a0000) +set(baseaddress_dsound 0x7a620000) +set(baseaddress_glu32 0x7a520000) +set(baseaddress_opengl32 0x7a310000) +set(baseaddress_riched20 0x7a240000) +set(baseaddress_smdll 0x7a220000) +set(baseaddress_userenv 0x7a1d0000) +set(baseaddress_uxtheme 0x7a170000) +set(baseaddress_cryptui 0x7a0c0000) +set(baseaddress_csrsrv 0x7a090000) +set(baseaddress_basesrv 0x7a060000) +set(baseaddress_winsrv 0x79fb0000) +set(baseaddress_dplayx 0x79f40000) +set(baseaddress_gdiplus 0x79e60000) +set(baseaddress_msimg32 0x79e30000) +set(baseaddress_mswsock 0x79e00000) +set(baseaddress_oledlg 0x79db0000) +set(baseaddress_rasapi32 0x79d80000) +set(baseaddress_rsaenh 0x79d10000) +set(baseaddress_samlib 0x79cd0000) +set(baseaddress_sensapi 0x79ca0000) +set(baseaddress_sfc_os 0x79c70000) +set(baseaddress_snmpapi 0x79c40000) +set(baseaddress_spoolss 0x79c00000) +set(baseaddress_usp10 0x79b80000) +set(baseaddress_access 0x79b00000) +set(baseaddress_acgenral 0x79ad0000) +set(baseaddress_aclayers 0x79aa0000) +set(baseaddress_acledit 0x79a70000) +set(baseaddress_aclui 0x79a30000) +set(baseaddress_acppage 0x799c0000) +set(baseaddress_activeds 0x79990000) +set(baseaddress_actxprxy 0x79780000) +set(baseaddress_advapi32_vista 0x79760000) +set(baseaddress_advpack 0x79720000) +set(baseaddress_amstream 0x796c0000) +set(baseaddress_apphelp 0x79680000) +set(baseaddress_appwiz 0x79600000) +set(baseaddress_atl 0x795c0000) +set(baseaddress_atl100 0x79580000) +set(baseaddress_atl80 0x79540000) +set(baseaddress_authz 0x79510000) +set(baseaddress_avifil32 0x79490000) +set(baseaddress_batt 0x79460000) +set(baseaddress_bcrypt 0x79430000) +set(baseaddress_beepmidi 0x79400000) +set(baseaddress_browseui 0x79270000) +set(baseaddress_bthci 0x79240000) +set(baseaddress_cards 0x79180000) +set(baseaddress_cfgmgr32 0x79150000) +set(baseaddress_clusapi 0x79120000) +set(baseaddress_cmicpl 0x790e0000) +set(baseaddress_comcat 0x790b0000) +set(baseaddress_compstui 0x79080000) +set(baseaddress_console 0x79020000) +set(baseaddress_credui 0x78fe0000) +set(baseaddress_crtdll 0x78f70000) +set(baseaddress_cryptdlg 0x78f40000) +set(baseaddress_cryptdll 0x78f10000) +set(baseaddress_cryptnet 0x78ee0000) +set(baseaddress_custom 0x78eb0000) +set(baseaddress_d3d8 0x78e50000) +set(baseaddress_d3d8thk 0x78e30000) +set(baseaddress_d3d9 0x78dc0000) +set(baseaddress_d3dcompiler_43 0x78d10000) +set(baseaddress_d3drm 0x78c70000) +set(baseaddress_d3dwine 0x78a60000) +set(baseaddress_d3dx9_24 0x78a30000) +set(baseaddress_d3dx9_25 0x789f0000) +set(baseaddress_d3dx9_26 0x789c0000) +set(baseaddress_d3dx9_27 0x78990000) +set(baseaddress_d3dx9_28 0x78960000) +set(baseaddress_d3dx9_29 0x78930000) +set(baseaddress_d3dx9_30 0x78900000) +set(baseaddress_d3dx9_31 0x788d0000) +set(baseaddress_d3dx9_32 0x788a0000) +set(baseaddress_d3dx9_33 0x78870000) +set(baseaddress_d3dx9_34 0x78840000) +set(baseaddress_d3dx9_35 0x78810000) +set(baseaddress_d3dx9_36 0x78710000) +set(baseaddress_d3dx9_37 0x786e0000) +set(baseaddress_d3dx9_38 0x786b0000) +set(baseaddress_d3dx9_39 0x78680000) +set(baseaddress_d3dx9_40 0x78650000) +set(baseaddress_d3dx9_41 0x78620000) +set(baseaddress_d3dx9_42 0x785f0000) +set(baseaddress_d3dx9_43 0x785c0000) +set(baseaddress_d3dxof 0x78580000) +set(baseaddress_dciman32 0x78550000) +set(baseaddress_ddraw 0x78490000) +set(baseaddress_desk 0x783f0000) +set(baseaddress_deskadp 0x783c0000) +set(baseaddress_deskmon 0x78390000) +set(baseaddress_devcpux 0x78360000) +set(baseaddress_devenum 0x78310000) +set(baseaddress_dinput 0x782b0000) +set(baseaddress_dinput8 0x78280000) +set(baseaddress_dmusic 0x78230000) +set(baseaddress_dplay 0x78200000) +set(baseaddress_dxdiagn 0x781b0000) +set(baseaddress_dxtn 0x78190000) +set(baseaddress_esent 0x78160000) +set(baseaddress_faultrep 0x78130000) +set(baseaddress_fltlib 0x78100000) +set(baseaddress_fmifs 0x780e0000) +set(baseaddress_fontext 0x780b0000) +set(baseaddress_fontsub 0x78080000) +set(baseaddress_framebuf 0x78060000) +set(baseaddress_framebuf_new 0x78040000) +set(baseaddress_framedyn 0x78000000) +set(baseaddress_genincdata 0x77fd0000) +set(baseaddress_getuname 0x76dd0000) +set(baseaddress_hdwwiz 0x76d50000) +set(baseaddress_hhctrl 0x76cf0000) +set(baseaddress_hid 0x76cc0000) +set(baseaddress_hlink 0x76c80000) +set(baseaddress_hnetcfg 0x76c40000) +set(baseaddress_httpapi 0x76c10000) +set(baseaddress_iccvid 0x76be0000) +set(baseaddress_ieframe 0x76ae0000) +set(baseaddress_iernonce 0x76ab0000) +set(baseaddress_imaadp32.acm 0x76a80000) +set(baseaddress_imagehlp 0x76a50000) +set(baseaddress_inetcomm 0x769e0000) +set(baseaddress_inetcpl 0x76980000) +set(baseaddress_inetmib1 0x76950000) +set(baseaddress_initpki 0x76920000) +set(baseaddress_input 0x768c0000) +set(baseaddress_inseng 0x76880000) +set(baseaddress_intl 0x76810000) +set(baseaddress_iologmsg 0x767f0000) +set(baseaddress_itircl 0x767c0000) +set(baseaddress_itss 0x76780000) +set(baseaddress_joy 0x76740000) +set(baseaddress_jscript 0x76630000) +set(baseaddress_jsproxy 0x76600000) +set(baseaddress_kbdeo 0x765e0000) +set(baseaddress_kbsdll 0x765b0000) +set(baseaddress_kernel32_vista 0x76590000) +set(baseaddress_ksuser 0x76560000) +set(baseaddress_libjpeg 0x764d0000) +set(baseaddress_libpng 0x76440000) +set(baseaddress_libtiff 0x76370000) +set(baseaddress_libtirpc 0x76310000) +set(baseaddress_libxslt 0x76040000) +set(baseaddress_load_notifications 0x76020000) +set(baseaddress_loadperf 0x75ff0000) +set(baseaddress_localmon 0x75fc0000) +set(baseaddress_localspl 0x75f80000) +set(baseaddress_localspl_apitest 0x75f50000) +set(baseaddress_localui 0x75f20000) +set(baseaddress_lpk 0x75ee0000) +set(baseaddress_lsasrv 0x75e70000) +set(baseaddress_main 0x75dd0000) +set(baseaddress_mapi32 0x75d90000) +set(baseaddress_mbedtls 0x75d00000) +set(baseaddress_mciavi32 0x75cc0000) +set(baseaddress_mcicda 0x75c90000) +set(baseaddress_mciqtz32 0x75c50000) +set(baseaddress_mciseq 0x75c20000) +set(baseaddress_mciwave 0x75bf0000) +set(baseaddress_mgmtapi 0x75bc0000) +set(baseaddress_midimap 0x75b90000) +set(baseaddress_mlang 0x75b50000) +set(baseaddress_mmdrv 0x75b20000) +set(baseaddress_mmsys 0x75a50000) +set(baseaddress_modemui 0x759e0000) +set(baseaddress_mprapi 0x759b0000) +set(baseaddress_msacm32.drv 0x75980000) +set(baseaddress_msadp32.acm 0x75950000) +set(baseaddress_msafd 0x75910000) +set(baseaddress_mscat32 0x758e0000) +set(baseaddress_mscms 0x758b0000) +set(baseaddress_mscoree 0x75860000) +set(baseaddress_msctf 0x75800000) +set(baseaddress_msdmo 0x757d0000) +set(baseaddress_msftedit 0x757a0000) +set(baseaddress_msg711.acm 0x75770000) +set(baseaddress_msgina 0x756d0000) +set(baseaddress_msgsm32.acm 0x756a0000) +set(baseaddress_mshtml 0x75380000) +set(baseaddress_msi 0x751d0000) +set(baseaddress_msimtf 0x751a0000) +set(baseaddress_msisip 0x75170000) +set(baseaddress_msisys 0x75140000) +set(baseaddress_mspatcha 0x75110000) +set(baseaddress_msports 0x750d0000) +set(baseaddress_msrle32 0x750a0000) +set(baseaddress_mssign32 0x75070000) +set(baseaddress_mssip32 0x75040000) +set(baseaddress_mstask 0x75000000) +set(baseaddress_msv1_0 0x74fd0000) +set(baseaddress_msvcrt20 0x74f00000) +set(baseaddress_msvcrt40 0x74e30000) +set(baseaddress_msvcrt_crt_dll_startup 0x74e00000) +set(baseaddress_msvidc32 0x74dd0000) +set(baseaddress_msxml 0x74da0000) +set(baseaddress_msxml2 0x74d70000) +set(baseaddress_msxml3 0x74990000) +set(baseaddress_msxml4 0x74950000) +set(baseaddress_msxml6 0x74910000) +set(baseaddress_mycomput 0x748f0000) +set(baseaddress_ncpa 0x748c0000) +set(baseaddress_nddeapi 0x74890000) +set(baseaddress_netcfgx 0x747f0000) +set(baseaddress_netevent 0x747c0000) +set(baseaddress_netid 0x74770000) +set(baseaddress_netshell 0x746c0000) +set(baseaddress_newdev 0x74660000) +set(baseaddress_nfs41_np 0x74630000) +set(baseaddress_normaliz 0x74600000) +set(baseaddress_notifyhook 0x745d0000) +set(baseaddress_npptools 0x745a0000) +set(baseaddress_ntdll_vista 0x74580000) +set(baseaddress_ntdsapi 0x74550000) +set(baseaddress_ntlanman 0x74520000) +set(baseaddress_ntmarta 0x744f0000) +set(baseaddress_ntobjshex 0x74450000) +set(baseaddress_objsel 0x74420000) +set(baseaddress_odbc32 0x743e0000) +set(baseaddress_odbccp32 0x743b0000) +set(baseaddress_odbccp32i 0x74380000) +set(baseaddress_oleacc 0x742f0000) +set(baseaddress_olecli32 0x742c0000) +set(baseaddress_olepro32 0x74290000) +set(baseaddress_olesvr32 0x74260000) +set(baseaddress_olethk32 0x74230000) +set(baseaddress_openglcfg 0x74200000) +set(baseaddress_pdh 0x741c0000) +set(baseaddress_pidgen 0x74190000) +set(baseaddress_pifmgr 0x74120000) +set(baseaddress_powercfg 0x740c0000) +set(baseaddress_printui 0x74090000) +set(baseaddress_propsys 0x74050000) +set(baseaddress_pstorec 0x74020000) +set(baseaddress_qedit 0x73fd0000) +set(baseaddress_qmgr 0x73f90000) +set(baseaddress_qmgrprxy 0x73f30000) +set(baseaddress_quartz 0x73db0000) +set(baseaddress_query 0x73d80000) +set(baseaddress_rasadhlp 0x73d50000) +set(baseaddress_rasdlg 0x73b80000) +set(baseaddress_rasman 0x73b50000) +set(baseaddress_redirtest1 0x73b20000) +set(baseaddress_redirtest2 0x73af0000) +set(baseaddress_resutils 0x73ac0000) +set(baseaddress_riched32 0x73a90000) +set(baseaddress_rsabase 0x73a70000) +set(baseaddress_rshell 0x739c0000) +set(baseaddress_samsrv 0x73950000) +set(baseaddress_sccbase 0x73920000) +set(baseaddress_schannel 0x738e0000) +set(baseaddress_schedsvc 0x738b0000) +set(baseaddress_scrrun 0x73850000) +set(baseaddress_security 0x73830000) +set(baseaddress_serialui 0x73800000) +set(baseaddress_sfc 0x737d0000) +set(baseaddress_shdoclc 0x73790000) +set(baseaddress_shdocvw 0x73740000) +set(baseaddress_shellbtrfs 0x735e0000) +set(baseaddress_shfolder 0x735c0000) +set(baseaddress_shimgvw 0x73570000) +set(baseaddress_shsvcs 0x73540000) +set(baseaddress_slbcsp 0x73510000) +set(baseaddress_sndblst 0x734e0000) +set(baseaddress_softpub 0x734c0000) +set(baseaddress_srclient 0x73490000) +set(baseaddress_srvsvc 0x73460000) +set(baseaddress_sti 0x73420000) +set(baseaddress_stobject 0x73390000) +set(baseaddress_streamci 0x73360000) +set(baseaddress_sxs 0x73330000) +set(baseaddress_sysdm 0x73240000) +set(baseaddress_syssetup 0x73140000) +set(baseaddress_t2embed 0x73110000) +set(baseaddress_tapi32 0x730d0000) +set(baseaddress_tapiui 0x73050000) +set(baseaddress_telephon 0x73020000) +set(baseaddress_testvdd 0x72ff0000) +set(baseaddress_themeui 0x72fd0000) +set(baseaddress_timedate 0x72f50000) +set(baseaddress_traffic 0x72f20000) +set(baseaddress_twain_32 0x72ef0000) +set(baseaddress_ubtrfs 0x72ec0000) +set(baseaddress_ucdfs 0x72ea0000) +set(baseaddress_uext2 0x72e60000) +set(baseaddress_ufat 0x72e20000) +set(baseaddress_ufatx 0x72e00000) +set(baseaddress_uffs 0x72de0000) +set(baseaddress_umpnpmgr 0x72db0000) +set(baseaddress_untfs 0x72d90000) +set(baseaddress_updspapi 0x72d60000) +set(baseaddress_ureiserfs 0x72d40000) +set(baseaddress_url 0x72d10000) +set(baseaddress_usrmgr 0x72cc0000) +set(baseaddress_vbscript 0x72c10000) +set(baseaddress_vdmdbg 0x72be0000) +set(baseaddress_verifier 0x72bc0000) +set(baseaddress_vfd 0x72b60000) +set(baseaddress_vssapi 0x72b30000) +set(baseaddress_wbemdisp 0x72ae0000) +set(baseaddress_wbemprox 0x72a80000) +set(baseaddress_wdmaud.drv 0x728c0000) +set(baseaddress_win32u 0x72890000) +set(baseaddress_win32u_2k3sp2 0x72860000) +set(baseaddress_win32u_xpsp2 0x72830000) +set(baseaddress_windowscodecs 0x726f0000) +set(baseaddress_windowscodecsext 0x726c0000) +set(baseaddress_wined3dcfg 0x72690000) +set(baseaddress_winemp3.acm 0x72600000) +set(baseaddress_winfax 0x725d0000) +set(baseaddress_wing32 0x725a0000) +set(baseaddress_winhttp 0x72530000) +set(baseaddress_winprint 0x72500000) +set(baseaddress_winscard 0x724d0000) +set(baseaddress_winsta 0x724a0000) +set(baseaddress_wkssvc 0x72470000) +set(baseaddress_wlanapi 0x72440000) +set(baseaddress_wldap32 0x72400000) +set(baseaddress_wlnotify 0x723d0000) +set(baseaddress_wmi 0x723b0000) +set(baseaddress_wmisvc 0x72380000) +set(baseaddress_wmiutils 0x72340000) +set(baseaddress_wmvcore 0x722f0000) +set(baseaddress_wshirda 0x722c0000) +set(baseaddress_wshom 0x72270000) +set(baseaddress_wshtcpip 0x72240000) +set(baseaddress_wsock32 0x72210000) +set(baseaddress_wtsapi32 0x721e0000) +set(baseaddress_wuapi 0x721a0000) +set(baseaddress_wuauserv 0x72170000) +set(baseaddress_xinput1_1 0x72140000) +set(baseaddress_xinput1_2 0x72110000) +set(baseaddress_xinput1_3 0x720e0000) +set(baseaddress_xinput9_1_0 0x720b0000) +set(baseaddress_xmllite 0x72070000) +set(baseaddress_zipfldr 0x71fd0000) diff --git a/sdk/cmake/baseaddress_dwarf.cmake b/sdk/cmake/baseaddress_dwarf.cmake index 903f9a639d..25b86ab5fc 100644 --- a/sdk/cmake/baseaddress_dwarf.cmake +++ b/sdk/cmake/baseaddress_dwarf.cmake @@ -1,109 +1,110 @@ -# Generated from f:\reactos\build\mingw-x86-ninja-dwarf-apps-tests +# Generated from R:\build\master\gcc_dwarf # Generated by sdk/tools/gen_baseaddress.py set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c5e0000) -set(baseaddress_msvcrt 0x7c4c0000) -set(baseaddress_advapi32 0x7c3c0000) -set(baseaddress_gdi32 0x7c2e0000) +set(baseaddress_kernel32 0x7c570000) +set(baseaddress_msvcrt 0x7c450000) +set(baseaddress_advapi32 0x7c350000) +set(baseaddress_gdi32 0x7c270000) set(baseaddress_user32 0x77a20000) # reserved -set(baseaddress_dhcpcsvc 0x7c280000) -set(baseaddress_dnsapi 0x7c210000) -set(baseaddress_icmp 0x7c1e0000) -set(baseaddress_iphlpapi 0x7c180000) -set(baseaddress_ws2_32 0x7c110000) -set(baseaddress_ws2help 0x7c0e0000) -set(baseaddress_shlwapi 0x7c000000) -set(baseaddress_rpcrt4 0x7bef0000) -set(baseaddress_comctl32 0x7bcb0000) -set(baseaddress_ole32 0x7b9e0000) -set(baseaddress_winspool 0x7b970000) -set(baseaddress_winmm 0x7b8a0000) -set(baseaddress_comdlg32 0x7b780000) -set(baseaddress_shell32 0x7ad30000) -set(baseaddress_lz32 0x7ad10000) -set(baseaddress_version 0x7acd0000) -set(baseaddress_oleaut32 0x7aa60000) -set(baseaddress_setupapi 0x7a8b0000) -set(baseaddress_mpr 0x7a860000) -set(baseaddress_crypt32 0x7a6f0000) -set(baseaddress_wininet 0x7a5f0000) -set(baseaddress_urlmon 0x7a480000) -set(baseaddress_psapi 0x7a440000) -set(baseaddress_imm32 0x7a3f0000) -set(baseaddress_msvfw32 0x7a3a0000) -set(baseaddress_dbghelp 0x7a2a0000) -set(baseaddress_devmgr 0x7a1a0000) -set(baseaddress_msacm32 0x7a150000) -set(baseaddress_netapi32 0x7a0a0000) -set(baseaddress_powrprof 0x7a060000) -set(baseaddress_secur32 0x79ff0000) -set(baseaddress_wintrust 0x79f80000) -set(baseaddress_avicap32 0x79f50000) -set(baseaddress_cabinet 0x79ef0000) -set(baseaddress_dsound 0x79e50000) -set(baseaddress_glu32 0x79cf0000) -set(baseaddress_opengl32 0x799e0000) -set(baseaddress_riched20 0x798f0000) -set(baseaddress_smdll 0x798d0000) -set(baseaddress_userenv 0x79870000) -set(baseaddress_uxtheme 0x797f0000) -set(baseaddress_cryptui 0x79730000) -set(baseaddress_csrsrv 0x796f0000) -set(baseaddress_basesrv 0x796b0000) -set(baseaddress_winsrv 0x795e0000) -set(baseaddress_dplayx 0x79550000) -set(baseaddress_gdiplus 0x79420000) -set(baseaddress_msimg32 0x793f0000) -set(baseaddress_mswsock 0x793b0000) -set(baseaddress_oledlg 0x79350000) -set(baseaddress_rasapi32 0x79310000) -set(baseaddress_rsaenh 0x79290000) -set(baseaddress_samlib 0x79240000) -set(baseaddress_sensapi 0x79210000) -set(baseaddress_sfc_os 0x791e0000) -set(baseaddress_snmpapi 0x791a0000) -set(baseaddress_spoolss 0x79150000) -set(baseaddress_usp10 0x790b0000) -set(baseaddress_access 0x79020000) -set(baseaddress_acgenral 0x78ff0000) -set(baseaddress_aclayers 0x78fb0000) -set(baseaddress_acledit 0x78f80000) -set(baseaddress_aclui 0x78f30000) -set(baseaddress_acppage 0x78ea0000) -set(baseaddress_activeds 0x78e70000) -set(baseaddress_actxprxy 0x78b80000) -set(baseaddress_advapi32_vista 0x78b50000) -set(baseaddress_advpack 0x78b00000) -set(baseaddress_amstream 0x78a90000) -set(baseaddress_apphelp 0x78a30000) -set(baseaddress_appwiz 0x789a0000) -set(baseaddress_atl 0x78940000) -set(baseaddress_atl100 0x788f0000) -set(baseaddress_atl80 0x78890000) -set(baseaddress_authz 0x78860000) -set(baseaddress_avifil32 0x787d0000) -set(baseaddress_batt 0x787a0000) -set(baseaddress_bcrypt 0x78760000) -set(baseaddress_beepmidi 0x78730000) -set(baseaddress_browseui 0x784f0000) -set(baseaddress_cards 0x78420000) -set(baseaddress_cfgmgr32 0x783f0000) -set(baseaddress_clusapi 0x783b0000) -set(baseaddress_cmicpl 0x78370000) -set(baseaddress_comcat 0x78340000) -set(baseaddress_compstui 0x78310000) -set(baseaddress_console 0x782b0000) -set(baseaddress_credui 0x78260000) -set(baseaddress_crtdll 0x781e0000) -set(baseaddress_cryptdlg 0x781a0000) -set(baseaddress_cryptdll 0x78170000) -set(baseaddress_cryptnet 0x78130000) -set(baseaddress_custom 0x78100000) -set(baseaddress_d3d8 0x78080000) -set(baseaddress_d3d8thk 0x78060000) -set(baseaddress_d3d9 0x77fc0000) -set(baseaddress_d3dcompiler_43 0x77ee0000) -set(baseaddress_d3drm 0x77e10000) +set(baseaddress_dhcpcsvc 0x7c210000) +set(baseaddress_dnsapi 0x7c1a0000) +set(baseaddress_icmp 0x7c170000) +set(baseaddress_iphlpapi 0x7c110000) +set(baseaddress_ws2_32 0x7c0a0000) +set(baseaddress_ws2help 0x7c070000) +set(baseaddress_shlwapi 0x7bf90000) +set(baseaddress_rpcrt4 0x7be80000) +set(baseaddress_comctl32 0x7bc40000) +set(baseaddress_ole32 0x7b970000) +set(baseaddress_winspool 0x7b900000) +set(baseaddress_winmm 0x7b830000) +set(baseaddress_comdlg32 0x7b710000) +set(baseaddress_shell32 0x7acc0000) +set(baseaddress_lz32 0x7aca0000) +set(baseaddress_version 0x7ac60000) +set(baseaddress_oleaut32 0x7a9f0000) +set(baseaddress_setupapi 0x7a840000) +set(baseaddress_mpr 0x7a7f0000) +set(baseaddress_crypt32 0x7a680000) +set(baseaddress_wininet 0x7a580000) +set(baseaddress_urlmon 0x7a410000) +set(baseaddress_psapi 0x7a3d0000) +set(baseaddress_imm32 0x7a380000) +set(baseaddress_msvfw32 0x7a330000) +set(baseaddress_dbghelp 0x7a230000) +set(baseaddress_devmgr 0x7a120000) +set(baseaddress_msacm32 0x7a0d0000) +set(baseaddress_netapi32 0x7a010000) +set(baseaddress_powrprof 0x79fd0000) +set(baseaddress_secur32 0x79f60000) +set(baseaddress_wintrust 0x79ef0000) +set(baseaddress_avicap32 0x79ec0000) +set(baseaddress_cabinet 0x79e60000) +set(baseaddress_dsound 0x79dc0000) +set(baseaddress_glu32 0x79c60000) +set(baseaddress_opengl32 0x79950000) +set(baseaddress_riched20 0x79860000) +set(baseaddress_smdll 0x79840000) +set(baseaddress_userenv 0x797e0000) +set(baseaddress_uxtheme 0x79760000) +set(baseaddress_cryptui 0x796a0000) +set(baseaddress_csrsrv 0x79660000) +set(baseaddress_basesrv 0x79620000) +set(baseaddress_winsrv 0x79550000) +set(baseaddress_dplayx 0x794c0000) +set(baseaddress_gdiplus 0x79390000) +set(baseaddress_msimg32 0x79360000) +set(baseaddress_mswsock 0x79320000) +set(baseaddress_oledlg 0x792c0000) +set(baseaddress_rasapi32 0x79280000) +set(baseaddress_rsaenh 0x79200000) +set(baseaddress_samlib 0x791b0000) +set(baseaddress_sensapi 0x79180000) +set(baseaddress_sfc_os 0x79150000) +set(baseaddress_snmpapi 0x79110000) +set(baseaddress_spoolss 0x790c0000) +set(baseaddress_usp10 0x79020000) +set(baseaddress_access 0x78f90000) +set(baseaddress_acgenral 0x78f60000) +set(baseaddress_aclayers 0x78f20000) +set(baseaddress_acledit 0x78ef0000) +set(baseaddress_aclui 0x78ea0000) +set(baseaddress_acppage 0x78e10000) +set(baseaddress_activeds 0x78de0000) +set(baseaddress_actxprxy 0x78af0000) +set(baseaddress_advapi32_vista 0x78ac0000) +set(baseaddress_advpack 0x78a70000) +set(baseaddress_amstream 0x78a00000) +set(baseaddress_apphelp 0x789a0000) +set(baseaddress_appwiz 0x78910000) +set(baseaddress_atl 0x788b0000) +set(baseaddress_atl100 0x78860000) +set(baseaddress_atl80 0x78800000) +set(baseaddress_authz 0x787d0000) +set(baseaddress_avifil32 0x78740000) +set(baseaddress_batt 0x78710000) +set(baseaddress_bcrypt 0x786d0000) +set(baseaddress_beepmidi 0x786a0000) +set(baseaddress_browseui 0x78460000) +set(baseaddress_bthci 0x78430000) +set(baseaddress_cards 0x78360000) +set(baseaddress_cfgmgr32 0x78330000) +set(baseaddress_clusapi 0x782f0000) +set(baseaddress_cmicpl 0x782b0000) +set(baseaddress_comcat 0x78280000) +set(baseaddress_compstui 0x78250000) +set(baseaddress_console 0x781f0000) +set(baseaddress_credui 0x781a0000) +set(baseaddress_crtdll 0x78120000) +set(baseaddress_cryptdlg 0x780e0000) +set(baseaddress_cryptdll 0x780b0000) +set(baseaddress_cryptnet 0x78070000) +set(baseaddress_custom 0x78040000) +set(baseaddress_d3d8 0x77fc0000) +set(baseaddress_d3d8thk 0x77fa0000) +set(baseaddress_d3d9 0x77f00000) +set(baseaddress_d3dcompiler_43 0x77e20000) +set(baseaddress_d3drm 0x77d40000) set(baseaddress_d3dwine 0x77740000) set(baseaddress_d3dx9_24 0x77710000) set(baseaddress_d3dx9_25 0x776c0000) @@ -128,40 +129,40 @@ set(baseaddress_d3dx9_43 0x77220000) set(baseaddress_d3dxof 0x771d0000) set(baseaddress_dciman32 0x771a0000) set(baseaddress_ddraw 0x770a0000) -set(baseaddress_desk 0x76fe0000) -set(baseaddress_deskadp 0x76fa0000) -set(baseaddress_deskmon 0x76f60000) -set(baseaddress_devcpux 0x76f30000) -set(baseaddress_devenum 0x76ed0000) -set(baseaddress_dinput 0x76e50000) -set(baseaddress_dinput8 0x76e10000) -set(baseaddress_dmusic 0x76da0000) -set(baseaddress_dplay 0x76d70000) -set(baseaddress_dxdiagn 0x76d10000) -set(baseaddress_dxtn 0x76ce0000) -set(baseaddress_esent 0x76ca0000) -set(baseaddress_faultrep 0x76c70000) -set(baseaddress_fltlib 0x76c40000) -set(baseaddress_fmifs 0x76c10000) -set(baseaddress_fontext 0x76be0000) -set(baseaddress_fontsub 0x76bb0000) -set(baseaddress_framebuf 0x76b80000) -set(baseaddress_framebuf_new 0x76b50000) -set(baseaddress_framedyn 0x76b00000) -set(baseaddress_genincdata 0x76ad0000) -set(baseaddress_getuname 0x761c0000) -set(baseaddress_hdwwiz 0x76140000) -set(baseaddress_hhctrl 0x760d0000) -set(baseaddress_hid 0x760a0000) -set(baseaddress_hlink 0x76050000) -set(baseaddress_hnetcfg 0x75ff0000) -set(baseaddress_httpapi 0x75fb0000) -set(baseaddress_iccvid 0x75f70000) -set(baseaddress_ieframe 0x75e30000) -set(baseaddress_iernonce 0x75df0000) -set(baseaddress_imaadp32.acm 0x75db0000) -set(baseaddress_imagehlp 0x75d70000) -set(baseaddress_inetcomm 0x75ce0000) +set(baseaddress_desk 0x76ff0000) +set(baseaddress_deskadp 0x76fb0000) +set(baseaddress_deskmon 0x76f70000) +set(baseaddress_devcpux 0x76f40000) +set(baseaddress_devenum 0x76ee0000) +set(baseaddress_dinput 0x76e60000) +set(baseaddress_dinput8 0x76e20000) +set(baseaddress_dmusic 0x76db0000) +set(baseaddress_dplay 0x76d80000) +set(baseaddress_dxdiagn 0x76d20000) +set(baseaddress_dxtn 0x76cf0000) +set(baseaddress_esent 0x76cb0000) +set(baseaddress_faultrep 0x76c80000) +set(baseaddress_fltlib 0x76c50000) +set(baseaddress_fmifs 0x76c20000) +set(baseaddress_fontext 0x76bf0000) +set(baseaddress_fontsub 0x76bc0000) +set(baseaddress_framebuf 0x76b90000) +set(baseaddress_framebuf_new 0x76b60000) +set(baseaddress_framedyn 0x76b10000) +set(baseaddress_genincdata 0x76ae0000) +set(baseaddress_getuname 0x761d0000) +set(baseaddress_hdwwiz 0x76150000) +set(baseaddress_hhctrl 0x760e0000) +set(baseaddress_hid 0x760b0000) +set(baseaddress_hlink 0x76060000) +set(baseaddress_hnetcfg 0x76000000) +set(baseaddress_httpapi 0x75fc0000) +set(baseaddress_iccvid 0x75f80000) +set(baseaddress_ieframe 0x75e40000) +set(baseaddress_iernonce 0x75e00000) +set(baseaddress_imaadp32.acm 0x75dc0000) +set(baseaddress_imagehlp 0x75d80000) +set(baseaddress_inetcomm 0x75cf0000) set(baseaddress_inetcpl 0x75c80000) set(baseaddress_inetmib1 0x75c40000) set(baseaddress_initpki 0x75c10000) @@ -180,26 +181,26 @@ set(baseaddress_kernel32_vista 0x75790000) set(baseaddress_ksuser 0x75760000) set(baseaddress_libjpeg 0x756a0000) set(baseaddress_libpng 0x755f0000) -set(baseaddress_libtiff 0x754f0000) -set(baseaddress_libtirpc 0x75470000) -set(baseaddress_libxslt 0x750f0000) -set(baseaddress_load_notifications 0x750c0000) -set(baseaddress_loadperf 0x75090000) -set(baseaddress_localmon 0x75050000) -set(baseaddress_localspl 0x74ff0000) -set(baseaddress_localspl_apitest 0x74fc0000) -set(baseaddress_localui 0x74f80000) -set(baseaddress_lpk 0x74f40000) -set(baseaddress_lsasrv 0x74eb0000) -set(baseaddress_main 0x74e10000) -set(baseaddress_mapi32 0x74db0000) -set(baseaddress_mbedtls 0x74ce0000) -set(baseaddress_mciavi32 0x74c90000) -set(baseaddress_mcicda 0x74c50000) -set(baseaddress_mciqtz32 0x74c00000) -set(baseaddress_mciseq 0x74bc0000) -set(baseaddress_mciwave 0x74b80000) -set(baseaddress_mgmtapi 0x74b50000) +set(baseaddress_libtiff 0x75500000) +set(baseaddress_libtirpc 0x75480000) +set(baseaddress_libxslt 0x75100000) +set(baseaddress_load_notifications 0x750d0000) +set(baseaddress_loadperf 0x750a0000) +set(baseaddress_localmon 0x75060000) +set(baseaddress_localspl 0x75000000) +set(baseaddress_localspl_apitest 0x74fd0000) +set(baseaddress_localui 0x74f90000) +set(baseaddress_lpk 0x74f50000) +set(baseaddress_lsasrv 0x74ec0000) +set(baseaddress_main 0x74e20000) +set(baseaddress_mapi32 0x74dc0000) +set(baseaddress_mbedtls 0x74cf0000) +set(baseaddress_mciavi32 0x74ca0000) +set(baseaddress_mcicda 0x74c60000) +set(baseaddress_mciqtz32 0x74c10000) +set(baseaddress_mciseq 0x74bd0000) +set(baseaddress_mciwave 0x74b90000) +set(baseaddress_mgmtapi 0x74b60000) set(baseaddress_midimap 0x74b20000) set(baseaddress_mlang 0x74ad0000) set(baseaddress_mmdrv 0x74aa0000) @@ -241,137 +242,137 @@ set(baseaddress_msxml4 0x73320000) set(baseaddress_msxml6 0x732d0000) set(baseaddress_mycomput 0x732b0000) set(baseaddress_ncpa 0x73280000) -set(baseaddress_nddeapi 0x73250000) -set(baseaddress_netcfgx 0x731b0000) -set(baseaddress_netevent 0x73180000) -set(baseaddress_netid 0x73130000) -set(baseaddress_netshell 0x73070000) -set(baseaddress_newdev 0x73000000) -set(baseaddress_nfs41_np 0x72fc0000) -set(baseaddress_normaliz 0x72f90000) -set(baseaddress_notifyhook 0x72f60000) -set(baseaddress_npptools 0x72f30000) -set(baseaddress_ntdll_vista 0x72f00000) -set(baseaddress_ntdsapi 0x72ec0000) -set(baseaddress_ntlanman 0x72e90000) -set(baseaddress_ntmarta 0x72e60000) -set(baseaddress_ntobjshex 0x72d80000) -set(baseaddress_objsel 0x72d40000) -set(baseaddress_odbc32 0x72cf0000) -set(baseaddress_odbccp32 0x72cb0000) -set(baseaddress_odbccp32i 0x72c80000) -set(baseaddress_oleacc 0x72bd0000) -set(baseaddress_olecli32 0x72b90000) -set(baseaddress_olepro32 0x72b60000) -set(baseaddress_olesvr32 0x72b30000) -set(baseaddress_olethk32 0x72b00000) -set(baseaddress_openglcfg 0x72ac0000) -set(baseaddress_pdh 0x72a80000) -set(baseaddress_pidgen 0x72a50000) -set(baseaddress_pifmgr 0x729e0000) -set(baseaddress_powercfg 0x72970000) -set(baseaddress_printui 0x72940000) -set(baseaddress_propsys 0x728f0000) -set(baseaddress_pstorec 0x728b0000) -set(baseaddress_qedit 0x72840000) -set(baseaddress_qmgr 0x727f0000) -set(baseaddress_qmgrprxy 0x72770000) -set(baseaddress_quartz 0x72550000) -set(baseaddress_query 0x72520000) -set(baseaddress_rasadhlp 0x724f0000) -set(baseaddress_rasdlg 0x72310000) -set(baseaddress_rasman 0x722d0000) -set(baseaddress_redirtest1 0x722a0000) -set(baseaddress_redirtest2 0x72270000) -set(baseaddress_resutils 0x72230000) -set(baseaddress_riched32 0x72200000) -set(baseaddress_rsabase 0x721e0000) -set(baseaddress_rshell 0x720f0000) -set(baseaddress_samsrv 0x72060000) -set(baseaddress_sccbase 0x72030000) -set(baseaddress_schannel 0x71fe0000) -set(baseaddress_schedsvc 0x71fa0000) -set(baseaddress_scrrun 0x71f30000) -set(baseaddress_security 0x71f10000) -set(baseaddress_serialui 0x71ee0000) -set(baseaddress_sfc 0x71eb0000) -set(baseaddress_shdoclc 0x71e70000) -set(baseaddress_shdocvw 0x71e10000) -set(baseaddress_shellbtrfs 0x71c80000) -set(baseaddress_shfolder 0x71c60000) -set(baseaddress_shimgvw 0x71c10000) -set(baseaddress_shsvcs 0x71be0000) -set(baseaddress_slbcsp 0x71bb0000) -set(baseaddress_sndblst 0x71b70000) -set(baseaddress_softpub 0x71b50000) -set(baseaddress_srclient 0x71b20000) -set(baseaddress_srvsvc 0x71ae0000) -set(baseaddress_sti 0x71a90000) -set(baseaddress_stobject 0x719e0000) -set(baseaddress_streamci 0x719b0000) -set(baseaddress_sxs 0x71970000) -set(baseaddress_sysdm 0x71880000) -set(baseaddress_syssetup 0x71780000) -set(baseaddress_t2embed 0x71750000) -set(baseaddress_tapi32 0x71700000) -set(baseaddress_tapiui 0x71680000) -set(baseaddress_telephon 0x71650000) -set(baseaddress_testvdd 0x71620000) -set(baseaddress_themeui 0x71600000) -set(baseaddress_timedate 0x71580000) -set(baseaddress_traffic 0x71550000) -set(baseaddress_twain_32 0x71510000) -set(baseaddress_ubtrfs 0x714e0000) -set(baseaddress_ucdfs 0x714c0000) -set(baseaddress_uext2 0x71480000) -set(baseaddress_ufat 0x71440000) -set(baseaddress_ufatx 0x71410000) -set(baseaddress_uffs 0x713f0000) -set(baseaddress_umpnpmgr 0x713b0000) -set(baseaddress_untfs 0x71390000) -set(baseaddress_updspapi 0x71360000) -set(baseaddress_ureiserfs 0x71340000) -set(baseaddress_url 0x71310000) -set(baseaddress_usrmgr 0x712b0000) -set(baseaddress_vbscript 0x711d0000) -set(baseaddress_vdmdbg 0x711a0000) -set(baseaddress_verifier 0x71170000) -set(baseaddress_vfd 0x71100000) -set(baseaddress_vssapi 0x710c0000) -set(baseaddress_wbemdisp 0x71060000) -set(baseaddress_wbemprox 0x70fd0000) -set(baseaddress_wdmaud.drv 0x70e00000) -set(baseaddress_win32u 0x70dd0000) -set(baseaddress_win32u_2k3sp2 0x70da0000) -set(baseaddress_win32u_xpsp2 0x70d70000) -set(baseaddress_windowscodecs 0x70ba0000) -set(baseaddress_windowscodecsext 0x70b60000) -set(baseaddress_wined3dcfg 0x70b20000) -set(baseaddress_winemp3.acm 0x70a80000) -set(baseaddress_winfax 0x70a50000) -set(baseaddress_wing32 0x70a20000) -set(baseaddress_winhttp 0x709a0000) -set(baseaddress_winprint 0x70970000) -set(baseaddress_winscard 0x70930000) -set(baseaddress_winsta 0x708f0000) -set(baseaddress_wkssvc 0x708b0000) -set(baseaddress_wlanapi 0x70870000) -set(baseaddress_wldap32 0x70810000) -set(baseaddress_wlnotify 0x707e0000) -set(baseaddress_wmi 0x707c0000) -set(baseaddress_wmisvc 0x70790000) -set(baseaddress_wmiutils 0x70740000) -set(baseaddress_wmvcore 0x706e0000) -set(baseaddress_wshirda 0x706b0000) -set(baseaddress_wshom 0x70650000) -set(baseaddress_wshtcpip 0x70620000) -set(baseaddress_wsock32 0x705f0000) -set(baseaddress_wtsapi32 0x705b0000) -set(baseaddress_wuapi 0x70560000) -set(baseaddress_wuauserv 0x70530000) -set(baseaddress_xinput1_1 0x70500000) -set(baseaddress_xinput1_2 0x704d0000) -set(baseaddress_xinput1_3 0x704a0000) -set(baseaddress_xinput9_1_0 0x70470000) -set(baseaddress_xmllite 0x70410000) -set(baseaddress_zipfldr 0x70310000) +set(baseaddress_nddeapi 0x73240000) +set(baseaddress_netcfgx 0x73190000) +set(baseaddress_netevent 0x73160000) +set(baseaddress_netid 0x73110000) +set(baseaddress_netshell 0x73050000) +set(baseaddress_newdev 0x72fe0000) +set(baseaddress_nfs41_np 0x72fb0000) +set(baseaddress_normaliz 0x72f80000) +set(baseaddress_notifyhook 0x72f50000) +set(baseaddress_npptools 0x72f20000) +set(baseaddress_ntdll_vista 0x72ef0000) +set(baseaddress_ntdsapi 0x72eb0000) +set(baseaddress_ntlanman 0x72e80000) +set(baseaddress_ntmarta 0x72e50000) +set(baseaddress_ntobjshex 0x72d70000) +set(baseaddress_objsel 0x72d30000) +set(baseaddress_odbc32 0x72ce0000) +set(baseaddress_odbccp32 0x72ca0000) +set(baseaddress_odbccp32i 0x72c70000) +set(baseaddress_oleacc 0x72bc0000) +set(baseaddress_olecli32 0x72b80000) +set(baseaddress_olepro32 0x72b50000) +set(baseaddress_olesvr32 0x72b20000) +set(baseaddress_olethk32 0x72af0000) +set(baseaddress_openglcfg 0x72ab0000) +set(baseaddress_pdh 0x72a60000) +set(baseaddress_pidgen 0x72a30000) +set(baseaddress_pifmgr 0x729c0000) +set(baseaddress_powercfg 0x72950000) +set(baseaddress_printui 0x72910000) +set(baseaddress_propsys 0x728c0000) +set(baseaddress_pstorec 0x72880000) +set(baseaddress_qedit 0x72810000) +set(baseaddress_qmgr 0x727c0000) +set(baseaddress_qmgrprxy 0x72740000) +set(baseaddress_quartz 0x72520000) +set(baseaddress_query 0x724e0000) +set(baseaddress_rasadhlp 0x724b0000) +set(baseaddress_rasdlg 0x722d0000) +set(baseaddress_rasman 0x72290000) +set(baseaddress_redirtest1 0x72260000) +set(baseaddress_redirtest2 0x72230000) +set(baseaddress_resutils 0x721f0000) +set(baseaddress_riched32 0x721c0000) +set(baseaddress_rsabase 0x721a0000) +set(baseaddress_rshell 0x720b0000) +set(baseaddress_samsrv 0x72020000) +set(baseaddress_sccbase 0x71ff0000) +set(baseaddress_schannel 0x71fa0000) +set(baseaddress_schedsvc 0x71f60000) +set(baseaddress_scrrun 0x71ef0000) +set(baseaddress_security 0x71ed0000) +set(baseaddress_serialui 0x71ea0000) +set(baseaddress_sfc 0x71e70000) +set(baseaddress_shdoclc 0x71e30000) +set(baseaddress_shdocvw 0x71dd0000) +set(baseaddress_shellbtrfs 0x71c40000) +set(baseaddress_shfolder 0x71c20000) +set(baseaddress_shimgvw 0x71bd0000) +set(baseaddress_shsvcs 0x71b90000) +set(baseaddress_slbcsp 0x71b60000) +set(baseaddress_sndblst 0x71b20000) +set(baseaddress_softpub 0x71b00000) +set(baseaddress_srclient 0x71ad0000) +set(baseaddress_srvsvc 0x71a90000) +set(baseaddress_sti 0x71a40000) +set(baseaddress_stobject 0x71990000) +set(baseaddress_streamci 0x71960000) +set(baseaddress_sxs 0x71920000) +set(baseaddress_sysdm 0x71820000) +set(baseaddress_syssetup 0x71720000) +set(baseaddress_t2embed 0x716f0000) +set(baseaddress_tapi32 0x716a0000) +set(baseaddress_tapiui 0x71620000) +set(baseaddress_telephon 0x715f0000) +set(baseaddress_testvdd 0x715c0000) +set(baseaddress_themeui 0x715a0000) +set(baseaddress_timedate 0x71520000) +set(baseaddress_traffic 0x714f0000) +set(baseaddress_twain_32 0x714b0000) +set(baseaddress_ubtrfs 0x71480000) +set(baseaddress_ucdfs 0x71460000) +set(baseaddress_uext2 0x71420000) +set(baseaddress_ufat 0x713e0000) +set(baseaddress_ufatx 0x713b0000) +set(baseaddress_uffs 0x71390000) +set(baseaddress_umpnpmgr 0x71350000) +set(baseaddress_untfs 0x71330000) +set(baseaddress_updspapi 0x71300000) +set(baseaddress_ureiserfs 0x712e0000) +set(baseaddress_url 0x712b0000) +set(baseaddress_usrmgr 0x71250000) +set(baseaddress_vbscript 0x71170000) +set(baseaddress_vdmdbg 0x71140000) +set(baseaddress_verifier 0x71110000) +set(baseaddress_vfd 0x710a0000) +set(baseaddress_vssapi 0x71060000) +set(baseaddress_wbemdisp 0x71000000) +set(baseaddress_wbemprox 0x70f70000) +set(baseaddress_wdmaud.drv 0x70da0000) +set(baseaddress_win32u 0x70d70000) +set(baseaddress_win32u_2k3sp2 0x70d40000) +set(baseaddress_win32u_xpsp2 0x70d10000) +set(baseaddress_windowscodecs 0x70b40000) +set(baseaddress_windowscodecsext 0x70b00000) +set(baseaddress_wined3dcfg 0x70ac0000) +set(baseaddress_winemp3.acm 0x70a20000) +set(baseaddress_winfax 0x709f0000) +set(baseaddress_wing32 0x709c0000) +set(baseaddress_winhttp 0x70940000) +set(baseaddress_winprint 0x70910000) +set(baseaddress_winscard 0x708d0000) +set(baseaddress_winsta 0x70890000) +set(baseaddress_wkssvc 0x70850000) +set(baseaddress_wlanapi 0x70810000) +set(baseaddress_wldap32 0x707b0000) +set(baseaddress_wlnotify 0x70780000) +set(baseaddress_wmi 0x70760000) +set(baseaddress_wmisvc 0x70730000) +set(baseaddress_wmiutils 0x706e0000) +set(baseaddress_wmvcore 0x70680000) +set(baseaddress_wshirda 0x70650000) +set(baseaddress_wshom 0x705f0000) +set(baseaddress_wshtcpip 0x705c0000) +set(baseaddress_wsock32 0x70590000) +set(baseaddress_wtsapi32 0x70550000) +set(baseaddress_wuapi 0x70500000) +set(baseaddress_wuauserv 0x704d0000) +set(baseaddress_xinput1_1 0x704a0000) +set(baseaddress_xinput1_2 0x70470000) +set(baseaddress_xinput1_3 0x70440000) +set(baseaddress_xinput9_1_0 0x70410000) +set(baseaddress_xmllite 0x703b0000) +set(baseaddress_zipfldr 0x702b0000) diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake index 0ad6c7367d..219203c33c 100644 --- a/sdk/cmake/baseaddress_msvc.cmake +++ b/sdk/cmake/baseaddress_msvc.cmake @@ -1,377 +1,378 @@ # Generated from R:\build\master\msvc # Generated by sdk/tools/gen_baseaddress.py set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c690000) -set(baseaddress_msvcrt 0x7c610000) -set(baseaddress_advapi32 0x7c580000) -set(baseaddress_gdi32 0x7c520000) +set(baseaddress_kernel32 0x7c620000) +set(baseaddress_msvcrt 0x7c5a0000) +set(baseaddress_advapi32 0x7c510000) +set(baseaddress_gdi32 0x7c4b0000) set(baseaddress_user32 0x77a20000) # reserved -set(baseaddress_dhcpcsvc 0x7c4e0000) -set(baseaddress_dnsapi 0x7c4a0000) -set(baseaddress_icmp 0x7c480000) -set(baseaddress_iphlpapi 0x7c440000) -set(baseaddress_ws2_32 0x7c410000) -set(baseaddress_ws2help 0x7c3f0000) -set(baseaddress_shlwapi 0x7c370000) -set(baseaddress_rpcrt4 0x7c2d0000) -set(baseaddress_comctl32 0x7c170000) -set(baseaddress_ole32 0x7c020000) -set(baseaddress_winspool 0x7bfe0000) -set(baseaddress_winmm 0x7bf40000) -set(baseaddress_comdlg32 0x7be60000) -set(baseaddress_shell32 0x7b680000) -set(baseaddress_lz32 0x7b660000) -set(baseaddress_version 0x7b630000) -set(baseaddress_oleaut32 0x7b4e0000) -set(baseaddress_setupapi 0x7b3a0000) -set(baseaddress_mpr 0x7b370000) -set(baseaddress_crypt32 0x7b290000) -set(baseaddress_wininet 0x7b200000) -set(baseaddress_urlmon 0x7b140000) -set(baseaddress_psapi 0x7b120000) -set(baseaddress_imm32 0x7b0f0000) -set(baseaddress_msvfw32 0x7b0b0000) -set(baseaddress_dbghelp 0x7b030000) -set(baseaddress_devmgr 0x7af80000) -set(baseaddress_msacm32 0x7af40000) -set(baseaddress_netapi32 0x7aed0000) -set(baseaddress_powrprof 0x7aeb0000) -set(baseaddress_secur32 0x7ae70000) -set(baseaddress_wintrust 0x7ae30000) -set(baseaddress_avicap32 0x7ae10000) -set(baseaddress_cabinet 0x7add0000) -set(baseaddress_dsound 0x7ad70000) -set(baseaddress_glu32 0x7acf0000) -set(baseaddress_opengl32 0x7ab40000) -set(baseaddress_riched20 0x7aab0000) -set(baseaddress_smdll 0x7aa90000) -set(baseaddress_userenv 0x7aa50000) -set(baseaddress_uxtheme 0x7aa00000) -set(baseaddress_cryptui 0x7a970000) -set(baseaddress_csrsrv 0x7a940000) -set(baseaddress_basesrv 0x7a910000) -set(baseaddress_winsrv 0x7a8a0000) -set(baseaddress_dplayx 0x7a850000) -set(baseaddress_gdiplus 0x7a7b0000) -set(baseaddress_msimg32 0x7a790000) -set(baseaddress_mswsock 0x7a770000) -set(baseaddress_oledlg 0x7a730000) -set(baseaddress_rasapi32 0x7a700000) -set(baseaddress_rsaenh 0x7a6b0000) -set(baseaddress_samlib 0x7a680000) -set(baseaddress_sensapi 0x7a660000) -set(baseaddress_sfc_os 0x7a640000) -set(baseaddress_snmpapi 0x7a620000) -set(baseaddress_spoolss 0x7a5f0000) -set(baseaddress_usp10 0x7a590000) -set(baseaddress_access 0x7a510000) -set(baseaddress_acgenral 0x7a4f0000) -set(baseaddress_aclayers 0x7a4d0000) -set(baseaddress_acledit 0x7a4b0000) -set(baseaddress_aclui 0x7a480000) -set(baseaddress_acppage 0x7a440000) -set(baseaddress_activeds 0x7a420000) -set(baseaddress_actxprxy 0x7a2a0000) -set(baseaddress_advapi32_vista 0x7a280000) -set(baseaddress_advpack 0x7a250000) -set(baseaddress_amstream 0x7a210000) -set(baseaddress_apphelp 0x7a1d0000) -set(baseaddress_appwiz 0x7a160000) -set(baseaddress_atl 0x7a130000) -set(baseaddress_atl100 0x7a100000) -set(baseaddress_atl80 0x7a0d0000) -set(baseaddress_authz 0x7a0b0000) -set(baseaddress_avifil32 0x7a050000) -set(baseaddress_batt 0x7a030000) -set(baseaddress_bcrypt 0x7a000000) -set(baseaddress_beepmidi 0x79fe0000) -set(baseaddress_browseui 0x79ee0000) -set(baseaddress_cards 0x79e20000) -set(baseaddress_cfgmgr32 0x79e00000) -set(baseaddress_clusapi 0x79dd0000) -set(baseaddress_cmicpl 0x79da0000) -set(baseaddress_comcat 0x79d80000) -set(baseaddress_compstui 0x79d60000) -set(baseaddress_console 0x79d10000) -set(baseaddress_credui 0x79cd0000) -set(baseaddress_crtdll 0x79c90000) -set(baseaddress_cryptdlg 0x79c60000) -set(baseaddress_cryptdll 0x79c40000) -set(baseaddress_cryptnet 0x79c10000) -set(baseaddress_custom 0x79bf0000) -set(baseaddress_d3d8 0x79ba0000) -set(baseaddress_d3d8thk 0x79b80000) -set(baseaddress_d3d9 0x79b30000) -set(baseaddress_d3dcompiler_43 0x79a90000) -set(baseaddress_d3drm 0x79a10000) -set(baseaddress_d3dwine 0x79850000) -set(baseaddress_d3dx9_24 0x79830000) -set(baseaddress_d3dx9_25 0x79800000) -set(baseaddress_d3dx9_26 0x797e0000) -set(baseaddress_d3dx9_27 0x797c0000) -set(baseaddress_d3dx9_28 0x797a0000) -set(baseaddress_d3dx9_29 0x79780000) -set(baseaddress_d3dx9_30 0x79750000) -set(baseaddress_d3dx9_31 0x79730000) -set(baseaddress_d3dx9_32 0x79710000) -set(baseaddress_d3dx9_33 0x796f0000) -set(baseaddress_d3dx9_34 0x796d0000) -set(baseaddress_d3dx9_35 0x796b0000) -set(baseaddress_d3dx9_36 0x795e0000) -set(baseaddress_d3dx9_37 0x795c0000) -set(baseaddress_d3dx9_38 0x795a0000) -set(baseaddress_d3dx9_39 0x79580000) -set(baseaddress_d3dx9_40 0x79560000) -set(baseaddress_d3dx9_41 0x79540000) -set(baseaddress_d3dx9_42 0x79520000) -set(baseaddress_d3dx9_43 0x79500000) -set(baseaddress_d3dxof 0x794d0000) -set(baseaddress_dciman32 0x794b0000) -set(baseaddress_ddraw 0x79420000) -set(baseaddress_desk 0x79390000) -set(baseaddress_deskadp 0x79360000) -set(baseaddress_deskmon 0x79340000) -set(baseaddress_devcpux 0x79320000) -set(baseaddress_devenum 0x792f0000) -set(baseaddress_dinput 0x792b0000) -set(baseaddress_dinput8 0x79290000) -set(baseaddress_dmusic 0x79250000) -set(baseaddress_dplay 0x79230000) -set(baseaddress_dxdiagn 0x79200000) -set(baseaddress_dxtn 0x791e0000) -set(baseaddress_esent 0x791b0000) -set(baseaddress_faultrep 0x79190000) -set(baseaddress_fltlib 0x79170000) -set(baseaddress_fmifs 0x79150000) -set(baseaddress_fontext 0x79130000) -set(baseaddress_fontsub 0x79110000) -set(baseaddress_framebuf 0x790f0000) -set(baseaddress_framebuf_new 0x790d0000) -set(baseaddress_framedyn 0x790b0000) -set(baseaddress_genincdata 0x79080000) -set(baseaddress_getuname 0x78780000) -set(baseaddress_hdwwiz 0x78710000) -set(baseaddress_hhctrl 0x786d0000) -set(baseaddress_hid 0x786b0000) -set(baseaddress_hlink 0x78680000) -set(baseaddress_hnetcfg 0x78650000) -set(baseaddress_httpapi 0x78630000) -set(baseaddress_iccvid 0x78610000) -set(baseaddress_ieframe 0x78580000) -set(baseaddress_iernonce 0x78550000) -set(baseaddress_imaadp32.acm 0x78530000) -set(baseaddress_imagehlp 0x78500000) -set(baseaddress_inetcomm 0x784b0000) -set(baseaddress_inetcpl 0x78460000) -set(baseaddress_inetmib1 0x78440000) -set(baseaddress_initpki 0x78420000) -set(baseaddress_input 0x783c0000) -set(baseaddress_inseng 0x78390000) -set(baseaddress_intl 0x78330000) -set(baseaddress_iologmsg 0x78310000) -set(baseaddress_itircl 0x782f0000) -set(baseaddress_itss 0x782c0000) -set(baseaddress_joy 0x78280000) -set(baseaddress_jscript 0x781d0000) -set(baseaddress_jsproxy 0x781b0000) -set(baseaddress_kbdeo 0x78190000) -set(baseaddress_kbsdll 0x78170000) -set(baseaddress_kernel32_vista 0x78150000) -set(baseaddress_ksuser 0x78130000) -set(baseaddress_libjpeg 0x780d0000) -set(baseaddress_libpng 0x78070000) -set(baseaddress_libtiff 0x77fd0000) -set(baseaddress_libtirpc 0x77f90000) -set(baseaddress_libxslt 0x77e50000) -set(baseaddress_load_notifications 0x77e30000) -set(baseaddress_loadperf 0x77e10000) -set(baseaddress_localmon 0x77de0000) -set(baseaddress_localspl 0x77da0000) -set(baseaddress_localspl_apitest 0x77d80000) -set(baseaddress_localui 0x77d50000) -set(baseaddress_lpk 0x77d20000) -set(baseaddress_lsasrv 0x77cc0000) -set(baseaddress_main 0x77c40000) -set(baseaddress_mapi32 0x77c10000) -set(baseaddress_mbedtls 0x77ba0000) -set(baseaddress_mciavi32 0x77b70000) -set(baseaddress_mcicda 0x77b40000) -set(baseaddress_mciqtz32 0x779f0000) -set(baseaddress_mciseq 0x779c0000) -set(baseaddress_mciwave 0x77990000) -set(baseaddress_mgmtapi 0x77970000) -set(baseaddress_midimap 0x77950000) -set(baseaddress_mlang 0x77920000) -set(baseaddress_mmdrv 0x77900000) -set(baseaddress_mmsys 0x77830000) -set(baseaddress_modemui 0x777c0000) -set(baseaddress_mprapi 0x77790000) -set(baseaddress_msacm32.drv 0x77760000) -set(baseaddress_msadp32.acm 0x77740000) -set(baseaddress_msafd 0x77710000) -set(baseaddress_mscat32 0x776f0000) -set(baseaddress_mscms 0x776c0000) -set(baseaddress_mscoree 0x77680000) -set(baseaddress_msctf 0x77640000) -set(baseaddress_msdmo 0x77620000) -set(baseaddress_msftedit 0x77600000) -set(baseaddress_msg711.acm 0x775e0000) -set(baseaddress_msgina 0x77560000) -set(baseaddress_msgsm32.acm 0x77540000) -set(baseaddress_mshtml 0x77380000) -set(baseaddress_msi 0x77240000) -set(baseaddress_msimtf 0x77220000) -set(baseaddress_msisip 0x77200000) -set(baseaddress_msisys 0x771e0000) -set(baseaddress_mspatcha 0x771c0000) -set(baseaddress_msports 0x77190000) -set(baseaddress_msrle32 0x77160000) -set(baseaddress_mssign32 0x77140000) -set(baseaddress_mssip32 0x77120000) -set(baseaddress_mstask 0x770f0000) -set(baseaddress_msv1_0 0x770d0000) -set(baseaddress_msvcrt20 0x77040000) -set(baseaddress_msvcrt40 0x76fb0000) -set(baseaddress_msvcrt_crt_dll_startup 0x76f90000) -set(baseaddress_msvidc32 0x76f70000) -set(baseaddress_msxml 0x76f40000) -set(baseaddress_msxml2 0x76f10000) -set(baseaddress_msxml3 0x76d10000) -set(baseaddress_msxml4 0x76cd0000) -set(baseaddress_msxml6 0x76c90000) -set(baseaddress_mycomput 0x76c70000) -set(baseaddress_ncpa 0x76c50000) -set(baseaddress_nddeapi 0x76c30000) -set(baseaddress_netcfgx 0x76bc0000) -set(baseaddress_netevent 0x76b90000) -set(baseaddress_netid 0x76b50000) -set(baseaddress_netshell 0x76ad0000) -set(baseaddress_newdev 0x76a80000) -set(baseaddress_nfs41_np 0x76a60000) -set(baseaddress_normaliz 0x76a40000) -set(baseaddress_notifyhook 0x76a20000) -set(baseaddress_npptools 0x76a00000) -set(baseaddress_ntdll_vista 0x769e0000) -set(baseaddress_ntdsapi 0x769b0000) -set(baseaddress_ntlanman 0x76990000) -set(baseaddress_ntmarta 0x76970000) -set(baseaddress_ntobjshex 0x76910000) -set(baseaddress_objsel 0x768f0000) -set(baseaddress_odbc32 0x768b0000) -set(baseaddress_odbccp32 0x76880000) -set(baseaddress_odbccp32i 0x76860000) -set(baseaddress_oleacc 0x76810000) -set(baseaddress_olecli32 0x767f0000) -set(baseaddress_olepro32 0x767d0000) -set(baseaddress_olesvr32 0x767b0000) -set(baseaddress_olethk32 0x76790000) -set(baseaddress_openglcfg 0x76760000) -set(baseaddress_pdh 0x76730000) -set(baseaddress_pidgen 0x76710000) -set(baseaddress_pifmgr 0x766a0000) -set(baseaddress_powercfg 0x76640000) -set(baseaddress_printui 0x76620000) -set(baseaddress_propsys 0x765f0000) -set(baseaddress_pstorec 0x765d0000) -set(baseaddress_qedit 0x765a0000) -set(baseaddress_qmgr 0x76570000) -set(baseaddress_qmgrprxy 0x76520000) -set(baseaddress_quartz 0x76400000) -set(baseaddress_query 0x763e0000) -set(baseaddress_rasadhlp 0x763c0000) -set(baseaddress_rasdlg 0x76200000) -set(baseaddress_rasman 0x761d0000) -set(baseaddress_redirtest1 0x761b0000) -set(baseaddress_redirtest2 0x76190000) -set(baseaddress_resutils 0x76170000) -set(baseaddress_riched32 0x76150000) -set(baseaddress_rsabase 0x76130000) -set(baseaddress_rshell 0x760d0000) -set(baseaddress_samsrv 0x76070000) -set(baseaddress_sccbase 0x76050000) -set(baseaddress_schannel 0x76020000) -set(baseaddress_schedsvc 0x76000000) -set(baseaddress_scrrun 0x75fc0000) -set(baseaddress_security 0x75fa0000) -set(baseaddress_serialui 0x75f80000) -set(baseaddress_sfc 0x75f60000) -set(baseaddress_shdoclc 0x75f20000) -set(baseaddress_shdocvw 0x75ee0000) -set(baseaddress_shellbtrfs 0x75e50000) -set(baseaddress_shfolder 0x75e30000) -set(baseaddress_shimgvw 0x75df0000) -set(baseaddress_shsvcs 0x75dd0000) -set(baseaddress_slbcsp 0x75db0000) -set(baseaddress_sndblst 0x75d80000) -set(baseaddress_softpub 0x75d60000) -set(baseaddress_srclient 0x75d40000) -set(baseaddress_srvsvc 0x75d10000) -set(baseaddress_sti 0x75ce0000) -set(baseaddress_stobject 0x75c80000) -set(baseaddress_streamci 0x75c60000) -set(baseaddress_sxs 0x75c40000) -set(baseaddress_sysdm 0x75b70000) -set(baseaddress_syssetup 0x75a90000) -set(baseaddress_t2embed 0x75a70000) -set(baseaddress_tapi32 0x75a40000) -set(baseaddress_tapiui 0x759c0000) -set(baseaddress_telephon 0x759a0000) -set(baseaddress_testvdd 0x75980000) -set(baseaddress_themeui 0x75960000) -set(baseaddress_timedate 0x758f0000) -set(baseaddress_traffic 0x758d0000) -set(baseaddress_twain_32 0x758b0000) -set(baseaddress_ubtrfs 0x75890000) -set(baseaddress_ucdfs 0x75870000) -set(baseaddress_uext2 0x75840000) -set(baseaddress_ufat 0x75810000) -set(baseaddress_ufatx 0x757f0000) -set(baseaddress_uffs 0x757d0000) -set(baseaddress_umpnpmgr 0x757a0000) -set(baseaddress_untfs 0x75780000) -set(baseaddress_updspapi 0x75760000) -set(baseaddress_ureiserfs 0x75740000) -set(baseaddress_url 0x75720000) -set(baseaddress_usrmgr 0x756d0000) -set(baseaddress_vbscript 0x75660000) -set(baseaddress_vdmdbg 0x75640000) -set(baseaddress_verifier 0x75620000) -set(baseaddress_vfd 0x755e0000) -set(baseaddress_vssapi 0x755b0000) -set(baseaddress_wbemdisp 0x75570000) -set(baseaddress_wbemprox 0x75530000) -set(baseaddress_wdmaud.drv 0x753a0000) -set(baseaddress_win32u 0x75380000) -set(baseaddress_win32u_2k3sp2 0x75360000) -set(baseaddress_win32u_xpsp2 0x75340000) -set(baseaddress_windowscodecs 0x75260000) -set(baseaddress_windowscodecsext 0x75240000) -set(baseaddress_wined3dcfg 0x75210000) -set(baseaddress_winemp3.acm 0x751a0000) -set(baseaddress_winfax 0x75180000) -set(baseaddress_wing32 0x75160000) -set(baseaddress_winhttp 0x75110000) -set(baseaddress_winprint 0x750f0000) -set(baseaddress_winscard 0x750d0000) -set(baseaddress_winsta 0x750a0000) -set(baseaddress_wkssvc 0x75080000) -set(baseaddress_wlanapi 0x75060000) -set(baseaddress_wldap32 0x75030000) -set(baseaddress_wlnotify 0x75000000) -set(baseaddress_wmi 0x74fe0000) -set(baseaddress_wmisvc 0x74fc0000) -set(baseaddress_wmiutils 0x74f90000) -set(baseaddress_wmvcore 0x74f60000) -set(baseaddress_wshirda 0x74f40000) -set(baseaddress_wshom 0x74f10000) -set(baseaddress_wshtcpip 0x74ef0000) -set(baseaddress_wsock32 0x74ed0000) -set(baseaddress_wtsapi32 0x74eb0000) -set(baseaddress_wuapi 0x74e80000) -set(baseaddress_wuauserv 0x74e60000) -set(baseaddress_xinput1_1 0x74e40000) -set(baseaddress_xinput1_2 0x74e20000) -set(baseaddress_xinput1_3 0x74e00000) -set(baseaddress_xinput9_1_0 0x74de0000) -set(baseaddress_xmllite 0x74db0000) -set(baseaddress_zipfldr 0x74d60000) +set(baseaddress_dhcpcsvc 0x7c470000) +set(baseaddress_dnsapi 0x7c430000) +set(baseaddress_icmp 0x7c410000) +set(baseaddress_iphlpapi 0x7c3d0000) +set(baseaddress_ws2_32 0x7c3a0000) +set(baseaddress_ws2help 0x7c380000) +set(baseaddress_shlwapi 0x7c300000) +set(baseaddress_rpcrt4 0x7c260000) +set(baseaddress_comctl32 0x7c100000) +set(baseaddress_ole32 0x7bfb0000) +set(baseaddress_winspool 0x7bf70000) +set(baseaddress_winmm 0x7bed0000) +set(baseaddress_comdlg32 0x7bdf0000) +set(baseaddress_shell32 0x7b610000) +set(baseaddress_lz32 0x7b5f0000) +set(baseaddress_version 0x7b5c0000) +set(baseaddress_oleaut32 0x7b470000) +set(baseaddress_setupapi 0x7b330000) +set(baseaddress_mpr 0x7b300000) +set(baseaddress_crypt32 0x7b220000) +set(baseaddress_wininet 0x7b190000) +set(baseaddress_urlmon 0x7b0d0000) +set(baseaddress_psapi 0x7b0b0000) +set(baseaddress_imm32 0x7b080000) +set(baseaddress_msvfw32 0x7b040000) +set(baseaddress_dbghelp 0x7afc0000) +set(baseaddress_devmgr 0x7af10000) +set(baseaddress_msacm32 0x7aed0000) +set(baseaddress_netapi32 0x7ae60000) +set(baseaddress_powrprof 0x7ae40000) +set(baseaddress_secur32 0x7ae00000) +set(baseaddress_wintrust 0x7adb0000) +set(baseaddress_avicap32 0x7ad90000) +set(baseaddress_cabinet 0x7ad50000) +set(baseaddress_dsound 0x7acf0000) +set(baseaddress_glu32 0x7ac70000) +set(baseaddress_opengl32 0x7aac0000) +set(baseaddress_riched20 0x7aa30000) +set(baseaddress_smdll 0x7aa10000) +set(baseaddress_userenv 0x7a9d0000) +set(baseaddress_uxtheme 0x7a980000) +set(baseaddress_cryptui 0x7a8f0000) +set(baseaddress_csrsrv 0x7a8c0000) +set(baseaddress_basesrv 0x7a890000) +set(baseaddress_winsrv 0x7a820000) +set(baseaddress_dplayx 0x7a7d0000) +set(baseaddress_gdiplus 0x7a730000) +set(baseaddress_msimg32 0x7a710000) +set(baseaddress_mswsock 0x7a6f0000) +set(baseaddress_oledlg 0x7a6b0000) +set(baseaddress_rasapi32 0x7a680000) +set(baseaddress_rsaenh 0x7a630000) +set(baseaddress_samlib 0x7a600000) +set(baseaddress_sensapi 0x7a5e0000) +set(baseaddress_sfc_os 0x7a5c0000) +set(baseaddress_snmpapi 0x7a5a0000) +set(baseaddress_spoolss 0x7a570000) +set(baseaddress_usp10 0x7a510000) +set(baseaddress_access 0x7a490000) +set(baseaddress_acgenral 0x7a470000) +set(baseaddress_aclayers 0x7a450000) +set(baseaddress_acledit 0x7a430000) +set(baseaddress_aclui 0x7a400000) +set(baseaddress_acppage 0x7a3c0000) +set(baseaddress_activeds 0x7a3a0000) +set(baseaddress_actxprxy 0x7a220000) +set(baseaddress_advapi32_vista 0x7a200000) +set(baseaddress_advpack 0x7a1d0000) +set(baseaddress_amstream 0x7a190000) +set(baseaddress_apphelp 0x7a150000) +set(baseaddress_appwiz 0x7a0e0000) +set(baseaddress_atl 0x7a0b0000) +set(baseaddress_atl100 0x7a080000) +set(baseaddress_atl80 0x7a050000) +set(baseaddress_authz 0x7a030000) +set(baseaddress_avifil32 0x79fd0000) +set(baseaddress_batt 0x79fb0000) +set(baseaddress_bcrypt 0x79f80000) +set(baseaddress_beepmidi 0x79f60000) +set(baseaddress_browseui 0x79e60000) +set(baseaddress_bthci 0x79e40000) +set(baseaddress_cards 0x79d80000) +set(baseaddress_cfgmgr32 0x79d60000) +set(baseaddress_clusapi 0x79d30000) +set(baseaddress_cmicpl 0x79d00000) +set(baseaddress_comcat 0x79ce0000) +set(baseaddress_compstui 0x79cc0000) +set(baseaddress_console 0x79c70000) +set(baseaddress_credui 0x79c30000) +set(baseaddress_crtdll 0x79bf0000) +set(baseaddress_cryptdlg 0x79bc0000) +set(baseaddress_cryptdll 0x79ba0000) +set(baseaddress_cryptnet 0x79b70000) +set(baseaddress_custom 0x79b50000) +set(baseaddress_d3d8 0x79b00000) +set(baseaddress_d3d8thk 0x79ae0000) +set(baseaddress_d3d9 0x79a90000) +set(baseaddress_d3dcompiler_43 0x799f0000) +set(baseaddress_d3drm 0x79970000) +set(baseaddress_d3dwine 0x797b0000) +set(baseaddress_d3dx9_24 0x79790000) +set(baseaddress_d3dx9_25 0x79760000) +set(baseaddress_d3dx9_26 0x79740000) +set(baseaddress_d3dx9_27 0x79720000) +set(baseaddress_d3dx9_28 0x79700000) +set(baseaddress_d3dx9_29 0x796e0000) +set(baseaddress_d3dx9_30 0x796b0000) +set(baseaddress_d3dx9_31 0x79690000) +set(baseaddress_d3dx9_32 0x79670000) +set(baseaddress_d3dx9_33 0x79650000) +set(baseaddress_d3dx9_34 0x79630000) +set(baseaddress_d3dx9_35 0x79610000) +set(baseaddress_d3dx9_36 0x79540000) +set(baseaddress_d3dx9_37 0x79520000) +set(baseaddress_d3dx9_38 0x79500000) +set(baseaddress_d3dx9_39 0x794e0000) +set(baseaddress_d3dx9_40 0x794c0000) +set(baseaddress_d3dx9_41 0x794a0000) +set(baseaddress_d3dx9_42 0x79480000) +set(baseaddress_d3dx9_43 0x79460000) +set(baseaddress_d3dxof 0x79430000) +set(baseaddress_dciman32 0x79410000) +set(baseaddress_ddraw 0x79380000) +set(baseaddress_desk 0x79300000) +set(baseaddress_deskadp 0x792d0000) +set(baseaddress_deskmon 0x792b0000) +set(baseaddress_devcpux 0x79290000) +set(baseaddress_devenum 0x79260000) +set(baseaddress_dinput 0x79220000) +set(baseaddress_dinput8 0x79200000) +set(baseaddress_dmusic 0x791c0000) +set(baseaddress_dplay 0x791a0000) +set(baseaddress_dxdiagn 0x79170000) +set(baseaddress_dxtn 0x79150000) +set(baseaddress_esent 0x79120000) +set(baseaddress_faultrep 0x79100000) +set(baseaddress_fltlib 0x790e0000) +set(baseaddress_fmifs 0x790c0000) +set(baseaddress_fontext 0x790a0000) +set(baseaddress_fontsub 0x79080000) +set(baseaddress_framebuf 0x79060000) +set(baseaddress_framebuf_new 0x79040000) +set(baseaddress_framedyn 0x79020000) +set(baseaddress_genincdata 0x78ff0000) +set(baseaddress_getuname 0x786f0000) +set(baseaddress_hdwwiz 0x78680000) +set(baseaddress_hhctrl 0x78640000) +set(baseaddress_hid 0x78620000) +set(baseaddress_hlink 0x785f0000) +set(baseaddress_hnetcfg 0x785c0000) +set(baseaddress_httpapi 0x785a0000) +set(baseaddress_iccvid 0x78580000) +set(baseaddress_ieframe 0x784f0000) +set(baseaddress_iernonce 0x784c0000) +set(baseaddress_imaadp32.acm 0x784a0000) +set(baseaddress_imagehlp 0x78470000) +set(baseaddress_inetcomm 0x78420000) +set(baseaddress_inetcpl 0x783d0000) +set(baseaddress_inetmib1 0x783b0000) +set(baseaddress_initpki 0x78390000) +set(baseaddress_input 0x78330000) +set(baseaddress_inseng 0x78300000) +set(baseaddress_intl 0x782a0000) +set(baseaddress_iologmsg 0x78280000) +set(baseaddress_itircl 0x78260000) +set(baseaddress_itss 0x78230000) +set(baseaddress_joy 0x781f0000) +set(baseaddress_jscript 0x78140000) +set(baseaddress_jsproxy 0x78120000) +set(baseaddress_kbdeo 0x78100000) +set(baseaddress_kbsdll 0x780e0000) +set(baseaddress_kernel32_vista 0x780c0000) +set(baseaddress_ksuser 0x780a0000) +set(baseaddress_libjpeg 0x78040000) +set(baseaddress_libpng 0x77fe0000) +set(baseaddress_libtiff 0x77f40000) +set(baseaddress_libtirpc 0x77f00000) +set(baseaddress_libxslt 0x77dc0000) +set(baseaddress_load_notifications 0x77da0000) +set(baseaddress_loadperf 0x77d80000) +set(baseaddress_localmon 0x77d50000) +set(baseaddress_localspl 0x77d10000) +set(baseaddress_localspl_apitest 0x77cf0000) +set(baseaddress_localui 0x77cc0000) +set(baseaddress_lpk 0x77c90000) +set(baseaddress_lsasrv 0x77c30000) +set(baseaddress_main 0x77bb0000) +set(baseaddress_mapi32 0x77b80000) +set(baseaddress_mbedtls 0x779b0000) +set(baseaddress_mciavi32 0x77980000) +set(baseaddress_mcicda 0x77950000) +set(baseaddress_mciqtz32 0x77920000) +set(baseaddress_mciseq 0x778f0000) +set(baseaddress_mciwave 0x778c0000) +set(baseaddress_mgmtapi 0x778a0000) +set(baseaddress_midimap 0x77880000) +set(baseaddress_mlang 0x77850000) +set(baseaddress_mmdrv 0x77830000) +set(baseaddress_mmsys 0x77760000) +set(baseaddress_modemui 0x776f0000) +set(baseaddress_mprapi 0x776c0000) +set(baseaddress_msacm32.drv 0x77690000) +set(baseaddress_msadp32.acm 0x77670000) +set(baseaddress_msafd 0x77640000) +set(baseaddress_mscat32 0x77620000) +set(baseaddress_mscms 0x775f0000) +set(baseaddress_mscoree 0x775b0000) +set(baseaddress_msctf 0x77570000) +set(baseaddress_msdmo 0x77550000) +set(baseaddress_msftedit 0x77530000) +set(baseaddress_msg711.acm 0x77510000) +set(baseaddress_msgina 0x77490000) +set(baseaddress_msgsm32.acm 0x77470000) +set(baseaddress_mshtml 0x772b0000) +set(baseaddress_msi 0x77170000) +set(baseaddress_msimtf 0x77150000) +set(baseaddress_msisip 0x77130000) +set(baseaddress_msisys 0x77110000) +set(baseaddress_mspatcha 0x770f0000) +set(baseaddress_msports 0x770c0000) +set(baseaddress_msrle32 0x77090000) +set(baseaddress_mssign32 0x77070000) +set(baseaddress_mssip32 0x77050000) +set(baseaddress_mstask 0x77020000) +set(baseaddress_msv1_0 0x77000000) +set(baseaddress_msvcrt20 0x76f60000) +set(baseaddress_msvcrt40 0x76ec0000) +set(baseaddress_msvcrt_crt_dll_startup 0x76ea0000) +set(baseaddress_msvidc32 0x76e80000) +set(baseaddress_msxml 0x76e50000) +set(baseaddress_msxml2 0x76e20000) +set(baseaddress_msxml3 0x76c20000) +set(baseaddress_msxml4 0x76be0000) +set(baseaddress_msxml6 0x76ba0000) +set(baseaddress_mycomput 0x76b80000) +set(baseaddress_ncpa 0x76b60000) +set(baseaddress_nddeapi 0x76b40000) +set(baseaddress_netcfgx 0x76ac0000) +set(baseaddress_netevent 0x76a90000) +set(baseaddress_netid 0x76a50000) +set(baseaddress_netshell 0x769d0000) +set(baseaddress_newdev 0x76980000) +set(baseaddress_nfs41_np 0x76960000) +set(baseaddress_normaliz 0x76940000) +set(baseaddress_notifyhook 0x76920000) +set(baseaddress_npptools 0x76900000) +set(baseaddress_ntdll_vista 0x768e0000) +set(baseaddress_ntdsapi 0x768b0000) +set(baseaddress_ntlanman 0x76890000) +set(baseaddress_ntmarta 0x76870000) +set(baseaddress_ntobjshex 0x76810000) +set(baseaddress_objsel 0x767f0000) +set(baseaddress_odbc32 0x767b0000) +set(baseaddress_odbccp32 0x76780000) +set(baseaddress_odbccp32i 0x76760000) +set(baseaddress_oleacc 0x76710000) +set(baseaddress_olecli32 0x766f0000) +set(baseaddress_olepro32 0x766d0000) +set(baseaddress_olesvr32 0x766b0000) +set(baseaddress_olethk32 0x76690000) +set(baseaddress_openglcfg 0x76660000) +set(baseaddress_pdh 0x76630000) +set(baseaddress_pidgen 0x76610000) +set(baseaddress_pifmgr 0x765a0000) +set(baseaddress_powercfg 0x76540000) +set(baseaddress_printui 0x76520000) +set(baseaddress_propsys 0x764e0000) +set(baseaddress_pstorec 0x764c0000) +set(baseaddress_qedit 0x76490000) +set(baseaddress_qmgr 0x76460000) +set(baseaddress_qmgrprxy 0x76410000) +set(baseaddress_quartz 0x762f0000) +set(baseaddress_query 0x762d0000) +set(baseaddress_rasadhlp 0x762b0000) +set(baseaddress_rasdlg 0x760f0000) +set(baseaddress_rasman 0x760c0000) +set(baseaddress_redirtest1 0x760a0000) +set(baseaddress_redirtest2 0x76080000) +set(baseaddress_resutils 0x76050000) +set(baseaddress_riched32 0x76030000) +set(baseaddress_rsabase 0x76010000) +set(baseaddress_rshell 0x75fb0000) +set(baseaddress_samsrv 0x75f50000) +set(baseaddress_sccbase 0x75f30000) +set(baseaddress_schannel 0x75f00000) +set(baseaddress_schedsvc 0x75ee0000) +set(baseaddress_scrrun 0x75ea0000) +set(baseaddress_security 0x75e80000) +set(baseaddress_serialui 0x75e60000) +set(baseaddress_sfc 0x75e40000) +set(baseaddress_shdoclc 0x75e00000) +set(baseaddress_shdocvw 0x75dc0000) +set(baseaddress_shellbtrfs 0x75d10000) +set(baseaddress_shfolder 0x75cf0000) +set(baseaddress_shimgvw 0x75cb0000) +set(baseaddress_shsvcs 0x75c90000) +set(baseaddress_slbcsp 0x75c70000) +set(baseaddress_sndblst 0x75c40000) +set(baseaddress_softpub 0x75c20000) +set(baseaddress_srclient 0x75c00000) +set(baseaddress_srvsvc 0x75bd0000) +set(baseaddress_sti 0x75ba0000) +set(baseaddress_stobject 0x75b40000) +set(baseaddress_streamci 0x75b20000) +set(baseaddress_sxs 0x75b00000) +set(baseaddress_sysdm 0x75a20000) +set(baseaddress_syssetup 0x75930000) +set(baseaddress_t2embed 0x75910000) +set(baseaddress_tapi32 0x758e0000) +set(baseaddress_tapiui 0x75860000) +set(baseaddress_telephon 0x75840000) +set(baseaddress_testvdd 0x75820000) +set(baseaddress_themeui 0x75800000) +set(baseaddress_timedate 0x75790000) +set(baseaddress_traffic 0x75770000) +set(baseaddress_twain_32 0x75750000) +set(baseaddress_ubtrfs 0x75730000) +set(baseaddress_ucdfs 0x75710000) +set(baseaddress_uext2 0x756e0000) +set(baseaddress_ufat 0x756b0000) +set(baseaddress_ufatx 0x75690000) +set(baseaddress_uffs 0x75670000) +set(baseaddress_umpnpmgr 0x75640000) +set(baseaddress_untfs 0x75620000) +set(baseaddress_updspapi 0x75600000) +set(baseaddress_ureiserfs 0x755e0000) +set(baseaddress_url 0x755c0000) +set(baseaddress_usrmgr 0x75570000) +set(baseaddress_vbscript 0x75500000) +set(baseaddress_vdmdbg 0x754e0000) +set(baseaddress_verifier 0x754c0000) +set(baseaddress_vfd 0x75480000) +set(baseaddress_vssapi 0x75450000) +set(baseaddress_wbemdisp 0x75410000) +set(baseaddress_wbemprox 0x753d0000) +set(baseaddress_wdmaud.drv 0x75240000) +set(baseaddress_win32u 0x75220000) +set(baseaddress_win32u_2k3sp2 0x75200000) +set(baseaddress_win32u_xpsp2 0x751e0000) +set(baseaddress_windowscodecs 0x75100000) +set(baseaddress_windowscodecsext 0x750e0000) +set(baseaddress_wined3dcfg 0x750b0000) +set(baseaddress_winemp3.acm 0x75040000) +set(baseaddress_winfax 0x75020000) +set(baseaddress_wing32 0x75000000) +set(baseaddress_winhttp 0x74fb0000) +set(baseaddress_winprint 0x74f90000) +set(baseaddress_winscard 0x74f70000) +set(baseaddress_winsta 0x74f40000) +set(baseaddress_wkssvc 0x74f20000) +set(baseaddress_wlanapi 0x74f00000) +set(baseaddress_wldap32 0x74ed0000) +set(baseaddress_wlnotify 0x74ea0000) +set(baseaddress_wmi 0x74e80000) +set(baseaddress_wmisvc 0x74e60000) +set(baseaddress_wmiutils 0x74e30000) +set(baseaddress_wmvcore 0x74e00000) +set(baseaddress_wshirda 0x74de0000) +set(baseaddress_wshom 0x74db0000) +set(baseaddress_wshtcpip 0x74d90000) +set(baseaddress_wsock32 0x74d70000) +set(baseaddress_wtsapi32 0x74d50000) +set(baseaddress_wuapi 0x74d20000) +set(baseaddress_wuauserv 0x74d00000) +set(baseaddress_xinput1_1 0x74ce0000) +set(baseaddress_xinput1_2 0x74cc0000) +set(baseaddress_xinput1_3 0x74ca0000) +set(baseaddress_xinput9_1_0 0x74c80000) +set(baseaddress_xmllite 0x74c50000) +set(baseaddress_zipfldr 0x74c00000)

5 years, 10 months

08/08: [USETUP] Use UNICODE_NULL.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cefc9238fb74cc86aca30… commit cefc9238fb74cc86aca30ece68ae658157ffed01 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jun 30 22:17:18 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Oct 25 01:02:20 2018 +0200 [USETUP] Use UNICODE_NULL. svn path=/branches/setup_improvements/; revision=75248 --- base/setup/usetup/filequeue.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/base/setup/usetup/filequeue.c b/base/setup/usetup/filequeue.c index 6067fca07e..2d928fb714 100644 --- a/base/setup/usetup/filequeue.c +++ b/base/setup/usetup/filequeue.c @@ -156,7 +156,9 @@ SetupQueueCopy( SourceRootPath == NULL || SourceFilename == NULL || TargetDirectory == NULL) + { return FALSE; + } QueueHeader = (PFILEQUEUEHEADER)QueueHandle; @@ -184,7 +186,7 @@ SetupQueueCopy( } wcsncpy(Entry->SourceCabinet, SourceCabinet, Length); - Entry->SourceCabinet[Length] = (WCHAR)0; + Entry->SourceCabinet[Length] = UNICODE_NULL; } else { @@ -208,7 +210,7 @@ SetupQueueCopy( } wcsncpy(Entry->SourceRootPath, SourceRootPath, Length); - Entry->SourceRootPath[Length] = (WCHAR)0; + Entry->SourceRootPath[Length] = UNICODE_NULL; /* Copy source path */ if (SourcePath != NULL) @@ -232,7 +234,7 @@ SetupQueueCopy( } wcsncpy(Entry->SourcePath, SourcePath, Length); - Entry->SourcePath[Length] = (WCHAR)0; + Entry->SourcePath[Length] = UNICODE_NULL; } /* Copy source file name */ @@ -254,7 +256,7 @@ SetupQueueCopy( } wcsncpy(Entry->SourceFilename, SourceFilename, Length); - Entry->SourceFilename[Length] = (WCHAR)0; + Entry->SourceFilename[Length] = UNICODE_NULL; /* Copy target directory */ Length = wcslen(TargetDirectory); @@ -278,7 +280,7 @@ SetupQueueCopy( } wcsncpy(Entry->TargetDirectory, TargetDirectory, Length); - Entry->TargetDirectory[Length] = (WCHAR)0; + Entry->TargetDirectory[Length] = UNICODE_NULL; /* Copy optional target filename */ if (TargetFilename != NULL) @@ -303,7 +305,7 @@ SetupQueueCopy( } wcsncpy(Entry->TargetFilename, TargetFilename, Length); - Entry->TargetFilename[Length] = (WCHAR)0; + Entry->TargetFilename[Length] = UNICODE_NULL; } /* Append queue entry */

5 years, 11 months

07/08: [USETUP] More code for updating/repairing the registry. Fix the name of the txtsetup.sif section to look for when performing a registry upgrade.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fedeb7db334962cad79d… commit 7fedeb7db334962cad79de12f25a448982cb43f3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 22 00:38:32 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Oct 25 01:00:43 2018 +0200 [USETUP] More code for updating/repairing the registry. Fix the name of the txtsetup.sif section to look for when performing a registry upgrade. [BOOTDATA] Add needed entries in txtsetup.sif for registry upgrade. svn path=/branches/setup_improvements/; revision=75162 svn path=/branches/setup_improvements/; revision=75226 --- base/setup/usetup/registry.c | 102 +++++++++++++++++-------- base/setup/usetup/registry.h | 2 +- base/setup/usetup/usetup.c | 172 +++++++++++++++++++++++++++---------------- boot/bootdata/txtsetup.sif | 9 ++- 4 files changed, 188 insertions(+), 97 deletions(-) diff --git a/base/setup/usetup/registry.c b/base/setup/usetup/registry.c index bb79689789..50fbb31d1d 100644 --- a/base/setup/usetup/registry.c +++ b/base/setup/usetup/registry.c @@ -750,7 +750,7 @@ CreateRegistryFile( InitializeObjectAttributes(&ObjectAttributes, &FileName, OBJ_CASE_INSENSITIVE, - NULL, // Could have been installpath, etc... + NULL, // Could have been InstallPath, etc... NULL); // Descriptor Status = NtCreateFile(&FileHandle, @@ -902,7 +902,7 @@ VerifyRegistryHive( { NTSTATUS Status; UNICODE_STRING KeyName; - OBJECT_ATTRIBUTES KeyObjectAttributes; + OBJECT_ATTRIBUTES ObjectAttributes; /* Try to mount the specified registry hive */ Status = ConnectRegistry(NULL, @@ -937,14 +937,14 @@ VerifyRegistryHive( DPRINT1("VerifyRegistryHive: Registry hive %S succeeded recovered (Status 0x%08lx)\n", RegistryKey, Status); /* Unmount the hive */ - InitializeObjectAttributes(&KeyObjectAttributes, + InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, NULL, NULL); RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\USetup_VerifyHive"); - Status = NtUnloadKey(&KeyObjectAttributes); + Status = NtUnloadKey(&ObjectAttributes); if (!NT_SUCCESS(Status)) { DPRINT1("NtUnloadKey(%S, %wZ) failed, Status 0x%08lx\n", RegistryKey, &KeyName, Status); @@ -998,14 +998,14 @@ C_ASSERT(_countof(SecurityRegistryHives) == NUMBER_OF_SECURITY_REGISTRY_HIVES); NTSTATUS VerifyRegistryHives( IN PUNICODE_STRING InstallPath, - OUT PBOOLEAN ShouldUpdateRegistry) + OUT PBOOLEAN ShouldRepairRegistry) { NTSTATUS Status; BOOLEAN PrivilegeSet[2] = {FALSE, FALSE}; UINT i; - /* Suppose first the registry hives do not have to be updated/recreated */ - *ShouldUpdateRegistry = FALSE; + /* Suppose first the registry hives do not have to be fully recreated */ + *ShouldRepairRegistry = FALSE; /* Acquire restore privilege */ Status = RtlAdjustPrivilege(SE_RESTORE_PRIVILEGE, TRUE, FALSE, &PrivilegeSet[0]); @@ -1033,7 +1033,7 @@ VerifyRegistryHives( { DPRINT1("Registry hive '%S' needs repair!\n", RegistryHives[i].HiveName); RegistryHives[i].State = Repair; - *ShouldUpdateRegistry = TRUE; + *ShouldRepairRegistry = TRUE; } else { @@ -1145,14 +1145,14 @@ RegInitializeRegistry( { DPRINT1("CreateRegistryFile(%S) failed, Status 0x%08lx\n", RegistryHives[i].HiveName, Status); /* Exit prematurely here.... */ - /* That is now done, clean everything up! */ + /* That is now done, remove the proto-hive */ NtDeleteKey(KeyHandle); NtClose(KeyHandle); goto Quit; } } - /* That is now done, clean everything up! */ + /* That is now done, remove the proto-hive */ NtDeleteKey(KeyHandle); NtClose(KeyHandle); @@ -1238,7 +1238,7 @@ RegInitializeRegistry( } else { - /* Create *DUMMY* volatile hives just to make the update procedure work */ + /* Create *DUMMY* volatile hives just to make the update procedure working */ RtlInitUnicodeString(&KeyName, RegistryHives[i].RegSymLink); InitializeObjectAttributes(&ObjectAttributes, @@ -1385,23 +1385,14 @@ RegCleanupRegistry( IN PUNICODE_STRING InstallPath) { NTSTATUS Status; + HANDLE KeyHandle; UNICODE_STRING KeyName; - OBJECT_ATTRIBUTES KeyObjectAttributes; + OBJECT_ATTRIBUTES ObjectAttributes; BOOLEAN PrivilegeSet[2] = {FALSE, FALSE}; UINT i; WCHAR SrcPath[MAX_PATH]; WCHAR DstPath[MAX_PATH]; - for (i = 0; i < ARRAYSIZE(RootKeys); ++i) - { - if (RootKeys[i].Handle) - { - NtFlushKey(RootKeys[i].Handle); - NtClose(RootKeys[i].Handle); - RootKeys[i].Handle = NULL; - } - } - /* Acquire restore privilege */ Status = RtlAdjustPrivilege(SE_RESTORE_PRIVILEGE, TRUE, FALSE, &PrivilegeSet[0]); if (!NT_SUCCESS(Status)) @@ -1421,20 +1412,68 @@ RegCleanupRegistry( return; } - InitializeObjectAttributes(&KeyObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); + /* + * Note that we don't need to explicitly remove the symlinks we have created + * since they are created volatile, inside registry keys that will be however + * removed explictly in the following. + */ for (i = 0; i < ARRAYSIZE(RegistryHives); ++i) { if (RegistryHives[i].State != Create && RegistryHives[i].State != Repair) - continue; + { + RtlInitUnicodeString(&KeyName, RegistryHives[i].RegSymLink); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + RootKeys[GetPredefKeyIndex(RegistryHives[i].PredefKeyHandle)].Handle, + NULL); + KeyHandle = NULL; + Status = NtOpenKey(&KeyHandle, + DELETE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenKey(%wZ) failed, Status 0x%08lx\n", &KeyName, Status); + // return; + } + + NtDeleteKey(KeyHandle); + NtClose(KeyHandle); + } + else + { + RtlInitUnicodeString(&KeyName, RegistryHives[i].HiveRegistryPath); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + // Status = NtUnloadKey(&ObjectAttributes); + Status = NtUnloadKey2(&ObjectAttributes, 1 /* REG_FORCE_UNLOAD */); + DPRINT1("Unmounting '%S' %s\n", RegistryHives[i].HiveRegistryPath, NT_SUCCESS(Status) ? "succeeded" : "failed"); - RtlInitUnicodeString(&KeyName, RegistryHives[i].HiveRegistryPath); - Status = NtUnloadKey(&KeyObjectAttributes); - DPRINT1("Unmounting '%S' %s\n", RegistryHives[i].HiveRegistryPath, NT_SUCCESS(Status) ? "succeeded" : "failed"); + /* Switch the hive state to 'Update' */ + RegistryHives[i].State = Update; + } + } + + /* + * FIXME: Once force-unloading keys is correctly fixed, I'll fix + * this code that closes some of the registry keys that were opened + * inside the hives we've just unmounted above... + */ + + /* Remove the registry root keys */ + for (i = 0; i < ARRAYSIZE(RootKeys); ++i) + { + if (RootKeys[i].Handle) + { + /**/NtFlushKey(RootKeys[i].Handle);/**/ // FIXME: Why does it hang? Answer: because we have some problems in CMAPI! + NtDeleteKey(RootKeys[i].Handle); + NtClose(RootKeys[i].Handle); + RootKeys[i].Handle = NULL; + } } // @@ -1465,6 +1504,7 @@ RegCleanupRegistry( RtlAdjustPrivilege(SE_RESTORE_PRIVILEGE, PrivilegeSet[0], FALSE, &PrivilegeSet[0]); } + VOID SetDefaultPagefile( WCHAR Drive) diff --git a/base/setup/usetup/registry.h b/base/setup/usetup/registry.h index cae50e8271..0548061a35 100644 --- a/base/setup/usetup/registry.h +++ b/base/setup/usetup/registry.h @@ -46,7 +46,7 @@ ImportRegistryFile( NTSTATUS VerifyRegistryHives( IN PUNICODE_STRING InstallPath, - OUT PBOOLEAN ShouldUpdateRegistry); + OUT PBOOLEAN ShouldRepairRegistry); NTSTATUS RegInitializeRegistry( diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 80d6345aa2..a8e72676d3 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -4079,32 +4079,32 @@ RegistryPage(PINPUT_RECORD Ir) PWSTR Action; PWSTR File; PWSTR Section; + BOOLEAN Success; + BOOLEAN ShouldRepairRegistry = FALSE; BOOLEAN Delete; MUIDisplayPage(REGISTRY_PAGE); if (RepairUpdateFlag) { - BOOLEAN ShouldUpdateRegistry = FALSE; - DPRINT1("TODO: Updating / repairing the registry is not completely implemented yet!\n"); /* Verify the registry hives and check whether we need to update or repair any of them */ - Status = VerifyRegistryHives(&DestinationPath, &ShouldUpdateRegistry); + Status = VerifyRegistryHives(&DestinationPath, &ShouldRepairRegistry); if (!NT_SUCCESS(Status)) { DPRINT1("VerifyRegistryHives failed, Status 0x%08lx\n", Status); - ShouldUpdateRegistry = FALSE; - } - if (!ShouldUpdateRegistry) - { - DPRINT1("No need to update the registry\n"); - // return SUCCESS_PAGE; - goto Quit; + ShouldRepairRegistry = FALSE; } + if (!ShouldRepairRegistry) + DPRINT1("No need to repair the registry\n"); } - /* Initialize the registry and setup the default installation hives */ +DoUpdate: + /* Update the registry */ + CONSOLE_SetStatusText(MUIGetString(STRING_REGHIVEUPDATE)); + + /* Initialize the registry and setup the registry hives */ Status = RegInitializeRegistry(&DestinationPath); if (!NT_SUCCESS(Status)) { @@ -4124,14 +4124,41 @@ RegistryPage(PINPUT_RECORD Ir) return QUIT_PAGE; } - /* Update registry */ - CONSOLE_SetStatusText(MUIGetString(STRING_REGHIVEUPDATE)); + if (!RepairUpdateFlag || ShouldRepairRegistry) + { + /* + * We fully setup the hives, in case we are doing a fresh installation + * (RepairUpdateFlag == FALSE), or in case we are doing an update + * (RepairUpdateFlag == TRUE) BUT we have some registry hives to + * "repair" (aka. recreate: ShouldRepairRegistry == TRUE). + */ + + Success = SetupFindFirstLineW(SetupInf, L"HiveInfs.Fresh", NULL, &InfContext); // Windows-compatible + if (!Success) + Success = SetupFindFirstLineW(SetupInf, L"HiveInfs.Install", NULL, &InfContext); // ReactOS-specific - if (!SetupFindFirstLineW(SetupInf, L"HiveInfs.Install", NULL, &InfContext)) + if (!Success) + { + DPRINT1("SetupFindFirstLine() failed\n"); + MUIDisplayError(ERROR_FIND_REGISTRY, Ir, POPUP_WAIT_ENTER); + goto Cleanup; + } + } + else // if (RepairUpdateFlag && !ShouldRepairRegistry) { - DPRINT1("SetupFindFirstLine() failed\n"); - MUIDisplayError(ERROR_FIND_REGISTRY, Ir, POPUP_WAIT_ENTER); - goto Cleanup; + /* + * In case we are doing an update (RepairUpdateFlag == TRUE) and + * NO registry hives need a repair (ShouldRepairRegistry == FALSE), + * we only update the hives. + */ + + Success = SetupFindFirstLineW(SetupInf, L"HiveInfs.Upgrade", NULL, &InfContext); + if (!Success) + { + /* Nothing to do for update! */ + DPRINT1("No update needed for the registry!\n"); + goto Cleanup; + } } do @@ -4150,7 +4177,10 @@ RegistryPage(PINPUT_RECORD Ir) else if (!_wcsicmp(Action, L"DelReg")) Delete = TRUE; else + { + DPRINT1("Unrecognized registry INF action '%S'\n", Action); continue; + } CONSOLE_SetStatusText(MUIGetString(STRING_IMPORTFILE), File); @@ -4162,62 +4192,67 @@ RegistryPage(PINPUT_RECORD Ir) } } while (SetupFindNextLine(&InfContext, &InfContext)); - /* Update display registry settings */ - CONSOLE_SetStatusText(MUIGetString(STRING_DISPLAYETTINGSUPDATE)); - if (!ProcessDisplayRegistry(SetupInf, DisplayList)) + if (!RepairUpdateFlag || ShouldRepairRegistry) { - MUIDisplayError(ERROR_UPDATE_DISPLAY_SETTINGS, Ir, POPUP_WAIT_ENTER); - goto Cleanup; - } + /* See the explanation for this test above */ - /* Set the locale */ - CONSOLE_SetStatusText(MUIGetString(STRING_LOCALESETTINGSUPDATE)); - if (!ProcessLocaleRegistry(LanguageList)) - { - MUIDisplayError(ERROR_UPDATE_LOCALESETTINGS, Ir, POPUP_WAIT_ENTER); - goto Cleanup; - } + /* Update display registry settings */ + CONSOLE_SetStatusText(MUIGetString(STRING_DISPLAYETTINGSUPDATE)); + if (!ProcessDisplayRegistry(SetupInf, DisplayList)) + { + MUIDisplayError(ERROR_UPDATE_DISPLAY_SETTINGS, Ir, POPUP_WAIT_ENTER); + goto Cleanup; + } - /* Add keyboard layouts */ - CONSOLE_SetStatusText(MUIGetString(STRING_ADDKBLAYOUTS)); - if (!AddKeyboardLayouts()) - { - MUIDisplayError(ERROR_ADDING_KBLAYOUTS, Ir, POPUP_WAIT_ENTER); - goto Cleanup; - } + /* Set the locale */ + CONSOLE_SetStatusText(MUIGetString(STRING_LOCALESETTINGSUPDATE)); + if (!ProcessLocaleRegistry(LanguageList)) + { + MUIDisplayError(ERROR_UPDATE_LOCALESETTINGS, Ir, POPUP_WAIT_ENTER); + goto Cleanup; + } - /* Set GeoID */ - if (!SetGeoID(MUIGetGeoID())) - { - MUIDisplayError(ERROR_UPDATE_GEOID, Ir, POPUP_WAIT_ENTER); - goto Cleanup; - } + /* Add keyboard layouts */ + CONSOLE_SetStatusText(MUIGetString(STRING_ADDKBLAYOUTS)); + if (!AddKeyboardLayouts()) + { + MUIDisplayError(ERROR_ADDING_KBLAYOUTS, Ir, POPUP_WAIT_ENTER); + goto Cleanup; + } - if (!IsUnattendedSetup) - { - /* Update keyboard layout settings */ - CONSOLE_SetStatusText(MUIGetString(STRING_KEYBOARDSETTINGSUPDATE)); - if (!ProcessKeyboardLayoutRegistry(LayoutList)) + /* Set GeoID */ + if (!SetGeoID(MUIGetGeoID())) { - MUIDisplayError(ERROR_UPDATE_KBSETTINGS, Ir, POPUP_WAIT_ENTER); + MUIDisplayError(ERROR_UPDATE_GEOID, Ir, POPUP_WAIT_ENTER); goto Cleanup; } - } - /* Add codepage information to registry */ - CONSOLE_SetStatusText(MUIGetString(STRING_CODEPAGEINFOUPDATE)); - if (!AddCodePage()) - { - MUIDisplayError(ERROR_ADDING_CODEPAGE, Ir, POPUP_WAIT_ENTER); - goto Cleanup; - } + if (!IsUnattendedSetup) + { + /* Update keyboard layout settings */ + CONSOLE_SetStatusText(MUIGetString(STRING_KEYBOARDSETTINGSUPDATE)); + if (!ProcessKeyboardLayoutRegistry(LayoutList)) + { + MUIDisplayError(ERROR_UPDATE_KBSETTINGS, Ir, POPUP_WAIT_ENTER); + goto Cleanup; + } + } + + /* Add codepage information to registry */ + CONSOLE_SetStatusText(MUIGetString(STRING_CODEPAGEINFOUPDATE)); + if (!AddCodePage()) + { + MUIDisplayError(ERROR_ADDING_CODEPAGE, Ir, POPUP_WAIT_ENTER); + goto Cleanup; + } - /* Set the default pagefile entry */ - SetDefaultPagefile(DestinationDriveLetter); + /* Set the default pagefile entry */ + SetDefaultPagefile(DestinationDriveLetter); - /* Update the mounted devices list */ - // FIXME: This should technically be done by mountmgr (if AutoMount is enabled)! - SetMountedDeviceValues(PartitionList); + /* Update the mounted devices list */ + // FIXME: This should technically be done by mountmgr (if AutoMount is enabled)! + SetMountedDeviceValues(PartitionList); + } Cleanup: // @@ -4226,7 +4261,18 @@ Cleanup: // RegCleanupRegistry(&DestinationPath); -Quit: + /* + * Check whether we were in update/repair mode but we were actually + * repairing the registry hives. If so, we have finished repairing them, + * and we now reset the flag and run the proper registry update. + * Otherwise we have finished the registry update! + */ + if (RepairUpdateFlag && ShouldRepairRegistry) + { + ShouldRepairRegistry = FALSE; + goto DoUpdate; + } + if (NT_SUCCESS(Status)) { CONSOLE_SetStatusText(MUIGetString(STRING_DONE)); diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index ba2db1012e..f7f44d8f9b 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -524,7 +524,12 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 0000048F = kbdeo.dll [HiveInfs.Install] -AddReg=caroots.inf,AddReg -AddReg=registry.inf,AddReg +; Called "HiveInfs.Fresh" on Windows +AddReg = caroots.inf,AddReg +AddReg = registry.inf,AddReg + +[HiveInfs.Upgrade] +DelReg = registry.inf,DelReg +AddReg = registry.inf,AddReg ; EOF

5 years, 11 months

← Newer
1
...
10
11
12
13
14
15
16
...
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