Previous 15994 Revisions Next

r7916 Tuesday 27th April, 2010 at 17:27:42 UTC by Fabio Priuli
Added some basic validation to softlists (part of the ones MAME/MESS apply to drivers), and fixed a few related warnings
[hash]bbcbc.xml
[src/mess]softlist.c softlist.h

hash/bbcbc.xml
r7915r7916
44<softwarelist name="bbcbc" description="BBC Bridge Companion cartridges">
55   <software name="advbidng">
66      <description>Advanced Bidding</description>
7      <year>198x</year>
7      <year>198?</year>
88      <publisher>BBC</publisher>
99      <part name="cart" interface="bbcbc_cart">
1010         <dataarea name="rom" size="32768">
r7915r7916
1515
1616   <software name="advdefnc">
1717      <description>Advanced Defence</description>
18      <year>198x</year>
18      <year>198?</year>
1919      <publisher>BBC</publisher>
2020      <part name="cart" interface="bbcbc_cart">
2121         <dataarea name="rom" size="32768">
r7915r7916
2626
2727   <software name="bbuilder">
2828      <description>Bridge Builder</description>
29      <year>198x</year>
29      <year>198?</year>
3030      <publisher>BBC</publisher>
3131      <part name="cart" interface="bbcbc_cart">
3232         <dataarea name="rom" size="32768">
r7915r7916
4040
4141   <software name="bbuildera" cloneof="bbuilder">
4242      <description>Bridge Builder (Alt)</description>
43      <year>198x</year>
43      <year>198?</year>
4444      <publisher>BBC</publisher>
4545      <part name="cart" interface="bbcbc_cart">
4646         <dataarea name="rom" size="32768">
r7915r7916
5252
5353   <software name="cplay1">
5454      <description>Club Play 1</description>
55      <year>198x</year>
55      <year>198?</year>
5656      <publisher>BBC</publisher>
5757      <part name="cart" interface="bbcbc_cart">
5858         <dataarea name="rom" size="24576">
r7915r7916
6565
6666   <software name="cplay2">
6767      <description>Club Play 2</description>
68      <year>198x</year>
68      <year>198?</year>
6969      <publisher>BBC</publisher>
7070      <part name="cart" interface="bbcbc_cart">
7171         <dataarea name="rom" size="32768">
r7915r7916
7777
7878   <software name="cplay2a" cloneof="cplay2">
7979      <description>Club Play 2 (Alt)</description>
80      <year>198x</year>
80      <year>198?</year>
8181      <publisher>BBC</publisher>
8282      <part name="cart" interface="bbcbc_cart">
8383         <dataarea name="rom" size="32768">
r7915r7916
8888
8989   <software name="cplay3">
9090      <description>Club Play 3</description>
91      <year>198x</year>
91      <year>198?</year>
9292      <publisher>BBC</publisher>
9393      <part name="cart" interface="bbcbc_cart">
9494         <dataarea name="rom" size="32768">
r7915r7916
9999
100100   <software name="convent1">
101101      <description>Conventions 1</description>
102      <year>198x</year>
102      <year>198?</year>
103103      <publisher>BBC</publisher>
104104      <part name="cart" interface="bbcbc_cart">
105105         <dataarea name="rom" size="32768">
r7915r7916
110110
111111   <software name="duplict1">
112112      <description>Duplicate 1</description>
113      <year>198x</year>
113      <year>198?</year>
114114      <publisher>BBC</publisher>
115115      <part name="cart" interface="bbcbc_cart">
116116         <dataarea name="rom" size="32768">
r7915r7916
121121
122122   <software name="mplay1">
123123      <description>Master Play 1</description>
124      <year>198x</year>
124      <year>198?</year>
125125      <publisher>BBC</publisher>
126126      <part name="cart" interface="bbcbc_cart">
127127         <dataarea name="rom" size="32768">
src/mess/softlist.c
r7915r7916
1313#include "emuopts.h"
1414#include "softlist.h"
1515
16#include <ctype.h>
1617
1718enum softlist_parse_position
1819{
r7915r7916
6162};
6263
6364
65typedef tagmap_t<software_info *> softlist_map;
66
6467/***************************************************************************
6568    EXPAT INTERFACES
6669***************************************************************************/
r7915r7916
315318         if ( !strcmp( tagname, "software" ) )
316319         {
317320            const char *name = NULL;
321            const char *parent = NULL;
318322            const char *supported = NULL;
319323
320324            for ( ; attributes[0]; attributes += 2 )
r7915r7916
323327               {
324328                  name = attributes[1];
325329               }
330               if ( !strcmp( attributes[0], "cloneof" ) )
331               {
332                  parent = attributes[1];
333               }
326334               if ( !strcmp( attributes[0], "supported" ) )
327335               {
328336                  supported = attributes[1];
r7915r7916
347355
348356               strcpy( (char *)elem->info.shortname, name );
349357
358               /* Allocate space to hold the parentname and copy the parent name */
359               if (parent)
360               {
361                  elem->info.parentname = (const char*)pool_malloc_lib(swlist->pool, ( strlen(parent) + 1 ) * sizeof(char) );
362                  strcpy((char *)elem->info.parentname, parent);
363               }
364
350365               /* Allocate initial space to hold part information */
351366               swlist->part_entries = 2;
352367               swlist->current_part_entry = 0;
r7915r7916
10431058{
10441059}
10451060
1061static DEVICE_VALIDITY_CHECK( software_list )
1062{
1063   software_list_config *swlist = (software_list_config *)device->inline_config;
1064   int error = FALSE, is_clone = 0;
1065   softlist_map names;
1066   softlist_map descriptions;
10461067
1068   enum { NAME_LEN_PARENT = 8, NAME_LEN_CLONE = 16 };
1069
1070   for (int i = 0; i < DEVINFO_STR_SWLIST_MAX - DEVINFO_STR_SWLIST_0; i++)
1071   {
1072      if (swlist->list_name[i])
1073      {
1074         if (mame_options() == NULL)
1075            return FALSE;
1076         
1077         software_list *list = software_list_open(mame_options(), swlist->list_name[i], FALSE, NULL);
1078         
1079         for (software_info *swinfo = software_list_first(list); swinfo != NULL; swinfo = software_list_next(list))
1080         {
1081            const char *s;
1082           
1083            /* check for duplicate names */
1084            if (names.add(swinfo->shortname, swinfo, FALSE) == TMERR_DUPLICATE)
1085            {
1086               software_info *match = names.find(swinfo->shortname);
1087               mame_printf_error("%s: %s is a duplicate name (%s)\n", swlist->list_name[i], swinfo->shortname, match->shortname);
1088               error = TRUE;
1089            }
1090           
1091            /* check for duplicate descriptions */
1092            if (descriptions.add(swinfo->longname, swinfo, FALSE) == TMERR_DUPLICATE)
1093            {
1094               software_info *match = names.find(swinfo->shortname);
1095               mame_printf_error("%s: %s is a duplicate description (%s)\n", swlist->list_name[i], swinfo->longname, match->longname);
1096               error = TRUE;
1097            }
1098           
1099            if (swinfo->parentname != NULL)
1100               is_clone = 1;
1101           
1102            /* make sure the driver name is 8 chars or less */
1103            if ((is_clone && strlen(swinfo->shortname) > NAME_LEN_CLONE) || ((!is_clone) && strlen(swinfo->shortname) > NAME_LEN_PARENT))
1104            {
1105               mame_printf_error("%s: %s %s driver name must be %d characters or less\n", swlist->list_name[i], swinfo->shortname,
1106                             is_clone ? "clone" : "parent", is_clone ? NAME_LEN_CLONE : NAME_LEN_PARENT);
1107               error = TRUE;
1108            }
1109           
1110            /* make sure the year is only digits, '?' or '+' */
1111            for (s = swinfo->year; *s; s++)
1112               if (!isdigit((UINT8)*s) && *s != '?' && *s != '+')
1113               {
1114                  mame_printf_error("%s: %s has an invalid year '%s'\n", swlist->list_name[i], swinfo->shortname, swinfo->year);
1115                  error = TRUE;
1116                  break;
1117               }
1118         }
1119      }
1120   }
1121   return error;
1122}   
1123
10471124DEVICE_GET_INFO( software_list )
10481125{
10491126   switch (state)
r7915r7916
10561133      /* --- the following bits of info are returned as pointers to data or functions --- */
10571134      case DEVINFO_FCT_START:                     info->start = DEVICE_START_NAME( software_list );   break;
10581135      case DEVINFO_FCT_STOP:                     /* Nothing */                              break;
1136      case DEVINFO_FCT_VALIDITY_CHECK:            info->validity_check = DEVICE_VALIDITY_CHECK_NAME( software_list ); break;
10591137
10601138      /* --- the following bits of info are returned as NULL-terminated strings --- */
10611139      case DEVINFO_STR_NAME:                     strcpy(info->s, "Software lists");               break;
src/mess/softlist.h
r7915r7916
3434{
3535   const char *shortname;
3636   const char *longname;
37   const char *parentname;
3738   const char *year;         /* Copyright year on title screen, actual release dates can be tracked in external resources */
3839   const char *publisher;
3940   UINT32 supported;

Previous 15994 Revisions Next


© 1998-2018 The MESS Team