From: Kai Tietz <kai.tietz@onevision.com>
Date: Sat, 11 Feb 2012 15:15:34 +0000 (+0000)
Subject: 	PR binutils/13297
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=7afcdbb2bf95b8bb7e139185b7e53df94aa45a99;p=deliverable%2Fbinutils-gdb.git

	PR binutils/13297
	* resrc.c (write_rc_dialog_control): Omit text dump for
	EDITTEXT, COMBOBOX, LISTBOX, and SCROLLBAR.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 1ff055525f..1040f9e218 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-11  Kai Tietz  <ktietz@redhat.com>
+
+	PR binutils/13297
+	* resrc.c (write_rc_dialog_control): Omit text dump for
+	EDITTEXT, COMBOBOX, LISTBOX, and SCROLLBAR.
+
 2012-02-09  Alan Modra  <amodra@gmail.com>
 
 	* sysdep.h: Include sys/stat.h here.
diff --git a/binutils/resrc.c b/binutils/resrc.c
index 702d2f1818..9d1abbc94e 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);