mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
ntdll-Fix_Aligment: Remove patch set.
This is fixed upstream, presumably by e3e477e6a14fbcb153258b47d1905915dc4c1f22.
This commit is contained in:
parent
411aeb2398
commit
534f6ae34e
@ -1,32 +0,0 @@
|
||||
From 9a7a3037b16670d121465036e7da2c4db6f18182 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Wed, 20 Aug 2014 19:21:18 +0200
|
||||
Subject: [PATCH] ntdll: Move NtProtectVirtualMemory and NtCreateSection to
|
||||
separate pages on x86. (try 2)
|
||||
|
||||
---
|
||||
dlls/ntdll/unix/virtual.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
|
||||
index 0346d0d9753..ab321a989dd 100644
|
||||
--- a/dlls/ntdll/unix/virtual.c
|
||||
+++ b/dlls/ntdll/unix/virtual.c
|
||||
@@ -660,6 +660,14 @@ static void free_ranges_remove_view( struct file_view *view )
|
||||
}
|
||||
|
||||
|
||||
+#if defined(__i386__)
|
||||
+NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr,
|
||||
+ ULONG new_prot, ULONG *old_prot ) DECLSPEC_ALIGN(4096);
|
||||
+NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr,
|
||||
+ const LARGE_INTEGER *size, ULONG protect,
|
||||
+ ULONG sec_flags, HANDLE file ) DECLSPEC_ALIGN(4096);
|
||||
+#endif
|
||||
+
|
||||
static inline int is_view_valloc( const struct file_view *view )
|
||||
{
|
||||
return !(view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT));
|
||||
--
|
||||
2.26.2
|
||||
|
@ -1 +0,0 @@
|
||||
Fixes: [33162] Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages
|
@ -166,7 +166,6 @@ patch_enable_all ()
|
||||
enable_ntdll_Exception="$1"
|
||||
enable_ntdll_FileDispositionInformation="$1"
|
||||
enable_ntdll_FileFsFullSizeInformation="$1"
|
||||
enable_ntdll_Fix_Alignment="$1"
|
||||
enable_ntdll_ForceBottomUpAlloc="$1"
|
||||
enable_ntdll_HashLinks="$1"
|
||||
enable_ntdll_Heap_Improvements="$1"
|
||||
@ -588,9 +587,6 @@ patch_enable ()
|
||||
ntdll-FileFsFullSizeInformation)
|
||||
enable_ntdll_FileFsFullSizeInformation="$2"
|
||||
;;
|
||||
ntdll-Fix_Alignment)
|
||||
enable_ntdll_Fix_Alignment="$2"
|
||||
;;
|
||||
ntdll-ForceBottomUpAlloc)
|
||||
enable_ntdll_ForceBottomUpAlloc="$2"
|
||||
;;
|
||||
@ -3172,18 +3168,6 @@ if test "$enable_ntdll_FileFsFullSizeInformation" -eq 1; then
|
||||
patch_apply ntdll-FileFsFullSizeInformation/0001-ntdll-Add-support-for-FileFsFullSizeInformation-clas.patch
|
||||
fi
|
||||
|
||||
# Patchset ntdll-Fix_Alignment
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#33162] Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntdll/unix/virtual.c
|
||||
# |
|
||||
if test "$enable_ntdll_Fix_Alignment" -eq 1; then
|
||||
patch_apply ntdll-Fix_Alignment/0001-ntdll-Move-NtProtectVirtualMemory-and-NtCreateSectio.patch
|
||||
fi
|
||||
|
||||
# Patchset ntdll-HashLinks
|
||||
# |
|
||||
# | Modified files:
|
||||
|
Loading…
x
Reference in New Issue
Block a user