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/debug.l b/debugger/debug.l
index 862c1f8..af11db4 100644
--- a/debugger/debug.l
+++ b/debugger/debug.l
@@ -9,8 +9,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "dbg.tab.h"
#include "debugger.h"
+#include "dbg.tab.h"
#ifdef USE_READLINE
#undef YY_INPUT
@@ -25,7 +25,6 @@
static char * make_symbol(char *);
void flush_symbols();
static int syntax_error;
-extern int yylval;
%}
DIGIT [0-9]
@@ -39,37 +38,39 @@
[-+=()*:] { return *yytext; }
-"0x"{HEXDIGIT}+ { sscanf(yytext, "%x", &yylval); return NUM; }
-{DIGIT}+ { sscanf(yytext, "%d", &yylval); return NUM; }
+"0x"{HEXDIGIT}+ { sscanf(yytext, "%x", &yylval.integer); return NUM; }
+{DIGIT}+ { sscanf(yytext, "%d", &yylval.integer); return NUM; }
-"/"{DIGIT}+{FORMAT} { char *last; yylval = strtol( yytext+1, &last, NULL );
- yylval = (yylval << 8) | *last; return FORMAT; }
-"/"{FORMAT} { yylval = (1 << 8) | yytext[1]; return FORMAT; }
+"/"{DIGIT}+{FORMAT} { char * last;
+ yylval.integer = strtol( yytext+1, &last, NULL );
+ yylval.integer = (yylval.integer << 8) | *last;
+ return FORMAT; }
+"/"{FORMAT} { yylval.integer = (1 << 8) | yytext[1]; return FORMAT; }
-$pc { yylval = REG_EIP; return REG; }
-$flags { yylval = REG_EFL; return REG; }
-$eip { yylval = REG_EIP; return REG; }
-$ip { yylval = REG_IP; return REG; }
-$esp { yylval = REG_ESP; return REG; }
-$sp { yylval = REG_SP; return REG; }
-$eax { yylval = REG_EAX; return REG; }
-$ebx { yylval = REG_EBX; return REG; }
-$ecx { yylval = REG_ECX; return REG; }
-$edx { yylval = REG_EDX; return REG; }
-$esi { yylval = REG_ESI; return REG; }
-$edi { yylval = REG_EDI; return REG; }
-$ebp { yylval = REG_EBP; return REG; }
-$ax { yylval = REG_AX; return REG; }
-$bx { yylval = REG_BX; return REG; }
-$cx { yylval = REG_CX; return REG; }
-$dx { yylval = REG_DX; return REG; }
-$si { yylval = REG_SI; return REG; }
-$di { yylval = REG_DI; return REG; }
-$bp { yylval = REG_BP; return REG; }
-$es { yylval = REG_ES; return REG; }
-$ds { yylval = REG_DS; return REG; }
-$cs { yylval = REG_CS; return REG; }
-$ss { yylval = REG_SS; return REG; }
+$pc { yylval.reg = REG_EIP; return REG; }
+$flags { yylval.reg = REG_EFL; return REG; }
+$eip { yylval.reg = REG_EIP; return REG; }
+$ip { yylval.reg = REG_IP; return REG; }
+$esp { yylval.reg = REG_ESP; return REG; }
+$sp { yylval.reg = REG_SP; return REG; }
+$eax { yylval.reg = REG_EAX; return REG; }
+$ebx { yylval.reg = REG_EBX; return REG; }
+$ecx { yylval.reg = REG_ECX; return REG; }
+$edx { yylval.reg = REG_EDX; return REG; }
+$esi { yylval.reg = REG_ESI; return REG; }
+$edi { yylval.reg = REG_EDI; return REG; }
+$ebp { yylval.reg = REG_EBP; return REG; }
+$ax { yylval.reg = REG_AX; return REG; }
+$bx { yylval.reg = REG_BX; return REG; }
+$cx { yylval.reg = REG_CX; return REG; }
+$dx { yylval.reg = REG_DX; return REG; }
+$si { yylval.reg = REG_SI; return REG; }
+$di { yylval.reg = REG_DI; return REG; }
+$bp { yylval.reg = REG_BP; return REG; }
+$es { yylval.reg = REG_ES; return REG; }
+$ds { yylval.reg = REG_DS; return REG; }
+$cs { yylval.reg = REG_CS; return REG; }
+$ss { yylval.reg = REG_SS; return REG; }
info|inf|in { return INFO; }
segments|segm { return SEGMENTS; }
@@ -103,14 +104,14 @@
stack|stac|sta|st { return STACK; }
-{IDENTIFIER} {yylval = (int) make_symbol(yytext);
- return IDENTIFIER;
- }
+{IDENTIFIER} { yylval.string = make_symbol(yytext); return IDENTIFIER; }
[ \t]+ /* Eat up whitespace */
-. { if(syntax_error == 0) {
- syntax_error ++; fprintf(stderr, "Syntax Error\n"); }
+. { if (syntax_error == 0)
+ {
+ syntax_error ++; fprintf(stderr, "Syntax Error\n");
+ }
}
%%
@@ -124,11 +125,6 @@
#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
#endif
-#if 0
-/* Used only with GNU readline */
-#include "readline/readline.h"
-#include "readline/chardefs.h"
-#endif
/* Strip whitespace from the start and end of STRING. */
static void stripwhite (char *string)
@@ -161,18 +157,22 @@
line = readline ("Wine-dbg>");
if (!line) exit(0);
- /* Remove leading and trailing whitespace from the line.
- Then, if there is anything left, add it to the history list
- and execute it. */
+ /* Remove leading and trailing whitespace from the line */
+
stripwhite (line);
+ /* If there is anything left, add it to the history list
+ and execute it. Otherwise, re-execute last command. */
+
if (*line)
{
add_history( line );
strncpy( last_line, line, 255 );
last_line[255] = '\0';
}
- else line = last_line; /* Repeat previous command */
+
+ free( line );
+ line = last_line;
if ((len = strlen(line)) > 0)
{
@@ -184,7 +184,6 @@
strcpy(buf, line);
buf[len] = '\n';
buf[len+1] = 0;
- free(line);
return len + 1;
}
}
