Merge remote-tracking branch 'origin/master' into dev

.github/workflows/android.yml

@@ -80,6 +80,7 @@ jobs:
           token: ${{ env.SENTRY_TOKEN }}
           organization: flycast
           project: minidump
+          version: 2.21.2
         if: ${{ env.SENTRY_TOKEN != '' }}
 
       - name: Upload symbols to Sentry

.github/workflows/c-cpp.yml

@@ -165,6 +165,7 @@ jobs:
           token: ${{ env.SENTRY_TOKEN }}
           organization: flycast
           project: minidump
+          version: 2.21.2
         if: ${{ env.SENTRY_TOKEN != '' }}
 
       - name: Upload symbols to Sentry (Windows, macOS, Linux)

CMakeLists.txt

@@ -978,8 +978,8 @@ cmrc_add_resources(flycast-resources
 		resources/flash/wldkicksj.nvmem.zip	# free play
 		resources/flash/wldkicksu.nvmem.zip	# free play
 		resources/flash/f355.nvmem.zip		# printer on
-		resources/flash/f355twin.nvmem.zip
-		resources/flash/f355twn2.nvmem.zip
+		resources/flash/f355twin.nvmem.zip	# printer on
+		resources/flash/f355twn2.nvmem.zip	# printer on
 		resources/flash/dirtypig.nvmem.zip	# 4 players
 		resources/flash/dirtypig.nvmem2.zip
 		resources/flash/vf4.nvmem.zip		# card all day, stage select

core/emulator.cpp

@@ -281,7 +281,10 @@ static void loadSpecialSettings()
 		}
 		if (prod_id == "T1102M"				// Densha de Go! 2
 				|| prod_id == "T00000A"		// The Ring of the Nibelungen (demo, hack)
-				|| prod_id == "T15124N 00")	// Worms Pinball (prototype)
+				|| prod_id == "T15124N 00"	// Worms Pinball (prototype)
+				|| prod_id == "T9503M"		// Eisei Meijin III
+				|| prod_id == "T5202M"		// Marionette Company
+				|| prod_id == "T5301M")		// World Neverland Plus
 		{
 			NOTICE_LOG(BOOT, "Forcing Full Framebuffer Emulation");
 			config::EmulateFramebuffer.override(true);

core/hw/aica/aica.cpp

@@ -76,18 +76,16 @@ static bool UpdateSh4Ints()
 	if (p_ints)
 	{
 		if ((SB_ISTEXT & SH4_IRQ_BIT) == 0)
-		{
 			// if no interrupt is already pending then raise one
 			asic_RaiseInterrupt(holly_SPU_IRQ);
-			return true;
-		}
+		return true;
 	}
 	else
 	{
 		if ((SB_ISTEXT & SH4_IRQ_BIT) != 0)
 			asic_CancelInterrupt(holly_SPU_IRQ);
+		return false;
 	}
-	return false;
 }
 
 AicaTimer timers[3];

core/hw/maple/maple_cfg.cpp

@@ -320,7 +320,6 @@ static void createDreamcastDevices()
 		case MDT_MaracasController:
 		case MDT_FishingController:
 		case MDT_PopnMusicController:
-		case MDT_RacingController:
 		case MDT_DenshaDeGoController:
 		case MDT_Dreameye:
 			mcfg_Create(config::MapleMainDevices[bus], bus, 5);
@@ -332,6 +331,7 @@ static void createDreamcastDevices()
 		case MDT_LightGun:
 		case MDT_TwinStick:
 		case MDT_AsciiStick:
+		case MDT_RacingController:
 			mcfg_Create(config::MapleMainDevices[bus], bus, 5);
 			if (config::MapleExpansionDevices[bus][0] != MDT_None)
 				mcfg_Create(config::MapleExpansionDevices[bus][0], bus, 0);

core/hw/naomi/naomi_cart.cpp

@@ -681,8 +681,7 @@ void naomi_cart_LoadRom(const std::string& path, const std::string& fileName, Lo
 		}
 		if (gameId == " TOUCH DE UNOH -------------"
 			|| gameId == " TOUCH DE UNOH 2 -----------"
-					// only for F355 Deluxe
-			|| (gameId == "F355 CHALLENGE JAPAN" && romName == "f355"))
+			|| (gameId == "F355 CHALLENGE JAPAN" && config::MultiboardSlaves == 2))
 		{
 			printer::init();
 		}

core/hw/naomi/printer.cpp

@@ -17,6 +17,7 @@
     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "types.h"
