Bugfix: relay/snoop debugging was broken by last patch ...

relay32/kernel32.spec

@@ -924,7 +924,3 @@ import  ntdll.dll
 #1599 wrong ordinal (249 in Win32s's W32SCOMB.DLL) !
 1599 stdcall Get16DLLAddress(long str) Get16DLLAddress
 
-# Wine internal functions
-1600 register SNOOP_Entry() SNOOP_Entry
-1601 register SNOOP_Return() SNOOP_Return
-1602 register RELAY_CallFrom32Regs() RELAY_CallFrom32Regs

relay32/relay386.c

@@ -61,6 +61,8 @@ int RELAY_ShowDebugmsgRelay(const char *func) {
 }
 
 
+#ifdef __i386__
+
 /***********************************************************************
  *           RELAY_PrintArgs
  */
@@ -222,7 +224,9 @@ int RELAY_CallFrom32( int ret_addr, ... )
  *  ...    >128 bytes space free to be modified (ensured by the assembly glue)
  */
 
-void WINAPI RELAY_CallFrom32Regs( CONTEXT86 *context )
+void WINAPI RELAY_DoCallFrom32Regs( CONTEXT86 *context );
+DEFINE_REGS_ENTRYPOINT_0( RELAY_CallFrom32Regs, RELAY_DoCallFrom32Regs )
+void WINAPI RELAY_DoCallFrom32Regs( CONTEXT86 *context )
 {
     unsigned int typemask;
     char buffer[80];
@@ -301,4 +305,5 @@ void WINAPI RELAY_CallFrom32Regs( CONTEXT86 *context )
 
     SYSLEVEL_CheckNotLevel( 2 );
 }
+#endif /* __i386__ */
 

relay32/snoop.c

@@ -24,11 +24,11 @@ DEFAULT_DEBUG_CHANNEL(snoop)
 
 char **debug_snoop_excludelist = NULL, **debug_snoop_includelist = NULL;
 
+#ifdef __i386__
+
 extern void WINAPI SNOOP_Entry();
 extern void WINAPI SNOOP_Return();
 
-#ifdef __i386__
-
 #ifdef NEED_UNDERSCORE_PREFIX
 # define PREFIX "_"
 #else
@@ -251,7 +251,10 @@ SNOOP_PrintArg(DWORD x) {
 }
 
 #define CALLER1REF (*(DWORD*)ESP_reg(context))
-void WINAPI SNOOP_Entry( CONTEXT86 *context )
+
+void WINAPI SNOOP_DoEntry( CONTEXT86 *context );
+DEFINE_REGS_ENTRYPOINT_0( SNOOP_Entry, SNOOP_DoEntry );
+void WINAPI SNOOP_DoEntry( CONTEXT86 *context )
 {
 	DWORD		ordinal=0,entry = EIP_reg(context)-5;
 	SNOOP_DLL	*dll = firstdll;
@@ -331,7 +334,9 @@ void WINAPI SNOOP_Entry( CONTEXT86 *context )
 	DPRINTF(") ret=%08lx fs=%04lx\n",(DWORD)ret->origreturn,FS_reg(context));
 }
 
-void WINAPI SNOOP_Return( CONTEXT86 *context )
+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*)(EIP_reg(context)-5);