From: Thomas Faber <thomas.faber@reactos.org>
Date: Sat, 17 Oct 2015 19:31:46 +0000 (+0000)
Subject: [VIDEOPRT]
X-Git-Tag: ReactOS-0.4.0~482
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=e0f1e0177b28ad322c763ec0f7f12ed9ae7ff054;hp=6be0925245bb05d1da7814f2b3ed54a98bae4c7c;ds=sidebyside

[VIDEOPRT]
- Don't try to incorrectly and unnecessarily parse multiple resource descriptors
CORE-10146

svn path=/trunk/; revision=69573
---

diff --git a/reactos/win32ss/drivers/videoprt/dispatch.c b/reactos/win32ss/drivers/videoprt/dispatch.c
index 7aa2acb956e..34ae1074626 100644
--- a/reactos/win32ss/drivers/videoprt/dispatch.c
+++ b/reactos/win32ss/drivers/videoprt/dispatch.c
@@ -588,31 +588,28 @@ IntVideoPortPnPStartDevice(
                       ResourceListSize);
 
         /* Get the interrupt level/vector - needed by HwFindAdapter sometimes */
-        for (FullList = AllocatedResources->List;
-             FullList < AllocatedResources->List + AllocatedResources->Count;
-             FullList++)
+        FullList = AllocatedResources->List;
+        ASSERT(AllocatedResources->Count == 1);
+        INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n",
+              FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision);
+
+        /* FIXME: Is this ASSERT ok for resources from the PNP manager? */
+        ASSERT(FullList->InterfaceType == PCIBus);
+        ASSERT(FullList->BusNumber == DeviceExtension->SystemIoBusNumber);
+        ASSERT(1 == FullList->PartialResourceList.Version);
+        ASSERT(1 == FullList->PartialResourceList.Revision);
+        for (Descriptor = FullList->PartialResourceList.PartialDescriptors;
+             Descriptor < FullList->PartialResourceList.PartialDescriptors + FullList->PartialResourceList.Count;
+             Descriptor++)
         {
-            INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n",
-                  FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision);
-
-            /* FIXME: Is this ASSERT ok for resources from the PNP manager? */
-            ASSERT(FullList->InterfaceType == PCIBus);
-            ASSERT(FullList->BusNumber == DeviceExtension->SystemIoBusNumber);
-            ASSERT(1 == FullList->PartialResourceList.Version);
-            ASSERT(1 == FullList->PartialResourceList.Revision);
-            for (Descriptor = FullList->PartialResourceList.PartialDescriptors;
-                 Descriptor < FullList->PartialResourceList.PartialDescriptors + FullList->PartialResourceList.Count;
-                 Descriptor++)
+            if (Descriptor->Type == CmResourceTypeInterrupt)
             {
-                if (Descriptor->Type == CmResourceTypeInterrupt)
-                {
-                    DeviceExtension->InterruptLevel = Descriptor->u.Interrupt.Level;
-                    DeviceExtension->InterruptVector = Descriptor->u.Interrupt.Vector;
-                    if (Descriptor->ShareDisposition == CmResourceShareShared)
-                        DeviceExtension->InterruptShared = TRUE;
-                    else
-                        DeviceExtension->InterruptShared = FALSE;
-                }
+                DeviceExtension->InterruptLevel = Descriptor->u.Interrupt.Level;
+                DeviceExtension->InterruptVector = Descriptor->u.Interrupt.Vector;
+                if (Descriptor->ShareDisposition == CmResourceShareShared)
+                    DeviceExtension->InterruptShared = TRUE;
+                else
+                    DeviceExtension->InterruptShared = FALSE;
             }
         }
     }
