X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Frcparse.y;h=93c8f5798f9cc7d39e26469d18590827eb374399;hb=d8bd95efd8119e06e6753c841f1bbc54bb09d5de;hp=e260792912739d01e7072654cf3c82d7c217bfd2;hpb=bfb6c1ab1ed502faa7c3764722a1f1661f6d44e8;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/rcparse.y b/binutils/rcparse.y index e260792912..93c8f5798f 100644 --- a/binutils/rcparse.y +++ b/binutils/rcparse.y @@ -1,6 +1,5 @@ %{ /* rcparse.y -- parser for Windows rc files - Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2008, - 2011 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support. Extended by Kai Tietz, Onevision. @@ -164,7 +163,7 @@ static const rc_res_id res_null_text = { 1, {{0, &null_unichar}}}; %type file_name %type res_unicode_string resname res_unicode_string_concat %type sizedstring -%type sizedunistring +%type sizedunistring res_unicode_sizedstring res_unicode_sizedstring_concat %type sizednumexpr sizedposnumexpr %left '|' @@ -563,7 +562,7 @@ control: base_style = BS_AUTO3STATE; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -575,7 +574,7 @@ control: base_style = BS_AUTOCHECKBOX; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -587,7 +586,7 @@ control: base_style = BS_AUTORADIOBUTTON; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -599,7 +598,7 @@ control: base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class.named = 0; class.u.id = CTL_EDIT; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -614,7 +613,7 @@ control: base_style = BS_CHECKBOX | WS_TABSTOP; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -628,7 +627,7 @@ control: base_style = 0; class.named = 0; class.u.id = CTL_COMBOBOX; - res_text_field = res_null_text; + res_text_field = res_null_text; } control_params { @@ -660,7 +659,7 @@ control: base_style = SS_CENTER; class.named = 0; class.u.id = CTL_STATIC; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -672,7 +671,7 @@ control: base_style = BS_DEFPUSHBUTTON | WS_TABSTOP; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -684,7 +683,7 @@ control: base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class.named = 0; class.u.id = CTL_EDIT; - res_text_field = res_null_text; + res_text_field = res_null_text; } control_params { @@ -696,7 +695,7 @@ control: base_style = BS_GROUPBOX; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -708,7 +707,7 @@ control: base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class.named = 0; class.u.id = CTL_EDIT; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -746,7 +745,7 @@ control: base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class.named = 0; class.u.id = CTL_EDIT; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -761,7 +760,7 @@ control: base_style = LBS_NOTIFY | WS_BORDER; class.named = 0; class.u.id = CTL_LISTBOX; - res_text_field = res_null_text; + res_text_field = res_null_text; } control_params { @@ -773,7 +772,7 @@ control: base_style = SS_LEFT; class.named = 0; class.u.id = CTL_STATIC; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -796,7 +795,7 @@ control: base_style = BS_PUSHBUTTON | WS_TABSTOP; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -808,7 +807,7 @@ control: base_style = BS_RADIOBUTTON; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -820,7 +819,7 @@ control: base_style = SS_RIGHT; class.named = 0; class.u.id = CTL_STATIC; - res_text_field = $2; + res_text_field = $2; } control_params { @@ -832,7 +831,7 @@ control: base_style = 0; class.named = 0; class.u.id = CTL_SCROLLBAR; - res_text_field = res_null_text; + res_text_field = res_null_text; } control_params { @@ -844,14 +843,14 @@ control: base_style = BS_3STATE; class.named = 0; class.u.id = CTL_BUTTON; - res_text_field = $2; + res_text_field = $2; } control_params { $$ = $4; } | USERBUTTON resref numexpr ',' numexpr ',' numexpr ',' - numexpr ',' numexpr ',' + numexpr ',' numexpr ',' { style = WS_CHILD | WS_VISIBLE; } styleexpr optcnumexpr { @@ -1259,21 +1258,21 @@ rcdata_data: /* Stringtable resources. */ stringtable: - STRINGTABLE suboptions BEG - { sub_res_info = $2; } - string_data END + STRINGTABLE suboptions BEG + { sub_res_info = $2; rcparse_rcdata (); } + string_data END { rcparse_normal (); } ; string_data: /* empty */ - | string_data numexpr res_unicode_string_concat + | string_data numexpr res_unicode_sizedstring_concat { - define_stringtable (&sub_res_info, $2, $3); + define_stringtable (&sub_res_info, $2, $3.s, $3.length); rcparse_discard_strings (); } - | string_data numexpr ',' res_unicode_string_concat + | string_data numexpr ',' res_unicode_sizedstring_concat { - define_stringtable (&sub_res_info, $2, $4); + define_stringtable (&sub_res_info, $2, $4.s, $4.length); rcparse_discard_strings (); } | string_data error @@ -1423,16 +1422,18 @@ fixedverinfo: res_alloc (sizeof (rc_fixed_versioninfo))); memset ($$, 0, sizeof (rc_fixed_versioninfo)); } - | fixedverinfo FILEVERSION numexpr cnumexpr cnumexpr cnumexpr + | fixedverinfo FILEVERSION numexpr optcnumexpr optcnumexpr + optcnumexpr { - $1->file_version_ms = ($3 << 16) | $4; - $1->file_version_ls = ($5 << 16) | $6; + $1->file_version_ms = ($3 << 16) | ($4 & 0xffff); + $1->file_version_ls = ($5 << 16) | ($6 & 0xffff); $$ = $1; } - | fixedverinfo PRODUCTVERSION numexpr cnumexpr cnumexpr cnumexpr + | fixedverinfo PRODUCTVERSION numexpr optcnumexpr optcnumexpr + optcnumexpr { - $1->product_version_ms = ($3 << 16) | $4; - $1->product_version_ls = ($5 << 16) | $6; + $1->product_version_ms = ($3 << 16) | ($4 & 0xffff); + $1->product_version_ls = ($5 << 16) | ($6 & 0xffff); $$ = $1; } | fixedverinfo FILEFLAGSMASK numexpr @@ -1718,6 +1719,43 @@ res_unicode_string: } ; +res_unicode_sizedstring: + sizedunistring + { + $$ = $1; + } + | sizedstring + { + unichar *h = NULL; + rc_uint_type l = 0; + unicode_from_ascii_len (&l, &h, $1.s, $1.length); + $$.s = h; + $$.length = l; + } + ; + +/* Concat string */ +res_unicode_sizedstring_concat: + res_unicode_sizedstring + { + $$ = $1; + } + | + res_unicode_sizedstring_concat res_unicode_sizedstring + { + rc_uint_type l1 = $1.length; + rc_uint_type l2 = $2.length; + unichar *h = (unichar *) res_alloc ((l1 + l2 + 1) * sizeof (unichar)); + if (l1 != 0) + memcpy (h, $1.s, l1 * sizeof (unichar)); + if (l2 != 0) + memcpy (h + l1, $2.s, l2 * sizeof (unichar)); + h[l1 + l2] = 0; + $$.length = l1 + l2; + $$.s = h; + } + ; + sizedstring: SIZEDSTRING { @@ -1849,12 +1887,12 @@ sizednumexpr: } | sizednumexpr '/' sizednumexpr { - $$.val = $1.val / $3.val; + $$.val = $1.val / ($3.val ? $3.val : 1); $$.dword = $1.dword || $3.dword; } | sizednumexpr '%' sizednumexpr { - $$.val = $1.val % $3.val; + $$.val = $1.val % ($3.val ? $3.val : 1); $$.dword = $1.dword || $3.dword; } | sizednumexpr '+' sizednumexpr @@ -1928,12 +1966,13 @@ sizedposnumexpr: } | sizedposnumexpr '/' sizednumexpr { - $$.val = $1.val / $3.val; + $$.val = $1.val / ($3.val ? $3.val : 1); $$.dword = $1.dword || $3.dword; } | sizedposnumexpr '%' sizednumexpr { - $$.val = $1.val % $3.val; + /* PR 17512: file: 89105a25. */ + $$.val = $1.val % ($3.val ? $3.val : 1); $$.dword = $1.dword || $3.dword; } | sizedposnumexpr '+' sizednumexpr