Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[phater] 74664: [WS2_32_APITESTS] Fix GCC build ROSTESTS-278

by phater＠svn.reactos.org

Author: phater Date: Fri May 26 07:11:13 2017 New Revision: 74664 URL: http://svn.reactos.org/svn/reactos?rev=74664&view=rev Log: [WS2_32_APITESTS] Fix GCC build ROSTESTS-278 Modified: trunk/rostests/apitests/ws2_32/bind.c Modified: trunk/rostests/apitests/ws2_32/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/bind.c?re… ============================================================================== --- trunk/rostests/apitests/ws2_32/bind.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/bind.c [iso-8859-1] Fri May 26 07:11:13 2017 @@ -82,7 +82,7 @@ ok(Error == 0, "Unexpected error %d on getsockname for test %d\n", Error, i); ok(WSAGetLastError() == 0, "Unexpected error %d on getsockname for test %d\n", WSAGetLastError(), i); ok(AddrSize == sizeof(Addr), "Returned size %d differs from expected %d for test %d\n", AddrSize, sizeof(Addr), i); - ok(Addr.sin_addr.s_addr == Tests[i].ExpectedAddr.sin_addr.s_addr, "Expected address %x differs from returned address %x for test %d\n", Tests[i].ExpectedAddr.sin_addr.s_addr, Addr.sin_addr.s_addr, i); + ok(Addr.sin_addr.s_addr == Tests[i].ExpectedAddr.sin_addr.s_addr, "Expected address %lx differs from returned address %lx for test %d\n", Tests[i].ExpectedAddr.sin_addr.s_addr, Addr.sin_addr.s_addr, i); if (Tests[i].ExpectedAddr.sin_port) { ok(Addr.sin_port == Tests[i].ExpectedAddr.sin_port, "Returned port %d differs from expected %d for test %d\n", Addr.sin_port, Tests[i].ExpectedAddr.sin_port, i);

7 years, 7 months

[phater] 74663: [WS2_32_APITESTS] Improve bind test output ROSTESTS-278

by phater＠svn.reactos.org

Author: phater Date: Fri May 26 07:08:06 2017 New Revision: 74663 URL: http://svn.reactos.org/svn/reactos?rev=74663&view=rev Log: [WS2_32_APITESTS] Improve bind test output ROSTESTS-278 Modified: trunk/rostests/apitests/ws2_32/bind.c Modified: trunk/rostests/apitests/ws2_32/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/bind.c?re… ============================================================================== --- trunk/rostests/apitests/ws2_32/bind.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/bind.c [iso-8859-1] Fri May 26 07:08:06 2017 @@ -65,35 +65,36 @@ Socket = socket(AF_INET, Tests[i].Type, Tests[i].Proto); if (Socket == INVALID_SOCKET) { - skip("Failed to create socket, skipping"); + skip("Failed to create socket with error %d for test %d, skipping\n", WSAGetLastError(), i); continue; } Error = bind(Socket, (const struct sockaddr *) &Tests[i].Addr, sizeof(Tests[i].Addr)); - ok_dec(Error, Tests[i].ExpectedResult); + ok(Error == Tests[i].ExpectedResult, "Error %d differs from expected %d for test %d\n", Error, Tests[i].ExpectedResult, i); if (Error) { - ok_dec(WSAGetLastError(), Tests[i].ExpectedWSAResult); + ok(WSAGetLastError() == Tests[i].ExpectedWSAResult, "Error %d differs from expected %d for test %d\n", WSAGetLastError(), Tests[i].ExpectedWSAResult, i); } else { - ok_dec(WSAGetLastError(), 0); + ok(WSAGetLastError() == 0, "Unexpected error %d on bind for test %d\n", WSAGetLastError(), i); AddrSize = sizeof(Addr); Error = getsockname(Socket, (struct sockaddr *) &Addr, &AddrSize); - ok(Error == 0, "Error getsockname for test %d, Error %d\n", i, Error); - ok_dec(WSAGetLastError(), 0); - ok_dec(AddrSize, sizeof(Addr)); - ok_dec(Addr.sin_addr.s_addr, Tests[i].ExpectedAddr.sin_addr.s_addr); + ok(Error == 0, "Unexpected error %d on getsockname for test %d\n", Error, i); + ok(WSAGetLastError() == 0, "Unexpected error %d on getsockname for test %d\n", WSAGetLastError(), i); + ok(AddrSize == sizeof(Addr), "Returned size %d differs from expected %d for test %d\n", AddrSize, sizeof(Addr), i); + ok(Addr.sin_addr.s_addr == Tests[i].ExpectedAddr.sin_addr.s_addr, "Expected address %x differs from returned address %x for test %d\n", Tests[i].ExpectedAddr.sin_addr.s_addr, Addr.sin_addr.s_addr, i); if (Tests[i].ExpectedAddr.sin_port) { - ok_dec(Addr.sin_port, Tests[i].ExpectedAddr.sin_port); + ok(Addr.sin_port == Tests[i].ExpectedAddr.sin_port, "Returned port %d differs from expected %d for test %d\n", Addr.sin_port, Tests[i].ExpectedAddr.sin_port, i); } else { - ok(Addr.sin_port != 0, "Port remained zero\n"); + ok(Addr.sin_port != 0, "Port remained zero for test %d\n", i); } } Error = closesocket(Socket); - ok_dec(Error, 0); + ok(Error == 0, "Unexpected error %d on closesocket for test %d\n", Error, i); + ok(WSAGetLastError() == 0, "Unexpected error %d on closesocket for test %d\n", WSAGetLastError(), i); } #if 0 /* Check double bind */

7 years, 7 months

[hbelusca] 74662: [INCLUDEs:ARC]: Fix some structure members of LOADER_PARAMETER_EXTENSION and SETUP_LOADER_BLOCK. Add some documentation & links regarded these structures to document which members...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri May 26 02:15:54 2017 New Revision: 74662 URL: http://svn.reactos.org/svn/reactos?rev=74662&view=rev Log: [INCLUDEs:ARC]: Fix some structure members of LOADER_PARAMETER_EXTENSION and SETUP_LOADER_BLOCK. Add some documentation & links regarded these structures to document which members change/disappear starting some NT version. Also, turn some Win32 LPSTR into NT' PSTR or PCHAR types. Modified: trunk/reactos/sdk/include/reactos/arc/arc.h trunk/reactos/sdk/include/reactos/arc/setupblk.h Modified: trunk/reactos/sdk/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/arc/ar… ============================================================================== --- trunk/reactos/sdk/include/reactos/arc/arc.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/arc/arc.h [iso-8859-1] Fri May 26 02:15:54 2017 @@ -110,7 +110,7 @@ ULONG AffinityMask; ULONG ConfigurationDataLength; ULONG IdentifierLength; - LPSTR Identifier; + PCHAR Identifier; } CONFIGURATION_COMPONENT, *PCONFIGURATION_COMPONENT; typedef struct _CONFIGURATION_COMPONENT_DATA @@ -338,19 +338,22 @@ // // Extended Loader Parameter Block // +// See http://www.geoffchappell.com/studies/windows/km/ntoskrnl/structs/loader_par… +// for more details. +// typedef struct _LOADER_PARAMETER_EXTENSION { ULONG Size; PROFILE_PARAMETER_BLOCK Profile; - ULONG MajorVersion; - ULONG MinorVersion; + ULONG MajorVersion; /* Not anymore present starting NT 6.1 */ + ULONG MinorVersion; /* Not anymore present starting NT 6.1 */ PVOID EmInfFileImage; ULONG EmInfFileSize; PVOID TriageDumpBlock; // // NT 5.1 // - ULONG LoaderPagesSpanned; + ULONG_PTR LoaderPagesSpanned; /* Not anymore present starting NT 6.2 */ PHEADLESS_LOADER_BLOCK HeadlessLoaderBlock; PSMBIOS_TABLE_HEADER SMBiosEPSHeader; PVOID DrvDBImage; @@ -359,18 +362,22 @@ // // NT 5.2+ // - PCHAR HalpIRQLToTPR; - PCHAR HalpVectorToIRQL; +#ifdef _X86_ + PUCHAR HalpIRQLToTPR; + PUCHAR HalpVectorToIRQL; +#endif LIST_ENTRY FirmwareDescriptorListHead; PVOID AcpiTable; ULONG AcpiTableSize; // // NT 5.2 SP1+ // +/** NT-version-dependent flags **/ ULONG BootViaWinload:1; ULONG BootViaEFI:1; ULONG Reserved:30; - LOADER_PERFORMANCE_DATA LoaderPerformanceData; +/********************************/ + PLOADER_PERFORMANCE_DATA LoaderPerformanceData; LIST_ENTRY BootApplicationPersistentData; PVOID WmdTestResult; GUID BootIdentifier; @@ -478,6 +485,9 @@ // // Loader Parameter Block // +// See http://www.geoffchappell.com/studies/windows/km/ntoskrnl/structs/loader_par… +// for more details. +// typedef struct _LOADER_PARAMETER_BLOCK { LIST_ENTRY LoadOrderListHead; @@ -490,11 +500,11 @@ ULONG RegistryLength; PVOID RegistryBase; PCONFIGURATION_COMPONENT_DATA ConfigurationRoot; - LPSTR ArcBootDeviceName; - LPSTR ArcHalDeviceName; - LPSTR NtBootPathName; - LPSTR NtHalPathName; - LPSTR LoadOptions; + PSTR ArcBootDeviceName; + PSTR ArcHalDeviceName; + PSTR NtBootPathName; + PSTR NtHalPathName; + PSTR LoadOptions; PNLS_DATA_BLOCK NlsData; PARC_DISK_INFORMATION ArcDiskInformation; PVOID OemFontFile; Modified: trunk/reactos/sdk/include/reactos/arc/setupblk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/arc/se… ============================================================================== --- trunk/reactos/sdk/include/reactos/arc/setupblk.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/arc/setupblk.h [iso-8859-1] Fri May 26 02:15:54 2017 @@ -126,7 +126,7 @@ ULONG UnsupDriversInfFileLength; PVOID BootFontFile; ULONG BootFontFileLength; - MONITOR_CONFIGURATION_DATA Monitor; + PMONITOR_CONFIGURATION_DATA Monitor; PCHAR MonitorId; PDETECTED_DEVICE BootBusExtenders; PDETECTED_DEVICE BusExtenders;

