This is vAmiga v4.2b2

dirkwhoffmann · dirkwhoffmann · commit b5e28ed6416c · 2025-06-03T17:06:56.000+02:00
diff --git a/Emulator/VACore/Components/Zorro/HdController.cpp b/Emulator/VACore/Components/Zorro/HdController.cpp
@@ -409,22 +409,11 @@ HdController::processInit(u32 ptr)
 
     auto assignDosName = [&](isize partition, char *name) {
 
-        name[0] = 'D';
-        name[1] = 'H';
+        if (objid >= 1) partition += amiga.hd0.numPartitions();
+        if (objid >= 2) partition += amiga.hd1.numPartitions();
+        if (objid >= 3) partition += amiga.hd2.numPartitions();
 
-        if (objid == 0) {
-
-            name[2] = '0' + char(partition);
-            name[3] = 0;
-            name[4] = 0;
-
-        } else {
-
-            name[2] = '0' + char(objid);
-            name[3] = '0' + char(partition);
-            name[4] = 0;
-
-        }
+        snprintf(name, 5, "DH%ld", partition);
     };
 
     // Keep in check with exprom.asm
diff --git a/Emulator/VACore/Infrastructure/Host.cpp b/Emulator/VACore/Infrastructure/Host.cpp
@@ -159,9 +159,11 @@ Host::sanitize(const string &filename)
     // Avoid reserved Windows names
     if (isReserved(result)) result = "__" + result;
 
+    /*
     if (filename != result) {
         printf("sanitize: %s -> %s\n", filename.c_str(), result.c_str());
     }
+    */
     
     return fs::path(result);
 }
@@ -233,9 +235,11 @@ Host::unsanitize(const fs::path &filename)
         }
     }
     
+    /*
     if (filename.string() != result) {
         printf("unsanitize: %s -> %s\n", filename.string().c_str(), result.c_str());
     }
+    */
     
     return result;
 }
diff --git a/Emulator/VAmigaConfig.h b/Emulator/VAmigaConfig.h
@@ -17,13 +17,13 @@
 static constexpr int VER_MAJOR      = 4;
 static constexpr int VER_MINOR      = 2;
 static constexpr int VER_SUBMINOR   = 0;
-static constexpr int VER_BETA       = 1;
+static constexpr int VER_BETA       = 2;
 
 // Snapshot version number
 static constexpr int SNP_MAJOR      = 4;
 static constexpr int SNP_MINOR      = 2;
 static constexpr int SNP_SUBMINOR   = 0;
-static constexpr int SNP_BETA       = 1;
+static constexpr int SNP_BETA       = 2;
 
 
 //
diff --git a/vAmiga.xcodeproj/project.pbxproj b/vAmiga.xcodeproj/project.pbxproj
@@ -3166,7 +3166,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 250531;
+				CURRENT_PROJECT_VERSION = 250603;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = NO;
@@ -3191,7 +3191,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.5;
-				MARKETING_VERSION = 4.2b1;
+				MARKETING_VERSION = 4.2b2;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
 				PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3221,7 +3221,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 250531;
+				CURRENT_PROJECT_VERSION = 250603;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = "";
@@ -3246,7 +3246,7 @@
 				);
 				LLVM_LTO = YES_THIN;
 				MACOSX_DEPLOYMENT_TARGET = 13.5;
-				MARKETING_VERSION = 4.2b1;
+				MARKETING_VERSION = 4.2b2;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
 				PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3270,7 +3270,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 250531;
+				CURRENT_PROJECT_VERSION = 250603;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -3286,7 +3286,7 @@
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 15.1;
-				MARKETING_VERSION = 4.2b1;
+				MARKETING_VERSION = 4.2b2;
 				PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga.QuickLookPlugIn;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -3304,7 +3304,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 250531;
+				CURRENT_PROJECT_VERSION = 250603;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -3320,7 +3320,7 @@
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 15.1;
-				MARKETING_VERSION = 4.2b1;
+				MARKETING_VERSION = 4.2b2;
 				PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga.QuickLookPlugIn;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

Original file line number	Diff line number	Diff line change
`@@ -159,9 +159,11 @@ Host::sanitize(const string &filename)`
`159`	`159`	`// Avoid reserved Windows names`
`160`	`160`	`if (isReserved(result)) result = "__" + result;`
`161`	`161`
	`162`	`+ /*`
`162`	`163`	`if (filename != result) {`
`163`	`164`	`printf("sanitize: %s -> %s\n", filename.c_str(), result.c_str());`
`164`	`165`	`}`
	`166`	`+ */`
`165`	`167`
`166`	`168`	`return fs::path(result);`
`167`	`169`	`}`
`@@ -233,9 +235,11 @@ Host::unsanitize(const fs::path &filename)`
`233`	`235`	`}`
`234`	`236`	`}`
`235`	`237`
	`238`	`+ /*`
`236`	`239`	`if (filename.string() != result) {`
`237`	`240`	`printf("unsanitize: %s -> %s\n", filename.string().c_str(), result.c_str());`
`238`	`241`	`}`
	`242`	`+ */`
`239`	`243`
`240`	`244`	`return result;`
`241`	`245`	`}`