+#include "stdclass.h"
 #include "printer.h"
 #include "serialize.h"
 #include "rend/gui.h"
@@ -738,7 +739,7 @@ class ThermalPrinter
 			state = Default;
 			if (bitmapWriter && bitmapWriter->isDirty())
 			{
-				std::string s = settings.content.gameId + "-results.png";
+				std::string s = get_writable_data_path(settings.content.gameId + "-results.png");
 				bitmapWriter->save(s);
 				bitmapWriter.reset();
 				s = "Print out saved to " + s;

core/windows/winmain.cpp

@@ -976,21 +976,33 @@ void os_DoEvents()
 
 void os_RunInstance(int argc, const char *argv[])
 {
-	char exePath[MAX_PATH];
-	GetModuleFileNameA(NULL, exePath, sizeof(exePath));
+	wchar_t exePath[MAX_PATH];
+	GetModuleFileNameW(NULL, exePath, std::size(exePath));
 
-	std::string cmdLine(exePath);
+	std::wstring cmdLine = L'"' + std::wstring(exePath) + L'"';
 	for (int i = 0; i < argc; i++)
 	{
-		cmdLine += ' ';
-		cmdLine += argv[i];
+		nowide::wstackstring wname;
+		if (!wname.convert(argv[i])) {
+			WARN_LOG(BOOT, "Invalid argument: %s", argv[i]);
+			continue;
+		}
+		cmdLine += L" \"";
+		for (wchar_t *p = wname.get(); *p != L'\0'; p++)
+		{
+			cmdLine += *p;
+			if (*p == L'"')
+				// escape double quote
+				cmdLine += L'"';
+		}
+		cmdLine += L'"';
 	}
 
-	STARTUPINFOA startupInfo{};
+	STARTUPINFOW startupInfo{};
 	startupInfo.cb = sizeof(startupInfo);
 
 	PROCESS_INFORMATION processInfo{};
-	BOOL rc = CreateProcessA(exePath, (char *)cmdLine.c_str(), nullptr, nullptr, true, 0, nullptr, nullptr, &startupInfo, &processInfo);
+	BOOL rc = CreateProcessW(exePath, (wchar_t *)cmdLine.c_str(), nullptr, nullptr, true, 0, nullptr, nullptr, &startupInfo, &processInfo);
 	if (rc)
 	{
 		CloseHandle(processInfo.hProcess);

shell/apple/emulator-osx/emulator-osx/osx-main.mm

@@ -13,6 +13,7 @@
 #include <mach/mach_port.h>
 
 #include "types.h"
+#include "cfg/option.h"
 #include "log/LogManager.h"
 #if defined(USE_SDL)
 #include "sdl/sdl.h"
@@ -144,6 +145,27 @@ static void emu_flycast_term()
     CFRelease(mainBundle);
 
 	emu_flycast_init();
+
+	int boardId = cfgLoadInt("naomi", "BoardId", 0);
+	if (boardId > 0)
+	{
+		NSString *label = @"S";		// Slave
+		if (config::MultiboardSlaves == 2) // 1 = Single, 2 = Deluxe
+		{
+			switch (boardId) {
+				case 1:
+					label = @"C";	// Center
+					break;
+				case 2:
+					label = @"L";	// Left
+					break;
+				case 3:
+					label = @"R";	// Right
+			}
+		}
+		[[NSApp dockTile] setBadgeLabel:label];
+	}
+
 #ifdef USE_BREAKPAD
 	auto async = std::async(std::launch::async, uploadCrashes, "/tmp");
 #endif

shell/libretro/libretro_core_options_intl.h

@@ -57,11 +57,11 @@ extern "C" {
 */
 /* RETRO_LANGUAGE_AR */
 
-#define CATEGORY_SYSTEM_LABEL_AR NULL
+#define CATEGORY_SYSTEM_LABEL_AR "نظام"
 #define CATEGORY_SYSTEM_INFO_0_AR NULL
 #define CATEGORY_VIDEO_LABEL_AR "فيديو"
 #define CATEGORY_VIDEO_INFO_0_AR NULL
-#define CATEGORY_PERFORMANCE_LABEL_AR NULL
+#define CATEGORY_PERFORMANCE_LABEL_AR "الأداء"
 #define CATEGORY_PERFORMANCE_INFO_0_AR NULL
 #define CATEGORY_HACKS_LABEL_AR NULL
 #define CATEGORY_HACKS_INFO_0_AR NULL