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

Added patch to fix protection flags passed to VirtualAlloc call in PageReserve VxDCall.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-01-09 21:23:38 +01:00
parent 9d5d217c25
commit 0f9f441be7
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
patches/patchinstall.sh
View File

@ -299,6 +299,7 @@ patch_enable_all ()
enable_user32_WndProc="$1"
enable_uxtheme_GTK_Theming="$1"
enable_version_VerQueryValue="$1"
enable_vmm_vxd_PageReserve="$1"
enable_wbemdisp_ISWbemSecurity="$1"
enable_wine_inf_Performance="$1"
enable_wine_inf_ProfileList_UserSID="$1"
@ -1014,6 +1015,9 @@ patch_enable ()
version-VerQueryValue)
enable_version_VerQueryValue="$2"
;;
vmm.vxd-PageReserve)
enable_vmm_vxd_PageReserve="$2"
;;
wbemdisp-ISWbemSecurity)
enable_wbemdisp_ISWbemSecurity="$2"
;;
@ -5809,6 +5813,21 @@ if test "$enable_version_VerQueryValue" -eq 1; then
) >> "$patchlist"
fi
# Patchset vmm.vxd-PageReserve
# |
# | This patchset fixes the following Wine bugs:
# | * [#36013] Fix protection flags passed to VirtualAlloc call in PageReserve VxDCall
# |
# | Modified files:
# | * dlls/vmm.vxd/vmm.c
# |
if test "$enable_vmm_vxd_PageReserve" -eq 1; then
patch_apply vmm.vxd-PageReserve/0001-vmm.vxd-Fix-protection-flags-passed-to-VirtualAlloc.patch
(
echo '+ { "Sebastian Lackner", "vmm.vxd: Fix protection flags passed to VirtualAlloc.", 1 },';
) >> "$patchlist"
fi
# Patchset wbemdisp-ISWbemSecurity
# |
# | Modified files:

25
patches/vmm.vxd-PageReserve/0001-vmm.vxd-Fix-protection-flags-passed-to-VirtualAlloc.patch Normal file
View File

@ -0,0 +1,25 @@
From d0c4bb573627e7e8ea1295bd781ee58c25a8c769 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 9 Jan 2016 21:20:28 +0100
Subject: vmm.vxd: Fix protection flags passed to VirtualAlloc.
---
dlls/vmm.vxd/vmm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c
index 7327f78..833a8d1 100644
--- a/dlls/vmm.vxd/vmm.c
+++ b/dlls/vmm.vxd/vmm.c
@@ -159,7 +159,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context )
if ( page == PR_PRIVATE || page == PR_SHARED ) page = 0;
/* FIXME: Handle flags in some way */
address = (LPVOID )(page * page_size);
- ret = VirtualAlloc ( address, npages * page_size, MEM_RESERVE, 0 );
+ ret = VirtualAlloc ( address, npages * page_size, MEM_RESERVE, PAGE_EXECUTE_READWRITE );
TRACE("PageReserve: returning: %p\n", ret );
if ( ret == NULL )
return -1;
--
2.6.4

1
patches/vmm.vxd-PageReserve/definition Normal file
View File

@ -0,0 +1 @@
Fixes: [36013] Fix protection flags passed to VirtualAlloc call in PageReserve VxDCall