Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 00:45:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[videoprt]

Browse source 
- Improve some debug messages

svn path=/trunk/; revision=58845
This commit is contained in:
Giannis Adamopoulos 2013-04-24 17:51:44 +00:00
parent 4efe1428b9
commit 4d5fd81d67
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/win32ss/drivers/videoprt/timer.c
View file

@ -57,7 +57,7 @@ IntVideoPortSetupTimer(
if (!NT_SUCCESS(Status)) 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; return FALSE;
} }
} }

20
reactos/win32ss/drivers/videoprt/videoprt.c
View file

@ -442,7 +442,7 @@ IntVideoPortFindAdapter(
} }
else 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); RtlFreeUnicodeString(&DeviceExtension->RegistryPath);
if (DeviceExtension->NextDeviceObject) if (DeviceExtension->NextDeviceObject)
IoDetachDevice(DeviceExtension->NextDeviceObject); IoDetachDevice(DeviceExtension->NextDeviceObject);
@ -465,7 +465,7 @@ IntVideoPortFindAdapter(
if (Status != NO_ERROR) 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); RtlFreeUnicodeString(&DeviceExtension->RegistryPath);
if (DeviceExtension->NextDeviceObject) if (DeviceExtension->NextDeviceObject)
IoDetachDevice(DeviceExtension->NextDeviceObject); IoDetachDevice(DeviceExtension->NextDeviceObject);
@ -532,7 +532,7 @@ IntVideoPortFindAdapter(
IoDetachDevice(DeviceExtension->NextDeviceObject); IoDetachDevice(DeviceExtension->NextDeviceObject);
RtlFreeUnicodeString(&DeviceExtension->RegistryPath); RtlFreeUnicodeString(&DeviceExtension->RegistryPath);
IoDeleteDevice(DeviceObject); IoDeleteDevice(DeviceObject);
WARN_(VIDEOPRT, "STATUS_INSUFFICIENT_RESOURCES\n"); ERR_(VIDEOPRT, "IntVideoPortSetupTimer failed\n");
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;
} }
@ -591,6 +591,7 @@ VideoPortInitialize(
if (HwInitializationData->HwInitDataSize > sizeof(VIDEO_HW_INITIALIZATION_DATA)) if (HwInitializationData->HwInitDataSize > sizeof(VIDEO_HW_INITIALIZATION_DATA))
{ {
ERR_(VIDEOPRT, "Invalid HwInitializationData\n");
return STATUS_REVISION_MISMATCH; return STATUS_REVISION_MISMATCH;
} }
@ -598,6 +599,7 @@ VideoPortInitialize(
HwInitializationData->HwInitialize == NULL || HwInitializationData->HwInitialize == NULL ||
HwInitializationData->HwStartIO == NULL) HwInitializationData->HwStartIO == NULL)
{ {
ERR_(VIDEOPRT, "Invalid HwInitializationData\n");
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
@ -621,7 +623,7 @@ VideoPortInitialize(
break; break;
default: default:
WARN_(VIDEOPRT, "Invalid HwInitializationData size.\n"); ERR_(VIDEOPRT, "Invalid HwInitializationData size.\n");
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
@ -677,6 +679,7 @@ VideoPortInitialize(
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
ERR_(VIDEOPRT, "IoAllocateDriverObjectExtension failed 0x%x\n", Status);
return Status; return Status;
} }
@ -744,13 +747,18 @@ VideoPortInitialize(
} }
Status = IntVideoPortCreateAdapterDeviceObject(DriverObject, DriverExtension, Status = IntVideoPortCreateAdapterDeviceObject(DriverObject, DriverExtension,
NULL, &DeviceObject); NULL, &DeviceObject);
INFO_(VIDEOPRT, "IntVideoPortCreateAdapterDeviceObject returned 0x%x\n", Status);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{
ERR_(VIDEOPRT, "IntVideoPortCreateAdapterDeviceObject returned 0x%x\n", Status);
return Status; return Status;
}
Status = IntVideoPortFindAdapter(DriverObject, DriverExtension, DeviceObject); Status = IntVideoPortFindAdapter(DriverObject, DriverExtension, DeviceObject);
INFO_(VIDEOPRT, "IntVideoPortFindAdapter returned 0x%x\n", Status);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
VideoPortDeviceNumber++; VideoPortDeviceNumber++;
else
ERR_(VIDEOPRT, "IntVideoPortFindAdapter returned 0x%x\n", Status);
return Status; return Status;
} }
else else

2
reactos/win32ss/user/ntuser/display.c
View file

@ -187,7 +187,7 @@ InitVideo()
Status = RegOpenKey(KEY_VIDEO, &hkey); Status = RegOpenKey(KEY_VIDEO, &hkey);
if (!NT_SUCCESS(Status)) 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; return Status;
} }