1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00

[wue] fix WUE options not being applied for ARM64 images

* Closes #1996
* Also set Coverity GitHub Actions workflow to use windows-latest
This commit is contained in:
Pete Batard 2022-07-25 16:48:57 +01:00
parent a19828c9d1
commit 01dbb3d957
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
3 changed files with 7 additions and 7 deletions

View file

@ -23,7 +23,7 @@ env:
jobs: jobs:
Coverity-Build: Coverity-Build:
runs-on: windows-2022 runs-on: windows-latest
steps: steps:
- name: Checkout repository - name: Checkout repository

View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.20.1922" CAPTION "Rufus 3.20.1923"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -395,8 +395,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,20,1922,0 FILEVERSION 3,20,1923,0
PRODUCTVERSION 3,20,1922,0 PRODUCTVERSION 3,20,1923,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie" VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.20.1922" VALUE "FileVersion", "3.20.1923"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.20.exe" VALUE "OriginalFilename", "rufus-3.20.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.20.1922" VALUE "ProductVersion", "3.20.1923"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

View file

@ -60,7 +60,7 @@ char* CreateUnattendXml(int arch, int flags)
int i, order; int i, order;
const char* xml_arch_names[5] = { "x86", "amd64", "arm", "arm64" }; const char* xml_arch_names[5] = { "x86", "amd64", "arm", "arm64" };
unattend_xml_flags = flags; unattend_xml_flags = flags;
if (arch < ARCH_X86_32 || arch >= ARCH_ARM_64 || flags == 0) if (arch < ARCH_X86_32 || arch > ARCH_ARM_64 || flags == 0)
return NULL; return NULL;
arch--; arch--;
// coverity[swapped_arguments] // coverity[swapped_arguments]