[ros-diffs] [reactos] 04/04: [NTOS:CM] Do not create ProcessorNameString value if there is no Brand String

[Stanislav Motylkov]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f234cb6e595949175c65a…

commit f234cb6e595949175c65ae62468120affb3bc7a2
Author:     Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Wed Dec 30 03:24:06 2020 +0300
Commit:     Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Wed Dec 30 19:38:41 2020 +0300

    [NTOS:CM] Do not create ProcessorNameString value if there is no Brand String
    
    If the CPU does support CPUID instruction but does not have the Brand String,
    the legacy name detection should be performed either in CIM_Processor (WMI),
    in the Processor device driver, or in the application itself.
    
    The deleted Intel CPU name detection code can go to the WMI at some point.
    In fact Windows XP and 2003 kernels do not have any strings of that kind.
    
    This effectively reverts the hack committed 6 years ago in 7a985425 (r63798)
    that was intended to workaround CORE-7952.
    
    CORE-17413
---
 ntoskrnl/config/i386/cmhardwr.c | 118 +---------------------------------------
 1 file changed, 3 insertions(+), 115 deletions(-)

diff --git a/ntoskrnl/config/i386/cmhardwr.c b/ntoskrnl/config/i386/cmhardwr.c
index b98c2691000..4b7457d12ac 100644
--- a/ntoskrnl/config/i386/cmhardwr.c
+++ b/ntoskrnl/config/i386/cmhardwr.c
@@ -226,99 +226,6 @@ Match:
     return TRUE;
 }
 
-VOID
-NTAPI
-CmpGetIntelBrandString(OUT PCHAR CpuString)
-{
-    CPU_INFO CpuInfo;
-    ULONG BrandId, Signature;
-
-    /* Get the Brand Id */
-    KiCpuId(&CpuInfo, 0x00000001);
-    Signature = CpuInfo.Eax;
-    BrandId = CpuInfo.Ebx & 0xFF;
-
-    switch (BrandId)
-    {
-        case 0x01:
-            strcpy(CpuString, "Intel(R) Celeron(R) processor");
-            break;
-        case 0x02:
-        case 0x04:
-            strcpy(CpuString, "Intel(R) Pentium(R) III processor");
-            break;
-        case 0x03:
-            if(Signature == 0x000006B1)
-                strcpy(CpuString, "Intel(R) Celeron(R) processor");
-            else
-                strcpy(CpuString, "Intel(R) Pentium(R) III Xeon(R)
processor");
-            break;
-        case 0x06:
-            strcpy(CpuString, "Mobile Intel(R) Pentium(R) III Processor-M");
-            break;
-        case 0x08:
-            if(Signature >= 0x00000F13)
-                strcpy(CpuString, "Intel(R) Genuine Processor");
-            else
-                strcpy(CpuString, "Intel(R) Pentium(R) 4 processor");
-            break;
-        case 0x09:
-            strcpy(CpuString, "Intel(R) Pentium(R) 4 processor");
-            break;
-        case 0x0B:
-            if(Signature >= 0x00000F13)
-                strcpy(CpuString, "Intel(R) Xeon(R) processor");
-            else
-                strcpy(CpuString, "Intel(R) Xeon(R) processor MP");
-            break;
-        case 0x0C:
-            strcpy(CpuString, "Intel(R) Xeon(R) processor MP");
-            break;
-        case 0x0E:
-            if(Signature >= 0x00000F13)
-                strcpy(CpuString, "Mobile Intel(R) Pentium(R) 4 processor-M");
-            else
-                strcpy(CpuString, "Intel(R) Xeon(R) processor");
-            break;
-        case 0x12:
-            strcpy(CpuString, "Intel(R) Celeron(R) M processor");
-            break;
-        case 0x07:
-        case 0x0F:
-        case 0x13:
-        case 0x17:
-            strcpy(CpuString, "Mobile Intel(R) Celeron(R) processor");
-            break;
-        case 0x0A:
-        case 0x14:
-            strcpy(CpuString, "Intel(R) Celeron(R) Processor");
-            break;
-        case 0x15:
-            strcpy(CpuString, "Mobile Genuine Intel(R) Processor");
-            break;
-        case 0x16:
-            strcpy(CpuString, "Intel(R) Pentium(R) M processor");
-            break;
-        default:
-            strcpy(CpuString, "Unknown Intel processor");
-    }
-}
-
-VOID
-NTAPI
-CmpGetVendorString(IN PKPRCB Prcb, OUT PCHAR CpuString)
-{
-    /* Check if we have a Vendor String */
-    if (Prcb->VendorString[0])
-    {
-        strcpy(CpuString, Prcb->VendorString);
-    }
-    else
-    {
-        strcpy(CpuString, "Unknown x86 processor");
-    }
-}
-
 NTSTATUS
 NTAPI
 CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
@@ -332,7 +239,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK
LoaderBloc
     CONFIGURATION_COMPONENT_DATA ConfigData;
     CHAR Buffer[128];
     CPU_INFO CpuInfo;
-    ULONG VendorId, ExtendedId;
+    ULONG ExtendedId;
     PKPRCB Prcb;
     USHORT IndexTable[MaximumType + 1] = {0};
     ANSI_STRING TempString;
@@ -527,9 +434,8 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK
LoaderBloc
                 KeSetSystemAffinityThread(Prcb->SetMember);
                 if (!Prcb->CpuID)
                 {
-                    /* Uh oh, no CPUID! */
-                    PartialString = CpuString;
-                    CmpGetVendorString(Prcb, PartialString);
+                    /* Uh oh, no CPUID! Should not happen as we don't support 80386
and older 80486 */
+                    ASSERT(FALSE);
                 }
                 else
                 {
@@ -556,24 +462,6 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK
LoaderBloc
                         /* Null-terminate it */
                         CpuString[47] = ANSI_NULL;
                     }
-                    else
-                    {
-                        KiCpuId(&CpuInfo, 0x00000000);
-                        VendorId = CpuInfo.Ebx;
-                        PartialString = CpuString;
-                        switch (VendorId)
-                        {
-                            case 'uneG': /* Intel */
-                                CmpGetIntelBrandString(PartialString);
-                                break;
-                            case 'htuA': /* AMD */
-                                /* FIXME */
-                                CmpGetVendorString(Prcb, PartialString);
-                                break;
-                            default:
-                                CmpGetVendorString(Prcb, PartialString);
-                        }
-                    }
                 }
 
                 /* Go back to user affinity */