From Ton van Overbeek <tvoverbe@wk.estec.esa.nl>:

	* resbin.c (res_to_bin_menu): Correct computation of menu
	vs. menuex length.
	* resrc.c (define_stringtable): Add 1 to resource ID.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 579ce2787745d6e240152348bb619ccac8ec87e2..e317514b68c0be5e22f19d8e1bae83637da817b3 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jul 30 11:21:06 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+       From Ton van Overbeek <tvoverbe@wk.estec.esa.nl>:
+       * resbin.c (res_to_bin_menu): Correct computation of menu
+       vs. menuex length.
+       * resrc.c (define_stringtable): Add 1 to resource ID.
+
 Tue Jul 29 11:06:03 1997  Ian Lance Taylor  <ian@cygnus.com>
 
        * resbin.c (bin_to_res_string): Correct adjustment of data and

diff --git a/binutils/resbin.c b/binutils/resbin.c
index 24432d27eaee16712257d077bfd370f0e8467747..7931dbf7a9ecc3f0645a60de4026d2f1e121d55f 100644 (file)
--- a/binutils/resbin.c
+++ b/binutils/resbin.c
@@ -1818,7 +1818,7 @@ res_to_bin_menu (menu, big_endian)
   menuex = extended_menu (menu);
 
   d = (struct bindata *) reswr_alloc (sizeof *d);
-  d->length = menuex ? 4 : 8;
+  d->length = menuex ? 8 : 4;
   d->data = (unsigned char *) reswr_alloc (d->length);
 
   if (! menuex)