diff options
| author | Nick Clifton <nickc@redhat.com> | 2011-10-11 15:56:27 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2011-10-11 15:56:27 +0000 |
| commit | 1d73eefe2817e0ad82a902a26f8ca9ad46afc19b (patch) | |
| tree | f794c8c1d4f5c00c4b523116bea964c578a99b09 /binutils/windint.h | |
| parent | 066f3707e988b24f8f39d01f105662a814c0979a (diff) | |
| download | binutils-redhat-1d73eefe2817e0ad82a902a26f8ca9ad46afc19b.tar.gz | |
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/windint.h')
| -rw-r--r-- | binutils/windint.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/binutils/windint.h b/binutils/windint.h index eed8f790fa..0a7589954c 100644 --- a/binutils/windint.h +++ b/binutils/windint.h @@ -944,6 +944,18 @@ struct __attribute__ ((__packed__)) bin_fixed_versioninfo }; #define BIN_FIXED_VERSIONINFO_SIZE 52 +/* A list of string version information. */ + +typedef struct rc_ver_stringtable +{ + /* Next item. */ + struct rc_ver_stringtable *next; + /* Language. */ + unichar *language; + /* Strings. */ + struct rc_ver_stringinfo *strings; +} rc_ver_stringtable; + /* A list of variable version information. */ typedef struct rc_ver_info @@ -957,10 +969,8 @@ typedef struct rc_ver_info /* StringFileInfo data. */ struct { - /* Language. */ - unichar *language; - /* Strings. */ - struct rc_ver_stringinfo *strings; + /* String tables. */ + struct rc_ver_stringtable *stringtables; } string; /* VarFileInfo data. */ struct |