5 Sep
2005
5 Sep
'05
8:03 p.m.
Alexandre Julliard <julliard(a)winehq.org>
- Removed the broken mmap64 configure check, and moved the
_FILE_OFFSET_BITS define to wine/port.h. Made sure that all files that
need the define include it.
Modified: trunk/reactos/include/wine/config.h
Modified: trunk/reactos/lib/libwine/libwine.xml
Added: trunk/reactos/lib/libwine/string.c
Modified: trunk/reactos/tools/wrc/parser.y
Modified: trunk/reactos/tools/wrc/y.tab.c
Modified: trunk/reactos/tools/wrc/y.tab.h
_____
Modified: trunk/reactos/include/wine/config.h
--- trunk/reactos/include/wine/config.h 2005-09-05 18:06:20 UTC (rev
17660)
+++ trunk/reactos/include/wine/config.h 2005-09-05 20:03:06 UTC (rev
17661)
@@ -775,7 +775,7 @@
#define HAVE__SPAWNVP 1
/* Define to 1 if you have the `_stricmp' function. */
-#define HAVE__STRICMP 1
+/* #undef HAVE__STRICMP 1 */
/* Define to 1 if you have the `_strnicmp' function. */
#define HAVE__STRNICMP 1
_____
Modified: trunk/reactos/lib/libwine/libwine.xml
--- trunk/reactos/lib/libwine/libwine.xml 2005-09-05 18:06:20 UTC
(rev 17660)
+++ trunk/reactos/lib/libwine/libwine.xml 2005-09-05 20:03:06 UTC
(rev 17661)
@@ -3,4 +3,5 @@
<define name="__REACTOS__" />
<define name="__USE_W32API" />
<file>debug.c</file>
+ <file>string.c</file>
</module>
_____
Added: trunk/reactos/lib/libwine/string.c
--- trunk/reactos/lib/libwine/string.c 2005-09-05 18:06:20 UTC (rev
17660)
+++ trunk/reactos/lib/libwine/string.c 2005-09-05 20:03:06 UTC (rev
17661)
@@ -0,0 +1,19 @@
+#include <ctype.h>
+#include "wine/config.h"
+#include "wine/port.h"
+
+#ifndef HAVE_STRCASECMP
+# ifndef HAVE__STRICMP
+int strcasecmp( const char *str1, const char *str2 )
+{
+ const unsigned char *ustr1 = (const unsigned char *)str1;
+ const unsigned char *ustr2 = (const unsigned char *)str2;
+
+ while (*ustr1 && toupper(*ustr1) == toupper(*ustr2)) {
+ ustr1++;
+ ustr2++;
+ }
+ return toupper(*ustr1) - toupper(*ustr2);
+}
+#endif
+#endif
Property changes on: trunk/reactos/lib/libwine/string.c
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
_____
Modified: trunk/reactos/tools/wrc/parser.y
--- trunk/reactos/tools/wrc/parser.y 2005-09-05 18:06:20 UTC (rev
17660)
+++ trunk/reactos/tools/wrc/parser.y 2005-09-05 20:03:06 UTC (rev
17661)
@@ -121,6 +121,7 @@
* - Added extra comment about grammar
*/
#include "config.h"
+#include "wine/port.h"
#include <stdio.h>
#include <stdlib.h>
_____
Modified: trunk/reactos/tools/wrc/y.tab.c
--- trunk/reactos/tools/wrc/y.tab.c 2005-09-05 18:06:20 UTC (rev
17660)
+++ trunk/reactos/tools/wrc/y.tab.c 2005-09-05 20:03:06 UTC (rev
17661)
@@ -350,6 +350,7 @@
* - Added extra comment about grammar
*/
#include "config.h"
+#include "wine/port.h"
#include <stdio.h>
#include <stdlib.h>
@@ -481,7 +482,7 @@
#endif
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 240 "./parser.y"
+#line 241 "./parser.y"
typedef union YYSTYPE {
string_t *str;
int num;
@@ -526,7 +527,7 @@
ani_any_t *ani;
} YYSTYPE;
/* Line 191 of yacc.c. */
-#line 530 "y.tab.c"
+#line 531 "y.tab.c"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
@@ -538,7 +539,7 @@
/* Line 214 of yacc.c. */
-#line 542 "y.tab.c"
+#line 543 "y.tab.c"
#if ! defined (yyoverflow) || YYERROR_VERBOSE
@@ -844,32 +845,32 @@
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const unsigned short yyrline[] =
{
- 0, 363, 363, 397, 398, 468, 474, 486, 496,
504,
- 504, 548, 554, 561, 571, 572, 581, 582, 583,
607,
- 608, 614, 615, 616, 617, 641, 642, 648, 649,
650,
- 651, 652, 653, 657, 658, 659, 663, 667, 683,
705,
- 715, 723, 731, 735, 739, 743, 754, 759, 768,
792,
- 793, 794, 803, 804, 807, 808, 811, 812, 813,
814,
- 815, 816, 821, 856, 857, 858, 859, 860, 861,
862,
- 863, 864, 865, 868, 869, 870, 871, 872, 873,
874,
- 875, 876, 877, 879, 880, 881, 882, 883, 884,
885,
- 886, 888, 898, 923, 945, 947, 952, 959, 970,
984,
- 999, 1004, 1005, 1006, 1010, 1011, 1012, 1013, 1017,
1022,
- 1030, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081,
1082,
- 1083, 1084, 1087, 1088, 1089, 1090, 1091, 1092, 1093,
1094,
- 1095, 1096, 1098, 1099, 1100, 1101, 1102, 1103, 1104,
1105,
- 1107, 1117, 1142, 1158, 1186, 1209, 1210, 1213, 1214,
1218,
- 1225, 1226, 1230, 1253, 1257, 1258, 1267, 1273, 1292,
1293,
- 1294, 1295, 1296, 1297, 1298, 1302, 1327, 1331, 1332,
1348,
- 1354, 1374, 1375, 1379, 1387, 1398, 1399, 1403, 1409,
1417,
- 1437, 1478, 1489, 1490, 1523, 1525, 1530, 1546, 1547,
1557,
- 1567, 1574, 1581, 1588, 1595, 1605, 1606, 1615, 1623,
1624,
- 1633, 1638, 1644, 1653, 1654, 1658, 1684, 1685, 1690,
1699,
- 1700, 1710, 1725, 1726, 1727, 1728, 1731, 1732, 1733,
1737,
- 1738, 1746, 1754, 1772, 1779, 1783, 1787, 1802, 1803,
1804,
- 1805, 1806, 1807, 1808, 1809, 1810, 1811, 1812, 1813,
1817,
- 1818, 1825, 1826, 1830, 1833, 1834, 1835, 1836, 1837,
1838,
- 1839, 1840, 1841, 1842, 1843, 1844, 1848, 1849, 1852, 1853
+ 0, 364, 364, 398, 399, 469, 475, 487, 497,
505,
+ 505, 549, 555, 562, 572, 573, 582, 583, 584,
608,
+ 609, 615, 616, 617, 618, 642, 643, 649, 650,
651,
+ 652, 653, 654, 658, 659, 660, 664, 668, 684,
706,
+ 716, 724, 732, 736, 740, 744, 755, 760, 769,
793,
+ 794, 795, 804, 805, 808, 809, 812, 813, 814,
815,
+ 816, 817, 822, 857, 858, 859, 860, 861, 862,
863,
+ 864, 865, 866, 869, 870, 871, 872, 873, 874,
875,
+ 876, 877, 878, 880, 881, 882, 883, 884, 885,
886,
+ 887, 889, 899, 924, 946, 948, 953, 960, 971,
985,
+ 1000, 1005, 1006, 1007, 1011, 1012, 1013, 1014, 1018,
1023,
+ 1031, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082,
1083,
+ 1084, 1085, 1088, 1089, 1090, 1091, 1092, 1093, 1094,
1095,
+ 1096, 1097, 1099, 1100, 1101, 1102, 1103, 1104, 1105,
1106,
+ 1108, 1118, 1143, 1159, 1187, 1210, 1211, 1214, 1215,
1219,
+ 1226, 1227, 1231, 1254, 1258, 1259, 1268, 1274, 1293,
1294,
+ 1295, 1296, 1297, 1298, 1299, 1303, 1328, 1332, 1333,
1349,
+ 1355, 1375, 1376, 1380, 1388, 1399, 1400, 1404, 1410,
1418,
+ 1438, 1479, 1490, 1491, 1524, 1526, 1531, 1547, 1548,
1558,
+ 1568, 1575, 1582, 1589, 1596, 1606, 1607, 1616, 1624,
1625,
+ 1634, 1639, 1645, 1654, 1655, 1659, 1685, 1686, 1691,
1700,
+ 1701, 1711, 1726, 1727, 1728, 1729, 1732, 1733, 1734,
1738,
+ 1739, 1747, 1755, 1773, 1780, 1784, 1788, 1803, 1804,
1805,
+ 1806, 1807, 1808, 1809, 1810, 1811, 1812, 1813, 1814,
1818,
+ 1819, 1826, 1827, 1831, 1834, 1835, 1836, 1837, 1838,
1839,
+ 1840, 1841, 1842, 1843, 1844, 1845, 1849, 1850, 1853, 1854
};
#endif
@@ -1981,7 +1982,7 @@
switch (yyn)
{
case 2:
-#line 363 "./parser.y"
+#line 364 "./parser.y"
{
resource_t *rsc;
/* First add stringtables to the resource-list */
@@ -2015,12 +2016,12 @@
break;
case 3:
-#line 397 "./parser.y"
+#line 398 "./parser.y"
{ yyval.res = NULL; want_id = 1; }
break;
case 4:
-#line 398 "./parser.y"
+#line 399 "./parser.y"
{
if(yyvsp[0].res)
{
@@ -2069,7 +2070,7 @@
break;
case 6:
-#line 474 "./parser.y"
+#line 475 "./parser.y"
{
yyval.res = yyvsp[0].res;
if(yyval.res)
@@ -2085,7 +2086,7 @@
break;
case 7:
-#line 486 "./parser.y"
+#line 487 "./parser.y"
{
yyval.res = yyvsp[0].res;
if(yyval.res)
@@ -2099,7 +2100,7 @@
break;
case 8:
-#line 496 "./parser.y"
+#line 497 "./parser.y"
{
/* Don't do anything, stringtables are converted to
* resource_t structures when we are finished parsing
and
@@ -2111,12 +2112,12 @@
break;
case 9:
-#line 504 "./parser.y"
+#line 505 "./parser.y"
{want_nl = 1; }
break;
case 10:
-#line 504 "./parser.y"
+#line 505 "./parser.y"
{
/* We *NEED* the newline to delimit the expression.
* Otherwise, we would not be able to set the next
@@ -2158,12 +2159,12 @@
break;
case 11:
-#line 548 "./parser.y"
+#line 549 "./parser.y"
{ yychar = rsrcid_to_token(yychar); }
break;
case 12:
-#line 554 "./parser.y"
+#line 555 "./parser.y"
{
if(yyvsp[0].num > 65535 || yyvsp[0].num < -32768)
yyerror("Resource's ID out of range (%d)",
yyvsp[0].num);
@@ -2174,7 +2175,7 @@
break;
case 13:
-#line 561 "./parser.y"
+#line 562 "./parser.y"
{
yyval.nid = new_name_id();
yyval.nid->type = name_str;
@@ -2183,12 +2184,12 @@
break;
case 14:
-#line 571 "./parser.y"
+#line 572 "./parser.y"
{ yyval.nid = yyvsp[0].nid; }
break;
case 15:
-#line 572 "./parser.y"
+#line 573 "./parser.y"
{
yyval.nid = new_name_id();
yyval.nid->type = name_str;
@@ -2197,17 +2198,17 @@
break;
case 16:
-#line 581 "./parser.y"
+#line 582 "./parser.y"
{ yyval.res = new_resource(res_acc, yyvsp[0].acc,
yyvsp[0].acc->memopt, yyvsp[0].acc->lvc.language); }
break;
case 17:
-#line 582 "./parser.y"
+#line 583 "./parser.y"
{ yyval.res = new_resource(res_bmp, yyvsp[0].bmp,
yyvsp[0].bmp->memopt, yyvsp[0].bmp->data->lvc.language); }
break;
case 18:
-#line 583 "./parser.y"
+#line 584 "./parser.y"
{
resource_t *rsc;
if(yyvsp[0].ani->type == res_anicur)
@@ -2235,12 +2236,12 @@
break;
case 19:
-#line 607 "./parser.y"
+#line 608 "./parser.y"
{ yyval.res = new_resource(res_dlg, yyvsp[0].dlg,
yyvsp[0].dlg->memopt, yyvsp[0].dlg->lvc.language); }
break;
case 20:
-#line 608 "./parser.y"
+#line 609 "./parser.y"
{
if(win32)
yyval.res = new_resource(res_dlgex,
yyvsp[0].dlgex, yyvsp[0].dlgex->memopt, yyvsp[0].dlgex->lvc.language);
@@ -2250,22 +2251,22 @@
break;
case 21:
-#line 614 "./parser.y"
+#line 615 "./parser.y"
{ yyval.res = new_resource(res_dlginit, yyvsp[0].dginit,
yyvsp[0].dginit->memopt, yyvsp[0].dginit->data->lvc.language); }
break;
case 22:
-#line 615 "./parser.y"
+#line 616 "./parser.y"
{ yyval.res = new_resource(res_fnt, yyvsp[0].fnt,
yyvsp[0].fnt->memopt, yyvsp[0].fnt->data->lvc.language); }
break;
case 23:
-#line 616 "./parser.y"
+#line 617 "./parser.y"
{ yyval.res = new_resource(res_fntdir, yyvsp[0].fnd,
yyvsp[0].fnd->memopt, yyvsp[0].fnd->data->lvc.language); }
break;
case 24:
-#line 617 "./parser.y"
+#line 618 "./parser.y"
{
resource_t *rsc;
if(yyvsp[0].ani->type == res_aniico)
@@ -2293,12 +2294,12 @@
break;
case 25:
-#line 641 "./parser.y"
+#line 642 "./parser.y"
{ yyval.res = new_resource(res_men, yyvsp[0].men,
yyvsp[0].men->memopt, yyvsp[0].men->lvc.language); }
break;
case 26:
-#line 642 "./parser.y"
+#line 643 "./parser.y"
{
if(win32)
yyval.res = new_resource(res_menex,
yyvsp[0].menex, yyvsp[0].menex->memopt, yyvsp[0].menex->lvc.language);
@@ -2308,57 +2309,57 @@
break;
case 27:
-#line 648 "./parser.y"
+#line 649 "./parser.y"
{ yyval.res = new_resource(res_msg, yyvsp[0].msg, WRC_MO_MOVEABLE |
WRC_MO_DISCARDABLE, yyvsp[0].msg->data->lvc.language); }
break;
case 28:
-#line 649 "./parser.y"
+#line 650 "./parser.y"
{ yyval.res = new_resource(res_html, yyvsp[0].html,
yyvsp[0].html->memopt, yyvsp[0].html->data->lvc.language); }
break;
case 29:
-#line 650 "./parser.y"
+#line 651 "./parser.y"
{ yyval.res = new_resource(res_rdt, yyvsp[0].rdt,
yyvsp[0].rdt->memopt, yyvsp[0].rdt->data->lvc.language); }
break;
case 30:
-#line 651 "./parser.y"
+#line 652 "./parser.y"
{ yyval.res = new_resource(res_toolbar, yyvsp[0].tlbar,
yyvsp[0].tlbar->memopt, yyvsp[0].tlbar->lvc.language); }
break;
case 31:
-#line 652 "./parser.y"
+#line 653 "./parser.y"
{ yyval.res = new_resource(res_usr, yyvsp[0].usr,
yyvsp[0].usr->memopt, yyvsp[0].usr->data->lvc.language); }
break;
case 32:
-#line 653 "./parser.y"
+#line 654 "./parser.y"
{ yyval.res = new_resource(res_ver, yyvsp[0].veri, WRC_MO_MOVEABLE
| WRC_MO_DISCARDABLE, yyvsp[0].veri->lvc.language); }
break;
case 33:
-#line 657 "./parser.y"
+#line 658 "./parser.y"
{ yyval.str = make_filename(yyvsp[0].str); }
break;
case 34:
-#line 658 "./parser.y"
+#line 659 "./parser.y"
{ yyval.str = make_filename(yyvsp[0].str); }
break;
case 35:
-#line 659 "./parser.y"
+#line 660 "./parser.y"
{ yyval.str = make_filename(yyvsp[0].str); }
break;
case 36:
-#line 663 "./parser.y"
+#line 664 "./parser.y"
{ yyval.bmp = new_bitmap(yyvsp[0].raw, yyvsp[-1].iptr); }
break;
case 37:
-#line 667 "./parser.y"
+#line 668 "./parser.y"
{
yyval.ani = new_ani_any();
if(yyvsp[0].raw->size > 4 && !memcmp(yyvsp[0].raw->data,
riff, sizeof(riff)))
@@ -2375,7 +2376,7 @@
break;
case 38:
-#line 683 "./parser.y"
+#line 684 "./parser.y"
{
yyval.ani = new_ani_any();
if(yyvsp[0].raw->size > 4 && !memcmp(yyvsp[0].raw->data,
riff, sizeof(riff)))
@@ -2392,17 +2393,17 @@
break;
case 39:
-#line 705 "./parser.y"
+#line 706 "./parser.y"
{ yyval.fnt = new_font(yyvsp[0].raw, yyvsp[-1].iptr); }
break;
case 40:
-#line 715 "./parser.y"
+#line 716 "./parser.y"
{ yyval.fnd = new_fontdir(yyvsp[0].raw, yyvsp[-1].iptr); }
break;
case 41:
-#line 723 "./parser.y"
+#line 724 "./parser.y"
{
if(!win32)
yywarning("MESSAGETABLE not supported in 16-bit
mode");
@@ -2411,22 +2412,22 @@
break;
case 42:
-#line 731 "./parser.y"
+#line 732 "./parser.y"
{ yyval.html = new_html(yyvsp[0].raw, yyvsp[-1].iptr); }
break;
case 43:
-#line 735 "./parser.y"
+#line 736 "./parser.y"
{ yyval.rdt = new_rcdata(yyvsp[0].raw, yyvsp[-1].iptr); }
break;
case 44:
-#line 739 "./parser.y"
+#line 740 "./parser.y"
{ yyval.dginit = new_dlginit(yyvsp[0].raw, yyvsp[-1].iptr); }
break;
case 45:
-#line 743 "./parser.y"
+#line 744 "./parser.y"
{
#ifdef WORDS_BIGENDIAN
if(pedantic && byteorder != WRC_BO_LITTLE)
@@ -2439,7 +2440,7 @@
break;
case 46:
-#line 754 "./parser.y"
+#line 755 "./parser.y"
{
yyval.nid = new_name_id();
yyval.nid->type = name_ord;
@@ -2448,7 +2449,7 @@
break;
case 47:
-#line 759 "./parser.y"
+#line 760 "./parser.y"
{
yyval.nid = new_name_id();
yyval.nid->type = name_str;
@@ -2457,7 +2458,7 @@
break;
case 48:
-#line 768 "./parser.y"
+#line 769 "./parser.y"
{
yyval.acc = new_accelerator();
if(yyvsp[-4].iptr)
@@ -2483,72 +2484,72 @@
break;
case 49:
-#line 792 "./parser.y"
+#line 793 "./parser.y"
{ yyval.event=NULL; }
break;
case 50:
-#line 793 "./parser.y"
+#line 794 "./parser.y"
{ yyval.event=add_string_event(yyvsp[-3].str, yyvsp[-1].num,
yyvsp[0].num, yyvsp[-4].event); }
break;
case 51:
-#line 794 "./parser.y"
+#line 795 "./parser.y"
{ yyval.event=add_event(yyvsp[-3].num, yyvsp[-1].num, yyvsp[0].num,
yyvsp[-4].event); }
break;
case 52:
-#line 803 "./parser.y"
+#line 804 "./parser.y"
{ yyval.num = 0; }
break;
case 53:
-#line 804 "./parser.y"
+#line 805 "./parser.y"
{ yyval.num = yyvsp[0].num; }
break;
case 54:
-#line 807 "./parser.y"
+#line 808 "./parser.y"
{ yyval.num = yyvsp[0].num; }
break;
case 55:
-#line 808 "./parser.y"
+#line 809 "./parser.y"
{ yyval.num = yyvsp[-2].num | yyvsp[0].num; }
break;
case 56:
-#line 811 "./parser.y"
+#line 812 "./parser.y"
{ yyval.num = WRC_AF_NOINVERT; }
break;
case 57:
-#line 812 "./parser.y"
+#line 813 "./parser.y"
{ yyval.num = WRC_AF_SHIFT; }
break;
case 58:
-#line 813 "./parser.y"
+#line 814 "./parser.y"
{ yyval.num = WRC_AF_CONTROL; }
break;
case 59:
-#line 814 "./parser.y"
+#line 815 "./parser.y"
{ yyval.num = WRC_AF_ALT; }
break;
case 60:
-#line 815 "./parser.y"
+#line 816 "./parser.y"
{ yyval.num = WRC_AF_ASCII; }
break;
case 61:
-#line 816 "./parser.y"
+#line 817 "./parser.y"
{ yyval.num = WRC_AF_VIRTKEY; }
break;
case 62:
-#line 822 "./parser.y"
+#line 823 "./parser.y"
{
if(yyvsp[-11].iptr)
{
@@ -2583,147 +2584,147 @@
break;
case 63:
-#line 856 "./parser.y"
+#line 857 "./parser.y"
{ yyval.dlg=new_dialog(); }
break;
case 64:
-#line 857 "./parser.y"
+#line 858 "./parser.y"
{ yyval.dlg=dialog_style(yyvsp[0].style,yyvsp[-2].dlg); }
break;
case 65:
-#line 858 "./parser.y"
+#line 859 "./parser.y"
{ yyval.dlg=dialog_exstyle(yyvsp[0].style,yyvsp[-2].dlg); }
break;
case 66:
-#line 859 "./parser.y"
+#line 860 "./parser.y"
{ yyval.dlg=dialog_caption(yyvsp[0].str,yyvsp[-2].dlg); }
break;
case 67:
-#line 860 "./parser.y"
+#line 861 "./parser.y"
{ yyval.dlg=dialog_font(yyvsp[0].fntid,yyvsp[-1].dlg); }
break;
case 68:
-#line 861 "./parser.y"
+#line 862 "./parser.y"
{ yyval.dlg=dialog_class(yyvsp[0].nid,yyvsp[-2].dlg); }
break;
case 69:
-#line 862 "./parser.y"
+#line 863 "./parser.y"
{ yyval.dlg=dialog_menu(yyvsp[0].nid,yyvsp[-2].dlg); }
break;
case 70:
-#line 863 "./parser.y"
+#line 864 "./parser.y"
{ yyval.dlg=dialog_language(yyvsp[0].lan,yyvsp[-1].dlg); }
break;
case 71:
-#line 864 "./parser.y"
+#line 865 "./parser.y"
{ yyval.dlg=dialog_characteristics(yyvsp[0].chars,yyvsp[-1].dlg); }
break;
case 72:
-#line 865 "./parser.y"
+#line 866 "./parser.y"
{ yyval.dlg=dialog_version(yyvsp[0].ver,yyvsp[-1].dlg); }
break;
case 73:
-#line 868 "./parser.y"
+#line 869 "./parser.y"
{ yyval.ctl = NULL; }
break;
case 74:
-#line 869 "./parser.y"
+#line 870 "./parser.y"
{ yyval.ctl=ins_ctrl(-1, 0, yyvsp[0].ctl, yyvsp[-2].ctl); }
break;
case 75:
-#line 870 "./parser.y"
+#line 871 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_EDIT, 0, yyvsp[0].ctl, yyvsp[-2].ctl); }
break;
case 76:
-#line 871 "./parser.y"
+#line 872 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_LISTBOX, 0, yyvsp[0].ctl, yyvsp[-2].ctl); }
break;
case 77:
-#line 872 "./parser.y"
+#line 873 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_COMBOBOX, 0, yyvsp[0].ctl, yyvsp[-2].ctl);
}
break;
case 78:
-#line 873 "./parser.y"
+#line 874 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_SCROLLBAR, 0, yyvsp[0].ctl, yyvsp[-2].ctl);
}
break;
case 79:
-#line 874 "./parser.y"
+#line 875 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_BUTTON, BS_CHECKBOX, yyvsp[0].ctl,
yyvsp[-2].ctl); }
break;
case 80:
-#line 875 "./parser.y"
+#line 876 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_BUTTON, BS_DEFPUSHBUTTON, yyvsp[0].ctl,
yyvsp[-2].ctl); }
break;
case 81:
-#line 876 "./parser.y"
+#line 877 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_BUTTON, BS_GROUPBOX, yyvsp[0].ctl,
yyvsp[-2].ctl);}
break;
case 82:
-#line 877 "./parser.y"
+#line 878 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_BUTTON, BS_PUSHBUTTON, yyvsp[0].ctl,
yyvsp[-2].ctl); }
break;
case 83:
-#line 879 "./parser.y"
+#line 880 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_BUTTON, BS_RADIOBUTTON, yyvsp[0].ctl,
yyvsp[-2].ctl); }
break;
case 84:
-#line 880 "./parser.y"
+#line 881 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTO3STATE, yyvsp[0].ctl,
yyvsp[-2].ctl); }
break;
case 85:
-#line 881 "./parser.y"
+#line 882 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_BUTTON, BS_3STATE, yyvsp[0].ctl,
yyvsp[-2].ctl); }
break;
case 86:
-#line 882 "./parser.y"
+#line 883 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTOCHECKBOX, yyvsp[0].ctl,
yyvsp[-2].ctl); }
break;
case 87:
-#line 883 "./parser.y"
+#line 884 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTORADIOBUTTON, yyvsp[0].ctl,
yyvsp[-2].ctl); }
break;
case 88:
-#line 884 "./parser.y"
+#line 885 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_STATIC, SS_LEFT, yyvsp[0].ctl,
yyvsp[-2].ctl); }
break;
case 89:
-#line 885 "./parser.y"
+#line 886 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_STATIC, SS_CENTER, yyvsp[0].ctl,
yyvsp[-2].ctl); }
break;
case 90:
-#line 886 "./parser.y"
+#line 887 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_STATIC, SS_RIGHT, yyvsp[0].ctl,
yyvsp[-2].ctl); }
break;
case 91:
-#line 888 "./parser.y"
+#line 889 "./parser.y"
{
yyvsp[0].ctl->title = yyvsp[-7].nid;
yyvsp[0].ctl->id = yyvsp[-5].num;
@@ -2734,7 +2735,7 @@
break;
case 92:
-#line 898 "./parser.y"
+#line 899 "./parser.y"
{
yyval.ctl=new_control();
yyval.ctl->title = new_name_id();
@@ -2760,7 +2761,7 @@
break;
case 93:
-#line 923 "./parser.y"
+#line 924 "./parser.y"
{
yyval.ctl = new_control();
yyval.ctl->id = yyvsp[-9].num;
@@ -2783,12 +2784,12 @@
break;
case 94:
-#line 945 "./parser.y"
+#line 946 "./parser.y"
{ yyval.ctl = new_control(); }
break;
case 95:
-#line 947 "./parser.y"
+#line 948 "./parser.y"
{
yyval.ctl = new_control();
yyval.ctl->width = yyvsp[-2].num;
@@ -2797,7 +2798,7 @@
break;
case 96:
-#line 952 "./parser.y"
+#line 953 "./parser.y"
{
yyval.ctl = new_control();
yyval.ctl->width = yyvsp[-4].num;
@@ -2808,7 +2809,7 @@
break;
case 97:
-#line 959 "./parser.y"
+#line 960 "./parser.y"
{
yyval.ctl = new_control();
yyval.ctl->width = yyvsp[-6].num;
@@ -2821,7 +2822,7 @@
break;
case 98:
-#line 970 "./parser.y"
+#line 971 "./parser.y"
{
yyval.ctl=new_control();
yyval.ctl->title = yyvsp[-16].nid;
@@ -2839,7 +2840,7 @@
break;
case 99:
-#line 984 "./parser.y"
+#line 985 "./parser.y"
{
yyval.ctl=new_control();
yyval.ctl->title = yyvsp[-14].nid;
@@ -2855,47 +2856,47 @@
break;
case 100:
-#line 999 "./parser.y"
+#line 1000 "./parser.y"
{ yyval.fntid = new_font_id(yyvsp[-2].num, yyvsp[0].str, 0, 0); }
break;
case 101:
-#line 1004 "./parser.y"
+#line 1005 "./parser.y"
{ yyval.styles = NULL; }
break;
case 102:
-#line 1005 "./parser.y"
+#line 1006 "./parser.y"
{ yyval.styles = new_style_pair(yyvsp[0].style, 0); }
break;
case 103:
-#line 1006 "./parser.y"
+#line 1007 "./parser.y"
{ yyval.styles = new_style_pair(yyvsp[-2].style, yyvsp[0].style); }
break;
case 104:
-#line 1010 "./parser.y"
+#line 1011 "./parser.y"
{ yyval.style = new_style(yyvsp[-2].style->or_mask |
yyvsp[0].style->or_mask, yyvsp[-2].style->and_mask |
yyvsp[0].style->and_mask); free(yyvsp[-2].style); free(yyvsp[0].style);}
break;
case 105:
-#line 1011 "./parser.y"
+#line 1012 "./parser.y"
{ yyval.style = yyvsp[-1].style; }
break;
case 106:
-#line 1012 "./parser.y"
+#line 1013 "./parser.y"
{ yyval.style = new_style(yyvsp[0].num, 0); }
break;
case 107:
-#line 1013 "./parser.y"
+#line 1014 "./parser.y"
{ yyval.style = new_style(0, yyvsp[0].num); }
break;
case 108:
-#line 1017 "./parser.y"
+#line 1018 "./parser.y"
{
yyval.nid = new_name_id();
yyval.nid->type = name_ord;
@@ -2904,7 +2905,7 @@
break;
case 109:
-#line 1022 "./parser.y"
+#line 1023 "./parser.y"
{
yyval.nid = new_name_id();
yyval.nid->type = name_str;
@@ -2913,7 +2914,7 @@
break;
case 110:
-#line 1031 "./parser.y"
+#line 1032 "./parser.y"
{
if(!win32)
yywarning("DIALOGEX not supported in 16-bit
mode");
@@ -2957,152 +2958,152 @@
break;
case 111:
-#line 1074 "./parser.y"
+#line 1075 "./parser.y"
{ yyval.dlgex=new_dialogex(); }
break;
case 112:
-#line 1075 "./parser.y"
+#line 1076 "./parser.y"
{ yyval.dlgex=dialogex_style(yyvsp[0].style,yyvsp[-2].dlgex); }
break;
case 113:
-#line 1076 "./parser.y"
+#line 1077 "./parser.y"
{ yyval.dlgex=dialogex_exstyle(yyvsp[0].style,yyvsp[-2].dlgex); }
break;
case 114:
-#line 1077 "./parser.y"
+#line 1078 "./parser.y"
{ yyval.dlgex=dialogex_caption(yyvsp[0].str,yyvsp[-2].dlgex); }
break;
case 115:
-#line 1078 "./parser.y"
+#line 1079 "./parser.y"
{ yyval.dlgex=dialogex_font(yyvsp[0].fntid,yyvsp[-1].dlgex); }
break;
case 116:
-#line 1079 "./parser.y"
+#line 1080 "./parser.y"
{ yyval.dlgex=dialogex_font(yyvsp[0].fntid,yyvsp[-1].dlgex); }
break;
case 117:
-#line 1080 "./parser.y"
+#line 1081 "./parser.y"
{ yyval.dlgex=dialogex_class(yyvsp[0].nid,yyvsp[-2].dlgex); }
break;
case 118:
-#line 1081 "./parser.y"
+#line 1082 "./parser.y"
{ yyval.dlgex=dialogex_menu(yyvsp[0].nid,yyvsp[-2].dlgex); }
break;
case 119:
-#line 1082 "./parser.y"
+#line 1083 "./parser.y"
{ yyval.dlgex=dialogex_language(yyvsp[0].lan,yyvsp[-1].dlgex); }
break;
case 120:
-#line 1083 "./parser.y"
+#line 1084 "./parser.y"
{
yyval.dlgex=dialogex_characteristics(yyvsp[0].chars,yyvsp[-1].dlgex); }
break;
case 121:
-#line 1084 "./parser.y"
+#line 1085 "./parser.y"
{ yyval.dlgex=dialogex_version(yyvsp[0].ver,yyvsp[-1].dlgex); }
break;
case 122:
-#line 1087 "./parser.y"
+#line 1088 "./parser.y"
{ yyval.ctl = NULL; }
break;
case 123:
-#line 1088 "./parser.y"
+#line 1089 "./parser.y"
{ yyval.ctl=ins_ctrl(-1, 0, yyvsp[0].ctl, yyvsp[-2].ctl); }
break;
case 124:
-#line 1089 "./parser.y"
+#line 1090 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_EDIT, 0, yyvsp[0].ctl, yyvsp[-2].ctl); }
break;
case 125:
-#line 1090 "./parser.y"
+#line 1091 "./parser.y"
{ yyval.ctl=ins_ctrl(CT_LISTBOX, 0, yyvsp[0].ctl, yyvsp[-2].ctl); }
break;
[truncated at 1000 lines; 964 more skipped]