From bcaa33e33b3edb88d035bae74345696377d59500 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <reactos-git_serge_171003@gautherie.fr>
Date: Wed, 1 Nov 2017 13:20:14 +0100
Subject: [PATCH] [USETUP][ROSAPPS][EXT2LIB] NtReadFile() calls: Remove unused
 'ByteOffset = 0', Use explicit NULL instead of ambiguous 0, Remove casts to
 same type. CORE-13910

---
 base/setup/usetup/bootsup.c                                 | 1 -
 base/setup/usetup/native/utils/console.c                    | 4 ++--
 .../rosapps/applications/sysutils/utils/pice/module/utils.c | 4 ++--
 sdk/lib/fslib/ext2lib/Disk.c                                | 6 +++---
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/base/setup/usetup/bootsup.c b/base/setup/usetup/bootsup.c
index 7b4629bb5ad..9c05e3e7eba 100644
--- a/base/setup/usetup/bootsup.c
+++ b/base/setup/usetup/bootsup.c
@@ -1001,7 +1001,6 @@ InstallFat32BootCodeToFile(
         return Status;
     }
 
-    FileOffset.QuadPart = 0ULL;
     Status = NtReadFile(FileHandle,
                         NULL,
                         NULL,
diff --git a/base/setup/usetup/native/utils/console.c b/base/setup/usetup/native/utils/console.c
index aa2a5661dad..2ab380a0bcb 100644
--- a/base/setup/usetup/native/utils/console.c
+++ b/base/setup/usetup/native/utils/console.c
@@ -170,7 +170,7 @@ FlushConsoleInputBuffer(
                             &InputData,
                             sizeof(KEYBOARD_INPUT_DATA),
                             &Offset,
-                            0);
+                            NULL);
         if (Status == STATUS_PENDING)
         {
             Timeout.QuadPart = -100;
@@ -208,7 +208,7 @@ ReadConsoleInput(
                         &InputData,
                         sizeof(KEYBOARD_INPUT_DATA),
                         &Offset,
-                        0);
+                        NULL);
     if (Status == STATUS_PENDING)
     {
         Status = NtWaitForSingleObject(hConsoleInput, FALSE, NULL);
diff --git a/modules/rosapps/applications/sysutils/utils/pice/module/utils.c b/modules/rosapps/applications/sysutils/utils/pice/module/utils.c
index 64977a0fa51..c87e3122562 100644
--- a/modules/rosapps/applications/sysutils/utils/pice/module/utils.c
+++ b/modules/rosapps/applications/sysutils/utils/pice/module/utils.c
@@ -2233,9 +2233,9 @@ long PICE_read(HANDLE hFile, LPVOID lpBuffer, long lBytes)
 	ASSERT( lpBuffer );
 
 	if (!NT_SUCCESS(NtReadFile(
-		(HANDLE) hFile,
+		hFile,
 		NULL, NULL, NULL, &iosb,
-		(LPVOID) lpBuffer,
+		lpBuffer,
 		(DWORD) lBytes,
 		NULL,
 		NULL
diff --git a/sdk/lib/fslib/ext2lib/Disk.c b/sdk/lib/fslib/ext2lib/Disk.c
index 0180304fe39..84293219afe 100644
--- a/sdk/lib/fslib/ext2lib/Disk.c
+++ b/sdk/lib/fslib/ext2lib/Disk.c
@@ -982,7 +982,7 @@ Ext2ReadDisk( PEXT2_FILESYS  Ext2Sys,
         Address.QuadPart = Offset;
 
         Status = NtReadFile(  Ext2Sys->MediaHandle,
-                              0,
+                              NULL,
                               NULL,
                               NULL,
                               &IoStatus,
@@ -1009,7 +1009,7 @@ Ext2ReadDisk( PEXT2_FILESYS  Ext2Sys,
         }
 
         Status = NtReadFile( Ext2Sys->MediaHandle,
-                             0,
+                             NULL,
                              NULL,
                              NULL,
                              &IoStatus,
@@ -1106,7 +1106,7 @@ Ext2WriteDisk( PEXT2_FILESYS  Ext2Sys,
         if ((AlignedLength != Length) || (Address.QuadPart != (LONGLONG)Offset))
         {
             Status = NtReadFile( Ext2Sys->MediaHandle,
-                                 0,
+                                 NULL,
                                  NULL,
                                  NULL,
                                  &IoStatus,
-- 
2.17.1