From f6dd7940f03d1feb4ee1e0a1d762c2804705fa91 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 6 Nov 2014 03:18:26 +0100 Subject: [PATCH] ntdll-Fix_Alignment: Use DECLSPEC_ALIGN instead of __attribute__((aligned(..))). --- debian/changelog | 1 + patches/Makefile | 4 ++-- ...dll-Move-NtProtectVirtualMemory-and-NtCreateSectio.patch | 6 +++--- patches/ntdll-Fix_Alignment/definition | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1320639..b3534485 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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. diff --git a/patches/Makefile b/patches/Makefile index 07de1aed..43287430 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -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 diff --git a/patches/ntdll-Fix_Alignment/0001-ntdll-Move-NtProtectVirtualMemory-and-NtCreateSectio.patch b/patches/ntdll-Fix_Alignment/0001-ntdll-Move-NtProtectVirtualMemory-and-NtCreateSectio.patch index ff395a27..6529a620 100644 --- a/patches/ntdll-Fix_Alignment/0001-ntdll-Move-NtProtectVirtualMemory-and-NtCreateSectio.patch +++ b/patches/ntdll-Fix_Alignment/0001-ntdll-Move-NtProtectVirtualMemory-and-NtCreateSectio.patch @@ -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 /*********************************************************************** diff --git a/patches/ntdll-Fix_Alignment/definition b/patches/ntdll-Fix_Alignment/definition index 3ceadf7d..3872506f 100644 --- a/patches/ntdll-Fix_Alignment/definition +++ b/patches/ntdll-Fix_Alignment/definition @@ -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