commit 85d666aef1ff98fc570e73a95c98277c7489c3f6
author Alexandre Julliard <julliard@winehq.org> Tue Dec 12 00:49:45 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Dec 12 00:49:45 2000 +0000
tree 55b719563b7225d6bc1ff2914aae46a42cdcba73
parent a67369ea00bbc78d292d9f3a6d847acba70e7b87

Use __ASM_GLOBAL_FUNC directly in i386-only code.

relay32/snoop.c

diff --git a/relay32/snoop.c b/relay32/snoop.c
index 37b978e..80f96aa 100644
--- a/relay32/snoop.c
+++ b/relay32/snoop.c
@@ -258,8 +258,6 @@
 
 #define CALLER1REF (*(DWORD*)context->Esp)
 
-void WINAPI SNOOP_DoEntry( CONTEXT86 *context );
-DEFINE_REGS_ENTRYPOINT_0( SNOOP_Entry, SNOOP_DoEntry );
 void WINAPI SNOOP_DoEntry( CONTEXT86 *context )
 {
 	DWORD		ordinal=0,entry = context->Eip - 5;
@@ -340,8 +338,7 @@
 	DPRINTF(") ret=%08lx fs=%04lx\n",(DWORD)ret->origreturn,context->SegFs);
 }
 
-void WINAPI SNOOP_DoReturn( CONTEXT86 *context );
-DEFINE_REGS_ENTRYPOINT_0( SNOOP_Return, SNOOP_DoReturn );
+
 void WINAPI SNOOP_DoReturn( CONTEXT86 *context )
 {
 	SNOOP_RETURNENTRY	*ret = (SNOOP_RETURNENTRY*)(context->Eip - 5);
@@ -373,6 +370,15 @@
 			context->Eax,(DWORD)ret->origreturn,context->SegFs );
 	ret->origreturn = NULL; /* mark as empty */
 }
+
+/* assembly wrappers that save the context */
+__ASM_GLOBAL_FUNC( SNOOP_Entry,
+                   "call " __ASM_NAME("CALL32_Regs") "\n\t"
+                   ".long " __ASM_NAME("SNOOP_DoEntry") ",0" );
+__ASM_GLOBAL_FUNC( SNOOP_Return,
+                   "call " __ASM_NAME("CALL32_Regs") "\n\t"
+                   ".long " __ASM_NAME("SNOOP_DoReturn") ",0" );
+
 #else	/* !__i386__ */
 void SNOOP_RegisterDLL(HMODULE hmod,LPCSTR name,DWORD nrofordinals) {
 	FIXME("snooping works only on i386 for now.\n");