Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[ion] 26685: - Add code to detect and save the BIOS Version string to the registry. We use the same detection patterns as Windows for now (Ver, Rev, Rel, v0-9). - All BIOS Version strings are scanned and saved in a REG_MULTI_SZ key, as on Windows. QEMU BIOS Version String is correctly detected as the CVS/SVN $ID tag, which is good enough.

by ion＠svn.reactos.org

Author: ion Date: Fri May 11 01:36:24 2007 New Revision: 26685 URL: http://svn.reactos.org/svn/reactos?rev=26685&view=rev Log: - Add code to detect and save the BIOS Version string to the registry. We use the same detection patterns as Windows for now (Ver, Rev, Rel, v0-9). - All BIOS Version strings are scanned and saved in a REG_MULTI_SZ key, as on Windows. QEMU BIOS Version String is correctly detected as the CVS/SVN $ID tag, which is good enough. Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Fri May 11 01:36:24 2007 @@ -17,6 +17,17 @@ PCHAR CmpID1 = "80%u86-%c%x"; PCHAR CmpID2 = "x86 Family %u Model %u Stepping %u"; +PCHAR CmpBiosStrings[] = +{ + "Ver", + "Rev", + "Rel", + "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", + "v 0", "v 1", "v 2", "v 3", "v 4", "v 5", "v 6", "v 7", "v 8", "v 9", + NULL +}; + +PCHAR CmpBiosBegin, CmpBiosSearchStart, CmpBiosSearchEnd; /* FUNCTIONS *****************************************************************/ @@ -117,30 +128,126 @@ return FALSE; } +BOOLEAN +NTAPI +CmpGetBiosVersion(IN PCHAR BiosStart, + IN ULONG BiosLength, + IN PCHAR BiosVersion) +{ + CHAR Buffer[128]; + PCHAR p, pp; + USHORT i; + + /* Check if we were given intitial data for the search */ + if (BiosStart) + { + /* Save it for later use */ + CmpBiosBegin = BiosStart; + CmpBiosSearchStart = BiosStart + 1; + CmpBiosSearchEnd = BiosStart + BiosLength - 2; + } + + /* Now loop the BIOS area */ + for (;;) + { + /* Start an initial search looking for numbers and periods */ + pp = NULL; + while (CmpBiosSearchStart <= CmpBiosSearchEnd) + { + /* Check if we have an "x.y" version string */ + if ((*CmpBiosSearchStart == '.') && + (*(CmpBiosSearchStart + 1) >= '0') && + (*(CmpBiosSearchStart + 1) <= '9') && + (*(CmpBiosSearchStart - 1) >= '0') && + (*(CmpBiosSearchStart - 1) <= '9')) + { + /* Start looking in this area for the actual BIOS Version */ + pp = CmpBiosSearchStart; + break; + } + else + { + /* Keep searching */ + CmpBiosSearchStart++; + } + } + + /* Break out if we're went past the BIOS area */ + if (CmpBiosSearchStart > CmpBiosSearchEnd) return FALSE; + + /* Move to the next 2 bytes */ + CmpBiosSearchStart += 2; + + /* Null-terminate our scratch buffer and start the string here */ + Buffer[127] = ANSI_NULL; + p = &Buffer[127]; + + /* Go back one character since we're doing this backwards */ + pp--; + + /* Loop the identifier we found as long as it's valid */ + i = 0; + while ((i++ < 127) && + (pp >= CmpBiosBegin) && + (*pp >= ' ') && + (*pp != '$')) + { + /* Copy the character */ + *--p = *pp--; + } + + /* Go past the last character since we went backwards */ + pp++; + + /* Loop the strings we recognize */ + for (i = 0; CmpBiosStrings[i]; i++) + { + /* Check if a match was found */ + if (strstr(p, CmpBiosStrings[i])) goto Match; + } + } + +Match: + /* Skip until we find a space */ + for (; *pp == ' '; pp++); + + /* Loop the final string */ + i = 0; + do + { + /* Copy the character into the final string */ + BiosVersion[i] = *pp++; + } while ((++i < 127) && + (pp <= (CmpBiosSearchEnd + 1)) && + (*pp >= ' ') && + (*pp != '$')); + + /* Null-terminate the version string */ + BiosVersion[i] = ANSI_NULL; + return TRUE; +} + NTSTATUS NTAPI CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { UNICODE_STRING KeyName, ValueName, Data, SectionName; OBJECT_ATTRIBUTES ObjectAttributes; - ULONG HavePae; + ULONG HavePae, CacheSize, ViewSize, Length, TotalLength = 0, i, Disposition; NTSTATUS Status; HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle, SectionHandle; - ULONG Disposition; CONFIGURATION_COMPONENT_DATA ConfigData; CHAR Buffer[128]; - ULONG i, ExtendedId, Dummy; + ULONG ExtendedId, Dummy; PKPRCB Prcb; USHORT IndexTable[MaximumType + 1] = {0}; ANSI_STRING TempString; - PCHAR PartialString = NULL; + PCHAR PartialString = NULL, BiosVersion; CHAR CpuString[48]; - ULONG CacheSize; PVOID BaseAddress = NULL; LARGE_INTEGER ViewBase = {{0}}; ULONG_PTR VideoRomBase; - ULONG ViewSize; - PCHAR BiosVersion; + PCHAR CurrentVersion; /* Open the SMSS Memory Management key */ RtlInitUnicodeString(&KeyName, @@ -281,7 +388,7 @@ ConfigData.ComponentEntry.AffinityMask = AFFINITY_MASK(i); ConfigData.ComponentEntry.Identifier = Buffer; - /* For 386 cpus, the CPU String is the identifier */ + /* For 386 cpus, the CPU pp is the identifier */ if (Prcb->CpuType == 3) strcpy(Buffer, "80387"); /* Save the ID string length now that we've created it */ @@ -475,7 +582,7 @@ ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); } - /* Allocate BIOS Version String Buffer */ + /* Allocate BIOS Version pp Buffer */ BiosVersion = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); /* Setup settings to map the 64K BIOS ROM */ @@ -539,6 +646,56 @@ /* Close the bios information handle */ NtClose(BiosHandle); + + /* Get the BIOS Version */ + if (CmpGetBiosVersion(BaseAddress, 16* PAGE_SIZE, Buffer)) + { + /* Start at the beginning of our buffer */ + CurrentVersion = BiosVersion; + do + { + /* Convert to Unicode */ + RtlInitAnsiString(&TempString, Buffer); + RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + + /* Calculate the length of this string and copy it in */ + Length = Data.Length + sizeof(UNICODE_NULL); + RtlMoveMemory(CurrentVersion, Data.Buffer, Length); + + /* Free the unicode string */ + RtlFreeUnicodeString(&Data); + + /* Update the total length and see if we're out of space */ + TotalLength += Length; + if (TotalLength + 256 + sizeof(UNICODE_NULL) > PAGE_SIZE) + { + /* One more string would push us out, so stop here */ + break; + } + + /* Go to the next string inside the multi-string buffer */ + CurrentVersion += Length; + + /* Query the next BIOS Version */ + } while (CmpGetBiosVersion(NULL, 0, Buffer)); + + /* Check if we found any strings at all */ + if (TotalLength) + { + /* Add the final null-terminator */ + *(PWSTR)CurrentVersion = UNICODE_NULL; + TotalLength += sizeof(UNICODE_NULL); + + /* Write the BIOS Version to the registry */ + RtlInitUnicodeString(&ValueName, L"SystemBiosVersion"); + Status = NtSetValueKey(SystemHandle, + &ValueName, + 0, + REG_MULTI_SZ, + BiosVersion, + TotalLength); + } + } } /* Unmap the section */

17 years, 5 months

[ion] 26684: - Remove CPU Detection code from FreeLDR (hwcpu.c) since our kernel properly does the same job now (and better). - Remove ReactOS hacks from recent code due to FreeLDR, since it doesn't conflict with us anymore.

by ion＠svn.reactos.org

