diff options
| author | Nick Clifton <nickc@redhat.com> | 2011-10-11 15:56:29 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2011-10-11 15:56:29 +0000 |
| commit | bfb6c1ab1ed502faa7c3764722a1f1661f6d44e8 (patch) | |
| tree | 1d8de29dde516f5b030ce2a485fa33e458477bd5 /binutils/testsuite/binutils-all/windres/version_cat.rsd | |
| parent | 941b2081b1fd085fff7d323448672cedf18258db (diff) | |
| download | binutils-bfb6c1ab1ed502faa7c3764722a1f1661f6d44e8.zip binutils-bfb6c1ab1ed502faa7c3764722a1f1661f6d44e8.tar.gz binutils-bfb6c1ab1ed502faa7c3764722a1f1661f6d44e8.tar.bz2 | |
PR binutils/13051
Fix a syntax error bug when compiling rc files with the VERSIONINFO resource
containing more than one language block inside a single StringFileInfo block.
* windint.h (rc_ver_stringtable): New structure definition.
(rc_ver_info): Use it.
* rcparse.y (verstringtable): New variable.
(verstringtables): New type.
(verstringtables:): New rule declaration.
(verblocks:): Use it.
* resrc.c (append_ver_stringtable): New function.
(append_ver_stringfileinfo): Update to use stringtables.
* windres.h (append_ver_stringfileinfo): Update declaration.
(append_ver_stringtable): New declaration.
* resrc.c (write_rc_versioninfo): Update to support multiple blocks.
* resbin.c (bin_to_res_version): Likewise.
(res_to_bin_versioninfo): Likewise.
* binutils-all\windres\version.rsd: Regenerate.
* binutils-all\windres\version_cat.rsd: Regenerate.
* binutils-all\windres\version_mlang.rc: Add new test.
* binutils-all\windres\version_mlang.rsd: Likewise.
Diffstat (limited to 'binutils/testsuite/binutils-all/windres/version_cat.rsd')
| -rw-r--r-- | binutils/testsuite/binutils-all/windres/version_cat.rsd | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/binutils/testsuite/binutils-all/windres/version_cat.rsd b/binutils/testsuite/binutils-all/windres/version_cat.rsd index 85dd5d3..4e57512 100644 --- a/binutils/testsuite/binutils-all/windres/version_cat.rsd +++ b/binutils/testsuite/binutils-all/windres/version_cat.rsd @@ -12,9 +12,9 @@ Contents of section .data: 0070 00000100 01000000 00000100 01000000 ................ 0080 3f000000 00000000 04000000 01000000 ?............... 0090 00000000 00000000 00000000 4c020000 ............L... - 00a0 00005300 74007200 69006e00 67004600 ..S.t.r.i.n.g.F. + 00a0 01005300 74007200 69006e00 67004600 ..S.t.r.i.n.g.F. 00b0 69006c00 65004900 6e006600 6f000000 i.l.e.I.n.f.o... - 00c0 28020000 00003000 34003000 37003000 (.....0.4.0.7.0. + 00c0 28020000 01003000 34003000 37003000 (.....0.4.0.7.0. 00d0 34006500 34000000 32000900 01004300 4.e.4...2.....C. 00e0 6f006d00 70006100 6e007900 4e006100 o.m.p.a.n.y.N.a. 00f0 6d006500 00000000 62006900 6e007500 m.e.....b.i.n.u. @@ -48,7 +48,7 @@ Contents of section .data: 02b0 72000000 34000800 01005000 72006f00 r...4.....P.r.o. 02c0 64007500 63007400 56006500 72007300 d.u.c.t.V.e.r.s. 02d0 69006f00 6e000000 31002e00 30002e00 i.o.n...1...0... - 02e0 30002e00 31000000 44000000 00005600 0...1...D.....V. + 02e0 30002e00 31000000 44000000 01005600 0...1...D.....V. 02f0 61007200 46006900 6c006500 49006e00 a.r.F.i.l.e.I.n. 0300 66006f00 00000000 24000400 00005400 f.o.....$.....T. 0310 72006100 6e007300 6c006100 74006900 r.a.n.s.l.a.t.i. |