FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply patch from Bernd Herd to fix quoted class definitions inside dialogs.

Browse source
This commit is contained in:
Nick Clifton 2002-04-09 15:21:01 +00:00
parent 9c5382a023
commit df3baf66cb
5 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
binutils/ChangeLog
View file

@ -1,4 +1,13 @@
Tue Apr 9 15:13:10 2002 J"orn Rennecke <joern.rennecke@superh.com> 2002-04-09 Bernd Herd <info@herdsoft.com>
* rcparse.y: CLASS definitions in DIALOG resources
are quoted.
2002-04-09 Gunnar Degnbol <degnbol@danbbs.dk>
* resrc.c: print CLASS names in quotes
2002-04-09 J"orn Rennecke <joern.rennecke@superh.com>
* MAINTAINERS: Update my email address. * MAINTAINERS: Update my email address.

4
binutils/rcparse.y
View file

@ -425,6 +425,10 @@ styles:
{ {
dialog.exstyle = $3; dialog.exstyle = $3;
} }
| styles CLASS QUOTEDSTRING
{
res_string_to_id (& dialog.class, $3);
}
| styles FONT numexpr ',' QUOTEDSTRING | styles FONT numexpr ',' QUOTEDSTRING
{ {
dialog.style |= DS_SETFONT; dialog.style |= DS_SETFONT;

10
binutils/resrc.c
View file

@ -1,5 +1,5 @@
/* resrc.c -- read and write Windows rc files. /* resrc.c -- read and write Windows rc files.
Copyright 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. Copyright 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Cygnus Support. Written by Ian Lance Taylor, Cygnus Support.
This file is part of GNU Binutils. This file is part of GNU Binutils.
@ -173,7 +173,7 @@ static void get_data
PARAMS ((FILE *, unsigned char *, unsigned long, const char *)); PARAMS ((FILE *, unsigned char *, unsigned long, const char *));
static void define_fontdirs PARAMS ((void)); static void define_fontdirs PARAMS ((void));
/* Run `cmd' and redirect the output to `redir'. */ /* Run `cmd' and redirect the output to `redir'. */
static int static int
run_cmd (cmd, redir) run_cmd (cmd, redir)
@ -518,7 +518,7 @@ close_input_stream ()
pclose (cpp_pipe); pclose (cpp_pipe);
} }
/* Since this is also run via xatexit, safeguard. */ /* Since this is also run via xatexit, safeguard. */
cpp_pipe = NULL; cpp_pipe = NULL;
cpp_temp_file = NULL; cpp_temp_file = NULL;
} }
@ -1580,7 +1580,7 @@ write_rc_directory (e, rd, type, name, language, level)
case 2: case 2:
/* If we're at level 2, the key of this resource is the name /* If we're at level 2, the key of this resource is the name
we are going to use in the rc printout. */ we are going to use in the rc printout. */
name = &re->id; name = &re->id;
break; break;
@ -2060,7 +2060,7 @@ write_rc_dialog (e, dialog)
|| dialog->class.u.id != 0) || dialog->class.u.id != 0)
{ {
fprintf (e, "CLASS "); fprintf (e, "CLASS ");
res_id_print (e, dialog->class, 0); res_id_print (e, dialog->class, 1);
fprintf (e, "\n"); fprintf (e, "\n");
} }
if (dialog->caption != NULL) if (dialog->caption != NULL)

5
binutils/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2002-04-09 Nick Clifton <nickc@cambridge.redhat.com>
* binutils-all/windres/quoteclass.rc: New test case for quoted
CLASS definitions in DIALOG resources.
2002-02-18 Timothy Daly <remote_bob@yahoo.com> 2002-02-18 Timothy Daly <remote_bob@yahoo.com>
* binutils-all/readelf.r: Change expected output to match new, * binutils-all/readelf.r: Change expected output to match new,

8
binutils/testsuite/binutils-all/windres/quoteclass.rc Normal file
View file

@ -0,0 +1,8 @@
// parse-only
101 DIALOG DISCARDABLE 0, 0, 186, 95
CLASS "myclass"
BEGIN
DEFPUSHBUTTON "OK",1,129,7,50,14
END