Author: ion Date: Fri May 11 00:51:50 2007 New Revision: 26684 URL: http://svn.reactos.org/svn/reactos?rev=26684&view=rev Log: - Remove CPU Detection code from FreeLDR (hwcpu.c) since our kernel properly does the same job now (and better). - Remove ReactOS hacks from recent code due to FreeLDR, since it doesn't conflict with us anymore. Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/ntoskrnl/config/cmconfig.c trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Fri May 11 00:51:50 2007 @@ -2284,11 +2284,6 @@ return; } -#if 0 - DetectSystemData(); -#endif - DetectCPUs(SystemKey); - /* Detect buses */ DetectPciBios(SystemKey, &BusNumber); DetectApmBios(SystemKey, &BusNumber); Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c (removed) @@ -1,763 +1,0 @@ -/* - * FreeLoader - * - * Copyright (C) 2003 Eric Kohl - * Copyright (C) 2006 Colin Finck <mail(a)colinfinck.de> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include <freeldr.h> - -#define NDEBUG -#include <debug.h> - -#define HZ (100) -#define CLOCK_TICK_RATE (1193182) -#define LATCH (CLOCK_TICK_RATE / HZ) -#define CALIBRATE_LATCH (5 * LATCH) -#define CALIBRATE_TIME (5 * 1000020/HZ) - -#define MP_FP_SIGNATURE 0x5F504D5F /* "_MP_" */ -#define MP_CT_SIGNATURE 0x504D4350 /* "PCMP" */ - - -typedef struct _MP_FLOATING_POINT_TABLE -{ - ULONG Signature; /* "_MP_" */ - ULONG PhysicalAddressPointer; - UCHAR Length; - UCHAR SpecRev; - UCHAR Checksum; - UCHAR FeatureByte[5]; -} PACKED MP_FLOATING_POINT_TABLE, *PMP_FLOATING_POINT_TABLE; - - -typedef struct _MPS_CONFIG_TABLE_HEADER -{ - ULONG Signature; /* "PCMP" */ - USHORT BaseTableLength; - UCHAR SpecRev; - UCHAR Checksum; - UCHAR OemIdString[8]; - UCHAR ProductIdString[12]; - ULONG OemTablePointer; - USHORT OemTableLength; - USHORT EntryCount; - ULONG AddressOfLocalAPIC; - USHORT ExtendedTableLength; - UCHAR ExtendedTableChecksum; - UCHAR Reserved; -} PACKED MP_CONFIGURATION_TABLE, *PMP_CONFIGURATION_TABLE; - - -typedef struct _MP_PROCESSOR_ENTRY -{ - UCHAR EntryType; - UCHAR LocalApicId; - UCHAR LocalApicVersion; - UCHAR CpuFlags; - ULONG CpuSignature; - ULONG FeatureFlags; - ULONG Reserved1; - ULONG Reserved2; -} PACKED MP_PROCESSOR_ENTRY, *PMP_PROCESSOR_ENTRY; - - -/* FUNCTIONS ****************************************************************/ - -static ULONG -GetCpuSpeed(BOOLEAN DualCoreSpeedMesure) -{ - ULONGLONG Timestamp1; - ULONGLONG Timestamp2; - ULONGLONG Diff; - ULONG Count = 0; - - /* - FIXME - if the DualCoreSpeedMesure is true we need - use the wrmsr and rdmsr to mesure the speed - - The rdtc are outdate to use if cpu support - the wrmsr and rdmsr, see intel doc AP-485 - for more informations and how to use it. - - Follow code is good on cpu that does not - support dual core or have a mmx unit or - more. - */ - - - /* Initialise timer channel 2 */ - /* Set the Gate high, disable speaker */ - WRITE_PORT_UCHAR((PUCHAR)0x61, (READ_PORT_UCHAR((PUCHAR)0x61) & ~0x02) | 0x01); - WRITE_PORT_UCHAR((PUCHAR)0x43, 0xB0); /* binary, mode 0, LSB/MSB, ch 2 */ - WRITE_PORT_UCHAR((PUCHAR)0x42, CALIBRATE_LATCH & 0xff); /* LSB */ - WRITE_PORT_UCHAR((PUCHAR)0x42, CALIBRATE_LATCH >> 8); /* MSB */ - - /* Read TSC (Time Stamp Counter) */ - Timestamp1 = RDTSC(); - - /* Wait */ - do - { - Count++; - } - while ((READ_PORT_UCHAR((PUCHAR)0x61) & 0x20) == 0); - - /* Read TSC (Time Stamp Counter) again */ - Timestamp2 = RDTSC(); - - /* Calculate elapsed time (check for counter overrun) */ - if (Timestamp2 > Timestamp1) - { - Diff = Timestamp2 - Timestamp1; - } - else - { - Diff = Timestamp2 + (((ULONGLONG)-1) - Timestamp1); - } - - return (ULONG)(Diff / CALIBRATE_TIME); -} - - -static VOID -DetectCPU(FRLDRHKEY CpuKey, - FRLDRHKEY FpuKey) -{ - WCHAR VendorIdentifier[13]; - WCHAR ProcessorNameString[49]; - CHAR tmpVendorIdentifier[13]; - CHAR tmpProcessorNameString[49]; - WCHAR Identifier[64]; - ULONG FeatureSet; - FRLDRHKEY CpuInstKey; - FRLDRHKEY FpuInstKey; - ULONG eax = 0; - ULONG ebx = 0; - ULONG ecx = 0; - ULONG edx = 0; - ULONG i; - ULONG *Ptr; - LONG Error; - BOOLEAN SupportTSC = FALSE; - ULONG CpuSpeed; - BOOLEAN DualCoreSpeedMesure = FALSE; - - /* Create the CPU instance key */ - Error = RegCreateKey(CpuKey, - L"0", - &CpuInstKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - - /* Create the FPU instance key */ - Error = RegCreateKey(FpuKey, - L"0", - &FpuInstKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - - eax = CpuidSupported(); - if (eax & 1) - { - DbgPrint((DPRINT_HWDETECT, "CPUID supported\n")); - - /* Get vendor identifier */ - GetCpuid(0, &eax, &ebx, &ecx, &edx); - tmpVendorIdentifier[12] = 0; - Ptr = (ULONG*)&tmpVendorIdentifier[0]; - *Ptr = ebx; - Ptr++; - *Ptr = edx; - Ptr++; - *Ptr = ecx; - swprintf(VendorIdentifier, L"%S", tmpVendorIdentifier); - - /* Get Identifier */ - GetCpuid(1, &eax, &ebx, &ecx, &edx); - swprintf(Identifier, - L"x86 Family %u Model %u Stepping %u", - (unsigned int)((eax >> 8) & 0x0F), - (unsigned int)((eax >> 4) & 0x0F), - (unsigned int)(eax & 0x0F)); - FeatureSet = edx; - - if ((FeatureSet & 0x10) == 0x10) - SupportTSC = TRUE; - - if ((FeatureSet & 0x20) == 0x20) - DualCoreSpeedMesure = TRUE; - - /* Check if Extended CPUID information is supported */ - GetCpuid(0x80000000, &eax, &ebx, &ecx, &edx); - - if(eax >= 0x80000004) - { - /* Get Processor Name String */ - tmpProcessorNameString[48] = 0; - Ptr = (ULONG*)&tmpProcessorNameString[0]; - - for (i = 0x80000002; i <= 0x80000004; i++) - { - GetCpuid(i, &eax, &ebx, &ecx, &edx); - *Ptr = eax; - Ptr++; - *Ptr = ebx; - Ptr++; - *Ptr = ecx; - Ptr++; - *Ptr = edx; - Ptr++; - } - - swprintf(ProcessorNameString, L"%S", tmpProcessorNameString); - - - /* Set 'ProcessorNameString' value (CPU only) */ - DbgPrint((DPRINT_HWDETECT, "Processor Name String: %S\n", ProcessorNameString)); - - Error = RegSetValue(CpuInstKey, - L"ProcessorNameString", - REG_SZ, - (PCHAR)ProcessorNameString, - (wcslen(ProcessorNameString) + 1) * sizeof(WCHAR)); - - if (Error != ERROR_SUCCESS) - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - } - else - { - DbgPrint((DPRINT_HWDETECT, "CPUID not supported\n")); - - wcscpy(VendorIdentifier, L"Unknown"); - swprintf(Identifier, - L"x86 Family %u Model %u Stepping %u", - (unsigned int)((eax >> 8) & 0x0F), - (unsigned int)((eax >> 4) & 0x0F), - (unsigned int)(eax & 0x0F)); - FeatureSet = 0; - } - - /* Set 'Conmponent Information' value (CPU and FPU) */ - SetComponentInformation(CpuInstKey, 0, 0, 1); - SetComponentInformation(FpuInstKey, 0, 0, 1); - - /* Set 'FeatureSet' value (CPU only) */ - DbgPrint((DPRINT_HWDETECT, "FeatureSet: %x\n", FeatureSet)); - - Error = RegSetValue(CpuInstKey, - L"FeatureSet", - REG_DWORD, - (PCHAR)&FeatureSet, - sizeof(ULONG)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - /* Set 'Identifier' value (CPU and FPU) */ - DbgPrint((DPRINT_HWDETECT, "Identifier: %S\n", Identifier)); - - Error = RegSetValue(CpuInstKey, - L"Identifier", - REG_SZ, - (PCHAR)Identifier, - (wcslen(Identifier) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - Error = RegSetValue(FpuInstKey, - L"Identifier", - REG_SZ, - (PCHAR)Identifier, - (wcslen(Identifier) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - /* Set 'VendorIdentifier' value (CPU only) */ - DbgPrint((DPRINT_HWDETECT, "Vendor Identifier: %S\n", VendorIdentifier)); - - Error = RegSetValue(CpuInstKey, - L"VendorIdentifier", - REG_SZ, - (PCHAR)VendorIdentifier, - (wcslen(VendorIdentifier) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - /* FIXME: Set 'Update Signature' value (CPU only) */ - - /* FIXME: Set 'Update Status' value (CPU only) */ - - /* Set '~MHz' value (CPU only) */ - if (SupportTSC) - { - CpuSpeed = GetCpuSpeed(DualCoreSpeedMesure); - - Error = RegSetValue(CpuInstKey, - L"~MHz", - REG_DWORD, - (PCHAR)&CpuSpeed, - sizeof(ULONG)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - } -} - - -static VOID -SetMpsProcessor(FRLDRHKEY CpuKey, - FRLDRHKEY FpuKey, - PMP_PROCESSOR_ENTRY CpuEntry) -{ - WCHAR ProcessorNameString[49]; - WCHAR VendorIdentifier[13]; - CHAR tmpProcessorNameString[49]; - CHAR tmpVendorIdentifier[13]; - WCHAR Identifier[64]; - WCHAR Buffer[8]; - ULONG FeatureSet; - FRLDRHKEY CpuInstKey; - FRLDRHKEY FpuInstKey; - ULONG eax = 0; - ULONG ebx = 0; - ULONG ecx = 0; - ULONG edx = 0; - ULONG i; - ULONG *Ptr; - LONG Error; - ULONG CpuSpeed; - - /* Get processor instance number */ - swprintf(Buffer, L"%u", CpuEntry->LocalApicId); - - /* Create the CPU instance key */ - Error = RegCreateKey(CpuKey, - Buffer, - &CpuInstKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - - /* Create the FPU instance key */ - Error = RegCreateKey(FpuKey, - Buffer, - &FpuInstKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - - /* Get 'VendorIdentifier' */ - GetCpuid(0, &eax, &ebx, &ecx, &edx); - tmpVendorIdentifier[12] = 0; - Ptr = (ULONG*)&tmpVendorIdentifier[0]; - *Ptr = ebx; - Ptr++; - *Ptr = edx; - Ptr++; - *Ptr = ecx; - swprintf(VendorIdentifier, L"%S", tmpVendorIdentifier); - - /* Get 'Identifier' */ - swprintf(Identifier, - L"x86 Family %u Model %u Stepping %u", - (ULONG)((CpuEntry->CpuSignature >> 8) & 0x0F), - (ULONG)((CpuEntry->CpuSignature >> 4) & 0x0F), - (ULONG)(CpuEntry->CpuSignature & 0x0F)); - - /* Get FeatureSet */ - FeatureSet = CpuEntry->FeatureFlags; - - /* Check if Extended CPUID information is supported */ - GetCpuid(0x80000000, &eax, &ebx, &ecx, &edx); - - if(eax >= 0x80000004) - { - /* Get 'ProcessorNameString' */ - tmpProcessorNameString[48] = 0; - Ptr = (ULONG*)&tmpProcessorNameString[0]; - - for (i = 0x80000002; i <= 0x80000004; i++) - { - GetCpuid(i, &eax, &ebx, &ecx, &edx); - *Ptr = eax; - Ptr++; - *Ptr = ebx; - Ptr++; - *Ptr = ecx; - Ptr++; - *Ptr = edx; - Ptr++; - } - - swprintf(ProcessorNameString, L"%S", tmpProcessorNameString); - - - /* Set 'ProcessorNameString' value (CPU only) */ - DbgPrint((DPRINT_HWDETECT, "Processor Name String: %S\n", ProcessorNameString)); - - Error = RegSetValue(CpuInstKey, - L"ProcessorNameString", - REG_SZ, - (PCHAR)ProcessorNameString, - (wcslen(ProcessorNameString) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - /* Set 'Configuration Data' value (CPU and FPU) */ - SetComponentInformation(CpuInstKey, - 0, - CpuEntry->LocalApicId, - 1 << CpuEntry->LocalApicId); - - SetComponentInformation(FpuInstKey, - 0, - CpuEntry->LocalApicId, - 1 << CpuEntry->LocalApicId); - - /* Set 'FeatureSet' value (CPU only) */ - DbgPrint((DPRINT_HWDETECT, "FeatureSet: %x\n", FeatureSet)); - - Error = RegSetValue(CpuInstKey, - L"FeatureSet", - REG_DWORD, - (PCHAR)&FeatureSet, - sizeof(ULONG)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - /* Set 'Identifier' value (CPU and FPU) */ - DbgPrint((DPRINT_HWDETECT, "Identifier: %S\n", Identifier)); - - Error = RegSetValue(CpuInstKey, - L"Identifier", - REG_SZ, - (PCHAR)Identifier, - (wcslen(Identifier) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - Error = RegSetValue(FpuInstKey, - L"Identifier", - REG_SZ, - (PCHAR)Identifier, - (wcslen(Identifier) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - /* Set 'VendorIdentifier' value (CPU only) */ - DbgPrint((DPRINT_HWDETECT, "Vendor Identifier: %S\n", VendorIdentifier)); - - Error = RegSetValue(CpuInstKey, - L"VendorIdentifier", - REG_SZ, - (PCHAR)VendorIdentifier, - (wcslen(VendorIdentifier) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - /* FIXME: Set 'Update Signature' value (CPU only) */ - - /* FIXME: Set 'Update Status' value (CPU only) */ - - /* Set '~MHz' value (CPU only) */ - - - if ((CpuEntry->FeatureFlags & 0x10) == 0x10) - { - if ((CpuEntry->FeatureFlags & 0x20) == 0x20) - { - CpuSpeed = GetCpuSpeed(TRUE); - } - else - { - DbgPrint((DPRINT_HWDETECT, "Does not support MSR that are need for mesure the speed correct\n", (int)Error)); - CpuSpeed = GetCpuSpeed(FALSE); - } - - Error = RegSetValue(CpuInstKey, - L"~MHz", - REG_DWORD, - (PCHAR)&CpuSpeed, - sizeof(ULONG)); - if (Error != ERROR_SUCCESS) - { - - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - } -} - - -static PMP_FLOATING_POINT_TABLE -GetMpFloatingPointTable(VOID) -{ - PMP_FLOATING_POINT_TABLE FpTable; - char *Ptr; - UCHAR Sum; - ULONG Length; - ULONG i; - - FpTable = (PMP_FLOATING_POINT_TABLE)0xF0000; - while ((ULONG)FpTable < 0x100000) - { - if (FpTable->Signature == MP_FP_SIGNATURE) - { - Length = FpTable->Length * 0x10; - Ptr = (char *)FpTable; - Sum = 0; - for (i = 0; i < Length; i++) - { - Sum += Ptr[i]; - } - DbgPrint((DPRINT_HWDETECT, - "Checksum: %u\n", - Sum)); - - if (Sum != 0) - { - DbgPrint((DPRINT_HWDETECT, - "Invalid MP floating point checksum: %u\n", - Sum)); - return NULL; - } - - return FpTable; - } - - FpTable = (PMP_FLOATING_POINT_TABLE)((ULONG)FpTable + 0x10); - } - - return NULL; -} - - -static PMP_CONFIGURATION_TABLE -GetMpConfigurationTable(PMP_FLOATING_POINT_TABLE FpTable) -{ - PMP_CONFIGURATION_TABLE ConfigTable; - char *Ptr; - UCHAR Sum; - ULONG Length; - ULONG i; - - if (FpTable->FeatureByte[0] != 0 || - FpTable->PhysicalAddressPointer == 0) - return NULL; - - ConfigTable = (PMP_CONFIGURATION_TABLE)FpTable->PhysicalAddressPointer; - if (ConfigTable->Signature != MP_CT_SIGNATURE) - return NULL; - - DbgPrint((DPRINT_HWDETECT, - "MP Configuration Table at: %x\n", - (ULONG)ConfigTable)); - - /* Calculate base table checksum */ - Length = ConfigTable->BaseTableLength; - Ptr = (char *)ConfigTable; - Sum = 0; - for (i = 0; i < Length; i++) - { - Sum += Ptr[i]; - } - DbgPrint((DPRINT_HWDETECT, - "MP Configuration Table base checksum: %u\n", - Sum)); - - if (Sum != 0) - { - DbgPrint((DPRINT_HWDETECT, - "Invalid MP Configuration Table base checksum: %u\n", - Sum)); - return NULL; - } - - if (ConfigTable->ExtendedTableLength != 0) - { - /* FIXME: Check extended table */ - } - - return ConfigTable; -} - - -static BOOLEAN -DetectMps(FRLDRHKEY CpuKey, - FRLDRHKEY FpuKey) -{ - PMP_FLOATING_POINT_TABLE FpTable; - PMP_CONFIGURATION_TABLE ConfigTable; - PMP_PROCESSOR_ENTRY CpuEntry; - char *Ptr; - ULONG Offset; - - /* Get floating point table */ - FpTable = GetMpFloatingPointTable(); - if (FpTable == NULL) - return FALSE; - - DbgPrint((DPRINT_HWDETECT, - "MP Floating Point Table at: %x\n", - (ULONG)FpTable)); - - if (FpTable->FeatureByte[0] == 0) - { - /* Get configuration table */ - ConfigTable = GetMpConfigurationTable(FpTable); - if (ConfigTable == NULL) - { - DbgPrint((DPRINT_HWDETECT, - "Failed to find the MP Configuration Table\n")); - return FALSE; - } - - Offset = sizeof(MP_CONFIGURATION_TABLE); - while (Offset < ConfigTable->BaseTableLength) - { - Ptr = (char*)((ULONG)ConfigTable + Offset); - - switch (*Ptr) - { - case 0: - CpuEntry = (PMP_PROCESSOR_ENTRY)Ptr; - - DbgPrint((DPRINT_HWDETECT, "Processor Entry\n")); - DbgPrint((DPRINT_HWDETECT, - "APIC Id %u APIC Version %u Flags %x Signature %x Feature %x\n", - CpuEntry->LocalApicId, - CpuEntry->LocalApicVersion, - CpuEntry->CpuFlags, - CpuEntry->CpuSignature, - CpuEntry->FeatureFlags)); - DbgPrint((DPRINT_HWDETECT, - "Processor %u: x86 Family %u Model %u Stepping %u\n", - CpuEntry->LocalApicId, - (ULONG)((CpuEntry->CpuSignature >> 8) & 0x0F), - (ULONG)((CpuEntry->CpuSignature >> 4) & 0x0F), - (ULONG)(CpuEntry->CpuSignature & 0x0F))); - - SetMpsProcessor(CpuKey, FpuKey, CpuEntry); - Offset += 0x14; - break; - - case 1: - DbgPrint((DPRINT_HWDETECT, "Bus Entry\n")); - Offset += 0x08; - break; - - case 2: - DbgPrint((DPRINT_HWDETECT, "I/0 APIC Entry\n")); - Offset += 0x08; - break; - - case 3: - DbgPrint((DPRINT_HWDETECT, "I/0 Interrupt Assignment Entry\n")); - Offset += 0x08; - break; - - case 4: - DbgPrint((DPRINT_HWDETECT, "Local Interrupt Assignment Entry\n")); - Offset += 0x08; - break; - - default: - DbgPrint((DPRINT_HWDETECT, "Unknown Entry %u\n",(ULONG)*Ptr)); - return FALSE; - } - } - } - else - { - DbgPrint((DPRINT_HWDETECT, - "Unsupported MPS configuration: %x\n", - FpTable->FeatureByte[0])); - - /* FIXME: Identify default configurations */ - - return FALSE; - } - - return TRUE; -} - - - -VOID -DetectCPUs(FRLDRHKEY SystemKey) -{ - FRLDRHKEY CpuKey; - FRLDRHKEY FpuKey; - LONG Error; - - /* Create the 'CentralProcessor' key */ - Error = RegCreateKey(SystemKey, - L"CentralProcessor", - &CpuKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - - /* Create the 'FloatingPointProcessor' key */ - Error = RegCreateKey(SystemKey, - L"FloatingPointProcessor", - &FpuKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - - /* Detect CPUs */ - if (!DetectMps(CpuKey, FpuKey)) - { - DetectCPU(CpuKey, FpuKey); - } -} - -/* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Fri May 11 00:51:50 2007 @@ -17,7 +17,6 @@ <file>hardware.c</file> <file>hwacpi.c</file> <file>hwapm.c</file> - <file>hwcpu.c</file> <file>hwpci.c</file> <file>i386disk.c</file> <file>i386rtl.c</file> Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c (original) +++ trunk/reactos/ntoskrnl/config/cmconfig.c Fri May 11 00:51:50 2007 @@ -87,9 +87,7 @@ /* Fail if the key couldn't be created, and make sure it's a new key */ if (!NT_SUCCESS(Status)) return Status; - - /* These keys should -not- exist, but FreeLDR creates them :( */ - //ASSERT(Disposition == REG_CREATED_NEW_KEY); + ASSERT(Disposition == REG_CREATED_NEW_KEY); } /* Sstup the compnent information key */ Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Fri May 11 00:51:50 2007 @@ -215,8 +215,8 @@ &Disposition); NtClose(KeyHandle); - /* This key -never- exists on x86 machines, except in ReactOS! */ - //if (Disposition == REG_CREATED_NEW_KEY) + /* The key shouldn't already exist */ + if (Disposition == REG_CREATED_NEW_KEY) { /* Allocate the configuration data for cmconfig.c */ CmpConfigurationData = ExAllocatePoolWithTag(PagedPool,

