Rebase against 8ef224fa43869a8c977921d6bec08863382d6e11

2025-09-12 18:50:20 -07:00 · 2018-07-10 08:39:20 +10:00
parent 738fd3fd35
commit f61b8570b8
13 changed files with 56 additions and 724 deletions
--- a/patches/ntoskrnl-Stubs/0007-ntoskrnl.exe-Improve-KeInitializeTimerEx-stub.patch
+++ b/patches/ntoskrnl-Stubs/0007-ntoskrnl.exe-Improve-KeInitializeTimerEx-stub.patch
@@ -1,26 +0,0 @@
-From 9d314bb031e123beffa43f5b5f47ce6deda25cf4 Mon Sep 17 00:00:00 2001
-From: Alexander Morozov <amorozov@etersoft.ru>
-Date: Fri, 30 Jan 2015 00:33:55 +0100
-Subject: ntoskrnl.exe: Improve KeInitializeTimerEx stub.
-
---
- dlls/ntoskrnl.exe/ntoskrnl.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
-index 36331a1..c3a7e2a 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
-+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
-@@ -1387,6 +1387,9 @@ void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock )
- void WINAPI KeInitializeTimerEx( PKTIMER Timer, TIMER_TYPE Type )
- {
-     FIXME( "stub: %p %d\n", Timer, Type );
-+
-+    RtlZeroMemory(Timer, sizeof(KTIMER));
-+    Timer->Header.Type = Type ? 9 : 8;
- }
- 
- 
-- 
-2.2.2
-
--- a/patches/ntoskrnl-Stubs/0013-ntoskrnl.exe-Implement-NtBuildNumber.patch
+++ b/patches/ntoskrnl-Stubs/0013-ntoskrnl.exe-Implement-NtBuildNumber.patch
@@ -1,7 +1,7 @@
-From 6b77a809cc81c22fced7c970c1c43a5f5426184b Mon Sep 17 00:00:00 2001
+From 44e38cce5a02a0a5db60316270f33974f8d89400 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 6 Jun 2017 21:08:51 +0200
-Subject: ntoskrnl.exe: Implement NtBuildNumber.
+Subject: [PATCH] ntoskrnl.exe: Implement NtBuildNumber.

 ---
 dlls/ntoskrnl.exe/ntoskrnl.c        | 11 +++++++++--
@@ -10,7 +10,7 @@ Subject: ntoskrnl.exe: Implement NtBuildNumber.
 3 files changed, 40 insertions(+), 3 deletions(-)

 diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
-index ae699dc..21507dc 100644
+index 958bcdf..343033d 100644
 --- a/dlls/ntoskrnl.exe/ntoskrnl.c
 +++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -52,6 +52,7 @@ WINE_DECLARE_DEBUG_CHANNEL(plugplay);
@@ -53,7 +53,7 @@ index ae699dc..21507dc 100644
     case DLL_PROCESS_DETACH:
         if (reserved) break;
 diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
-index a572399..0fc9256 100644
+index 5df4ae3..00d09dd 100644
 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
 +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -743,7 +743,7 @@
@@ -66,7 +66,7 @@ index a572399..0fc9256 100644
 @ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr)
 @ stdcall NtCreateEvent(ptr long ptr long long)
 diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
-index 06b365f..71d2491 100644
+index cde78e5..f4bdb0b 100644
 --- a/dlls/ntoskrnl.exe/tests/driver.c
 +++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -143,6 +143,22 @@ static void winetest_end_todo(void)
@@ -92,8 +92,8 @@ index 06b365f..71d2491 100644
 static void test_currentprocess(void)
 {
     PEPROCESS current;
-@@ -172,6 +188,19 @@ todo_wine
-     IoFreeMdl(mdl);
+@@ -187,6 +203,19 @@ static void test_init_funcs(void)
+     ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState);
 }
 
 +static void test_version(void)
