Added patches for ntoskrnl.ProbeFor{Read,Write}.

This commit is contained in:
Sebastian Lackner 2015-02-27 01:31:59 +01:00
parent b4c665d65a
commit a63ea08036
4 changed files with 89 additions and 0 deletions

1
debian/changelog vendored
View File

@ -12,6 +12,7 @@ wine-staging (1.7.38) UNRELEASED; urgency=low
* Added patch for CopyFileEx progress callback and cancellation support.
* Added first set of patches for job objects (by Andrew Cook).
* Added patch for stub of gdiplus.GdipCreateEffect.
* Added patches for ntoskrnl.ProbeFor{Read,Write}.
* Removed patch to properly call DriverUnload when unloading device drivers (accepted upstream).
* Removed patch to allow Accept-Encoding for HTTP/1.0 in wininet (accepted upstream).
* Removed patch to declare pDirectInputCreateEx in a MSVC compatible way (accepted upstream).

View File

@ -0,0 +1,42 @@
From 4fc03f00f5cf231d957021cb6a52687ec9336ca9 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Fri, 27 Feb 2015 01:27:07 +0100
Subject: ntoskrnl.exe: Add stub for ProbeForRead.
---
dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 3ff5d63..6b52d27 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -2195,3 +2195,11 @@ PLIST_ENTRY WINAPI ExfInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lo
FIXME("(%p %p) stub\n", head, lock);
return ExInterlockedRemoveHeadList( head, lock );
}
+
+/***********************************************************************
+ * ProbeForRead (NTOSKRNL.EXE.@)
+ */
+VOID WINAPI ProbeForRead(PVOID address, SIZE_T length, ULONG alignment)
+{
+ FIXME("%p %lu %u\n", address, length, alignment);
+}
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index 4a112ef..6e86a16 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -835,7 +835,7 @@
@ stub PoShutdownBugCheck
@ stub PoStartNextPowerIrp
@ stub PoUnregisterSystemState
-@ stub ProbeForRead
+@ stdcall ProbeForRead(ptr long long)
@ stub ProbeForWrite
@ stub PsAssignImpersonationToken
@ stub PsChargePoolQuota
--
2.3.0

View File

@ -0,0 +1,42 @@
From e182b0a8eec7ec662d107591cf13cc80dc53ca98 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 27 Feb 2015 01:29:54 +0100
Subject: ntoskrnl.exe: Add stub for ProbeForWrite.
---
dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 6b52d27..274132e 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -2203,3 +2203,11 @@ VOID WINAPI ProbeForRead(PVOID address, SIZE_T length, ULONG alignment)
{
FIXME("%p %lu %u\n", address, length, alignment);
}
+
+/***********************************************************************
+ * ProbeForWrite (NTOSKRNL.EXE.@)
+ */
+VOID WINAPI ProbeForWrite(PVOID address, SIZE_T length, ULONG alignment)
+{
+ FIXME("%p %lu %u\n", address, length, alignment);
+}
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index 6e86a16..e813146 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -836,7 +836,7 @@
@ stub PoStartNextPowerIrp
@ stub PoUnregisterSystemState
@ stdcall ProbeForRead(ptr long long)
-@ stub ProbeForWrite
+@ stdcall ProbeForWrite(ptr long long)
@ stub PsAssignImpersonationToken
@ stub PsChargePoolQuota
@ stub PsChargeProcessNonPagedPoolQuota
--
2.3.0

View File

@ -2944,6 +2944,8 @@ if test "$enable_ntoskrnl_Stubs" -eq 1; then
patch_apply ntoskrnl-Stubs/0013-ntoskrnl.exe-Add-stub-for-ExDeleteResourceLite.patch
patch_apply ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch
patch_apply ntoskrnl-Stubs/0015-ntoskrnl.exe-Implement-KeInitializeMutex.patch
patch_apply ntoskrnl-Stubs/0016-ntoskrnl.exe-Add-stub-for-ProbeForRead.patch
patch_apply ntoskrnl-Stubs/0017-ntoskrnl.exe-Add-stub-for-ProbeForWrite.patch
(
echo '+ { "Sebastian Lackner", "include: Remove several duplicate definitions from ntdef.h.", 1 },';
echo '+ { "Austin English", "ntoskrnl.exe: add KeWaitForMultipleObjects stub.", 1 },';
@ -2960,6 +2962,8 @@ if test "$enable_ntoskrnl_Stubs" -eq 1; then
echo '+ { "Christian Costa", "ntoskrnl.exe: Add stub for ExDeleteResourceLite.", 1 },';
echo '+ { "Christian Costa", "ntoskrnl.exe: Implement MmMapLockedPages and MmUnmapLockedPages.", 1 },';
echo '+ { "Alexander Morozov", "ntoskrnl.exe: Implement KeInitializeMutex.", 1 },';
echo '+ { "Austin English", "ntoskrnl.exe: Add stub for ProbeForRead.", 1 },';
echo '+ { "Sebastian Lackner", "ntoskrnl.exe: Add stub for ProbeForWrite.", 1 },';
) >> "$patchlist"
fi