7 years, 7 months

[hbelusca] 74661: [SETUPLIB]: Add a new module "bldrsup.c" (WIP) where I place all the NT boot loaders (i.e. ntldr, freeldr, and possibly bootmgr in the future) management functions. So far we only...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 25 23:52:50 2017 New Revision: 74661 URL: http://svn.reactos.org/svn/reactos?rev=74661&view=rev Log: [SETUPLIB]: Add a new module "bldrsup.c" (WIP) where I place all the NT boot loaders (i.e. ntldr, freeldr, and possibly bootmgr in the future) management functions. So far we only have: - a function FindNTOSBootLoader() that detects the existence of a given boot loader; - a function EnumerateNTOSBootEntries() (and corresponding helpers) that enumerate the different boot entries in the configuration file(s) for a given boot loader, and for each entry, calls a user-provided callback. Only supported at the moment: ntldr and freeldr. Doing that allows me to simplify large portions of the NT-OS detection code so that it becomes more bootloader-agnostic, and this will help me for simplifying some parts of usetup/bootsup.c too, later... Added: branches/setup_improvements/base/setup/lib/bldrsup.c (with props) branches/setup_improvements/base/setup/lib/bldrsup.h (with props) Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt branches/setup_improvements/base/setup/lib/osdetect.c Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/CMakeLists.txt [iso-8859-1] Thu May 25 23:52:50 2017 @@ -1,6 +1,7 @@ list(APPEND SOURCE arcname.c + bldrsup.c filesup.c fsutil.c genlist.c Added: branches/setup_improvements/base/setup/lib/bldrsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/bldrsup.c (added) +++ branches/setup_improvements/base/setup/lib/bldrsup.c [iso-8859-1] Thu May 25 23:52:50 2017 @@ -0,0 +1,353 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Setup Library + * FILE: base/setup/lib/bldrsup.c + * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) + * boot loaders management. + * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +// TODO: Add support for NT 6.x family! (detection + BCD manipulation). + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#include "bldrsup.h" +#include "filesup.h" +#include "inicache.h" + +#define NDEBUG +#include <debug.h> + + +/* GLOBALS ******************************************************************/ + +typedef struct _NTOS_BOOT_LOADER_FILES +{ + NTOS_BOOT_LOADER_TYPE Type; + PCWSTR LoaderExecutable; + PCWSTR LoaderConfigurationFile; + // EnumerateInstallations; +} NTOS_BOOT_LOADER_FILES, *PNTOS_BOOT_LOADER_FILES; + +// Question 1: What if config file is optional? +// Question 2: What if many config files are possible? +NTOS_BOOT_LOADER_FILES NtosBootLoaders[] = +{ + {FreeLdr, L"freeldr.sys", L"freeldr.ini"}, + {NtLdr , L"ntldr" , L"boot.ini"}, // FIXME: What about osloader.exe, etc...? +// {NtLdr , L"setupldr" , L"txtsetup.sif"}, // FIXME +// {BootMgr, L"bootmgr" , L"BCD"} +}; + + +/* FUNCTIONS ****************************************************************/ + +// +// We need, for each type of bootloader (FreeLdr, NtLdr, Bootmgr): +// 1. A function that detects its presence and its version; +// 2. A function that opens/closes its corresponding configuration file; +// 3. A function that adds a new boot entry. Note that for the first two BLDRs +// this is a .INI file, while in the latter case this is a registry hive... +// + +NTSTATUS +FindNTOSBootLoader( // By handle + IN HANDLE PartitionHandle, // OPTIONAL + IN NTOS_BOOT_LOADER_TYPE Type, + OUT PULONG Version OPTIONAL) +// OUT PHANDLE ConfigFileHande OPTIONAL ???? +{ + // UINT i; + + if (Type >= BldrTypeMax) + return STATUS_INVALID_PARAMETER; + + // FIXME: Unused for now, but should be used later!! + *Version = 0; + // TODO: Check for BLDR version ONLY if Version != NULL + + /* Check whether the loader executable exists */ + if (!DoesFileExist(PartitionHandle, NtosBootLoaders[Type].LoaderExecutable)) + { + /* The loader does not exist, continue with another one */ + // DPRINT1("Loader executable '%S' does not exist, continue with another one...\n", NtosBootLoaders[Type].LoaderExecutable); + DPRINT1("Loader executable '%S' does not exist\n", NtosBootLoaders[Type].LoaderExecutable); + return STATUS_NOT_FOUND; + } + + /* Check whether the loader configuration file exists */ + if (!DoesFileExist(PartitionHandle, NtosBootLoaders[Type].LoaderConfigurationFile)) + { + /* The loader does not exist, continue with another one */ + // FIXME: Consider it might be optional?? + // DPRINT1("Loader configuration file '%S' does not exist, continue with another one...\n", NtosBootLoaders[Type].LoaderConfigurationFile); + DPRINT1("Loader configuration file '%S' does not exist\n", NtosBootLoaders[Type].LoaderConfigurationFile); + return STATUS_NOT_FOUND; + } + +#if 0 + /* Check whether the loader configuration file exists */ + Status = OpenAndMapFile(PartitionHandle, NtosBootLoaders[Type].LoaderConfigurationFile, + &FileHandle, &SectionHandle, &ViewBase, &FileSize); + if (!NT_SUCCESS(Status)) + { + /* The loader does not exist, continue with another one */ + // FIXME: Consider it might be optional?? + DPRINT1("Loader configuration file '%S' does not exist, continue with another one...\n", NtosBootLoaders[Type].LoaderConfigurationFile); + return STATUS_NOT_FOUND; + } +#endif + + return STATUS_SUCCESS; +} + + +static NTSTATUS +FreeLdrEnumerateBootEntries( + IN PCHAR FileBuffer, + IN ULONG FileLength, +// IN ULONG Flags, // Determine which data to retrieve + IN PENUM_BOOT_ENTRIES_ROUTINE EnumBootEntriesRoutine, + IN PVOID Parameter OPTIONAL) +{ + NTSTATUS Status; + PINICACHE IniCache; + PINICACHEITERATOR Iterator; + PINICACHESECTION IniSection, OsIniSection; + PWCHAR SectionName, KeyData; +/**/NTOS_BOOT_ENTRY xxBootEntry;/**/ + PNTOS_BOOT_ENTRY BootEntry = &xxBootEntry; + UNICODE_STRING InstallName; + + /* Open an *existing* FreeLdr.ini configuration file */ + Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); + if (!NT_SUCCESS(Status)) + return Status; + + /* Get the "Operating Systems" section */ + IniSection = IniCacheGetSection(IniCache, L"Operating Systems"); + if (IniSection == NULL) + { + IniCacheDestroy(IniCache); + return STATUS_UNSUCCESSFUL; + } + + /* Enumerate all the valid installations */ + Iterator = IniCacheFindFirstValue(IniSection, &SectionName, &KeyData); + if (!Iterator) goto Quit; + do + { + // FIXME: Poor-man quotes removal (improvement over bootsup.c:UpdateFreeLoaderIni). + if (KeyData[0] == L'"') + { + /* Quoted name, copy up to the closing quote */ + PWCHAR Begin = &KeyData[1]; + PWCHAR End = wcschr(Begin, L'"'); + if (!End) + End = Begin + wcslen(Begin); + RtlInitEmptyUnicodeString(&InstallName, Begin, (ULONG_PTR)End - (ULONG_PTR)Begin); + InstallName.Length = InstallName.MaximumLength; + } + else + { + /* Non-quoted name, copy everything */ + RtlInitUnicodeString(&InstallName, KeyData); + } + + DPRINT1("Boot entry '%wZ' in OS section '%S'\n", &InstallName, SectionName); + + /* Search for an existing ReactOS entry */ + OsIniSection = IniCacheGetSection(IniCache, SectionName); + if (!OsIniSection) + continue; + + /* Check for supported boot type "Windows2003" */ + Status = IniCacheGetKey(OsIniSection, L"BootType", &KeyData); + if (NT_SUCCESS(Status)) + { + // TODO: What to do with "Windows" ; "WindowsNT40" ; "ReactOSSetup" ? + if ((KeyData == NULL) || + ( (_wcsicmp(KeyData, L"Windows2003") != 0) && + (_wcsicmp(KeyData, L"\"Windows2003\"") != 0) )) + { + /* This is not a ReactOS entry */ + continue; + } + } + else + { + /* Certainly not a ReactOS installation */ + continue; + } + + /* BootType is Windows2003. Now check its SystemPath. */ + Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); + if (!NT_SUCCESS(Status)) + { + DPRINT1(" A Win2k3 install '%wZ' without an ARC path?!\n", &InstallName); + continue; + } + + DPRINT1(" Found a candidate Win2k3 install '%wZ' with ARC path '%S'\n", &InstallName, KeyData); + // KeyData == SystemRoot; + + BootEntry->FriendlyName = &InstallName; + BootEntry->OsLoadPath = KeyData; + /* Unused stuff (for now...) */ + BootEntry->BootFilePath = NULL; + BootEntry->OsOptions = NULL; + BootEntry->OsLoadOptions = NULL; + + Status = EnumBootEntriesRoutine(FreeLdr, BootEntry, Parameter); + // TODO: Stop enumeration if !NT_SUCCESS(Status); + } + while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); + + IniCacheFindClose(Iterator); + +Quit: + IniCacheDestroy(IniCache); + return STATUS_SUCCESS; +} + +static NTSTATUS +NtLdrEnumerateBootEntries( + IN PCHAR FileBuffer, + IN ULONG FileLength, +// IN ULONG Flags, // Determine which data to retrieve + IN PENUM_BOOT_ENTRIES_ROUTINE EnumBootEntriesRoutine, + IN PVOID Parameter OPTIONAL) +{ + NTSTATUS Status; + PINICACHE IniCache; + PINICACHEITERATOR Iterator; + PINICACHESECTION IniSection; + PWCHAR SectionName, KeyData; +/**/NTOS_BOOT_ENTRY xxBootEntry;/**/ + PNTOS_BOOT_ENTRY BootEntry = &xxBootEntry; + UNICODE_STRING InstallName; + + /* Open an *existing* boot.ini configuration file */ + Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); + if (!NT_SUCCESS(Status)) + return Status; + + /* Get the "Operating Systems" section */ + IniSection = IniCacheGetSection(IniCache, L"operating systems"); + if (IniSection == NULL) + { + IniCacheDestroy(IniCache); + return STATUS_UNSUCCESSFUL; + } + + /* Enumerate all the valid installations */ + Iterator = IniCacheFindFirstValue(IniSection, &SectionName, &KeyData); + if (!Iterator) goto Quit; + do + { + // FIXME: Poor-man quotes removal (improvement over bootsup.c:UpdateFreeLoaderIni). + if (KeyData[0] == L'"') + { + /* Quoted name, copy up to the closing quote */ + PWCHAR Begin = &KeyData[1]; + PWCHAR End = wcschr(Begin, L'"'); + if (!End) + End = Begin + wcslen(Begin); + RtlInitEmptyUnicodeString(&InstallName, Begin, (ULONG_PTR)End - (ULONG_PTR)Begin); + InstallName.Length = InstallName.MaximumLength; + } + else + { + /* Non-quoted name, copy everything */ + RtlInitUnicodeString(&InstallName, KeyData); + } + + DPRINT1("Boot entry '%wZ' in OS section '%S'\n", &InstallName, SectionName); + + DPRINT1(" Found a Win2k3 install '%wZ' with ARC path '%S'\n", &InstallName, SectionName); + // SectionName == SystemRoot; + + BootEntry->FriendlyName = &InstallName; + BootEntry->OsLoadPath = SectionName; + /* Unused stuff (for now...) */ + BootEntry->BootFilePath = NULL; + BootEntry->OsOptions = NULL; + BootEntry->OsLoadOptions = NULL; + + Status = EnumBootEntriesRoutine(NtLdr, BootEntry, Parameter); + // TODO: Stop enumeration if !NT_SUCCESS(Status); + } + while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); + + IniCacheFindClose(Iterator); + +Quit: + IniCacheDestroy(IniCache); + return STATUS_SUCCESS; +} + + +// This function may be viewed as being similar to ntos:NtEnumerateBootEntries(). +NTSTATUS +EnumerateNTOSBootEntries( + IN HANDLE PartitionHandle, // OPTIONAL + IN NTOS_BOOT_LOADER_TYPE Type, +// IN ULONG Flags, // Determine which data to retrieve + IN PENUM_BOOT_ENTRIES_ROUTINE EnumBootEntriesRoutine, + IN PVOID Parameter OPTIONAL) +{ + NTSTATUS Status; + HANDLE FileHandle; + HANDLE SectionHandle; + // SIZE_T ViewSize; + ULONG FileSize; + PVOID ViewBase; + + /* + * NOTE: Currently we open & map the loader configuration file without + * further tests. It's OK as long as we only deal with FreeLdr's freeldr.ini + * and NTLDR's boot.ini files. But as soon as we'll implement support for + * BOOTMGR detection, the "configuration file" will be the BCD registry + * hive and then, we'll have instead to mount the hive & open it. + */ + + /* Check whether the loader configuration file exists */ + Status = OpenAndMapFile(PartitionHandle, NtosBootLoaders[Type].LoaderConfigurationFile, + &FileHandle, &SectionHandle, &ViewBase, &FileSize); + if (!NT_SUCCESS(Status)) + { + /* The loader does not exist, continue with another one */ + // FIXME: Consider it might be optional?? + // DPRINT1("Loader configuration file '%S' does not exist, continue with another one...\n", NtosBootLoaders[Type].LoaderConfigurationFile); + DPRINT1("Loader configuration file '%S' does not exist\n", NtosBootLoaders[Type].LoaderConfigurationFile); + return Status; + } + + /* The loader configuration file exists, interpret it to find valid installations */ + switch (NtosBootLoaders[Type].Type) + { + case FreeLdr: + Status = FreeLdrEnumerateBootEntries(ViewBase, FileSize, /* Flags, */ + EnumBootEntriesRoutine, Parameter); + break; + + case NtLdr: + Status = NtLdrEnumerateBootEntries(ViewBase, FileSize, /* Flags, */ + EnumBootEntriesRoutine, Parameter); + break; + + default: + DPRINT1("Loader type %d is currently unsupported!\n", NtosBootLoaders[Type].Type); + Status = STATUS_SUCCESS; + } + + /* Finally, unmap and close the file */ + UnMapFile(SectionHandle, ViewBase); + NtClose(FileHandle); + + return Status; +} + +/* EOF */ Propchange: branches/setup_improvements/base/setup/lib/bldrsup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/setup_improvements/base/setup/lib/bldrsup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/bldrsup.h (added) +++ branches/setup_improvements/base/setup/lib/bldrsup.h [iso-8859-1] Thu May 25 23:52:50 2017 @@ -0,0 +1,60 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Setup Library + * FILE: base/setup/lib/bldrsup.h + * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) + * boot loaders management. + * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +// TODO: Add support for NT 6.x family! (detection + BCD manipulation). + +#pragma once + +typedef enum _NTOS_BOOT_LOADER_TYPE +{ + FreeLdr, // ReactOS' FreeLoader + NtLdr, // Windows <= 2k3 NT "FlexBoot" OS Loader NTLDR +// BootMgr, // Vista+ BCD-oriented BOOTMGR + BldrTypeMax +} NTOS_BOOT_LOADER_TYPE; + +/* + * This structure is inspired from the EFI boot entry structures + * BOOT_ENTRY, BOOT_OPTIONS and FILE_PATH that are defined in ndk/iotypes.h . + */ +typedef struct _NTOS_BOOT_ENTRY +{ + // ULONG Version; // We might use the ntldr version here?? Or the "BootType" as in freeldr? + // ULONG Length; + // ULONG Id; // Boot entry number (position) in the list +/** PCWSTR FriendlyName; // Human-readable boot entry description **/ + PUNICODE_STRING FriendlyName; + PCWSTR BootFilePath; // Path to e.g. osloader.exe, or winload.efi + PCWSTR OsLoadPath; // The OS SystemRoot path + PCWSTR OsOptions; + PCWSTR OsLoadOptions; +} NTOS_BOOT_ENTRY, *PNTOS_BOOT_ENTRY; + + +typedef NTSTATUS +(NTAPI *PENUM_BOOT_ENTRIES_ROUTINE)( + IN NTOS_BOOT_LOADER_TYPE Type, + IN PNTOS_BOOT_ENTRY BootEntry, + IN PVOID Parameter OPTIONAL); + + +NTSTATUS +FindNTOSBootLoader( // By handle + IN HANDLE PartitionHandle, // OPTIONAL + IN NTOS_BOOT_LOADER_TYPE Type, + OUT PULONG Version); + +NTSTATUS +EnumerateNTOSBootEntries( + IN HANDLE PartitionHandle, // OPTIONAL + IN NTOS_BOOT_LOADER_TYPE Type, + IN PENUM_BOOT_ENTRIES_ROUTINE EnumBootEntriesRoutine, + IN PVOID Parameter OPTIONAL); + +/* EOF */ Propchange: branches/setup_improvements/base/setup/lib/bldrsup.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/setup_improvements/base/setup/lib/osdetect.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/osdetect.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/osdetect.c [iso-8859-1] Thu May 25 23:52:50 2017 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup + * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/osdetect.c * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) * operating systems detection code. @@ -13,9 +13,9 @@ #include "ntverrsrc.h" // #include "arcname.h" +#include "bldrsup.h" #include "filesup.h" #include "genlist.h" -#include "inicache.h" #include "partlist.h" #include "arcname.h" #include "osdetect.h" @@ -76,31 +76,6 @@ #endif -typedef enum _NTOS_BOOT_LOADER_TYPE -{ - FreeLdr, // ReactOS' FreeLDR - NtLdr, // Windows <= 2k3 NTLDR -// BootMgr, // Vista+ BCD-oriented BOOTMGR -} NTOS_BOOT_LOADER_TYPE; - -typedef struct _NTOS_BOOT_LOADER_FILES -{ - NTOS_BOOT_LOADER_TYPE Type; - PCWSTR LoaderExecutable; - PCWSTR LoaderConfigurationFile; - // EnumerateInstallations; -} NTOS_BOOT_LOADER_FILES, *PNTOS_BOOT_LOADER_FILES; - -// Question 1: What if config file is optional? -// Question 2: What if many config files are possible? -NTOS_BOOT_LOADER_FILES NtosBootLoaders[] = -{ - {FreeLdr, L"freeldr.sys", L"freeldr.ini"}, - {NtLdr , L"ntldr" , L"boot.ini"}, - {NtLdr , L"setupldr" , L"txtsetup.sif"}, -// {BootMgr, L"bootmgr" , ???} -}; - static BOOLEAN IsValidNTOSInstallation_UStr( @@ -128,339 +103,146 @@ IN PPARTENTRY PartEntry OPTIONAL, IN PCWSTR InstallationName); +typedef struct _ENUM_INSTALLS_DATA +{ + IN OUT PGENERIC_LIST List; + IN PPARTLIST PartList; + // IN PPARTENTRY PartEntry; +} ENUM_INSTALLS_DATA, *PENUM_INSTALLS_DATA; + +// PENUM_BOOT_ENTRIES_ROUTINE static NTSTATUS -FreeLdrEnumerateInstallations( - IN OUT PGENERIC_LIST List, - IN PPARTLIST PartList, - // IN PPARTENTRY PartEntry, - IN PCHAR FileBuffer, - IN ULONG FileLength) -{ - NTSTATUS Status; - PINICACHE IniCache; - PINICACHEITERATOR Iterator; - PINICACHESECTION IniSection, OsIniSection; - PWCHAR SectionName, KeyData; - UNICODE_STRING InstallName; +NTAPI +EnumerateInstallations( + IN NTOS_BOOT_LOADER_TYPE Type, + IN PNTOS_BOOT_ENTRY BootEntry, + IN PVOID Parameter OPTIONAL) +{ + PENUM_INSTALLS_DATA Data = (PENUM_INSTALLS_DATA)Parameter; PNTOS_INSTALLATION NtOsInstall; UNICODE_STRING SystemRootPath; WCHAR SystemRoot[MAX_PATH]; WCHAR InstallNameW[MAX_PATH]; - /* Open an *existing* FreeLdr.ini configuration file */ - Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); - if (!NT_SUCCESS(Status)) - return Status; - - /* Get the "Operating Systems" section */ - IniSection = IniCacheGetSection(IniCache, L"Operating Systems"); - if (IniSection == NULL) - { - IniCacheDestroy(IniCache); - return STATUS_UNSUCCESSFUL; - } - - /* Enumerate all the valid installations */ - Iterator = IniCacheFindFirstValue(IniSection, &SectionName, &KeyData); - if (!Iterator) goto Quit; - do - { - // FIXME: Poor-man quotes removal (improvement over bootsup.c:UpdateFreeLoaderIni). - if (KeyData[0] == L'"') - { - /* Quoted name, copy up to the closing quote */ - PWCHAR Begin = &KeyData[1]; - PWCHAR End = wcschr(Begin, L'"'); - if (!End) - End = Begin + wcslen(Begin); - RtlInitEmptyUnicodeString(&InstallName, Begin, (ULONG_PTR)End - (ULONG_PTR)Begin); - InstallName.Length = InstallName.MaximumLength; - } - else - { - /* Non-quoted name, copy everything */ - RtlInitUnicodeString(&InstallName, KeyData); - } - - DPRINT1("Possible installation '%wZ' in OS section '%S'\n", &InstallName, SectionName); - - /* Search for an existing ReactOS entry */ - OsIniSection = IniCacheGetSection(IniCache, SectionName); - if (!OsIniSection) - continue; - + ULONG DiskNumber = 0, PartitionNumber = 0; + PCWSTR PathComponent = NULL; + PDISKENTRY DiskEntry = NULL; + PPARTENTRY PartEntry = NULL; + + /* We have a boot entry */ + + UNICODE_STRING InstallName; + // /**/RtlInitUnicodeString(&InstallName, BootEntry->FriendlyName);/**/ + InstallName = *BootEntry->FriendlyName; + +#if 0 + if (Type == FreeLdr) + { /* Check for supported boot type "Windows2003" */ - Status = IniCacheGetKey(OsIniSection, L"BootType", &KeyData); - if (NT_SUCCESS(Status)) - { - // TODO: What to do with "Windows" ; "WindowsNT40" ; "ReactOSSetup" ? - if ((KeyData == NULL) || - ( (_wcsicmp(KeyData, L"Windows2003") != 0) && - (_wcsicmp(KeyData, L"\"Windows2003\"") != 0) )) - { - /* This is not a ReactOS entry */ - continue; - } - } - else - { + + // TODO: What to do with "Windows" ; "WindowsNT40" ; "ReactOSSetup" ? + if ((BootType == NULL) || + ( (_wcsicmp(BootType, L"Windows2003") != 0) && + (_wcsicmp(BootType, L"\"Windows2003\"") != 0) )) + { + /* This is not a ReactOS entry */ /* Certainly not a ReactOS installation */ - continue; - } - - /* BootType is Windows2003. Now check SystemPath. */ - Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); - if (!NT_SUCCESS(Status)) - { - DPRINT1(" A Win2k3 install '%wZ' without an ARC path?!\n", &InstallName); - continue; - } - - DPRINT1(" Found a candidate Win2k3 install '%wZ' with ARC path '%S'\n", &InstallName, KeyData); - - // TODO: Normalize the ARC path. - - /* - * Check whether we already have an installation with this ARC path. - * If this is the case, stop there. - */ - NtOsInstall = FindExistingNTOSInstall(List, KeyData, NULL); - if (NtOsInstall) - { - DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", - NtOsInstall->InstallationName, &NtOsInstall->SystemArcPath); - continue; - } - - /* - * Convert the ARC path into an NT path, from which we will deduce - * the real disk drive & partition on which the candidate installation - * resides, as well verifying whether it is indeed an NTOS installation. - */ - RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot)); - if (!ArcPathToNtPath(&SystemRootPath, KeyData, PartList)) - { - DPRINT1("ArcPathToNtPath(%S) failed, skip the installation.\n", KeyData); - continue; - } - - DPRINT1("ArcPathToNtPath() succeeded: '%S' --> '%wZ'\n", KeyData, &SystemRootPath); - - /* - * Check whether we already have an installation with this NT path. - * If this is the case, stop there. - */ - NtOsInstall = FindExistingNTOSInstall(List, NULL /*KeyData*/, &SystemRootPath); - if (NtOsInstall) - { - DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", - NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); - continue; - } - - /* Set SystemRootPath */ - DPRINT1("FreeLdrEnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); - - if (IsValidNTOSInstallation_UStr(&SystemRootPath)) - { - ULONG DiskNumber = 0, PartitionNumber = 0; - PCWSTR PathComponent = NULL; - PDISKENTRY DiskEntry = NULL; - PPARTENTRY PartEntry = NULL; - - DPRINT1("Found a valid NTOS installation in SystemRoot ARC path '%S', NT path '%wZ'\n", KeyData, &SystemRootPath); - - /* From the NT path, compute the disk, partition and path components */ - if (NtPathToDiskPartComponents(SystemRootPath.Buffer, &DiskNumber, &PartitionNumber, &PathComponent)) - { - DPRINT1("SystemRootPath = '%wZ' points to disk #%d, partition #%d, path '%S'\n", - &SystemRootPath, DiskNumber, PartitionNumber, PathComponent); - - /* Retrieve the corresponding disk and partition */ - if (!GetDiskOrPartition(PartList, DiskNumber, PartitionNumber, &DiskEntry, &PartEntry)) - DPRINT1("GetDiskOrPartition(disk #%d, partition #%d) failed\n", DiskNumber, PartitionNumber); - } - else - { - DPRINT1("NtPathToDiskPartComponents(%wZ) failed\n", &SystemRootPath); - } - - if (PartEntry && PartEntry->DriveLetter) - { - /* We have retrieved a partition that is mounted */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%wZ\"", - PartEntry->DriveLetter, PathComponent, &InstallName); - } - else - { - /* We failed somewhere, just show the NT path */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%wZ\"", - &SystemRootPath, &InstallName); - } - AddNTOSInstallation(List, KeyData, &SystemRootPath, PathComponent, - DiskNumber, PartitionNumber, PartEntry, - InstallNameW); - } - } - while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); - - IniCacheFindClose(Iterator); - -Quit: - IniCacheDestroy(IniCache); - return STATUS_SUCCESS; -} - -static NTSTATUS -NtLdrEnumerateInstallations( - IN OUT PGENERIC_LIST List, - IN PPARTLIST PartList, - // IN PPARTENTRY PartEntry, - IN PCHAR FileBuffer, - IN ULONG FileLength) -{ - NTSTATUS Status; - PINICACHE IniCache; - PINICACHEITERATOR Iterator; - PINICACHESECTION IniSection; - PWCHAR SectionName, KeyData; - UNICODE_STRING InstallName; - - PNTOS_INSTALLATION NtOsInstall; - UNICODE_STRING SystemRootPath; - WCHAR SystemRoot[MAX_PATH]; - WCHAR InstallNameW[MAX_PATH]; - - /* Open an *existing* FreeLdr.ini configuration file */ - Status = IniCacheLoadFromMemory(&IniCache, FileBuffer, FileLength, FALSE); - if (!NT_SUCCESS(Status)) - return Status; - - /* Get the "Operating Systems" section */ - IniSection = IniCacheGetSection(IniCache, L"operating systems"); - if (IniSection == NULL) - { - IniCacheDestroy(IniCache); - return STATUS_UNSUCCESSFUL; - } - - /* Enumerate all the valid installations */ - Iterator = IniCacheFindFirstValue(IniSection, &SectionName, &KeyData); - if (!Iterator) goto Quit; - do - { - // FIXME: Poor-man quotes removal (improvement over bootsup.c:UpdateFreeLoaderIni). - if (KeyData[0] == L'"') - { - /* Quoted name, copy up to the closing quote */ - PWCHAR Begin = &KeyData[1]; - PWCHAR End = wcschr(Begin, L'"'); - if (!End) - End = Begin + wcslen(Begin); - RtlInitEmptyUnicodeString(&InstallName, Begin, (ULONG_PTR)End - (ULONG_PTR)Begin); - InstallName.Length = InstallName.MaximumLength; - } - else - { - /* Non-quoted name, copy everything */ - RtlInitUnicodeString(&InstallName, KeyData); - } - - DPRINT1("Possible installation '%wZ' with ARC path '%S'\n", &InstallName, SectionName); - - DPRINT1(" Found a Win2k3 install '%wZ' with ARC path '%S'\n", &InstallName, SectionName); - - // TODO: Normalize the ARC path. - - /* - * Check whether we already have an installation with this ARC path. - * If this is the case, stop there. - */ - NtOsInstall = FindExistingNTOSInstall(List, SectionName, NULL); - if (NtOsInstall) - { - DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", - NtOsInstall->InstallationName, &NtOsInstall->SystemArcPath); - continue; - } - - /* - * Convert the ARC path into an NT path, from which we will deduce - * the real disk drive & partition on which the candidate installation - * resides, as well verifying whether it is indeed an NTOS installation. - */ - RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot)); - if (!ArcPathToNtPath(&SystemRootPath, SectionName, PartList)) - { - DPRINT1("ArcPathToNtPath(%S) failed, skip the installation.\n", SectionName); - continue; - } - - DPRINT1("ArcPathToNtPath() succeeded: '%S' --> '%wZ'\n", SectionName, &SystemRootPath); - - /* - * Check whether we already have an installation with this NT path. - * If this is the case, stop there. - */ - NtOsInstall = FindExistingNTOSInstall(List, NULL /*SectionName*/, &SystemRootPath); - if (NtOsInstall) - { - DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", - NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); - continue; - } - - /* Set SystemRootPath */ - DPRINT1("NtLdrEnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); - - if (IsValidNTOSInstallation_UStr(&SystemRootPath)) - { - ULONG DiskNumber = 0, PartitionNumber = 0; - PCWSTR PathComponent = NULL; - PDISKENTRY DiskEntry = NULL; - PPARTENTRY PartEntry = NULL; - - DPRINT1("Found a valid NTOS installation in SystemRoot ARC path '%S', NT path '%wZ'\n", SectionName, &SystemRootPath); - - /* From the NT path, compute the disk, partition and path components */ - if (NtPathToDiskPartComponents(SystemRootPath.Buffer, &DiskNumber, &PartitionNumber, &PathComponent)) - { - DPRINT1("SystemRootPath = '%wZ' points to disk #%d, partition #%d, path '%S'\n", - &SystemRootPath, DiskNumber, PartitionNumber, PathComponent); - - /* Retrieve the corresponding disk and partition */ - if (!GetDiskOrPartition(PartList, DiskNumber, PartitionNumber, &DiskEntry, &PartEntry)) - DPRINT1("GetDiskOrPartition(disk #%d, partition #%d) failed\n", DiskNumber, PartitionNumber); - } - else - { - DPRINT1("NtPathToDiskPartComponents(%wZ) failed\n", &SystemRootPath); - } - - if (PartEntry && PartEntry->DriveLetter) - { - /* We have retrieved a partition that is mounted */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%wZ\"", - PartEntry->DriveLetter, PathComponent, &InstallName); - } - else - { - /* We failed somewhere, just show the NT path */ - StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%wZ\"", - &SystemRootPath, &InstallName); - } - AddNTOSInstallation(List, SectionName, &SystemRootPath, PathComponent, - DiskNumber, PartitionNumber, PartEntry, - InstallNameW); - } - } - while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); - - IniCacheFindClose(Iterator); - -Quit: - IniCacheDestroy(IniCache); + return STATUS_SUCCESS; + } + } +#endif + + DPRINT1(" Found a candidate Win2k3 install '%wZ' with ARC path '%S'\n", + &InstallName, BootEntry->OsLoadPath); + // DPRINT1(" Found a Win2k3 install '%wZ' with ARC path '%S'\n", + // &InstallName, BootEntry->OsLoadPath); + + // TODO: Normalize the ARC path. + + /* + * Check whether we already have an installation with this ARC path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(Data->List, BootEntry->OsLoadPath, NULL); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemArcPath); + return STATUS_SUCCESS; + } + + /* + * Convert the ARC path into an NT path, from which we will deduce + * the real disk drive & partition on which the candidate installation + * resides, as well verifying whether it is indeed an NTOS installation. + */ + RtlInitEmptyUnicodeString(&SystemRootPath, SystemRoot, sizeof(SystemRoot)); + if (!ArcPathToNtPath(&SystemRootPath, BootEntry->OsLoadPath, Data->PartList)) + { + DPRINT1("ArcPathToNtPath(%S) failed, skip the installation.\n", BootEntry->OsLoadPath); + return STATUS_SUCCESS; + } + + DPRINT1("ArcPathToNtPath() succeeded: '%S' --> '%wZ'\n", + BootEntry->OsLoadPath, &SystemRootPath); + + /* + * Check whether we already have an installation with this NT path. + * If this is the case, stop there. + */ + NtOsInstall = FindExistingNTOSInstall(Data->List, NULL /*BootEntry->OsLoadPath*/, &SystemRootPath); + if (NtOsInstall) + { + DPRINT1(" An NTOS installation with name \"%S\" already exists in SystemRoot '%wZ'\n", + NtOsInstall->InstallationName, &NtOsInstall->SystemNtPath); + return STATUS_SUCCESS; + } + + DPRINT1("EnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); + + /* Check if this is a valid NTOS installation; stop there if it isn't one */ + if (!IsValidNTOSInstallation_UStr(&SystemRootPath)) + return STATUS_SUCCESS; + + DPRINT1("Found a valid NTOS installation in SystemRoot ARC path '%S', NT path '%wZ'\n", + BootEntry->OsLoadPath, &SystemRootPath); + + /* From the NT path, compute the disk, partition and path components */ + if (NtPathToDiskPartComponents(SystemRootPath.Buffer, &DiskNumber, &PartitionNumber, &PathComponent)) + { + DPRINT1("SystemRootPath = '%wZ' points to disk #%d, partition #%d, path '%S'\n", + &SystemRootPath, DiskNumber, PartitionNumber, PathComponent); + + /* Retrieve the corresponding disk and partition */ + if (!GetDiskOrPartition(Data->PartList, DiskNumber, PartitionNumber, &DiskEntry, &PartEntry)) + { + DPRINT1("GetDiskOrPartition(disk #%d, partition #%d) failed\n", + DiskNumber, PartitionNumber); + } + } + else + { + DPRINT1("NtPathToDiskPartComponents(%wZ) failed\n", &SystemRootPath); + } + + if (PartEntry && PartEntry->DriveLetter) + { + /* We have retrieved a partition that is mounted */ + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%C:%s \"%wZ\"", + PartEntry->DriveLetter, PathComponent, &InstallName); + } + else + { + /* We failed somewhere, just show the NT path */ + StringCchPrintfW(InstallNameW, ARRAYSIZE(InstallNameW), L"%wZ \"%wZ\"", + &SystemRootPath, &InstallName); + } + AddNTOSInstallation(Data->List, BootEntry->OsLoadPath, + &SystemRootPath, PathComponent, + DiskNumber, PartitionNumber, PartEntry, + InstallNameW); + return STATUS_SUCCESS; } @@ -597,28 +379,32 @@ IN HANDLE SystemRootDirectory) { BOOLEAN Success = FALSE; + PCWSTR PathName; USHORT i; UNICODE_STRING VendorName; WCHAR VendorNameBuffer[MAX_PATH]; /* Check for the existence of \SystemRoot\System32 */ - if (!DoesPathExist(SystemRootDirectory, L"System32\\")) - { - // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); + PathName = L"System32\\"; + if (!DoesPathExist(SystemRootDirectory, PathName)) + { + // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); return FALSE; } /* Check for the existence of \SystemRoot\System32\drivers */ - if (!DoesPathExist(SystemRootDirectory, L"System32\\drivers\\")) - { - // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); + PathName = L"System32\\drivers\\"; + if (!DoesPathExist(SystemRootDirectory, PathName)) + { + // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); return FALSE; } /* Check for the existence of \SystemRoot\System32\config */ - if (!DoesPathExist(SystemRootDirectory, L"System32\\config\\")) - { - // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); + PathName = L"System32\\config\\"; + if (!DoesPathExist(SystemRootDirectory, PathName)) + { + // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); return FALSE; } @@ -627,14 +413,16 @@ * Check for the existence of SYSTEM and SOFTWARE hives in \SystemRoot\System32\config * (but we don't check here whether they are actually valid). */ - if (!DoesFileExist(SystemRootDirectory, L"System32\\config\\SYSTEM")) - { - // DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); + PathName = L"System32\\config\\SYSTEM"; + if (!DoesFileExist(SystemRootDirectory, PathName)) + { + // DPRINT1("Failed to open file '%S', Status 0x%08lx\n", PathName, Status); return FALSE; } - if (!DoesFileExist(SystemRootDirectory, L"System32\\config\\SOFTWARE")) - { - // DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); + PathName = L"System32\\config\\SOFTWARE"; + if (!DoesFileExist(SystemRootDirectory, PathName)) + { + // DPRINT1("Failed to open file '%S', Status 0x%08lx\n", PathName, Status); return FALSE; } #endif @@ -642,9 +430,10 @@ RtlInitEmptyUnicodeString(&VendorName, VendorNameBuffer, sizeof(VendorNameBuffer)); /* Check for the existence of \SystemRoot\System32\ntoskrnl.exe and retrieves its vendor name */ - Success = CheckForValidPEAndVendor(SystemRootDirectory, L"System32\\ntoskrnl.exe", &VendorName); + PathName = L"System32\\ntoskrnl.exe"; + Success = CheckForValidPEAndVendor(SystemRootDirectory, PathName, &VendorName); if (!Success) - DPRINT1("Kernel file ntoskrnl.exe is either not a PE file, or does not have any vendor?\n"); + DPRINT1("Kernel executable '%S' is either not a PE file, or does not have any vendor?\n", PathName); /* The kernel gives the OS its flavour */ if (Success) @@ -664,9 +453,10 @@ /* OPTIONAL: Check for the existence of \SystemRoot\System32\ntkrnlpa.exe */ /* Check for the existence of \SystemRoot\System32\ntdll.dll and retrieves its vendor name */ - Success = CheckForValidPEAndVendor(SystemRootDirectory, L"System32\\ntdll.dll", &VendorName); + PathName = L"System32\\ntdll.dll"; + Success = CheckForValidPEAndVendor(SystemRootDirectory, PathName, &VendorName); if (!Success) - DPRINT1("User-mode file ntdll.dll is either not a PE file, or does not have any vendor?\n"); + DPRINT1("User-mode DLL '%S' is either not a PE file, or does not have any vendor?\n", PathName); if (Success) { for (i = 0; i < ARRAYSIZE(KnownVendors); ++i) @@ -674,7 +464,7 @@ if (!!FindSubStrI(VendorName.Buffer, KnownVendors[i])) { /* We have found a correct vendor combination */ - DPRINT1("IsValidNTOSInstallation: The user-mode file ntdll.dll is from %S\n", KnownVendors[i]); + DPRINT1("IsValidNTOSInstallation: The user-mode DLL '%S' is from %S\n", PathName, KnownVendors[i]); break; } } @@ -874,15 +664,13 @@ NTSTATUS Status; ULONG DiskNumber = PartEntry->DiskEntry->DiskNumber; ULONG PartitionNumber = PartEntry->PartitionNumber; - HANDLE PartitionHandle, FileHandle; + HANDLE PartitionHandle; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; UNICODE_STRING PartitionRootPath; - UINT i; - HANDLE SectionHandle; - // SIZE_T ViewSize; - ULONG FileSize; - PVOID ViewBase; + NTOS_BOOT_LOADER_TYPE Type; + ENUM_INSTALLS_DATA Data; + ULONG Version; WCHAR PathBuffer[MAX_PATH]; /* Set PartitionRootPath */ @@ -910,49 +698,26 @@ return; } + Data.List = List; + Data.PartList = PartList; + /* Try to see whether we recognize some NT boot loaders */ - for (i = 0; i < ARRAYSIZE(NtosBootLoaders); ++i) - { - /* Check whether the loader executable exists */ - if (!DoesFileExist(PartitionHandle, NtosBootLoaders[i].LoaderExecutable)) + for (Type = FreeLdr; Type < BldrTypeMax; ++Type) + { + Status = FindNTOSBootLoader(PartitionHandle, Type, &Version); + if (!NT_SUCCESS(Status)) { /* The loader does not exist, continue with another one */ - DPRINT1("Loader executable '%S' does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderExecutable); + DPRINT1("Loader type '%d' does not exist, or an error happened (Status 0x%08lx), continue with another one...\n", + Type, Status); continue; } - /* Check whether the loader configuration file exists */ - Status = OpenAndMapFile(PartitionHandle, NtosBootLoaders[i].LoaderConfigurationFile, - &FileHandle, &SectionHandle, &ViewBase, &FileSize); - if (!NT_SUCCESS(Status)) - { - /* The loader does not exist, continue with another one */ - // FIXME: Consider it might be optional?? - DPRINT1("Loader configuration file '%S' does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderConfigurationFile); - continue; - } - - /* The loader configuration file exists, interpret it to find valid installations */ - DPRINT1("Analyse the OS installations inside '%S' in disk #%d, partition #%d\n", - NtosBootLoaders[i].LoaderConfigurationFile, DiskNumber, PartitionNumber); - switch (NtosBootLoaders[i].Type) - { - case FreeLdr: - Status = FreeLdrEnumerateInstallations(List, PartList, ViewBase, FileSize); - break; - - case NtLdr: - Status = NtLdrEnumerateInstallations(List, PartList, ViewBase, FileSize); - break; - - default: - DPRINT1("Loader type %d is currently unsupported!\n", NtosBootLoaders[i].Type); - Status = STATUS_SUCCESS; - } - - /* Finally, unmap and close the file */ - UnMapFile(SectionHandle, ViewBase); - NtClose(FileHandle); + /* The loader exists, try to enumerate its boot entries */ + DPRINT1("Analyse the OS installations for loader type '%d' in disk #%d, partition #%d\n", + Type, DiskNumber, PartitionNumber); + + EnumerateNTOSBootEntries(PartitionHandle, Type, EnumerateInstallations, &Data); } /* Close the partition */

