[Bug binutils/13051] windres fails on reading VERSIONINFO with multiple language BLOCKS

[cvs-commit at gcc dot gnu.org]

http://sourceware.org/bugzilla/show_bug.cgi?id=13051

--- Comment #7 from cvs-commit at gcc dot gnu.org <cvs-commit at gcc dot 
gnu.org> 2011-10-11 15:56:37 UTC ---
CVSROOT:    /cvs/src
Module name:    src
Changes by:    address@hidden    2011-10-11 15:56:29

Modified files:
    binutils       : ChangeLog rcparse.y resbin.c resrc.c windint.h 
                     windres.h 
    binutils/testsuite: ChangeLog 
    binutils/testsuite/binutils-all/windres: version.rsd 
                                             version_cat.rsd 
Added files:
    binutils/testsuite/binutils-all/windres: version_mlang.rc 
                                             version_mlang.rsd 

Log message:
    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.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/src/binutils/ChangeLog.diff?cvsroot=src&r1=1.1838&r2=1.1839
http://sourceware.org/cgi-bin/cvsweb.cgi/src/binutils/rcparse.y.diff?cvsroot=src&r1=1.30&r2=1.31
http://sourceware.org/cgi-bin/cvsweb.cgi/src/binutils/resbin.c.diff?cvsroot=src&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/src/binutils/resrc.c.diff?cvsroot=src&r1=1.37&r2=1.38
http://sourceware.org/cgi-bin/cvsweb.cgi/src/binutils/windint.h.diff?cvsroot=src&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/src/binutils/windres.h.diff?cvsroot=src&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/src/binutils/testsuite/ChangeLog.diff?cvsroot=src&r1=1.244&r2=1.245
http://sourceware.org/cgi-bin/cvsweb.cgi/src/binutils/testsuite/binutils-all/windres/version_mlang.rc.diff?cvsroot=src&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/src/binutils/testsuite/binutils-all/windres/version_mlang.rsd.diff?cvsroot=src&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/src/binutils/testsuite/binutils-all/windres/version.rsd.diff?cvsroot=src&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/src/binutils/testsuite/binutils-all/windres/version_cat.rsd.diff?cvsroot=src&r1=1.1&r2=1.2

-- 
Configure bugmail: http://sourceware.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.