Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 14:35:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Precision: r58138 was part 2a/3 of my changes.

Browse source 
[KERNEL32-RAMDISK]
Continue to use the new debugging macros introduced in r58132.

Part 2b/3

svn path=/trunk/; revision=58140
This commit is contained in:
Hermès Bélusca-Maïto 2013-01-08 00:35:26 +00:00
parent 15eb0fd332
commit 65de4100f6
3 changed files with 49 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/kernel32/client/path.c
View file

@ -236,9 +236,7 @@ BasepComputeProcessPath(IN PBASE_SEARCH_PATH_TYPE PathOrder,
if (NtCurrentTeb()->NtTib.SubSystemTib) if (NtCurrentTeb()->NtTib.SubSystemTib)
{ {
/* This means someone added RTL_PERTHREAD_CURDIR */ /* This means someone added RTL_PERTHREAD_CURDIR */
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE);
// while (TRUE);
} }
/* We do not. Do we have the LDR_ENTRY for the executable? */ /* We do not. Do we have the LDR_ENTRY for the executable? */

33
reactos/dll/win32/kernel32/client/thread.c
View file

@ -238,10 +238,9 @@ CreateRemoteThread(IN HANDLE hProcess,
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
/* Fail */ /* Fail */
DbgPrint("SXS: %s - Failing thread create because " ERROR_DBGBREAK("SXS: %s - Failing thread create because "
"NtQueryInformationThread() failed with status %08lx\n", "NtQueryInformationThread() failed with status %08lx\n",
__FUNCTION__, Status); __FUNCTION__, Status);
ASSERT(FALSE); // while (TRUE);
return NULL; return NULL;
} }
@ -250,10 +249,9 @@ CreateRemoteThread(IN HANDLE hProcess,
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
/* Fail */ /* Fail */
DbgPrint("SXS: %s - Failing thread create because " ERROR_DBGBREAK("SXS: %s - Failing thread create because "
"RtlAllocateActivationContextStack() failed with status %08lx\n", "RtlAllocateActivationContextStack() failed with status %08lx\n",
__FUNCTION__, Status); __FUNCTION__, Status);
ASSERT(FALSE); // while (TRUE);
return NULL; return NULL;
} }
@ -273,10 +271,9 @@ CreateRemoteThread(IN HANDLE hProcess,
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
/* Fail */ /* Fail */
DbgPrint("SXS: %s - Failing thread create because " ERROR_DBGBREAK("SXS: %s - Failing thread create because "
"RtlQueryInformationActivationContext() failed with status %08lx\n", "RtlQueryInformationActivationContext() failed with status %08lx\n",
__FUNCTION__, Status); __FUNCTION__, Status);
ASSERT(FALSE); // while (TRUE);
return NULL; return NULL;
} }
@ -291,10 +288,9 @@ CreateRemoteThread(IN HANDLE hProcess,
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
/* Fail */ /* Fail */
DbgPrint("SXS: %s - Failing thread create because " ERROR_DBGBREAK("SXS: %s - Failing thread create because "
"RtlActivateActivationContextEx() failed with status %08lx\n", "RtlActivateActivationContextEx() failed with status %08lx\n",
__FUNCTION__, Status); __FUNCTION__, Status);
ASSERT(FALSE); // while (TRUE);
return NULL; return NULL;
} }
} }
@ -370,9 +366,8 @@ ExitThread(IN DWORD uExitCode)
NtTerminateThread(NULL, uExitCode); NtTerminateThread(NULL, uExitCode);
/* We should never reach this place */ /* We should never reach this place */
DPRINT1("It should not happen\n"); ERROR_FATAL("It should not happen\n");
ASSERT(FALSE); while (TRUE); /* 'noreturn' function */
while (TRUE); // 'noreturn' function.
} }
/* /*

107
reactos/drivers/storage/class/ramdisk/ramdisk.c
View file

@ -772,8 +772,7 @@ RamdiskCreateDiskDevice(IN PRAMDISK_BUS_EXTENSION DeviceExtension,
} }
FailCreate: FailCreate:
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -1066,9 +1065,7 @@ RamdiskWorkerThread(IN PDEVICE_OBJECT DeviceObject,
case IOCTL_DISK_GET_DRIVE_LAYOUT: case IOCTL_DISK_GET_DRIVE_LAYOUT:
DPRINT1("Get drive layout request\n"); UNIMPLEMENTED_DBGBREAK("Get drive layout request\n");
UNIMPLEMENTED;
ASSERT(FALSE); // while (TRUE);
break; break;
case IOCTL_DISK_GET_PARTITION_INFO: case IOCTL_DISK_GET_PARTITION_INFO:
@ -1078,9 +1075,7 @@ RamdiskWorkerThread(IN PDEVICE_OBJECT DeviceObject,
default: default:
DPRINT1("Invalid request\n"); UNIMPLEMENTED_DBGBREAK("Invalid request\n");
UNIMPLEMENTED;
ASSERT(FALSE); // while (TRUE);
break; break;
} }
@ -1095,9 +1090,7 @@ RamdiskWorkerThread(IN PDEVICE_OBJECT DeviceObject,
case IRP_MJ_READ: case IRP_MJ_READ:
case IRP_MJ_WRITE: case IRP_MJ_WRITE:
DPRINT1("Read/Write request\n"); UNIMPLEMENTED_DBGBREAK("Read/Write request\n");
UNIMPLEMENTED;
ASSERT(FALSE); // while (TRUE);
break; break;
// //
@ -1105,9 +1098,7 @@ RamdiskWorkerThread(IN PDEVICE_OBJECT DeviceObject,
// //
case IRP_MJ_INTERNAL_DEVICE_CONTROL: case IRP_MJ_INTERNAL_DEVICE_CONTROL:
DPRINT1("SCSI request\n"); UNIMPLEMENTED_DBGBREAK("SCSI request\n");
UNIMPLEMENTED;
ASSERT(FALSE); // while (TRUE);
break; break;
// //
@ -1115,9 +1106,7 @@ RamdiskWorkerThread(IN PDEVICE_OBJECT DeviceObject,
// //
case IRP_MJ_FLUSH_BUFFERS: case IRP_MJ_FLUSH_BUFFERS:
DPRINT1("Flush request\n"); UNIMPLEMENTED_DBGBREAK("Flush request\n");
UNIMPLEMENTED;
ASSERT(FALSE); // while (TRUE);
break; break;
// //
@ -1125,9 +1114,7 @@ RamdiskWorkerThread(IN PDEVICE_OBJECT DeviceObject,
// //
default: default:
DPRINT1("Invalid request: %lx\n", IoStackLocation->MajorFunction); UNIMPLEMENTED_DBGBREAK("Invalid request: %lx\n", IoStackLocation->MajorFunction);
UNIMPLEMENTED;
ASSERT(FALSE); // while (TRUE);
break; break;
} }
@ -1481,7 +1468,7 @@ RamdiskDeviceControl(IN PDEVICE_OBJECT DeviceObject,
// //
// We don't handle anything else yet // We don't handle anything else yet
// //
ASSERT(FALSE); // while (TRUE); UNIMPLEMENTED_DBGBREAK();
} }
} }
else else
@ -1496,8 +1483,7 @@ RamdiskDeviceControl(IN PDEVICE_OBJECT DeviceObject,
case IOCTL_STORAGE_CHECK_VERIFY2: case IOCTL_STORAGE_CHECK_VERIFY2:
case IOCTL_CDROM_CHECK_VERIFY: case IOCTL_CDROM_CHECK_VERIFY:
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
break; break;
case IOCTL_STORAGE_GET_MEDIA_TYPES: case IOCTL_STORAGE_GET_MEDIA_TYPES:
@ -1662,68 +1648,57 @@ RamdiskDeviceControl(IN PDEVICE_OBJECT DeviceObject,
case IOCTL_DISK_GET_DRIVE_LAYOUT: case IOCTL_DISK_GET_DRIVE_LAYOUT:
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
break; break;
case IOCTL_DISK_GET_LENGTH_INFO: case IOCTL_DISK_GET_LENGTH_INFO:
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
break; break;
case IOCTL_DISK_IS_WRITABLE: case IOCTL_DISK_IS_WRITABLE:
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
break; break;
case IOCTL_SCSI_MINIPORT: case IOCTL_SCSI_MINIPORT:
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
break; break;
case IOCTL_STORAGE_QUERY_PROPERTY: case IOCTL_STORAGE_QUERY_PROPERTY:
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
break; break;
case IOCTL_MOUNTDEV_QUERY_UNIQUE_ID: case IOCTL_MOUNTDEV_QUERY_UNIQUE_ID:
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
break; break;
case IOCTL_MOUNTDEV_QUERY_STABLE_GUID: case IOCTL_MOUNTDEV_QUERY_STABLE_GUID:
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
break; break;
case IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS: case IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS:
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
break; break;
case IOCTL_VOLUME_SET_GPT_ATTRIBUTES: case IOCTL_VOLUME_SET_GPT_ATTRIBUTES:
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
break; break;
case IOCTL_VOLUME_GET_GPT_ATTRIBUTES: case IOCTL_VOLUME_GET_GPT_ATTRIBUTES:
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
break; break;
case IOCTL_VOLUME_OFFLINE: case IOCTL_VOLUME_OFFLINE:
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
break; break;
default: default:
@ -1791,8 +1766,7 @@ RamdiskQueryDeviceRelations(IN DEVICE_RELATION_TYPE Type,
// //
// FIXME: TODO // FIXME: TODO
// //
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
} }
// //
@ -1978,8 +1952,7 @@ NTAPI
RamdiskDeleteDiskDevice(IN PDEVICE_OBJECT DeviceObject, RamdiskDeleteDiskDevice(IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp) IN PIRP Irp)
{ {
UNIMPLEMENTED; UNIMPLEMENTED_DBGBREAK();
ASSERT(FALSE); // while (TRUE);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -2146,38 +2119,32 @@ RamdiskPnp(IN PDEVICE_OBJECT DeviceObject,
{ {
case IRP_MN_START_DEVICE: case IRP_MN_START_DEVICE:
DPRINT1("PnP IRP: %lx\n", Minor); UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor);
ASSERT(FALSE); // while (TRUE);
break; break;
case IRP_MN_QUERY_STOP_DEVICE: case IRP_MN_QUERY_STOP_DEVICE:
DPRINT1("PnP IRP: %lx\n", Minor); UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor);
ASSERT(FALSE); // while (TRUE);
break; break;
case IRP_MN_CANCEL_STOP_DEVICE: case IRP_MN_CANCEL_STOP_DEVICE:
DPRINT1("PnP IRP: %lx\n", Minor); UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor);
ASSERT(FALSE); // while (TRUE);
break; break;
case IRP_MN_STOP_DEVICE: case IRP_MN_STOP_DEVICE:
DPRINT1("PnP IRP: %lx\n", Minor); UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor);
ASSERT(FALSE); // while (TRUE);
break; break;
case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_REMOVE_DEVICE:
DPRINT1("PnP IRP: %lx\n", Minor); UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor);
ASSERT(FALSE); // while (TRUE);
break; break;
case IRP_MN_CANCEL_REMOVE_DEVICE: case IRP_MN_CANCEL_REMOVE_DEVICE:
DPRINT1("PnP IRP: %lx\n", Minor); UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor);
ASSERT(FALSE); // while (TRUE);
break; break;
case IRP_MN_REMOVE_DEVICE: case IRP_MN_REMOVE_DEVICE:
@ -2211,8 +2178,7 @@ RamdiskPnp(IN PDEVICE_OBJECT DeviceObject,
case IRP_MN_SURPRISE_REMOVAL: case IRP_MN_SURPRISE_REMOVAL:
DPRINT1("PnP IRP: %lx\n", Minor); UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor);
ASSERT(FALSE); // while (TRUE);
break; break;
case IRP_MN_QUERY_ID: case IRP_MN_QUERY_ID:
@ -2222,8 +2188,7 @@ RamdiskPnp(IN PDEVICE_OBJECT DeviceObject,
// //
if (DeviceExtension->Type == RamdiskDrive) if (DeviceExtension->Type == RamdiskDrive)
{ {
DPRINT1("PnP IRP: %lx\n", Minor); UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor);
ASSERT(FALSE); // while (TRUE);
} }
break; break;
@ -2234,15 +2199,13 @@ RamdiskPnp(IN PDEVICE_OBJECT DeviceObject,
// //
if (DeviceExtension->Type == RamdiskDrive) if (DeviceExtension->Type == RamdiskDrive)
{ {
DPRINT1("PnP IRP: %lx\n", Minor); UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor);
ASSERT(FALSE); // while (TRUE);
} }
break; break;
case IRP_MN_EJECT: case IRP_MN_EJECT:
DPRINT1("PnP IRP: %lx\n", Minor); UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor);
ASSERT(FALSE); // while (TRUE);
break; break;
case IRP_MN_QUERY_DEVICE_TEXT: case IRP_MN_QUERY_DEVICE_TEXT:
@ -2252,8 +2215,7 @@ RamdiskPnp(IN PDEVICE_OBJECT DeviceObject,
// //
if (DeviceExtension->Type == RamdiskDrive) if (DeviceExtension->Type == RamdiskDrive)
{ {
DPRINT1("PnP IRP: %lx\n", Minor); UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor);
ASSERT(FALSE); // while (TRUE);
} }
break; break;
@ -2276,8 +2238,7 @@ RamdiskPnp(IN PDEVICE_OBJECT DeviceObject,
// //
if (DeviceExtension->Type == RamdiskDrive) if (DeviceExtension->Type == RamdiskDrive)
{ {
DPRINT1("PnP IRP: %lx\n", Minor); UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor);
ASSERT(FALSE); // while (TRUE);
} }
break; break;