wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

ntdll-Fix_Alignment: Use DECLSPEC_ALIGN instead of __attribute__((aligned(..))).

Browse Source
This commit is contained in:
Sebastian Lackner 2014-11-06 03:18:26 +01:00
parent 14ae97f5a2
commit f6dd7940f0
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -1,5 +1,6 @@
wine-compholio (1.7.31) UNRELEASED; urgency=low
* Update kernel32-GetSystemTimes patches.
* Improve style for ntdll-Fix_Alignment patches.
* Added possibility to temporarily disable patches to patch system.
* Added patch to allow selecting specific audio device for PulseAudio backend.
* Added patch with stub for NtSetLdtEntries/ZwSetLdtEntries.

4
patches/Makefile
View File

@ -814,7 +814,7 @@ ntdll-FileDispositionInformation.ok:
# Patchset ntdll-Fix_Alignment
# |
# | Included patches:
# | * Move NtProtectVirtualMemory and NtCreateSection to separate pages in ntdll on x86. [by Michael Müller]
# | * Move NtProtectVirtualMemory and NtCreateSection to separate pages in ntdll on x86. [rev 2, by Michael Müller]
# |
# | This patchset fixes the following Wine bugs:
# | * [#33162] Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages
@ -826,7 +826,7 @@ ntdll-FileDispositionInformation.ok:
ntdll-Fix_Alignment.ok:
$(call APPLY_FILE,ntdll-Fix_Alignment/0001-ntdll-Move-NtProtectVirtualMemory-and-NtCreateSectio.patch)
@( \
echo '+ { "ntdll-Fix_Alignment", "Michael Müller", "Move NtProtectVirtualMemory and NtCreateSection to separate pages in ntdll on x86." },'; \
echo '+ { "ntdll-Fix_Alignment", "Michael Müller", "Move NtProtectVirtualMemory and NtCreateSection to separate pages in ntdll on x86. [rev 2]" },'; \
) > ntdll-Fix_Alignment.ok
# Patchset ntdll-Fix_Free

6
patches/ntdll-Fix_Alignment/0001-ntdll-Move-NtProtectVirtualMemory-and-NtCreateSectio.patch
View File

@ -16,12 +16,12 @@ index 4819d2d..63ba0a3 100644
static BOOL use_locks;
static BOOL force_exec_prot; /* whether to force PROT_EXEC on all PROT_READ mmaps */
+#if defined(__i386__) && defined(__GNUC__)
+#if defined(__i386__)
+NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr,
+ ULONG new_prot, ULONG *old_prot ) __attribute__((aligned(4096)));
+ 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 ) __attribute__((aligned(4096)));
+ ULONG sec_flags, HANDLE file ) DECLSPEC_ALIGN(4096);
+#endif
/***********************************************************************

2
patches/ntdll-Fix_Alignment/definition
View File

@ -1,4 +1,4 @@
Author: Michael Müller
Subject: Move NtProtectVirtualMemory and NtCreateSection to separate pages in ntdll on x86.
Revision: 1
Revision: 2
Fixes: [33162] Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages