From 456a8b2857fb95d717e6a1b2ab29d6ec405dc3d8 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Tue, 24 Jan 2012 21:56:02 +0000
Subject: [PATCH] Fix build

svn path=/trunk/; revision=55153
---
 reactos/include/ndk/extypes.h  |  2 +-
 reactos/include/ndk/peb_teb.h  |  2 +-
 reactos/include/ndk/rtlfuncs.h | 10 +---------
 reactos/include/ndk/rtltypes.h | 16 +++++++++++++---
 reactos/lib/rtl/nls.c          |  2 +-
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/reactos/include/ndk/extypes.h b/reactos/include/ndk/extypes.h
index e26afa17049..0731b1fd702 100644
--- a/reactos/include/ndk/extypes.h
+++ b/reactos/include/ndk/extypes.h
@@ -772,7 +772,7 @@ typedef struct _SYSTEM_PERFORMANCE_INFORMATION
     ULONG TotalSystemCodePages;
     ULONG NonPagedPoolLookasideHits;
     ULONG PagedPoolLookasideHits;
-    ULONG AvailablePagedPoolPages;
+    ULONG Spare3Count;
     ULONG ResidentSystemCachePage;
     ULONG ResidentPagedPoolPage;
     ULONG ResidentSystemDriverPage;
diff --git a/reactos/include/ndk/peb_teb.h b/reactos/include/ndk/peb_teb.h
index 844b4d0f11c..ba70ebc3fb0 100644
--- a/reactos/include/ndk/peb_teb.h
+++ b/reactos/include/ndk/peb_teb.h
@@ -146,7 +146,7 @@ typedef struct STRUCT(_PEB)
     PTR(PVOID*) FlsCallback;
     STRUCT(LIST_ENTRY) FlsListHead;
     PTR(PVOID) FlsBitmap;
-    ULONG FlsBitmapBits[FLS_MAXIMUM_AVAILABLE/(sizeof(ULONG)*8)];
+    ULONG FlsBitmapBits[4]; // [FLS_MAXIMUM_AVAILABLE/(sizeof(ULONG)*8)];
     ULONG FlsHighIndex;
 #endif
 #if (NTDDI_VERSION >= NTDDI_LONGHORN)
diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h
index 9d9ce2050d0..50b2a0bd3b3 100644
--- a/reactos/include/ndk/rtlfuncs.h
+++ b/reactos/include/ndk/rtlfuncs.h
@@ -964,7 +964,7 @@ NTSTATUS
 NTAPI
 RtlWalkHeap(
     IN HANDLE HeapHandle,
-    IN OUT PRTL_HEAP_WALK_ENTRY HeapEntry
+    IN PVOID HeapEntry
 );
 
 #define RtlGetProcessHeap() (NtCurrentPeb()->ProcessHeap)
@@ -2665,14 +2665,6 @@ RtlSetCurrentDirectory_U(
     IN PUNICODE_STRING name
 );
 
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlSetCurrentEnvironment(
-    IN PVOID Environment,
-    OUT OPTIONAL PVOID *PreviousEnvironment
-);
-
 NTSYSAPI
 NTSTATUS
 NTAPI
diff --git a/reactos/include/ndk/rtltypes.h b/reactos/include/ndk/rtltypes.h
index 1ab594b24ff..6c566723991 100644
--- a/reactos/include/ndk/rtltypes.h
+++ b/reactos/include/ndk/rtltypes.h
@@ -46,7 +46,7 @@ Author:
 #define RTL_USER_PROCESS_PARAMETERS_PROCESS_OR_1            0x200
 #define RTL_USER_PROCESS_PARAMETERS_PROCESS_OR_2            0x400
 #define RTL_USER_PROCESS_PARAMETERS_PRIVATE_DLL_PATH        0x1000
-#define RTL_USER_PROCESS_PARAMETERS_APP_MANIFEST_PRESENT    0x2000
+#define RTL_USER_PROCESS_PARAMETERS_LOCAL_DLL_PATH          0x2000
 #define RTL_USER_PROCESS_PARAMETERS_IMAGE_KEY_MISSING       0x4000
 #define RTL_USER_PROCESS_PARAMETERS_NX                      0x20000
 
@@ -979,6 +979,16 @@ typedef struct _RTL_HEAP_ENTRY
     } u;
 } RTL_HEAP_ENTRY, *PRTL_HEAP_ENTRY;
 
+typedef struct _RTL_HEAP_TAG
+{
+    ULONG NumberOfAllocations;
+    ULONG NumberOfFrees;
+    SIZE_T BytesAllocated;
+    USHORT TagIndex;
+    USHORT CreatorBackTraceIndex;
+    WCHAR TagName[24];
+} RTL_HEAP_TAG, *PRTL_HEAP_TAG;
+
 typedef struct _RTL_HEAP_INFORMATION
 {
     PVOID BaseAddress;
@@ -1262,8 +1272,8 @@ typedef struct _RTL_RESOURCE
     ULONG ExclusiveWaiters;
     LONG NumberActive;
     HANDLE OwningThread;
-    ULONG Flags;
-    PRTL_RESOURCE_DEBUG DebugInfo;
+    ULONG TimeoutBoost;
+    PVOID DebugInfo;
 } RTL_RESOURCE, *PRTL_RESOURCE;
 
 //
diff --git a/reactos/lib/rtl/nls.c b/reactos/lib/rtl/nls.c
index 697835dd697..d6e181dd5ca 100644
--- a/reactos/lib/rtl/nls.c
+++ b/reactos/lib/rtl/nls.c
@@ -502,7 +502,7 @@ NTSTATUS NTAPI
 RtlUnicodeToMultiByteN (PCHAR MbString,
                         ULONG MbSize,
                         PULONG ResultSize,
-                        PWCHAR UnicodeString,
+                        PCWCH UnicodeString,
                         ULONG UnicodeSize)
 {
    ULONG Size = 0;