[MU3] Fix GH#7449: Almost everything suitable for 3.6.3 or 3.7.0

.github/workflows/ci_linux.yml

@@ -19,14 +19,14 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - name: Cancel Previous Runs
-      uses: styfle/cancel-workflow-action@0.5.0
+      uses: styfle/cancel-workflow-action@0.11.0
       with:
         access_token: ${{ github.token }}
     - name: Clone repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: "Configure workflow"
       run: |
         sudo bash ./build/ci/tools/make_build_mode_env.sh -e ${{ github.event_name }} -m ${{ github.event.inputs.build_mode }}
@@ -59,7 +59,7 @@ jobs:
       run: |
         T_ID=${{ secrets.TELEMETRY_TRACK_ID }}; if [ -z "$T_ID" ]; then T_ID="''"; fi
         sudo bash ./build/ci/linux/build.sh -n ${{ github.run_id }} --telemetry $T_ID
-    - name: Package 
+    - name: Package
       if: env.DO_BUILD == 'true'
       run: |
         sudo bash ./build/ci/linux/package.sh
@@ -73,27 +73,34 @@ jobs:
         sudo bash ./build/ci/tools/osuosl/publish.sh -s ${{ secrets.OSUOSL_SSH_ENCRYPT_SECRET }} --os linux -v 3
     - name: Upload artifacts on GitHub
       if: env.DO_BUILD == 'true'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: MuseScore_${{ github.run_id }}
         path: ./build.artifacts/
 
   run_mtests:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
         # Enable AddressSanitizer in the mtest build
         CFLAGS: "-fsanitize=address -fno-omit-frame-pointer"
         CXXFLAGS: "-fsanitize=address -fno-omit-frame-pointer"
     steps:
     - name: Clone repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup environment
       run: |
         sudo bash ./build/ci/linux/setup.sh
     - name: Build
       run: |
         mkdir -p build.artifacts/env
+        #sudo bash ./build/ci/linux/build.sh -n ${{ github.run_id }} --build_mode mtests
         ./build/ci/linux/build.sh -n ${{ github.run_id }} --build_mode mtests
     - name: Run mtests 
       run: |
+        # At moment build and run mtests consume 13.4 Gb of the disk.
+        # After left too little free space.
+        # So, we remove unnecessary tools, for more free space
+        #sudo docker system prune -a -f
+        #sudo rm -rf /usr/local/lib/android
+        #sudo bash ./build/ci/linux/runmtests.sh
         ./build/ci/linux/runmtests.sh

.github/workflows/ci_lupdate.yml

@@ -9,13 +9,13 @@ on:
       publish:
         description: 'Publish to Transifex: on - publish'
         required: false
-        default: 'off'
+        default: 'on'
 jobs:
   lupdate:
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
     - name: Clone repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: "Configure workflow"
       run: |
         DO_PUBLISH='false'
@@ -45,7 +45,7 @@ jobs:
       run: |
         sudo bash ./build/ci/lupdate/publish_to_tx.sh -u ${{ secrets.TRANSIFEX_USER }} -p ${{ secrets.TRANSIFEX_PASSWORD }}
     - name: Upload artifacts on GitHub
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: MuseScore_tsfiles_${{ github.run_id }}
-        path: ./share/locale
+        path: ./share/locale

.github/workflows/ci_macos.yml

@@ -23,13 +23,14 @@ env:
 jobs:
   build:    
     runs-on: macos-10.15
+    #runs-on: macos-11 may be needed in the near futur
     steps:
     - name: Cancel Previous Runs
-      uses: styfle/cancel-workflow-action@0.5.0
+      uses: styfle/cancel-workflow-action@0.11.0
       with:
         access_token: ${{ github.token }}
     - name: Clone repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 3
     - name: "Configure workflow"
@@ -106,7 +107,7 @@ jobs:
         bash ./build/ci/tools/sparkle_appcast_gen.sh -p macos
     - name: Upload artifacts on GitHub
       if: env.DO_BUILD == 'true'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: MuseScore_${{ github.run_id }}
         path: ./build.artifacts/

