- Remove deprecated CHECKPOINT/CHECKPOINT1 macros which basically translated into DPRINT/DPRINT1("\n")

svn path=/trunk/; revision=35638
This commit is contained in:
Stefan Ginsberg 2008-08-25 18:52:38 +00:00
parent 7afb74e857
commit 7876a9fe0d
23 changed files with 4 additions and 72 deletions

View file

@ -979,7 +979,6 @@ InstallFat32BootCodeToFile(PWSTR SrcPath,
NtClose(FileHandle);
if (!NT_SUCCESS(Status))
{
CHECKPOINT1;
RtlFreeHeap(ProcessHeap, 0, OrigBootSector);
return(Status);
}

View file

@ -189,7 +189,6 @@ CdfsFindFile(PDEVICE_EXTENSION DeviceExt,
if (FileToFind == NULL || FileToFind->Length == 0)
{
CHECKPOINT;
RtlInitUnicodeString(&TempString, L".");
FileToFind = &TempString;
}

View file

@ -204,7 +204,6 @@ FindFile (
PathNameBuffer = ExAllocatePoolWithTag(NonPagedPool, PathNameBufferLength + sizeof(WCHAR), TAG_VFAT);
if (!PathNameBuffer)
{
CHECKPOINT1;
return STATUS_INSUFFICIENT_RESOURCES;
}
@ -263,7 +262,6 @@ FindFile (
Status = RtlUpcaseUnicodeString(&FileToFindUpcase, FileToFindU, TRUE);
if (!NT_SUCCESS(Status))
{
CHECKPOINT;
ExFreePool(PathNameBuffer);
return Status;
}

View file

@ -478,7 +478,6 @@ NTSTATUS VfatDirectoryControl (PVFAT_IRP_CONTEXT IrpContext)
*/
{
NTSTATUS RC = STATUS_SUCCESS;
CHECKPOINT;
IrpContext->Irp->IoStatus.Information = 0;
switch (IrpContext->MinorFunction)
{

View file

@ -205,7 +205,6 @@ NTSTATUS FATGetNextDirEntry(PVOID * pContext,
if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart ||
!CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage))
{
CHECKPOINT;
*pContext = NULL;
return STATUS_NO_MORE_ENTRIES;
}
@ -230,7 +229,6 @@ NTSTATUS FATGetNextDirEntry(PVOID * pContext,
if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart ||
!CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage))
{
CHECKPOINT;
*pContext = NULL;
return STATUS_NO_MORE_ENTRIES;
}
@ -328,7 +326,6 @@ NTSTATUS FATGetNextDirEntry(PVOID * pContext,
if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart ||
!CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage))
{
CHECKPOINT;
*pContext = NULL;
return STATUS_NO_MORE_ENTRIES;
}
@ -440,7 +437,6 @@ NTSTATUS FATXGetNextDirEntry(PVOID * pContext,
if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart ||
!CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage))
{
CHECKPOINT;
*pContext = NULL;
return STATUS_NO_MORE_ENTRIES;
}

View file

@ -137,7 +137,6 @@ vfatFindDirSpace(
if (*start + nbSlots > count)
{
LARGE_INTEGER AllocationSize;
CHECKPOINT;
/* extend the directory */
if (vfatFCBIsRoot(pDirFcb) && DeviceExt->FatInfo.FatType != FAT32)
{
@ -270,7 +269,6 @@ FATAddEntry(
if (i == 100) /* FIXME : what to do after this ? */
{
ExFreePoolWithTag(Buffer, TAG_VFAT);
CHECKPOINT;
return STATUS_UNSUCCESSFUL;
}
IsNameLegal = RtlIsNameLegalDOS8Dot3(&DirContext.ShortNameU, &NameA, &SpacesFound);
@ -440,7 +438,6 @@ FATAddEntry(
if (DirContext.StartIndex / i == DirContext.DirIndex / i)
{
/* one cluster */
CHECKPOINT;
CcPinRead(ParentFcb->FileObject, &FileOffset, nbSlots * sizeof(FAT_DIR_ENTRY),
TRUE, &Context, (PVOID*)&pFatEntry);
if (nbSlots > 1)
@ -452,7 +449,6 @@ FATAddEntry(
else
{
/* two clusters */
CHECKPOINT;
size = DeviceExt->FatInfo.BytesPerCluster -
(DirContext.StartIndex * sizeof(FAT_DIR_ENTRY)) % DeviceExt->FatInfo.BytesPerCluster;
i = size / sizeof(FAT_DIR_ENTRY);
@ -533,7 +529,6 @@ FATXAddEntry(
if (DirContext.LongNameU.Length / sizeof(WCHAR) > 42)
{
/* name too long */
CHECKPOINT;
return STATUS_NAME_TOO_LONG;
}

View file

@ -653,7 +653,6 @@ GetNextClusterExtend(PDEVICE_EXTENSION DeviceExt,
DeviceExt, CurrentCluster);
ExAcquireResourceExclusiveLite(&DeviceExt->FatResource, TRUE);
CHECKPOINT;
/*
* If the file hasn't any clusters allocated then we need special
* handling

View file

@ -300,14 +300,12 @@ vfatGrabFCBFromTable(PDEVICE_EXTENSION pVCB, PUNICODE_STRING PathNameU)
if (RtlEqualUnicodeString(&FileNameU, FcbNameU, TRUE))
{
rcFCB->RefCount++;
CHECKPOINT;
return rcFCB;
}
}
}
entry = entry->next;
}
CHECKPOINT;
return NULL;
}
@ -536,7 +534,6 @@ vfatAttachFCBToFileObject (
newCCB = ExAllocateFromNPagedLookasideList(&VfatGlobalData->CcbLookasideList);
if (newCCB == NULL)
{
CHECKPOINT;
return STATUS_INSUFFICIENT_RESOURCES;
}
RtlZeroMemory (newCCB, sizeof (VFATCCB));

View file

@ -241,7 +241,6 @@ VfatHasFileSystem(PDEVICE_OBJECT DeviceToMount,
if (PartitionInfoIsValid &&
FatInfo.Sectors > PartitionInfo.PartitionLength.QuadPart / FatInfo.BytesPerSector)
{
CHECKPOINT1;
*RecognizedFS = FALSE;
}

View file

@ -194,7 +194,6 @@ VfatReadFileData (PVFAT_IRP_CONTEXT IrpContext,
if (FirstCluster == 1)
{
// Directory of FAT12/16 needs a special handling
CHECKPOINT;
if (ReadOffset.u.LowPart + Length > DeviceExt->FatInfo.rootDirectorySectors * BytesPerSector)
{
Length = DeviceExt->FatInfo.rootDirectorySectors * BytesPerSector - ReadOffset.u.LowPart;
@ -660,7 +659,6 @@ VfatRead(PVFAT_IRP_CONTEXT IrpContext)
!(Fcb->Flags & (FCB_IS_PAGE_FILE|FCB_IS_VOLUME)))
{
// cached read
CHECKPOINT;
Status = STATUS_SUCCESS;
if (ByteOffset.u.LowPart + Length > Fcb->RFCB.FileSize.u.LowPart)
{
@ -668,7 +666,6 @@ VfatRead(PVFAT_IRP_CONTEXT IrpContext)
Status = /*STATUS_END_OF_FILE*/STATUS_SUCCESS;
}
CHECKPOINT;
if (IrpContext->FileObject->PrivateCacheMap == NULL)
{
CcInitializeCacheMap(IrpContext->FileObject,
@ -684,7 +681,6 @@ VfatRead(PVFAT_IRP_CONTEXT IrpContext)
Status = IrpContext->Irp->IoStatus.Status;//STATUS_PENDING;
goto ByeBye;
}
CHECKPOINT;
if (!NT_SUCCESS(IrpContext->Irp->IoStatus.Status))
{
Status = IrpContext->Irp->IoStatus.Status;
@ -693,7 +689,6 @@ VfatRead(PVFAT_IRP_CONTEXT IrpContext)
else
{
// non cached read
CHECKPOINT;
if (ByteOffset.QuadPart + Length > ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector))
{
Length = (ULONG)(ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart);
@ -951,7 +946,6 @@ NTSTATUS VfatWrite (PVFAT_IRP_CONTEXT IrpContext)
IrpContext->DeviceExt, &AllocationSize);
if (!NT_SUCCESS (Status))
{
CHECKPOINT;
goto ByeBye;
}
}
@ -960,7 +954,6 @@ NTSTATUS VfatWrite (PVFAT_IRP_CONTEXT IrpContext)
!(Fcb->Flags & (FCB_IS_PAGE_FILE|FCB_IS_VOLUME)))
{
// cached write
CHECKPOINT;
if (IrpContext->FileObject->PrivateCacheMap == NULL)
{
@ -984,12 +977,10 @@ NTSTATUS VfatWrite (PVFAT_IRP_CONTEXT IrpContext)
{
Status = STATUS_UNSUCCESSFUL;
}
CHECKPOINT;
}
else
{
// non cached write
CHECKPOINT;
if (ByteOffset.QuadPart > OldFileSize.QuadPart)
{

View file

@ -179,7 +179,6 @@ FsdSetFsLabelInformation(PDEVICE_OBJECT DeviceObject,
if (sizeof(DeviceObject->Vpb->VolumeLabel) < FsLabelInfo->VolumeLabelLength)
{
CHECKPOINT;
return STATUS_NAME_TOO_LONG;
}

View file

@ -627,7 +627,6 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject,
offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) +
(Buf->dwCoord.X * 2);
CHECKPOINT
for (dwCount = 0; dwCount < Buf->nLength; dwCount++)
{

View file

@ -648,15 +648,13 @@ HaliReconfigurePciInterrupts(VOID)
i, IRQMap[i].IrqType, IRQMap[i].IrqFlag, IRQMap[i].SrcBusId,
IRQMap[i].SrcBusIrq, IRQMap[i].DstApicId, IRQMap[i].DstApicInt);
if(1 != HalSetBusDataByOffset(PCIConfiguration,
HalSetBusDataByOffset(PCIConfiguration,
IRQMap[i].SrcBusId,
(IRQMap[i].SrcBusIrq >> 2) & 0x1f,
&IRQMap[i].DstApicInt,
0x3c /*PCI_INTERRUPT_LINE*/,
1))
{
CHECKPOINT;
}
1);
}
}
}

View file

@ -813,17 +813,14 @@ Ext2Format(
EXT2_FILESYS FileSys;
ULONG Percent;
CHECKPOINT;
Callback(PROGRESS, 0, (PVOID)&Percent);
CHECKPOINT;
RtlZeroMemory(&Ext2Sb, sizeof(EXT2_SUPER_BLOCK));
RtlZeroMemory(&FileSys, sizeof(EXT2_FILESYS));
FileSys.ext2_sb = &Ext2Sb;
CHECKPOINT;
if (!NT_SUCCESS(Ext2OpenDevice(&FileSys, DriveRoot)))
{
@ -831,7 +828,6 @@ Ext2Format(
goto clean_up;
}
CHECKPOINT;
if (!NT_SUCCESS(Ext2GetMediaInfo(&FileSys)))
{
@ -844,7 +840,6 @@ Ext2Format(
Ext2Sb.s_blocks_count = FileSys.PartInfo.PartitionLength.QuadPart /
EXT2_BLOCK_SIZE(&Ext2Sb);
CHECKPOINT;
/*
* Calculate number of inodes based on the inode ratio
@ -857,7 +852,6 @@ Ext2Format(
*/
Ext2Sb.s_r_blocks_count = (Ext2Sb.s_blocks_count * 5) / 100;
CHECKPOINT;
Status = Ext2LockVolume(&FileSys);
if (NT_SUCCESS(Status))
@ -865,7 +859,6 @@ Ext2Format(
bLocked = TRUE;
}
CHECKPOINT;
// Initialize
if (!ext2_initialize_sb(&FileSys))
@ -874,7 +867,6 @@ Ext2Format(
goto clean_up;
}
CHECKPOINT;
zap_sector(&FileSys, 2, 6);
@ -999,13 +991,9 @@ clean_up:
}
}
CHECKPOINT;
Ext2CloseDevice(&FileSys);
CHECKPOINT;
CHECKPOINT;
Callback(DONE, 0, (PVOID)&bRet);
CHECKPOINT;
return Status;
}

View file

@ -162,7 +162,6 @@ RtlGenerate8dot3Name(IN PUNICODE_STRING Name,
(Checksum == Context->Checksum) &&
(Context->LastIndexValue < 999))
{
CHECKPOINT;
Context->LastIndexValue++;
if (Context->CheckSumInserted == FALSE &&
Context->LastIndexValue > 9)
@ -174,7 +173,6 @@ RtlGenerate8dot3Name(IN PUNICODE_STRING Name,
}
else
{
CHECKPOINT;
Context->LastIndexValue = 1;
Context->CheckSumInserted = FALSE;
}

View file

@ -197,7 +197,7 @@ ShutdownThreadMain(PVOID Context)
#endif /* CONFIG_SMP */
PopSetSystemPowerState(PowerSystemShutdown);
CHECKPOINT1;
DPRINT1("Shutting down\n");
KiHaltProcessorDpcRoutine(NULL, NULL, NULL, NULL);
/* KiHaltProcessor does never return */

View file

@ -337,7 +337,6 @@ IopSaveBootLogToFile(VOID)
BufferSize);
if (KeyInfo == NULL)
{
CHECKPOINT1;
ExReleaseResourceLite(&IopBootLogResource);
return;
}
@ -354,7 +353,6 @@ IopSaveBootLogToFile(VOID)
&ObjectAttributes);
if (!NT_SUCCESS(Status))
{
CHECKPOINT1;
ExFreePool(KeyInfo);
ExReleaseResourceLite(&IopBootLogResource);
return;
@ -381,7 +379,6 @@ IopSaveBootLogToFile(VOID)
if (!NT_SUCCESS(Status))
{
CHECKPOINT1;
ZwClose(KeyHandle);
ExFreePool(KeyInfo);
ExReleaseResourceLite(&IopBootLogResource);
@ -391,7 +388,6 @@ IopSaveBootLogToFile(VOID)
Status = IopWriteLogFile((PWSTR)&KeyInfo->Data);
if (!NT_SUCCESS(Status))
{
CHECKPOINT1;
ZwClose(KeyHandle);
ExFreePool(KeyInfo);
ExReleaseResourceLite(&IopBootLogResource);

View file

@ -316,7 +316,6 @@ MiBalancerThread(PVOID Unused)
if (Status == STATUS_SUCCESS)
{
/* MiBalancerEvent */
CHECKPOINT;
while (MmStats.NrFreePages < MiMinimumAvailablePages + 5)
{
for (i = 0; i < MC_MAXIMUM; i++)
@ -333,7 +332,6 @@ MiBalancerThread(PVOID Unused)
}
}
InterlockedExchange(&MiBalancerWork, 0);
CHECKPOINT;
}
else if (Status == STATUS_SUCCESS + 1)
{
@ -387,7 +385,6 @@ MiInitBalancerThread(VOID)
;
#endif
CHECKPOINT;
KeInitializeEvent(&MiBalancerEvent, SynchronizationEvent, FALSE);
KeInitializeTimerEx(&MiBalancerTimer, SynchronizationTimer);

View file

@ -978,14 +978,12 @@ MmCreateMemoryArea(PMM_AVL_TABLE AddressSpace,
if (!MmGetAddressSpaceOwner(AddressSpace) && *BaseAddress < MmSystemRangeStart)
{
CHECKPOINT;
return STATUS_ACCESS_VIOLATION;
}
if (MmGetAddressSpaceOwner(AddressSpace) &&
(ULONG_PTR)(*BaseAddress) + tmpLength > (ULONG_PTR)MmSystemRangeStart)
{
CHECKPOINT;
return STATUS_ACCESS_VIOLATION;
}

View file

@ -2036,7 +2036,6 @@ MmProtectSectionView(PMM_AVL_TABLE AddressSpace,
if ((MemoryArea->Flags & SEC_NO_CHANGE) &&
Region->Protect != Protect)
{
CHECKPOINT1;
return STATUS_INVALID_PAGE_PROTECTION;
}
@ -3686,7 +3685,6 @@ NtMapViewOfSection(IN HANDLE SectionHandle,
*/
if (Protect & ~PAGE_FLAGS_VALID_FROM_USER_MODE)
{
CHECKPOINT1;
return STATUS_INVALID_PARAMETER_10;
}
@ -3700,7 +3698,6 @@ NtMapViewOfSection(IN HANDLE SectionHandle,
tmpProtect != PAGE_EXECUTE_READWRITE &&
tmpProtect != PAGE_EXECUTE_WRITECOPY)
{
CHECKPOINT1;
return STATUS_INVALID_PAGE_PROTECTION;
}
@ -4508,7 +4505,6 @@ MmMapViewOfSection(IN PVOID SectionObject,
Protect != PAGE_EXECUTE_READWRITE &&
Protect != PAGE_EXECUTE_WRITECOPY)
{
CHECKPOINT1;
return STATUS_INVALID_PAGE_PROTECTION;
}
@ -4605,21 +4601,18 @@ MmMapViewOfSection(IN PVOID SectionObject,
if ((Protect & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)) &&
!(Section->SectionPageProtection & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)))
{
CHECKPOINT1;
return STATUS_SECTION_PROTECTION;
}
/* check for read access */
if ((Protect & (PAGE_READONLY|PAGE_WRITECOPY|PAGE_EXECUTE_READ|PAGE_EXECUTE_WRITECOPY)) &&
!(Section->SectionPageProtection & (PAGE_READONLY|PAGE_READWRITE|PAGE_WRITECOPY|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY)))
{
CHECKPOINT1;
return STATUS_SECTION_PROTECTION;
}
/* check for execute access */
if ((Protect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY)) &&
!(Section->SectionPageProtection & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY)))
{
CHECKPOINT1;
return STATUS_SECTION_PROTECTION;
}
@ -4925,7 +4918,6 @@ MmCreateSection (OUT PVOID * Section,
Protection != PAGE_EXECUTE_READWRITE &&
Protection != PAGE_EXECUTE_WRITECOPY)
{
CHECKPOINT1;
return STATUS_INVALID_PAGE_PROTECTION;
}

View file

@ -574,7 +574,6 @@ CSR_API(CsrReadConsole)
CurrentEntry = RemoveHeadList(&Console->InputEvents);
if (IsListEmpty(&Console->InputEvents))
{
CHECKPOINT;
ResetEvent(Console->ActiveEvent);
}
Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry);

View file

@ -23,10 +23,8 @@ TuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
if (msg == WM_ACTIVATE)
{
CHECKPOINT1;
if (LOWORD(wParam) != WA_INACTIVE)
{
CHECKPOINT1;
SetFocus(hWnd);
ConioDrawConsole(ActiveConsole);
}

View file

@ -136,7 +136,6 @@ co_IntSendActivateMessages(HWND hWndPrev, HWND hWnd, BOOL MouseActivate)
/* FIXME: IntIsWindow */
CHECKPOINT;
co_IntPostOrSendMessage(hWnd, WM_NCACTIVATE, (WPARAM)(hWnd == UserGetForegroundWindow()), 0);
/* FIXME: WA_CLICKACTIVE */
co_IntPostOrSendMessage(hWnd, WM_ACTIVATE,
@ -251,7 +250,6 @@ co_IntSetForegroundAndFocusWindow(PWINDOW_OBJECT Window, PWINDOW_OBJECT FocusWin
/* FIXME: Send WM_ACTIVATEAPP to all thread windows. */
}
CHECKPOINT;
co_IntSendSetFocusMessages(hWndFocusPrev, hWndFocus);
co_IntSendActivateMessages(hWndPrev, hWnd, MouseActivate);