ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable/disable relay32 debugging on the fly. Start app with 

-debugmsg +relay or warn+relay. Suggested by Juergen Schmied.
This commit is contained in:
Marcus Meissner 1999-01-30 15:55:28 +00:00 committed by Alexandre Julliard
parent a1d6d247d4
commit 3ad2b93f2d
3 changed files with 60 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/builtin32.h
View File

@ -28,6 +28,7 @@ extern ENTRYPOINT32 BUILTIN32_GetEntryPoint( char *buffer, void *relay,
extern void BUILTIN32_Unimplemented( const BUILTIN32_DESCRIPTOR *descr,
int ordinal );
extern void BUILTIN32_PrintDLLs(void);
extern void BUILTIN32_SwitchRelayDebug(int onoff);
extern int BUILTIN32_EnableDLL( const char *name, int len, int enable );
#endif /* __WINE_BUILTIN32_H */

8
misc/main.c
View File

@ -28,6 +28,7 @@
#include "process.h"
#include "shell.h"
#include "winbase.h"
#include "builtin32.h"
#include "debug.h"
#include "debugdefs.h"
#include "xmalloc.h"
@ -234,7 +235,7 @@ BOOL32 MAIN_ParseDebugOptions(char *options)
extern char **debug_snoop_includelist;
extern char **debug_snoop_excludelist;
int l, cls;
int l, cls, dotracerelay = TRACE_ON(relay);
l = strlen(options);
if (l<3)
@ -330,6 +331,11 @@ BOOL32 MAIN_ParseDebugOptions(char *options)
options+=l;
}
while((*options==',')&&(*(++options)));
/* special handling for relay debugging */
if (dotracerelay != TRACE_ON(relay))
BUILTIN32_SwitchRelayDebug( TRACE_ON(relay) );
if (*options)
return FALSE;
else

53
relay32/builtin32.c
View File

@ -110,6 +110,7 @@ static BUILTIN32_DLL BuiltinDLLs[] =
{ NULL, FALSE }
};
extern void RELAY_CallFrom32();
/***********************************************************************
* BUILTIN32_DoLoadImage
@ -118,7 +119,6 @@ static BUILTIN32_DLL BuiltinDLLs[] =
*/
static HMODULE32 BUILTIN32_DoLoadImage( BUILTIN32_DLL *dll )
{
extern void RELAY_CallFrom32();
IMAGE_DATA_DIRECTORY *dir;
IMAGE_DOS_HEADER *dos;
@ -140,7 +140,7 @@ static HMODULE32 BUILTIN32_DoLoadImage( BUILTIN32_DLL *dll )
+ dll->descr->nb_funcs * sizeof(LPVOID)
+ dll->descr->nb_names * sizeof(LPSTR));
#ifdef __i386__
if (TRACE_ON(relay))
if (WARN_ON(relay) || TRACE_ON(relay))
size += dll->descr->nb_funcs * sizeof(DEBUG_ENTRY_POINT);
#endif
addr = VirtualAlloc( NULL, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE );
@ -206,7 +206,7 @@ static HMODULE32 BUILTIN32_DoLoadImage( BUILTIN32_DLL *dll )
strcpy( sec->Name, ".code" );
sec->SizeOfRawData = 0;
#ifdef __i386__
if (TRACE_ON(relay))
if (WARN_ON(relay) || TRACE_ON(relay))
sec->SizeOfRawData += dll->descr->nb_funcs * sizeof(DEBUG_ENTRY_POINT);
#endif
sec->Misc.VirtualSize = sec->SizeOfRawData;
@ -235,7 +235,7 @@ static HMODULE32 BUILTIN32_DoLoadImage( BUILTIN32_DLL *dll )
if (!dll->descr->functions[i]) continue;
*funcs = (LPVOID)((BYTE *)dll->descr->functions[i] - addr);
#ifdef __i386__
if (!TRACE_ON(relay)) continue;
if (!(WARN_ON(relay) || TRACE_ON(relay))) continue;
for (j=0;j<dll->descr->nb_names;j++)
if (dll->descr->ordinals[j] == i)
break;
@ -260,9 +260,15 @@ static HMODULE32 BUILTIN32_DoLoadImage( BUILTIN32_DLL *dll )
case 0xff: /* stub or extern */
break;
default: /* normal function (stdcall or cdecl) */
debug->call = 0xe8;
if (TRACE_ON(relay)) {
debug->call = 0xe8; /* lcall relative */
debug->callfrom32 = (DWORD)RELAY_CallFrom32 -
(DWORD)&debug->ret;
} else {
debug->call = 0xe9; /* ljmp relative */
debug->callfrom32 = (DWORD)dll->descr->functions[i] -
(DWORD)&debug->ret;
}
debug->ret = (args & 0x80) ? 0xc3 : 0xc2; /*ret/ret $n*/
debug->args = (args & 0x7f) * sizeof(int);
*funcs = (LPVOID)((BYTE *)debug - addr);
@ -360,6 +366,43 @@ ENTRYPOINT32 BUILTIN32_GetEntryPoint( char *buffer, void *relay,
return dll->descr->functions[ordinal];
}
/***********************************************************************
* BUILTIN32_SwitchRelayDebug
*
* FIXME: enhance to do it module relative.
*/
void BUILTIN32_SwitchRelayDebug(BOOL32 onoff) {
BUILTIN32_DLL *dll;
HMODULE32 hModule;
int i;
if (!(TRACE_ON(relay) || WARN_ON(relay)))
return;
for (dll = BuiltinDLLs; dll->descr; dll++) {
IMAGE_SECTION_HEADER *sec;
DEBUG_ENTRY_POINT *debug;
if (!dll->used || !(hModule = GetModuleHandle32A(dll->descr->name)))
continue;
sec = PE_SECTIONS(hModule);
debug = (DEBUG_ENTRY_POINT *)((DWORD)hModule + sec[1].VirtualAddress);
for (i = 0; i < dll->descr->nb_funcs; i++,debug++) {
if (!dll->descr->functions[i]) continue;
if ((dll->descr->args[i]==0xff) || (dll->descr->args[i]==0xfe))
continue;
if (onoff) {
debug->call = 0xe8; /* lcall relative */
debug->callfrom32 = (DWORD)RELAY_CallFrom32 -
(DWORD)&debug->ret;
} else {
debug->call = 0xe9; /* ljmp relative */
debug->callfrom32 = (DWORD)dll->descr->functions[i] -
(DWORD)&debug->ret;
}
}
}
return;
}
/***********************************************************************
* BUILTIN32_Unimplemented