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 85d8d1390467147fca416236fd50bb6ea2e2c8e4

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-09-13 08:44:02 +10:00
parent 6ef7be2566
commit 26e542b4e5
3 changed files with 44 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
patches/ntdll-Interrupt-0x2e/0001-ntdll-Catch-windows-int-0x2e-syscall-on-i386.patch
View File

@@ -1,49 +1,38 @@
From 40f4e264b0c957eafe187bc0de597c3aa18dc6be Mon Sep 17 00:00:00 2001
From ee30dc13a100788219ecc357056f8edf3a2f2113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 19 Mar 2017 19:08:34 +0100
Subject: ntdll: Catch windows int 0x2e syscall on i386.
Subject: [PATCH] ntdll: Catch windows int 0x2e syscall on i386.
---
dlls/ntdll/signal_i386.c | 13 +++++++++++++
dlls/ntdll/signal_i386.c | 10 +++++++++-
include/wine/exception.h | 1 +
2 files changed, 14 insertions(+)
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index d76fe95dfa..93d9418527 100644
index 8876790195..7ddc64284e 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -1572,6 +1572,14 @@ static inline BOOL handle_interrupt( unsigned int interrupt, EXCEPTION_RECORD *r
rec->ExceptionInformation[1] = context->Ecx;
rec->ExceptionInformation[2] = context->Edx;
@@ -1945,6 +1944,15 @@ static BOOL handle_interrupt( unsigned int interrupt, ucontext_t *sigcontext, st
stack->rec.ExceptionInformation[2] = stack->context.Edx;
setup_raise_exception( sigcontext, stack );
return TRUE;
+ case 0x2e:
+ context->Eip += 2;
+ rec->ExceptionCode = EXCEPTION_WINE_SYSCALL;
+ rec->ExceptionAddress = (void *)context->Eip;
+ rec->NumberParameters = 2;
+ rec->ExceptionInformation[0] = context->Eax;
+ rec->ExceptionInformation[1] = context->Edx;
+ stack->context.Eip += 2;
+ stack->rec.ExceptionCode = EXCEPTION_WINE_SYSCALL;
+ stack->rec.ExceptionAddress = (void *)stack->context.Eip;
+ stack->rec.NumberParameters = 2;
+ stack->rec.ExceptionInformation[0] = stack->context.Eax;
+ stack->rec.ExceptionInformation[1] = stack->context.Edx;
+ setup_raise_exception( sigcontext, stack );
+ return TRUE;
default:
return FALSE;
}
@@ -1953,6 +1961,11 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context
}
}
break;
+ case EXCEPTION_WINE_SYSCALL:
+ FIXME("unimplemented syscall handler for 0x%lx, stack 0x%lx\n",
+ rec->ExceptionInformation[0], rec->ExceptionInformation[1]);
+ context->Eax = STATUS_INVALID_SYSTEM_SERVICE;
+ goto done;
}
status = NtRaiseException( rec, context, TRUE );
raise_status( status, rec );
diff --git a/include/wine/exception.h b/include/wine/exception.h
index f275568f4d..b8aeb3b866 100644
index 3281130c50..e822573ace 100644
--- a/include/wine/exception.h
+++ b/include/wine/exception.h
@@ -302,6 +302,7 @@ static inline EXCEPTION_REGISTRATION_REC
@@ -315,6 +315,7 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void)
#define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */
#define EXCEPTION_WINE_ASSERTION 0x80000101 /* assertion failed */
@@ -52,4 +41,5 @@ index f275568f4d..b8aeb3b866 100644
#ifdef __cplusplus
}
--
2.11.0
2.17.1