Author: tkreuzer Date: Sun Sep 21 13:53:48 2008 New Revision: 36387
URL: http://svn.reactos.org/svn/reactos?rev=36387&view=rev Log: MS symbols say that the KPRCB member VebdorString is an array of UCHARs, not CHARs.
Modified: branches/ros-amd64-bringup/reactos/include/ndk/i386/ketypes.h branches/ros-amd64-bringup/reactos/ntoskrnl/config/i386/cmhardwr.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c
Modified: branches/ros-amd64-bringup/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ... ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Sun Sep 21 13:53:48 2008 @@ -595,7 +595,7 @@ #else ULONG SpareFields0[1]; #endif - CHAR VendorString[13]; + UCHAR VendorString[13]; UCHAR InitialApicId; UCHAR LogicalProcessorsPerPhysicalProcessor; ULONG MHz;
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Sun Sep 21 13:53:48 2008 @@ -483,7 +483,7 @@ if (Prcb->VendorString) { /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, Prcb->VendorString); + RtlInitAnsiString(&TempString, (PCHAR)Prcb->VendorString); RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE);
/* Add it to the registry */
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sun Sep 21 13:53:48 2008 @@ -206,30 +206,30 @@ Prcb->VendorString[sizeof(Prcb->VendorString) - sizeof(CHAR)] = ANSI_NULL;
/* Now check the CPU Type */ - if (!strcmp(Prcb->VendorString, CmpIntelID)) + if (!strcmp((PCHAR)Prcb->VendorString, CmpIntelID)) { return CPU_INTEL; } - else if (!strcmp(Prcb->VendorString, CmpAmdID)) + else if (!strcmp((PCHAR)Prcb->VendorString, CmpAmdID)) { return CPU_AMD; } - else if (!strcmp(Prcb->VendorString, CmpCyrixID)) + else if (!strcmp((PCHAR)Prcb->VendorString, CmpCyrixID)) { DPRINT1("Cyrix CPUs not fully supported\n"); return 0; } - else if (!strcmp(Prcb->VendorString, CmpTransmetaID)) + else if (!strcmp((PCHAR)Prcb->VendorString, CmpTransmetaID)) { DPRINT1("Transmeta CPUs not fully supported\n"); return 0; } - else if (!strcmp(Prcb->VendorString, CmpCentaurID)) + else if (!strcmp((PCHAR)Prcb->VendorString, CmpCentaurID)) { DPRINT1("VIA CPUs not fully supported\n"); return 0; } - else if (!strcmp(Prcb->VendorString, CmpRiseID)) + else if (!strcmp((PCHAR)Prcb->VendorString, CmpRiseID)) { DPRINT1("Rise CPUs not fully supported\n"); return 0;