7 years, 7 months

[hbelusca] 74660: And nope, USetup is not a DLL!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 25 23:39:55 2017 New Revision: 74660 URL: http://svn.reactos.org/svn/reactos?rev=74660&view=rev Log: And nope, USetup is not a DLL! Modified: branches/setup_improvements/base/setup/usetup/usetup.rc Modified: branches/setup_improvements/base/setup/usetup/usetup.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.rc [iso-8859-1] Thu May 25 23:39:55 2017 @@ -1,6 +1,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Text-Mode Setup" #define REACTOS_STR_INTERNAL_NAME "usetup" -#define REACTOS_STR_ORIGINAL_FILENAME "usetup.dll" +#define REACTOS_STR_ORIGINAL_FILENAME "usetup.exe" #ifdef __REACTOS__ #include <reactos/version.rc> #endif

7 years, 7 months

[hbelusca] 74659: [SETUPLIB]: Update the code file headers. Note that Eric & Casper did write the functions that remained in the usetup/filesup.c file; the ones in lib/filesup.c were all added by m...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 25 23:36:50 2017 New Revision: 74659 URL: http://svn.reactos.org/svn/reactos?rev=74659&view=rev Log: [SETUPLIB]: Update the code file headers. Note that Eric & Casper did write the functions that remained in the usetup/filesup.c file; the ones in lib/filesup.c were all added by me. [USETUP]: Update the version resource: USetup.exe is the "ReactOS Text-Mode Setup". Modified: branches/setup_improvements/base/setup/lib/arcname.c branches/setup_improvements/base/setup/lib/arcname.h branches/setup_improvements/base/setup/lib/filesup.c branches/setup_improvements/base/setup/lib/filesup.h branches/setup_improvements/base/setup/lib/genlist.c branches/setup_improvements/base/setup/lib/genlist.h branches/setup_improvements/base/setup/lib/ntverrsrc.c branches/setup_improvements/base/setup/lib/ntverrsrc.h branches/setup_improvements/base/setup/lib/osdetect.h branches/setup_improvements/base/setup/lib/partlist.c branches/setup_improvements/base/setup/lib/partlist.h branches/setup_improvements/base/setup/lib/precomp.h branches/setup_improvements/base/setup/lib/setuplib.h branches/setup_improvements/base/setup/usetup/usetup.rc Modified: branches/setup_improvements/base/setup/lib/arcname.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] Thu May 25 23:36:50 2017 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup + * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/arcname.c * PURPOSE: ARC path to-and-from NT path resolver. * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/setup_improvements/base/setup/lib/arcname.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/arcname.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/arcname.h [iso-8859-1] Thu May 25 23:36:50 2017 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup + * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/arcname.h * PURPOSE: ARC path to-and-from NT path resolver. * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/setup_improvements/base/setup/lib/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/filesup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/filesup.c [iso-8859-1] Thu May 25 23:36:50 2017 @@ -1,10 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup + * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/filesup.c * PURPOSE: File support functions - * PROGRAMMER: Eric Kohl - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *****************************************************************/ Modified: branches/setup_improvements/base/setup/lib/filesup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/filesup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/filesup.h [iso-8859-1] Thu May 25 23:36:50 2017 @@ -1,9 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup + * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/filesup.h * PURPOSE: File support functions - * PROGRAMMER: Eric Kohl + * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #pragma once Modified: branches/setup_improvements/base/setup/lib/genlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/genlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/genlist.c [iso-8859-1] Thu May 25 23:36:50 2017 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup + * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/genlist.c * PURPOSE: Generic list functions * PROGRAMMERS: Eric Kohl Modified: branches/setup_improvements/base/setup/lib/genlist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/genlist.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/genlist.h [iso-8859-1] Thu May 25 23:36:50 2017 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup + * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/genlist.h * PURPOSE: Generic list functions * PROGRAMMER: Eric Kohl Modified: branches/setup_improvements/base/setup/lib/ntverrsrc.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/ntverrsrc.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/ntverrsrc.c [iso-8859-1] Thu May 25 23:36:50 2017 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup + * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/ntverrsrc.c * PURPOSE: NT Version Resource Management API * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/setup_improvements/base/setup/lib/ntverrsrc.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/ntverrsrc.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/ntverrsrc.h [iso-8859-1] Thu May 25 23:36:50 2017 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup + * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/ntverrsrc.h * PURPOSE: NT Version Resource Management API * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/setup_improvements/base/setup/lib/osdetect.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/osdetect.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/osdetect.h [iso-8859-1] Thu May 25 23:36:50 2017 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/lib/osdetect.c + * PROJECT: ReactOS Setup Library + * FILE: base/setup/lib/osdetect.h * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) * operating systems detection code. * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/setup_improvements/base/setup/lib/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/partlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/partlist.c [iso-8859-1] Thu May 25 23:36:50 2017 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup + * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/partlist.c * PURPOSE: Partition list functions * PROGRAMMERS: Eric Kohl @@ -1208,7 +1208,7 @@ List = (PPARTLIST)RtlAllocateHeap(ProcessHeap, 0, - sizeof (PARTLIST)); + sizeof(PARTLIST)); if (List == NULL) return NULL; @@ -2459,7 +2459,7 @@ RtlFreeHeap(ProcessHeap, 0, PartEntry); /* Remove the next entry */ - RemoveEntryList (&NextPartEntry->ListEntry); + RemoveEntryList(&NextPartEntry->ListEntry); RtlFreeHeap(ProcessHeap, 0, NextPartEntry); /* Update current partition */ Modified: branches/setup_improvements/base/setup/lib/partlist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/partlist.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/partlist.h [iso-8859-1] Thu May 25 23:36:50 2017 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup + * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/partlist.h * PURPOSE: Partition list functions * PROGRAMMER: Eric Kohl Modified: branches/setup_improvements/base/setup/lib/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/precomp.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/precomp.h [iso-8859-1] Thu May 25 23:36:50 2017 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup + * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/precomp.h - * PURPOSE: Console settings management - Precompiled header + * PURPOSE: Setup Library - Precompiled header * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/setup_improvements/base/setup/lib/setuplib.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] Thu May 25 23:36:50 2017 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup + * PROJECT: ReactOS Setup Library * FILE: base/setup/lib/setuplib.h - * PURPOSE: Console settings management - Public header + * PURPOSE: Setup Library - Public header * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ @@ -15,10 +15,7 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <wingdi.h> // For LF_FACESIZE and TranslateCharsetInfo() -#include <wincon.h> -#include <winnls.h> // For code page support -#include <winreg.h> +#include <winxxx.h> #endif @@ -30,6 +27,7 @@ #include "linklist.h" #include "ntverrsrc.h" // #include "arcname.h" +#include "bldrsup.h" #include "filesup.h" #include "fsutil.h" #include "genlist.h" Modified: branches/setup_improvements/base/setup/usetup/usetup.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.rc [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.rc [iso-8859-1] Thu May 25 23:36:50 2017 @@ -1,4 +1,4 @@ -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Text-Mode Setup" #define REACTOS_STR_INTERNAL_NAME "usetup" #define REACTOS_STR_ORIGINAL_FILENAME "usetup.dll" #ifdef __REACTOS__

