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 5baadda536172d6713fa6fef1196dc2baa773904
This commit is contained in:
Alistair Leslie-Hughes
@@ -1,25 +1,23 @@
|
||||
From 25b736d558aba82da91d004b8976471df6ef0a64 Mon Sep 17 00:00:00 2001
|
||||
From 3342ffc67dd4df100c164335a024c072a784256b Mon Sep 17 00:00:00 2001
|
||||
From: Zebediah Figura <z.figura12@gmail.com>
|
||||
Date: Tue, 29 Jan 2019 21:41:46 -0600
|
||||
Subject: [PATCH 06/13] ntoskrnl.exe: Implement
|
||||
ExReleaseResourceForThreadLite().
|
||||
Subject: [PATCH] ntoskrnl.exe: Implement ExReleaseResourceForThreadLite().
|
||||
|
||||
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
|
||||
---
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 8 -----
|
||||
dlls/ntoskrnl.exe/sync.c | 61 ++++++++++++++++++++++++++++++++++++
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 8 ------
|
||||
dlls/ntoskrnl.exe/sync.c | 61 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
include/ddk/wdm.h | 1 +
|
||||
3 files changed, 62 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
index d6c35d1c..5ab4db12 100644
|
||||
index 887fdb1..9fbfed2 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
@@ -3047,14 +3047,6 @@ NTSTATUS WINAPI ExDeleteResourceLite(PERESOURCE resource)
|
||||
return STATUS_NOT_IMPLEMENTED;
|
||||
@@ -3256,14 +3256,6 @@ NTSTATUS WINAPI ExDeleteResourceLite(PERESOURCE resource)
|
||||
}
|
||||
|
||||
-/***********************************************************************
|
||||
/***********************************************************************
|
||||
- * ExReleaseResourceForThreadLite (NTOSKRNL.EXE.@)
|
||||
- */
|
||||
-void WINAPI ExReleaseResourceForThreadLite( PERESOURCE resource, ERESOURCE_THREAD tid )
|
||||
@@ -27,14 +25,15 @@ index d6c35d1c..5ab4db12 100644
|
||||
- FIXME( "stub: %p %lu\n", resource, tid );
|
||||
-}
|
||||
-
|
||||
/***********************************************************************
|
||||
-/***********************************************************************
|
||||
* KeEnterCriticalRegion (NTOSKRNL.EXE.@)
|
||||
*/
|
||||
void WINAPI KeEnterCriticalRegion(void)
|
||||
diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c
|
||||
index 2fd7f903..450e4417 100644
|
||||
index 8644562..540093d 100644
|
||||
--- a/dlls/ntoskrnl.exe/sync.c
|
||||
+++ b/dlls/ntoskrnl.exe/sync.c
|
||||
@@ -945,3 +945,64 @@ BOOLEAN WINAPI ExAcquireSharedWaitForExclusive( ERESOURCE *resource, BOOLEAN wai
|
||||
@@ -925,3 +925,64 @@ BOOLEAN WINAPI ExAcquireSharedWaitForExclusive( ERESOURCE *resource, BOOLEAN wai
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@@ -100,7 +99,7 @@ index 2fd7f903..450e4417 100644
|
||||
+ KeReleaseSpinLock( &resource->SpinLock, irql );
|
||||
+}
|
||||
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
|
||||
index 010c1ee4..e95458bf 100644
|
||||
index 4dada66..58e60d2 100644
|
||||
--- a/include/ddk/wdm.h
|
||||
+++ b/include/ddk/wdm.h
|
||||
@@ -1529,6 +1529,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK);
|
||||
@@ -108,9 +107,9 @@ index 010c1ee4..e95458bf 100644
|
||||
LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*);
|
||||
void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX);
|
||||
+void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD);
|
||||
ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN);
|
||||
|
||||
void WINAPI IoAcquireCancelSpinLock(KIRQL*);
|
||||
NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*);
|
||||
--
|
||||
2.20.1
|
||||
1.9.1
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
From 7a4285a1f926b9a1caba1f815b9b781857a0997e Mon Sep 17 00:00:00 2001
|
||||
From 29d57097b8a1915d1fdbd8822117c096bb9e8dae Mon Sep 17 00:00:00 2001
|
||||
From: Zebediah Figura <z.figura12@gmail.com>
|
||||
Date: Tue, 29 Jan 2019 21:50:37 -0600
|
||||
Subject: [PATCH 11/13] ntoskrnl.exe: Implement
|
||||
ExIsResourceAcquiredExclusiveLite().
|
||||
Subject: [PATCH] ntoskrnl.exe: Implement ExIsResourceAcquiredExclusiveLite().
|
||||
|
||||
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
|
||||
---
|
||||
@@ -12,7 +11,7 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
|
||||
3 files changed, 21 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index 45553e06..66f0b7d9 100644
|
||||
index 51ba575..8892b7c 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -165,7 +165,7 @@
|
||||
@@ -25,10 +24,10 @@ index 45553e06..66f0b7d9 100644
|
||||
@ stdcall ExLocalTimeToSystemTime(ptr ptr) RtlLocalTimeToSystemTime
|
||||
@ stub ExNotifyCallback
|
||||
diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c
|
||||
index ad68e7ea..cee15605 100644
|
||||
index c63d739..0f71902 100644
|
||||
--- a/dlls/ntoskrnl.exe/sync.c
|
||||
+++ b/dlls/ntoskrnl.exe/sync.c
|
||||
@@ -1069,3 +1069,22 @@ ULONG WINAPI ExGetSharedWaiterCount( ERESOURCE *resource )
|
||||
@@ -1045,3 +1045,22 @@ ULONG WINAPI ExGetSharedWaiterCount( ERESOURCE *resource )
|
||||
|
||||
return count;
|
||||
}
|
||||
@@ -52,7 +51,7 @@ index ad68e7ea..cee15605 100644
|
||||
+ return ret;
|
||||
+}
|
||||
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
|
||||
index 7a4be723..76eb6117 100644
|
||||
index 1c58ab9..80a82b0 100644
|
||||
--- a/include/ddk/wdm.h
|
||||
+++ b/include/ddk/wdm.h
|
||||
@@ -1531,6 +1531,7 @@ NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*);
|
||||
@@ -62,7 +61,7 @@ index 7a4be723..76eb6117 100644
|
||||
+BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite(ERESOURCE*);
|
||||
void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX);
|
||||
void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD);
|
||||
|
||||
ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN);
|
||||
--
|
||||
2.20.1
|
||||
1.9.1
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
From 5203c63e18a2461b1909996ec1ffbcc662d57865 Mon Sep 17 00:00:00 2001
|
||||
From d121e866eaf9e480749b7a1faf863e77e67595a4 Mon Sep 17 00:00:00 2001
|
||||
From: Zebediah Figura <z.figura12@gmail.com>
|
||||
Date: Tue, 29 Jan 2019 21:51:08 -0600
|
||||
Subject: [PATCH 12/13] ntoskrnl.exe: Implement
|
||||
ExIsResourceAcquiredSharedLite().
|
||||
Subject: [PATCH] ntoskrnl.exe: Implement ExIsResourceAcquiredSharedLite().
|
||||
|
||||
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
|
||||
---
|
||||
@@ -12,7 +11,7 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
|
||||
3 files changed, 27 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index 66f0b7d9..127c5ef3 100644
|
||||
index 8892b7c..f0d6da6 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -166,7 +166,7 @@
|
||||
@@ -25,10 +24,10 @@ index 66f0b7d9..127c5ef3 100644
|
||||
@ stub ExNotifyCallback
|
||||
@ stub ExQueryPoolBlockSize
|
||||
diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c
|
||||
index cee15605..5154ea5c 100644
|
||||
index 0f71902..cfdc6d1 100644
|
||||
--- a/dlls/ntoskrnl.exe/sync.c
|
||||
+++ b/dlls/ntoskrnl.exe/sync.c
|
||||
@@ -1088,3 +1088,28 @@ BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite( ERESOURCE *resource )
|
||||
@@ -1064,3 +1064,28 @@ BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite( ERESOURCE *resource )
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -58,7 +57,7 @@ index cee15605..5154ea5c 100644
|
||||
+ return ret;
|
||||
+}
|
||||
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
|
||||
index 76eb6117..e5a2906f 100644
|
||||
index 80a82b0..3600bcd 100644
|
||||
--- a/include/ddk/wdm.h
|
||||
+++ b/include/ddk/wdm.h
|
||||
@@ -1532,6 +1532,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK);
|
||||
@@ -68,7 +67,7 @@ index 76eb6117..e5a2906f 100644
|
||||
+ULONG WINAPI ExIsResourceAcquiredSharedLite(ERESOURCE*);
|
||||
void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX);
|
||||
void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD);
|
||||
|
||||
ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN);
|
||||
--
|
||||
2.20.1
|
||||
1.9.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user