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
Rebase against f6c10b8a75943dc3a49890c9c7a64c91752a4ee0.
[ntoskrnl-Stubs] Removed patch to add stub for KeDelayExecutionThread (fixed upstream). Removed patch to add stub for PsRemoveLoadImageNotifyRoutine (fixed upstream). [wined3d-Geforce_425M] Removed patch to add wined3d detection for GeForce GT 425M (accepted upstream).
This commit is contained in:
@@ -1,63 +0,0 @@
|
||||
From ce5aa07ac893aa38e72bb82c3e6dd2496ef4e1f5 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Morozov <amorozov@etersoft.ru>
|
||||
Date: Sat, 31 Jan 2015 12:17:54 +0100
|
||||
Subject: ntoskrnl.exe: Add stub for KeDelayExecutionThread.
|
||||
|
||||
---
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++
|
||||
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +-
|
||||
include/ddk/wdm.h | 1 +
|
||||
3 files changed, 15 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
index 0d6f730..c90b351 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
@@ -1308,6 +1308,19 @@ PRKTHREAD WINAPI KeGetCurrentThread(void)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * KeDelayExecutionThread (NTOSKRNL.EXE.@)
|
||||
+ */
|
||||
+NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE WaitMode, BOOLEAN Alertable,
|
||||
+ PLARGE_INTEGER Interval)
|
||||
+{
|
||||
+ FIXME("(%d, %d, %p): stub\n", WaitMode, Alertable, Interval);
|
||||
+
|
||||
+ return STATUS_SUCCESS;
|
||||
+}
|
||||
+
|
||||
+
|
||||
/***********************************************************************
|
||||
* KeInitializeEvent (NTOSKRNL.EXE.@)
|
||||
*/
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index 25624a6..bae3678 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -518,7 +518,7 @@
|
||||
@ stub KeClearEvent
|
||||
@ stub KeConnectInterrupt
|
||||
@ stub KeDcacheFlushCount
|
||||
-@ stub KeDelayExecutionThread
|
||||
+@ stdcall KeDelayExecutionThread(long long ptr)
|
||||
@ stub KeDeregisterBugCheckCallback
|
||||
@ stub KeDeregisterBugCheckReasonCallback
|
||||
@ stub KeDetachProcess
|
||||
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
|
||||
index f2eb6a5..0d13337 100644
|
||||
--- a/include/ddk/wdm.h
|
||||
+++ b/include/ddk/wdm.h
|
||||
@@ -1219,6 +1219,7 @@ void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR);
|
||||
VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG);
|
||||
NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG);
|
||||
|
||||
+NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE,BOOLEAN,PLARGE_INTEGER);
|
||||
PKTHREAD WINAPI KeGetCurrentThread(void);
|
||||
void WINAPI KeQuerySystemTime(LARGE_INTEGER*);
|
||||
void WINAPI KeQueryTickCount(LARGE_INTEGER*);
|
||||
--
|
||||
2.2.2
|
||||
|
@@ -1,46 +0,0 @@
|
||||
From 0a2999e8266717769d3a8c245b70861552ad62fb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Fri, 3 Apr 2015 17:08:20 +0200
|
||||
Subject: ntoskrnl.exe: Add stub for PsRemoveLoadImageNotifyRoutine.
|
||||
|
||||
---
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++
|
||||
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +-
|
||||
2 files changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
index 23c4c62..2692f47 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
@@ -2285,6 +2285,15 @@ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Acti
|
||||
}
|
||||
|
||||
/*****************************************************
|
||||
+ * PsRemoveLoadImageNotifyRoutine (NTOSKRNL.EXE.@)
|
||||
+ */
|
||||
+NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine)
|
||||
+{
|
||||
+ FIXME("(%p) stub\n", routine);
|
||||
+ return STATUS_SUCCESS;
|
||||
+}
|
||||
+
|
||||
+/*****************************************************
|
||||
* PsSetLoadImageNotifyRoutine (NTOSKRNL.EXE.@)
|
||||
*/
|
||||
NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine)
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index 4d4320c..a284393 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -899,7 +899,7 @@
|
||||
@ stub PsReferenceImpersonationToken
|
||||
@ stub PsReferencePrimaryToken
|
||||
@ stdcall PsRemoveCreateThreadNotifyRoutine(ptr)
|
||||
-@ stub PsRemoveLoadImageNotifyRoutine
|
||||
+@ stdcall PsRemoveLoadImageNotifyRoutine(ptr)
|
||||
@ stub PsRestoreImpersonation
|
||||
@ stub PsReturnPoolQuota
|
||||
@ stub PsReturnProcessNonPagedPoolQuota
|
||||
--
|
||||
2.6.2
|
||||
|
@@ -2,12 +2,10 @@ Fixes: [32186] Add stub for ntoskrnl.KeWaitForMultipleObjects
|
||||
Fixes: Implement stub for ntoskrnl.IoGetAttachedDeviceReference
|
||||
Fixes: Implement stubs for ntoskrnl.Ex{Acquire,Release}FastMutexUnsafe
|
||||
Fixes: Implement stubs for ntoskrnl.ObReferenceObjectByPointer and ntoskrnl.ObDereferenceObject
|
||||
Fixes: Implement stub for ntoskrnl.KeDelayExecutionThread.
|
||||
Fixes: Fix wrong defition of ntoskrnl.IoReleaseCancelSpinLock function.
|
||||
Fixes: Add stub for ntoskrnl.ExAcquireResourceExclusiveLite
|
||||
Fixes: Add stub for ntoskrnl.ExReleaseResourceForThread
|
||||
Fixes: Add stub for ntoskrnl.ExDeleteResourceLite
|
||||
Fixes: Add stub for ntoskrnl.Mm{Map,Unmap}LockedPages
|
||||
Fixes: Implement ntoskrnl.KeInitializeMutex
|
||||
Fixes: Add stub for ntoskrnl.PsRemoveLoadImageNotifyRoutine
|
||||
Fixes: Add stub for ntoskrnl.IoGetDeviceAttachmentBaseRef
|
||||
|
Reference in New Issue
Block a user