From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 12 Dec 2017 11:50:58 +0000 (+0100)
Subject: [ASM][NDK][NTOS] Rename Self to SelfPcr in the KIPCR structure.
X-Git-Tag: 0.4.9-dev~681
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=631a14ff641c1b8a5ebba40829625ff0b1c72d1a

[ASM][NDK][NTOS] Rename Self to SelfPcr in the KIPCR structure.
---

diff --git a/ntoskrnl/kd64/kddata.c b/ntoskrnl/kd64/kddata.c
index d7b02c9baa7..681eb9bed9d 100644
--- a/ntoskrnl/kd64/kddata.c
+++ b/ntoskrnl/kd64/kddata.c
@@ -25,7 +25,7 @@ VOID NTAPI RtlpBreakWithStatusInstruction(VOID);
 
 #if defined(_M_IX86)
 
-#define KPCR_SELF_PCR_OFFSET           FIELD_OFFSET(KPCR, Self)
+#define KPCR_SELF_PCR_OFFSET           FIELD_OFFSET(KPCR, SelfPcr)
 #define KPCR_CURRENT_PRCB_OFFSET       FIELD_OFFSET(KPCR, Prcb)
 #define KPCR_CONTAINED_PRCB_OFFSET     FIELD_OFFSET(KPCR, PrcbData)
 #define KPCR_INITIAL_STACK_OFFSET      0
diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c
index db7dae79812..a2829e40cab 100644
--- a/ntoskrnl/kdbg/kdb_cli.c
+++ b/ntoskrnl/kdbg/kdb_cli.c
@@ -2112,7 +2112,7 @@ KdbpCmdPcr(
               "  Tib.FiberData/Version:     0x%08x\n"
               "  Tib.ArbitraryUserPointer:  0x%08x\n"
               "  Tib.Self:                  0x%08x\n"
-              "  Self:                      0x%08x\n"
+              "  SelfPcr:                   0x%08x\n"
               "  PCRCB:                     0x%08x\n"
               "  Irql:                      0x%02x\n"
               "  IRR:                       0x%08x\n"
@@ -2133,7 +2133,7 @@ KdbpCmdPcr(
               "  InterruptMode:             0x%08x\n",
               Pcr->NtTib.ExceptionList, Pcr->NtTib.StackBase, Pcr->NtTib.StackLimit,
               Pcr->NtTib.SubSystemTib, Pcr->NtTib.FiberData, Pcr->NtTib.ArbitraryUserPointer,
-              Pcr->NtTib.Self, Pcr->Self, Pcr->Prcb, Pcr->Irql, Pcr->IRR, Pcr->IrrActive,
+              Pcr->NtTib.Self, Pcr->SelfPcr, Pcr->Prcb, Pcr->Irql, Pcr->IRR, Pcr->IrrActive,
               Pcr->IDR, Pcr->KdVersionBlock, Pcr->IDT, Pcr->GDT, Pcr->TSS,
               Pcr->MajorVersion, Pcr->MinorVersion, Pcr->SetMember, Pcr->StallScaleFactor,
               Pcr->Number, Pcr->SecondLevelCacheAssociativity,
diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c
index 5f192cc7ca4..cba2c423fd4 100644
--- a/ntoskrnl/ke/i386/kiinit.c
+++ b/ntoskrnl/ke/i386/kiinit.c
@@ -345,7 +345,7 @@ KiInitializePcr(IN ULONG ProcessorNumber,
     Pcr->PrcbData.CurrentThread = IdleThread;
 
     /* Set pointers to ourselves */
-    Pcr->Self = (PKPCR)Pcr;
+    Pcr->SelfPcr = (PKPCR)Pcr;
     Pcr->Prcb = &Pcr->PrcbData;
 
     /* Set the PCR Version */
diff --git a/sdk/include/asm/ks386.template.h b/sdk/include/asm/ks386.template.h
index dedeefa0aff..e5f672cb1b2 100644
--- a/sdk/include/asm/ks386.template.h
+++ b/sdk/include/asm/ks386.template.h
@@ -369,7 +369,7 @@ OFFSET(PcTssCopy, KIPCR, TssCopy),
 OFFSET(PcContextSwitches, KIPCR, ContextSwitches),
 OFFSET(PcSetMemberCopy, KIPCR, SetMemberCopy),
 OFFSET(PcTeb, KIPCR, NtTib.Self),
-OFFSET(PcSelfPcr, KIPCR, Self),
+OFFSET(PcSelfPcr, KIPCR, SelfPcr),
 OFFSET(PcPrcb, KIPCR, Prcb),
 OFFSET(PcIrql, KIPCR, Irql),
 OFFSET(PcIRR, KIPCR, IRR),
@@ -582,7 +582,7 @@ OFFSET(KPCR_EXCEPTION_LIST, KPCR, NtTib.ExceptionList),
 OFFSET(KPCR_PERF_GLOBAL_GROUP_MASK, KIPCR, PerfGlobalGroupMask),
 OFFSET(KPCR_CONTEXT_SWITCHES, KPCR, ContextSwitches),
 OFFSET(KPCR_TEB, KIPCR, Used_Self),
-OFFSET(KPCR_SELF, KIPCR, Self),
+OFFSET(KPCR_SELF, KIPCR, SelfPcr),
 OFFSET(KPCR_PRCB, KPCR, Prcb),
 OFFSET(KPCR_IDT, KIPCR, IDT),
 OFFSET(KPCR_GDT, KIPCR, GDT),
diff --git a/sdk/include/ndk/i386/ketypes.h b/sdk/include/ndk/i386/ketypes.h
index cd005d7700f..e7563b8d52b 100644
--- a/sdk/include/ndk/i386/ketypes.h
+++ b/sdk/include/ndk/i386/ketypes.h
@@ -746,7 +746,7 @@ typedef struct _KIPCR
             PVOID Used_Self;
         };
     };
-    struct _KPCR *Self;
+    struct _KPCR *SelfPcr;
     struct _KPRCB *Prcb;
     KIRQL Irql;
     ULONG IRR;