From 8449a9cbdc47a36e9a5ecc079a073c599439c019 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 31 Jul 2011 15:46:18 +0000 Subject: [PATCH] - Removing MD5 support in ROMLOAD_* [Oliver Stoneberg] - Various core and tools memory leaks fixes [Oliver Stoneberg] --- hash/softwarelist.dtd | 2 -- src/build/makedep.c | 2 +- src/build/makelist.c | 3 ++ src/emu/audit.c | 4 +-- src/emu/clifront.c | 7 ++-- src/emu/debug/express.c | 3 +- src/emu/diimage.c | 2 +- src/emu/hash.c | 72 +------------------------------------ src/emu/hash.h | 2 -- src/emu/hashfile.c | 5 --- src/emu/info.c | 2 -- src/emu/romload.c | 2 +- src/lib/util/corefile.c | 2 +- src/mame/drivers/multfish.c | 48 ++++++++++++------------- src/osd/windows/input.c | 2 +- src/osd/windows/output.c | 2 +- src/tools/chdman.c | 6 ++-- src/tools/regrep.c | 2 +- src/tools/split.c | 4 +-- src/tools/src2html.c | 2 +- src/tools/unidasm.c | 2 ++ 21 files changed, 48 insertions(+), 128 deletions(-) diff --git a/hash/softwarelist.dtd b/hash/softwarelist.dtd index 1f75ec13c5e..16e278cb8a1 100644 --- a/hash/softwarelist.dtd +++ b/hash/softwarelist.dtd @@ -31,7 +31,6 @@ - @@ -41,7 +40,6 @@ - diff --git a/src/build/makedep.c b/src/build/makedep.c index df94e540515..51862ec3feb 100644 --- a/src/build/makedep.c +++ b/src/build/makedep.c @@ -479,7 +479,7 @@ static file_entry *compute_dependencies(int srcrootlen, const astring *srcfile) astring_free(filename); } - free(filedata); + osd_free(filedata); return file; } diff --git a/src/build/makelist.c b/src/build/makelist.c index 88d600f3a42..05f9d629497 100644 --- a/src/build/makelist.c +++ b/src/build/makelist.c @@ -168,6 +168,9 @@ int parse_file(const char *srcfile) strcpy(name, drivname); drivlist[drivcount++] = name; } + + osd_free(buffer); + return 0; } diff --git a/src/emu/audit.c b/src/emu/audit.c index 79870e94282..c837fb6af8c 100644 --- a/src/emu/audit.c +++ b/src/emu/audit.c @@ -358,9 +358,7 @@ audit_record *media_auditor::audit_one_disk(const rom_entry *rom) chd_header header = *chd_get_header(source); hash_collection hashes; - // if there's an MD5 or SHA1 hash, add them to the output hash - if (memcmp(nullhash, header.md5, sizeof(header.md5)) != 0) - hashes.add_from_buffer(hash_collection::HASH_MD5, header.md5, sizeof(header.md5)); + // if there's a SHA1 hash, add them to the output hash if (memcmp(nullhash, header.sha1, sizeof(header.sha1)) != 0) hashes.add_from_buffer(hash_collection::HASH_SHA1, header.sha1, sizeof(header.sha1)); diff --git a/src/emu/clifront.c b/src/emu/clifront.c index 170d1c04a38..cd4ce2b5e52 100644 --- a/src/emu/clifront.c +++ b/src/emu/clifront.c @@ -980,7 +980,6 @@ void cli_frontend::listsoftware(const char *gamename) "\t\t\t\t\t\t\n" "\t\t\t\t\t\t\n" "\t\t\t\t\t\t\n" - "\t\t\t\t\t\t\n" "\t\t\t\t\t\t\n" "\t\t\t\t\t\t\n" "\t\t\t\t\t\t\n" @@ -990,7 +989,6 @@ void cli_frontend::listsoftware(const char *gamename) "\t\t\t\t\t\n" "\t\t\t\t\t\n" "\t\t\t\t\t\t\n" - "\t\t\t\t\t\t\n" "\t\t\t\t\t\t\n" "\t\t\t\t\t\t\n" "\t\t\t\t\t\t\n" @@ -1452,8 +1450,6 @@ void media_identifier::identify_file(const char *name) static const UINT8 nullhash[20] = { 0 }; hash_collection hashes; - if (memcmp(nullhash, header.md5, sizeof(header.md5)) != 0) - hashes.add_from_buffer(hash_collection::HASH_MD5, header.md5, sizeof(header.md5)); if (memcmp(nullhash, header.sha1, sizeof(header.sha1)) != 0) hashes.add_from_buffer(hash_collection::HASH_SHA1, header.sha1, sizeof(header.sha1)); @@ -1473,7 +1469,10 @@ void media_identifier::identify_file(const char *name) void *data; file_error filerr = core_fload(name, &data, &length); if (filerr == FILERR_NONE && length > 0) + { identify_data(name, reinterpret_cast(data), length); + osd_free(data); + } } } diff --git a/src/emu/debug/express.c b/src/emu/debug/express.c index dbb2e96aedb..cf9fc8699e9 100644 --- a/src/emu/debug/express.c +++ b/src/emu/debug/express.c @@ -58,8 +58,7 @@ ***************************************************************************/ -#include "emucore.h" -#include "emutempl.h" +#include "emu.h" #include "express.h" #include diff --git a/src/emu/diimage.c b/src/emu/diimage.c index 23d357cb865..fadf1d94c31 100644 --- a/src/emu/diimage.c +++ b/src/emu/diimage.c @@ -490,7 +490,7 @@ void device_image_interface::image_checkhash() if (m_hash.first() == NULL && m_readonly && !m_created) { /* do not cause a linear read of 600 megs please */ - /* TODO: use SHA/MD5 in the CHD header as the hash */ + /* TODO: use SHA1 in the CHD header as the hash */ if (image_type() == IO_CDROM) return; diff --git a/src/emu/hash.c b/src/emu/hash.c index ca768554514..07a57587531 100644 --- a/src/emu/hash.c +++ b/src/emu/hash.c @@ -41,7 +41,6 @@ #include "emu.h" #include "zlib.h" -#include "md5.h" #include "sha1.h" #include @@ -73,26 +72,6 @@ private: }; -// ======================> hash_md5 - -// MD5 hash implementation -class hash_md5 : public hash_base -{ -public: - // construction/destruction - hash_md5(); - - // creation - virtual void begin(); - virtual void buffer(const UINT8 *data, UINT32 length); - virtual void end(); - -private: - // internal state - UINT8 m_buffer[16]; - struct MD5Context m_context; -}; - // ======================> hash_sha1 @@ -122,7 +101,7 @@ private: const char *hash_collection::HASH_TYPES_CRC = "R"; const char *hash_collection::HASH_TYPES_CRC_SHA1 = "RS"; -const char *hash_collection::HASH_TYPES_ALL = "RSM"; +const char *hash_collection::HASH_TYPES_ALL = "RS"; @@ -292,53 +271,6 @@ void hash_crc::end() -//************************************************************************** -// HASH MD5 -//************************************************************************** - -//------------------------------------------------- -// hash_md5 - constructor -//------------------------------------------------- - -hash_md5::hash_md5() - : hash_base(hash_collection::HASH_MD5, "md5", sizeof(m_buffer), m_buffer) -{ -} - - -//------------------------------------------------- -// begin - initialize state for hash computation -//------------------------------------------------- - -void hash_md5::begin() -{ - m_in_progress = true; - MD5Init(&m_context); -} - - -//------------------------------------------------- -// buffer - hash a buffer's worth of data -//------------------------------------------------- - -void hash_md5::buffer(const UINT8 *data, UINT32 length) -{ - MD5Update(&m_context, (md5byte *)data, length); -} - - -//------------------------------------------------- -// end - finish hash computation -//------------------------------------------------- - -void hash_md5::end() -{ - MD5Final(m_buffer, &m_context); - m_in_progress = false; -} - - - //************************************************************************** // HASH SHA1 //************************************************************************** @@ -728,7 +660,6 @@ void hash_collection::begin(const char *types) if (types == NULL) { m_hashlist.append(*alloc_by_id(HASH_CRC)).begin(); - m_hashlist.append(*alloc_by_id(HASH_MD5)).begin(); m_hashlist.append(*alloc_by_id(HASH_SHA1)).begin(); } @@ -785,7 +716,6 @@ hash_base *hash_collection::alloc_by_id(char id) switch (id) { case HASH_CRC: return global_alloc(hash_crc); - case HASH_MD5: return global_alloc(hash_md5); case HASH_SHA1: return global_alloc(hash_sha1); default: return NULL; } diff --git a/src/emu/hash.h b/src/emu/hash.h index 3f5995edb51..04c25853856 100644 --- a/src/emu/hash.h +++ b/src/emu/hash.h @@ -51,7 +51,6 @@ // use these to define compile-time internal-format hash strings #define CRC(x) "R" #x -#define MD5(x) "M" #x #define SHA1(x) "S" #x #define NO_DUMP "!" #define BAD_DUMP "^" @@ -124,7 +123,6 @@ class hash_collection public: // hash types are identified by non-hex alpha values (G-Z) static const char HASH_CRC = 'R'; - static const char HASH_MD5 = 'M'; static const char HASH_SHA1 = 'S'; // common combinations for requests diff --git a/src/emu/hashfile.c b/src/emu/hashfile.c index 15a5ea9ffd4..d3c1b16a223 100644 --- a/src/emu/hashfile.c +++ b/src/emu/hashfile.c @@ -213,11 +213,6 @@ static void start_handler(void *data, const char *tagname, const char **attribut /* crc32 attribute */ functions = hash_collection::HASH_CRC; } - else if (!strcmp(attributes[0], "md5")) - { - /* md5 attribute */ - functions = hash_collection::HASH_MD5; - } else if (!strcmp(attributes[0], "sha1")) { /* sha1 attribute */ diff --git a/src/emu/info.c b/src/emu/info.c index 5f8b375319c..a13eeadd08f 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -79,7 +79,6 @@ const char info_xml_creator::s_dtd_string[] = "\t\t\t\n" "\t\t\t\n" "\t\t\t\n" -"\t\t\t\n" "\t\t\t\n" "\t\t\t\n" "\t\t\t\n" @@ -88,7 +87,6 @@ const char info_xml_creator::s_dtd_string[] = "\t\t\t\n" "\t\t\n" "\t\t\t\n" -"\t\t\t\n" "\t\t\t\n" "\t\t\t\n" "\t\t\t\n" diff --git a/src/emu/romload.c b/src/emu/romload.c index 6d9b68daf47..4a1c87e8cbe 100644 --- a/src/emu/romload.c +++ b/src/emu/romload.c @@ -1244,7 +1244,7 @@ static void process_disk_entries(rom_load_data *romdata, const char *regiontag, continue; } - /* get the header and extract the MD5/SHA1 */ + /* get the header and extract the SHA1 */ header = *chd_get_header(chd.origchd); hash_collection acthashes; acthashes.add_from_buffer(hash_collection::HASH_SHA1, header.sha1, sizeof(header.sha1)); diff --git a/src/lib/util/corefile.c b/src/lib/util/corefile.c index 94c8d49a4a6..4c4b0673d3d 100644 --- a/src/lib/util/corefile.c +++ b/src/lib/util/corefile.c @@ -740,7 +740,7 @@ file_error core_fload(const char *filename, void **data, UINT32 *length) } /* allocate memory */ - *data = malloc(size); + *data = osd_malloc(size); if (length != NULL) *length = (UINT32)size; diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index 701d8aa011c..3125dbfca6f 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -1114,7 +1114,7 @@ ROM_END ROM_START( mfish ) // 021120 ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD( "mf021120.rom", 0x00000, 0x40000, MD5(6021e2bfa67abdfc0beb7f291fdc9d9c) SHA1(eb7eb5aae00a77edcf328f460970eb180d86d058) ) + ROM_LOAD( "mf021120.rom", 0x00000, 0x40000, SHA1(eb7eb5aae00a77edcf328f460970eb180d86d058) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "multi_fish.001", 0x000000, 0x80000, CRC(2f2a7367) SHA1(ce7ee9ca4f374ec61edc3b89d4752f0edb64a910) ) @@ -1129,7 +1129,7 @@ ROM_END ROM_START( mfish_2 ) // 021121 ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD( "mf021121.rom", 0x00000, 0x40000, MD5(727dc01459f6745caa2b19fbd4432055) SHA1(87a1fb81330cf4b66e17702c22fda694ebff58eb) ) + ROM_LOAD( "mf021121.rom", 0x00000, 0x40000, SHA1(87a1fb81330cf4b66e17702c22fda694ebff58eb) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "multi_fish.001", 0x000000, 0x80000, CRC(2f2a7367) SHA1(ce7ee9ca4f374ec61edc3b89d4752f0edb64a910) ) @@ -1160,7 +1160,7 @@ ROM_END ROM_START( mfish_4 ) // 021219 ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD( "mf021219.rom", 0x00000, 0x40000, MD5(c8810d803d320d9fefa46588c8ef28c0) SHA1(887d456b2ba89560329457d9eaea26fb72223a38) ) + ROM_LOAD( "mf021219.rom", 0x00000, 0x40000, SHA1(887d456b2ba89560329457d9eaea26fb72223a38) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "multi_fish.001", 0x000000, 0x80000, CRC(2f2a7367) SHA1(ce7ee9ca4f374ec61edc3b89d4752f0edb64a910) ) @@ -1175,7 +1175,7 @@ ROM_END ROM_START( mfish_5 ) // 021227 ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD( "mf021227.rom", 0x00000, 0x40000, MD5(1bbdff5bd2b89a0c9c474286c55d16db) SHA1(58b74c41a88a781da01dba52744dc74e41deae70) ) + ROM_LOAD( "mf021227.rom", 0x00000, 0x40000, SHA1(58b74c41a88a781da01dba52744dc74e41deae70) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "multi_fish.001", 0x000000, 0x80000, CRC(2f2a7367) SHA1(ce7ee9ca4f374ec61edc3b89d4752f0edb64a910) ) @@ -1205,7 +1205,7 @@ ROM_END ROM_START( mfish_7 ) // 030511 ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD( "mf030511.rom", 0x00000, 0x40000, MD5(a910910ce7963a4385e31769789842f7) SHA1(06b3e3875f036782983e29e305f67a36f78a4f06) ) + ROM_LOAD( "mf030511.rom", 0x00000, 0x40000, SHA1(06b3e3875f036782983e29e305f67a36f78a4f06) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "multi_fish.001", 0x000000, 0x80000, CRC(2f2a7367) SHA1(ce7ee9ca4f374ec61edc3b89d4752f0edb64a910) ) @@ -1235,7 +1235,7 @@ ROM_END ROM_START( mfish_9 ) // 031026 ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD( "mf031026.rom", 0x00000, 0x40000, MD5(a0a31829705ad78786f7c1bd36cee0cf) SHA1(451b390793f89188afe2b6e82fc02b474fb97a7c) ) + ROM_LOAD( "mf031026.rom", 0x00000, 0x40000, SHA1(451b390793f89188afe2b6e82fc02b474fb97a7c) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "multi_fish.001", 0x000000, 0x80000, CRC(2f2a7367) SHA1(ce7ee9ca4f374ec61edc3b89d4752f0edb64a910) ) @@ -1250,7 +1250,7 @@ ROM_END ROM_START( mfish_10 ) // 031117 ROM_REGION( 0x40000, "maincpu", 0 ) - ROM_LOAD( "mf031117.rom", 0x00000, 0x40000, MD5(531a3e63c46be33a151c06bdd9479655) SHA1(1d244a332af0fb6aa593a246211ff2b6d2c48a59) ) + ROM_LOAD( "mf031117.rom", 0x00000, 0x40000, SHA1(1d244a332af0fb6aa593a246211ff2b6d2c48a59) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "multi_fish.001", 0x000000, 0x80000, CRC(2f2a7367) SHA1(ce7ee9ca4f374ec61edc3b89d4752f0edb64a910) ) @@ -1319,7 +1319,7 @@ ROM_END ROM_START( crzmon ) // 030217 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "cm_m_030217.rom", 0x00000, 0x40000, MD5(5e2e4eec4cb20437a3e389003f8e2bb7) SHA1(75787f32aa4c8e8ff7bc11c57a37ad5a65f71c52) ) + ROM_LOAD( "cm_m_030217.rom", 0x00000, 0x40000, SHA1(75787f32aa4c8e8ff7bc11c57a37ad5a65f71c52) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "crazymonkey_m.001", 0x000000, 0x80000, CRC(683f2be3) SHA1(6fdba4ec07752bf049787a11638895352e9d5f10) ) @@ -1334,7 +1334,7 @@ ROM_END ROM_START( crzmon_2 ) // 030225 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "cm_m_030225.rom", 0x00000, 0x40000, MD5(8f8d0ca97b5a2ad255d36094a6b30e0e) SHA1(3627a3d6a4a50ed8544456d53ab5a489af389a19) ) + ROM_LOAD( "cm_m_030225.rom", 0x00000, 0x40000, SHA1(3627a3d6a4a50ed8544456d53ab5a489af389a19) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "crazymonkey_m.001", 0x000000, 0x80000, CRC(683f2be3) SHA1(6fdba4ec07752bf049787a11638895352e9d5f10) ) @@ -1349,7 +1349,7 @@ ROM_END ROM_START( crzmon_3 ) // 030227 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "cm_m_030227.rom", 0x00000, 0x40000, MD5(e2704337640db28a92b9946209eec2b1) SHA1(4f8cd68dd2b6abeaabc9b45da18469cc6e7ac74d) ) + ROM_LOAD( "cm_m_030227.rom", 0x00000, 0x40000, SHA1(4f8cd68dd2b6abeaabc9b45da18469cc6e7ac74d) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "crazymonkey_m.001", 0x000000, 0x80000, CRC(683f2be3) SHA1(6fdba4ec07752bf049787a11638895352e9d5f10) ) @@ -1364,7 +1364,7 @@ ROM_END ROM_START( crzmon_4 ) // 030404 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "cm_m_030404.rom", 0x00000, 0x40000, MD5(a3a9fce896f75cf9f8046c68a70a098d) SHA1(fd99caa2b6ef7218563db4f3b755e34dd551e05f) ) + ROM_LOAD( "cm_m_030404.rom", 0x00000, 0x40000, SHA1(fd99caa2b6ef7218563db4f3b755e34dd551e05f) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "crazymonkey_m.001", 0x000000, 0x80000, CRC(683f2be3) SHA1(6fdba4ec07752bf049787a11638895352e9d5f10) ) @@ -1394,7 +1394,7 @@ ROM_END ROM_START( crzmon_6 ) // 031016 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "cm_m_031016.rom", 0x00000, 0x40000, MD5(36901e462cd3a9d221a9cefcdf377cbe) SHA1(2f2a5ecbb311ade75f8fdc322c6e63836d4119c3) ) + ROM_LOAD( "cm_m_031016.rom", 0x00000, 0x40000, SHA1(2f2a5ecbb311ade75f8fdc322c6e63836d4119c3) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "crazymonkey_m.001", 0x000000, 0x80000, CRC(683f2be3) SHA1(6fdba4ec07752bf049787a11638895352e9d5f10) ) @@ -1463,7 +1463,7 @@ ROM_END ROM_START( fcockt ) // 030505 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "fc_m_030505.rom", 0x00000, 0x40000, MD5(5ee5ad269498787e5eb69194874b6544) SHA1(cc65334e8dfae5ffef1d73bd5085e3555905e259) ) + ROM_LOAD( "fc_m_030505.rom", 0x00000, 0x40000, SHA1(cc65334e8dfae5ffef1d73bd5085e3555905e259) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "fruitcocktail_m.001", 0x000000, 0x80000, CRC(da72c0bb) SHA1(41c9eebccce82520dfe41d6a3a574b2890945ffa) ) @@ -1478,7 +1478,7 @@ ROM_END ROM_START( fcockt_2 ) // 030512 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "fc_m_030512.rom", 0x00000, 0x40000, MD5(e94917c5935641601f17a3fe56dedb17) SHA1(c23ebcf64609a56a029f05101185f3adf73cdadd) ) + ROM_LOAD( "fc_m_030512.rom", 0x00000, 0x40000, SHA1(c23ebcf64609a56a029f05101185f3adf73cdadd) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "fruitcocktail_m.001", 0x000000, 0x80000, CRC(da72c0bb) SHA1(41c9eebccce82520dfe41d6a3a574b2890945ffa) ) @@ -1508,7 +1508,7 @@ ROM_END ROM_START( fcockt_4 ) // 031028 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "fc_m_031028.rom", 0x00000, 0x40000, MD5(ffab543f86538d4717da7cf20d97e3d1) SHA1(18a0ac6e3c6f1d6ae7aeae5322e6b6617923cfdf) ) + ROM_LOAD( "fc_m_031028.rom", 0x00000, 0x40000, SHA1(18a0ac6e3c6f1d6ae7aeae5322e6b6617923cfdf) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "fruitcocktail_m.001", 0x000000, 0x80000, CRC(da72c0bb) SHA1(41c9eebccce82520dfe41d6a3a574b2890945ffa) ) @@ -1652,7 +1652,7 @@ ROM_END ROM_START( lhaunt ) // 030707 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "lh_m_030707.rom", 0x00000, 0x40000, MD5(f2e42fb479888c21351e3029025e6700) SHA1(c7b8e1b98cd0aa665d62c1652716993539c9f3ef) ) + ROM_LOAD( "lh_m_030707.rom", 0x00000, 0x40000, SHA1(c7b8e1b98cd0aa665d62c1652716993539c9f3ef) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "luckyhaunter_m.001", 0x000000, 0x80000, CRC(5f1000c6) SHA1(05154d786caf7f5fb9ed90c7d3391cec42e871f8) ) @@ -1682,7 +1682,7 @@ ROM_END ROM_START( lhaunt_3 ) // 031027 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "lh_m_031027.rom", 0x00000, 0x40000, MD5(49b1cf6f89d03b36c5f80d0ccfc23aa2) SHA1(caec736dde2878588ab197ba37801cf7a9ed975b) ) + ROM_LOAD( "lh_m_031027.rom", 0x00000, 0x40000, SHA1(caec736dde2878588ab197ba37801cf7a9ed975b) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "luckyhaunter_m.001", 0x000000, 0x80000, CRC(5f1000c6) SHA1(05154d786caf7f5fb9ed90c7d3391cec42e871f8) ) @@ -1781,7 +1781,7 @@ ROM_END ROM_START( garage ) // 040122 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "gg_m_040122.rom", 0x00000, 0x40000, MD5(b1fca0a1293d6891171b168ade2112c0) SHA1(327e55d1f4bdc0ad0556faa2fbdaa05b9a5f1c16) ) + ROM_LOAD( "gg_m_040122.rom", 0x00000, 0x40000, SHA1(327e55d1f4bdc0ad0556faa2fbdaa05b9a5f1c16) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "garage_m.001", 0x000000, 0x80000, CRC(57acd4bc) SHA1(8796f463787c359cce6ac09c1b6895f871bbb7c9) ) @@ -1796,7 +1796,7 @@ ROM_END ROM_START( garage_2 ) // 040123 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "gg_m_040123.rom", 0x00000, 0x40000, MD5(7b66e7c7b9ddf74bd344a626c64fce5e) SHA1(3051c99d22cfe46b532fcc59a0b98eec186f4a76) ) + ROM_LOAD( "gg_m_040123.rom", 0x00000, 0x40000, SHA1(3051c99d22cfe46b532fcc59a0b98eec186f4a76) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "garage_m.001", 0x000000, 0x80000, CRC(57acd4bc) SHA1(8796f463787c359cce6ac09c1b6895f871bbb7c9) ) @@ -1811,7 +1811,7 @@ ROM_END ROM_START( garage_3 ) // 040216 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "gg_m_040216.rom", 0x00000, 0x40000, MD5(9d89036118ece87c98bb9b64021014ff) SHA1(321c4106ce07e195a05eacdef6387d61d5e58bb9) ) + ROM_LOAD( "gg_m_040216.rom", 0x00000, 0x40000, SHA1(321c4106ce07e195a05eacdef6387d61d5e58bb9) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "garage_m.001", 0x000000, 0x80000, CRC(57acd4bc) SHA1(8796f463787c359cce6ac09c1b6895f871bbb7c9) ) @@ -1911,7 +1911,7 @@ ROM_END ROM_START( rclimb_2 ) // 040823 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "rc_m_040823.rom", 0x00000, 0x40000, MD5(f3f5edf6f838f07f4848fbcf9e566a38) SHA1(31cf4d7f50102d35556817273893182e30c9a70c) ) + ROM_LOAD( "rc_m_040823.rom", 0x00000, 0x40000, SHA1(31cf4d7f50102d35556817273893182e30c9a70c) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "rockclimber_m.001", 0x000000, 0x80000, CRC(934f18c7) SHA1(da3a7cddc68e104d415d947e89c0e7f0d067c056) ) @@ -2106,7 +2106,7 @@ ROM_END ROM_START( rollfr ) // 030821 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "rf5-030821.rom", 0x00000, 0x40000, MD5(ef4e9d1845676fe655d2f415ca7bd953) SHA1(5e9c2235ea4207086db23870993d8e28356c9eb8) ) + ROM_LOAD( "rf5-030821.rom", 0x00000, 0x40000, SHA1(5e9c2235ea4207086db23870993d8e28356c9eb8) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "roll_fruit5.001", 0x000000, 0x80000, CRC(caeb1fc3) SHA1(14b9f99f892849faecb3327e572dc134e1065463) ) @@ -2222,7 +2222,7 @@ ROM_END ROM_START( island2_2 ) // 061214 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "is2_m_061214.rom", 0x00000, 0x40000, MD5(566eb61392eaf72e7c311dceb92cdb11) SHA1(dd416d831c3773f044b355efcb1121f7eb81932b) ) + ROM_LOAD( "is2_m_061214.rom", 0x00000, 0x40000, SHA1(dd416d831c3773f044b355efcb1121f7eb81932b) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "island2.001", 0x000000, 0x80000, CRC(f8dd9fe9) SHA1(0cf67fbca107b255011fded6390507d12cbac514) ) @@ -2272,7 +2272,7 @@ ROM_END ROM_START( pirate ) // 051229 ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked - ROM_LOAD( "pr_m_051229.rom", 0x00000, 0x40000, MD5(d813af59a7a356800470b109a41b978f) SHA1(d1286cba474ccbbff8358ba2fd6917d43d101674) ) + ROM_LOAD( "pr_m_051229.rom", 0x00000, 0x40000, SHA1(d1286cba474ccbbff8358ba2fd6917d43d101674) ) ROM_REGION( 0x400000, "gfx", 0 ) ROM_LOAD( "pirate.001", 0x000000, 0x80000, CRC(d2199619) SHA1(8c67ef7d0e305ae0783302ba9a1cb56cdcf4bc09) ) diff --git a/src/osd/windows/input.c b/src/osd/windows/input.c index 512f95e9b08..4cb35cc3a03 100644 --- a/src/osd/windows/input.c +++ b/src/osd/windows/input.c @@ -59,8 +59,8 @@ #include // MAME headers -#include "osdepend.h" #include "emu.h" +#include "osdepend.h" #include "ui.h" // MAMEOS headers diff --git a/src/osd/windows/output.c b/src/osd/windows/output.c index 16c06fcabd8..d550a52e2d8 100644 --- a/src/osd/windows/output.c +++ b/src/osd/windows/output.c @@ -44,8 +44,8 @@ #include // MAME headers -#include "osdepend.h" #include "emu.h" +#include "osdepend.h" // MAMEOS headers #include "output.h" diff --git a/src/tools/chdman.c b/src/tools/chdman.c index 049c1335700..ab8c3557542 100644 --- a/src/tools/chdman.c +++ b/src/tools/chdman.c @@ -450,7 +450,7 @@ cleanup: if (err != CHDERR_NONE) osd_rmfile(outputfile); if (identdata != NULL) - free(identdata); + osd_free(identdata); return (err != CHDERR_NONE); } @@ -592,7 +592,7 @@ cleanup: if (err != CHDERR_NONE) osd_rmfile(outputfile); if (identdata != NULL) - free(identdata); + osd_free(identdata); return (err != CHDERR_NONE); } @@ -3084,7 +3084,7 @@ static int do_addmeta(int argc, char *argv[], int param) cleanup: if (metadata != NULL) - free(metadata); + osd_free(metadata); if (chd != NULL) chd_close(chd); if (err != CHDERR_NONE && was_readonly) diff --git a/src/tools/regrep.c b/src/tools/regrep.c index 6409c822418..03bf037b05f 100644 --- a/src/tools/regrep.c +++ b/src/tools/regrep.c @@ -269,7 +269,7 @@ int main(int argc, char *argv[]) if (core_fload(astring_c(tempfilename), &buffer, &bufsize) == FILERR_NONE) { tempheader = astring_dupch((const char *)buffer, bufsize); - free(buffer); + osd_free(buffer); } /* verify the template */ diff --git a/src/tools/split.c b/src/tools/split.c index 74facce3e0b..03592ec6cb3 100644 --- a/src/tools/split.c +++ b/src/tools/split.c @@ -379,7 +379,7 @@ static int join_file(const char *filename, const char *outname, int write_output printf(" verified\n"); // release allocated memory - free(splitbuffer); + osd_free(splitbuffer); splitbuffer = NULL; } if (write_output) @@ -402,7 +402,7 @@ cleanup: remove(astring_c(outfilename)); } if (splitbuffer != NULL) - free(splitbuffer); + osd_free(splitbuffer); astring_free(outfilename); astring_free(infilename); astring_free(basepath); diff --git a/src/tools/src2html.c b/src/tools/src2html.c index 24ef9a5157d..4b4c50d8ec6 100644 --- a/src/tools/src2html.c +++ b/src/tools/src2html.c @@ -312,7 +312,7 @@ int main(int argc, char *argv[]) if (core_fload(astring_c(tempfilename), &buffer, &bufsize) == FILERR_NONE) { tempheader = astring_dupch((const char *)buffer, bufsize); - free(buffer); + osd_free(buffer); } /* verify the template */ diff --git a/src/tools/unidasm.c b/src/tools/unidasm.c index ec9044d565b..8251de97b03 100644 --- a/src/tools/unidasm.c +++ b/src/tools/unidasm.c @@ -657,6 +657,8 @@ int main(int argc, char *argv[]) { fprintf(stderr, "Caught unhandled exception\n"); } + + osd_free(data); return result; }