Merge pull request #26053 from cbjeukendrup/wrong_measure_length_corruption_message

cbjeukendrup · web-flow · commit 2f39009eaac8 · 2025-02-11T18:33:19.000+01:00
Fix wrong corruption message
diff --git a/src/engraving/compat/mscxcompat.cpp b/src/engraving/compat/mscxcompat.cpp
@@ -35,7 +35,7 @@ using namespace muse;
 using namespace muse::io;
 using namespace mu::engraving;
 
-Ret mu::engraving::compat::mscxToMscz(const String& mscxFilePath, ByteArray* msczData)
+Ret mu::engraving::compat::mscxToMscz(const io::path_t& mscxFilePath, ByteArray* msczData)
 {
     File mscxFile(mscxFilePath);
     if (!mscxFile.open(IODevice::ReadOnly)) {
@@ -56,16 +56,18 @@ Ret mu::engraving::compat::mscxToMscz(const String& mscxFilePath, ByteArray* msc
     return muse::make_ok();
 }
 
-Ret mu::engraving::compat::loadMsczOrMscx(MasterScore* score, const String& path, bool ignoreVersionError)
+Ret mu::engraving::compat::loadMsczOrMscx(MasterScore* score, const io::path_t& path, bool ignoreVersionError)
 {
+    std::string suffix = io::suffix(path);
+
     ByteArray msczData;
-    if (path.endsWith(u".mscx", muse::CaseInsensitive)) {
+    if (suffix == MSCX) {
         //! NOTE Convert mscx -> mscz
         Ret ret = mscxToMscz(path, &msczData);
         if (!ret) {
             return ret;
         }
-    } else if (path.endsWith(u".mscz", muse::CaseInsensitive)) {
+    } else if (suffix == MSCZ) {
         File msczFile(path);
         if (!msczFile.open(IODevice::ReadOnly)) {
             return make_ret(Err::FileOpenError, path);
@@ -92,18 +94,18 @@ Ret mu::engraving::compat::loadMsczOrMscx(MasterScore* score, const String& path
     return scoreReader.loadMscz(score, reader, audioSettings, ignoreVersionError);
 }
 
-Ret mu::engraving::compat::loadMsczOrMscx(EngravingProjectPtr project, const String& path, bool ignoreVersionError)
+Ret mu::engraving::compat::loadMsczOrMscx(EngravingProjectPtr project, const io::path_t& path, bool ignoreVersionError)
 {
+    std::string suffix = io::suffix(path);
+
     ByteArray msczData;
-    String filePath = path;
-    if (path.endsWith(u".mscx", muse::CaseInsensitive)) {
+    if (suffix == MSCX) {
         //! NOTE Convert mscx -> mscz
-
         Ret ret = mscxToMscz(path, &msczData);
         if (!ret) {
             return ret;
         }
-    } else if (path.endsWith(u".mscz", muse::CaseInsensitive)) {
+    } else if (suffix == MSCZ) {
         File msczFile(path);
         if (!msczFile.open(IODevice::ReadOnly)) {
             return make_ret(Err::FileOpenError, path);
@@ -119,7 +121,7 @@ Ret mu::engraving::compat::loadMsczOrMscx(EngravingProjectPtr project, const Str
     Buffer msczBuf(&msczData);
     MscReader::Params params;
     params.device = &msczBuf;
-    params.filePath = filePath;
+    params.filePath = path;
     params.mode = MscIoMode::Zip;
 
     MscReader reader(params);
diff --git a/src/engraving/compat/mscxcompat.h b/src/engraving/compat/mscxcompat.h
@@ -26,9 +26,9 @@
 #include "../engravingproject.h"
 
 namespace mu::engraving::compat {
-muse::Ret mscxToMscz(const muse::String& mscxFilePath, muse::ByteArray* msczData);
-muse::Ret loadMsczOrMscx(MasterScore* score, const muse::String& path, bool ignoreVersionError = false);
-muse::Ret loadMsczOrMscx(EngravingProjectPtr project, const muse::String& path, bool ignoreVersionError = false);
+muse::Ret mscxToMscz(const muse::io::path_t& mscxFilePath, muse::ByteArray* msczData);
+muse::Ret loadMsczOrMscx(MasterScore* score, const muse::io::path_t& path, bool ignoreVersionError = false);
+muse::Ret loadMsczOrMscx(EngravingProjectPtr project, const muse::io::path_t& path, bool ignoreVersionError = false);
 }
 
 #endif // MU_ENGRAVING_MSCXCOMPAT_H
diff --git a/src/engraving/engravingerrors.h b/src/engraving/engravingerrors.h
@@ -50,7 +50,12 @@ enum class Err {
     IgnoreError = 2012
 };
 
-inline muse::Ret make_ret(Err err, const muse::io::path_t& filePath = "")
+inline muse::Ret make_ret(Err err, const muse::String& text)
+{
+    return muse::Ret(static_cast<int>(err), text.toStdString());
+}
+
+inline muse::Ret make_ret(Err err, const muse::io::path_t& filePath = {})
 {
     muse::String text;
 
diff --git a/src/engraving/rw/ireader.h b/src/engraving/rw/ireader.h
@@ -60,7 +60,7 @@ class IReader
 public:
     virtual ~IReader() = default;
 
-    virtual Err readScore(Score* score, XmlReader& xml, rw::ReadInOutData* out) = 0;
+    virtual muse::Ret readScore(Score* score, XmlReader& xml, rw::ReadInOutData* out) = 0;
 
     using Supported = std::variant<std::monostate,
                                    Accidental*,
diff --git a/src/engraving/rw/mscloader.cpp b/src/engraving/rw/mscloader.cpp
@@ -184,8 +184,7 @@ Ret MscLoader::loadMscz(MasterScore* masterScore, const MscReader& mscReader, Se
                 break;
             }
 
-            Err err = reader.val->readScore(partScore, xml, &partReadInData);
-            ret =  make_ret(err);
+            ret = reader.val->readScore(partScore, xml, &partReadInData);
             if (!ret) {
                 break;
             }
@@ -258,15 +257,15 @@ Ret MscLoader::readMasterScore(MasterScore* score, XmlReader& e, bool ignoreVers
                 score->checkChordList();
             }
 
-            Err err = reader.val->readScore(score, e, out);
+            Ret ret = reader.val->readScore(score, e, out);
 
             score->setExcerptsChanged(false);
 
-            return make_ret(err);
+            return ret;
         } else {
             e.unknown();
         }
     }
 
-    return Ret(static_cast<int>(Err::FileCorrupted), e.errorString().toStdString());
+    return make_ret(Err::FileCriticallyCorrupted, e.errorString());
 }
diff --git a/src/engraving/rw/read114/read114.cpp b/src/engraving/rw/read114/read114.cpp
@@ -2728,10 +2728,10 @@ static void readStyle(MStyle* style, XmlReader& e, ReadChordListHook& readChordL
 //    import old version <= 1.3 files
 //---------------------------------------------------------
 
-Err Read114::readScore(Score* score, XmlReader& e, ReadInOutData* out)
+muse::Ret Read114::readScore(Score* score, XmlReader& e, ReadInOutData* out)
 {
     IF_ASSERT_FAILED(score->isMaster()) {
-        return Err::FileUnknownError;
+        return make_ret(Err::FileUnknownError);
     }
 
     ReadContext ctx(score);
@@ -2925,7 +2925,7 @@ Err Read114::readScore(Score* score, XmlReader& e, ReadInOutData* out)
 
     if (e.error() != muse::XmlStreamReader::NoError) {
         LOGD() << e.lineNumber() << " " << e.columnNumber() << ": " << e.errorString();
-        return Err::FileBadFormat;
+        return make_ret(Err::FileBadFormat, e.errorString());
     }
 
     for (Staff* s : masterScore->staves()) {
@@ -3182,7 +3182,7 @@ Err Read114::readScore(Score* score, XmlReader& e, ReadInOutData* out)
         score->removeElement(invalidSpanner);
     }
 
-    return Err::NoError;
+    return muse::make_ok();
 }
 
 bool Read114::pasteStaff(XmlReader&, Segment*, staff_idx_t, Fraction)
diff --git a/src/engraving/rw/read114/read114.h b/src/engraving/rw/read114/read114.h
@@ -33,7 +33,7 @@ class Read114 : public rw::IReader
     //   read114
     //    import old version <= 1.3 files
     //---------------------------------------------------------
-    Err readScore(Score* masterScore, XmlReader& e, rw::ReadInOutData* out) override;
+    muse::Ret readScore(Score* masterScore, XmlReader& e, rw::ReadInOutData* out) override;
 
     bool pasteStaff(XmlReader& e, Segment* dst, staff_idx_t dstStaff, Fraction scale) override;
     void pasteSymbols(XmlReader& e, ChordRest* dst) override;
diff --git a/src/engraving/rw/read206/read206.cpp b/src/engraving/rw/read206/read206.cpp
@@ -3419,7 +3419,7 @@ bool Read206::readScore206(Score* score, XmlReader& e, ReadContext& ctx)
     return true;
 }
 
-Err Read206::readScore(Score* score, XmlReader& e, ReadInOutData* out)
+Ret Read206::readScore(Score* score, XmlReader& e, ReadInOutData* out)
 {
     ReadContext ctx(score);
     if (out) {
@@ -3444,7 +3444,10 @@ Err Read206::readScore(Score* score, XmlReader& e, ReadInOutData* out)
             score->setMscoreRevision(e.readInt(nullptr, 16));
         } else if (tag == "Score") {
             if (!readScore206(score, e, ctx)) {
-                return Err::FileBadFormat;
+                if (e.error() == muse::XmlStreamReader::CustomError) {
+                    return make_ret(Err::FileCriticallyCorrupted, e.errorString());
+                }
+                return make_ret(Err::FileBadFormat, e.errorString());
             }
 
             if (ctx.overrideSpatium() && out) {
@@ -3504,7 +3507,7 @@ Err Read206::readScore(Score* score, XmlReader& e, ReadInOutData* out)
 
     compat::CompatUtils::doCompatibilityConversions(score->masterScore());
 
-    return Err::NoError;
+    return make_ok();
 }
 
 bool Read206::pasteStaff(XmlReader&, Segment*, staff_idx_t, Fraction)
diff --git a/src/engraving/rw/read206/read206.h b/src/engraving/rw/read206/read206.h
@@ -65,7 +65,7 @@ class Read206 : public rw::IReader
     //   read206
     //    import old version > 1.3  and < 3.x files
     //---------------------------------------------------------
-    Err readScore(Score* score, XmlReader& e, rw::ReadInOutData* out) override;
+    muse::Ret readScore(Score* score, XmlReader& e, rw::ReadInOutData* out) override;
 
     bool pasteStaff(XmlReader& e, Segment* dst, staff_idx_t dstStaff, Fraction scale) override;
     void pasteSymbols(XmlReader& e, ChordRest* dst) override;
diff --git a/src/engraving/rw/read302/read302.cpp b/src/engraving/rw/read302/read302.cpp
@@ -251,7 +251,7 @@ bool Read302::readScore302(Score* score, XmlReader& e, ReadContext& ctx)
     return true;
 }
 
-Err Read302::readScore(Score* score, XmlReader& e, ReadInOutData* out)
+muse::Ret Read302::readScore(Score* score, XmlReader& e, ReadInOutData* out)
 {
     ReadContext ctx(score);
     if (out) {
@@ -278,9 +278,9 @@ Err Read302::readScore(Score* score, XmlReader& e, ReadInOutData* out)
         } else if (tag == "Score") {
             if (!readScore302(score, e, ctx)) {
                 if (e.error() == muse::XmlStreamReader::CustomError) {
-                    return Err::FileCriticallyCorrupted;
+                    return make_ret(Err::FileCriticallyCorrupted, e.errorString());
                 }
-                return Err::FileBadFormat;
+                return make_ret(Err::FileBadFormat, e.errorString());
             }
 
             if (ctx.overrideSpatium() && out) {
@@ -291,7 +291,7 @@ Err Read302::readScore(Score* score, XmlReader& e, ReadInOutData* out)
         }
     }
 
-    return Err::NoError;
+    return muse::make_ok();
 }
 
 void Read302::fixInstrumentId(Instrument* instrument)
diff --git a/src/engraving/rw/read302/read302.h b/src/engraving/rw/read302/read302.h
@@ -46,7 +46,7 @@ class Read302 : public rw::IReader
 {
 public:
 
-    Err readScore(Score* score, XmlReader& e, rw::ReadInOutData* out) override;
+    muse::Ret readScore(Score* score, XmlReader& e, rw::ReadInOutData* out) override;
 
     bool pasteStaff(XmlReader& e, Segment* dst, staff_idx_t dstStaff, Fraction scale) override;
     void pasteSymbols(XmlReader& e, ChordRest* dst) override;
diff --git a/src/engraving/rw/read400/measurerw.cpp b/src/engraving/rw/read400/measurerw.cpp
@@ -86,24 +86,18 @@ void MeasureRead::readMeasure(Measure* measure, XmlReader& e, ReadContext& ctx,
         measure->m_mstaves.push_back(s);
     }
 
-    bool irregular;
+    bool irregular = false;
     if (e.hasAttribute("len")) {
-        StringList sl = e.attribute("len").split(u'/');
-        if (sl.size() == 2) {
-            measure->m_len = Fraction(sl.at(0).toInt(), sl.at(1).toInt());
-        } else {
-            LOGD("illegal measure size <%s>", muPrintable(e.attribute("len")));
-        }
-        irregular = true;
-        if (measure->m_len.numerator() <= 0 || measure->m_len.denominator() <= 0 || measure->m_len.denominator() > 128) {
-            e.raiseError(muse::mtrc("engraving",
-                                    "MSCX error at line %1: invalid measure length: %2").arg(e.lineNumber()).arg(measure->m_len.toString()));
+        bool ok = true;
+        measure->m_len = Fraction::fromString(e.attribute("len"), &ok);
+        if (!ok || measure->m_len < Fraction(1, 128)) {
+            e.raiseError(muse::mtrc("engraving", "MSCX error at line %1: invalid measure length: %2")
+                         .arg(e.lineNumber()).arg(e.attribute("len")));
             return;
         }
+        irregular = true;
         ctx.compatTimeSigMap()->add(measure->tick().ticks(), SigEvent(measure->m_len, measure->m_timesig));
         ctx.compatTimeSigMap()->add((measure->tick() + measure->ticks()).ticks(), SigEvent(measure->m_timesig));
-    } else {
-        irregular = false;
     }
 
     while (e.readNextStartElement()) {
diff --git a/src/engraving/rw/read400/read400.cpp b/src/engraving/rw/read400/read400.cpp
@@ -55,7 +55,7 @@
 using namespace mu::engraving;
 using namespace mu::engraving::read400;
 
-Err Read400::readScore(Score* score, XmlReader& e, rw::ReadInOutData* data)
+muse::Ret Read400::readScore(Score* score, XmlReader& e, rw::ReadInOutData* data)
 {
     ReadContext ctx(score);
     if (data) {
@@ -87,9 +87,9 @@ Err Read400::readScore(Score* score, XmlReader& e, rw::ReadInOutData* data)
         } else if (tag == "Score") {
             if (!readScore400(score, e, ctx)) {
                 if (e.error() == muse::XmlStreamReader::CustomError) {
-                    return Err::FileCriticallyCorrupted;
+                    return make_ret(Err::FileCriticallyCorrupted, e.errorString());
                 }
-                return Err::FileBadFormat;
+                return make_ret(Err::FileBadFormat, e.errorString());
             }
         } else if (tag == "museScore") {
             // pass
@@ -110,7 +110,7 @@ Err Read400::readScore(Score* score, XmlReader& e, rw::ReadInOutData* data)
         data->settingsCompat = ctx.settingCompat();
     }
 
-    return Err::NoError;
+    return muse::make_ok();
 }
 
 bool Read400::readScore400(Score* score, XmlReader& e, ReadContext& ctx)
diff --git a/src/engraving/rw/read400/read400.h b/src/engraving/rw/read400/read400.h
@@ -35,7 +35,7 @@ class Read400 : public rw::IReader
 {
 public:
 
-    Err readScore(Score* score, XmlReader& e, rw::ReadInOutData* data) override;
+    muse::Ret readScore(Score* score, XmlReader& e, rw::ReadInOutData* data) override;
 
     static bool readScore400(Score* score, XmlReader& e, ReadContext& ctx);
 
diff --git a/src/engraving/rw/read410/measureread.cpp b/src/engraving/rw/read410/measureread.cpp
@@ -84,24 +84,18 @@ void MeasureRead::readMeasure(Measure* measure, XmlReader& e, ReadContext& ctx,
         measure->m_mstaves.push_back(s);
     }
 
-    bool irregular;
+    bool irregular = false;
     if (e.hasAttribute("len")) {
-        StringList sl = e.attribute("len").split(u'/');
-        if (sl.size() == 2) {
-            measure->m_len = Fraction(sl.at(0).toInt(), sl.at(1).toInt());
-        } else {
-            LOGD("illegal measure size <%s>", muPrintable(e.attribute("len")));
-        }
-        irregular = true;
-        if (measure->m_len.numerator() <= 0 || measure->m_len.denominator() <= 0 || measure->m_len.denominator() > 128) {
-            e.raiseError(muse::mtrc("engraving",
-                                    "MSCX error at line %1: invalid measure length: %2").arg(e.lineNumber()).arg(measure->m_len.toString()));
+        bool ok = true;
+        measure->m_len = Fraction::fromString(e.attribute("len"), &ok);
+        if (!ok || measure->m_len < Fraction(1, 128)) {
+            e.raiseError(muse::mtrc("engraving", "MSCX error at line %1: invalid measure length: %2")
+                         .arg(e.lineNumber()).arg(e.attribute("len")));
             return;
         }
+        irregular = true;
         ctx.compatTimeSigMap()->add(measure->tick().ticks(), SigEvent(measure->m_len, measure->m_timesig));
         ctx.compatTimeSigMap()->add((measure->tick() + measure->ticks()).ticks(), SigEvent(measure->m_timesig));
-    } else {
-        irregular = false;
     }
 
     while (e.readNextStartElement()) {
diff --git a/src/engraving/rw/read410/read410.cpp b/src/engraving/rw/read410/read410.cpp
@@ -59,7 +59,7 @@
 using namespace mu::engraving;
 using namespace mu::engraving::read410;
 
-Err Read410::readScore(Score* score, XmlReader& e, rw::ReadInOutData* data)
+muse::Ret Read410::readScore(Score* score, XmlReader& e, rw::ReadInOutData* data)
 {
     ReadContext ctx(score);
     if (data) {
@@ -93,9 +93,9 @@ Err Read410::readScore(Score* score, XmlReader& e, rw::ReadInOutData* data)
         } else if (tag == "Score") {
             if (!readScore410(score, e, ctx)) {
                 if (e.error() == muse::XmlStreamReader::CustomError) {
-                    return Err::FileCriticallyCorrupted;
+                    return make_ret(Err::FileCriticallyCorrupted, e.errorString());
                 }
-                return Err::FileBadFormat;
+                return make_ret(Err::FileBadFormat, e.errorString());
             }
         } else if (tag == "museScore") {
             // pass
@@ -116,7 +116,7 @@ Err Read410::readScore(Score* score, XmlReader& e, rw::ReadInOutData* data)
         data->settingsCompat = ctx.settingCompat();
     }
 
-    return Err::NoError;
+    return muse::make_ok();
 }
 
 bool Read410::readScore410(Score* score, XmlReader& e, ReadContext& ctx)
diff --git a/src/engraving/rw/read410/read410.h b/src/engraving/rw/read410/read410.h
@@ -35,7 +35,7 @@ class Read410 : public rw::IReader
 {
 public:
 
-    Err readScore(Score* score, XmlReader& e, rw::ReadInOutData* data) override;
+    muse::Ret readScore(Score* score, XmlReader& e, rw::ReadInOutData* data) override;
 
     static bool readScore410(Score* score, XmlReader& e, ReadContext& ctx);
 
diff --git a/src/engraving/types/fraction.h b/src/engraving/types/fraction.h
diff --git a/src/framework/global/serialization/xmlstreamreader.cpp b/src/framework/global/serialization/xmlstreamreader.cpp
diff --git a/src/importexport/midi/tests/testbase.cpp b/src/importexport/midi/tests/testbase.cpp

Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,7 @@ Ret MscLoader::loadMscz(MasterScore* masterScore, const MscReader& mscReader, Se`
`184`	`184`	`break;`
`185`	`185`	`}`
`186`	`186`
`187`		`- Err err = reader.val->readScore(partScore, xml, &partReadInData);`
`188`		`- ret = make_ret(err);`
	`187`	`+ ret = reader.val->readScore(partScore, xml, &partReadInData);`
`189`	`188`	`if (!ret) {`
`190`	`189`	`break;`
`191`	`190`	`}`
`@@ -258,15 +257,15 @@ Ret MscLoader::readMasterScore(MasterScore* score, XmlReader& e, bool ignoreVers`
`258`	`257`	`score->checkChordList();`
`259`	`258`	`}`
`260`	`259`
`261`		`- Err err = reader.val->readScore(score, e, out);`
	`260`	`+ Ret ret = reader.val->readScore(score, e, out);`
`262`	`261`
`263`	`262`	`score->setExcerptsChanged(false);`
`264`	`263`
`265`		`- return make_ret(err);`
	`264`	`+ return ret;`
`266`	`265`	`} else {`
`267`	`266`	`e.unknown();`
`268`	`267`	`}`
`269`	`268`	`}`
`270`	`269`
`271`		`- return Ret(static_cast<int>(Err::FileCorrupted), e.errorString().toStdString());`
	`270`	`+ return make_ret(Err::FileCriticallyCorrupted, e.errorString());`
`272`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2728,10 +2728,10 @@ static void readStyle(MStyle* style, XmlReader& e, ReadChordListHook& readChordL`
`2728`	`2728`	`// import old version <= 1.3 files`
`2729`	`2729`	`//---------------------------------------------------------`
`2730`	`2730`
`2731`		`-Err Read114::readScore(Score* score, XmlReader& e, ReadInOutData* out)`
	`2731`	`+muse::Ret Read114::readScore(Score* score, XmlReader& e, ReadInOutData* out)`
`2732`	`2732`	`{`
`2733`	`2733`	`IF_ASSERT_FAILED(score->isMaster()) {`
`2734`		`- return Err::FileUnknownError;`
	`2734`	`+ return make_ret(Err::FileUnknownError);`
`2735`	`2735`	`}`
`2736`	`2736`
`2737`	`2737`	`ReadContext ctx(score);`
`@@ -2925,7 +2925,7 @@ Err Read114::readScore(Score* score, XmlReader& e, ReadInOutData* out)`
`2925`	`2925`
`2926`	`2926`	`if (e.error() != muse::XmlStreamReader::NoError) {`
`2927`	`2927`	`LOGD() << e.lineNumber() << " " << e.columnNumber() << ": " << e.errorString();`
`2928`		`- return Err::FileBadFormat;`
	`2928`	`+ return make_ret(Err::FileBadFormat, e.errorString());`
`2929`	`2929`	`}`
`2930`	`2930`
`2931`	`2931`	`for (Staff* s : masterScore->staves()) {`
`@@ -3182,7 +3182,7 @@ Err Read114::readScore(Score* score, XmlReader& e, ReadInOutData* out)`
`3182`	`3182`	`score->removeElement(invalidSpanner);`
`3183`	`3183`	`}`
`3184`	`3184`
`3185`		`- return Err::NoError;`
	`3185`	`+ return muse::make_ok();`
`3186`	`3186`	`}`
`3187`	`3187`
`3188`	`3188`	`bool Read114::pasteStaff(XmlReader&, Segment*, staff_idx_t, Fraction)`
Original file line number	Diff line number	Diff line change
`@@ -3419,7 +3419,7 @@ bool Read206::readScore206(Score* score, XmlReader& e, ReadContext& ctx)`
`3419`	`3419`	`return true;`
`3420`	`3420`	`}`
`3421`	`3421`
`3422`		`-Err Read206::readScore(Score* score, XmlReader& e, ReadInOutData* out)`
	`3422`	`+Ret Read206::readScore(Score* score, XmlReader& e, ReadInOutData* out)`
`3423`	`3423`	`{`
`3424`	`3424`	`ReadContext ctx(score);`
`3425`	`3425`	`if (out) {`
`@@ -3444,7 +3444,10 @@ Err Read206::readScore(Score* score, XmlReader& e, ReadInOutData* out)`
`3444`	`3444`	`score->setMscoreRevision(e.readInt(nullptr, 16));`
`3445`	`3445`	`} else if (tag == "Score") {`
`3446`	`3446`	`if (!readScore206(score, e, ctx)) {`
`3447`		`- return Err::FileBadFormat;`
	`3447`	`+ if (e.error() == muse::XmlStreamReader::CustomError) {`
	`3448`	`+ return make_ret(Err::FileCriticallyCorrupted, e.errorString());`
	`3449`	`+ }`
	`3450`	`+ return make_ret(Err::FileBadFormat, e.errorString());`
`3448`	`3451`	`}`
`3449`	`3452`
`3450`	`3453`	`if (ctx.overrideSpatium() && out) {`
`@@ -3504,7 +3507,7 @@ Err Read206::readScore(Score* score, XmlReader& e, ReadInOutData* out)`
`3504`	`3507`
`3505`	`3508`	`compat::CompatUtils::doCompatibilityConversions(score->masterScore());`
`3506`	`3509`
`3507`		`- return Err::NoError;`
	`3510`	`+ return make_ok();`
`3508`	`3511`	`}`
`3509`	`3512`
`3510`	`3513`	`bool Read206::pasteStaff(XmlReader&, Segment*, staff_idx_t, Fraction)`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ bool Read302::readScore302(Score* score, XmlReader& e, ReadContext& ctx)`
`251`	`251`	`return true;`
`252`	`252`	`}`
`253`	`253`
`254`		`-Err Read302::readScore(Score* score, XmlReader& e, ReadInOutData* out)`
	`254`	`+muse::Ret Read302::readScore(Score* score, XmlReader& e, ReadInOutData* out)`
`255`	`255`	`{`
`256`	`256`	`ReadContext ctx(score);`
`257`	`257`	`if (out) {`
`@@ -278,9 +278,9 @@ Err Read302::readScore(Score* score, XmlReader& e, ReadInOutData* out)`
`278`	`278`	`} else if (tag == "Score") {`
`279`	`279`	`if (!readScore302(score, e, ctx)) {`
`280`	`280`	`if (e.error() == muse::XmlStreamReader::CustomError) {`
`281`		`- return Err::FileCriticallyCorrupted;`
	`281`	`+ return make_ret(Err::FileCriticallyCorrupted, e.errorString());`
`282`	`282`	`}`
`283`		`- return Err::FileBadFormat;`
	`283`	`+ return make_ret(Err::FileBadFormat, e.errorString());`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`if (ctx.overrideSpatium() && out) {`
`@@ -291,7 +291,7 @@ Err Read302::readScore(Score* score, XmlReader& e, ReadInOutData* out)`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`
`294`		`- return Err::NoError;`
	`294`	`+ return muse::make_ok();`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`void Read302::fixInstrumentId(Instrument* instrument)`