From 80078ade2b27e74aa409a6e0efd384cbbb08a545 Mon Sep 17 00:00:00 2001
From: Stefan Ginsberg <stefanginsberg@gmail.com>
Date: Thu, 22 Oct 2009 18:27:17 +0000
Subject: [PATCH] - Fix 43192 -- MAXUINT and MAXULONGLONG are only defined for
 Vista and later. - Add some leftover MAXULONG.

svn path=/trunk/; revision=43691
---
 reactos/boot/freeldr/freeldr/fs/ntfs.c | 2 +-
 reactos/dll/cpl/main/mouse.c           | 2 +-
 reactos/include/psdk/basetsd.h         | 5 ++++-
 reactos/lib/rtl/rangelist.c            | 4 ++--
 reactos/ntoskrnl/io/pnpmgr/pnpmgr.c    | 4 ++--
 reactos/ntoskrnl/mm/i386/pagepae.c     | 4 ++--
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/reactos/boot/freeldr/freeldr/fs/ntfs.c b/reactos/boot/freeldr/freeldr/fs/ntfs.c
index 8373e42b1b3..b9617942f5e 100644
--- a/reactos/boot/freeldr/freeldr/fs/ntfs.c
+++ b/reactos/boot/freeldr/freeldr/fs/ntfs.c
@@ -292,7 +292,7 @@ static ULONGLONG NtfsReadAttribute(PNTFS_VOLUME_INFO Volume, PNTFS_ATTR_CONTEXT
         {
             CurrentOffset += DataRunLength * Volume->ClusterSize;
             DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength);
-            if (DataRunLength != MAXULONGLONG)
+            if (DataRunLength != (ULONGLONG)-1)
             {
                 DataRunStartLCN = LastLCN + DataRunOffset;
                 LastLCN = DataRunStartLCN;
diff --git a/reactos/dll/cpl/main/mouse.c b/reactos/dll/cpl/main/mouse.c
index ee486179a78..689334f9619 100644
--- a/reactos/dll/cpl/main/mouse.c
+++ b/reactos/dll/cpl/main/mouse.c
@@ -971,7 +971,7 @@ OnDrawItem(UINT idCtl,
                    GetSysColor(COLOR_WINDOWTEXT));
     }
 
-    if (lpdis->itemID != MAXUINT)
+    if (lpdis->itemID != (UINT)-1)
     {
         CopyRect(&rc, &lpdis->rcItem);
         rc.left += 5;
diff --git a/reactos/include/psdk/basetsd.h b/reactos/include/psdk/basetsd.h
index 00b0eb8b00b..966ead4ee46 100644
--- a/reactos/include/psdk/basetsd.h
+++ b/reactos/include/psdk/basetsd.h
@@ -48,10 +48,13 @@
 #define MAXHALF_PTR  ((HALF_PTR)(MAXUHALF_PTR >> 1))
 #define MINHALF_PTR  (~MAXHALF_PTR)
 
-#define MAXUINT      ((UINT)~((UINT)0))
+#if _WIN32_WINNT >= 0x0600
 
+#define MAXUINT      ((UINT)~((UINT)0))
 #define MAXULONGLONG ((ULONGLONG)~((ULONGLONG)0))
 
+#endif
+
 #ifndef RC_INVOKED
 #ifdef __cplusplus
 extern "C" {
diff --git a/reactos/lib/rtl/rangelist.c b/reactos/lib/rtl/rangelist.c
index 446c296c89a..4730bbb8392 100644
--- a/reactos/lib/rtl/rangelist.c
+++ b/reactos/lib/rtl/rangelist.c
@@ -608,11 +608,11 @@ RtlInvertRangeList (OUT PRTL_RANGE_LIST InvertedRangeList,
     }
 
   /* Add trailing range */
-  if (Previous->Range.End + 1 != MAXULONGLONG)
+  if (Previous->Range.End + 1 != (ULONGLONG)-1)
     {
       Status = RtlAddRange (InvertedRangeList,
 			    Previous->Range.End + 1,
-			    MAXULONGLONG,
+			    (ULONGLONG)-1,
 			    0,
 			    0,
 			    NULL,
diff --git a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
index f0f7a17d7c9..fd60e951854 100644
--- a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
+++ b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
@@ -1420,7 +1420,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
                              sizeof(ULONG));
 
       /* Set 'UINumber' value */
-      if (DeviceCapabilities.UINumber != (ULONG)-1)
+      if (DeviceCapabilities.UINumber != MAXULONG)
       {
          RtlInitUnicodeString(&ValueName, L"UINumber");
          Status = ZwSetValueKey(InstanceKey,
@@ -3078,7 +3078,7 @@ IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject,
     case DevicePropertyAddress:
         /* Query the device caps */
         Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCaps);
-        if (NT_SUCCESS(Status) && (DeviceCaps.Address != (ULONG)-1))
+        if (NT_SUCCESS(Status) && (DeviceCaps.Address != MAXULONG))
         {
             /* Return length */
             *ResultLength = sizeof(ULONG);
diff --git a/reactos/ntoskrnl/mm/i386/pagepae.c b/reactos/ntoskrnl/mm/i386/pagepae.c
index 0a7be927dc9..609e2faa819 100644
--- a/reactos/ntoskrnl/mm/i386/pagepae.c
+++ b/reactos/ntoskrnl/mm/i386/pagepae.c
@@ -78,11 +78,11 @@ ULONG_PTR
 NTAPI
 MiFlushTlbIpiRoutine(ULONG_PTR Address)
 {
-   if (Address == MAXULONGLONG)
+   if (Address == (ULONGLONG)-1)
    {
       KeFlushCurrentTb();
    }
-   else if (Address == MAXULONGLONG-1)
+   else if (Address == (ULONGLONG)-2)
    {
       KeFlushCurrentTb();
    }