Fix Windows build. Updated UI tools. More work on Maschine 2 reader (unfinished).

git-moss · git-moss · commit 95a0ead8e37e · 2025-11-09T16:56:34.000+01:00
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
@@ -62,6 +62,10 @@ jobs:
         # distribution: 'temurin'
         distribution: 'zulu'
         java-version: 25
+    # Zulu does not contain WiX Toolset (Temurin does)!
+    - name: Install WiX Toolset
+      if: startsWith(matrix.os, 'windows')
+      run: choco install wixtoolset --no-progress -y
     - name: Build and jpackage with Maven
       run: mvn -B package jpackage::jpackage@${{ matrix.build_name }} --file pom.xml
     - name: Publish jpackage result
diff --git a/documentation/CHANGELOG.md b/documentation/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 14.2.1 (unreleased)
 
+* Restoration of main window on startup ensures that it is at least 25% visible on the screen.
 * EXS
   * Fixed: Read loop cross-fade was not calculated correctly (integer instead of double).
   * Fixed: Loop cross-fade was written as samples not as milliseconds.
diff --git a/maven-local-repository/de/mossgrabers/uitools/2.0.0/uitools-2.0.0.jar b/maven-local-repository/de/mossgrabers/uitools/2.0.0/uitools-2.0.0.jar
diff --git a/maven-local-repository/de/mossgrabers/uitools/2.0.0/uitools-2.0.0.jar.md5 b/maven-local-repository/de/mossgrabers/uitools/2.0.0/uitools-2.0.0.jar.md5
@@ -1 +1 @@
-5cd1bc4b93680c77f874f15094b62cf2
+fe26d28ab60f650f3589fab20e41953c
diff --git a/maven-local-repository/de/mossgrabers/uitools/2.0.0/uitools-2.0.0.jar.sha1 b/maven-local-repository/de/mossgrabers/uitools/2.0.0/uitools-2.0.0.jar.sha1
@@ -1 +1 @@
-6a26c899c770df1b4531fd85638f77f61db1073b
+a0fd66ad564d37c92cd7bf7e839424d259a78961
diff --git a/maven-local-repository/de/mossgrabers/uitools/2.0.0/uitools-2.0.0.pom b/maven-local-repository/de/mossgrabers/uitools/2.0.0/uitools-2.0.0.pom
@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/maven-local-repository/de/mossgrabers/uitools/2.0.0/uitools-2.0.0.pom.md5 b/maven-local-repository/de/mossgrabers/uitools/2.0.0/uitools-2.0.0.pom.md5
@@ -1 +1 @@
-1ad03015706eda8f507bb6d9572c1780
+f6bf6d7b8db888f4abe6c62043f729ac
diff --git a/maven-local-repository/de/mossgrabers/uitools/2.0.0/uitools-2.0.0.pom.sha1 b/maven-local-repository/de/mossgrabers/uitools/2.0.0/uitools-2.0.0.pom.sha1
@@ -1 +1 @@
-5f7c63ed6303f26430d2908821b56f244927031c
+e78855a2a99954f50ce48f22e9aee7431529a29e
diff --git a/maven-local-repository/de/mossgrabers/uitools/maven-metadata.xml b/maven-local-repository/de/mossgrabers/uitools/maven-metadata.xml
@@ -7,6 +7,6 @@
     <versions>
       <version>2.0.0</version>
     </versions>
-    <lastUpdated>20251031151144</lastUpdated>
+    <lastUpdated>20251109140534</lastUpdated>
   </versioning>
 </metadata>
diff --git a/maven-local-repository/de/mossgrabers/uitools/maven-metadata.xml.md5 b/maven-local-repository/de/mossgrabers/uitools/maven-metadata.xml.md5
@@ -1 +1 @@
-a177c32ad049cc57553c8a08faf0e160
+1392d50a3399275ef228cfaf7c4fe91b
diff --git a/maven-local-repository/de/mossgrabers/uitools/maven-metadata.xml.sha1 b/maven-local-repository/de/mossgrabers/uitools/maven-metadata.xml.sha1
@@ -1 +1 @@
-9db3a8c52d610bedad5080b0d39a201bbf3b7c19
+8dc42764d584637a40501167b2418eec3115ca86
diff --git a/src/main/java/de/mossgrabers/convertwithmoss/core/ConverterBackend.java b/src/main/java/de/mossgrabers/convertwithmoss/core/ConverterBackend.java
@@ -40,6 +40,7 @@
 import de.mossgrabers.convertwithmoss.format.music1010.Music1010Detector;
 import de.mossgrabers.convertwithmoss.format.ni.kontakt.KontaktCreator;
 import de.mossgrabers.convertwithmoss.format.ni.kontakt.KontaktDetector;
+import de.mossgrabers.convertwithmoss.format.ni.maschine.MaschineDetector;
 import de.mossgrabers.convertwithmoss.format.samplefile.SampleFileDetector;
 import de.mossgrabers.convertwithmoss.format.sf2.Sf2Creator;
 import de.mossgrabers.convertwithmoss.format.sf2.Sf2Detector;
@@ -104,7 +105,7 @@ public ConverterBackend (final INotifier notifier)
             new KontaktDetector (notifier),
             new KMPDetector (notifier),
             new KorgmultisampleDetector (notifier),
-            // new MaschineDetector (notifier),
+            new MaschineDetector (notifier),
             new EXS24Detector (notifier),
             new SxtDetector (notifier),
             new SampleFileDetector (notifier),
diff --git a/src/main/java/de/mossgrabers/convertwithmoss/file/StreamUtils.java b/src/main/java/de/mossgrabers/convertwithmoss/file/StreamUtils.java
@@ -827,6 +827,8 @@ public static void writeWithLengthUTF16 (final OutputStream out, final String te
     public static String readWith1ByteLengthAscii (final InputStream in) throws IOException
     {
         final int blocklength = in.read ();
+        if (blocklength < 0)
+            throw new IOException ("Negative string length.");
         final byte [] blockData = in.readNBytes (blocklength);
         return new String (blockData);
     }
diff --git a/src/main/java/de/mossgrabers/convertwithmoss/format/ni/maschine/maschine2/MaschinePresetAccessor.java b/src/main/java/de/mossgrabers/convertwithmoss/format/ni/maschine/maschine2/MaschinePresetAccessor.java
diff --git a/src/main/java/de/mossgrabers/convertwithmoss/format/ni/maschine/maschine2/MaschinePresetParameterArray.java b/src/main/java/de/mossgrabers/convertwithmoss/format/ni/maschine/maschine2/MaschinePresetParameterArray.java
diff --git a/src/main/resources/Strings.properties b/src/main/resources/Strings.properties

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-5cd1bc4b93680c77f874f15094b62cf2`
	`1`	`+fe26d28ab60f650f3589fab20e41953c`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-6a26c899c770df1b4531fd85638f77f61db1073b`
	`1`	`+a0fd66ad564d37c92cd7bf7e839424d259a78961`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-1ad03015706eda8f507bb6d9572c1780`
	`1`	`+f6bf6d7b8db888f4abe6c62043f729ac`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-5f7c63ed6303f26430d2908821b56f244927031c`
	`1`	`+e78855a2a99954f50ce48f22e9aee7431529a29e`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-a177c32ad049cc57553c8a08faf0e160`
	`1`	`+1392d50a3399275ef228cfaf7c4fe91b`