mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Rebase against 7c06f1c218a2ecb1f2dda2cfb97b3a2c5b7f01e8.
This commit is contained in:
parent
b3a71a8918
commit
50a0e530a8
@ -1,59 +0,0 @@
|
||||
From 9b3429a9704b5ee5cd393036b64b80002c8b00de Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Morozov <amorozov@etersoft.ru>
|
||||
Date: Thu, 29 Jan 2015 23:23:13 +0100
|
||||
Subject: ntoskrnl.exe: Add stub for IoGetAttachedDeviceReference.
|
||||
|
||||
---
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++
|
||||
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +-
|
||||
include/ddk/wdm.h | 1 +
|
||||
3 files changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
index e8ae795..1ad44ba 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
@@ -810,6 +810,15 @@ NTSTATUS WINAPI IofCallDriver( DEVICE_OBJECT *device, IRP *irp )
|
||||
return IoCallDriver( device, irp );
|
||||
}
|
||||
|
||||
+/***********************************************************************
|
||||
+ * IoGetAttachedDeviceReference (NTOSKRNL.EXE.@)
|
||||
+ */
|
||||
+PDEVICE_OBJECT WINAPI IoGetAttachedDeviceReference(PDEVICE_OBJECT obj)
|
||||
+{
|
||||
+ FIXME("(%p): stub\n", obj);
|
||||
+
|
||||
+ return obj;
|
||||
+}
|
||||
|
||||
/***********************************************************************
|
||||
* IoGetRelatedDeviceObject (NTOSKRNL.EXE.@)
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index d7adf66..98992c5 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -374,7 +374,7 @@
|
||||
@ stdcall IoFreeMdl(ptr)
|
||||
@ stub IoFreeWorkItem
|
||||
@ stdcall IoGetAttachedDevice(ptr)
|
||||
-@ stub IoGetAttachedDeviceReference
|
||||
+@ stdcall IoGetAttachedDeviceReference(ptr)
|
||||
@ stub IoGetBaseFileSystemDeviceObject
|
||||
@ stub IoGetBootDiskInformation
|
||||
@ stdcall IoGetConfigurationInformation()
|
||||
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
|
||||
index c234375..9c67478 100644
|
||||
--- a/include/ddk/wdm.h
|
||||
+++ b/include/ddk/wdm.h
|
||||
@@ -1211,6 +1211,7 @@ void WINAPI IoDeleteDriver(DRIVER_OBJECT*);
|
||||
NTSTATUS WINAPI IoDeleteSymbolicLink(UNICODE_STRING*);
|
||||
void WINAPI IoFreeIrp(IRP*);
|
||||
void WINAPI IoFreeMdl(MDL*);
|
||||
+PDEVICE_OBJECT WINAPI IoGetAttachedDeviceReference(PDEVICE_OBJECT);
|
||||
PEPROCESS WINAPI IoGetCurrentProcess(void);
|
||||
NTSTATUS WINAPI IoGetDeviceInterfaces(const GUID*,PDEVICE_OBJECT,ULONG,PWSTR*);
|
||||
NTSTATUS WINAPI IoGetDeviceObjectPointer(UNICODE_STRING*,ACCESS_MASK,PFILE_OBJECT*,PDEVICE_OBJECT*);
|
||||
--
|
||||
2.3.0
|
||||
|
@ -1,5 +1,4 @@
|
||||
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: Fix wrong defition of ntoskrnl.IoReleaseCancelSpinLock function.
|
||||
|
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "f53c320f04114253955b509da294ef454864679d"
|
||||
echo "7c06f1c218a2ecb1f2dda2cfb97b3a2c5b7f01e8"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -5482,7 +5482,6 @@ fi
|
||||
# |
|
||||
if test "$enable_ntoskrnl_Stubs" -eq 1; then
|
||||
patch_apply ntoskrnl-Stubs/0001-ntoskrnl.exe-add-KeWaitForMultipleObjects-stub.patch
|
||||
patch_apply ntoskrnl-Stubs/0002-ntoskrnl.exe-Add-stub-for-IoGetAttachedDeviceReferen.patch
|
||||
patch_apply ntoskrnl-Stubs/0003-ntoskrnl.exe-Add-stubs-for-ExAcquireFastMutexUnsafe-.patch
|
||||
patch_apply ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch
|
||||
patch_apply ntoskrnl-Stubs/0005-ntoskrnl.exe-Improve-KeReleaseMutex-stub.patch
|
||||
@ -5495,7 +5494,6 @@ if test "$enable_ntoskrnl_Stubs" -eq 1; then
|
||||
patch_apply ntoskrnl-Stubs/0012-ntoskrnl.exe-Add-IoStopTimer-stub.patch
|
||||
(
|
||||
echo '+ { "Austin English", "ntoskrnl.exe: Add KeWaitForMultipleObjects stub.", 1 },';
|
||||
echo '+ { "Alexander Morozov", "ntoskrnl.exe: Add stub for IoGetAttachedDeviceReference.", 1 },';
|
||||
echo '+ { "Alexander Morozov", "ntoskrnl.exe: Add stubs for ExAcquireFastMutexUnsafe and ExReleaseFastMutexUnsafe.", 1 },';
|
||||
echo '+ { "Alexander Morozov", "ntoskrnl.exe: Add stub for ObReferenceObjectByPointer.", 1 },';
|
||||
echo '+ { "Alexander Morozov", "ntoskrnl.exe: Improve KeReleaseMutex stub.", 1 },';
|
||||
|
Loading…
Reference in New Issue
Block a user