diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml index e3ed3f89..0ff81dc5 100644 --- a/.github/workflows/setup.yml +++ b/.github/workflows/setup.yml @@ -10,7 +10,7 @@ env: BUILD_CONFIGURATION: Release jobs: - VS2022-Build: + VS2026-Build: runs-on: windows-latest strategy: @@ -43,7 +43,7 @@ jobs: Extra-Step-To-Merge-Artifacts-Thanks-To-Upload-Artifact-v4-Breaking-Backwards-Compatibility: runs-on: windows-latest - needs: VS2022-Build + needs: VS2026-Build steps: - name: Merge Artifacts uses: actions/upload-artifact/merge@v7 diff --git a/.github/workflows/vs2022.yml b/.github/workflows/vs2026.yml similarity index 98% rename from .github/workflows/vs2022.yml rename to .github/workflows/vs2026.yml index f27cd3fb..2c368afb 100644 --- a/.github/workflows/vs2022.yml +++ b/.github/workflows/vs2026.yml @@ -1,4 +1,4 @@ -name: VS2022 +name: VS2026 on: push: @@ -31,7 +31,7 @@ env: BUILD_CONFIGURATION: Release jobs: - VS2022-Build: + VS2026-Build: runs-on: windows-latest strategy: @@ -136,11 +136,11 @@ jobs: Extra-Step-To-Merge-Artifacts-Thanks-To-Upload-Artifact-v4-Breaking-Backwards-Compatibility: runs-on: windows-latest - needs: VS2022-Build + needs: VS2026-Build steps: - name: Merge Artifacts uses: actions/upload-artifact/merge@v7 if: ${{ github.event_name == 'push' }} with: - name: VS2022 + name: VS2026 delete-merged: true diff --git a/.vs/bled.vcxproj b/.vs/bled.vcxproj index 12050177..7d57bbd6 100644 --- a/.vs/bled.vcxproj +++ b/.vs/bled.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -17,10 +13,6 @@ Debug x64 - - Release - ARM - Release ARM64 @@ -110,58 +102,41 @@ StaticLibrary Unicode - v143 - - - StaticLibrary - Unicode - v143 - true + v145 StaticLibrary Unicode - v143 + v145 true StaticLibrary Unicode - v143 + v145 StaticLibrary Unicode - v143 - true - - - StaticLibrary - Unicode - v143 - true + v145 true StaticLibrary Unicode - v143 + v145 true true StaticLibrary Unicode - v143 + v145 true <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ @@ -174,8 +149,6 @@ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x64\$(Configuration)\ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ - false - false false false false @@ -202,24 +175,6 @@ odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - Level3 - ProgramDatabase - Disabled - _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) - MultiThreadedDebug - ..\src - /utf-8 %(AdditionalOptions) - - - true - true - true - $(OutDir)$(TargetName)$(TargetExt) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - Level3 @@ -278,26 +233,6 @@ true - - - Level3 - true - _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) - MultiThreaded - ..\src - /utf-8 %(AdditionalOptions) - true - - - true - true - $(OutDir)$(TargetName)$(TargetExt) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - true - - Level3 diff --git a/.vs/ext2fs.vcxproj b/.vs/ext2fs.vcxproj index 521437b2..93901ae9 100644 --- a/.vs/ext2fs.vcxproj +++ b/.vs/ext2fs.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -17,10 +13,6 @@ Debug x64 - - Release - ARM - Release ARM64 @@ -122,58 +114,41 @@ StaticLibrary Unicode - v143 - - - StaticLibrary - Unicode - v143 - true + v145 StaticLibrary Unicode - v143 + v145 true StaticLibrary Unicode - v143 + v145 StaticLibrary Unicode - v143 - true - - - StaticLibrary - Unicode - v143 - true + v145 true StaticLibrary Unicode - v143 + v145 true true StaticLibrary Unicode - v143 + v145 true <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ @@ -186,8 +161,6 @@ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x64\$(Configuration)\ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ - false - false false false false @@ -214,24 +187,6 @@ $(OutDir)$(TargetName)$(TargetExt) - - - Level3 - ProgramDatabase - Disabled - _CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) - MultiThreadedDebug - ..\src;..\src\msvc-missing - 4018;4146;4244;4267;4996 - /utf-8 %(AdditionalOptions) - - - true - true - true - $(OutDir)$(TargetName)$(TargetExt) - - Level3 @@ -291,26 +246,6 @@ true - - - Level3 - true - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - ..\src;..\src\msvc-missing - 4018;4146;4244;4267;4996 - /utf-8 %(AdditionalOptions) - true - - - true - true - $(OutDir)$(TargetName)$(TargetExt) - - - true - - Level3 diff --git a/.vs/getopt.vcxproj b/.vs/getopt.vcxproj index 767adf07..ef7c6cc4 100644 --- a/.vs/getopt.vcxproj +++ b/.vs/getopt.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -17,10 +13,6 @@ Debug x64 - - Release - ARM - Release ARM64 @@ -44,39 +36,25 @@ StaticLibrary Unicode true - v143 - - - StaticLibrary - Unicode - true - v143 - true + v145 StaticLibrary Unicode true - v143 + v145 true StaticLibrary Unicode - v143 - true - - - StaticLibrary - Unicode - v143 - true + v145 true StaticLibrary Unicode - v143 + v145 true true @@ -84,21 +62,17 @@ StaticLibrary Unicode true - v143 + v145 StaticLibrary Unicode - v143 + v145 true <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ @@ -111,8 +85,6 @@ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x64\$(Configuration)\ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ - false - false false false false @@ -135,19 +107,6 @@ true - - - HAVE_STRING_H;%(PreprocessorDefinitions) - MultiThreadedDebug - Level3 - ProgramDatabase - 28252;28253 - /utf-8 %(AdditionalOptions) - - - true - - HAVE_STRING_H;%(PreprocessorDefinitions) @@ -194,20 +153,6 @@ true - - - MaxSpeed - HAVE_STRING_H;%(PreprocessorDefinitions) - MultiThreaded - Level3 - 28252;28253 - /utf-8 %(AdditionalOptions) - true - - - true - - MaxSpeed diff --git a/.vs/libcdio-driver.vcxproj b/.vs/libcdio-driver.vcxproj index 1e8b35c7..47d21cca 100644 --- a/.vs/libcdio-driver.vcxproj +++ b/.vs/libcdio-driver.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -13,10 +9,6 @@ Debug Win32 - - Release - ARM - Release ARM64 @@ -76,61 +68,43 @@ StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ @@ -143,8 +117,6 @@ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x64\$(Configuration)\ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ - false - false false false false @@ -171,24 +143,6 @@ MachineX86 - - - - - Level3 - Disabled - HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) - ..\src;..\src\libcdio;..\src\msvc-missing;%(AdditionalIncludeDirectories) - MultiThreadedDebug - ProgramDatabase - /utf-8 %(AdditionalOptions) - - - Windows - true - - - @@ -222,22 +176,6 @@ MachineX86 - - - Level3 - - - MaxSpeed - true - HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) - ..\src;..\src\libcdio;..\src\msvc-missing;%(AdditionalIncludeDirectories) - MultiThreaded - ProgramDatabase - /utf-8 %(AdditionalOptions) - true - - - Level3 diff --git a/.vs/libcdio-iso9660.vcxproj b/.vs/libcdio-iso9660.vcxproj index beadf8e6..d4bab65f 100644 --- a/.vs/libcdio-iso9660.vcxproj +++ b/.vs/libcdio-iso9660.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -13,10 +9,6 @@ Debug Win32 - - Release - ARM - Release ARM64 @@ -69,61 +61,43 @@ StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ @@ -136,8 +110,6 @@ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x64\$(Configuration)\ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ - false - false false false false @@ -164,24 +136,6 @@ MachineX86 - - - - - Level3 - Disabled - HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) - ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) - MultiThreadedDebug - ProgramDatabase - /utf-8 %(AdditionalOptions) - - - Windows - true - - - @@ -215,22 +169,6 @@ MachineX86 - - - Level3 - - - MaxSpeed - true - HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) - ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) - MultiThreaded - ProgramDatabase - /utf-8 %(AdditionalOptions) - true - - - Level3 diff --git a/.vs/libcdio-udf.vcxproj b/.vs/libcdio-udf.vcxproj index 60ce04b7..cce3485d 100644 --- a/.vs/libcdio-udf.vcxproj +++ b/.vs/libcdio-udf.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -13,10 +9,6 @@ Debug Win32 - - Release - ARM - Release ARM64 @@ -62,61 +54,43 @@ StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ @@ -129,8 +103,6 @@ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x64\$(Configuration)\ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ - false - false false false false @@ -157,24 +129,6 @@ MachineX86 - - - - - Level3 - Disabled - HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) - ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) - MultiThreadedDebug - ProgramDatabase - /utf-8 %(AdditionalOptions) - - - Windows - true - - - @@ -208,22 +162,6 @@ MachineX86 - - - Level3 - - - MaxSpeed - true - HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) - ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) - MultiThreaded - ProgramDatabase - /utf-8 %(AdditionalOptions) - true - - - Level3 diff --git a/.vs/ms-sys.vcxproj b/.vs/ms-sys.vcxproj index 796de1c8..cd2babdd 100644 --- a/.vs/ms-sys.vcxproj +++ b/.vs/ms-sys.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -13,10 +9,6 @@ Debug Win32 - - Release - ARM - Release ARM64 @@ -106,61 +98,43 @@ StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ @@ -173,8 +147,6 @@ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x64\$(Configuration)\ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ - false - false false false false @@ -202,25 +174,6 @@ MachineX86 - - - - - Level3 - Disabled - _CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) - ..\src\ms-sys\inc;%(AdditionalIncludeDirectories) - MultiThreadedDebug - ProgramDatabase - /analyze:stacksize32850 /utf-8 %(AdditionalOptions) - 28252;28253 - - - Windows - true - - - @@ -256,23 +209,6 @@ MachineX86 - - - Level3 - - - MaxSpeed - true - %(PreprocessorDefinitions) - ..\src\ms-sys\inc;%(AdditionalIncludeDirectories) - MultiThreaded - ProgramDatabase - /analyze:stacksize32850 /utf-8 %(AdditionalOptions) - 28252;28253 - true - - - Level3 diff --git a/.vs/rufus.vcxproj b/.vs/rufus.vcxproj index 843705b4..b0f1085f 100644 --- a/.vs/rufus.vcxproj +++ b/.vs/rufus.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -17,10 +13,6 @@ Debug x64 - - Release - ARM - Release ARM64 @@ -39,46 +31,30 @@ {731858A7-0303-4988-877B-9C0DD6471864} rufus Win32Proj - 10.0 Application Unicode true - v143 - - - Application - Unicode - true - v143 - true + v145 Application Unicode true - v143 + v145 true Application Unicode - v143 - true - - - Application - Unicode - v143 - true true + v145 Application Unicode - v143 true true @@ -86,21 +62,17 @@ Application Unicode true - v143 + v145 Application Unicode - v143 true + v145 <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ @@ -113,9 +85,11 @@ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x64\$(Configuration)\ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ - false + false false + false false + false false @@ -149,38 +123,6 @@ Generating 'embedded.loc' file - - - - _RUFUS;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;COBJMACROS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) - MultiThreadedDebug - Level3 - ..\src;..\src\msvc-missing;..\src\ms-sys\inc;..\src\syslinux\libinstaller;..\src\syslinux\libfat;..\src\syslinux\win;..\src\libcdio;..\src\getopt;..\src\wimlib;..\res;%(AdditionalIncludeDirectories) - CompileAsC - true - Async - 4091;5255;28251;28252;28253;%(DisableSpecificWarnings) - /utf-8 /std:clatest $(ExternalCompilerOptions) %(AdditionalOptions) - - - advapi32.lib;comctl32.lib;crypt32.lib;gdi32.lib;ole32.lib;dwmapi.lib;setupapi.lib;shell32.lib;ntdll.lib;shlwapi.lib;uxtheme.lib;version.lib;virtdisk.lib;wininet.lib;wintrust.lib;comdlg32.lib;%(AdditionalDependencies) - RequireAdministrator - true - Windows - C:\Program Files (x86)\Windows Kits\10\Lib\10.0.15063.0\um\arm - advapi32.dll;comctl32.dll;crypt32.dll;gdi32.dll;ole32.dll;dwmapi.dll;setupapi.dll;shell32.dll;shlwapi.dll;uxtheme.dll;version.dll;virtdisk.dll;wininet.dll;wintrust.dll;%(DelayLoadDLLs) - /BREPRO /DEPENDENTLOADFLAG:0x800 %(AdditionalOptions) - - - _UNICODE;UNICODE;%(PreprocessorDefinitions) - - - - - type $(SolutionDir)res\loc\rufus.loc | findstr /v MSG_9 > $(SolutionDir)res\loc\embedded.loc - Generating 'embedded.loc' file - - @@ -280,40 +222,6 @@ Generating 'embedded.loc' file - - - - _RUFUS;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;COBJMACROS;%(PreprocessorDefinitions) - MultiThreaded - Level3 - ..\src;..\src\msvc-missing;..\src\ms-sys\inc;..\src\syslinux\libinstaller;..\src\syslinux\libfat;..\src\syslinux\win;..\src\libcdio;..\src\getopt;..\src\wimlib;..\res;%(AdditionalIncludeDirectories) - CompileAsC - true - Async - 4091;5255;28251;28252;28253;%(DisableSpecificWarnings) - NDEBUG - /utf-8 /std:clatest $(ExternalCompilerOptions) %(AdditionalOptions) - true - - - advapi32.lib;comctl32.lib;crypt32.lib;gdi32.lib;ole32.lib;dwmapi.lib;setupapi.lib;shell32.lib;ntdll.lib;shlwapi.lib;uxtheme.lib;version.lib;virtdisk.lib;wininet.lib;wintrust.lib;comdlg32.lib;%(AdditionalDependencies) - RequireAdministrator - false - Windows - C:\Program Files (x86)\Windows Kits\10\Lib\10.0.15063.0\um\arm - /BREPRO /DEPENDENTLOADFLAG:0x800 %(AdditionalOptions) - advapi32.dll;comctl32.dll;crypt32.dll;gdi32.dll;ole32.dll;dwmapi.dll;setupapi.dll;shell32.dll;shlwapi.dll;uxtheme.dll;version.dll;virtdisk.dll;wininet.dll;wintrust.dll;%(DelayLoadDLLs) - - - _UNICODE;UNICODE;%(PreprocessorDefinitions) - - - - - type $(SolutionDir)res\loc\rufus.loc | findstr /v MSG_9 > $(SolutionDir)res\loc\embedded.loc - Generating 'embedded.loc' file - - diff --git a/.vs/syslinux-libfat.vcxproj b/.vs/syslinux-libfat.vcxproj index 732904b0..80957246 100644 --- a/.vs/syslinux-libfat.vcxproj +++ b/.vs/syslinux-libfat.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -13,10 +9,6 @@ Debug Win32 - - Release - ARM - Release ARM64 @@ -59,61 +51,43 @@ StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ @@ -126,8 +100,6 @@ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x64\$(Configuration)\ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ - false - false false false false @@ -155,25 +127,6 @@ MachineX86 - - - - - Level3 - Disabled - inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) - ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) - MultiThreadedDebug - ProgramDatabase - 4018;4244 - /utf-8 %(AdditionalOptions) - - - Windows - true - - - @@ -209,23 +162,6 @@ MachineX86 - - - Level3 - - - MaxSpeed - true - inline=__inline;%(PreprocessorDefinitions) - ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) - MultiThreaded - ProgramDatabase - 4018;4244 - /utf-8 %(AdditionalOptions) - true - - - Level3 diff --git a/.vs/syslinux-libinstaller.vcxproj b/.vs/syslinux-libinstaller.vcxproj index 8af68451..ad63a77b 100644 --- a/.vs/syslinux-libinstaller.vcxproj +++ b/.vs/syslinux-libinstaller.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -13,10 +9,6 @@ Debug Win32 - - Release - ARM - Release ARM64 @@ -58,61 +50,43 @@ StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ @@ -125,8 +99,6 @@ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x64\$(Configuration)\ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ - false - false false false false @@ -154,25 +126,6 @@ MachineX86 - - - - - Level3 - Disabled - inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) - ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) - MultiThreadedDebug - ProgramDatabase - 4244;4267 - /utf-8 %(AdditionalOptions) - - - Windows - true - - - @@ -208,23 +161,6 @@ MachineX86 - - - Level3 - - - MaxSpeed - true - inline=__inline;%(PreprocessorDefinitions) - ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) - MultiThreaded - ProgramDatabase - 4244;4267 - /utf-8 %(AdditionalOptions) - true - - - Level3 diff --git a/.vs/syslinux-win.vcxproj b/.vs/syslinux-win.vcxproj index 5e77cea3..0b0d3953 100644 --- a/.vs/syslinux-win.vcxproj +++ b/.vs/syslinux-win.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -13,10 +9,6 @@ Debug Win32 - - Release - ARM - Release ARM64 @@ -52,61 +44,43 @@ StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ @@ -119,8 +93,6 @@ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x64\$(Configuration)\ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ - false - false false false false @@ -148,25 +120,6 @@ MachineX86 - - - - - Level3 - Disabled - inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) - ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) - MultiThreadedDebug - ProgramDatabase - 4244;4267;4996 - /utf-8 %(AdditionalOptions) - - - Windows - true - - - @@ -202,23 +155,6 @@ MachineX86 - - - Level3 - - - MaxSpeed - true - inline=__inline;%(PreprocessorDefinitions) - ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) - MultiThreaded - ProgramDatabase - 4244;4267;4996 - /utf-8 %(AdditionalOptions) - true - - - Level3 diff --git a/.vs/wimlib.vcxproj b/.vs/wimlib.vcxproj index d82bbb86..a4cbc066 100644 --- a/.vs/wimlib.vcxproj +++ b/.vs/wimlib.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -13,10 +9,6 @@ Debug Win32 - - Release - ARM - Release ARM64 @@ -184,61 +176,43 @@ StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 - - - StaticLibrary - true - Unicode - v143 - true + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ - $(SolutionDir)arm\$(Configuration)\ - $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ $(SolutionDir)arm64\$(Configuration)\ @@ -251,8 +225,6 @@ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ $(SolutionDir)x64\$(Configuration)\ $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ - false - false false false false @@ -280,25 +252,6 @@ MachineX86 - - - - - Level3 - Disabled - ..\src;..\src\wimlib;..\src\msvc-missing;..\src\libcdio;%(AdditionalIncludeDirectories) - MultiThreadedDebug - ProgramDatabase - /std:clatest - 4018;4146;4267;4244;4334;4789;4996;6201;6239;6246;6255;6262;6297;6326;28252;28253 - _RUFUS;HAVE_CONFIG_H;UNICODE;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) - - - Windows - true - - - @@ -334,23 +287,6 @@ MachineX86 - - - Level3 - - - MaxSpeed - true - ..\src;..\src\wimlib;..\src\msvc-missing;..\src\libcdio;%(AdditionalIncludeDirectories) - MultiThreaded - ProgramDatabase - /std:clatest - 4018;4146;4267;4244;4334;4789;4996;6201;6239;6246;6255;6262;6297;6326;28252;28253 - true - _RUFUS;HAVE_CONFIG_H;UNICODE;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) - - - Level3 diff --git a/README.md b/README.md index 0b9191f3..b48745d8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Rufus: The Reliable USB Formatting Utility ========================================== -[![VS2022 Build Status](https://img.shields.io/github/actions/workflow/status/pbatard/rufus/vs2022.yml?branch=master&style=flat-square&label=VS2022%20Build)](https://github.com/pbatard/rufus/actions/workflows/vs2022.yml) +[![VS2022 Build Status](https://img.shields.io/github/actions/workflow/status/pbatard/rufus/vs2026.yml?branch=master&style=flat-square&label=VS2026%20Build)](https://github.com/pbatard/rufus/actions/workflows/vs2026.yml) [![MinGW Build Status](https://img.shields.io/github/actions/workflow/status/pbatard/rufus/mingw.yml?branch=master&style=flat-square&label=MinGW%20Build)](https://github.com/pbatard/rufus/actions/workflows/mingw.yml) [![Coverity Scan Status](https://img.shields.io/coverity/scan/2172.svg?style=flat-square&label=Coverity%20Analysis)](https://scan.coverity.com/projects/pbatard-rufus) [![Latest Release](https://img.shields.io/github/release-pre/pbatard/rufus.svg?style=flat-square&label=Latest%20Release)](https://github.com/pbatard/rufus/releases) @@ -39,7 +39,7 @@ Features Compilation ----------- -Use either Visual Studio 2022 or MinGW and then invoke the `.sln` or `configure`/`make` respectively. +Use either Visual Studio 2026 or MinGW and then invoke the `.sln` or `configure`/`make` respectively. #### Visual Studio diff --git a/res/setup/setup.vcxproj b/res/setup/setup.vcxproj index b4043bc7..39f3853b 100644 --- a/res/setup/setup.vcxproj +++ b/res/setup/setup.vcxproj @@ -37,40 +37,40 @@ Application true Unicode - v143 + v145 Application false true Unicode - v143 + v145 Application true Unicode - v143 + v145 Application true Unicode - v143 + v145 Application false true Unicode - v143 + v145 Application false true Unicode - v143 + v145 diff --git a/rufus.sln b/rufus.sln index 26a77148..db1c23c9 100644 --- a/rufus.sln +++ b/rufus.sln @@ -31,202 +31,152 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wimlib", ".vs\wimlib.vcxpro EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|arm = Debug|arm Debug|arm64 = Debug|arm64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|arm = Release|arm Release|arm64 = Release|arm64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {731858A7-0303-4988-877B-9C0DD6471864}.Debug|arm.ActiveCfg = Debug|ARM - {731858A7-0303-4988-877B-9C0DD6471864}.Debug|arm.Build.0 = Debug|ARM {731858A7-0303-4988-877B-9C0DD6471864}.Debug|arm64.ActiveCfg = Debug|ARM64 {731858A7-0303-4988-877B-9C0DD6471864}.Debug|arm64.Build.0 = Debug|ARM64 {731858A7-0303-4988-877B-9C0DD6471864}.Debug|x64.ActiveCfg = Debug|x64 {731858A7-0303-4988-877B-9C0DD6471864}.Debug|x64.Build.0 = Debug|x64 {731858A7-0303-4988-877B-9C0DD6471864}.Debug|x86.ActiveCfg = Debug|Win32 {731858A7-0303-4988-877B-9C0DD6471864}.Debug|x86.Build.0 = Debug|Win32 - {731858A7-0303-4988-877B-9C0DD6471864}.Release|arm.ActiveCfg = Release|ARM - {731858A7-0303-4988-877B-9C0DD6471864}.Release|arm.Build.0 = Release|ARM {731858A7-0303-4988-877B-9C0DD6471864}.Release|arm64.ActiveCfg = Release|ARM64 {731858A7-0303-4988-877B-9C0DD6471864}.Release|arm64.Build.0 = Release|ARM64 {731858A7-0303-4988-877B-9C0DD6471864}.Release|x64.ActiveCfg = Release|x64 {731858A7-0303-4988-877B-9C0DD6471864}.Release|x64.Build.0 = Release|x64 {731858A7-0303-4988-877B-9C0DD6471864}.Release|x86.ActiveCfg = Release|Win32 {731858A7-0303-4988-877B-9C0DD6471864}.Release|x86.Build.0 = Release|Win32 - {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|arm.ActiveCfg = Debug|ARM - {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|arm.Build.0 = Debug|ARM {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|arm64.ActiveCfg = Debug|ARM64 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|arm64.Build.0 = Debug|ARM64 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|x64.ActiveCfg = Debug|x64 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|x64.Build.0 = Debug|x64 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|x86.ActiveCfg = Debug|Win32 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Debug|x86.Build.0 = Debug|Win32 - {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|arm.ActiveCfg = Release|ARM - {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|arm.Build.0 = Release|ARM {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|arm64.ActiveCfg = Release|ARM64 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|arm64.Build.0 = Release|ARM64 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|x64.ActiveCfg = Release|x64 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|x64.Build.0 = Release|x64 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|x86.ActiveCfg = Release|Win32 {2B1D078D-8EB4-4398-9CA4-23457265A7F6}.Release|x86.Build.0 = Release|Win32 - {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|arm.ActiveCfg = Debug|ARM - {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|arm.Build.0 = Debug|ARM {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|arm64.ActiveCfg = Debug|ARM64 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|arm64.Build.0 = Debug|ARM64 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|x64.ActiveCfg = Debug|x64 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|x64.Build.0 = Debug|x64 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|x86.ActiveCfg = Debug|Win32 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Debug|x86.Build.0 = Debug|Win32 - {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|arm.ActiveCfg = Release|ARM - {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|arm.Build.0 = Release|ARM {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|arm64.ActiveCfg = Release|ARM64 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|arm64.Build.0 = Release|ARM64 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|x64.ActiveCfg = Release|x64 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|x64.Build.0 = Release|x64 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|x86.ActiveCfg = Release|Win32 {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF}.Release|x86.Build.0 = Release|Win32 - {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|arm.ActiveCfg = Debug|ARM - {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|arm.Build.0 = Debug|ARM {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|arm64.ActiveCfg = Debug|ARM64 {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|arm64.Build.0 = Debug|ARM64 {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|x64.ActiveCfg = Debug|x64 {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|x64.Build.0 = Debug|x64 {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|x86.ActiveCfg = Debug|Win32 {266502AC-CD74-4581-B707-938A7D05AD7A}.Debug|x86.Build.0 = Debug|Win32 - {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|arm.ActiveCfg = Release|ARM - {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|arm.Build.0 = Release|ARM {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|arm64.ActiveCfg = Release|ARM64 {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|arm64.Build.0 = Release|ARM64 {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|x64.ActiveCfg = Release|x64 {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|x64.Build.0 = Release|x64 {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|x86.ActiveCfg = Release|Win32 {266502AC-CD74-4581-B707-938A7D05AD7A}.Release|x86.Build.0 = Release|Win32 - {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|arm.ActiveCfg = Debug|ARM - {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|arm.Build.0 = Debug|ARM {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|arm64.ActiveCfg = Debug|ARM64 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|arm64.Build.0 = Debug|ARM64 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|x64.ActiveCfg = Debug|x64 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|x64.Build.0 = Debug|x64 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|x86.ActiveCfg = Debug|Win32 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Debug|x86.Build.0 = Debug|Win32 - {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|arm.ActiveCfg = Release|ARM - {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|arm.Build.0 = Release|ARM {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|arm64.ActiveCfg = Release|ARM64 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|arm64.Build.0 = Release|ARM64 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|x64.ActiveCfg = Release|x64 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|x64.Build.0 = Release|x64 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|x86.ActiveCfg = Release|Win32 {7D2E9784-DDF7-4988-A887-CF099BC3B340}.Release|x86.Build.0 = Release|Win32 - {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|arm.ActiveCfg = Debug|ARM - {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|arm.Build.0 = Debug|ARM {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|arm64.ActiveCfg = Debug|ARM64 {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|arm64.Build.0 = Debug|ARM64 {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|x64.ActiveCfg = Debug|x64 {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|x64.Build.0 = Debug|x64 {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|x86.ActiveCfg = Debug|Win32 {D4E80F35-2604-40AC-B436-97B052ECB572}.Debug|x86.Build.0 = Debug|Win32 - {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|arm.ActiveCfg = Release|ARM - {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|arm.Build.0 = Release|ARM {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|arm64.ActiveCfg = Release|ARM64 {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|arm64.Build.0 = Release|ARM64 {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|x64.ActiveCfg = Release|x64 {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|x64.Build.0 = Release|x64 {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|x86.ActiveCfg = Release|Win32 {D4E80F35-2604-40AC-B436-97B052ECB572}.Release|x86.Build.0 = Release|Win32 - {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|arm.ActiveCfg = Debug|ARM - {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|arm.Build.0 = Debug|ARM {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|arm64.ActiveCfg = Debug|ARM64 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|arm64.Build.0 = Debug|ARM64 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|x64.ActiveCfg = Debug|x64 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|x64.Build.0 = Debug|x64 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|x86.ActiveCfg = Debug|Win32 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Debug|x86.Build.0 = Debug|Win32 - {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|arm.ActiveCfg = Release|ARM - {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|arm.Build.0 = Release|ARM {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|arm64.ActiveCfg = Release|ARM64 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|arm64.Build.0 = Release|ARM64 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|x64.ActiveCfg = Release|x64 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|x64.Build.0 = Release|x64 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|x86.ActiveCfg = Release|Win32 {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC}.Release|x86.Build.0 = Release|Win32 - {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|arm.ActiveCfg = Debug|ARM - {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|arm.Build.0 = Debug|ARM {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|arm64.ActiveCfg = Debug|ARM64 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|arm64.Build.0 = Debug|ARM64 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|x64.ActiveCfg = Debug|x64 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|x64.Build.0 = Debug|x64 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|x86.ActiveCfg = Debug|Win32 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Debug|x86.Build.0 = Debug|Win32 - {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|arm.ActiveCfg = Release|ARM - {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|arm.Build.0 = Release|ARM {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|arm64.ActiveCfg = Release|ARM64 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|arm64.Build.0 = Release|ARM64 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|x64.ActiveCfg = Release|x64 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|x64.Build.0 = Release|x64 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|x86.ActiveCfg = Release|Win32 {FA1B1093-BA86-410A-B7A0-7A54C605F812}.Release|x86.Build.0 = Release|Win32 - {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|arm.ActiveCfg = Debug|ARM - {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|arm.Build.0 = Debug|ARM {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|arm64.ActiveCfg = Debug|ARM64 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|arm64.Build.0 = Debug|ARM64 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x64.ActiveCfg = Debug|x64 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x64.Build.0 = Debug|x64 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x86.ActiveCfg = Debug|Win32 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Debug|x86.Build.0 = Debug|Win32 - {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|arm.ActiveCfg = Release|ARM - {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|arm.Build.0 = Release|ARM {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|arm64.ActiveCfg = Release|ARM64 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|arm64.Build.0 = Release|ARM64 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.ActiveCfg = Release|x64 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x64.Build.0 = Release|x64 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x86.ActiveCfg = Release|Win32 {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E}.Release|x86.Build.0 = Release|Win32 - {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|arm.ActiveCfg = Debug|ARM - {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|arm.Build.0 = Debug|ARM {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|arm64.ActiveCfg = Debug|ARM64 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|arm64.Build.0 = Debug|ARM64 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|x64.ActiveCfg = Debug|x64 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|x64.Build.0 = Debug|x64 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|x86.ActiveCfg = Debug|Win32 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Debug|x86.Build.0 = Debug|Win32 - {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|arm.ActiveCfg = Release|ARM - {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|arm.Build.0 = Release|ARM {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|arm64.ActiveCfg = Release|ARM64 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|arm64.Build.0 = Release|ARM64 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|x64.ActiveCfg = Release|x64 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|x64.Build.0 = Release|x64 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|x86.ActiveCfg = Release|Win32 {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D}.Release|x86.Build.0 = Release|Win32 - {B01F5886-2B39-4B66-B65C-6427135B6A02}.Debug|arm.ActiveCfg = Debug|ARM - {B01F5886-2B39-4B66-B65C-6427135B6A02}.Debug|arm.Build.0 = Debug|ARM {B01F5886-2B39-4B66-B65C-6427135B6A02}.Debug|arm64.ActiveCfg = Debug|ARM64 {B01F5886-2B39-4B66-B65C-6427135B6A02}.Debug|arm64.Build.0 = Debug|ARM64 {B01F5886-2B39-4B66-B65C-6427135B6A02}.Debug|x64.ActiveCfg = Debug|x64 {B01F5886-2B39-4B66-B65C-6427135B6A02}.Debug|x64.Build.0 = Debug|x64 {B01F5886-2B39-4B66-B65C-6427135B6A02}.Debug|x86.ActiveCfg = Debug|Win32 {B01F5886-2B39-4B66-B65C-6427135B6A02}.Debug|x86.Build.0 = Debug|Win32 - {B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|arm.ActiveCfg = Release|ARM - {B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|arm.Build.0 = Release|ARM {B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|arm64.ActiveCfg = Release|ARM64 {B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|arm64.Build.0 = Release|ARM64 {B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|x64.ActiveCfg = Release|x64 {B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|x64.Build.0 = Release|x64 {B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|x86.ActiveCfg = Release|Win32 {B01F5886-2B39-4B66-B65C-6427135B6A02}.Release|x86.Build.0 = Release|Win32 - {633CFC82-E01B-4777-BDE4-DC0739804332}.Debug|arm.ActiveCfg = Debug|ARM - {633CFC82-E01B-4777-BDE4-DC0739804332}.Debug|arm.Build.0 = Debug|ARM {633CFC82-E01B-4777-BDE4-DC0739804332}.Debug|arm64.ActiveCfg = Debug|ARM64 {633CFC82-E01B-4777-BDE4-DC0739804332}.Debug|arm64.Build.0 = Debug|ARM64 {633CFC82-E01B-4777-BDE4-DC0739804332}.Debug|x64.ActiveCfg = Debug|x64 {633CFC82-E01B-4777-BDE4-DC0739804332}.Debug|x64.Build.0 = Debug|x64 {633CFC82-E01B-4777-BDE4-DC0739804332}.Debug|x86.ActiveCfg = Debug|Win32 {633CFC82-E01B-4777-BDE4-DC0739804332}.Debug|x86.Build.0 = Debug|Win32 - {633CFC82-E01B-4777-BDE4-DC0739804332}.Release|arm.ActiveCfg = Release|ARM - {633CFC82-E01B-4777-BDE4-DC0739804332}.Release|arm.Build.0 = Release|ARM {633CFC82-E01B-4777-BDE4-DC0739804332}.Release|arm64.ActiveCfg = Release|ARM64 {633CFC82-E01B-4777-BDE4-DC0739804332}.Release|arm64.Build.0 = Release|ARM64 {633CFC82-E01B-4777-BDE4-DC0739804332}.Release|x64.ActiveCfg = Release|x64 diff --git a/src/rufus.c b/src/rufus.c index 19e79efc..7bc5defc 100755 --- a/src/rufus.c +++ b/src/rufus.c @@ -1454,7 +1454,6 @@ DWORD WINAPI ImageScanThread(LPVOID param) } UpdateImage(dont_display_image_name); ToggleImageOptions(); - EnableControls(TRUE, FALSE); // Set Target and FS accordingly if (img_report.is_iso || img_report.is_windows_img) { IGNORE_RETVAL(ComboBox_SetCurSel(hBootType, image_index)); @@ -1467,6 +1466,7 @@ DWORD WINAPI ImageScanThread(LPVOID param) SendMessage(hMainDialog, WM_COMMAND, (CBN_SELCHANGE_INTERNAL << 16) | IDC_FILE_SYSTEM, ComboBox_GetCurSel(hFileSystem)); } + EnableControls(TRUE, FALSE); // Lose the focus on the select ISO (but place it on Close) SendMessage(hMainDialog, WM_NEXTDLGCTL, (WPARAM)FALSE, 0); // Lose the focus from Close and set it back to Start diff --git a/src/rufus.rc b/src/rufus.rc index d23cc73e..f6507d0c 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 232, 326 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 4.15.2384" +CAPTION "Rufus 4.15.2386" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -409,8 +409,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,15,2384,0 - PRODUCTVERSION 4,15,2384,0 + FILEVERSION 4,15,2386,0 + PRODUCTVERSION 4,15,2386,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -428,13 +428,13 @@ BEGIN VALUE "Comments", "https://rufus.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "4.15.2384" + VALUE "FileVersion", "4.15.2386" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2026 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "OriginalFilename", "rufus-4.15.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "4.15.2384" + VALUE "ProductVersion", "4.15.2386" END END BLOCK "VarFileInfo" diff --git a/src/wue.c b/src/wue.c index 817a61ee..71af59bc 100644 --- a/src/wue.c +++ b/src/wue.c @@ -279,8 +279,8 @@ char* CreateUnattendXml(int arch, int flags) // Remove OneDrive StrArrayAdd(&commands, "reg add \"HKLM\\Software\\Policies\\Microsoft\\Windows\\OneDrive\" /v DisableFileSyncNGSC /t REG_DWORD /d 1 /f", TRUE); StrArrayAdd(&commands, "PowerShell -NonInteractive -WindowStyle Hidden -Command " - "\"Remove-Item -Path $env:SystemRoot\\System32\\OneDriveSetup.exe -Force -Confirm:$false;" - "\"Remove-Item -Path $env:SystemRoot\\SysWOW64\\OneDriveSetup.exe -Force -Confirm:$false;", TRUE); + "\"Remove-Item -Path $env:SystemRoot\\System32\\OneDriveSetup.exe -Force -Confirm:$false; " + "Remove-Item -Path $env:SystemRoot\\SysWOW64\\OneDriveSetup.exe -Force -Confirm:$false;\"", TRUE); // Remove Outlook. How the frig is forcing Outlook on users legal when MS got pinned for bundling IE with Windows? StrArrayAdd(&commands, "PowerShell -NonInteractive -WindowStyle Hidden -Command " "\"Get-AppxProvisionedPackage -Online | Where-Object {$_.PackageName -like '*Outlook*'} |"