[CODEREVIEW]

Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito@reactos.org>

Author: DarkFire01

win32ss/drivers/videoprt/resource.c

@@ -26,6 +26,8 @@
 
 extern BOOLEAN VpBaseVideo;
 
+static UNICODE_STRING VideoClassName = RTL_CONSTANT_STRING(L"VIDEO");
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 static BOOLEAN
@@ -228,7 +230,6 @@ IntVideoPortReleaseResources(
     }
     else
     {
-        static UNICODE_STRING VideoClassName = RTL_CONSTANT_STRING(L"VIDEO");
         Status = IoReportResourceUsage(&VideoClassName,
                                        DeviceExtension->DriverObject,
                                        NULL,
@@ -302,7 +303,7 @@ IntAccessRangeIsInAllocatedResources(
     _In_ PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension,
     _In_ PVIDEO_ACCESS_RANGE Range)
 {
-    PCM_RESOURCE_LIST Res = DeviceExtension->AllocatedResources;
+    CM_RESOURCE_LIST *Res = DeviceExtension->AllocatedResources;
     CM_FULL_RESOURCE_DESCRIPTOR *Full;
     CM_PARTIAL_RESOURCE_DESCRIPTOR *Desc;
 
@@ -992,8 +993,6 @@ VideoPortVerifyAccessRanges(
     PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor;
     ULONG i;
     NTSTATUS Status;
-    USHORT PciCommand;
-    ULONG BytesRead;
 
     TRACE_(VIDEOPRT, "VideoPortVerifyAccessRanges\n");
 
@@ -1013,7 +1012,7 @@ VideoPortVerifyAccessRanges(
             KeWaitForMutexObject(&VgaSyncLock, Executive, KernelMode, FALSE, NULL);
             if (VgaRanges)
             {
-                ExFreePool(VgaRanges);
+                ExFreePoolWithTag(VgaRanges, TAG_VIDEO_PORT);
                 VgaRanges = NULL;
             }
             NumOfVgaRanges = 0;
@@ -1029,6 +1028,9 @@ VideoPortVerifyAccessRanges(
      */
     if (!DeviceExtension->IsLegacyDevice && DeviceExtension->AdapterInterfaceType == PCIBus)
     {
+        USHORT PciCommand;
+        ULONG BytesRead;
+
         BytesRead = HalGetBusDataByOffset(PCIConfiguration,
                                           DeviceExtension->SystemIoBusNumber,
                                           DeviceExtension->SystemIoSlotNumber,
@@ -1138,7 +1140,6 @@ VideoPortVerifyAccessRanges(
         /* IntIsVgaSaveDriver() will later ignore STATUS_CONFLICTING_ADDRESSES, but we still claim it */
         if (!NT_SUCCESS(Status) && IntIsVgaSaveDriver(DeviceExtension))
         {
-            static UNICODE_STRING VideoClassName = RTL_CONSTANT_STRING(L"VIDEO");
             NTSTATUS fbStatus;
             BOOLEAN fbConflict = FALSE;
             fbStatus = IoReportResourceUsage(&VideoClassName,
@@ -1158,7 +1159,6 @@ VideoPortVerifyAccessRanges(
     }
     else
     {
-        static UNICODE_STRING VideoClassName = RTL_CONSTANT_STRING(L"VIDEO");
         Status = IoReportResourceUsage(&VideoClassName,
                                        DeviceExtension->DriverObject,
                                        NULL,
@@ -1191,7 +1191,7 @@ VideoPortVerifyAccessRanges(
             KeWaitForMutexObject(&VgaSyncLock, Executive, KernelMode, FALSE, NULL);
             if (VgaRanges)
             {
-                ExFreePool(VgaRanges);
+                ExFreePoolWithTag(VgaRanges, TAG_VIDEO_PORT);
                 VgaRanges = NULL;
                 NumOfVgaRanges = 0;
             }

win32ss/drivers/videoprt/videoprt.c

@@ -52,7 +52,7 @@ ULONG NumOfVgaRanges = 0;
 static BOOLEAN
 IntIsVgaSaveDriverName(_In_ PDRIVER_OBJECT DriverObject)
 {
-    UNICODE_STRING VgaSave = RTL_CONSTANT_STRING(L"\\Driver\\VgaSave");
+    static const UNICODE_STRING VgaSave = RTL_CONSTANT_STRING(L"\\Driver\\VgaSave");
     return RtlEqualUnicodeString(&VgaSave, &DriverObject->DriverName, TRUE);
 }
 
@@ -438,7 +438,7 @@ IntVideoPortFindAdapter(
 
     DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
     DeviceExtension->IsVgaDriver = IntIsVgaSaveDriverName(DriverObject);
-    DeviceExtension->IsVgaDetect = DeviceExtension->IsVgaDriver ? TRUE : FALSE;
+    DeviceExtension->IsVgaDetect = DeviceExtension->IsVgaDriver;
     DeviceExtension->IsLegacyDetect = FALSE;
     DeviceExtension->ReportDevice = FALSE;
 
@@ -487,8 +487,8 @@ IntVideoPortFindAdapter(
     }
 
      /* If we already have a VGA miniport and are about to probe for additional adapters,
-         release its resources temporarily so conflicts are visible during detection.
-         We'll reclaim them later if no new adapter successfully claims them. */
+      * release its resources temporarily so conflicts are visible during detection.
+      * We'll reclaim them later if no new adapter successfully claims them. */
     KeWaitForMutexObject(&VgaSyncLock, Executive, KernelMode, FALSE, NULL);
     if (VgaDeviceExtension)
     {
@@ -630,7 +630,7 @@ IntVideoPortFindAdapter(
     DeviceExtension->IsLegacyDetect = FALSE;
 
     /* For legacy (non-PnP) adapters we should report a detected device so that
-       a PDO exists for higher layers to enumerate consistently (mirrors ScsiPort).*/
+     * a PDO exists for higher layers to enumerate consistently (mirrors ScsiPort).*/
     if (DeviceExtension->IsLegacyDevice && !DeviceExtension->ReportDevice)
     {
         PDEVICE_OBJECT ReportedPdo = NULL;
@@ -672,7 +672,7 @@ IntVideoPortFindAdapter(
         {
             /* Another driver has taken VGA resources; drop fallback state */
             WARN_(VIDEOPRT, "VGA reclaim failed (vpStatus=0x%X); releasing fallback state\n", vr);
-            ExFreePool(VgaRanges);
+            ExFreePoolWithTag(VgaRanges, TAG_VIDEO_PORT);
             VgaRanges = NULL;
             NumOfVgaRanges = 0;
             VgaDeviceExtension = NULL;
@@ -692,7 +692,7 @@ IntVideoPortFindAdapter(
     if (DeviceExtension->NextDeviceObject)
         IoDetachDevice(DeviceExtension->NextDeviceObject);
 
-    /* explicitly reclaim VGA resources on complete failure */
+    /* Explicitly reclaim VGA resources on complete failure */
     if (VgaResourcesReleased)
     {
         KeWaitForMutexObject(&VgaSyncLock, Executive, KernelMode, FALSE, NULL);