From 28cf8cbce0583d65062a08e25aabedd34600e473 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sun, 18 Jan 2026 15:58:51 +0200
Subject: [PATCH] [NTDLL_APITEST] Improve/fix NtReadFile/NtWriteFile test

- Handle Vista+ and 64 bit
- Add 4 more tests
---
 modules/rostests/apitests/ntdll/NtReadFile.c  | 39 +++++++++++++++++--
 modules/rostests/apitests/ntdll/NtWriteFile.c | 37 +++++++++++++++++-
 2 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/modules/rostests/apitests/ntdll/NtReadFile.c b/modules/rostests/apitests/ntdll/NtReadFile.c
index 6ec6b23b80a..3c7dc29a44a 100644
--- a/modules/rostests/apitests/ntdll/NtReadFile.c
+++ b/modules/rostests/apitests/ntdll/NtReadFile.c
@@ -31,6 +31,12 @@ Is64BitSystem(VOID)
 #endif
 }
 
+#ifdef _WIN64
+#define IsWow64() FALSE
+#else
+#define IsWow64() Is64BitSystem()
+#endif
+
 static
 ULONG
 SizeOfMdl(VOID)
@@ -128,7 +134,7 @@ START_TEST(NtReadFile)
     ok_hex(Status, STATUS_SUCCESS);
 
     /* non-cached, too large -- fails to allocate MDL
-     * Note: this returns STATUS_SUCCESS on Win7 -- higher MDL size limit */
+     * Note: this returns STATUS_SUCCESS on Vista+ -- higher MDL size limit */
     Status = NtReadFile(FileHandle,
                         NULL,
                         NULL,
@@ -138,7 +144,34 @@ START_TEST(NtReadFile)
                         LargeMdlMaxDataSize + PAGE_SIZE,
                         &ByteOffset,
                         NULL);
-    ok_hex(Status, STATUS_INSUFFICIENT_RESOURCES);
+    if (GetNTVersion() >= _WIN32_WINNT_VISTA)
+        ok_hex(Status, STATUS_SUCCESS);
+    else
+        ok_hex(Status, STATUS_INSUFFICIENT_RESOURCES);
+
+    /* Invalid buffer address */
+    Status = NtReadFile(FileHandle,
+                        NULL,
+                        NULL,
+                        NULL,
+                        &IoStatus,
+                        LongToPtr(-1),
+                        PAGE_SIZE,
+                        &ByteOffset,
+                        NULL);
+    ok_hex(Status, STATUS_ACCESS_VIOLATION);
+
+    /* Buffer probing fails */
+    Status = NtReadFile(FileHandle,
+                        NULL,
+                        NULL,
+                        NULL,
+                        &IoStatus,
+                        Buffer,
+                        2 * LargeMdlMaxDataSize,
+                        &ByteOffset,
+                        NULL);
+    ok_hex(Status, STATUS_ACCESS_VIOLATION); // Different to NtWriteFile
 
     /* non-cached, unaligned -- fails with invalid parameter */
     Status = NtReadFile(FileHandle,
@@ -150,7 +183,7 @@ START_TEST(NtReadFile)
                         LargeMdlMaxDataSize + 1,
                         &ByteOffset,
                         NULL);
-    ok_hex(Status, STATUS_INVALID_PARAMETER);
+    ok_hex(Status, STATUS_INVALID_PARAMETER); // Different to NtWriteFile
 
     DispositionInfo.DeleteFile = TRUE;
     Status = NtSetInformationFile(FileHandle,
diff --git a/modules/rostests/apitests/ntdll/NtWriteFile.c b/modules/rostests/apitests/ntdll/NtWriteFile.c
index 7080fa84ec3..9a0a14968d5 100644
--- a/modules/rostests/apitests/ntdll/NtWriteFile.c
+++ b/modules/rostests/apitests/ntdll/NtWriteFile.c
@@ -31,6 +31,12 @@ Is64BitSystem(VOID)
 #endif
 }
 
+#ifdef _WIN64
+#define IsWow64() FALSE
+#else
+#define IsWow64() Is64BitSystem()
+#endif
+
 static
 ULONG
 SizeOfMdl(VOID)
@@ -133,7 +139,7 @@ START_TEST(NtWriteFile)
     ok_hex(Status, STATUS_SUCCESS);
 
     /* non-cached, too large -- fails to allocate MDL
-     * Note: this returns STATUS_SUCCESS on Win7 -- higher MDL size limit */
+     * Note: this returns STATUS_SUCCESS on Vista+ -- higher MDL size limit */
     Status = NtWriteFile(FileHandle,
                          NULL,
                          NULL,
@@ -143,7 +149,34 @@ START_TEST(NtWriteFile)
                          LargeMdlMaxDataSize + PAGE_SIZE,
                          &ByteOffset,
                          NULL);
-    ok_hex(Status, STATUS_INSUFFICIENT_RESOURCES);
+    if (GetNTVersion() >= _WIN32_WINNT_VISTA)
+        ok_hex(Status, STATUS_SUCCESS);
+    else
+        ok_hex(Status, STATUS_INSUFFICIENT_RESOURCES);
+
+    /* Invalid buffer address */
+    Status = NtWriteFile(FileHandle,
+                         NULL,
+                         NULL,
+                         NULL,
+                         &IoStatus,
+                         LongToPtr(-1),
+                         PAGE_SIZE,
+                         &ByteOffset,
+                         NULL);
+    ok_hex(Status, IsWow64() ? STATUS_INVALID_PARAMETER : STATUS_ACCESS_VIOLATION); // Different to NtReadFile
+
+    /* Buffer probing fails */
+    Status = NtWriteFile(FileHandle,
+                         NULL,
+                         NULL,
+                         NULL,
+                         &IoStatus,
+                         Buffer,
+                         2 * LargeMdlMaxDataSize,
+                         &ByteOffset,
+                         NULL);
+    ok_hex(Status, Is64BitSystem() ? STATUS_INVALID_USER_BUFFER: STATUS_INSUFFICIENT_RESOURCES); // Different to NtReadFile
 
     /* non-cached, unaligned -- fails with invalid parameter */
     Status = NtWriteFile(FileHandle,