diff --git a/reactos/win32ss/drivers/videoprt/timer.c b/reactos/win32ss/drivers/videoprt/timer.c index ba217b5e117..d30f6fc231b 100644 --- a/reactos/win32ss/drivers/videoprt/timer.c +++ b/reactos/win32ss/drivers/videoprt/timer.c @@ -57,7 +57,7 @@ IntVideoPortSetupTimer( 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; } } diff --git a/reactos/win32ss/drivers/videoprt/videoprt.c b/reactos/win32ss/drivers/videoprt/videoprt.c index 7016fc0fdd9..00bcec95520 100644 --- a/reactos/win32ss/drivers/videoprt/videoprt.c +++ b/reactos/win32ss/drivers/videoprt/videoprt.c @@ -442,7 +442,7 @@ IntVideoPortFindAdapter( } 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 @@ IntVideoPortFindAdapter( 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 @@ IntVideoPortFindAdapter( 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 @@ VideoPortInitialize( if (HwInitializationData->HwInitDataSize > sizeof(VIDEO_HW_INITIALIZATION_DATA)) { + ERR_(VIDEOPRT, "Invalid HwInitializationData\n"); return STATUS_REVISION_MISMATCH; } @@ -598,6 +599,7 @@ VideoPortInitialize( HwInitializationData->HwInitialize == NULL || HwInitializationData->HwStartIO == NULL) { + ERR_(VIDEOPRT, "Invalid HwInitializationData\n"); return STATUS_INVALID_PARAMETER; } @@ -621,7 +623,7 @@ VideoPortInitialize( break; default: - WARN_(VIDEOPRT, "Invalid HwInitializationData size.\n"); + ERR_(VIDEOPRT, "Invalid HwInitializationData size.\n"); return STATUS_UNSUCCESSFUL; } @@ -677,6 +679,7 @@ VideoPortInitialize( if (!NT_SUCCESS(Status)) { + ERR_(VIDEOPRT, "IoAllocateDriverObjectExtension failed 0x%x\n", Status); return Status; } @@ -744,13 +747,18 @@ VideoPortInitialize( } 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 diff --git a/reactos/win32ss/user/ntuser/display.c b/reactos/win32ss/user/ntuser/display.c index 350f49717ff..267db7223f9 100644 --- a/reactos/win32ss/user/ntuser/display.c +++ b/reactos/win32ss/user/ntuser/display.c @@ -187,7 +187,7 @@ InitVideo() 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; }