.github/workflows/ci_tx2s3.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   tx2s3:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - name: "Configure workflow"
       run: |
@@ -29,7 +29,7 @@ jobs:
 
     - name: Clone repository
       if: env.DO_RUN == 'true'
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Setup environment
       if: env.DO_RUN == 'true'
@@ -43,7 +43,7 @@ jobs:
 
     - name: Upload artifacts on GitHub
       if: env.DO_RUN == 'true'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: MuseScore_locale_${{ github.run_id }}
-        path: ./share/locale
+        path: ./share/locale

.github/workflows/ci_vtests.yml

@@ -7,10 +7,10 @@ on:
 
 jobs:
   run_vtests:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - name: Clone repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - name: Retrieve base commit for PR
@@ -75,7 +75,7 @@ jobs:
         ./gen_compare
     - name: Upload artifact
       if: contains( env.found, '1') && contains( env.VTEST_DIFF_FOUND, 'true')
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v3
       with:
         name: compare
         path: ./vtest/compare

.github/workflows/ci_windows.yml

@@ -19,14 +19,14 @@ on:
 
 jobs:
   build_x64:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     - name: Cancel Previous Runs
-      uses: styfle/cancel-workflow-action@0.5.0
+      uses: styfle/cancel-workflow-action@0.11.0
       with:
         access_token: ${{ github.token }}
     - name: Clone repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: 'true'
     - name: "Configure workflow"
