Release 970112
Sat Jan 11 18:17:59 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/menu.c]
Updated to new Win32 types.
* [controls/listbox.c]
Fixed Winfile extended selection bug.
* [files/directory.c]
Changed DIR_SearchPath to return both long and short file names.
* [files/dos_fs.c]
Implemented VFAT ioctl to retrieve the original short filenames
from a VFAT filesystem (Linux only for now).
Replaced DOSFS_GetUnixFileName()/DOSFS_GetDosTrueName() by
DOS_GetFullName().
Properly implemented GetShortPathName() and GetFullPathName().
Made all functions re-entrant.
* [files/file.c] [misc/main.c]
Replaced -allowreadonly option by -failreadonly. The default is
now to report success when opening a read-only file for writing.
* [objects/metafile.c]
Fixed bug in DIB bitmaps pointer calculation.
* [scheduler/process.c]
Implemented environment strings and Get/SetStdHandle with process
environment block.
* [tools/build.c]
Rewrote BuildContext32() to avoid instructions that may not be
supported by all assemblers.
Fri Jan 10 17:11:09 1997 David Faure <david.faure@ifhamy.insa-lyon.fr>
* [windows/event.c]
Created table keyc2vkey, which associate a vkey(+extended bit) to
any keycode. Changed EVENT_event_to_vkey to use this table to
return the correct vkey. Changed EVENT_ToAscii to get the keycode
from this table too. Assigned OEM specific vkeys arbitrarily.
Fri Jan 10 09:26:17 1997 John Harvey <john@division.co.uk>
* [misc/winsock.c] [misc/winsoc_async.c]
Fixed svr4 header files.
Changed bzero() to memset().
* [tools/fnt2bdf.c]
Removed bcopy() and used memcpy() instead.
* [debugger/msc.c]
Include string.h instead of strings.h
* [debugger/stabs.c]
Include string.h instead of strings.h.
Define __ELF__ for svr4 systems.
* [loader/signal.c]
Use wait() instead of wait4() which doesnt exist on Unixware.
* [memory/global.c]
Use sysconf() instead of getpagesize() for svr4 systems.
Thu Jan 9 21:07:20 1997 Robert Pouliot <krynos@clic.net>
* [Make.rules.in] [Makefile.in] [make_os2.sh] [rc/Makefile.in]
[tools/Makefile.in] [documentation/wine_os2.txt]
Patches for OS/2 support. Note that it doesn't compile yet.
Tue Jan 7 20:03:53 1997 Eric Youngdale <eric@sub2304.jic.com>
* [debugger/*]
Many more debugger improvements (see debugger/README for details).
Tue Jan 7 15:12:21 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [windows/graphics.c] [objects/text.c] [graphics/x11drv/*]
[graphics/metafiledrv/*]
Moved some device dependent code into the resp. subdirs.
* [include/gdi.h] [include/metafiledrv.h] [include/x11drv.h]
Prototypes added,
DC_FUNCTIONS: GetPixel added, some unnecessary functions removed.
* [objects/region.c]
CreatePolyPolygonRgn32 added.
* [files/dos_fs.c]
QueryDosDevice added.
* [misc/lstr.c]
FormatMessage: broken heap management fixed.
* [scheduler/process.c] [scheduler/thread.c]
Get/SetThreadPriority/PriorityClass added.
Mon Jan 6 21:55:30 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [misc/keyboard.c]
ToAscii : Use EVENT_ToAscii instead.
* [windows/event.c]
keypad_key : Do not convert XK_Mode_switch to VK_MENU; recognize
keypad cursor keys.
EVENT_event_to_vkey : New function, to transform a X keycode
into a MSwin vkey + extended bit.
EVENT_ToAscii : New function, to transform a vkey + extended bit
(+ key state table) into ascii char(s), using XLookupString, and
recognizing dead chars.
EVENT_key : Transform AltGr into Ctrl+Alt sequence; call
EVENT_event_to_vkey for keycode to vkey conversion; fixed
previous, context and extended bits.
* [windows/keyboard.c]
Include stddebug.h, to get -debugmsg messages.
GetKeyState : Handle VK_MBUTTON case.
GetKeyboardState, SetKeyboardState : Debugging messages added.
* [windows/message.c]
TranslateMessage : Handle dead chars.
Mon Jan 6 20:10:11 1997 Dominik Strasser <bm424953@muenchen.org>
* [if1632/crtdll.spec] [misc/crtdll.c]
C++ functions new/delete/set_new_handler implemented.
Mon Jan 6 15:48:15 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c] [include/windows.h]
Moved the edit control to 32 bits.
Included new (win95) message definitions in windows.h
Implemented EM_SCROLLCARET, EM_SETMARGINS, EM_GETMARGINS,
EM_GETLIMITTEXT, EM_POSFROMCHAR, EM_CHARFROMPOS.
Broke EM_SETWORDBREAKPROC (internal wordwrap still works).
Fixed some bugs, introduced a couple of others.
Text buffer is now initially in 32-bit heap.
* [controls/EDIT.TODO] [controls/combo.c] [controls/widgets.c]
[if1632/wprocs.spec] [library/miscstubs.c] [windows/defdlg.c]
[misc/commdlg.c]
Updated to work with 32-bit edit control.
Sat Jan 4 22:07:27 1997 O.Flebbe <O.Flebbe@science-computing.uni-tuebingen.de>
* [loader/pe_image.c]
Use mmap rather then malloc. Better workaround for clean
segments.
diff --git a/debugger/db_disasm.c b/debugger/db_disasm.c
index cb230c6..32e0d44 100644
--- a/debugger/db_disasm.c
+++ b/debugger/db_disasm.c
@@ -72,6 +72,13 @@
static BOOL32 db_disasm_16 = FALSE;
/*
+ * Flag to indicate whether we need to display instruction,
+ * or whether we just need to know the address of the next
+ * instruction.
+ */
+static BOOL32 db_display = FALSE;
+
+/*
* Size attributes
*/
#define BYTE 0
@@ -1009,7 +1016,7 @@
break;
case LONG:
{
- DBG_ADDR address = { 0, addr };
+ DBG_ADDR address = { NULL, 0, addr };
DEBUG_PrintAddress( &address, db_disasm_16 ? 16 : 32, TRUE );
}
break;
@@ -1057,6 +1064,11 @@
const char * name;
get_value_inc(regmodrm, addr, 1, FALSE);
+ if( !db_display )
+ {
+ return;
+ }
+
fp = &db_Esc_inst[inst - 0xd8][f_reg(regmodrm)];
mod = f_mod(regmodrm);
if (mod != 3) {
@@ -1128,7 +1140,7 @@
* Disassemble instruction at 'addr'. addr is changed to point to the
* start of the next instruction.
*/
-void DEBUG_Disasm( DBG_ADDR *addr )
+void DEBUG_Disasm( DBG_ADDR *addr, int display )
{
int inst;
int size;
@@ -1146,6 +1158,11 @@
int len;
struct i_addr address;
+ /*
+ * Set this so we get can supress the printout if we need to.
+ */
+ db_display = display;
+
if (!addr->seg) db_disasm_16 = FALSE;
else db_disasm_16 = !(GET_SEL_FLAGS(addr->seg) & LDT_FLAGS_32BIT);
@@ -1263,145 +1280,242 @@
}
if (i_size == SDEP) {
- if (size == WORD)
+ if( db_display )
+ {
+ if (size == WORD)
fprintf(stderr,i_name);
- else
+ else
fprintf(stderr,ip->i_extra);
+ }
}
else {
- fprintf(stderr,i_name);
+ if( db_display )
+ {
+ fprintf(stderr,i_name);
+ }
if (i_size != NONE) {
if (i_size == BYTE) {
- fprintf(stderr,"b");
+ if( db_display )
+ {
+ fprintf(stderr,"b");
+ }
size = BYTE;
}
else if (i_size == WORD) {
- fprintf(stderr,"w");
+ if( db_display )
+ {
+ fprintf(stderr,"w");
+ }
size = WORD;
}
else if (size == WORD)
- fprintf(stderr,"w");
+ {
+ if( db_display )
+ {
+ fprintf(stderr,"w");
+ }
+ }
else
- fprintf(stderr,"l");
+ {
+ if( db_display )
+ {
+ fprintf(stderr,"l");
+ }
+ }
}
}
- fprintf(stderr,"\t");
+ if( db_display )
+ {
+ fprintf(stderr,"\t");
+ }
for (first = TRUE;
i_mode != 0;
i_mode >>= 8, first = FALSE)
{
- if (!first)
+ if (!first && db_display)
fprintf(stderr,",");
switch (i_mode & 0xFF) {
case E:
- db_print_address(seg, size, &address);
+ if( db_display )
+ {
+ db_print_address(seg, size, &address);
+ }
break;
case Eind:
- fprintf(stderr,"*");
- db_print_address(seg, size, &address);
+ if( db_display )
+ {
+ fprintf(stderr,"*");
+ db_print_address(seg, size, &address);
+ }
break;
case Ew:
- db_print_address(seg, WORD, &address);
+ if( db_display )
+ {
+ db_print_address(seg, WORD, &address);
+ }
break;
case Eb:
- db_print_address(seg, BYTE, &address);
+ if( db_display )
+ {
+ db_print_address(seg, BYTE, &address);
+ }
break;
case R:
- fprintf(stderr,"%s", db_reg[size][f_reg(regmodrm)]);
+ if( db_display )
+ {
+ fprintf(stderr,"%s", db_reg[size][f_reg(regmodrm)]);
+ }
break;
case Rw:
- fprintf(stderr,"%s", db_reg[WORD][f_reg(regmodrm)]);
+ if( db_display )
+ {
+ fprintf(stderr,"%s", db_reg[WORD][f_reg(regmodrm)]);
+ }
break;
case Ri:
- fprintf(stderr,"%s", db_reg[size][f_rm(inst)]);
+ if( db_display )
+ {
+ fprintf(stderr,"%s", db_reg[size][f_rm(inst)]);
+ }
break;
case S:
- fprintf(stderr,"%s", db_seg_reg[f_reg(regmodrm)]);
+ if( db_display )
+ {
+ fprintf(stderr,"%s", db_seg_reg[f_reg(regmodrm)]);
+ }
break;
case Si:
- fprintf(stderr,"%s", db_seg_reg[f_reg(inst)]);
+ if( db_display )
+ {
+ fprintf(stderr,"%s", db_seg_reg[f_reg(inst)]);
+ }
break;
case A:
- fprintf(stderr,"%s", db_reg[size][0]); /* acc */
+ if( db_display )
+ {
+ fprintf(stderr,"%s", db_reg[size][0]); /* acc */
+ }
break;
case BX:
- if (seg)
+ if( db_display )
+ {
+ if (seg)
fprintf(stderr,"%s:", seg);
- fprintf(stderr,"(%s)", short_addr ? "%bx" : "%ebx");
+ fprintf(stderr,"(%s)", short_addr ? "%bx" : "%ebx");
+ }
break;
case CL:
- fprintf(stderr,"%%cl");
+ if( db_display )
+ {
+ fprintf(stderr,"%%cl");
+ }
break;
case DX:
- fprintf(stderr,"%%dx");
+ if( db_display )
+ {
+ fprintf(stderr,"%%dx");
+ }
break;
case SI:
- if (seg)
+ if( db_display )
+ {
+ if (seg)
fprintf(stderr,"%s:", seg);
- fprintf(stderr,"(%s)", short_addr ? "%si" : "%esi");
+ fprintf(stderr,"(%s)", short_addr ? "%si" : "%esi");
+ }
break;
case DI:
- fprintf(stderr,"%%es:(%s)", short_addr ? "%di" : "%edi");
+ if( db_display )
+ {
+ fprintf(stderr,"%%es:(%s)", short_addr ? "%di" : "%edi");
+ }
break;
case CR:
- fprintf(stderr,"%%cr%d", f_reg(regmodrm));
+ if( db_display )
+ {
+ fprintf(stderr,"%%cr%d", f_reg(regmodrm));
+ }
break;
case DR:
- fprintf(stderr,"%%dr%d", f_reg(regmodrm));
+ if( db_display )
+ {
+ fprintf(stderr,"%%dr%d", f_reg(regmodrm));
+ }
break;
case TR:
- fprintf(stderr,"%%tr%d", f_reg(regmodrm));
+ if( db_display )
+ {
+ fprintf(stderr,"%%tr%d", f_reg(regmodrm));
+ }
break;
case I:
len = db_lengths[size];
get_value_inc(imm, addr, len, FALSE);/* unsigned */
- fprintf(stderr,"$0x%x", imm);
+ if( db_display )
+ {
+ fprintf(stderr,"$0x%x", imm);
+ }
break;
case Is:
len = db_lengths[size];
get_value_inc(imm, addr, len, TRUE); /* signed */
- fprintf(stderr,"$%d", imm);
+ if( db_display )
+ {
+ fprintf(stderr,"$%d", imm);
+ }
break;
case Ib:
get_value_inc(imm, addr, 1, FALSE); /* unsigned */
- fprintf(stderr,"$0x%x", imm);
+ if( db_display )
+ {
+ fprintf(stderr,"$0x%x", imm);
+ }
break;
case Ibs:
get_value_inc(imm, addr, 1, TRUE); /* signed */
- fprintf(stderr,"$%d", imm);
+ if( db_display )
+ {
+ fprintf(stderr,"$%d", imm);
+ }
break;
case Iw:
get_value_inc(imm, addr, 2, FALSE); /* unsigned */
- fprintf(stderr,"$0x%x", imm);
+ if( db_display )
+ {
+ fprintf(stderr,"$0x%x", imm);
+ }
break;
case Il:
get_value_inc(imm, addr, 4, FALSE);
- fprintf(stderr,"$0x%x", imm);
+ if( db_display )
+ {
+ fprintf(stderr,"$0x%x", imm);
+ }
break;
case O:
@@ -1411,6 +1525,11 @@
else {
get_value_inc(displ, addr, 4, TRUE);
}
+ if( !db_display )
+ {
+ break;
+ }
+
if (seg)
fprintf(stderr,"%s:%d",seg, displ);
else
@@ -1419,6 +1538,11 @@
case Db:
get_value_inc(displ, addr, 1, TRUE);
+ if( !db_display )
+ {
+ break;
+ }
+
if (short_addr) {
/* offset only affects low 16 bits */
displ = (addr->off & 0xffff0000)
@@ -1439,15 +1563,25 @@
get_value_inc(displ, addr, 4, TRUE);
displ += addr->off;
}
+ if( !db_display )
+ {
+ break;
+ }
db_task_printsym( displ, short_addr ? WORD : LONG);
break;
case o1:
- fprintf(stderr,"$1");
+ if( db_display )
+ {
+ fprintf(stderr,"$1");
+ }
break;
case o3:
- fprintf(stderr,"$3");
+ if( db_display )
+ {
+ fprintf(stderr,"$3");
+ }
break;
case OS:
@@ -1457,8 +1591,12 @@
short_addr ? 2 : 4, FALSE );
get_value_inc( address.seg, addr, /* segment */
2, FALSE );
- DEBUG_PrintAddress( &address, short_addr ? 16 : 32,
- TRUE );
+ if( db_display )
+ {
+ DEBUG_PrintAddress( &address, short_addr ? 16 : 32,
+ TRUE );
+ }
+
}
break;
}