17 years, 5 months

[ion] 26683: - CmpInitializeMachineDependentConfiguration: Use the same strategy as for the BIOS to get the Video ROM BIOS Date as well and save it into VideoBiosDate.

by ion＠svn.reactos.org

Author: ion Date: Fri May 11 00:43:40 2007 New Revision: 26683 URL: http://svn.reactos.org/svn/reactos?rev=26683&view=rev Log: - CmpInitializeMachineDependentConfiguration: Use the same strategy as for the BIOS to get the Video ROM BIOS Date as well and save it into VideoBiosDate. Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Fri May 11 00:43:40 2007 @@ -540,7 +540,59 @@ /* Close the bios information handle */ NtClose(BiosHandle); } - } + + /* Unmap the section */ + ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + } + + /* Now prepare for Video BIOS Mapping of 32KB */ + BaseAddress = 0; + ViewSize = 8 * PAGE_SIZE; + ViewBase.LowPart = VideoRomBase; + ViewBase.HighPart = 0; + + /* Map it */ + Status = ZwMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + ViewSize, + &ViewBase, + &ViewSize, + ViewUnmap, + MEM_DOS_LIM, + PAGE_READWRITE); + if (NT_SUCCESS(Status)) + { + /* Scan the ROM to get the BIOS Date */ + if (CmpGetBiosDate(BaseAddress, 8 * PAGE_SIZE, Buffer, FALSE)) + { + /* Convert it to Unicode */ + RtlInitAnsiString(&TempString, Buffer); + RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + + /* Write the date into the registry */ + RtlInitUnicodeString(&ValueName, L"VideoBiosDate"); + Status = NtSetValueKey(SystemHandle, + &ValueName, + 0, + REG_SZ, + Data.Buffer, + Data.Length + sizeof(UNICODE_NULL)); + + /* Free the string */ + RtlFreeUnicodeString(&Data); + } + + /* Unmap the section */ + ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + } + + /* Close the section */ + ZwClose(SectionHandle); + + /* Free the BIOS version string buffer */ + if (BiosVersion) ExFreePool(BiosVersion); Quickie: /* Close the procesor handle */

