diff --git a/README.md b/README.md index bdcca95b..6cf65386 100644 --- a/README.md +++ b/README.md @@ -242,7 +242,7 @@ for more details.* * Software support for Environmental Audio Extensions (EAX) * Super Mario 3: Mario Forever fails to load keyboard mapping from profile files. ([Wine Bug #18099](https://bugs.winehq.org/show_bug.cgi?id=18099)) * Support for 8bpp grayscale TIFF images with 8bpp alpha channel ([Wine Bug #38027](https://bugs.winehq.org/show_bug.cgi?id=38027)) -* Support for AT_ROUND_TO_PAGE flag in NtMapViewOfSection +* ~~Support for AT_ROUND_TO_PAGE flag in NtMapViewOfSection~~ * Support for AllocateAndGetTcpExTableFromStack ([Wine Bug #34372](https://bugs.winehq.org/show_bug.cgi?id=34372)) * Support for BindImageEx ([Wine Bug #3591](https://bugs.winehq.org/show_bug.cgi?id=3591)) * Support for CSMT (command stream) to increase graphic performance ([Wine Bug #11674](https://bugs.winehq.org/show_bug.cgi?id=11674)) diff --git a/debian/changelog b/debian/changelog index c8e9fefd..0d031466 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ wine-staging (1.7.46) UNRELEASED; urgency=low * Removed patch for advapi32.GetWindowsAccountDomainSid (accepted upstream). * Removed patch for stub implementation of fltlib.FilterLoad (accepted upstream). + * Removed patch for AT_ROUND_TO_PAGE support in NtMapViewOfSection (accepted + upstream). * Removed patch to fix linking against libunwind on Linux (fixed upstream). -- Sebastian Lackner Sun, 14 Jun 2015 09:15:50 +0200 diff --git a/patches/ntdll-AT_ROUND_TO_PAGE/0001-ntdll-Add-support-for-AT_ROUND_TO_PAGE-flag-in-NtMap.patch b/patches/ntdll-AT_ROUND_TO_PAGE/0001-ntdll-Add-support-for-AT_ROUND_TO_PAGE-flag-in-NtMap.patch deleted file mode 100644 index a8d6ad14..00000000 --- a/patches/ntdll-AT_ROUND_TO_PAGE/0001-ntdll-Add-support-for-AT_ROUND_TO_PAGE-flag-in-NtMap.patch +++ /dev/null @@ -1,59 +0,0 @@ -From f595930f5c3bbfed975ddf38173573b56b20838f Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Fri, 5 Jun 2015 07:40:44 +0200 -Subject: ntdll: Add support for AT_ROUND_TO_PAGE flag in NtMapViewOfSection. - ---- - dlls/kernel32/tests/virtual.c | 4 ---- - dlls/ntdll/virtual.c | 5 +++++ - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c -index 3bcf697..cdd2466 100644 ---- a/dlls/kernel32/tests/virtual.c -+++ b/dlls/kernel32/tests/virtual.c -@@ -1138,12 +1138,10 @@ static void test_NtMapViewOfSection(void) - offset.QuadPart = 0; - status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, - &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); -- todo_wine - ok( status == STATUS_SUCCESS, "NtMapViewOfSection returned %x\n", status ); - ok( (char *)ptr2 == (char *)ptr + 0x1000, - "expected address %p, got %p\n", (char *)ptr + 0x1000, ptr2 ); - status = pNtUnmapViewOfSection( hProcess, ptr2 ); -- todo_wine - ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); - - /* the address is rounded down if not on a page boundary */ -@@ -1166,12 +1164,10 @@ static void test_NtMapViewOfSection(void) - offset.QuadPart = 0; - status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, - &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); -- todo_wine - ok( status == STATUS_SUCCESS, "NtMapViewOfSection returned %x\n", status ); - ok( (char *)ptr2 == (char *)ptr + 0x2000, - "expected address %p, got %p\n", (char *)ptr + 0x2000, ptr2 ); - status = pNtUnmapViewOfSection( hProcess, ptr2 ); -- todo_wine - ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); - } - else -diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c -index 72309f6..91c420e 100644 ---- a/dlls/ntdll/virtual.c -+++ b/dlls/ntdll/virtual.c -@@ -2601,6 +2601,11 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p - - /* Check parameters */ - -+#ifndef _WIN64 -+ if (!is_wow64 && (alloc_type & AT_ROUND_TO_PAGE) && !zero_bits) -+ mask = page_mask; -+#endif -+ - if ((offset.u.LowPart & mask) || (*addr_ptr && ((UINT_PTR)*addr_ptr & mask))) - return STATUS_MAPPED_ALIGNMENT; - --- -2.4.2 - diff --git a/patches/ntdll-AT_ROUND_TO_PAGE/definition b/patches/ntdll-AT_ROUND_TO_PAGE/definition deleted file mode 100644 index 5bf1ee56..00000000 --- a/patches/ntdll-AT_ROUND_TO_PAGE/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: Support for AT_ROUND_TO_PAGE flag in NtMapViewOfSection diff --git a/patches/ntdll-NtQuerySection/definition b/patches/ntdll-NtQuerySection/definition index c19ed095..6a86d72c 100644 --- a/patches/ntdll-NtQuerySection/definition +++ b/patches/ntdll-NtQuerySection/definition @@ -1,2 +1 @@ Fixes: [37338] Support for NtQuerySection -Depends: ntdll-AT_ROUND_TO_PAGE diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 19b280e1..2054d1b0 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -55,7 +55,7 @@ version() echo "Copyright (C) 2014-2015 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" - echo " commit efd41e4f2b1c784d4939aa10d869f87f2384f10c" + echo " commit ae6efa469bfaecade30e160d195d607bdcdcc6ae" echo "" } @@ -153,7 +153,6 @@ patch_enable_all () enable_msvfw32_Image_Size="$1" enable_ntdll_APC_Performance="$1" enable_ntdll_APC_Start_Process="$1" - enable_ntdll_AT_ROUND_TO_PAGE="$1" enable_ntdll_Activation_Context="$1" enable_ntdll_CLI_Images="$1" enable_ntdll_DOS_Attributes="$1" @@ -534,9 +533,6 @@ patch_enable () ntdll-APC_Start_Process) enable_ntdll_APC_Start_Process="$2" ;; - ntdll-AT_ROUND_TO_PAGE) - enable_ntdll_AT_ROUND_TO_PAGE="$2" - ;; ntdll-Activation_Context) enable_ntdll_Activation_Context="$2" ;; @@ -1752,13 +1748,6 @@ if test "$enable_ntdll_RtlIpStringToAddress" -eq 1; then enable_ntdll_LZNT1_Compression=1 fi -if test "$enable_ntdll_NtQuerySection" -eq 1; then - if test "$enable_ntdll_AT_ROUND_TO_PAGE" -gt 1; then - abort "Patchset ntdll-AT_ROUND_TO_PAGE disabled, but ntdll-NtQuerySection depends on that." - fi - enable_ntdll_AT_ROUND_TO_PAGE=1 -fi - if test "$enable_ntdll_Junction_Points" -eq 1; then if test "$enable_ntdll_Fix_Free" -gt 1; then abort "Patchset ntdll-Fix_Free disabled, but ntdll-Junction_Points depends on that." @@ -2881,18 +2870,6 @@ if test "$enable_kernel32_CompareStringEx" -eq 1; then ) >> "$patchlist" fi -# Patchset kernel32-SetFileInformationByHandle -# | -# | Modified files: -# | * include/winbase.h -# | -if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then - patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch - ( - echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },'; - ) >> "$patchlist" -fi - # Patchset server-File_Permissions # | # | Modified files: @@ -2956,6 +2933,18 @@ if test "$enable_ntdll_FileDispositionInformation" -eq 1; then ) >> "$patchlist" fi +# Patchset kernel32-SetFileInformationByHandle +# | +# | Modified files: +# | * include/winbase.h +# | +if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then + patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch + ( + echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },'; + ) >> "$patchlist" +fi + # Patchset kernel32-CopyFileEx # | # | This patchset fixes the following Wine bugs: @@ -3355,18 +3344,6 @@ if test "$enable_ntdll_APC_Start_Process" -eq 1; then ) >> "$patchlist" fi -# Patchset ntdll-AT_ROUND_TO_PAGE -# | -# | Modified files: -# | * dlls/kernel32/tests/virtual.c, dlls/ntdll/virtual.c -# | -if test "$enable_ntdll_AT_ROUND_TO_PAGE" -eq 1; then - patch_apply ntdll-AT_ROUND_TO_PAGE/0001-ntdll-Add-support-for-AT_ROUND_TO_PAGE-flag-in-NtMap.patch - ( - echo '+ { "Sebastian Lackner", "ntdll: Add support for AT_ROUND_TO_PAGE flag in NtMapViewOfSection.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ntdll-Activation_Context # | # | Modified files: