Fix hacks from last night and properly share the code

svn path=/trunk/; revision=13128

diff --git a/reactos/lib/ntdll/rtl/ppb.c b/reactos/lib/ntdll/rtl/ppb.c
index 6db2749..d05a963 100644 (file)
--- a/reactos/lib/ntdll/rtl/ppb.c
+++ b/reactos/lib/ntdll/rtl/ppb.c
@@ -30,6 +30,27 @@
 
 /* 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,

diff --git a/reactos/lib/ntdll/rtl/process.c b/reactos/lib/ntdll/rtl/process.c
index 78d7271..36f2071 100644 (file)
--- a/reactos/lib/ntdll/rtl/process.c
+++ b/reactos/lib/ntdll/rtl/process.c
@@ -48,6 +48,13 @@ static NTSTATUS RtlpCreateFirstThread
  );
 }
 
+PPEB
+STDCALL
+RtlpCurrentPeb(VOID)
+{
+    return NtCurrentPeb();
+}
+
 static NTSTATUS
 RtlpMapFile(PUNICODE_STRING ImageFileName,
             PRTL_USER_PROCESS_PARAMETERS Ppb,

diff --git a/reactos/lib/rtl/env.c b/reactos/lib/rtl/env.c
index 4b91775..b12b718 100644 (file)
--- a/reactos/lib/rtl/env.c
+++ b/reactos/lib/rtl/env.c
@@ -20,30 +20,9 @@
 #define NDEBUG
 #include <ntdll/ntdll.h>
 
+PPEB STDCALL RtlpCurrentPeb(VOID);
 /* 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
  */
@@ -533,12 +512,11 @@ RtlQueryEnvironmentVariable_U(PWSTR Environment,
 
    if (Environment == NULL)
    {
-      if (NtCurrentPeb() == NULL)
-      {
-         return(STATUS_VARIABLE_NOT_FOUND);
+      PPEB Peb = RtlpCurrentPeb();
+      if (Peb) {
+          Environment = Peb->ProcessParameters->Environment;
+          SysEnvUsed = TRUE;
       }
-      Environment = NtCurrentPeb()->ProcessParameters->Environment;
-      SysEnvUsed = TRUE;
    }
 
    if (Environment == NULL)

diff --git a/reactos/ntoskrnl/rtl/libsupp.c b/reactos/ntoskrnl/rtl/libsupp.c
index c84c112..01926e1 100644 (file)
--- a/reactos/ntoskrnl/rtl/libsupp.c
+++ b/reactos/ntoskrnl/rtl/libsupp.c
@@ -11,6 +11,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
+#include <internal/ps.h>
 #define NDEBUG
 #include <internal/debug.h>
 
@@ -19,6 +20,31 @@
 
 /* FUNCTIONS *****************************************************************/
 
+/*
+ * @implemented
+ */
+VOID STDCALL
+RtlAcquirePebLock(VOID)
+{
+
+}
+
+/*
+ * @implemented
+ */
+VOID STDCALL
+RtlReleasePebLock(VOID)
+{
+
+}
+
+PPEB
+STDCALL
+RtlpCurrentPeb(VOID)
+{
+    return ((PEPROCESS)(KeGetCurrentThread()->ApcState.Process))->Peb;
+}
+
 NTSTATUS 
 STDCALL
 RtlDeleteCriticalSection(