17 years, 5 months

[ion] 26682: - Create \Device\PhysicalMemory in Phase 1 instead of Phase 2, since CmInit needs it. - CmpInitializeMachineDependentConfiguration: Map the IVT to detect the Video ROM Area and save it (corretly detected on QEMU at 0xC000). Then map the BIOS at 0xF0000 and scan it for the newest BIOS Date. - Save detected BIOS date in the System Node's SystemBiosVersion, and save BIOS-default date (11 bytes before the ROM end) in Control\BIOSINFO.

by ion＠svn.reactos.org

Author: ion Date: Fri May 11 00:36:15 2007 New Revision: 26682 URL: http://svn.reactos.org/svn/reactos?rev=26682&view=rev Log: - Create \Device\PhysicalMemory in Phase 1 instead of Phase 2, since CmInit needs it. - CmpInitializeMachineDependentConfiguration: Map the IVT to detect the Video ROM Area and save it (corretly detected on QEMU at 0xC000). Then map the BIOS at 0xF0000 and scan it for the newest BIOS Date. - Save detected BIOS date in the System Node's SystemBiosVersion, and save BIOS-default date (11 bytes before the ROM end) in Control\BIOSINFO. Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Fri May 11 00:36:15 2007 @@ -20,15 +20,112 @@ /* FUNCTIONS *****************************************************************/ +BOOLEAN +NTAPI +CmpGetBiosDate(IN PCHAR BiosStart, + IN ULONG BiosLength, + IN PCHAR BiosDate, + IN BOOLEAN FromBios) +{ + CHAR LastDate[11] = {0}, CurrentDate[11]; + PCHAR p, pp; + + /* Skip the signature and the magic, and loop the BIOS ROM */ + p = BiosStart + 2; + pp = BiosStart + BiosLength - 5; + while (p < pp) + { + /* Check for xx/yy/zz which we assume to be a date */ + if ((p[0] == '/') && + (p[3] == '/') && + (isdigit(p[-1])) && + (isdigit(p[1])) && + (isdigit(p[2])) && + (isdigit(p[4])) && + (isdigit(p[5]))) + { + /* Copy the string proper */ + RtlMoveMemory(&CurrentDate[5], p - 2, 5); + + /* Add a 0 if the month only has one digit */ + if (!isdigit(CurrentDate[5])) CurrentDate[5] = '0'; + + /* Now copy the year */ + CurrentDate[2] = p[4]; + CurrentDate[3] = p[5]; + CurrentDate[4] = CurrentDate[7] = CurrentDate[10] = ANSI_NULL; + + /* If the date comes from the BIOS, check if it's a 4-digit year */ + if ((FromBios) && + (isdigit(p[6])) && + (isdigit(p[7])) && + ((RtlEqualMemory(&p[4], "19", 2)) || + (RtlEqualMemory(&p[4], "20", 2)))) + { + /* Copy the year proper */ + CurrentDate[0] = p[4]; + CurrentDate[1] = p[5]; + CurrentDate[2] = p[6]; + CurrentDate[3] = p[7]; + } + else + { + /* Otherwise, we'll just assume anything under 80 is 2000 */ + if (strtoul(&CurrentDate[2], NULL, 10) < 80) + { + /* Hopefully your BIOS wasn't made in 1979 */ + CurrentDate[0] = '2'; + CurrentDate[1] = '0'; + } + else + { + /* Anything over 80, was probably made in the 1900s... */ + CurrentDate[0] = '1'; + CurrentDate[1] = '9'; + } + } + + /* Add slashes were we previously had NULLs */ + CurrentDate[4] = CurrentDate[7] = '/'; + + /* Check which date is newer */ + if (memcmp(LastDate, CurrentDate, 10) < 0) + { + /* Found a newer date, select it */ + RtlMoveMemory(LastDate, CurrentDate, 10); + } + + p += 2; + } + p++; + } + + /* Make sure we found a date */ + if (LastDate[0]) + { + /* Copy the year at the pp, and keep only the last two digits */ + RtlMoveMemory(BiosDate, &LastDate[5], 5); + BiosDate[5] = '/'; + BiosDate[6] = LastDate[2]; + BiosDate[7] = LastDate[3]; + BiosDate[8] = ANSI_NULL; + return TRUE; + } + + /* No date found, return empty string */ + BiosDate[0] = ANSI_NULL; + return FALSE; +} + NTSTATUS NTAPI CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - UNICODE_STRING KeyName, ValueName, Data; + UNICODE_STRING KeyName, ValueName, Data, SectionName; OBJECT_ATTRIBUTES ObjectAttributes; ULONG HavePae; NTSTATUS Status; - HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle; + HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle, SectionHandle; ULONG Disposition; CONFIGURATION_COMPONENT_DATA ConfigData; CHAR Buffer[128]; @@ -38,6 +135,12 @@ ANSI_STRING TempString; PCHAR PartialString = NULL; CHAR CpuString[48]; + ULONG CacheSize; + PVOID BaseAddress = NULL; + LARGE_INTEGER ViewBase = {{0}}; + ULONG_PTR VideoRomBase; + ULONG ViewSize; + PCHAR BiosVersion; /* Open the SMSS Memory Management key */ RtlInitUnicodeString(&KeyName, @@ -233,6 +336,9 @@ } } + /* Get the cache size while we're still localized */ + CacheSize = ((PKIPCR)KeGetPcr())->SecondLevelCacheSize; + /* Go back to user affinity */ KeRevertToUserAffinityThread(); @@ -317,6 +423,8 @@ /* Close the processor handle */ NtClose(KeyHandle); + + /* FIXME: Detect CPU mismatches */ } } @@ -324,6 +432,118 @@ ExFreePool(CmpConfigurationData); } - /* All done*/ + /* Open physical memory */ + RtlInitUnicodeString(&SectionName, L"\\Device\\PhysicalMemory"); + InitializeObjectAttributes(&ObjectAttributes, + &SectionName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenSection(&SectionHandle, + SECTION_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Map the first 1KB of memory to get the IVT */ + ViewSize = PAGE_SIZE; + Status = ZwMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + ViewSize, + &ViewBase, + &ViewSize, + ViewUnmap, + MEM_DOS_LIM, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + /* Assume default */ + VideoRomBase = 0xC0000; + } + else + { + /* Calculate the base address from the vector */ + VideoRomBase = (*((PULONG)BaseAddress + 0x10) >> 12) & 0xFFFF0; + VideoRomBase += *((PULONG)BaseAddress + 0x10) & 0xFFF0; + + /* Now get to the actual ROM Start and make sure it's not invalid*/ + VideoRomBase &= 0xFFFF8000; + if (VideoRomBase < 0xC0000) VideoRomBase = 0xC0000; + + /* And unmap the section */ + ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + } + + /* Allocate BIOS Version String Buffer */ + BiosVersion = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); + + /* Setup settings to map the 64K BIOS ROM */ + BaseAddress = 0; + ViewSize = 16 * PAGE_SIZE; + ViewBase.LowPart = 0xF0000; + ViewBase.HighPart = 0; + + /* Map it */ + Status = ZwMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + ViewSize, + &ViewBase, + &ViewSize, + ViewUnmap, + MEM_DOS_LIM, + PAGE_READWRITE); + if (NT_SUCCESS(Status)) + { + /* Scan the ROM to get the BIOS Date */ + if (CmpGetBiosDate(BaseAddress, 16 * PAGE_SIZE, Buffer, TRUE)) + { + /* Convert it to Unicode */ + RtlInitAnsiString(&TempString, Buffer); + RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + + /* Write the date into the registry */ + RtlInitUnicodeString(&ValueName, L"SystemBiosDate"); + Status = NtSetValueKey(SystemHandle, + &ValueName, + 0, + REG_SZ, + Data.Buffer, + Data.Length + sizeof(UNICODE_NULL)); + + /* Free the string */ + RtlFreeUnicodeString(&Data); + + /* Get the BIOS Date Identifier */ + RtlCopyMemory(Buffer, (PCHAR)BaseAddress + (16*PAGE_SIZE - 11), 8); + Buffer[8] = ANSI_NULL; + + /* Convert it to unicode */ + RtlInitAnsiString(&TempString, Buffer); + Status = RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + if (NT_SUCCESS(Status)) + { + /* Save it to the registry */ + Status = NtSetValueKey(BiosHandle, + &ValueName, + 0, + REG_SZ, + Data.Buffer, + Data.Length + sizeof(UNICODE_NULL)); + + /* Free the string */ + RtlFreeUnicodeString(&Data); + } + + /* Close the bios information handle */ + NtClose(BiosHandle); + } + } + +Quickie: + /* Close the procesor handle */ + NtClose(KeyHandle); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Fri May 11 00:36:15 2007 @@ -496,6 +496,7 @@ SectionsReady = TRUE; MmInitPagingFile(); PagingReady = TRUE; + MmCreatePhysicalMemorySection(); /* Setup shared user data settings that NT does as well */ ASSERT(SharedUserData->NumberOfPhysicalPages == 0); @@ -510,7 +511,6 @@ /* * Unmap low memory */ - MmCreatePhysicalMemorySection(); MiInitBalancerThread(); /*

