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/debug.l b/debugger/debug.l
index 1fc3770..5f6cce2 100644
--- a/debugger/debug.l
+++ b/debugger/debug.l
@@ -34,11 +34,23 @@
DIGIT [0-9]
HEXDIGIT [0-9a-fA-F]
FORMAT [bcdiswx]
-IDENTIFIER [_a-zA-Z\.~][_a-zA-Z0-9\.~@]*
+IDENTIFIER [_a-zA-Z~][_a-zA-Z0-9~@]*
+PATHNAME [/_a-zA-Z\.~][/_a-zA-Z0-9\.~@]*
+STRING \"[^\n"]+\"
+
+%s FORMAT_EXPECTED
+%s PATH_EXPECTED
+%s INFO_CMD
+%s HELP_CMD
+%s DEL_CMD
+%s WALK_CMD
+%s SHOW_CMD
+%s NOCMD
%%
-\n { syntax_error = 0; return tEOL; } /*Indicates end of command*/
+\n { BEGIN(0); syntax_error = 0;
+ return tEOL; } /*Indicates end of command. Reset state. */
"||" { return OP_LOR; }
"&&" { return OP_LAND; }
@@ -48,16 +60,24 @@
">=" { return OP_GE; }
"<<" { return OP_SHL; }
">>" { return OP_SHR; }
-[-+<=>|&^()*/%:!~] { return *yytext; }
+"->" { return OP_DRF; }
+[-+<=>|&^()*/%:!~,\.] { return *yytext; }
+"[" { return *yytext; }
+"]" { return *yytext; }
"0x"{HEXDIGIT}+ { sscanf(yytext, "%x", &yylval.integer); return tNUM; }
{DIGIT}+ { sscanf(yytext, "%d", &yylval.integer); return tNUM; }
-"/"{DIGIT}+{FORMAT} { char * last;
+
+<FORMAT_EXPECTED>"/"{DIGIT}+{FORMAT} { char * last;
yylval.integer = strtol( yytext+1, &last, NULL );
yylval.integer = (yylval.integer << 8) | *last;
return tFORMAT; }
-"/"{FORMAT} { yylval.integer = (1 << 8) | yytext[1]; return tFORMAT; }
+
+
+<FORMAT_EXPECTED>"/"{FORMAT} { yylval.integer = (1 << 8) | yytext[1]; return tFORMAT; }
+
+{STRING} { yylval.string = make_symbol(yytext); return tSTRING; }
$pc { yylval.reg = REG_EIP; return tREG; }
$flags { yylval.reg = REG_EFL; return tREG; }
@@ -86,49 +106,60 @@
$fs { yylval.reg = REG_FS; return tREG; }
$gs { yylval.reg = REG_GS; return tREG; }
-up { return tUP; }
-down|dow|do { return tDOWN; }
-frame|fram|fra|fr { return tFRAME; }
-locals|local|loca|loc { return tLOCAL; }
-info|inf|in { return tINFO; }
-show|sho|sh { return tINFO; }
-list|lis|li|l { return tLIST; }
-break|brea|bre|br|b { return tBREAK; }
-enable|enabl|enab|ena { return tENABLE;}
-disable|disabl|disab|disa|dis { return tDISABLE; }
-delete|delet|dele|del { return tDELETE; }
-quit|qui|qu|q { return tQUIT; }
-set|se { return tSET; }
-walk|w { return tWALK; }
-x { return tEXAM; }
+<INITIAL>info|inf|in { BEGIN(INFO_CMD); return tINFO; }
+<INITIAL>up { BEGIN(NOCMD); return tUP; }
+<INITIAL>down|dow|do { BEGIN(NOCMD); return tDOWN; }
+<INITIAL>frame|fram|fra|fr { BEGIN(NOCMD); return tFRAME; }
+<INITIAL>list|lis|li|l { BEGIN(PATH_EXPECTED); return tLIST; }
+<INITIAL>enable|enabl|enab|ena { BEGIN(NOCMD); return tENABLE;}
+<INITIAL>disable|disabl|disab|disa|dis { BEGIN(NOCMD); return tDISABLE; }
+<INITIAL,INFO_CMD,DEL_CMD>display|displa|displ|disp { BEGIN(NOCMD); return tDISPLAY; }
+<INITIAL>undisplay|undispla|undispl|undisp|undis|undi|und { BEGIN(NOCMD); return tUNDISPLAY; }
+<INITIAL>delete|delet|dele|del { BEGIN(DEL_CMD); return tDELETE; }
+<INITIAL>quit|qui|qu|q { BEGIN(NOCMD); return tQUIT; }
+<INITIAL>set|se { BEGIN(NOCMD); return tSET; }
+<INITIAL>walk|w { BEGIN(WALK_CMD); return tWALK; }
+<INITIAL>x { BEGIN(FORMAT_EXPECTED); return tEXAM; }
+<INITIAL>help|hel|he|"?" { BEGIN(HELP_CMD); return tHELP; }
-class|clas|cla { return tCLASS; }
-module|modul|modu|mod { return tMODULE; }
-queue|queu|que { return tQUEUE; }
-registers|regs|reg|re { return tREGS; }
-segments|segment|segm|seg|se { return tSEGMENTS; }
-stack|stac|sta|st { return tSTACK; }
-window|windo|wind|win|wnd { return tWND; }
+<INITIAL>backtrace|backtrac|backtra|backt|back|bac|ba|bt { BEGIN(NOCMD); return tBACKTRACE; }
+<INITIAL>where|wher|whe { BEGIN(NOCMD); return tBACKTRACE; }
-help|hel|he|"?" { return tHELP; }
+<INITIAL>cont|con|co|c { BEGIN(NOCMD); return tCONT; }
+<INITIAL>condition|conditio|conditi|condit|condi|cond { BEGIN(NOCMD); return tCOND; }
+<INITIAL>step|ste|st|s { BEGIN(NOCMD); return tSTEP; }
+<INITIAL>next|nex|ne|n { BEGIN(NOCMD); return tNEXT; }
+<INITIAL>stepi|si { BEGIN(NOCMD); return tSTEPI; }
+<INITIAL>nexti|ni { BEGIN(NOCMD); return tNEXTI; }
+<INITIAL>finish|finis|fini|fin|fi { BEGIN(NOCMD); return tFINISH; }
-backtrace|backtrac|backtra|backt|back|bac|ba|bt { return tBACKTRACE; }
-where|wher|whe { return tBACKTRACE; }
+<INITIAL>abort|abor|abo { BEGIN(NOCMD); return tABORT; }
+<INITIAL>print|prin|pri|pr|p { BEGIN(FORMAT_EXPECTED); return tPRINT; }
-cont|con|co|c { return tCONT; }
-step|ste|st|s { return tSTEP; }
-next|nex|ne|n { return tNEXT; }
+<INITIAL>mode { BEGIN(NOCMD); return tMODE; }
+<INITIAL>show|sho|sh { BEGIN(SHOW_CMD); return tSHOW; }
-symbolfile|symbolfil|symbolfi|symbolf|symbol|symbo|symb { return tSYMBOLFILE; }
+<INFO_CMD,INITIAL>break|brea|bre|br|b { BEGIN(PATH_EXPECTED); return tBREAK; }
-define|defin|defi|def|de { return tDEFINE; }
-abort|abor|abo { return tABORT; }
-print|prin|pri|pr|p { return tPRINT; }
+<INFO_CMD>share|shar|sha { return tSHARE; }
+<INFO_CMD>locals|local|loca|loc { return tLOCAL; }
+<INFO_CMD,WALK_CMD>class|clas|cla { return tCLASS; }
+<INFO_CMD,WALK_CMD>module|modul|modu|mod { return tMODULE; }
+<INFO_CMD,WALK_CMD>queue|queu|que { return tQUEUE; }
+<INFO_CMD>registers|regs|reg|re { return tREGS; }
+<INFO_CMD>segments|segment|segm|seg|se { return tSEGMENTS; }
+<INFO_CMD>stack|stac|sta|st { return tSTACK; }
+<INFO_CMD,WALK_CMD>window|windo|wind|win|wnd { return tWND; }
+<HELP_CMD>info|inf|in { return tINFO; }
-mode { return tMODE; }
+<INITIAL,SHOW_CMD>directories|directorie|directori|director|directo|direct|direc|direc|dir {
+ BEGIN(PATH_EXPECTED); return tDIR; }
{IDENTIFIER} { yylval.string = make_symbol(yytext); return tIDENTIFIER; }
+<PATH_EXPECTED>{PATHNAME} { yylval.string = make_symbol(yytext); return tPATH; }
+
+
[ \t]+ /* Eat up whitespace */
. { if (syntax_error == 0)
@@ -137,6 +168,7 @@
}
}
+
%%
#ifndef yywrap
@@ -217,7 +249,7 @@
}
}
-static char *local_symbols[10];
+static char *local_symbols[30];
static int next_symbol;
char * make_symbol(char * symbol){
