[ion] 13117: Fix to unbreak tree. This is temporary until I come up with a good NtCurrentPeb macro that can be shared. Note that the brekage is because an ntdll only function was put in rtl but never used from ntoskrnl until my previous patch. It could be shared, but I need to do some work on it.

Fix to unbreak tree. This is temporary until I come up with a good
NtCurrentPeb macro that can be shared. Note that the brekage is because
an ntdll only function was put in rtl but never used from ntoskrnl until
my previous patch. It could be shared, but I need to do some work on it.
Modified: trunk/reactos/lib/ntdll/rtl/ppb.c
Modified: trunk/reactos/lib/rtl/env.c
  _____

Modified: trunk/reactos/lib/ntdll/rtl/ppb.c
--- trunk/reactos/lib/ntdll/rtl/ppb.c	2005-01-18 05:52:54 UTC (rev
13116)
+++ trunk/reactos/lib/ntdll/rtl/ppb.c	2005-01-18 06:00:55 UTC (rev
13117)
@@ -30,27 +30,6 @@

/* FUNCTIONS
****************************************************************/

-/*
- * @implemented
- */
-VOID STDCALL
-RtlAcquirePebLock(VOID)
-{
-   PPEB Peb = NtCurrentPeb ();
-   Peb->FastPebLockRoutine (Peb->FastPebLock);
-}
-
-
-/*
- * @implemented
- */
-VOID STDCALL
-RtlReleasePebLock(VOID)
-{
-   PPEB Peb = NtCurrentPeb ();
-   Peb->FastPebUnlockRoutine (Peb->FastPebLock);
-}
-
 static inline VOID
 RtlpCopyParameterString(PWCHAR *Ptr,
    		PUNICODE_STRING Destination,
  _____

Modified: trunk/reactos/lib/rtl/env.c
--- trunk/reactos/lib/rtl/env.c	2005-01-18 05:52:54 UTC (rev 13116)
+++ trunk/reactos/lib/rtl/env.c	2005-01-18 06:00:55 UTC (rev 13117)
@@ -22,9 +22,31 @@

/* FUNCTIONS
*****************************************************************/

+/* FIXME: Added here temporarly until I fix this properly tomorrow */
 /*
  * @implemented
  */
+VOID STDCALL
+RtlAcquirePebLock(VOID)
+{
+   PPEB Peb = NtCurrentPeb ();
+   Peb->FastPebLockRoutine (Peb->FastPebLock);
+}
+
+/* FIXME: Added here temporarly until I fix this properly tomorrow */
+/*
+ * @implemented
+ */
+VOID STDCALL
+RtlReleasePebLock(VOID)
+{
+   PPEB Peb = NtCurrentPeb ();
+   Peb->FastPebUnlockRoutine (Peb->FastPebLock);
+}
+
+/*
+ * @implemented
+ */
 NTSTATUS STDCALL
 RtlCreateEnvironment(BOOLEAN Inherit,
                      PWSTR *Environment)

[Gunnar Dalsnes]

[e-mail] wrote:
> Fix to unbreak tree. This is temporary until I come up with a good NtCurrentPeb macro that can be shared. Note that the brekage is because an ntdll only function was put in rtl but never used from ntoskrnl until my previous patch. It could be shared, but I need to do some work on it.

They shouldnt be shared. Just move them back to ntdll and add empty 
stubs for these functions in ntosknrl\rtl\xxxx.c. Since env. stuff crash 
on windows we can't be any better.

G.

[Alex Ionescu]

Gunnar Dalsnes wrote:
> [e-mail] wrote:
> > Fix to unbreak tree. This is temporary until I come up with a good 
> > NtCurrentPeb macro that can be shared. Note that the brekage is 
> > because an ntdll only function was put in rtl but never used from 
> > ntoskrnl until my previous patch. It could be shared, but I need to 
> > do some work on it.
>
> They shouldnt be shared. Just move them back to ntdll and add empty 
> stubs for these functions in ntosknrl\rtl\xxxx.c. Since env. stuff 
> crash on windows we can't be any better.
>
> G.

Gunnar,

They are present and exported in ntoskrnl. We simply need to read 
CurrentThread.ApcState.Process.Peb instead of NtCurrentPeb.
And no, I didn't merge, I took the best one.

Best regards,
Alex Ionescu