From 7afcdbb2bf95b8bb7e139185b7e53df94aa45a99 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Sat, 11 Feb 2012 15:15:34 +0000 Subject: [PATCH] PR binutils/13297 * resrc.c (write_rc_dialog_control): Omit text dump for EDITTEXT, COMBOBOX, LISTBOX, and SCROLLBAR. --- binutils/ChangeLog | 6 ++++++ binutils/resrc.c | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 1ff055525f6..1040f9e218b 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2012-02-11 Kai Tietz + + PR binutils/13297 + * resrc.c (write_rc_dialog_control): Omit text dump for + EDITTEXT, COMBOBOX, LISTBOX, and SCROLLBAR. + 2012-02-09 Alan Modra * sysdep.h: Include sys/stat.h here. diff --git a/binutils/resrc.c b/binutils/resrc.c index 702d2f18183..9d1abbc94e0 100644 --- a/binutils/resrc.c +++ b/binutils/resrc.c @@ -2650,7 +2650,13 @@ write_rc_dialog_control (FILE *e, const rc_dialog_control *control) ci = NULL; } - if (control->text.named || control->text.u.id != 0) + /* For EDITTEXT, COMBOBOX, LISTBOX, and SCROLLBAR don't dump text. */ + if ((control->text.named || control->text.u.id != 0) + && (!ci + || (ci->class != CTL_EDIT + && ci->class != CTL_COMBOBOX + && ci->class != CTL_LISTBOX + && ci->class != CTL_SCROLLBAR))) { fprintf (e, " "); res_id_print (e, control->text, 1);