@@ -98,19 +98,20 @@ jobs:
         bash ./build/ci/tools/sparkle_appcast_gen.sh -p windows 
     - name: Upload artifacts on GitHub
       if: ${{ always() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: MuseScore_x64_${{ github.run_id }}
         path: build.artifacts\ 
+
   build_x32:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     - name: Cancel Previous Runs
-      uses: styfle/cancel-workflow-action@0.5.0
+      uses: styfle/cancel-workflow-action@0.11.0
       with:
         access_token: ${{ github.token }}
     - name: Clone repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 3
     - name: Fetch submodules
@@ -127,6 +128,7 @@ jobs:
         if [[ "$BUILD_MODE" == "testing_build" || "$BUILD_MODE" == "stable_build" ]]; then 
           DO_BUILD='true'  
         fi
+        DO_BUILD='true'  
         echo "!! ATTENTION !! Windows x32 build run only for 'testing_build' and 'stable_build', and SKIP for 'pull requests' and nightly"
         echo "DO_BUILD=$DO_BUILD" >> $GITHUB_ENV
         echo "DO_BUILD: $DO_BUILD"
@@ -177,19 +179,19 @@ jobs:
         bash ./build/ci/tools/sparkle_appcast_gen.sh -p windows        
     - name: Upload artifacts on GitHub
       if: env.DO_BUILD == 'true'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: MuseScore_x86_${{ github.run_id }}
         path: build.artifacts\     
   build_portable:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     - name: Cancel Previous Runs
-      uses: styfle/cancel-workflow-action@0.5.0
+      uses: styfle/cancel-workflow-action@0.11.0
       with:
         access_token: ${{ github.token }}
     - name: Clone repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 3
     - name: Fetch submodules
@@ -256,7 +258,7 @@ jobs:
         bash ./build/ci/tools/sparkle_appcast_gen.sh -p windows       
     - name: Upload artifacts on GitHub
       if: env.DO_BUILD == 'true'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: MuseScore_Portable_${{ github.run_id }}
         path: build.artifacts\

.gitignore

@@ -53,3 +53,7 @@ VERSION
 SF_VERSION
 /mscore/data/mscore.aps
 /msvc.*
+
+# Created during (master) build
+thirdparty/lame/config.h
+thirdparty/flac/flac-1.3.4/config.h

CMakeLists.txt

@@ -312,7 +312,7 @@ else (APPLE)
       set(CMAKE_C_FLAGS_RELWITHDEBINFO   "/MT /W4 /Zi /O2 /Ob1 /DNDEBUG")
       set(CMAKE_EXE_LINKER_FLAGS         "/DYNAMICBASE:NO")
    else (MSVC)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_UNICODE -DUNICODE")
       if (MINGW)
          # -mno-ms-bitfields see #22048
          set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
@@ -349,7 +349,7 @@ endif (MINGW OR MSVC OR APPLE)
 
 # Download MuseScore SoundFont
 if (DOWNLOAD_SOUNDFONT)
-  set (SF_VERSION_REMOTE_FILE ${PROJECT_BINARY_DIR}/VERSION)
+  set (SF_VERSION_REMOTE_FILE ${PROJECT_BINARY_DIR}/SF_VERSION)
   set (SF_VERSION_LOCAL_FILE ${PROJECT_SOURCE_DIR}/share/sound/VERSION)
   set (DOWNLOAD_URL_ROOT "https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General")
   set (SOUND_DIRECTORY ${PROJECT_SOURCE_DIR}/share/sound)

CMakeSettings.json

@@ -3,7 +3,7 @@
    "configurations": [
       {
          "name": "x64-RelWithDebInfo",
-         "generator": "Visual Studio 16 2019 Win64",
+         "generator": "Visual Studio 17 2022 Win64",
          "configurationType": "RelWithDebInfo",
          "inheritEnvironments": [ "msvc_x64_x64" ],
          "buildRoot": "${projectDir}\\msvc.build_x64", // "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",

LICENSE.GPL

@@ -1,5 +1,5 @@
 MuseScore, free and open source music notation software
-Copyright (C) 1999-2020 MuseScore BVBA and others
+Copyright (C) 1999-2023 MuseScore BVBA and others
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License version 2 as published 

LICENSE.rtf

@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Courier New;}{\f1\fnil\fcharset77 Courier New;}}
 {\*\generator Riched20 6.3.9600}\viewkind4\uc1 
 \pard\sa200\sl276\slmult1\f0\fs18\lang12 MuseScore, free and open source music notation software.\par
-Copyright (C) 1999-2020 MuseScore BVBA and others.\par
+Copyright (C) 1999-2023 MuseScore BVBA and others.\par
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation and reproduce below with the following exception:\par
 - If you create a document which uses fonts included in MuseScore, and embed this font or unaltered portions of this font into the document, then this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.\par
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\par
@@ -95,4 +95,4 @@ NO WARRANTY\par
 \par
 END OF TERMS AND CONDITIONS\par
 }
-
+

all.h

@@ -224,12 +224,6 @@
 #define Q_ASSERT(a)
 #endif
 
-#if (defined (_MSCVER) || defined (_MSC_VER))
-   // Undefined problematic #def'd macros in Microsoft headers
-   #undef STRING_NONE
-   #undef small
-#endif
-
 #endif  // __cplusplus
 
 #endif

audio/drivers/alsa.cpp

@@ -616,6 +616,7 @@ AlsaAudio::~AlsaAudio()
       {
       stop();
       delete alsa;
+      delete midiDriver;
       }
 
 //---------------------------------------------------------

audio/drivers/alsamidi.h

@@ -47,7 +47,7 @@ class AlsaMidiDriver : public MidiDriver {
 
    public:
       AlsaMidiDriver(Seq* s);
-      virtual ~AlsaMidiDriver() {}
+      ~AlsaMidiDriver();
       virtual bool init();
       virtual Port registerOutPort(const QString& name);
       virtual Port registerInPort(const QString& name);

audio/drivers/mididriver.cpp

@@ -112,10 +112,16 @@ static const unsigned int outCap = SND_SEQ_PORT_CAP_SUBS_WRITE;
 //---------------------------------------------------------
 
 AlsaMidiDriver::AlsaMidiDriver(Seq* s)
-   : MidiDriver(s)
+   : MidiDriver(s), alsaSeq(0)
       {
       }
 
+AlsaMidiDriver::~AlsaMidiDriver()
+      {
+      if (alsaSeq)
+            snd_seq_close(alsaSeq);
+      }
+
 //---------------------------------------------------------
 //   init
 //    return false on error