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 dfae798d98bf7a8b45954e6d788928d067d0772e
Disabled windowscodecs patchsets until all pending changes have been committed/rejected.
This commit is contained in:
@@ -1,63 +0,0 @@
|
||||
From 5761c59c44922f139eeb9fdc873ad52cf2b75e02 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Morozov <amorozov@etersoft.ru>
|
||||
Date: Fri, 30 Jan 2015 00:01:37 +0100
|
||||
Subject: ntoskrnl.exe: Add stub for ObReferenceObjectByPointer.
|
||||
|
||||
---
|
||||
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 b2b900c..8db5bf0 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
@@ -2192,6 +2192,19 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName,
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
+ * ObReferenceObjectByPointer (NTOSKRNL.EXE.@)
|
||||
+ */
|
||||
+NTSTATUS WINAPI ObReferenceObjectByPointer(void *obj, ACCESS_MASK access,
|
||||
+ POBJECT_TYPE type,
|
||||
+ KPROCESSOR_MODE mode)
|
||||
+{
|
||||
+ FIXME("(%p, %x, %p, %d): stub\n", obj, access, type, mode);
|
||||
+
|
||||
+ return STATUS_NOT_IMPLEMENTED;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/***********************************************************************
|
||||
* ObDereferenceObject (NTOSKRNL.EXE.@)
|
||||
*/
|
||||
void WINAPI ObDereferenceObject( void *obj )
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index 8ff5d49..702dde0 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -811,7 +811,7 @@
|
||||
@ stub ObQueryObjectAuditingByHandle
|
||||
@ stdcall ObReferenceObjectByHandle(long long ptr long ptr ptr)
|
||||
@ stdcall ObReferenceObjectByName(ptr long ptr long ptr long ptr ptr)
|
||||
-@ stub ObReferenceObjectByPointer
|
||||
+@ stdcall ObReferenceObjectByPointer(ptr long ptr long)
|
||||
@ stub ObReferenceSecurityDescriptor
|
||||
@ stub ObReleaseObjectSecurity
|
||||
@ stub ObSetHandleAttributes
|
||||
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
|
||||
index 7d7fd73..60136ce 100644
|
||||
--- a/include/ddk/wdm.h
|
||||
+++ b/include/ddk/wdm.h
|
||||
@@ -1255,6 +1255,7 @@ MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void);
|
||||
void WINAPI ObDereferenceObject(void*);
|
||||
NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION);
|
||||
NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**);
|
||||
+NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE);
|
||||
|
||||
POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT,POWER_STATE_TYPE,POWER_STATE);
|
||||
NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID);
|
||||
--
|
||||
2.9.0
|
||||
|
@@ -1,42 +0,0 @@
|
||||
From 4dd6a88936cd579a5a293ef63d65e73fffb0dce6 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Costa <titan.costa@gmail.com>
|
||||
Date: Fri, 30 Jan 2015 00:10:53 +0100
|
||||
Subject: ntoskrnl.exe: Fix IoReleaseCancelSpinLock argument.
|
||||
|
||||
---
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++--
|
||||
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
index c3a7e2a..85cbf01 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
@@ -332,9 +332,9 @@ void WINAPI IoAcquireCancelSpinLock(PKIRQL irql)
|
||||
/***********************************************************************
|
||||
* IoReleaseCancelSpinLock (NTOSKRNL.EXE.@)
|
||||
*/
|
||||
-void WINAPI IoReleaseCancelSpinLock(PKIRQL irql)
|
||||
+void WINAPI IoReleaseCancelSpinLock(KIRQL irql)
|
||||
{
|
||||
- FIXME("(%p): stub\n", irql);
|
||||
+ FIXME("(%u): stub\n", irql);
|
||||
}
|
||||
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index bae3678..8ece531 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -432,7 +432,7 @@
|
||||
@ stub IoRegisterLastChanceShutdownNotification
|
||||
@ stdcall IoRegisterPlugPlayNotification(long long ptr ptr ptr ptr ptr)
|
||||
@ stdcall IoRegisterShutdownNotification(ptr)
|
||||
-@ stdcall IoReleaseCancelSpinLock(ptr)
|
||||
+@ stdcall IoReleaseCancelSpinLock(long)
|
||||
@ stub IoReleaseRemoveLockAndWaitEx
|
||||
@ stub IoReleaseRemoveLockEx
|
||||
@ stub IoReleaseVpbSpinLock
|
||||
--
|
||||
2.2.2
|
||||
|
@@ -7,5 +7,4 @@ 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