17 years, 5 months

[ion] 26681: - CmpInitializeMachineDependentConfiguration: Add Processor Name and Vendor ID as well (the former doesnt' work on QEMU because QEMU desn't support CPUID-EX, but on VMWare, I get: Dual Core AMD Opteron(tm) Processor 185.

by ion＠svn.reactos.org

Author: ion Date: Thu May 10 23:06:52 2007 New Revision: 26681 URL: http://svn.reactos.org/svn/reactos?rev=26681&view=rev Log: - CmpInitializeMachineDependentConfiguration: Add Processor Name and Vendor ID as well (the former doesnt' work on QEMU because QEMU desn't support CPUID-EX, but on VMWare, I get: Dual Core AMD Opteron(tm) Processor 185. Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Thu May 10 23:06:52 2007 @@ -24,7 +24,7 @@ NTAPI CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - UNICODE_STRING KeyName, ValueName; + UNICODE_STRING KeyName, ValueName, Data; OBJECT_ATTRIBUTES ObjectAttributes; ULONG HavePae; NTSTATUS Status; @@ -32,9 +32,12 @@ ULONG Disposition; CONFIGURATION_COMPONENT_DATA ConfigData; CHAR Buffer[128]; - ULONG i; + ULONG i, ExtendedId, Dummy; PKPRCB Prcb; USHORT IndexTable[MaximumType + 1] = {0}; + ANSI_STRING TempString; + PCHAR PartialString = NULL; + CHAR CpuString[48]; /* Open the SMSS Memory Management key */ RtlInitUnicodeString(&KeyName, @@ -198,6 +201,81 @@ /* Close this new handle */ NtClose(FpuHandle); + /* Stay on this CPU only */ + KeSetSystemAffinityThread(Prcb->SetMember); + if (!Prcb->CpuID) + { + /* Uh oh, no CPUID! */ + } + else + { + /* Check if we have extended CPUID that supports name ID */ + Ki386Cpuid(0x80000000, &ExtendedId, &Dummy, &Dummy, &Dummy); + if (ExtendedId >= 0x80000004) + { + /* Do all the CPUIDs requred to get the full name */ + PartialString = CpuString; + for (ExtendedId = 2; ExtendedId <= 4; ExtendedId++) + { + /* Do the CPUID and save the name string */ + Ki386Cpuid(0x80000000 | ExtendedId, + (PULONG)PartialString, + (PULONG)PartialString + 1, + (PULONG)PartialString + 2, + (PULONG)PartialString + 3); + + /* Go to the next name string */ + PartialString += 16; + } + + /* Null-terminate it */ + CpuString[48] = ANSI_NULL; + } + } + + /* Go back to user affinity */ + KeRevertToUserAffinityThread(); + + /* Check if we have a CPU Name */ + if (PartialString) + { + /* Convert it to Unicode */ + RtlInitAnsiString(&TempString, CpuString); + RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + + /* Add it to the registry */ + RtlInitUnicodeString(&ValueName, L"ProcessorNameString"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + Data.Buffer, + Data.Length + sizeof(UNICODE_NULL)); + + /* Free the temporary buffer */ + RtlFreeUnicodeString(&Data); + } + + /* Check if we had a Vendor ID */ + if (Prcb->VendorString) + { + /* Convert it to Unicode */ + RtlInitAnsiString(&TempString, Prcb->VendorString); + RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + + /* Add it to the registry */ + RtlInitUnicodeString(&ValueName, L"VendorIdentifier"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + Data.Buffer, + Data.Length + sizeof(UNICODE_NULL)); + + /* Free the temporary buffer */ + RtlFreeUnicodeString(&Data); + } + /* Check if we have features bits */ if (Prcb->FeatureBits) {

17 years, 5 months

[ion] 26680: - CmpInitializeMachineDependentConfiguration: Write FeatureSet, MHZ and Update Signature to registry CentralProcessor node.

by ion＠svn.reactos.org

Author: ion Date: Thu May 10 22:11:11 2007 New Revision: 26680 URL: http://svn.reactos.org/svn/reactos?rev=26680&view=rev Log: - CmpInitializeMachineDependentConfiguration: Write FeatureSet, MHZ and Update Signature to registry CentralProcessor node. Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Thu May 10 22:11:11 2007 @@ -197,6 +197,48 @@ /* Close this new handle */ NtClose(FpuHandle); + + /* Check if we have features bits */ + if (Prcb->FeatureBits) + { + /* Add them to the registry */ + RtlInitUnicodeString(&ValueName, L"FeatureSet"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_DWORD, + &Prcb->FeatureBits, + sizeof(Prcb->FeatureBits)); + } + + /* Check if we detected the CPU Speed */ + if (Prcb->MHz) + { + /* Add it to the registry */ + RtlInitUnicodeString(&ValueName, L"~MHz"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_DWORD, + &Prcb->MHz, + sizeof(Prcb->MHz)); + } + + /* Check if we have an update signature */ + if (Prcb->UpdateSignature.QuadPart) + { + /* Add it to the registry */ + RtlInitUnicodeString(&ValueName, L"Update Signature"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_BINARY, + &Prcb->UpdateSignature, + sizeof(Prcb->UpdateSignature)); + } + + /* Close the processor handle */ + NtClose(KeyHandle); } }

17 years, 5 months

[mbosma] 26679: reformatted options.c using gnu indent.

by mbosma＠svn.reactos.org

Author: mbosma Date: Thu May 10 22:09:36 2007 New Revision: 26679 URL: http://svn.reactos.org/svn/reactos?rev=26679&view=rev Log: reformatted options.c using gnu indent. Modified: trunk/tools/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Thu May 10 22:09:36 2007 @@ -24,93 +24,98 @@ #include "resources.h" // note: do not change the order - theses are the color under winxp they might differ in another OSes -WCHAR* Colors[] = { L"black", L"dark blue", L"green", L"turquoise", L"dark red", L"purple", - L"ochar", L"light grey", L"dark grey", L"light blue", L"light green", - L"cyan", L"light red", L"magenta", L"yellow", L"white" }; +WCHAR *Colors[] = { L"black", L"dark blue", L"green", L"turquoise", L"dark red", L"purple", + L"ochar", L"light grey", L"dark grey", L"light blue", L"light green", + L"cyan", L"light red", L"magenta", L"yellow", L"white" +}; -int WriteSettings (HWND hwnd) +int +WriteSettings(HWND hwnd) { - int foreground, background; - BOOL showtime, writelog; - WCHAR logpath [MAX_PATH]; + int foreground, background; + BOOL showtime, writelog; + WCHAR logpath[MAX_PATH]; - showtime = SendMessage(GetDlgItem(hwnd, ID_SHOWBUILDTIME), BM_GETCHECK, 0, 0) == BST_CHECKED; - writelog = SendMessage(GetDlgItem(hwnd, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED; - foreground = SendMessage(GetDlgItem(hwnd, IDC_BACK), CB_GETCURSEL, 0, 0); - background = SendMessage(GetDlgItem(hwnd, IDC_FONT), CB_GETCURSEL, 0, 0); - GetDlgItemText(hwnd, ID_LOGDIR, logpath, MAX_PATH); + showtime = SendMessage(GetDlgItem(hwnd, ID_SHOWBUILDTIME), BM_GETCHECK, 0, 0) == BST_CHECKED; + writelog = SendMessage(GetDlgItem(hwnd, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED; + foreground = SendMessage(GetDlgItem(hwnd, IDC_BACK), CB_GETCURSEL, 0, 0); + background = SendMessage(GetDlgItem(hwnd, IDC_FONT), CB_GETCURSEL, 0, 0); + GetDlgItemText(hwnd, ID_LOGDIR, logpath, MAX_PATH); - FILE * pFile = fopen ("options.cmd","w"); + FILE *pFile = fopen("options.cmd", "w"); - fprintf (pFile, "REM This file has been automatically created by RosBE Options Dialog\n\n"); - fprintf (pFile, "color %X%X\n",background,foreground); - fprintf (pFile, "set ROSBE_SHOWTIME=%d\n",showtime); - fprintf (pFile, "set ROSBE_WRITELOG=%d\n",writelog); - fprintf (pFile, "set ROSBE_LOGPATH=%S\n",logpath); + fprintf(pFile, "REM This file has been automatically created by RosBE Options Dialog\n\n"); + fprintf(pFile, "color %X%X\n", background, foreground); + fprintf(pFile, "set ROSBE_SHOWTIME=%d\n", showtime); + fprintf(pFile, "set ROSBE_WRITELOG=%d\n", writelog); + fprintf(pFile, "set ROSBE_LOGPATH=%S\n", logpath); - fclose (pFile); + fclose(pFile); } -INT_PTR CALLBACK DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK +DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { - int i = 0; - switch (Msg) - { - case WM_INITDIALOG: - { - for(i = 0; i < sizeof(Colors)/sizeof(char*); i++) - { - SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_ADDSTRING, 0, (LPARAM)(Colors[i])); - SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_ADDSTRING, 0, (LPARAM)(Colors[i])); - } - SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_SETCURSEL, 0, 0); - SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_SETCURSEL, 0xA, 0); - EnableWindow (GetDlgItem(Dlg, ID_BROWSE), FALSE); - EnableWindow (GetDlgItem(Dlg, ID_LOGDIR), FALSE); - return TRUE; - } + int i = 0; + switch (Msg) + { + case WM_INITDIALOG: + { + for(i = 0; i < sizeof(Colors) / sizeof(char *); i++) + { + SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_ADDSTRING, 0, (LPARAM) (Colors[i])); + SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_ADDSTRING, 0, (LPARAM) (Colors[i])); + } + SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_SETCURSEL, 0, 0); + SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_SETCURSEL, 0xA, 0); + EnableWindow(GetDlgItem(Dlg, ID_BROWSE), FALSE); + EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), FALSE); + return TRUE; + } - case WM_COMMAND: - { - if (wParam == ID_CANCEL) - { - PostMessage(Dlg, WM_CLOSE, 0, 0); - } - else if (wParam == ID_OK) - { - WriteSettings(Dlg); - PostMessage(Dlg, WM_CLOSE, 0, 0); - } - else if (wParam == ID_BROWSE) - { - WCHAR Path [MAX_PATH]; - BROWSEINFO PathInfo = {0}; - PathInfo.hwndOwner = Dlg; - PathInfo.lpszTitle = L"Please choose a directory where the the logs should be stored:"; - LPITEMIDLIST pidl = SHBrowseForFolder ( &PathInfo ); - if(pidl && SHGetPathFromIDList ( pidl, Path )) - SetDlgItemText(Dlg, ID_LOGDIR, Path); - } - else if (wParam == ID_SAVELOGS) - { - BOOL WriteLogSet = SendMessage(GetDlgItem(Dlg, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED; - EnableWindow (GetDlgItem(Dlg, ID_BROWSE), WriteLogSet); - EnableWindow (GetDlgItem(Dlg, ID_LOGDIR), WriteLogSet); - } - return FALSE; - } + case WM_COMMAND: + { + if (wParam == ID_CANCEL) + { + PostMessage(Dlg, WM_CLOSE, 0, 0); + } + else if (wParam == ID_OK) + { + WriteSettings(Dlg); + PostMessage(Dlg, WM_CLOSE, 0, 0); + } + else if (wParam == ID_BROWSE) + { + WCHAR Path[MAX_PATH]; + BROWSEINFO PathInfo = { 0 }; + PathInfo.hwndOwner = Dlg; + PathInfo.lpszTitle = L"Please choose a directory where the the logs should be stored:"; + LPITEMIDLIST pidl = SHBrowseForFolder(&PathInfo); + if (pidl && SHGetPathFromIDList(pidl, Path)) + SetDlgItemText(Dlg, ID_LOGDIR, Path); + } + else if (wParam == ID_SAVELOGS) + { + BOOL WriteLogSet = SendMessage(GetDlgItem(Dlg, ID_SAVELOGS), BM_GETCHECK, 0, + 0) == BST_CHECKED; + EnableWindow(GetDlgItem(Dlg, ID_BROWSE), WriteLogSet); + EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), WriteLogSet); + } + return FALSE; + } - case WM_CLOSE: - { - EndDialog(Dlg, 0); - return TRUE; - } - } - return FALSE; + case WM_CLOSE: + { + EndDialog(Dlg, 0); + return TRUE; + } + } + return FALSE; } -int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow) +int WINAPI +WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow) { - DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc); - return 0; + DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc); + return 0; }

17 years, 5 months

[ion] 26678: - Make CmpInitializeMachineDependentConfiguration create the FloatingPointProcessor hardware key/ARC node.

by ion＠svn.reactos.org

Author: ion Date: Thu May 10 22:04:41 2007 New Revision: 26678 URL: http://svn.reactos.org/svn/reactos?rev=26678&view=rev Log: - Make CmpInitializeMachineDependentConfiguration create the FloatingPointProcessor hardware key/ARC node. Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Thu May 10 22:04:41 2007 @@ -28,7 +28,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; ULONG HavePae; NTSTATUS Status; - HANDLE KeyHandle, BiosHandle, SystemHandle; + HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle; ULONG Disposition; CONFIGURATION_COMPONENT_DATA ConfigData; CHAR Buffer[128]; @@ -129,7 +129,7 @@ ConfigData.ComponentEntry.Class = ProcessorClass; ConfigData.ComponentEntry.Type = CentralProcessor; ConfigData.ComponentEntry.Key = i; - ConfigData.ComponentEntry.AffinityMask = 1 << i; + ConfigData.ComponentEntry.AffinityMask = AFFINITY_MASK(i); ConfigData.ComponentEntry.Identifier = Buffer; /* Check if the CPU doesn't support CPUID */ @@ -163,6 +163,41 @@ 0xFFFFFFFF, IndexTable); if (!NT_SUCCESS(Status)) return(Status); + + /* Check if we have an FPU */ + if (KeI386NpxPresent) + { + /* Setup the Configuration Entry for the FPU */ + RtlZeroMemory(&ConfigData, sizeof(ConfigData)); + ConfigData.ComponentEntry.Class = ProcessorClass; + ConfigData.ComponentEntry.Type = FloatingPointProcessor; + ConfigData.ComponentEntry.Key = i; + ConfigData.ComponentEntry.AffinityMask = AFFINITY_MASK(i); + ConfigData.ComponentEntry.Identifier = Buffer; + + /* For 386 cpus, the CPU String is the identifier */ + if (Prcb->CpuType == 3) strcpy(Buffer, "80387"); + + /* Save the ID string length now that we've created it */ + ConfigData.ComponentEntry.IdentifierLength = strlen(Buffer) + 1; + + /* Initialize the registry configuration node for it */ + Status = CmpInitializeRegistryNode(&ConfigData, + SystemHandle, + &FpuHandle, + InterfaceTypeUndefined, + 0xFFFFFFFF, + IndexTable); + if (!NT_SUCCESS(Status)) + { + /* Failed, close the CPU handle and return */ + NtClose(KeyHandle); + return Status; + } + + /* Close this new handle */ + NtClose(FpuHandle); + } } /* Free the configuration data */

17 years, 5 months

[ion] 26677: - Add more code to CmpInitializeMachineDependentConfiguration to create the BIOSINFO key and to start working on the CentralProcessor key (which, in ReactOS, FreeLDR creates when it shouldn't). Creates the basic CentralProcessor nodes for now. - Add cmconfig.c and implement a helper routine that converts from ARC CONFIGURATION_COMPONENT_DATA to a Hardware Description entry and resource descriptor. - Fix outdated _CONFIGURATION_TYPE definition in our DDK.

by ion＠svn.reactos.org

Author: ion Date: Thu May 10 21:52:09 2007 New Revision: 26677 URL: http://svn.reactos.org/svn/reactos?rev=26677&view=rev Log: - Add more code to CmpInitializeMachineDependentConfiguration to create the BIOSINFO key and to start working on the CentralProcessor key (which, in ReactOS, FreeLDR creates when it shouldn't). Creates the basic CentralProcessor nodes for now. - Add cmconfig.c and implement a helper routine that converts from ARC CONFIGURATION_COMPONENT_DATA to a Hardware Description entry and resource descriptor. - Fix outdated _CONFIGURATION_TYPE definition in our DDK. Added: trunk/reactos/ntoskrnl/config/cmconfig.c Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu May 10 21:52:09 2007 @@ -4592,6 +4592,7 @@ SystemMemory, DockingInformation, RealModeIrqRoutingTable, + RealModePCIEnumeration, MaximumType } CONFIGURATION_TYPE, *PCONFIGURATION_TYPE; Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Thu May 10 21:52:09 2007 @@ -940,6 +940,20 @@ ); // +// Hardware Configuration Routines +// +NTSTATUS +NTAPI +CmpInitializeRegistryNode( + IN PCONFIGURATION_COMPONENT_DATA CurrentEntry, + IN HANDLE NodeHandle, + OUT PHANDLE NewHandle, + IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber, + IN PUSHORT DeviceIndexTable +); + +// // Global variables accessible from all of Cm // extern BOOLEAN CmpSpecialBootCondition; @@ -961,6 +975,10 @@ extern LANGID PsInstallUILanguageId; extern LANGID PsDefaultUILanguageId; extern CM_SYSTEM_CONTROL_VECTOR CmControlVector[]; +extern ULONG CmpConfigurationAreaSize; +extern PCM_FULL_RESOURCE_DESCRIPTOR CmpConfigurationData; +extern UNICODE_STRING CmTypeName[]; +extern BOOLEAN ExpInTextModeSetup; // // Inlined functions Added: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c (added) +++ trunk/reactos/ntoskrnl/config/cmconfig.c Thu May 10 21:52:09 2007 @@ -1,0 +1,198 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmconfig.c + * PURPOSE: Configuration Manager - System Configuration Routines + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +CmpInitializeRegistryNode(IN PCONFIGURATION_COMPONENT_DATA CurrentEntry, + IN HANDLE NodeHandle, + OUT PHANDLE NewHandle, + IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber, + IN PUSHORT DeviceIndexTable) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName, ValueName, ValueData; + HANDLE KeyHandle, ParentHandle; + ANSI_STRING TempString; + CHAR TempBuffer[12]; + WCHAR Buffer[12]; + PCONFIGURATION_COMPONENT Component; + ULONG Disposition, Length = 0; + + /* Get the component */ + Component = &CurrentEntry->ComponentEntry; + + /* Set system class components to ARC system type */ + if (Component->Class == SystemClass) Component->Type = ArcSystem; + + /* Create a key for the component */ + InitializeObjectAttributes(&ObjectAttributes, + &CmTypeName[Component->Type], + OBJ_CASE_INSENSITIVE, + NodeHandle, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if this is anything but a system class component */ + if (Component->Class != SystemClass) + { + /* Build the sub-component string */ + RtlIntegerToChar(DeviceIndexTable[Component->Type]++, + 10, + 12, + TempBuffer); + RtlInitAnsiString(&TempString, TempBuffer); + + /* Convert it to Unicode */ + RtlInitEmptyUnicodeString(&KeyName, Buffer, sizeof(Buffer)); + RtlAnsiStringToUnicodeString(&KeyName, &TempString, FALSE); + + /* Create the key */ + ParentHandle = KeyHandle; + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentHandle, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + NtClose(ParentHandle); + + /* Fail if the key couldn't be created, and make sure it's a new key */ + if (!NT_SUCCESS(Status)) return Status; + + /* These keys should -not- exist, but FreeLDR creates them :( */ + //ASSERT(Disposition == REG_CREATED_NEW_KEY); + } + + /* Sstup the compnent information key */ + RtlInitUnicodeString(&ValueName, L"Component Information"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_BINARY, + &Component->Flags, + FIELD_OFFSET(CONFIGURATION_COMPONENT, + ConfigurationDataLength) - + FIELD_OFFSET(CONFIGURATION_COMPONENT, Flags)); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + NtClose(KeyHandle); + return Status; + } + + /* Check if we have an identifier */ + if (Component->IdentifierLength) + { + /* Build the string and convert it to Unicode */ + RtlInitUnicodeString(&ValueName, L"Identifier"); + RtlInitAnsiString(&TempString, Component->Identifier); + Status = RtlAnsiStringToUnicodeString(&ValueData, + &TempString, + TRUE); + if (NT_SUCCESS(Status)) + { + /* Save the identifier in the registry */ + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueData.Buffer, + ValueData.Length + sizeof(UNICODE_NULL)); + RtlFreeUnicodeString(&ValueData); + } + + /* Check for failure during conversion or registry write */ + if (!NT_SUCCESS(Status)) + { + /* Fail */ + NtClose(KeyHandle); + return Status; + } + } + + /* Setup the configuration data string */ + RtlInitUnicodeString(&ValueName, L"Configuration Data"); + + /* Check if we got configuration data */ + if (CurrentEntry->ConfigurationData) + { + /* Calculate the total length and check if it fits into our buffer */ + Length = Component->ConfigurationDataLength + + FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList); + if (Length > CmpConfigurationAreaSize) + { + ASSERTMSG("Component too large -- need reallocation!", FALSE); + } + else + { + /* Copy the data */ + RtlCopyMemory(&CmpConfigurationData->PartialResourceList.Version, + CurrentEntry->ConfigurationData, + Component->ConfigurationDataLength); + } + } + else + { + /* No configuration data, setup defaults */ + CmpConfigurationData->PartialResourceList.Version = 0; + CmpConfigurationData->PartialResourceList.Revision = 0; + CmpConfigurationData->PartialResourceList.Count = 0; + Length = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors) + + FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList); + } + + /* Set the interface type and bus number */ + CmpConfigurationData->InterfaceType = InterfaceType; + CmpConfigurationData->BusNumber = BusNumber; + + /* Save the actual data */ + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_FULL_RESOURCE_DESCRIPTOR, + CmpConfigurationData, + Length); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + NtClose(KeyHandle); + } + else + { + /* Return the new handle */ + *NewHandle = KeyHandle; + } + + /* Return status */ + return Status; +} + Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c Thu May 10 21:52:09 2007 @@ -33,6 +33,55 @@ CMHIVE CmControlHive; +ULONG CmpConfigurationAreaSize = PAGE_SIZE * 4; +PCM_FULL_RESOURCE_DESCRIPTOR CmpConfigurationData; + +UNICODE_STRING CmTypeName[MaximumType + 1] = +{ + RTL_CONSTANT_STRING(L"System"), + RTL_CONSTANT_STRING(L"CentralProcessor"), + RTL_CONSTANT_STRING(L"FloatingPointProcessor"), + RTL_CONSTANT_STRING(L"PrimaryICache"), + RTL_CONSTANT_STRING(L"PrimaryDCache"), + RTL_CONSTANT_STRING(L"SecondaryICache"), + RTL_CONSTANT_STRING(L"SecondaryDCache"), + RTL_CONSTANT_STRING(L"SecondaryCache"), + RTL_CONSTANT_STRING(L"EisaAdapter"), + RTL_CONSTANT_STRING(L"TcAdapter"), + RTL_CONSTANT_STRING(L"ScsiAdapter"), + RTL_CONSTANT_STRING(L"DtiAdapter"), + RTL_CONSTANT_STRING(L"MultifunctionAdapter"), + RTL_CONSTANT_STRING(L"DiskController"), + RTL_CONSTANT_STRING(L"TapeController"), + RTL_CONSTANT_STRING(L"CdRomController"), + RTL_CONSTANT_STRING(L"WormController"), + RTL_CONSTANT_STRING(L"SerialController"), + RTL_CONSTANT_STRING(L"NetworkController"), + RTL_CONSTANT_STRING(L"DisplayController"), + RTL_CONSTANT_STRING(L"ParallelController"), + RTL_CONSTANT_STRING(L"PointerController"), + RTL_CONSTANT_STRING(L"KeyboardController"), + RTL_CONSTANT_STRING(L"AudioController"), + RTL_CONSTANT_STRING(L"OtherController"), + RTL_CONSTANT_STRING(L"DiskPeripheral"), + RTL_CONSTANT_STRING(L"FloppyDiskPeripheral"), + RTL_CONSTANT_STRING(L"TapePeripheral"), + RTL_CONSTANT_STRING(L"ModemPeripheral"), + RTL_CONSTANT_STRING(L"MonitorPeripheral"), + RTL_CONSTANT_STRING(L"PrinterPeripheral"), + RTL_CONSTANT_STRING(L"PointerPeripheral"), + RTL_CONSTANT_STRING(L"KeyboardPeripheral"), + RTL_CONSTANT_STRING(L"TerminalPeripheral"), + RTL_CONSTANT_STRING(L"OtherPeripheral"), + RTL_CONSTANT_STRING(L"LinePeripheral"), + RTL_CONSTANT_STRING(L"NetworkPeripheral"), + RTL_CONSTANT_STRING(L"SystemMemory"), + RTL_CONSTANT_STRING(L"DockingInformation"), + RTL_CONSTANT_STRING(L"RealModeIrqRoutingTable"), + RTL_CONSTANT_STRING(L"RealModePCIEnumeration"), + RTL_CONSTANT_STRING(L"Undefined") +}; + CM_SYSTEM_CONTROL_VECTOR CmControlVector[] = { { Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Thu May 10 21:52:09 2007 @@ -13,6 +13,11 @@ #define NDEBUG #include "debug.h" +/* GLOBALS *******************************************************************/ + +PCHAR CmpID1 = "80%u86-%c%x"; +PCHAR CmpID2 = "x86 Family %u Model %u Stepping %u"; + /* FUNCTIONS *****************************************************************/ NTSTATUS @@ -23,8 +28,15 @@ OBJECT_ATTRIBUTES ObjectAttributes; ULONG HavePae; NTSTATUS Status; - HANDLE KeyHandle; + HANDLE KeyHandle, BiosHandle, SystemHandle; + ULONG Disposition; + CONFIGURATION_COMPONENT_DATA ConfigData; + CHAR Buffer[128]; + ULONG i; + PKPRCB Prcb; + USHORT IndexTable[MaximumType + 1] = {0}; + /* Open the SMSS Memory Management key */ RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\" L"Control\\Session Manager\\Memory Management"); @@ -52,6 +64,111 @@ NtClose(KeyHandle); } + /* Open the hardware description key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\Hardware\\Description\\System"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&SystemHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) return Status; + + /* Create the BIOS Information key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\" + L"Control\\BIOSINFO"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateKey(&BiosHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + &Disposition); + if (!NT_SUCCESS(Status) && !ExpInTextModeSetup) return Status; + + /* Create the CPU Key, and check if it already existed */ + RtlInitUnicodeString(&KeyName, L"CentralProcessor"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + SystemHandle, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + NtClose(KeyHandle); + + /* This key -never- exists on x86 machines, except in ReactOS! */ + //if (Disposition == REG_CREATED_NEW_KEY) + { + /* Allocate the configuration data for cmconfig.c */ + CmpConfigurationData = ExAllocatePoolWithTag(PagedPool, + CmpConfigurationAreaSize, + TAG_CM); + if (!CmpConfigurationData) return STATUS_INSUFFICIENT_RESOURCES; + + /* Loop all CPUs */ + for (i = 0; i < KeNumberProcessors; i++) + { + /* Get the PRCB */ + Prcb = KiProcessorBlock[i]; + + /* Setup the Configuration Entry for the Processor */ + RtlZeroMemory(&ConfigData, sizeof (ConfigData)); + ConfigData.ComponentEntry.Class = ProcessorClass; + ConfigData.ComponentEntry.Type = CentralProcessor; + ConfigData.ComponentEntry.Key = i; + ConfigData.ComponentEntry.AffinityMask = 1 << i; + ConfigData.ComponentEntry.Identifier = Buffer; + + /* Check if the CPU doesn't support CPUID */ + if (!Prcb->CpuID) + { + /* Build ID1-style string for older CPUs */ + sprintf(Buffer, + CmpID1, + Prcb->CpuType, + (Prcb->CpuStep >> 8) + 'A', + Prcb->CpuStep & 0xff); + } + else + { + /* Build ID2-style string for newer CPUs */ + sprintf(Buffer, + CmpID2, + Prcb->CpuType, + (Prcb->CpuStep >> 8), + Prcb->CpuStep & 0xff); + } + + /* Save the ID string length now that we've created it */ + ConfigData.ComponentEntry.IdentifierLength = strlen(Buffer) + 1; + + /* Initialize the registry configuration node for it */ + Status = CmpInitializeRegistryNode(&ConfigData, + SystemHandle, + &KeyHandle, + InterfaceTypeUndefined, + 0xFFFFFFFF, + IndexTable); + if (!NT_SUCCESS(Status)) return(Status); + } + + /* Free the configuration data */ + ExFreePool(CmpConfigurationData); + } + /* All done*/ return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu May 10 21:52:09 2007 @@ -91,6 +91,7 @@ </if> <file>cmboot.c</file> <file>cmcontrl.c</file> + <file>cmconfig.c</file> <file>cmdata.c</file> <file>cmindex.c</file> <file>cmhook.c</file>

17 years, 5 months

[mbosma] 26676: Proper color names.

by mbosma＠svn.reactos.org

Author: mbosma Date: Thu May 10 20:54:52 2007 New Revision: 26676 URL: http://svn.reactos.org/svn/reactos?rev=26676&view=rev Log: Proper color names. Modified: trunk/tools/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE-Windows/Tools/config/todo.txt Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Thu May 10 20:54:52 2007 @@ -24,9 +24,9 @@ #include "resources.h" // note: do not change the order - theses are the color under winxp they might differ in another OSes -WCHAR* Colors[] = { L"black", L"dark blue", L"green", L"turquoise", L"dark red", L"violett", - L"olive", L"light grey", L"dark grey", L"light blue", L"light green", - L"don't know what this color is called", L"light red", L"pink", L"yellow", L"white" }; +WCHAR* Colors[] = { L"black", L"dark blue", L"green", L"turquoise", L"dark red", L"purple", + L"ochar", L"light grey", L"dark grey", L"light blue", L"light green", + L"cyan", L"light red", L"magenta", L"yellow", L"white" }; int WriteSettings (HWND hwnd) { Modified: trunk/tools/RosBE-Windows/Tools/config/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/t… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/todo.txt (original) +++ trunk/tools/RosBE-Windows/Tools/config/todo.txt Thu May 10 20:54:52 2007 @@ -1,11 +1,9 @@ ToDo: +- Fix control size / positions - Load old settings - Disable Save button if there are no changes -- Check Log path before saving +- Check validity of log path before saving - Exe and dialog icon -- Fix control size / positions - Use styled controls (uxtheme) for dialog -- Find out how to disable -- Font preview -- ;abye cool logo as Bitmap -- find out the name of color 0xB +- Find out how to disable ... button +- Font preview

17 years, 5 months

← Newer
1
...
22
23
24
25
26
27
28
...
33
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 2007