[ros-diffs] [cgutman] 52615: [RTL] - Revert r52612 - It came before its time ; )

Author: cgutman
Date: Sun Jul 10 17:46:27 2011
New Revision: 52615

URL: http://svn.reactos.org/svn/reactos?rev=52615&view=rev
Log:
[RTL]
- Revert r52612
- It came before its time ;)

Modified:
    trunk/reactos/lib/rtl/actctx.c

Modified: trunk/reactos/lib/rtl/actctx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=52615…
==============================================================================
--- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sun Jul 10 17:46:27 2011
@@ -2763,12 +2763,13 @@
 RtlActivateActivationContextUnsafeFast(IN
PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame,
                                        IN PVOID Context)
 {
+#if NEW_NTDLL_LOADER
     RTL_ACTIVATION_CONTEXT_STACK_FRAME *ActiveFrame;
 
     /* Get the curren active frame */
     ActiveFrame = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame;
 
-    DPRINT("ActiveFrame %p, &Frame->Frame %p, Context %p\n",
ActiveFrame, &Frame->Frame, Context);
+    DPRINT1("ActiveFrame %p, &Frame->Frame %p, Context %p\n",
ActiveFrame, &Frame->Frame, Context);
 
     /* Actually activate it */
     Frame->Frame.Previous = ActiveFrame;
@@ -2800,6 +2801,18 @@
 
     /* Return pointer to the activation frame */
     return &Frame->Frame;
+#else
+
+    RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame = &Frame->Frame;
+
+    frame->Previous =
NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame;
+    frame->ActivationContext = Context;
+    frame->Flags = 0;
+
+    NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = frame;
+
+    return STATUS_SUCCESS;
+#endif
 }
 
 PRTL_ACTIVATION_CONTEXT_STACK_FRAME