@@ -112,14 +112,14 @@ index 06b365f..71d2491 100644
 static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
 {
     ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
-@@ -197,6 +226,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
- 
+@@ -213,6 +242,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
     test_currentprocess();
     test_mdl_map();
+     test_init_funcs();
 +    test_version();
 
     /* print process report */
     if (test_input->winetest_debug)
 -- 
-2.7.4
+1.9.1

--- a/patches/ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-ExInitializeNPagedLookasideLi.patch
+++ b/patches/ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-ExInitializeNPagedLookasideLi.patch
@@ -1,7 +1,7 @@
-From e4a32c13ea03d6bfc08f78d93b517d612005a395 Mon Sep 17 00:00:00 2001
+From 95d5fbf3bf582fb219d2de40c829a5c18fb27726 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 6 Jun 2017 23:42:56 +0200
-Subject: ntoskrnl.exe: Implement ExInitializeNPagedLookasideList.
+Subject: [PATCH] ntoskrnl.exe: Implement ExInitializeNPagedLookasideList.

 ---
 dlls/ntoskrnl.exe/ntoskrnl.c     | 19 +++++++++-
@@ -11,7 +11,7 @@ Subject: ntoskrnl.exe: Implement ExInitializeNPagedLookasideList.
 4 files changed, 127 insertions(+), 7 deletions(-)

 diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
-index 21507dc..a865cd8 100644
+index 343033d..9fd7231 100644
 --- a/dlls/ntoskrnl.exe/ntoskrnl.c
 +++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -1814,7 +1814,24 @@ void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST Lookaside,
@@ -41,7 +41,7 @@ index 21507dc..a865cd8 100644
 
 /***********************************************************************
 diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
-index 5fe997a..1ef27fb 100644
+index f4bdb0b..f56e2dd 100644
 --- a/dlls/ntoskrnl.exe/tests/driver.c
 +++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -22,6 +22,9 @@
@@ -54,7 +54,7 @@ index 5fe997a..1ef27fb 100644
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
 #include "windef.h"
-@@ -201,6 +204,33 @@ static void test_version(void)
+@@ -216,6 +219,33 @@ static void test_version(void)
     return;
 }
 
@@ -88,15 +88,15 @@ index 5fe997a..1ef27fb 100644
 static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
 {
     ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
-@@ -227,6 +257,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
-     test_currentprocess();
+@@ -243,6 +273,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
     test_mdl_map();
+     test_init_funcs();
     test_version();
 +    test_lookaside_list();
 
     /* print process report */
     if (test_input->winetest_debug)
-@@ -261,7 +292,7 @@ static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *
+@@ -277,7 +308,7 @@ static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *
 
 static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp)
 {
@@ -105,7 +105,7 @@ index 5fe997a..1ef27fb 100644
     IoCompleteRequest(irp, IO_NO_INCREMENT);
     return STATUS_SUCCESS;
 }
-@@ -283,14 +314,14 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp)
+@@ -299,14 +330,14 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp)
             break;
     }
 
@@ -123,7 +123,7 @@ index 5fe997a..1ef27fb 100644
     return STATUS_SUCCESS;
 }
 diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
-index d6b808f..b43ec62 100644
+index 5abe18b..175c07d 100644
 --- a/include/ddk/wdm.h
 +++ b/include/ddk/wdm.h
@@ -144,20 +144,18 @@ typedef enum _KWAIT_REASON
@@ -244,7 +244,7 @@ index d6b808f..b43ec62 100644
 PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK);
 void      WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX);
 diff --git a/include/winnt.h b/include/winnt.h
-index b309929..d7694ab 100644
+index 45c3222..719cf84 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
@@ -755,6 +755,8 @@ typedef struct _MEMORY_BASIC_INFORMATION
@@ -257,5 +257,5 @@ index b309929..d7694ab 100644
 #ifdef __GNUC__
 # define CONTAINING_RECORD(address, type, field) ({     \
 -- 
-2.7.4
+1.9.1