[tkreuzer] 46136: [NTOS] - KPCR::Tib -> NtTib, KPCR::Self -> SelfPcr - Rename ExInitializePushLock inline function to _ExInitializePushLock and use a define, as in newer versions of windows the function exists as export and is in the WDK

Author: tkreuzer
Date: Fri Mar 12 17:28:04 2010
New Revision: 46136

URL: http://svn.reactos.org/svn/reactos?rev=46136&view=rev
Log:
[NTOS]
- KPCR::Tib -> NtTib, KPCR::Self -> SelfPcr
- Rename ExInitializePushLock inline function to _ExInitializePushLock and use a define,
as in newer versions of windows the function exists as export and is in the WDK

Modified:
    branches/header-work/ntoskrnl/include/internal/ex.h
    branches/header-work/ntoskrnl/include/internal/ntoskrnl.h
    branches/header-work/ntoskrnl/include/internal/trap_x.h
    branches/header-work/ntoskrnl/ke/except.c
    branches/header-work/ntoskrnl/ke/i386/traphdlr.c
    branches/header-work/ntoskrnl/ke/i386/v86vdm.c

Modified: branches/header-work/ntoskrnl/include/internal/ex.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in…
==============================================================================
--- branches/header-work/ntoskrnl/include/internal/ex.h [iso-8859-1] (original)
+++ branches/header-work/ntoskrnl/include/internal/ex.h [iso-8859-1] Fri Mar 12 17:28:04
2010
@@ -878,10 +878,10 @@
 );
 
 /*++
- * @name ExInitializePushLock
+ * @name _ExInitializePushLock
  * INTERNAL MACRO
  *
- *     The ExInitializePushLock macro initializes a PushLock.
+ *     The _ExInitializePushLock macro initializes a PushLock.
  *
  * @params PushLock
  *         Pointer to the pushlock which is to be initialized.
@@ -893,11 +893,12 @@
  *--*/
 FORCEINLINE
 VOID
-ExInitializePushLock(IN PULONG_PTR PushLock)
+_ExInitializePushLock(IN PULONG_PTR PushLock)
 {
     /* Set the value to 0 */
     *PushLock = 0;
 }
+#define ExInitializePushLock _ExInitializePushLock
 
 /*++
  * @name ExAcquirePushLockExclusive

Modified: branches/header-work/ntoskrnl/include/internal/ntoskrnl.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in…
==============================================================================
--- branches/header-work/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original)
+++ branches/header-work/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Fri Mar 12
17:28:04 2010
@@ -160,8 +160,8 @@
 #endif
 
 #ifdef _M_IX86
-C_ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST);
-C_ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF);
+C_ASSERT(FIELD_OFFSET(KPCR, NtTib.ExceptionList) == KPCR_EXCEPTION_LIST);
+C_ASSERT(FIELD_OFFSET(KPCR, SelfPcr) == KPCR_SELF);
 C_ASSERT(FIELD_OFFSET(KPCR, IRR) == KPCR_IRR);
 C_ASSERT(FIELD_OFFSET(KPCR, IDR) == KPCR_IDR);
 C_ASSERT(FIELD_OFFSET(KPCR, Irql) == KPCR_IRQL);

Modified: branches/header-work/ntoskrnl/include/internal/trap_x.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in…
==============================================================================
--- branches/header-work/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original)
+++ branches/header-work/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Fri Mar 12
17:28:04 2010
@@ -108,9 +108,9 @@
     }
     
     /* Make sure we have a valid SEH chain */
