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

winebuild-Fake_Dlls: Use .balign instead of .fill.

Browse Source 
Also remove the ntdll-Interrupt-0x2e dependency, which is no longer necessary.
This commit is contained in:
Sebastian Lackner 2017-05-26 05:47:07 +02:00
parent 857e9c1cd4
commit 27d1ed8f59
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
patches/patchinstall.sh
View File

@ -2100,13 +2100,6 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then
enable_wined3d_Silence_FIXMEs=1
fi
if test "$enable_winebuild_Fake_Dlls" -eq 1; then
if test "$enable_ntdll_Interrupt_0x2e" -gt 1; then
abort "Patchset ntdll-Interrupt-0x2e disabled, but winebuild-Fake_Dlls depends on that."
fi
enable_ntdll_Interrupt_0x2e=1
fi
if test "$enable_wineboot_ProxySettings" -eq 1; then
if test "$enable_wineboot_DriveSerial" -gt 1; then
abort "Patchset wineboot-DriveSerial disabled, but wineboot-ProxySettings depends on that."
@ -8628,9 +8621,6 @@ fi
# Patchset winebuild-Fake_Dlls
# |
# | This patchset has the following (direct or indirect) dependencies:
# | * ntdll-Interrupt-0x2e
# |
# | This patchset fixes the following Wine bugs:
# | * [#42741] Various improvements for fake dlls
# |

15
patches/winebuild-Fake_Dlls/0008-winebuild-Try-to-make-sure-RVA-matches-between-fake-.patch
View File

@ -1,4 +1,4 @@
From c0531d2c7497a915a66919d0c4ef53be24e17909 Mon Sep 17 00:00:00 2001
From e54235a7c141af9b983d7d02b2a838c9adccf0da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 25 May 2017 21:46:27 +0200
Subject: winebuild: Try to make sure RVA matches between fake and builtin
@ -7,8 +7,8 @@ Subject: winebuild: Try to make sure RVA matches between fake and builtin
---
dlls/kernel32/tests/loader.c | 1 -
libs/wine/loader.c | 13 +++++++++++--
tools/winebuild/spec32.c | 22 +++++++++++++++++++---
3 files changed, 30 insertions(+), 6 deletions(-)
tools/winebuild/spec32.c | 23 ++++++++++++++++++++---
3 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
index a8f9e1f12d3..09ba7d435b0 100644
@ -54,10 +54,10 @@ index 89ae93503d3..8ace917d91d 100644
memcpy( sec->Name, ".text", sizeof(".text") );
diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index 4dda31c349b..1e4e481e72c 100644
index 4dda31c349b..6a8a5d07ebd 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -280,14 +280,23 @@ static void output_relay_debug( DLLSPEC *spec )
@@ -280,14 +280,24 @@ static void output_relay_debug( DLLSPEC *spec )
*/
static void output_syscall_thunks( DLLSPEC *spec )
{
@ -77,13 +77,14 @@ index 4dda31c349b..1e4e481e72c 100644
+
+ output( "\t.align %d\n", get_alignment(65536) );
+ output( "__wine_spec_pe_header_syscalls:\n" );
+ output( "\t.fill %d\n", page_size );
+ output( "\t.byte 0\n" );
+ output( "\t.balign %d, 0\n", get_alignment(page_size) );
+ output( "\n/* syscall thunks */\n\n" );
for (i = 0; i < spec->nb_syscalls; i++)
{
ORDDEF *odp = spec->syscalls[i];
@@ -666,7 +675,14 @@ void output_module( DLLSPEC *spec )
@@ -666,7 +676,14 @@ void output_module( DLLSPEC *spec )
output( "\t.long 0,0\n" ); /* DataDirectory[12] */
output( "\t.long 0,0\n" ); /* DataDirectory[13] */
output( "\t.long 0,0\n" ); /* DataDirectory[14] */

1
patches/winebuild-Fake_Dlls/definition
View File

@ -1,2 +1 @@
Fixes: [42741] Various improvements for fake dlls
Depends: ntdll-Interrupt-0x2e