Alexandre Julliard : ntdll: Avoid using the CONTEXT86 type.
Alexandre Julliard
julliard at winehq.org
Wed Oct 20 13:24:40 CDT 2010
Module: wine
Branch: master
Commit: 085d398302c920e039a22007282777202e078704
URL: http://source.winehq.org/git/wine.git/?a=commit;h=085d398302c920e039a22007282777202e078704
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Oct 20 15:33:49 2010 +0200
ntdll: Avoid using the CONTEXT86 type.
---
dlls/ntdll/relay.c | 6 +++---
dlls/ntdll/signal_i386.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c
index a2d5377..296a89a 100644
--- a/dlls/ntdll/relay.c
+++ b/dlls/ntdll/relay.c
@@ -444,7 +444,7 @@ static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx,
#ifdef __i386__
void WINAPI __regs_relay_call_regs( struct relay_descr *descr, unsigned int idx,
unsigned int orig_eax, unsigned int ret_addr,
- CONTEXT86 *context )
+ CONTEXT *context )
{
WORD ordinal = LOWORD(idx);
BYTE nb_args = LOBYTE(HIWORD(idx));
@@ -922,7 +922,7 @@ static void SNOOP_PrintArg(DWORD x)
#define CALLER1REF (*(DWORD*)context->Esp)
-void WINAPI __regs_SNOOP_Entry( CONTEXT86 *context )
+void WINAPI __regs_SNOOP_Entry( CONTEXT *context )
{
DWORD ordinal=0,entry = context->Eip - 5;
SNOOP_DLL *dll = firstdll;
@@ -1015,7 +1015,7 @@ void WINAPI __regs_SNOOP_Entry( CONTEXT86 *context )
}
-void WINAPI __regs_SNOOP_Return( CONTEXT86 *context )
+void WINAPI __regs_SNOOP_Return( CONTEXT *context )
{
SNOOP_RETURNENTRY *ret = (SNOOP_RETURNENTRY*)(context->Eip - 5);
SNOOP_FUN *fun = &ret->dll->funs[ret->ordinal];
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index c08693e..f30a617 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -1428,7 +1428,7 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from )
* Check if the fault location is a privileged instruction.
* Based on the instruction emulation code in dlls/kernel/instr.c.
*/
-static inline DWORD is_privileged_instr( CONTEXT86 *context )
+static inline DWORD is_privileged_instr( CONTEXT *context )
{
const BYTE *instr;
unsigned int prefix_count = 0;
More information about the wine-cvs
mailing list