7 years, 7 months

[tfaber] 74658: [ACPICA] - Use the compiler's native 64 bit math support instead of emulating it with 32 bit operations. CORE-13316

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu May 25 19:39:38 2017 New Revision: 74658 URL: http://svn.reactos.org/svn/reactos?rev=74658&view=rev Log: [ACPICA] - Use the compiler's native 64 bit math support instead of emulating it with 32 bit operations. CORE-13316 Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… ============================================================================== --- trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Thu May 25 19:39:38 2017 @@ -174,7 +174,7 @@ acpica/utilities/utglobal.c) add_pch(acpica acpica/include/acpi.h ACPICA_SOURCE) -set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE;ACPI_USE_SYSTEM_INTTYPES") +set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE;ACPI_USE_SYSTEM_INTTYPES;ACPI_USE_NATIVE_DIVIDE") add_dependencies(acpica bugcodes xdk) list(APPEND ACPI_SOURCE

7 years, 7 months

[hbelusca] 74657: [SYSDM]: Fix a SendDlgItemMessage(LB_GETITEMDATA) call that missed the index of the list item being selected. This fixes setting the page file for the actual selected disk. Caught...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 25 18:36:45 2017 New Revision: 74657 URL: http://svn.reactos.org/svn/reactos?rev=74657&view=rev Log: [SYSDM]: Fix a SendDlgItemMessage(LB_GETITEMDATA) call that missed the index of the list item being selected. This fixes setting the page file for the actual selected disk. Caught by "cagey45" contributor on the forums: https://reactos.org/forum/viewtopic.php?f=9&t=16439 ; see also CORE-1151. Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c [iso-8859-1] Thu May 25 18:36:45 2017 @@ -406,7 +406,7 @@ DriveIndex = SendDlgItemMessage(pVirtMem->hSelf, IDC_PAGEFILELIST, LB_GETITEMDATA, - 0, + (WPARAM)Index, 0); /* Check if custom settings are checked */

