Release 950817
Thu Aug 17 19:30:14 1995 Alexandre Julliard <julliard@sunsite.unc.edu>
* [*/Makefile.in]
Removed winelibclean target, as it doesn't work anyway.
* [controls/button.c]
Avoid drawing the focus rectangle outside of the button.
* [controls/widgets.c]
Fixed bug with the size of the reserved bytes for the Edit
control (caused Eudora to crash).
* [debugger/*] [include/debugger.h]
Unified debugger address handling. Segmented and linear addresses
are no grouped in a single type DBG_ADDR.
All commands now accept seg:off addresses.
Module entry points are now loaded upon first entry to the
debugger, so that entry points of the loaded executable also
appear in the symbol table.
* [include/registers.h] [miscemu/*.c]
Register macros are now of the form 'AX_reg(context)' instead of 'AX'.
This makes code less readable, but will prevent a lot of name
clashes with other definitions. It also avoids a hidden reference
to the 'context' variable.
* [ipc/dde_atom.c] [misc/atom.c]
All *AddAtom and *FindAtom functions now take a SEGPTR parameter,
to allow supporting integer atoms.
Moved atom.c to memory/ directory.
* [loader/task.c]
Fixed environment allocation to compute the size dynamically.
Added 'windir' environment variable.
Fixed GetDOSEnvironment() to return the current task environment.
* [windows/message.c]
Fixed bug in MSG_GetWindowForEvent().
Wed Aug 9 11:40:43 1995 Marcus Meissner <msmeissn@faui01.informatik.uni-erlangen.de>
* [include/ole.h]
Added a lot of structures from my Borland Manual. Neither complete,
nor 100% right (check please)
* [misc/shell.c]
Fixed some of the Reg* functions.
Enhanced ShellExecute.
Please test: wine "regedit.exe /v" mplayer.exe soundrec.exe
Do YOU know the format of \WINDOWS\REG.DAT? Mail me please :)
* [misc/dos_fs.c]
Make umsdos mounted windows dirs work again.
* [miscemu/emulate.c]
Added some comments, preimplementation of subfunction 7.
* [multimedia/mmsystem.c]
Implemented mciSendString. not complete, not clean, not
necessarily working (only checked with a program which uses
'cdaudio' (one working program is cool.exe, a shareware waveditor
with cdaudio play facilities.)
* [multimedia/mcicda.c]
Segptr fixes in DriverProc
Default cdrom drive in Linux is /dev/cdrom ... usually a symbolic
link to your real cdrom device.
Tue Aug 8 19:41:50 CDT 1995 Daniel Schepler <dks2@cec.wustl.edu>
* [loader/resource.c]
Don't crash in a LoadString to NULL
* [loader/resource.c]
Fixed accelerators to work with modifiers. (ALT-x modifiers still
won't work unless the ALT keypress exited the menu.)
* [misc/file.c]
Expand a file to the current offset with an _lwrite of size zero.
* [misc/file.c]
Set a newly created file to read-write instead of write-only.
Sun Aug 6 20:28:35 1995 Anand Kumria <akumria@ozemail.com.au>
* [misc/main.c] [include/msdos.h]
Fixed to return DOS version 6.22, and the correct byte order
for Windows programs.
Wed Aug 2 12:36:33 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [include/options.h] [memory/global.c] [misc/main.c]
Make the new IPC run-time selectible, disabling it by default.
(I think it's only useful for libwine, anyway.)
* [loader/task.c] [memory/selector.c]
In FreeSelector(), walk up the stack and fix the frames.
* [objects/dib.c]
Missing break statement in DIB_SetImageBits_RLE8().
In GetDIBits(), set the compression flag in the bitmap info to zero.
* [windows/dialog.c]
GetNextDlgGroupItem() needs to treat the first child as if it had
an implicit WS_GROUP bit set.
Mon Jul 31 15:44:47 EDT 1995 Louis-D. Dubeau <ldd@step.polymtl.ca>
* [misc/dos_fs.c]
Quick'n dirty fix for the initialisation of the Z: information
structure.
diff --git a/debugger/break.c b/debugger/break.c
index e143669..b237ce0 100644
--- a/debugger/break.c
+++ b/debugger/break.c
@@ -8,9 +8,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <sys/mman.h>
-#ifdef linux
-#include <sys/utsname.h>
-#endif
#include "windows.h"
#include "debugger.h"
@@ -21,15 +18,14 @@
typedef struct
{
- unsigned int segment;
- unsigned int addr;
- BYTE addrlen;
- BYTE opcode;
- BOOL enabled;
- BOOL in_use;
+ DBG_ADDR addr;
+ BYTE addrlen;
+ BYTE opcode;
+ BOOL enabled;
+ BOOL in_use;
} BREAKPOINT;
-static BREAKPOINT breakpoints[MAX_BREAKPOINTS] = { { 0, }, };
+static BREAKPOINT breakpoints[MAX_BREAKPOINTS];
static int next_bp = 1; /* breakpoint 0 is reserved for step-over */
@@ -39,11 +35,11 @@
*
* Change the opcode at segment:addr.
*/
-static void DEBUG_SetOpcode( unsigned int segment, unsigned int addr, BYTE op )
+static void DEBUG_SetOpcode( const DBG_ADDR *addr, BYTE op )
{
- if (segment)
+ if (addr->seg)
{
- *(BYTE *)PTR_SEG_OFF_TO_LIN( segment, addr ) = op;
+ *(BYTE *)PTR_SEG_OFF_TO_LIN( addr->seg, addr->off ) = op;
}
else /* 32-bit code, so we have to change the protection first */
{
@@ -56,14 +52,15 @@
Not that portability matters, this code is i386 only anyways...
How do I get the old protection in order to restore it later on?
*/
- if (mprotect((caddr_t)(addr & (~4095)), 4096,
- PROT_READ|PROT_WRITE|PROT_EXEC) == -1)
+ if (mprotect((caddr_t)(addr->off & (~4095)), 4096,
+ PROT_READ | PROT_WRITE | PROT_EXEC) == -1)
{
perror( "Can't set break point" );
return;
}
- *(BYTE *)addr = op;
- mprotect((caddr_t)(addr & ~4095), 4096, PROT_READ|PROT_EXEC);
+ *(BYTE *)addr->off = op;
+ mprotect((caddr_t)(addr->off & ~4095), 4096,
+ PROT_READ | PROT_EXEC );
}
}
@@ -80,7 +77,7 @@
for (i = 0; i < MAX_BREAKPOINTS; i++)
{
if (breakpoints[i].in_use && breakpoints[i].enabled)
- DEBUG_SetOpcode( breakpoints[i].segment, breakpoints[i].addr,
+ DEBUG_SetOpcode( &breakpoints[i].addr,
set ? INT3 : breakpoints[i].opcode );
}
}
@@ -92,15 +89,15 @@
* Find the breakpoint for a given address. Return the breakpoint
* number or -1 if none.
*/
-int DEBUG_FindBreakpoint( unsigned int segment, unsigned int addr )
+int DEBUG_FindBreakpoint( const DBG_ADDR *addr )
{
int i;
for (i = 0; i < MAX_BREAKPOINTS; i++)
{
if (breakpoints[i].in_use && breakpoints[i].enabled &&
- breakpoints[i].segment == segment && breakpoints[i].addr == addr)
- return i;
+ breakpoints[i].addr.seg == addr->seg &&
+ breakpoints[i].addr.off == addr->off) return i;
}
return -1;
}
@@ -111,13 +108,13 @@
*
* Add a breakpoint.
*/
-void DEBUG_AddBreakpoint( unsigned int segment, unsigned int addr )
+void DEBUG_AddBreakpoint( const DBG_ADDR *address )
{
+ DBG_ADDR addr = *address;
int num;
BYTE *p;
- if (segment == 0xffffffff) segment = CS;
- if (segment == WINE_CODE_SELECTOR) segment = 0;
+ DBG_FIX_ADDR_SEG( &addr, CS_reg(DEBUG_context) );
if (next_bp < MAX_BREAKPOINTS)
num = next_bp++;
@@ -131,16 +128,15 @@
return;
}
}
- p = segment ? (BYTE *)PTR_SEG_OFF_TO_LIN( segment, addr ) : (BYTE *)addr;
- breakpoints[num].segment = segment;
+ p = DBG_ADDR_TO_LIN( &addr );
breakpoints[num].addr = addr;
- breakpoints[num].addrlen = !segment ? 32 :
- (GET_SEL_FLAGS(segment) & LDT_FLAGS_32BIT) ? 32 : 16;
+ breakpoints[num].addrlen = !addr.seg ? 32 :
+ (GET_SEL_FLAGS(addr.seg) & LDT_FLAGS_32BIT) ? 32 : 16;
breakpoints[num].opcode = *p;
breakpoints[num].enabled = TRUE;
breakpoints[num].in_use = TRUE;
fprintf( stderr, "Breakpoint %d at ", num );
- print_address( segment, addr, breakpoints[num].addrlen );
+ DEBUG_PrintAddress( &breakpoints[num].addr, breakpoints[num].addrlen );
fprintf( stderr, "\n" );
}
@@ -193,8 +189,7 @@
if (breakpoints[i].in_use)
{
fprintf( stderr, "%d: %c ", i, breakpoints[i].enabled ? 'y' : 'n');
- print_address( breakpoints[i].segment, breakpoints[i].addr,
- breakpoints[i].addrlen );
+ DEBUG_PrintAddress( &breakpoints[i].addr, breakpoints[i].addrlen );
fprintf( stderr, "\n" );
}
}
@@ -210,22 +205,24 @@
BOOL DEBUG_ShouldContinue( struct sigcontext_struct *context,
enum exec_mode mode )
{
- unsigned int segment, addr;
+ DBG_ADDR addr;
int bpnum;
/* If not single-stepping, back up over the int3 instruction */
- if (!(EFL & STEP_FLAG)) EIP--;
+ if (!(EFL_reg(DEBUG_context) & STEP_FLAG)) EIP_reg(DEBUG_context)--;
- segment = (CS == WINE_CODE_SELECTOR) ? 0 : CS;
- addr = EIP;
- bpnum = DEBUG_FindBreakpoint( segment, addr );
+ addr.seg = (CS_reg(DEBUG_context) == WINE_CODE_SELECTOR) ?
+ 0 : CS_reg(DEBUG_context);
+ addr.off = EIP_reg(DEBUG_context);
+
+ bpnum = DEBUG_FindBreakpoint( &addr );
breakpoints[0].enabled = 0; /* disable the step-over breakpoint */
if ((bpnum != 0) && (bpnum != -1))
{
fprintf( stderr, "Stopped on breakpoint %d at ", bpnum );
- print_address( breakpoints[bpnum].segment, breakpoints[bpnum].addr,
- breakpoints[bpnum].addrlen );
+ DEBUG_PrintAddress( &breakpoints[bpnum].addr,
+ breakpoints[bpnum].addrlen );
fprintf( stderr, "\n" );
return FALSE;
}
@@ -243,34 +240,34 @@
void DEBUG_RestartExecution( struct sigcontext_struct *context,
enum exec_mode mode, int instr_len )
{
- unsigned int segment, addr;
+ DBG_ADDR addr;
- segment = (CS == WINE_CODE_SELECTOR) ? 0 : CS;
- addr = EIP;
+ addr.seg = (CS_reg(DEBUG_context) == WINE_CODE_SELECTOR) ?
+ 0 : CS_reg(DEBUG_context);
+ addr.off = EIP_reg(DEBUG_context);
- if (DEBUG_FindBreakpoint( segment, addr ) != -1)
+ if (DEBUG_FindBreakpoint( &addr ) != -1)
mode = EXEC_STEP_INSTR; /* If there's a breakpoint, skip it */
switch(mode)
{
case EXEC_CONT: /* Continuous execution */
- EFL &= ~STEP_FLAG;
+ EFL_reg(DEBUG_context) &= ~STEP_FLAG;
DEBUG_SetBreakpoints( TRUE );
break;
case EXEC_STEP_OVER: /* Stepping over a call */
- EFL &= ~STEP_FLAG;
- breakpoints[0].segment = segment;
- breakpoints[0].addr = addr + instr_len;
+ EFL_reg(DEBUG_context) &= ~STEP_FLAG;
+ addr.off += instr_len;
+ breakpoints[0].addr = addr;
breakpoints[0].enabled = TRUE;
breakpoints[0].in_use = TRUE;
- breakpoints[0].opcode = segment ?
- *(BYTE *)PTR_SEG_OFF_TO_LIN(segment,addr+instr_len) : *(BYTE *)addr;
+ breakpoints[0].opcode = *(BYTE *)DBG_ADDR_TO_LIN( &addr );
DEBUG_SetBreakpoints( TRUE );
break;
case EXEC_STEP_INSTR: /* Single-stepping an instruction */
- EFL |= STEP_FLAG;
+ EFL_reg(DEBUG_context) |= STEP_FLAG;
break;
}
}
