Merge branch 'dev41' into unicode

starg2 · May 2, 2023 · 5f471d8 · 5f471d8
2 parents 69b4530 + d8edd85
commit 5f471d8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -52,29 +52,29 @@ jobs:
  uses: actions/cache@v3
  with:
  path: mingw32
- key: v2022-11-09/gcc-12.2.0_i686-win32-dwarf-ucrt
+ key: v2023-03-19/gcc-12.2.0_i686-win32-dwarf-ucrt
 
  - name: Install toolchain (x86)
  if: ${{ matrix.arch == 'x86' && steps.cache-toolchain-mingw32.outputs.cache-hit != 'true' }}
  run: |
- curl.exe -L -O https://github.com/starg2/mingw64-builds-GHA/releases/download/v2022-11-09/gcc-12.2.0_i686-win32-dwarf-ucrt.zip
- 7z e gcc-12.2.0_i686-win32-dwarf-ucrt.zip i686-12.2.0-release-win32-dwarf-rt_v11.7z
- 7z x i686-12.2.0-release-win32-dwarf-rt_v11.7z
+ curl.exe -L -O https://github.com/starg2/mingw64-builds-GHA/releases/download/v2023-03-19/gcc-12.2.0_i686-win32-dwarf-ucrt.zip
+ 7z e gcc-12.2.0_i686-win32-dwarf-ucrt.zip i686-12.2.0-release-win32-dwarf-ucrt-rt_v11.7z
+ 7z x i686-12.2.0-release-win32-dwarf-ucrt-rt_v11.7z
 
  - name: Cache toolchain (x64)
  id: cache-toolchain-mingw64
  if: ${{ matrix.arch == 'x64' }}
  uses: actions/cache@v3
  with:
  path: mingw64
- key: v2022-11-09/gcc-12.2.0_x86_64-win32-seh-ucrt
+ key: v2023-03-19/gcc-12.2.0_x86_64-win32-seh-ucrt
 
  - name: Install toolchain (x64)
  if: ${{ matrix.arch == 'x64' && steps.cache-toolchain-mingw64.outputs.cache-hit != 'true' }}
  run: |
- curl.exe -L -O https://github.com/starg2/mingw64-builds-GHA/releases/download/v2022-11-09/gcc-12.2.0_x86_64-win32-seh-ucrt.zip
- 7z e gcc-12.2.0_x86_64-win32-seh-ucrt.zip x86_64-12.2.0-release-win32-seh-rt_v11.7z
- 7z x x86_64-12.2.0-release-win32-seh-rt_v11.7z
+ curl.exe -L -O https://github.com/starg2/mingw64-builds-GHA/releases/download/v2023-03-19/gcc-12.2.0_x86_64-win32-seh-ucrt.zip
+ 7z e gcc-12.2.0_x86_64-win32-seh-ucrt.zip x86_64-12.2.0-release-win32-seh-ucrt-rt_v11.7z
+ 7z x x86_64-12.2.0-release-win32-seh-ucrt-rt_v11.7z
 
  - name: Set Toolchain Path
  run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -276,7 +276,8 @@ if(MSVC)
  -DSTDOUT_FILENO=1
  )
 else()
- add_compile_options(-Wall -Wextra -Wno-missing-braces -ffast-math)
+ add_compile_definitions(_FORTIFY_SOURCE=2)
+ add_compile_options(-Wall -Wextra -Wno-missing-braces -ffast-math -fstack-protector-strong)
 
  if("${TIM41_GCC_WITH_LIBICONV}")
  add_compile_options(-fexec-charset=cp932)

diff --git a/interface/w32g_res.rc b/interface/w32g_res.rc
@@ -676,39 +676,39 @@ FONT 9, "MS UI Gothic", 0, 0, 1
 #ifdef _MSC_VER
 LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN
 #endif
