[ros-diffs] [tkreuzer] 55153: Fix build

Author: tkreuzer
Date: Tue Jan 24 21:56:02 2012
New Revision: 55153

URL: http://svn.reactos.org/svn/reactos?rev=55153&view=rev
Log:
Fix build

Modified:
    trunk/reactos/include/ndk/extypes.h
    trunk/reactos/include/ndk/peb_teb.h
    trunk/reactos/include/ndk/rtlfuncs.h
    trunk/reactos/include/ndk/rtltypes.h
    trunk/reactos/lib/rtl/nls.c

Modified: trunk/reactos/include/ndk/extypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=…
==============================================================================
--- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Tue Jan 24 21:56:02 2012
@@ -772,7 +772,7 @@
     ULONG TotalSystemCodePages;
     ULONG NonPagedPoolLookasideHits;
     ULONG PagedPoolLookasideHits;
-    ULONG AvailablePagedPoolPages;
+    ULONG Spare3Count;
     ULONG ResidentSystemCachePage;
     ULONG ResidentPagedPoolPage;
     ULONG ResidentSystemDriverPage;

Modified: trunk/reactos/include/ndk/peb_teb.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/peb_teb.h?rev=…
==============================================================================
--- trunk/reactos/include/ndk/peb_teb.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/peb_teb.h [iso-8859-1] Tue Jan 24 21:56:02 2012
@@ -146,7 +146,7 @@
     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)

Modified: trunk/reactos/include/ndk/rtlfuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev…
==============================================================================
--- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Tue Jan 24 21:56:02 2012
@@ -964,7 +964,7 @@
 NTAPI
 RtlWalkHeap(
     IN HANDLE HeapHandle,
-    IN OUT PRTL_HEAP_WALK_ENTRY HeapEntry
+    IN PVOID HeapEntry
 );
 
 #define RtlGetProcessHeap() (NtCurrentPeb()->ProcessHeap)
@@ -2663,14 +2663,6 @@
 NTAPI
 RtlSetCurrentDirectory_U(
     IN PUNICODE_STRING name
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlSetCurrentEnvironment(
-    IN PVOID Environment,
-    OUT OPTIONAL PVOID *PreviousEnvironment
 );
 
 NTSYSAPI

Modified: trunk/reactos/include/ndk/rtltypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev…
==============================================================================
--- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Tue Jan 24 21:56:02 2012
@@ -46,7 +46,7 @@
 #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
 
@@ -978,6 +978,16 @@
         } s2;
     } 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
 {
@@ -1262,8 +1272,8 @@
     ULONG ExclusiveWaiters;
     LONG NumberActive;
     HANDLE OwningThread;
-    ULONG Flags;
-    PRTL_RESOURCE_DEBUG DebugInfo;
+    ULONG TimeoutBoost;
+    PVOID DebugInfo;
 } RTL_RESOURCE, *PRTL_RESOURCE;
 
 //

Modified: trunk/reactos/lib/rtl/nls.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=55153&am…
==============================================================================
--- trunk/reactos/lib/rtl/nls.c [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/nls.c [iso-8859-1] Tue Jan 24 21:56:02 2012
@@ -502,7 +502,7 @@
 RtlUnicodeToMultiByteN (PCHAR MbString,
                         ULONG MbSize,
                         PULONG ResultSize,
-                        PWCHAR UnicodeString,
+                        PCWCH UnicodeString,
                         ULONG UnicodeSize)
 {
    ULONG Size = 0;