From 11baa0d7237df3131b05d406473c46bb59f83fb2 Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Wed, 25 Oct 2017 13:57:27 +0200 Subject: [PATCH] [NTOSKRNL][ROSSYM] ZwReadFile() calls: Use explicit NULL instead of ambiguous 0. CORE-13910 --- ntoskrnl/config/cmwraprs.c | 4 ++-- ntoskrnl/kdbg/kdb_cli.c | 2 +- sdk/lib/rossym/zwfile.c | 4 ++-- sdk/lib/rossym_new/zwfile.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/config/cmwraprs.c b/ntoskrnl/config/cmwraprs.c index a3948b94771..fa864a8fb52 100644 --- a/ntoskrnl/config/cmwraprs.c +++ b/ntoskrnl/config/cmwraprs.c @@ -83,8 +83,8 @@ CmpFileRead(IN PHHIVE RegistryHive, NTSTATUS Status; _FileOffset.QuadPart = *FileOffset; - Status = ZwReadFile(HiveHandle, 0, 0, 0, &IoStatusBlock, - Buffer, (ULONG)BufferLength, &_FileOffset, 0); + Status = ZwReadFile(HiveHandle, NULL, NULL, NULL, &IoStatusBlock, + Buffer, (ULONG)BufferLength, &_FileOffset, NULL); return NT_SUCCESS(Status) ? TRUE : FALSE; } diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 168dca04cd8..d5e7fde4d20 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3622,7 +3622,7 @@ KdbpCliInit(VOID) } /* Load file into memory */ - Status = ZwReadFile(hFile, 0, 0, 0, &Iosb, FileBuffer, FileSize, 0, 0); + Status = ZwReadFile(hFile, NULL, NULL, NULL, &Iosb, FileBuffer, FileSize, NULL, NULL); ZwClose(hFile); if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) diff --git a/sdk/lib/rossym/zwfile.c b/sdk/lib/rossym/zwfile.c index f4d7e6bb3e9..7711014392e 100644 --- a/sdk/lib/rossym/zwfile.c +++ b/sdk/lib/rossym/zwfile.c @@ -19,11 +19,11 @@ RosSymZwReadFile(PVOID FileContext, PVOID Buffer, ULONG Size) IO_STATUS_BLOCK IoStatusBlock; Status = ZwReadFile(*((HANDLE *) FileContext), - 0, 0, 0, + NULL, NULL, NULL, &IoStatusBlock, Buffer, Size, - 0, 0); + NULL, NULL); return NT_SUCCESS(Status) && IoStatusBlock.Information == Size; } diff --git a/sdk/lib/rossym_new/zwfile.c b/sdk/lib/rossym_new/zwfile.c index 99556e4e8cd..631979c681c 100644 --- a/sdk/lib/rossym_new/zwfile.c +++ b/sdk/lib/rossym_new/zwfile.c @@ -18,11 +18,11 @@ RosSymZwReadFile(PVOID FileContext, PVOID Buffer, ULONG Size) IO_STATUS_BLOCK IoStatusBlock; RosSymStatus = ZwReadFile(*((HANDLE *) FileContext), - 0, 0, 0, + NULL, NULL, NULL, &IoStatusBlock, Buffer, Size, - 0, 0); + NULL, NULL); return NT_SUCCESS(RosSymStatus) && IoStatusBlock.Information == Size; }