diff --git a/reactos/win32ss/drivers/videoprt/resource.c b/reactos/win32ss/drivers/videoprt/resource.c
index a4d7afad2d8..9cad3299ca1 100644
--- a/reactos/win32ss/drivers/videoprt/resource.c
+++ b/reactos/win32ss/drivers/videoprt/resource.c
@@ -744,71 +744,68 @@ VideoPortGetAccessRanges(
     /* Return the slot number if the caller wants it */
     if (Slot != NULL) *Slot = DeviceExtension->SystemIoBusNumber;
 
-    for (FullList = AllocatedResources->List;
-         FullList < AllocatedResources->List + AllocatedResources->Count;
-         FullList++)
+    FullList = AllocatedResources->List;
+    ASSERT(AllocatedResources->Count == 1);
+    INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n", 
+          FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision);
+    
+    ASSERT(FullList->InterfaceType == PCIBus);
+    ASSERT(FullList->BusNumber == DeviceExtension->SystemIoBusNumber);
+    ASSERT(1 == FullList->PartialResourceList.Version);
+    ASSERT(1 == FullList->PartialResourceList.Revision);
+    for (Descriptor = FullList->PartialResourceList.PartialDescriptors;
+         Descriptor < FullList->PartialResourceList.PartialDescriptors + FullList->PartialResourceList.Count;
+         Descriptor++)
     {
-        INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n", 
-              FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision);
-        
-        ASSERT(FullList->InterfaceType == PCIBus);
-        ASSERT(FullList->BusNumber == DeviceExtension->SystemIoBusNumber);
-        ASSERT(1 == FullList->PartialResourceList.Version);
-        ASSERT(1 == FullList->PartialResourceList.Revision);
-        for (Descriptor = FullList->PartialResourceList.PartialDescriptors;
-             Descriptor < FullList->PartialResourceList.PartialDescriptors + FullList->PartialResourceList.Count;
-             Descriptor++)
+        if ((Descriptor->Type == CmResourceTypeMemory ||
+             Descriptor->Type == CmResourceTypePort) &&
+            AssignedCount >= NumAccessRanges)
         {
-            if ((Descriptor->Type == CmResourceTypeMemory ||
-                 Descriptor->Type == CmResourceTypePort) &&
-                AssignedCount >= NumAccessRanges)
-            {
-                ERR_(VIDEOPRT, "Too many access ranges found\n");
-                return ERROR_NOT_ENOUGH_MEMORY;
-            }
-            if (Descriptor->Type == CmResourceTypeMemory)
-            {
-                INFO_(VIDEOPRT, "Memory range starting at 0x%08x length 0x%08x\n",
-                      Descriptor->u.Memory.Start.u.LowPart, Descriptor->u.Memory.Length);
-                AccessRanges[AssignedCount].RangeStart = Descriptor->u.Memory.Start;
-                AccessRanges[AssignedCount].RangeLength = Descriptor->u.Memory.Length;
-                AccessRanges[AssignedCount].RangeInIoSpace = 0;
-                AccessRanges[AssignedCount].RangeVisible = 0; /* FIXME: Just guessing */
-                AccessRanges[AssignedCount].RangeShareable =
-                (Descriptor->ShareDisposition == CmResourceShareShared);
-                AccessRanges[AssignedCount].RangePassive = 0;
-                AssignedCount++;
-            }
-            else if (Descriptor->Type == CmResourceTypePort)
-            {
-                INFO_(VIDEOPRT, "Port range starting at 0x%04x length %d\n",
-                      Descriptor->u.Port.Start.u.LowPart, Descriptor->u.Port.Length);
-                AccessRanges[AssignedCount].RangeStart = Descriptor->u.Port.Start;
-                AccessRanges[AssignedCount].RangeLength = Descriptor->u.Port.Length;
-                AccessRanges[AssignedCount].RangeInIoSpace = 1;
-                AccessRanges[AssignedCount].RangeVisible = 0; /* FIXME: Just guessing */
-                AccessRanges[AssignedCount].RangeShareable =
-                (Descriptor->ShareDisposition == CmResourceShareShared);
-                AccessRanges[AssignedCount].RangePassive = 0;
-                if (Descriptor->Flags & CM_RESOURCE_PORT_10_BIT_DECODE)
-                    AccessRanges[AssignedCount].RangePassive |= VIDEO_RANGE_10_BIT_DECODE;
-                if (Descriptor->Flags & CM_RESOURCE_PORT_PASSIVE_DECODE)
-                    AccessRanges[AssignedCount].RangePassive |= VIDEO_RANGE_PASSIVE_DECODE;
-                AssignedCount++;
-            }
-            else if (Descriptor->Type == CmResourceTypeInterrupt)
-            {
-                DeviceExtension->InterruptLevel = Descriptor->u.Interrupt.Level;
-                DeviceExtension->InterruptVector = Descriptor->u.Interrupt.Vector;
-                if (Descriptor->ShareDisposition == CmResourceShareShared)
-                    DeviceExtension->InterruptShared = TRUE;
-                else
-                    DeviceExtension->InterruptShared = FALSE;
-            }
+            ERR_(VIDEOPRT, "Too many access ranges found\n");
+            return ERROR_NOT_ENOUGH_MEMORY;
+        }
+        if (Descriptor->Type == CmResourceTypeMemory)
+        {
+            INFO_(VIDEOPRT, "Memory range starting at 0x%08x length 0x%08x\n",
+                  Descriptor->u.Memory.Start.u.LowPart, Descriptor->u.Memory.Length);
+            AccessRanges[AssignedCount].RangeStart = Descriptor->u.Memory.Start;
+            AccessRanges[AssignedCount].RangeLength = Descriptor->u.Memory.Length;
+            AccessRanges[AssignedCount].RangeInIoSpace = 0;
+            AccessRanges[AssignedCount].RangeVisible = 0; /* FIXME: Just guessing */
+            AccessRanges[AssignedCount].RangeShareable =
+            (Descriptor->ShareDisposition == CmResourceShareShared);
+            AccessRanges[AssignedCount].RangePassive = 0;
+            AssignedCount++;
+        }
+        else if (Descriptor->Type == CmResourceTypePort)
+        {
+            INFO_(VIDEOPRT, "Port range starting at 0x%04x length %d\n",
+                  Descriptor->u.Port.Start.u.LowPart, Descriptor->u.Port.Length);
+            AccessRanges[AssignedCount].RangeStart = Descriptor->u.Port.Start;
+            AccessRanges[AssignedCount].RangeLength = Descriptor->u.Port.Length;
+            AccessRanges[AssignedCount].RangeInIoSpace = 1;
+            AccessRanges[AssignedCount].RangeVisible = 0; /* FIXME: Just guessing */
+            AccessRanges[AssignedCount].RangeShareable =
+            (Descriptor->ShareDisposition == CmResourceShareShared);
+            AccessRanges[AssignedCount].RangePassive = 0;
+            if (Descriptor->Flags & CM_RESOURCE_PORT_10_BIT_DECODE)
+                AccessRanges[AssignedCount].RangePassive |= VIDEO_RANGE_10_BIT_DECODE;
+            if (Descriptor->Flags & CM_RESOURCE_PORT_PASSIVE_DECODE)
+                AccessRanges[AssignedCount].RangePassive |= VIDEO_RANGE_PASSIVE_DECODE;
+            AssignedCount++;
+        }
+        else if (Descriptor->Type == CmResourceTypeInterrupt)
+        {
+            DeviceExtension->InterruptLevel = Descriptor->u.Interrupt.Level;
+            DeviceExtension->InterruptVector = Descriptor->u.Interrupt.Vector;
+            if (Descriptor->ShareDisposition == CmResourceShareShared)
+                DeviceExtension->InterruptShared = TRUE;
+            else
+                DeviceExtension->InterruptShared = FALSE;
         }
     }
 
-   return NO_ERROR;
+    return NO_ERROR;
 }
 
 /*