diff options
author | Vas Crabb <vas@vastheman.com> | 2021-09-28 11:39:11 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2021-09-28 11:39:11 +1000 |
commit | e0f710df8ce7d629e100f88d3c9445f7007d4b47 (patch) | |
tree | 9f8013a85863a6443f17261ce69e5cf561b7bd74 | |
parent | 818cd4d7e073574fde7a5c352b9ca6645ed39788 (diff) | |
parent | d173b601c301a3c75a5c351bdd623b4d984593a9 (diff) |
Merge branch 'release0236' into mainline-master
-rw-r--r-- | hash/apxen_flop.xml | 5 | ||||
-rw-r--r-- | hash/cdi.xml | 18 | ||||
-rw-r--r-- | hash/nes.xml | 2 | ||||
-rw-r--r-- | hash/pc8001mk2_flop.xml | 11 | ||||
-rw-r--r-- | hash/pc8801_flop.xml | 11 | ||||
-rw-r--r-- | src/emu/validity.cpp | 8 | ||||
-rw-r--r-- | src/mame/drivers/konmedal020.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/debuggerview.cpp | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/win/debugviewinfo.cpp | 4 |
9 files changed, 25 insertions, 40 deletions
diff --git a/hash/apxen_flop.xml b/hash/apxen_flop.xml index cfd9b7d2676..e3b36f700ec 100644 --- a/hash/apxen_flop.xml +++ b/hash/apxen_flop.xml @@ -20,13 +20,14 @@ license:CC0 </software> <!-- Unknown if this is anything official --> - <software name="diag"> + <!-- disk image is missing copy protection information --> + <software name="diag" supported="no"> <description>Various Diags, XEEROM</description> <year>1986</year> <publisher>ACT</publisher> <part name="flop1" interface="floppy_3_5"> <dataarea name="flop" size="705879"> - <rom name="diag.dsk" size="705879" crc="9d48118f" sha1="2ba690bcc443fd1b02d5eb3017ea12d6172c6985"/> + <rom name="diag.dsk" size="705879" crc="9d48118f" sha1="2ba690bcc443fd1b02d5eb3017ea12d6172c6985" status="baddump"/> </dataarea> </part> </software> diff --git a/hash/cdi.xml b/hash/cdi.xml index d638a17efe9..1eba5394983 100644 --- a/hash/cdi.xml +++ b/hash/cdi.xml @@ -6033,6 +6033,7 @@ license:CC0 </part> </software> + <!-- "CD-i Bridge" format - playable on CD-i or Windows 95/98 --> <software name="gettinga"> <!-- Origin: TOSEC @@ -6040,7 +6041,7 @@ license:CC0 <rom name="Getting Ahead - Making Time (1994)(Temple Millar Multimedia - Xdra)(EU)(Track 2 of 2)[!][CD-i-PC].wav" size="376795148" crc="3576d879" md5="d2fa76c544f819f5ddbe7e742603b746"/> <rom name="Getting Ahead - Making Time (1994)(Temple Millar Multimedia - Xdra)(EU)[!][CD-i-PC].cue" size="363" crc="3a4f2123" md5="3ed5329375d9ae86b331b9b4bab4d81a"/> --> - <description>Getting Ahead - Making Time (Euro)[CD-i-PC]</description> + <description>Getting Ahead - Making Time (Euro)</description> <year>1994</year> <publisher>Temple Millar Multimedia ~ Xdra</publisher> <part name="cdrom" interface="cdi_cdrom"> @@ -10722,7 +10723,7 @@ license:CC0 <rom name="The Best of Photo Journalism (Track 2)" size="272361600" crc="ac49ca6f" md5="f90ae501920abaf205b41f7f68a9da2f"/> <rom name="The Best of Photo Journalism.cue" size="249" crc="79dd5617" md5="617ca8df6119c466908e17bd27beda6f"/> --> - <description>From The Associated Press: The Best of Photo Journalism [DVC]</description> + <description>From The Associated Press: The Best of Photo Journalism</description> <year>1993</year> <publisher>XDRA Ltd. ~ Asia CD Ltd.</publisher> <info name="serial" value="819 0036"/> @@ -10744,7 +10745,7 @@ license:CC0 value. The info for the original cue is below. <rom name="Bill Brandt - The Picture Post Years 1938-51.cue" size="279" crc="d9c1b4b0" md5="d96806ddded5ebd0901a5f4701a05519"/> --> - <description>Bill Brandt: The Picture Post Years 1938-1951[DVC]</description> + <description>Bill Brandt: The Picture Post Years 1938-1951</description> <year>1993</year> <publisher>XDRA Ltd.</publisher> <sharedfeat name="compatibility" value="DVC" /> @@ -10764,7 +10765,7 @@ license:CC0 value. The info for the original cue is below. <rom name="CD-i in Schools.cue" size="102" crc="a7808dda" md5="2835f5bd9aa0d0941ae992f813582285"/> --> - <description>CD-i in Schools [DVC]</description> + <description>CD-i in Schools</description> <year>1994</year> <publisher>Scottish Interactive Technology Centre</publisher> <info name="serial" value="819 0073"/> @@ -10785,7 +10786,7 @@ license:CC0 The info for the original cue is below. <rom name="Depression - The Search for the NaSSA.cue" size="101" crc="e0683fe3" md5="04d6c528037689bab54873d0834418e6"/> --> - <description>Depression - The Search For The NaSSA (NL)[DVC]</description> + <description>Depression - The Search For The NaSSA (NL)</description> <year>1993</year> <publisher>N.V. Organon</publisher> <sharedfeat name="compatibility" value="DVC" /> @@ -10807,6 +10808,7 @@ license:CC0 </part> </software> + <!-- "CD-i Bridge" format - playable on CD-i or Windows 95/98 --> <software name="gettinga2" cloneof="gettinga"> <!-- Origin: Gaming Alexandria @@ -10815,7 +10817,7 @@ license:CC0 <rom name="Getting Ahead - Making Time.cue" size="247" crc="c1f664f0" md5="61a958d52c26a7f10386e5f693857a09"/> Note: This is a later release that added Windows 3.1 playback software. --> - <description>Getting Ahead - Making Time (Euro)(Reprint)[CD-i-PC]</description> + <description>Getting Ahead - Making Time (Euro, reprint)</description> <year>1995</year> <publisher>XDRA Ltd. ~ Temple Millar Multimedia</publisher> <info name="serial" value="819 0025"/> @@ -10838,7 +10840,7 @@ license:CC0 The info for the original cue is below. <rom name="Nijmegen 'n rijk aan mogelijkheden.cue" size="515" crc="d0c1ea7f" md5="f1e4aca62f80f9594f2b584fde665266"/> --> - <description>Nijmegen 'n rijk aan mogelijkheden (NL)[DVC]</description> + <description>Nijmegen 'n rijk aan mogelijkheden (NL)</description> <year>1994</year> <publisher>Harlon Publishing</publisher> <sharedfeat name="compatibility" value="DVC" /> @@ -10878,7 +10880,7 @@ license:CC0 Note: This disc is a hybrid CD-i and Windows 3.1 disc. It will boot in a CD-i without issues, and it contains software to play back the disc images on Windows 3.1. --> - <description>Peaches [DVC]</description> + <description>Peaches</description> <year>1995</year> <publisher>Icontact Multimedia Limited</publisher> <info name="serial" value="IC 200"/> diff --git a/hash/nes.xml b/hash/nes.xml index 8cc97a2d7ad..bdcff4f5fc1 100644 --- a/hash/nes.xml +++ b/hash/nes.xml @@ -76876,7 +76876,7 @@ be better to redump them properly. --> <!-- Did this ever exist on an individual cart? Its CRCs match Golden Card 6 in 1 (the third 256K chunks). --> <software name="mk3a"> - <description>Mortal Kombat 3 (Asia, Alt)</description> + <description>Mortal Kombat 3 (Asia, alt)</description> <year>19??</year> <publisher>Super Games</publisher> <part name="cart" interface="nes_cart"> diff --git a/hash/pc8001mk2_flop.xml b/hash/pc8001mk2_flop.xml index a8dd3e69b11..d0ee6448370 100644 --- a/hash/pc8001mk2_flop.xml +++ b/hash/pc8001mk2_flop.xml @@ -81,17 +81,6 @@ Bon Bon, Bon Bon, Compaq, Aug 83, Aug 83, </part> </software> - <software name="n80diska" cloneof="n80diskb"> - <description>N80 Disk BASIC (alt)</description> - <year>19??</year> - <publisher><unknown></publisher> - <part name="flop1" interface="floppy_5_25"> - <dataarea name="flop" size="348848"> <!-- Data CRC16: 34301 --> - <rom name="n80 basic (1983)(microsoft - nec).d88" size="348848" crc="ff9416a4" sha1="3321c6a723545ef7f413a372683a1e40ef7ea4ef"/> - </dataarea> - </part> - </software> - <software name="pc80sys"> <description>PC-8001mkII System Disk</description> <year>19??</year> diff --git a/hash/pc8801_flop.xml b/hash/pc8801_flop.xml index 148ec69b125..8d66982b835 100644 --- a/hash/pc8801_flop.xml +++ b/hash/pc8801_flop.xml @@ -48464,17 +48464,6 @@ loderuna - pc8801 Device Floppy Disk load failed: Invalid image </part> </software> - <software name="fullfire"> - <description>Full Fire & Other Old Games</description> - <year>19??</year> - <publisher><unknown></publisher> - <part name="flop1" interface="floppy_5_25"> - <dataarea name="flop" size="348848"> - <rom name="full fire & other old games.d88" size="348848" crc="9eec8b75" sha1="0229b1e62264647baf93b126674ca7ab304859ad"/> - </dataarea> - </part> - </software> - <software name="fuyudego"> <description>Fuyu de Gozaru</description> <year>19??</year> diff --git a/src/emu/validity.cpp b/src/emu/validity.cpp index ca3389cde41..18ba2c6fc6b 100644 --- a/src/emu/validity.cpp +++ b/src/emu/validity.cpp @@ -47,10 +47,12 @@ using test_delegate = delegate<char (void const *&)>; // type //------------------------------------------------- +#if !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION >= 7000) test_delegate make_diamond_class_delegate(char (diamond_inheritance::*func)(void const *&), diamond_inheritance *obj) { return test_delegate(func, obj); } +#endif // !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION >= 7000) //------------------------------------------------- @@ -1391,6 +1393,7 @@ void validate_delegates_mfp() if (&o != addr) osd_printf_error("Error testing delegate this pointer adjustment for virtual member function through base class pointer %p -> %p (expected %p)\n", static_cast<void const *>(static_cast<base_b *>(&o)), addr, static_cast<void const *>(&o)); +#if !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION >= 7000) // test creating delegates for a forward-declared class cb1 = make_diamond_class_delegate(&diamond_inheritance::get_derived_a, &d); cb2 = make_diamond_class_delegate(&diamond_inheritance::get_derived_b, &d); @@ -1409,8 +1412,8 @@ void validate_delegates_mfp() if (static_cast<virtual_derived_b *>(&d) != addr) osd_printf_error("Error testing delegate this pointer adjustment for incomplete class %p -> %p (expected %p)\n", static_cast<void const *>(&d), addr, static_cast<void const *>(static_cast<virtual_derived_b *>(&d))); - // test MSVC extension allowing casting member pointer types across virtual inheritance relationships #if defined(_MSC_VER) && !defined(__clang__) + // test MSVC extension allowing casting member pointer types across virtual inheritance relationships cb1 = make_diamond_class_delegate(&diamond_inheritance::get_base, &d); addr = nullptr; @@ -1419,7 +1422,8 @@ void validate_delegates_mfp() osd_printf_error("Error testing delegate non-virtual member function dispatch for incomplete class\n"); if (static_cast<virtual_base *>(&d) != addr) osd_printf_error("Error testing delegate this pointer adjustment for incomplete class %p -> %p (expected %p)\n", static_cast<void const *>(&d), addr, static_cast<void const *>(static_cast<virtual_base *>(&d))); -#endif // defined(_MSC_VER) +#endif // defined(_MSC_VER) && !defined(__clang__) +#endif // !defined(_LIBCPP_VERSION) || (_LIBCPP_VERSION >= 7000) } diff --git a/src/mame/drivers/konmedal020.cpp b/src/mame/drivers/konmedal020.cpp index 41346454bf6..d44dcddaa18 100644 --- a/src/mame/drivers/konmedal020.cpp +++ b/src/mame/drivers/konmedal020.cpp @@ -121,4 +121,4 @@ ROM_END } // Anonymous namespace -GAME( 1997, gs471, 0, gs471, gs471, konmedal020_state, empty_init, ROT0, "Konami", "Unknown medal game GS471", MACHINE_NOT_WORKING ) +GAME( 1997, gs471, 0, gs471, gs471, konmedal020_state, empty_init, ROT0, "Konami", "unknown medal game GS471", MACHINE_NOT_WORKING ) diff --git a/src/osd/modules/debugger/qt/debuggerview.cpp b/src/osd/modules/debugger/qt/debuggerview.cpp index 263fcfe1e73..a1c8bcf2aec 100644 --- a/src/osd/modules/debugger/qt/debuggerview.cpp +++ b/src/osd/modules/debugger/qt/debuggerview.cpp @@ -331,8 +331,8 @@ void DebuggerView::copyVisibleSlot() for (uint32_t col = 0; col < visarea.x; ++col) text += wchar_t(viewdata[col].byte); std::string::size_type const nonblank = text.find_last_not_of("\t\n\v\r "); - if ((nonblank != std::string::npos) && (nonblank >= start)) - text.resize(nonblank + 1); + if (nonblank != std::string::npos) + text.resize((std::max)(start, nonblank + 1)); text += "\n"; } diff --git a/src/osd/modules/debugger/win/debugviewinfo.cpp b/src/osd/modules/debugger/win/debugviewinfo.cpp index d6e94c1ba3e..6965d032dfa 100644 --- a/src/osd/modules/debugger/win/debugviewinfo.cpp +++ b/src/osd/modules/debugger/win/debugviewinfo.cpp @@ -320,8 +320,8 @@ void debugview_info::handle_context_menu(unsigned command) for (uint32_t col = 0; col < visarea.x; ++col) text += wchar_t(viewdata[col].byte); std::wstring::size_type const nonblank = text.find_last_not_of(L"\t\n\v\r "); - if ((nonblank != std::wstring::npos) && (nonblank >= start)) - text.resize(nonblank + 1); + if (nonblank != std::wstring::npos) + text.resize((std::max)(start, nonblank + 1)); text += L"\r\n"; } |