wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 1510b8b92af23a2305de95f074468c231dc11fa3.

Browse Source 
[inetcpl-Default_Home]
Removed patch to implement default page button in inetcpl (fixed upstream).

[user32-MDI_Extra_Data]
Removed patch to preserve beginning of extra data for MDI windows (accepted
upstream).
This commit is contained in:
Sebastian Lackner
2016-02-26 20:50:47 +01:00
parent 7b40b6922a
commit 2228abee0a
6 changed files with 8 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/winedevice-Fix_Relocation/0001-winedevice-Avoid-invalid-memory-access-when-relocati.patch
View File

@@ -1,4 +1,4 @@
From d0620ed863ec0155f65ef1844ee75127aa003f07 Mon Sep 17 00:00:00 2001
From a99b0eeff3202d63f55f252ceb7cf364549d812c Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 10 Nov 2014 04:05:38 +0100
Subject: winedevice: Avoid invalid memory access when relocation block
@@ -9,11 +9,11 @@ Subject: winedevice: Avoid invalid memory access when relocation block
1 file changed, 43 insertions(+), 6 deletions(-)
diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
index ef1e1ef..101fdf9 100644
index 94132ed..6bcc2b2 100644
--- a/programs/winedevice/device.c
+++ b/programs/winedevice/device.c
@@ -61,6 +61,39 @@ static LDR_MODULE *find_ldr_module( HMODULE module )
return NULL;
@@ -63,6 +63,39 @@ static LDR_MODULE *find_ldr_module( HMODULE module )
return ldr;
}
+/* change permissions of a specific memory range, save original permissions */
@@ -52,7 +52,7 @@ index ef1e1ef..101fdf9 100644
/* load the driver module file */
static HMODULE load_driver_module( const WCHAR *name )
{
@@ -84,7 +117,7 @@ static HMODULE load_driver_module( const WCHAR *name )
@@ -86,7 +119,7 @@ static HMODULE load_driver_module( const WCHAR *name )
if (nt->OptionalHeader.SectionAlignment < info.PageSize ||
!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL))
{
@@ -61,7 +61,7 @@ index ef1e1ef..101fdf9 100644
IMAGE_BASE_RELOCATION *rel, *end;
if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size )))
@@ -92,20 +125,24 @@ static HMODULE load_driver_module( const WCHAR *name )
@@ -94,20 +127,24 @@ static HMODULE load_driver_module( const WCHAR *name )
WINE_TRACE( "%s: relocating from %p to %p\n",
wine_dbgstr_w(name), (char *)module - delta, module );
end = (IMAGE_BASE_RELOCATION *)((char *)rel + size);
@@ -92,5 +92,5 @@ index ef1e1ef..101fdf9 100644
}
--
2.3.5
2.7.1