7 years, 7 months

[tfaber] 74656: [ACPICA] - Fix our broken support for the Windows-GCC configuration (again) by providing proper implementations of ACPI_DIV_64_BY_32 and ACPI_SHIFT_RIGHT_64. CORE-13316 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu May 25 18:27:30 2017 New Revision: 74656 URL: http://svn.reactos.org/svn/reactos?rev=74656&view=rev Log: [ACPICA] - Fix our broken support for the Windows-GCC configuration (again) by providing proper implementations of ACPI_DIV_64_BY_32 and ACPI_SHIFT_RIGHT_64. CORE-13316 #resolve Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h [iso-8859-1] Thu May 25 18:27:30 2017 @@ -126,20 +126,17 @@ } while(0) -/* - * Note: This is also taken from our old adaptation. - * See acmsvc.h for where it came originally. - */ -#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ -{ \ - q32 = n_hi / d32; \ - r32 = n_lo / d32; \ +#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ +{ \ + asm("divl %4;" \ + :"=a"(q32),"=d"(r32):"a"(n_lo),"d"(n_hi),"rm"(d32):"cc"); \ } -#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \ -{ \ - n_hi >>= 1; \ - n_lo >>= 1; \ +#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \ +{ \ + asm("shrl $1, %0;" \ + "rcrl $1, %1;" \ + :"=rm"(n_hi),"=rm"(n_lo):"0"(n_hi),"1"(n_lo):"cc"); \ } #endif /* __REACTOS__ */

7 years, 7 months

[phater] 74655: [WS2_32_APITESTS] Set the size of addr when calling getsockname ROSTESTS-278

by phater＠svn.reactos.org

Author: phater Date: Thu May 25 15:57:38 2017 New Revision: 74655 URL: http://svn.reactos.org/svn/reactos?rev=74655&view=rev Log: [WS2_32_APITESTS] Set the size of addr when calling getsockname ROSTESTS-278 Modified: trunk/rostests/apitests/ws2_32/bind.c Modified: trunk/rostests/apitests/ws2_32/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/bind.c?re… ============================================================================== --- trunk/rostests/apitests/ws2_32/bind.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/bind.c [iso-8859-1] Thu May 25 15:57:38 2017 @@ -77,6 +77,7 @@ else { ok_dec(WSAGetLastError(), 0); + AddrSize = sizeof(Addr); Error = getsockname(Socket, (struct sockaddr *) &Addr, &AddrSize); ok(Error == 0, "Error getsockname for test %d, Error %d\n", i, Error); ok_dec(WSAGetLastError(), 0);

7 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
29
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 May 2017