Updated patch to emulate \Device\Null using /dev/null, use a proper device driver.

2025-09-12 18:50:20 -07:00 · 2015-05-16 00:34:09 +02:00
parent 26e06cc151
commit e2d58b98e4
14 changed files with 516 additions and 216 deletions
--- a/patches/null-Null_Device/0001-ntdll-tests-Add-tests-for-accessing-Device-Null.patch
+++ b/patches/null-Null_Device/0001-ntdll-tests-Add-tests-for-accessing-Device-Null.patch
@@ -0,0 +1,127 @@
+From 53fb7cd87e18767ddda8e4b901ec4f3a4570ae98 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Fri, 15 May 2015 19:57:42 +0200
+Subject: ntdll/tests: Add tests for accessing \\Device\\Null.
+
+---
+ dlls/ntdll/tests/om.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 99 insertions(+)
+
+diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
+index 96e1e6e..71b7ca8 100644
+--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
+@@ -1032,6 +1032,104 @@ static void test_keyed_events(void)
+     NtClose( event );
+ }
+ 
+static void test_null_device(void)
+{
+    OBJECT_ATTRIBUTES attr;
+    IO_STATUS_BLOCK iosb;
+    UNICODE_STRING str;
+    NTSTATUS status;
+    DWORD num_bytes;
+    OVERLAPPED ov;
+    char buf[64];
+    HANDLE null;
+    BOOL ret;
+
+    memset(buf, 0xAA, sizeof(buf));
+    memset(&ov, 0, sizeof(ov));
+    ov.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL);
+
+    pRtlCreateUnicodeStringFromAsciiz(&str, "\\Device\\Null");
+    InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL);
+    status = pNtOpenSymbolicLinkObject(&null, SYMBOLIC_LINK_QUERY, &attr);
+    todo_wine
+    ok(status == STATUS_OBJECT_TYPE_MISMATCH,
+       "expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status);
+
+    status = pNtOpenFile(&null, GENERIC_READ | GENERIC_WRITE, &attr, &iosb,
+                         FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN);
+    todo_wine
+    ok(status == STATUS_SUCCESS,
+       "expected STATUS_SUCCESS, got %08x\n", status);
+
+    SetLastError(0xdeadbeef);
+    ret = WriteFile(null, buf, sizeof(buf), &num_bytes, NULL);
+    ok(!ret, "WriteFile unexpectedly succeeded\n");
+    todo_wine
+    ok(GetLastError() == ERROR_INVALID_PARAMETER,
+       "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = ReadFile(null, buf, sizeof(buf), &num_bytes, NULL);
+    ok(!ret, "ReadFile unexpectedly succeeded\n");
+    todo_wine
+    ok(GetLastError() == ERROR_INVALID_PARAMETER,
+       "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError());
+
+    num_bytes = 0xdeadbeef;
+    SetLastError(0xdeadbeef);
+    ret = WriteFile(null, buf, sizeof(buf), &num_bytes, &ov);
+    if (ret || GetLastError() != ERROR_IO_PENDING)
+    {
+        todo_wine
+        ok(ret, "WriteFile failed with error %u\n", GetLastError());
+    }
+    else
+    {
+        num_bytes = 0xdeadbeef;
+        ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE);
+        ok(ret, "GetOverlappedResult failed with error %u\n", GetLastError());
+    }
+    todo_wine
+    ok(num_bytes == sizeof(buf), "expected num_bytes = %u, got %u\n",
+       (DWORD)sizeof(buf), num_bytes);
+
+    num_bytes = 0xdeadbeef;
+    SetLastError(0xdeadbeef);
+    ret = ReadFile(null, buf, sizeof(buf), &num_bytes, &ov);
+    if (ret || GetLastError() != ERROR_IO_PENDING)
+    {
+        ok(!ret, "ReadFile unexpectedly succeeded\n");
+    }
+    else
+    {
+        num_bytes = 0xdeadbeef;
+        ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE);
+        ok(!ret, "GetOverlappedResult unexpectedly succeeded\n");
+    }
+    todo_wine
+    ok(GetLastError() == ERROR_HANDLE_EOF,
+       "expected ERROR_HANDLE_EOF, got %u\n", GetLastError());
+
+    pNtClose(null);
+
+    null = CreateFileA("\\\\.\\Null", GENERIC_READ | GENERIC_WRITE,
+                       FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+                       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    ok(null == INVALID_HANDLE_VALUE, "CreateFileA unexpectedly succeeded\n");
+    ok(GetLastError() == ERROR_FILE_NOT_FOUND,
+       "expected ERROR_FILE_NOT_FOUND, got %u\n", GetLastError());
+
+    null = CreateFileA("\\\\.\\Device\\Null", GENERIC_READ | GENERIC_WRITE,
+                       FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+                       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    ok(null == INVALID_HANDLE_VALUE, "CreateFileA unexpectedly succeeded\n");
+    ok(GetLastError() == ERROR_PATH_NOT_FOUND,
+       "expected ERROR_PATH_NOT_FOUND, got %u\n", GetLastError());
+
+    pRtlFreeUnicodeString(&str);
+    CloseHandle(ov.hEvent);
+}
+
+ START_TEST(om)
+ {
+     HMODULE hntdll = GetModuleHandleA("ntdll.dll");
+@@ -1081,4 +1179,5 @@ START_TEST(om)
+     test_type_mismatch();
+     test_event();
+     test_keyed_events();
+    test_null_device();
+ }
+-- 
+2.4.0
+
--- a/patches/null-Null_Device/0002-null.sys-Added-stub-dll.patch
+++ b/patches/null-Null_Device/0002-null.sys-Added-stub-dll.patch
@@ -0,0 +1,109 @@
+From 0a3f771a48590503f8e8b951939e905bde132744 Mon Sep 17 00:00:00 2001
+From: Qian Hong <qhong@codeweavers.com>
+Date: Thu, 12 Mar 2015 06:43:03 +0800
+Subject: null.sys: Added stub dll.
+
+Changes by Sebastian Lackner <sebastian@fds-team.de>:
+ * Install driver to system32/drivers directory.
+---
+ configure.ac                |  1 +
+ dlls/null.sys/Makefile.in   |  5 +++++
+ dlls/null.sys/main.c        | 38 ++++++++++++++++++++++++++++++++++++++
+ dlls/null.sys/null.sys.spec |  1 +
+ loader/wine.inf.in          |  2 ++
+ 5 files changed, 47 insertions(+)
+ create mode 100644 dlls/null.sys/Makefile.in
+ create mode 100644 dlls/null.sys/main.c
+ create mode 100644 dlls/null.sys/null.sys.spec
+
+diff --git a/configure.ac b/configure.ac
+index a9a7bcf..32b2e16 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -3157,4 +3157,5 @@ WINE_CONFIG_DLL(ntoskrnl.exe,,[implib])
+ WINE_CONFIG_DLL(ntprint)
+ WINE_CONFIG_TEST(dlls/ntprint/tests)
+WINE_CONFIG_DLL(null.sys)
+ WINE_CONFIG_DLL(objsel,,[clean])
+ WINE_CONFIG_DLL(odbc32,,[implib])
+diff --git a/dlls/null.sys/Makefile.in b/dlls/null.sys/Makefile.in
+new file mode 100644
+index 0000000..4ea3b55
+--- /dev/null
+++ b/dlls/null.sys/Makefile.in
+@@ -0,0 +1,5 @@
+MODULE    = null.sys
+EXTRADLLFLAGS = -Wb,--subsystem,native
+
+C_SRCS = \
+	main.c
+diff --git a/dlls/null.sys/main.c b/dlls/null.sys/main.c
+new file mode 100644
+index 0000000..141c218
+--- /dev/null
+++ b/dlls/null.sys/main.c
+@@ -0,0 +1,38 @@
+/*
+ * null.sys
+ *
+ * Copyright 2015 Qian Hong for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "windef.h"
+#include "winbase.h"
+#include "winternl.h"
+#include "ddk/wdm.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(null);
+
+NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path)
+{
+    TRACE("(%p, %s)\n", driver, debugstr_w(path->Buffer));
+
+    return STATUS_SUCCESS;
+}
+diff --git a/dlls/null.sys/null.sys.spec b/dlls/null.sys/null.sys.spec
+new file mode 100644
+index 0000000..76421d7
+--- /dev/null
+++ b/dlls/null.sys/null.sys.spec
+@@ -0,0 +1 @@
+# nothing to export
+diff --git a/loader/wine.inf.in b/loader/wine.inf.in
+index fcd2e49..8a6c767 100644
+--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
+@@ -2498,4 +2498,5 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+ 12,,mountmgr.sys,-
+ 12,,ndis.sys,-
+12,,null.sys,-
+ ; skip .NET fake dlls in Wine Mono package
+ 11,,aspnet_regiis.exe,-
+@@ -2536,4 +2537,5 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+ 12,,mountmgr.sys
+ 12,,ndis.sys
+12,,null.sys
+ ; skip .NET fake dlls in Wine Mono package
+ 11,,aspnet_regiis.exe,-
+-- 
+2.4.0
+
--- a/patches/null-Null_Device/0003-null.sys-Implement-device-ioctl-read-write-functions.patch
+++ b/patches/null-Null_Device/0003-null.sys-Implement-device-ioctl-read-write-functions.patch
@@ -0,0 +1,209 @@
+From e2577e4c0c0637e22da03eeee33331495eb6d177 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Fri, 15 May 2015 22:23:52 +0200
+Subject: null.sys: Implement device ioctl/read/write functions.
+
+Based on a patch by Qian Hong.
+---
+ dlls/ntdll/tests/om.c     |  7 ++----
+ dlls/null.sys/Makefile.in |  1 +
+ dlls/null.sys/main.c      | 63 +++++++++++++++++++++++++++++++++++++++++++++++
+ loader/wine.inf.in        | 11 +++++++++
+ 4 files changed, 77 insertions(+), 5 deletions(-)
+
+diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
+index 71b7ca8..f92069c 100644
+--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
+@@ -1051,18 +1051,17 @@ static void test_null_device(void)
+     pRtlCreateUnicodeStringFromAsciiz(&str, "\\Device\\Null");
+     InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL);
+     status = pNtOpenSymbolicLinkObject(&null, SYMBOLIC_LINK_QUERY, &attr);
+-    todo_wine
+     ok(status == STATUS_OBJECT_TYPE_MISMATCH,
+        "expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status);
+ 
+     status = pNtOpenFile(&null, GENERIC_READ | GENERIC_WRITE, &attr, &iosb,
+                          FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN);
+-    todo_wine
+     ok(status == STATUS_SUCCESS,
+        "expected STATUS_SUCCESS, got %08x\n", status);
+ 
+     SetLastError(0xdeadbeef);
+     ret = WriteFile(null, buf, sizeof(buf), &num_bytes, NULL);
+    todo_wine
+     ok(!ret, "WriteFile unexpectedly succeeded\n");
+     todo_wine
+     ok(GetLastError() == ERROR_INVALID_PARAMETER,
+@@ -1070,6 +1069,7 @@ static void test_null_device(void)
+ 
+     SetLastError(0xdeadbeef);
+     ret = ReadFile(null, buf, sizeof(buf), &num_bytes, NULL);
+    todo_wine
+     ok(!ret, "ReadFile unexpectedly succeeded\n");
+     todo_wine
+     ok(GetLastError() == ERROR_INVALID_PARAMETER,
+@@ -1080,7 +1080,6 @@ static void test_null_device(void)
+     ret = WriteFile(null, buf, sizeof(buf), &num_bytes, &ov);
+     if (ret || GetLastError() != ERROR_IO_PENDING)
+     {
+-        todo_wine
+         ok(ret, "WriteFile failed with error %u\n", GetLastError());
+     }
+     else
+@@ -1089,7 +1088,6 @@ static void test_null_device(void)
+         ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE);
+         ok(ret, "GetOverlappedResult failed with error %u\n", GetLastError());
+     }
+-    todo_wine
+     ok(num_bytes == sizeof(buf), "expected num_bytes = %u, got %u\n",
+        (DWORD)sizeof(buf), num_bytes);
+ 
+@@ -1106,7 +1104,6 @@ static void test_null_device(void)
+         ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE);
+         ok(!ret, "GetOverlappedResult unexpectedly succeeded\n");
+     }
+-    todo_wine
+     ok(GetLastError() == ERROR_HANDLE_EOF,
+        "expected ERROR_HANDLE_EOF, got %u\n", GetLastError());
+ 
+diff --git a/dlls/null.sys/Makefile.in b/dlls/null.sys/Makefile.in
+index 4ea3b55..95c249d 100644
+--- a/dlls/null.sys/Makefile.in
+++ b/dlls/null.sys/Makefile.in
+@@ -1,4 +1,5 @@
+ MODULE    = null.sys
+IMPORTS   = ntoskrnl.exe
+ EXTRADLLFLAGS = -Wb,--subsystem,native
+ 
+ C_SRCS = \
+diff --git a/dlls/null.sys/main.c b/dlls/null.sys/main.c
+index 141c218..ecbb7cf 100644
+--- a/dlls/null.sys/main.c
+++ b/dlls/null.sys/main.c
+@@ -20,6 +20,7 @@
+ 
+ #include <stdarg.h>
+ 
+#define NONAMELESSUNION
+ #include "ntstatus.h"
+ #define WIN32_NO_STATUS
+ #include "windef.h"
+@@ -30,9 +31,71 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(null);
+ 
+static NTSTATUS WINAPI null_ioctl( DEVICE_OBJECT *device, IRP *irp )
+{
+    IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp );
+    ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode;
+
+    FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n",
+        code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3);
+    irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED;
+
+    IoCompleteRequest( irp, IO_NO_INCREMENT );
+    return STATUS_SUCCESS;
+}
+
+static NTSTATUS WINAPI null_read( DEVICE_OBJECT *device, IRP *irp )
+{
+    IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp );
+
+    TRACE( "length %u key %u byteoffset %u\n",
+           irpsp->Parameters.Read.Length,
+           irpsp->Parameters.Read.Key,
+           irpsp->Parameters.Read.ByteOffset.u.LowPart);
+
+    irp->IoStatus.u.Status = STATUS_END_OF_FILE;
+
+    IoCompleteRequest( irp, IO_NO_INCREMENT );
+    return STATUS_END_OF_FILE;
+}
+
+static NTSTATUS WINAPI null_write( DEVICE_OBJECT *device, IRP *irp )
+{
+    IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp );
+
+    TRACE( "length %u key %u byteoffset %u\n",
+           irpsp->Parameters.Read.Length,
+           irpsp->Parameters.Read.Key,
+           irpsp->Parameters.Read.ByteOffset.u.LowPart);
+
+    irp->IoStatus.Information = irpsp->Parameters.Read.Length;
+    irp->IoStatus.u.Status = STATUS_SUCCESS;
+
+    IoCompleteRequest( irp, IO_NO_INCREMENT );
+    return STATUS_SUCCESS;
+}
+
+ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path)
+ {
+    static const WCHAR device_nullW[] = {'\\','D','e','v','i','c','e','\\','N','u','l','l',0};
+    UNICODE_STRING nameW;
+    DEVICE_OBJECT *device;
+    NTSTATUS status;
+
+     TRACE("(%p, %s)\n", driver, debugstr_w(path->Buffer));
+ 
+    driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = null_ioctl;
+    driver->MajorFunction[IRP_MJ_READ]           = null_read;
+    driver->MajorFunction[IRP_MJ_WRITE]          = null_write;
+
+    RtlInitUnicodeString( &nameW, device_nullW );
+
+    status = IoCreateDevice( driver, 0, &nameW, 0, 0, FALSE, &device );
+    if (status)
+    {
+        FIXME( "failed to create device error %x\n", status );
+        return status;
+    }
+
+     return STATUS_SUCCESS;
+ }
+diff --git a/loader/wine.inf.in b/loader/wine.inf.in
+index 8a6c767..057d047 100644
+--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
+@@ -121,6 +121,7 @@ AddReg=\
+ AddService=BITS,0,BITSService
+ AddService=MSIServer,0,MSIService
+ AddService=MountMgr,0x800,MountMgrService
+AddService=Null,0x800,NullService
+ AddService=Spooler,0,SpoolerService
+ AddService=StiSvc,0,StiService
+ AddService=TermService,0,TerminalServices
+@@ -134,6 +135,7 @@ AddService=Schedule,0,TaskSchedulerService
+ AddService=BITS,0,BITSService
+ AddService=MSIServer,0,MSIService
+ AddService=MountMgr,0x800,MountMgrService
+AddService=Null,0x800,NullService
+ AddService=Spooler,0,SpoolerService
+ AddService=StiSvc,0,StiService
+ AddService=TermService,0,TerminalServices
+@@ -147,6 +149,7 @@ AddService=Schedule,0,TaskSchedulerService
+ AddService=BITS,0,BITSService
+ AddService=MSIServer,0,MSIService
+ AddService=MountMgr,0x800,MountMgrService
+AddService=Null,0x800,NullService
+ AddService=Spooler,0,SpoolerService
+ AddService=StiSvc,0,StiService
+ AddService=TermService,0,TerminalServices
+@@ -3128,6 +3131,14 @@ ServiceType=1
+ StartType=2
+ ErrorControl=1
+ 
+[NullService]
+Description="Null service"
+DisplayName="Null"
+ServiceBinary="%12%\null.sys"
+ServiceType=1
+StartType=2
+ErrorControl=1
+
+ [SpoolerService]
+ Description="Loads files to memory for later printing"
+ DisplayName="Print Spooler"
+-- 
+2.4.0
+
--- a/patches/null-Null_Device/definition
+++ b/patches/null-Null_Device/definition
@@ -0,0 +1 @@
+Fixes: [38107] Implement null.sys to provide \Device\Null
				`@@ -0,0 +1 @@`
				`Fixes: [38107] Implement null.sys to provide \Device\Null`