You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Added patches to implement NtBuildNumber and ExInitializeNPagedLookasideList.
This commit is contained in:
Sebastian Lackner
@@ -0,0 +1,69 @@
|
||||
From 16d5776424063d794c42609a06d3a010d191dee3 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.
|
||||
|
||||
---
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++--
|
||||
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +-
|
||||
2 files changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
index 9332c3ef2a6..0a5c22fc8c0 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
@@ -52,6 +52,7 @@ WINE_DECLARE_DEBUG_CHANNEL(plugplay);
|
||||
|
||||
BOOLEAN KdDebuggerEnabled = FALSE;
|
||||
ULONG InitSafeBootMode = 0;
|
||||
+USHORT NtBuildNumber = 0;
|
||||
|
||||
extern LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs );
|
||||
|
||||
@@ -2657,6 +2658,13 @@ NTSTATUS WINAPI IoAcquireRemoveLockEx(PIO_REMOVE_LOCK lock, PVOID tag,
|
||||
return STATUS_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
+static void ntoskrnl_init(void)
|
||||
+{
|
||||
+ LARGE_INTEGER count;
|
||||
+
|
||||
+ KeQueryTickCount( &count ); /* initialize the global KeTickCount */
|
||||
+ NtBuildNumber = NtCurrentTeb()->Peb->OSBuildNumber;
|
||||
+}
|
||||
|
||||
/*****************************************************
|
||||
* DllMain
|
||||
@@ -2664,7 +2672,6 @@ NTSTATUS WINAPI IoAcquireRemoveLockEx(PIO_REMOVE_LOCK lock, PVOID tag,
|
||||
BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
|
||||
{
|
||||
static void *handler;
|
||||
- LARGE_INTEGER count;
|
||||
|
||||
switch(reason)
|
||||
{
|
||||
@@ -2673,7 +2680,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
|
||||
#if defined(__i386__) || defined(__x86_64__)
|
||||
handler = RtlAddVectoredExceptionHandler( TRUE, vectored_handler );
|
||||
#endif
|
||||
- KeQueryTickCount( &count ); /* initialize the global KeTickCount */
|
||||
+ ntoskrnl_init();
|
||||
break;
|
||||
case DLL_PROCESS_DETACH:
|
||||
if (reserved) break;
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index aaa0d879219..1c862255dee 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -740,7 +740,7 @@
|
||||
@ stdcall NtAllocateLocallyUniqueId(ptr) ntdll.NtAllocateLocallyUniqueId
|
||||
@ stdcall NtAllocateUuids(ptr ptr ptr ptr) ntdll.NtAllocateUuids
|
||||
@ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) ntdll.NtAllocateVirtualMemory
|
||||
-@ stub NtBuildNumber
|
||||
+@ extern NtBuildNumber
|
||||
@ stdcall NtClose(long) ntdll.NtClose
|
||||
@ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) ntdll.NtConnectPort
|
||||
@ stdcall NtCreateEvent(ptr long ptr long long) ntdll.NtCreateEvent
|
||||
--
|
||||
2.13.1
|
||||
|
||||
@@ -0,0 +1,178 @@
|
||||
From 57f2a16836c81b58f09e68c5bcbb2f491bb428fe 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.
|
||||
|
||||
---
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 19 ++++++++++-
|
||||
include/ddk/wdm.h | 76 ++++++++++++++++++++++++++++++++++++++++++--
|
||||
include/winnt.h | 2 ++
|
||||
3 files changed, 93 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
index 0a5c22fc8c0..30324fdebd0 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
@@ -1801,7 +1801,24 @@ void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST Lookaside,
|
||||
ULONG Tag,
|
||||
USHORT Depth)
|
||||
{
|
||||
- FIXME( "stub: %p, %p, %p, %u, %lu, %u, %u\n", Lookaside, Allocate, Free, Flags, Size, Tag, Depth );
|
||||
+ TRACE( "%p, %p, %p, %u, %lu, %u, %u\n", Lookaside, Allocate, Free, Flags, Size, Tag, Depth );
|
||||
+
|
||||
+ RtlInitializeSListHead( &Lookaside->L.u.ListHead );
|
||||
+ Lookaside->L.Depth = 4;
|
||||
+ Lookaside->L.MaximumDepth = 256;
|
||||
+ Lookaside->L.TotalAllocates = 0;
|
||||
+ Lookaside->L.u2.AllocateMisses = 0;
|
||||
+ Lookaside->L.TotalFrees = 0;
|
||||
+ Lookaside->L.u3.FreeMisses = 0;
|
||||
+ Lookaside->L.Type = NonPagedPool | Flags;
|
||||
+ Lookaside->L.Tag = Tag;
|
||||
+ Lookaside->L.Size = Size;
|
||||
+ Lookaside->L.u4.Allocate = Allocate ? Allocate : ExAllocatePoolWithTag;
|
||||
+ Lookaside->L.u5.Free = Free ? Free : ExFreePool;
|
||||
+ Lookaside->L.LastTotalAllocates = 0;
|
||||
+ Lookaside->L.u6.LastAllocateMisses = 0;
|
||||
+
|
||||
+ /* FIXME: insert in global list of lookadside lists */
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
|
||||
index b75ef9d56df..8f5b9094472 100644
|
||||
--- a/include/ddk/wdm.h
|
||||
+++ b/include/ddk/wdm.h
|
||||
@@ -143,20 +143,18 @@ typedef enum _KWAIT_REASON
|
||||
MaximumWaitReason,
|
||||
} KWAIT_REASON;
|
||||
|
||||
-typedef struct _ALLOCATE_FUNCTION *PALLOCATE_FUNCTION;
|
||||
typedef struct _IO_TIMER *PIO_TIMER;
|
||||
typedef struct _IO_TIMER_ROUTINE *PIO_TIMER_ROUTINE;
|
||||
typedef struct _ETHREAD *PETHREAD;
|
||||
-typedef struct _FREE_FUNCTION *PFREE_FUNCTION;
|
||||
typedef struct _KTHREAD *PKTHREAD, *PRKTHREAD;
|
||||
typedef struct _EPROCESS *PEPROCESS;
|
||||
typedef struct _ERESOURCE *PERESOURCE;
|
||||
typedef struct _IO_WORKITEM *PIO_WORKITEM;
|
||||
-typedef struct _NPAGED_LOOKASIDE_LIST *PNPAGED_LOOKASIDE_LIST;
|
||||
typedef struct _PAGED_LOOKASIDE_LIST *PPAGED_LOOKASIDE_LIST;
|
||||
typedef struct _OBJECT_TYPE *POBJECT_TYPE;
|
||||
typedef struct _OBJECT_HANDLE_INFORMATION *POBJECT_HANDLE_INFORMATION;
|
||||
typedef struct _ZONE_HEADER *PZONE_HEADER;
|
||||
+typedef struct _LOOKASIDE_LIST_EX *PLOOKASIDE_LIST_EX;
|
||||
|
||||
typedef struct _FAST_MUTEX
|
||||
{
|
||||
@@ -181,6 +179,11 @@ typedef struct _VPB {
|
||||
WCHAR VolumeLabel[MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)];
|
||||
} VPB, *PVPB;
|
||||
|
||||
+#define POOL_QUOTA_FAIL_INSTEAD_OF_RAISE 0x8
|
||||
+#define POOL_RAISE_IF_ALLOCATION_FAILURE 0x10
|
||||
+#define POOL_COLD_ALLOCATION 0x100
|
||||
+#define POOL_NX_ALLOCATION 0x200
|
||||
+
|
||||
typedef enum _POOL_TYPE {
|
||||
NonPagedPool,
|
||||
PagedPool,
|
||||
@@ -1220,6 +1223,71 @@ typedef struct _KLOCK_QUEUE_HANDLE {
|
||||
KIRQL OldIrql;
|
||||
} KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE;
|
||||
|
||||
+typedef void * (NTAPI *PALLOCATE_FUNCTION)(POOL_TYPE, SIZE_T, ULONG);
|
||||
+typedef void * (NTAPI *PALLOCATE_FUNCTION_EX)(POOL_TYPE, SIZE_T, ULONG, PLOOKASIDE_LIST_EX);
|
||||
+typedef void (NTAPI *PFREE_FUNCTION)(void *);
|
||||
+typedef void (NTAPI *PFREE_FUNCTION_EX)(void *, PLOOKASIDE_LIST_EX);
|
||||
+
|
||||
+#ifdef _WIN64
|
||||
+#define LOOKASIDE_ALIGN DECLSPEC_CACHEALIGN
|
||||
+#else
|
||||
+#define LOOKASIDE_ALIGN
|
||||
+#endif
|
||||
+
|
||||
+#define LOOKASIDE_MINIMUM_BLOCK_SIZE (RTL_SIZEOF_THROUGH_FIELD(SLIST_ENTRY, Next))
|
||||
+
|
||||
+typedef struct LOOKASIDE_ALIGN _GENERAL_LOOKASIDE
|
||||
+{
|
||||
+ union
|
||||
+ {
|
||||
+ SLIST_HEADER ListHead;
|
||||
+ SINGLE_LIST_ENTRY SingleListHead;
|
||||
+ } DUMMYUNIONNAME;
|
||||
+ USHORT Depth;
|
||||
+ USHORT MaximumDepth;
|
||||
+ ULONG TotalAllocates;
|
||||
+ union
|
||||
+ {
|
||||
+ ULONG AllocateMisses;
|
||||
+ ULONG AllocateHits;
|
||||
+ } DUMMYUNIONNAME2;
|
||||
+ ULONG TotalFrees;
|
||||
+ union
|
||||
+ {
|
||||
+ ULONG FreeMisses;
|
||||
+ ULONG FreeHits;
|
||||
+ } DUMMYUNIONNAME3;
|
||||
+ POOL_TYPE Type;
|
||||
+ ULONG Tag;
|
||||
+ ULONG Size;
|
||||
+ union
|
||||
+ {
|
||||
+ PALLOCATE_FUNCTION_EX AllocateEx;
|
||||
+ PALLOCATE_FUNCTION Allocate;
|
||||
+ } DUMMYUNIONNAME4;
|
||||
+ union
|
||||
+ {
|
||||
+ PFREE_FUNCTION_EX FreeEx;
|
||||
+ PFREE_FUNCTION Free;
|
||||
+ } DUMMYUNIONNAME5;
|
||||
+ LIST_ENTRY ListEntry;
|
||||
+ ULONG LastTotalAllocates;
|
||||
+ union
|
||||
+ {
|
||||
+ ULONG LastAllocateMisses;
|
||||
+ ULONG LastAllocateHits;
|
||||
+ } DUMMYUNIONNAME6;
|
||||
+ ULONG Future[2];
|
||||
+} GENERAL_LOOKASIDE;
|
||||
+
|
||||
+typedef struct LOOKASIDE_ALIGN _NPAGED_LOOKASIDE_LIST
|
||||
+{
|
||||
+ GENERAL_LOOKASIDE L;
|
||||
+#if defined(__i386__)
|
||||
+ KSPIN_LOCK Lock__ObsoleteButDoNotDelete;
|
||||
+#endif
|
||||
+} NPAGED_LOOKASIDE_LIST, *PNPAGED_LOOKASIDE_LIST;
|
||||
+
|
||||
typedef NTSTATUS (NTAPI EX_CALLBACK_FUNCTION)(void *CallbackContext, void *Argument1, void *Argument2);
|
||||
typedef EX_CALLBACK_FUNCTION *PEX_CALLBACK_FUNCTION;
|
||||
|
||||
@@ -1277,8 +1345,10 @@ PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T);
|
||||
PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T);
|
||||
PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG);
|
||||
PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG);
|
||||
+void WINAPI ExDeleteNPagedLookasideList(PNPAGED_LOOKASIDE_LIST);
|
||||
void WINAPI ExFreePool(PVOID);
|
||||
void WINAPI ExFreePoolWithTag(PVOID,ULONG);
|
||||
+void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT);
|
||||
|
||||
NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*);
|
||||
PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR);
|
||||
diff --git a/include/winnt.h b/include/winnt.h
|
||||
index 3c5f0b8cb33..2cec63c895b 100644
|
||||
--- a/include/winnt.h
|
||||
+++ b/include/winnt.h
|
||||
@@ -755,6 +755,8 @@ typedef struct _MEMORY_BASIC_INFORMATION
|
||||
#define UNICODE_STRING_MAX_CHARS 32767
|
||||
|
||||
#define FIELD_OFFSET(type, field) ((LONG)offsetof(type, field))
|
||||
+#define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field))
|
||||
+#define RTL_SIZEOF_THROUGH_FIELD(type, field) (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(type, field))
|
||||
|
||||
#ifdef __GNUC__
|
||||
# define CONTAINING_RECORD(address, type, field) ({ \
|
||||
--
|
||||
2.13.1
|
||||
|
||||
@@ -5,3 +5,7 @@ Fixes: Add stub for ntoskrnl.Mm{Map,Unmap}LockedPages
|
||||
Fixes: Implement ntoskrnl.KeInitializeMutex
|
||||
Fixes: Add stub for ntoskrnl.IoGetDeviceAttachmentBaseRef
|
||||
Fixes: Implement ntoskrnl.ExInterlockedPopEntrySList
|
||||
Fixes: Implement ntoskrnl.NtBuildNumber
|
||||
Fixes: Implement ntoskrnl.ExInitializeNPagedLookasideList
|
||||
Depends: ntdll-NtAllocateUuids
|
||||
Depends: Compiler_Warnings
|
||||
|
||||
Reference in New Issue
Block a user