Sat Apr 29 20:42:01 1995 Alexandre Julliard (julliard@sunsite.unc.edu) * [controls/static.c] Fixed painting of SS_*FRAME controls. * [if1632/callback.c] Pass the window instance as DS to the 16-bit window procedure. Rewrote Catch() and Throw() to make them work with multiple tasks. * [loader/main.c] New function MAIN_Init() to perform initializations before the first task is started instead of doing them in InitApp(). Temporary hack to command-line parsing to load one program per command-line argument, to make testing task-switching easier. * [loader/*.c] Reimplemented modules to use a Windows-compatible layout and to allow multiple tasks and multiple module instances. Not really finished yet. * [loader/task.c] [misc/exec.c] Reimplemented tasks to use a common address space, and implemented preliminary task-switching capabilities. * [memory/global.c] Fixed bug in GlobalNext(). * [misc/main.c] Updated the list of contributors. Let me know if I forgot someone. * [miscemu/int21.c] Use one DTA per task instead of a global one. * [objects/bitblt.c] Fixed bug in BitBlt() that could cause BadMatch errors. * [tools/build.c] Added new function type 'stub', that makes possible to export an unimplemented function by name as well as by ordinal. This will avoid loading errors for unimplemented functions. Generate an in-memory module layout for built-in DLLs so that the same code can be used for built-in and loaded modules. Changed relay code to make it unnecessary to save the value of the BP register. * [windows/message.c] Implemented multiple message queues and preliminary task-switching capabilities. Inter-task SendMessage() calls are not implemented yet and will probably cause crashes if used. * [windows/property.c] Reimplemented properties and allocate them on the USER heap. * [windows/win.c] Fixed bug in SetWindowWord(). Reimplemented EnumWindows() and EnumTaskWindows(). Tue Apr 18 09:48:38 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de> * [misc/main.c] GetSystemParametersInfo(): Additional action SPI_GETICONTITLEFONT. * [loader/resource.c] Removed the check for NE_SEGFLAGS_EXECUTEONLY, since it broke control.exe. Fixed icon loading. * [objects/font.c] [include/windows.h] Fixed a bug in InitFontsList() and worked on the EnumFonts() functions to make them comprehensible. * [controls/button.c] Fixed my previous patch to handle LBUTTONUP messages. Fri Apr 14 11:41:28 1995 Cameron Heide (heide@ee.ualberta.ca) * [misc/network.c, misc/dos_fs.c] Implemented WNetGetConnection. All that is currently supported are drives, for which the remote name is simply the redirected UNIX directory name. * [miscemu/int2?.c] More drive number validity checking. Wed Apr 12 11:28:37 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de> * [controls/listbox.c] Oops, my previous change to ListBoxDirectory broke the Borland file open dialog. Fixed. Mon Apr 10 23:17:12 1995 Martin von Loewis <loewis@informatik.hu-berlin.de> * [if1632/ole2nls.spec] [misc/ole2nls.c] [misc/Imakefile] New file ole2nls.c. Added stubs for GetUserDefaultLCID, GetSystemDefaultLCID, GetUserDefaultLangID, GetSystemDefaultLangID. Mon Apr 10 10:05:18 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de> * [memory/global.c] [memory/local.c] [include/windows.h] GlobalReAlloc(): If GMEM_MODIFY is set, don't resize the block. LocalReAlloc(): Same for LMEM_MODIFY. * [controls/listbox.c] Fixed a bug in ListBoxDirectory that prevented commdlg from working. Check for errors in some more places. * [if1632/gdi.spec] [if1632/user.spec] 16 bit callback functions should be passed as segptrs. * [include/dlls.h] [loader/ne_image.c] [loader/selector.c] [loader/library.c] Prevent a DLL from being initialized twice (Borlands Resource Workshop used to do this). Provide an additional flag for each w_file that indicates whether it's an EXE or a DLL, for combinations like pbrush.exe/.dll. * [controls/button.c] Handle LBUTTONUP messages even if the button no longer has the capture (for WinHelp). * [include/wintypes.h] FARPROC is now a segptr for the emulator and a function pointer for the library. * [misc/commdlg.c] [misc/commdlg.h] Cleaned the file dialogs up a little. They now work reasonably well, although there are still some problems (e.g. files are initially invisible). * [windows/class.c] [if1632/user.spec] [include/windows.h] GetClassInfo() must take a segptr, as it checks whether the highword is zero. GetClassName() called the wrong atom function. No surprise it didn't find anything. * [misc/lstr.c] AnsiToOem() and OemToAnsi() didn't terminate the strings. Fixed. Removed some warnings. * [if1632/relay.c] [if1632/ddeml.spec] [include/dlls.h] New spec file for the 3.1 DDEML DDL. * [controls/menu.c] Small fix to ChangeMenu - mask out the obsolete flags (MF_APPEND == MF_OWNERDRAW, this led to problems). It also had problems with the MF_BYPOSITION flag. * [windows/message.c] SendMessage(): call the WH_CALLWNDPROC hook function. This is rather ugly, I'm afraid. Windows probably passes a pointer to the 16 bit stack for speed reasons. * [windows/hook.c] [include/windows.h] Set/HookWindowsHook() shouldn't just call their *Ex counterparts, as they have slightly different semantics. MS Hearts now works somewhat, if you disable the new builtin DDEML. The graphics are completely messed up, though.
297 lines
7.1 KiB
C
297 lines
7.1 KiB
C
/*
|
|
* Wine debugger utility routines
|
|
* Eric Youngdale
|
|
* 9/93
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include "ldt.h"
|
|
#include "db_disasm.h"
|
|
#include "regpos.h"
|
|
|
|
extern int * regval;
|
|
extern unsigned int dbg_mask;
|
|
extern unsigned int dbg_mode;
|
|
|
|
void application_not_running()
|
|
{
|
|
fprintf(stderr,"Application not running\n");
|
|
}
|
|
|
|
void print_address(unsigned int addr, FILE * outfile, int addrlen)
|
|
{
|
|
if (addrlen == 16)
|
|
{
|
|
fprintf( outfile, "%4.4x:%4.4x", addr >> 16, addr & 0xffff );
|
|
}
|
|
else
|
|
{
|
|
extern char * find_nearest_symbol(unsigned int *);
|
|
|
|
char * name = find_nearest_symbol((unsigned int *) addr);
|
|
if(name)
|
|
fprintf(outfile,"0x%8.8x(%s)", addr, name);
|
|
else
|
|
fprintf(outfile,"0x%8.8x", addr);
|
|
}
|
|
}
|
|
|
|
|
|
void info_reg(){
|
|
|
|
if(!regval) {
|
|
application_not_running();
|
|
return;
|
|
}
|
|
|
|
fprintf(stderr,"Register dump:\n");
|
|
/* First get the segment registers out of the way */
|
|
fprintf(stderr," CS:%4.4x SS:%4.4x DS:%4.4x ES:%4.4x GS:%4.4x FS:%4.4x\n",
|
|
SC_CS, SC_SS, SC_DS, SC_ES, SC_GS, SC_FS);
|
|
|
|
/* Now dump the main registers */
|
|
fprintf(stderr," EIP:%8.8x ESP:%8.8x EBP:%8.8x EFLAGS:%8.8x\n",
|
|
SC_EIP(dbg_mask), SC_ESP(dbg_mask), SC_EBP(dbg_mask), SC_EFLAGS);
|
|
|
|
/* And dump the regular registers */
|
|
|
|
fprintf(stderr," EAX:%8.8x EBX:%8.8x ECX:%8.8x EDX:%8.8x\n",
|
|
SC_EAX(dbg_mask), SC_EBX(dbg_mask), SC_ECX(dbg_mask), SC_EDX(dbg_mask));
|
|
|
|
/* Finally dump these main registers */
|
|
fprintf(stderr," EDI:%8.8x ESI:%8.8x\n",
|
|
SC_EDI(dbg_mask), SC_ESI(dbg_mask));
|
|
|
|
}
|
|
|
|
void info_stack(){
|
|
unsigned int * dump;
|
|
int i;
|
|
|
|
if(!regval) {
|
|
application_not_running();
|
|
return;
|
|
}
|
|
|
|
fprintf(stderr,"Stack dump:\n");
|
|
dump = (int*) SC_EIP(dbg_mask);
|
|
for(i=0; i<22; i++)
|
|
{
|
|
fprintf(stderr," %8.8x", *dump++);
|
|
if ((i % 8) == 7)
|
|
fprintf(stderr,"\n");
|
|
}
|
|
fprintf(stderr,"\n");
|
|
}
|
|
|
|
|
|
void examine_memory(int addr, int count, char format){
|
|
char * pnt;
|
|
unsigned int * dump;
|
|
unsigned short int * wdump;
|
|
int i;
|
|
|
|
if((addr & 0xffff0000) == 0 && dbg_mode == 16)
|
|
addr |= (format == 'i' ? SC_CS : SC_DS) << 16;
|
|
|
|
if(format != 'i' && count > 1) {
|
|
print_address(addr, stderr, dbg_mode);
|
|
fprintf(stderr,": ");
|
|
};
|
|
|
|
switch(format){
|
|
case 's':
|
|
pnt = dbg_mode == 16 ? (char *)PTR_SEG_TO_LIN(addr)
|
|
: (char *)addr;
|
|
if (count == 1) count = 256;
|
|
while(*pnt && count) {
|
|
fputc( *pnt++, stderr);
|
|
count--;
|
|
};
|
|
fprintf(stderr,"\n");
|
|
return;
|
|
|
|
case 'i':
|
|
for(i=0; i<count; i++) {
|
|
print_address(addr, stderr, dbg_mode);
|
|
fprintf(stderr,": ");
|
|
addr = db_disasm( addr, 0, (dbg_mode == 16) );
|
|
fprintf(stderr,"\n");
|
|
};
|
|
return;
|
|
case 'x':
|
|
dump = dbg_mode == 16 ? (unsigned int *)PTR_SEG_TO_LIN(addr)
|
|
: (unsigned int *)addr;
|
|
for(i=0; i<count; i++)
|
|
{
|
|
fprintf(stderr," %8.8x", *dump++);
|
|
addr += 4;
|
|
if ((i % 8) == 7) {
|
|
fprintf(stderr,"\n");
|
|
print_address(addr, stderr, dbg_mode);
|
|
fprintf(stderr,": ");
|
|
};
|
|
}
|
|
fprintf(stderr,"\n");
|
|
return;
|
|
|
|
case 'd':
|
|
dump = dbg_mode == 16 ? (unsigned int *)PTR_SEG_TO_LIN(addr)
|
|
: (unsigned int *)addr;
|
|
for(i=0; i<count; i++)
|
|
{
|
|
fprintf(stderr," %d", *dump++);
|
|
addr += 4;
|
|
if ((i % 8) == 7) {
|
|
fprintf(stderr,"\n");
|
|
print_address(addr, stderr, dbg_mode);
|
|
fprintf(stderr,": ");
|
|
};
|
|
}
|
|
fprintf(stderr,"\n");
|
|
return;
|
|
|
|
case 'w':
|
|
wdump = dbg_mode == 16 ? (unsigned short *)PTR_SEG_TO_LIN(addr)
|
|
: (unsigned short *)addr;
|
|
for(i=0; i<count; i++)
|
|
{
|
|
fprintf(stderr," %x", *wdump++);
|
|
addr += 2;
|
|
if ((i % 10) == 7) {
|
|
fprintf(stderr,"\n");
|
|
print_address(addr, stderr, dbg_mode);
|
|
fprintf(stderr,": ");
|
|
};
|
|
}
|
|
fprintf(stderr,"\n");
|
|
return;
|
|
|
|
case 'c':
|
|
pnt = dbg_mode == 16 ? (char *)PTR_SEG_TO_LIN(addr)
|
|
: (char *)addr;
|
|
for(i=0; i<count; i++)
|
|
{
|
|
if(*pnt < 0x20) {
|
|
fprintf(stderr," ");
|
|
pnt++;
|
|
} else
|
|
fprintf(stderr," %c", *pnt++);
|
|
addr++;
|
|
if ((i % 32) == 7) {
|
|
fprintf(stderr,"\n");
|
|
print_address(addr, stderr, dbg_mode);
|
|
fprintf(stderr,": ");
|
|
};
|
|
}
|
|
fprintf(stderr,"\n");
|
|
return;
|
|
|
|
case 'b':
|
|
pnt = dbg_mode == 16 ? (char *)PTR_SEG_TO_LIN(addr)
|
|
: (char *)addr;
|
|
for(i=0; i<count; i++)
|
|
{
|
|
fprintf(stderr," %02x", (*pnt++) & 0xff);
|
|
addr++;
|
|
if ((i % 32) == 7) {
|
|
fprintf(stderr,"\n");
|
|
print_address(addr, stderr, dbg_mode);
|
|
fprintf(stderr,": ");
|
|
};
|
|
}
|
|
fprintf(stderr,"\n");
|
|
return;
|
|
};
|
|
|
|
/* The rest are fairly straightforward */
|
|
|
|
fprintf(stderr,"examine mem: %x %d %c\n", addr, count, format);
|
|
}
|
|
|
|
char * helptext[] = {
|
|
"The commands accepted by the Wine debugger are a small subset",
|
|
"of the commands that gdb would accept. The commands currently",
|
|
"are:\n",
|
|
" break *<addr> bt",
|
|
" disable bpnum enable bpnum",
|
|
" help quit",
|
|
" x <expr> cont",
|
|
" mode [16,32] print <expr>",
|
|
" set <reg> = <expr> set *<expr> = <expr>",
|
|
" info [reg,stack,break,segments] symbolfile <filename>",
|
|
" define <identifier> <expr>",
|
|
"",
|
|
"The 'x' command accepts repeat counts and formats (including 'i') in the",
|
|
"same way that gdb does.",
|
|
"",
|
|
" The following are examples of legal expressions:",
|
|
" $eax $eax+0x3 0x1000 ($eip + 256) *$eax *($esp + 3)",
|
|
" Also, a nm format symbol table can be read from a file using the",
|
|
" symbolfile command. Symbols can also be defined individually with",
|
|
" the define command.",
|
|
"",
|
|
NULL};
|
|
|
|
void dbg_help(){
|
|
int i;
|
|
i = 0;
|
|
while(helptext[i]) fprintf(stderr,"%s\n", helptext[i++]);
|
|
}
|
|
|
|
|
|
struct frame{
|
|
union{
|
|
struct {
|
|
unsigned short saved_bp;
|
|
unsigned short saved_ip;
|
|
unsigned short saved_cs;
|
|
} win16;
|
|
struct {
|
|
unsigned long saved_bp;
|
|
unsigned long saved_ip;
|
|
unsigned short saved_cs;
|
|
} win32;
|
|
} u;
|
|
};
|
|
|
|
|
|
void dbg_bt(){
|
|
struct frame * frame;
|
|
unsigned short cs;
|
|
int frameno = 0;
|
|
|
|
if(!regval) {
|
|
application_not_running();
|
|
return;
|
|
}
|
|
|
|
if (dbg_mode == 16)
|
|
frame = (struct frame *)PTR_SEG_OFF_TO_LIN( SC_SS, SC_BP & ~1 );
|
|
else
|
|
frame = (struct frame *)SC_EBP(dbg_mask);
|
|
|
|
fprintf(stderr,"Backtrace:\n");
|
|
cs = SC_CS;
|
|
while((cs & 3) == 3) {
|
|
/* See if in 32 bit mode or not. Assume GDT means 32 bit. */
|
|
if ((cs & 7) != 7) {
|
|
extern int main();
|
|
fprintf(stderr,"%d ",frameno++);
|
|
print_address(frame->u.win32.saved_ip,stderr,32);
|
|
fprintf( stderr, "\n" );
|
|
if (frame->u.win32.saved_ip >= ((unsigned long)main) &&
|
|
frame->u.win32.saved_ip <= ((unsigned long)main+1000)) break;
|
|
frame = (struct frame *) frame->u.win32.saved_bp;
|
|
} else {
|
|
if (frame->u.win16.saved_bp & 1) cs = frame->u.win16.saved_cs;
|
|
fprintf(stderr,"%d %4.4x:%4.4x\n", frameno++, cs,
|
|
frame->u.win16.saved_ip);
|
|
if (!frame->u.win16.saved_bp) break;
|
|
frame = (struct frame *) PTR_SEG_OFF_TO_LIN( SC_SS, frame->u.win16.saved_bp & ~1);
|
|
}
|
|
}
|
|
putchar('\n');
|
|
}
|
|
|