[ros-diffs] [gadamopoulos] 58845: [videoprt] - Improve some debug messages

Author: gadamopoulos
Date: Wed Apr 24 17:51:44 2013
New Revision: 58845

URL: http://svn.reactos.org/svn/reactos?rev=58845&view=rev
Log:
[videoprt]
- Improve some debug messages

Modified:
    trunk/reactos/win32ss/drivers/videoprt/timer.c
    trunk/reactos/win32ss/drivers/videoprt/videoprt.c
    trunk/reactos/win32ss/user/ntuser/display.c

Modified: trunk/reactos/win32ss/drivers/videoprt/timer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/t…
==============================================================================
--- trunk/reactos/win32ss/drivers/videoprt/timer.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/drivers/videoprt/timer.c [iso-8859-1] Wed Apr 24 17:51:44 2013
@@ -57,7 +57,7 @@
 
       if (!NT_SUCCESS(Status))
       {
-         WARN_(VIDEOPRT, "IoInitializeTimer failed with status 0x%08x\n",
Status);
+         ERR_(VIDEOPRT, "IoInitializeTimer failed with status 0x%08x\n",
Status);
          return FALSE;
       }
    }

Modified: trunk/reactos/win32ss/drivers/videoprt/videoprt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/v…
==============================================================================
--- trunk/reactos/win32ss/drivers/videoprt/videoprt.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/drivers/videoprt/videoprt.c [iso-8859-1] Wed Apr 24 17:51:44
2013
@@ -442,7 +442,7 @@
          }
          else
          {
-            WARN_(VIDEOPRT, "HwFindAdapter call failed with error 0x%X\n",
Status);
+            ERR_(VIDEOPRT, "HwFindAdapter call failed with error 0x%X\n",
Status);
             RtlFreeUnicodeString(&DeviceExtension->RegistryPath);
             if (DeviceExtension->NextDeviceObject)
                 IoDetachDevice(DeviceExtension->NextDeviceObject);
@@ -465,7 +465,7 @@
 
    if (Status != NO_ERROR)
    {
-      WARN_(VIDEOPRT, "HwFindAdapter call failed with error 0x%X\n", Status);
+      ERR_(VIDEOPRT, "HwFindAdapter call failed with error 0x%X\n", Status);
       RtlFreeUnicodeString(&DeviceExtension->RegistryPath);
       if (DeviceExtension->NextDeviceObject)
           IoDetachDevice(DeviceExtension->NextDeviceObject);
@@ -532,7 +532,7 @@
           IoDetachDevice(DeviceExtension->NextDeviceObject);
       RtlFreeUnicodeString(&DeviceExtension->RegistryPath);
       IoDeleteDevice(DeviceObject);
-      WARN_(VIDEOPRT, "STATUS_INSUFFICIENT_RESOURCES\n");
+      ERR_(VIDEOPRT, "IntVideoPortSetupTimer failed\n");
       return STATUS_INSUFFICIENT_RESOURCES;
    }
 
@@ -591,6 +591,7 @@
 
    if (HwInitializationData->HwInitDataSize >
sizeof(VIDEO_HW_INITIALIZATION_DATA))
    {
+      ERR_(VIDEOPRT, "Invalid HwInitializationData\n");
       return STATUS_REVISION_MISMATCH;
    }
 
@@ -598,6 +599,7 @@
        HwInitializationData->HwInitialize == NULL ||
        HwInitializationData->HwStartIO == NULL)
    {
+      ERR_(VIDEOPRT, "Invalid HwInitializationData\n");
       return STATUS_INVALID_PARAMETER;
    }
 
@@ -621,7 +623,7 @@
          break;
 
       default:
-         WARN_(VIDEOPRT, "Invalid HwInitializationData size.\n");
+         ERR_(VIDEOPRT, "Invalid HwInitializationData size.\n");
          return STATUS_UNSUCCESSFUL;
    }
 
@@ -677,6 +679,7 @@
 
       if (!NT_SUCCESS(Status))
       {
+         ERR_(VIDEOPRT, "IoAllocateDriverObjectExtension failed 0x%x\n",
Status);
          return Status;
       }
 
@@ -744,13 +747,18 @@
       }
       Status = IntVideoPortCreateAdapterDeviceObject(DriverObject, DriverExtension,
                                                      NULL, &DeviceObject);
-      INFO_(VIDEOPRT, "IntVideoPortCreateAdapterDeviceObject returned 0x%x\n",
Status);
       if (!NT_SUCCESS(Status))
+      {
+         ERR_(VIDEOPRT, "IntVideoPortCreateAdapterDeviceObject returned
0x%x\n", Status);
          return Status;
+      }
+
       Status = IntVideoPortFindAdapter(DriverObject, DriverExtension, DeviceObject);
-      INFO_(VIDEOPRT, "IntVideoPortFindAdapter returned 0x%x\n", Status);
       if (NT_SUCCESS(Status))
          VideoPortDeviceNumber++;
+      else
+         ERR_(VIDEOPRT, "IntVideoPortFindAdapter returned 0x%x\n", Status);
+
       return Status;
    }
    else

Modified: trunk/reactos/win32ss/user/ntuser/display.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/displa…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Wed Apr 24 17:51:44 2013
@@ -187,7 +187,7 @@
     Status = RegOpenKey(KEY_VIDEO, &hkey);
     if (!NT_SUCCESS(Status))
     {
-        ERR("Could not open device registry key!\n");
+        ERR("Could not open HARDWARE\\DEVICEMAP\\VIDEO registry key:0x%lx\n",
Status);
         return Status;
     }