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

Fix compilation warnings.

Browse Source
This commit is contained in:
Sebastian Lackner
2014-10-19 07:43:41 +02:00
parent 4410ccbead
commit 2dcb4d2c27
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/ntdll-ATL_Thunk/0002-ntdll-Add-support-for-additional-ATL-thunks.patch
View File

@@ -1,4 +1,4 @@
From 31046c5a489a1b646b6dfb94c8156b96bb40bd2e Mon Sep 17 00:00:00 2001
From 89c0a2039200b6e273be02ee25c45b84ecd320cd Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 18 Oct 2014 04:32:27 +0200
Subject: ntdll: Add support for additional ATL thunks.
@@ -53,7 +53,7 @@ index 6971144..3be2977 100644
ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls );
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index f97799c..b2a9cb0 100644
index f97799c..13df4bb 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -1616,12 +1616,46 @@ static inline BOOL check_invalid_gs( CONTEXT *context )
@@ -173,7 +173,7 @@ index f97799c..b2a9cb0 100644
+ thunk_copy.t5.inst2 == 0x0460)
+ {
+ DWORD func, stack[2];
+ if (virtual_uninterrupted_read_memory( context->Esp,
+ if (virtual_uninterrupted_read_memory( (DWORD *)context->Esp,
+ stack, sizeof(stack) ) == sizeof(stack) &&
+ virtual_uninterrupted_read_memory( (DWORD *)stack[1] + 1,
+ &func, sizeof(DWORD) ) == sizeof(DWORD) &&