-IDD_DIALOG_PREF DIALOG 0, 0, 364, 350
+IDD_DIALOG_PREF DIALOG 0, 0, 364, 360
 STYLE DS_MODALFRAME | DS_SETFONT | WS_CAPTION | WS_POPUP | WS_SYSMENU
 CAPTION "TiMidity++ Win32GUI 詳細設定"
 FONT 9, "MS UI Gothic"
 {
- DEFPUSHBUTTON "OK", IDOK, 100, 330, 50, 15
- PUSHBUTTON "キャンセル", IDCANCEL, 155, 330, 50, 15
- PUSHBUTTON "適用", IDC_BUTTON_APPLY, 210, 330, 50, 15
- CONTROL "Tab1", IDC_TAB_MAIN, WC_TABCONTROL, WS_GROUP | WS_TABSTOP | TCS_FORCELABELLEFT | TCS_HOTTRACK | TCS_RAGGEDRIGHT, 4, 25, 355, 300
+ DEFPUSHBUTTON "OK", IDOK, 100, 340, 50, 15
+ PUSHBUTTON "キャンセル", IDCANCEL, 155, 340, 50, 15
+ PUSHBUTTON "適用", IDC_BUTTON_APPLY, 210, 340, 50, 15
+ CONTROL "Tab1", IDC_TAB_MAIN, WC_TABCONTROL, WS_GROUP | WS_TABSTOP | TCS_FORCELABELLEFT | TCS_HOTTRACK | TCS_RAGGEDRIGHT, 4, 25, 355, 310
  PUSHBUTTON "INIファイル", IDC_BUTTON_INI_FILE, 5, 5, 50, 15, BS_CENTER
  EDITTEXT IDC_EDIT_INI_FILE, 60, 5, 260, 14, ES_AUTOHSCROLL
- PUSHBUTTON "Open VST Manager", IDC_OPENVSTMGR, 280, 330, 80, 15
- PUSHBUTTON "セーブ再起動", IDC_BUTTON_SAVE_RESTART, 5, 330, 80, 15
+ PUSHBUTTON "Open VST Manager", IDC_OPENVSTMGR, 280, 340, 80, 15
+ PUSHBUTTON "セーブ再起動", IDC_BUTTON_SAVE_RESTART, 5, 340, 80, 15
 }
 
 
 
 #ifdef _MSC_VER
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #endif
-IDD_DIALOG_PREF_EN DIALOG 0, 0, 364, 350
+IDD_DIALOG_PREF_EN DIALOG 0, 0, 364, 360
 STYLE DS_MODALFRAME | DS_SETFONT | WS_CAPTION | WS_POPUP | WS_SYSMENU
 CAPTION "TiMidity++ Win32GUI Preference"
 FONT 8, "Tahoma"
 {
- DEFPUSHBUTTON "OK", IDOK, 100, 330, 50, 15
- PUSHBUTTON "Cancel", IDCANCEL, 155, 330, 50, 15
- PUSHBUTTON "Apply", IDC_BUTTON_APPLY, 210, 330, 50, 15
- CONTROL "Tab1", IDC_TAB_MAIN, WC_TABCONTROL, WS_GROUP | WS_TABSTOP | TCS_FORCELABELLEFT | TCS_HOTTRACK | TCS_RAGGEDRIGHT, 4, 25, 355, 300
+ DEFPUSHBUTTON "OK", IDOK, 100, 340, 50, 15
+ PUSHBUTTON "Cancel", IDCANCEL, 155, 340, 50, 15
+ PUSHBUTTON "Apply", IDC_BUTTON_APPLY, 210, 340, 50, 15
+ CONTROL "Tab1", IDC_TAB_MAIN, WC_TABCONTROL, WS_GROUP | WS_TABSTOP | TCS_FORCELABELLEFT | TCS_HOTTRACK | TCS_RAGGEDRIGHT, 4, 25, 355, 310
  PUSHBUTTON "Ini File", IDC_BUTTON_INI_FILE, 5, 5, 50, 15, BS_CENTER
  EDITTEXT IDC_EDIT_INI_FILE, 60, 5, 260, 14, ES_AUTOHSCROLL
- PUSHBUTTON "Open VST Manager", IDC_OPENVSTMGR, 280, 330, 80, 15
- PUSHBUTTON "Save && Restart", IDC_BUTTON_SAVE_RESTART, 5, 330, 80, 15
+ PUSHBUTTON "Open VST Manager", IDC_OPENVSTMGR, 280, 340, 80, 15
+ PUSHBUTTON "Save && Restart", IDC_BUTTON_SAVE_RESTART, 5, 340, 80, 15
 }