darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't print empty dialog caption.

Browse source 
Add testcase.
This commit is contained in:
Nick Clifton 2002-04-09 17:15:00 +00:00
parent b24eb5ac22
commit 420380ba3e
5 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
binutils/ChangeLog
View file

@ -11,6 +11,7 @@
* resrc.c (write_rc_dialog): Print style even if it is 0.
(write_rc_directory): Fix overlooked sublang shift bug.
(bin_to_res_dialog): Don't print empty dialog caption.
* resbin.c (bin_to_res_dialog): Use signature to identify
DIALOGEX.

2
binutils/resbin.c
View file

@ -517,6 +517,8 @@ bin_to_res_dialog (data, length, big_endian)
d->caption = get_unicode (data + off, length - off, big_endian, &sublen);
off += sublen * 2 + 2;
if (sublen == 0)
d->caption = NULL;
if ((d->style & DS_SETFONT) == 0)
{

4
binutils/testsuite/ChangeLog
View file

@ -16,6 +16,10 @@
in strings.
* binutils-all/windres/escapex.rsd: Expected output
* binutils-all/windres/nocaption.rc: New test case dialogs without
captions.
* binutils-all/windres/nocaption.rsd: Expected output
* binutils-all/windres/quoteclass.rc: New test case for quoted
CLASS definitions in DIALOG resources.

4
binutils/testsuite/binutils-all/windres/nocaption.rc Normal file
View file

@ -0,0 +1,4 @@
101 DIALOG DISCARDABLE 0, 0, 186, 95
BEGIN
DEFPUSHBUTTON "OK",1,129,7,50,14
END

8
binutils/testsuite/binutils-all/windres/nocaption.rsd Normal file
View file

@ -0,0 +1,8 @@
0000 00000000 20000000 ffff0000 ffff0000 .... ...........
0010 00000000 00000000 00000000 00000000 ................
0020 36000000 20000000 ffff0500 ffff6500 6... .........e.
0030 00000000 10100904 00000000 00000000 ................
0040 00008880 00000000 01000000 0000ba00 ................
0050 5f000000 00000000 01000150 00000000 _..........P....
0060 81000700 32000e00 0100ffff 80004f00 ....2.........O.
0070 4b000000 00000000 K.......