Silence debug message

[reactos.git] / reactos / lib / rtl / env.c

diff --git a/reactos/lib/rtl/env.c b/reactos/lib/rtl/env.c
index fc9e304..31ab8fe 100644 (file)
--- a/reactos/lib/rtl/env.c
+++ b/reactos/lib/rtl/env.c
@@ -1,31 +1,24 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
+/* COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/rtl/env.c
  * PURPOSE:         Environment functions
  * PROGRAMMER:      Eric Kohl
- * UPDATE HISTORY:
- *                  Created 30/09/98
  */
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <napi/teb.h>
-#include <ntos/minmax.h>
-#include <string.h>
+#include <rtl.h>
 
 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <debug.h>
 
+PPEB NTAPI RtlpCurrentPeb(VOID);
 /* FUNCTIONS *****************************************************************/
 
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 RtlCreateEnvironment(BOOLEAN Inherit,
                      PWSTR *Environment)
 {
@@ -100,7 +93,7 @@ RtlCreateEnvironment(BOOLEAN Inherit,
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 RtlDestroyEnvironment(PWSTR Environment)
 {
    ULONG Size = 0;
@@ -115,7 +108,7 @@ RtlDestroyEnvironment(PWSTR Environment)
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 RtlExpandEnvironmentStrings_U(PWSTR Environment,
                               PUNICODE_STRING Source,
                               PUNICODE_STRING Destination,
@@ -158,8 +151,8 @@ RtlExpandEnvironmentStrings_U(PWSTR Environment,
       }
       else
       {
-         /* Process environment variable. */ 
-         
+         /* Process environment variable. */
+
          VariableEnd = SourceBuffer + 1;
          Tail = SourceLength - 1;
          while (*VariableEnd != L'%' && Tail != 0)
@@ -170,7 +163,7 @@ RtlExpandEnvironmentStrings_U(PWSTR Environment,
 
          if (Tail != 0)
          {
-            Variable.MaximumLength = 
+            Variable.MaximumLength =
             Variable.Length = (VariableEnd - (SourceBuffer + 1)) * sizeof(WCHAR);
             Variable.Buffer = SourceBuffer + 1;
 
@@ -248,13 +241,13 @@ RtlExpandEnvironmentStrings_U(PWSTR Environment,
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 RtlSetCurrentEnvironment(PWSTR NewEnvironment,
                          PWSTR *OldEnvironment)
 {
    PVOID EnvPtr;
 
-   DPRINT("NewEnvironment %x OldEnvironment %x\n",
+   DPRINT("NewEnvironment 0x%p OldEnvironment 0x%p\n",
           NewEnvironment, OldEnvironment);
 
    RtlAcquirePebLock();
@@ -272,7 +265,7 @@ RtlSetCurrentEnvironment(PWSTR NewEnvironment,
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 RtlSetEnvironmentVariable(PWSTR *Environment,
                           PUNICODE_STRING Name,
                           PUNICODE_STRING Value)
@@ -495,7 +488,7 @@ found:
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 RtlQueryEnvironmentVariable_U(PWSTR Environment,
                               PUNICODE_STRING Name,
                               PUNICODE_STRING Value)
@@ -511,18 +504,24 @@ RtlQueryEnvironmentVariable_U(PWSTR Environment,
 
    if (Environment == NULL)
    {
-      Environment = NtCurrentPeb()->ProcessParameters->Environment;
-      SysEnvUsed = TRUE;
+      PPEB Peb = RtlpCurrentPeb();
+      if (Peb) {
+          Environment = Peb->ProcessParameters->Environment;
+          SysEnvUsed = TRUE;
+      }
    }
 
    if (Environment == NULL)
+   {
       return(STATUS_VARIABLE_NOT_FOUND);
+   }
 
    Value->Length = 0;
    if (SysEnvUsed == TRUE)
       RtlAcquirePebLock();
 
    wcs = Environment;
+   DPRINT("Starting search at :%p\n", wcs);
    while (*wcs)
    {
       var.Buffer = wcs++;
@@ -530,12 +529,14 @@ RtlQueryEnvironmentVariable_U(PWSTR Environment,
       if (wcs == NULL)
       {
          wcs = var.Buffer + wcslen(var.Buffer);
+         DPRINT("Search at :%S\n", wcs);
       }
       if (*wcs)
       {
          var.Length = var.MaximumLength = (wcs - var.Buffer) * sizeof(WCHAR);
          val = ++wcs;
          wcs += wcslen(wcs);
+         DPRINT("Search at :%S\n", wcs);
 
          if (RtlEqualUnicodeString(&var, Name, TRUE))
          {
@@ -566,7 +567,7 @@ RtlQueryEnvironmentVariable_U(PWSTR Environment,
    if (SysEnvUsed == TRUE)
       RtlReleasePebLock();
 
-   DPRINT("Return STATUS_VARIABLE_NOT_FOUND\n");
+   DPRINT("Return STATUS_VARIABLE_NOT_FOUND: %wZ\n", Name);
    return(STATUS_VARIABLE_NOT_FOUND);
 }