Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 08:15:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix explorer build

Browse source 
svn path=/trunk/; revision=31831
This commit is contained in:
Christoph von Wittich 2008-01-16 19:29:09 +00:00
parent 55ea1cb8dc
commit f348fd1edc
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
reactos/tools/wrc/parser.tab.c
View file

@ -4937,27 +4937,32 @@ static event_t *add_event(int key, int id, int flags, event_t *prev)
static event_t *add_string_event(string_t *key, int id, int flags, event_t *prev) static event_t *add_string_event(string_t *key, int id, int flags, event_t *prev)
{ {
int keycode = 0; int keycode = 0, keysym = 0;
event_t *ev = new_event(); event_t *ev = new_event();
if(key->type != str_char) if(key->type == str_char)
yyerror("Key code must be an ascii string"); keysym = key->str.cstr[0];
else
keysym = key->str.wstr[0];
if((flags & WRC_AF_VIRTKEY) && (!isupper(key->str.cstr[0] & 0xff) && !isdigit(key->str.cstr[0] & 0xff))) if((flags & WRC_AF_VIRTKEY) && (!isupper(keysym & 0xff) && !isdigit(keysym & 0xff)))
yyerror("VIRTKEY code is not equal to ascii value"); yyerror("VIRTKEY code is not equal to ascii value");
if(key->str.cstr[0] == '^' && (flags & WRC_AF_CONTROL) != 0) if(keysym == '^' && (flags & WRC_AF_CONTROL) != 0)
{ {
yyerror("Cannot use both '^' and CONTROL modifier"); yyerror("Cannot use both '^' and CONTROL modifier");
} }
else if(key->str.cstr[0] == '^') else if(keysym == '^')
{ {
keycode = toupper(key->str.cstr[1]) - '@'; if(key->type == str_char)
keycode = toupper(key->str.cstr[1]) - '@';
else
keycode = toupper(key->str.wstr[1]) - '@';
if(keycode >= ' ') if(keycode >= ' ')
yyerror("Control-code out of range"); yyerror("Control-code out of range");
} }
else else
keycode = key->str.cstr[0]; keycode = keysym;
ev->key = keycode; ev->key = keycode;
ev->id = id; ev->id = id;
ev->flags = flags & ~WRC_AF_ASCII; ev->flags = flags & ~WRC_AF_ASCII;