-    if (KeGetPcr()->Tib.ExceptionList == 0)
-    {
-        DbgPrint("Exiting with NULL exception chain: %p\n",
KeGetPcr()->Tib.ExceptionList);
+    if (KeGetPcr()->NtTib.ExceptionList == 0)
+    {
+        DbgPrint("Exiting with NULL exception chain: %p\n",
KeGetPcr()->NtTib.ExceptionList);
         while (TRUE);
     }
     
@@ -391,7 +391,7 @@
     KiExitTrapDebugChecks(TrapFrame, SkipBits);
 
     /* Restore the SEH handler chain */
-    KeGetPcr()->Tib.ExceptionList = TrapFrame->ExceptionList;
+    KeGetPcr()->NtTib.ExceptionList = TrapFrame->ExceptionList;
     
     /* Check if the previous mode must be restored */
     if (__builtin_expect(!SkipBits.SkipPreviousMode, 0)) /* More INTS than SYSCALLs */
@@ -558,7 +558,7 @@
 KiEnterV86Trap(IN PKTRAP_FRAME TrapFrame)
 {
     /* Save exception list */
-    TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList;
+    TrapFrame->ExceptionList = KeGetPcr()->NtTib.ExceptionList;
 
     /* Save DR7 and check for debugging */
     TrapFrame->Dr7 = __readdr(7);
@@ -577,8 +577,8 @@
 KiEnterInterruptTrap(IN PKTRAP_FRAME TrapFrame)
 {
     /* Save exception list and terminate it */
-    TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList;
-    KeGetPcr()->Tib.ExceptionList = EXCEPTION_CHAIN_END;
+    TrapFrame->ExceptionList = KeGetPcr()->NtTib.ExceptionList;
+    KeGetPcr()->NtTib.ExceptionList = EXCEPTION_CHAIN_END;
 
     /* Flush DR7 and check for debugging */
     TrapFrame->Dr7 = 0;
@@ -600,7 +600,7 @@
 KiEnterTrap(IN PKTRAP_FRAME TrapFrame)
 {
     /* Save exception list */
-    TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList;
+    TrapFrame->ExceptionList = KeGetPcr()->NtTib.ExceptionList;
     
     /* Flush DR7 and check for debugging */
     TrapFrame->Dr7 = 0;

Modified: branches/header-work/ntoskrnl/ke/except.c
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/ke/except.…
==============================================================================
--- branches/header-work/ntoskrnl/ke/except.c [iso-8859-1] (original)
+++ branches/header-work/ntoskrnl/ke/except.c [iso-8859-1] Fri Mar 12 17:28:04 2010
@@ -184,7 +184,7 @@
     
     /* Set exception list */
 #ifdef _M_IX86
-    KeGetPcr()->Tib.ExceptionList = TrapFrame->ExceptionList;
+    KeGetPcr()->NtTib.ExceptionList = TrapFrame->ExceptionList;
 #endif
     
     /* Raise the exception */

Modified: branches/header-work/ntoskrnl/ke/i386/traphdlr.c
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/ke/i386/tr…
==============================================================================
--- branches/header-work/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original)
+++ branches/header-work/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Mar 12 17:28:04
2010
@@ -411,7 +411,7 @@
     TrapFrame.Esi = Tss->Esi;
     TrapFrame.Edi = Tss->Edi;
     TrapFrame.SegFs = Tss->Fs;
-    TrapFrame.ExceptionList = PCR->Tib.ExceptionList;
+    TrapFrame.ExceptionList = PCR->NtTib.ExceptionList;
     TrapFrame.PreviousPreviousMode = -1;
     TrapFrame.Eax = Tss->Eax;
     TrapFrame.Ecx = Tss->Ecx;
@@ -1486,8 +1486,8 @@
     TrapFrame->SegFs = SegFs;
         
     /* Save the SEH chain and terminate it for now */    
-    TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList;
-    KeGetPcr()->Tib.ExceptionList = EXCEPTION_CHAIN_END;
+    TrapFrame->ExceptionList = KeGetPcr()->NtTib.ExceptionList;
+    KeGetPcr()->NtTib.ExceptionList = EXCEPTION_CHAIN_END;
         
     /* Clear DR7 and check for debugging */
     TrapFrame->Dr7 = 0;

Modified: branches/header-work/ntoskrnl/ke/i386/v86vdm.c
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/ke/i386/v8…
==============================================================================
--- branches/header-work/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original)
+++ branches/header-work/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Fri Mar 12 17:28:04 2010
@@ -471,7 +471,7 @@
 
     /* Restore TEB addresses */
     Thread->Teb = V86Frame->ThreadTeb;
-    KeGetPcr()->Tib.Self = V86Frame->PcrTeb;
+    KeGetPcr()->NtTib.Self = V86Frame->PcrTeb;
     
     /* Setup real TEB descriptor */
     GdtEntry = &((PKIPCR)KeGetPcr())->GDT[KGDT_R3_TEB / sizeof(KGDTENTRY)];
@@ -505,7 +505,7 @@
     
     /* Save TEB addresses */
     V86Frame->ThreadTeb = Thread->Teb;
-    V86Frame->PcrTeb = KeGetPcr()->Tib.Self;
+    V86Frame->PcrTeb = KeGetPcr()->NtTib.Self;
     
     /* Save return EIP */
     TrapFrame->Eip = (ULONG_PTR)Ki386BiosCallReturnAddress;
@@ -533,7 +533,7 @@
     RtlCopyMemory(NpxFrame, V86Frame->ThreadStack, sizeof(FX_SAVE_AREA));
     
     /* Clear exception list */
-    KeGetPcr()->Tib.ExceptionList = EXCEPTION_CHAIN_END;
+    KeGetPcr()->NtTib.ExceptionList = EXCEPTION_CHAIN_END;
     
     /* Set new ESP0 */
     KeGetPcr()->TSS->Esp0 = (ULONG_PTR)&TrapFrame->V86Es;
@@ -543,7 +543,7 @@
         
     /* Set VDM TEB */
     Thread->Teb = (PTEB)TRAMPOLINE_TEB;
-    KeGetPcr()->Tib.Self = (PVOID)TRAMPOLINE_TEB;
+    KeGetPcr()->NtTib.Self = (PVOID)TRAMPOLINE_TEB;
     
     /* Setup VDM TEB descriptor */
     GdtEntry = &((PKIPCR)KeGetPcr())->GDT[KGDT_R3_TEB / sizeof(KGDTENTRY)];