nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[wue] don't display WUE when '/sources/$OEM$/$$/Panther/unattend.xml' exists

Browse source 
* Closes #2451.
* Also update Coverity workflow to use latest actions/upload-artifact.
This commit is contained in:
Pete Batard 2024-04-15 16:35:52 +01:00
parent f813eb05d8
commit 92ac1c770c
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
5 changed files with 52 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/coverity.yml vendored
View file

@ -52,7 +52,7 @@ jobs:
cov-build.exe --dir cov-int msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION }},Platform=${{ env.TARGET_PLATFORM }} cov-build.exe --dir cov-int msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION }},Platform=${{ env.TARGET_PLATFORM }}
- name: Publish Coverity artifacts - name: Publish Coverity artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: cov-int name: cov-int
path: cov-int/ path: cov-int/

5
src/iso.c
View file

@ -324,6 +324,11 @@ static BOOL check_iso_props(const char* psz_dirname, int64_t file_length, const
} }
} }
// Check for "\sources\\$OEM$\\$$\\Panther\\unattend.xml"
if ((safe_stricmp(psz_dirname, "/sources/$OEM$/$$/Panther") == 0) &&
(safe_stricmp(psz_basename, "unattend.xml") == 0))
img_report.has_panther_unattend = TRUE;
// Check for PE (XP) specific files in "/i386", "/amd64" or "/minint" // Check for PE (XP) specific files in "/i386", "/amd64" or "/minint"
for (i = 0; i < ARRAYSIZE(pe_dirname); i++) for (i = 0; i < ARRAYSIZE(pe_dirname); i++)
if (safe_stricmp(psz_dirname, pe_dirname[i]) == 0) if (safe_stricmp(psz_dirname, pe_dirname[i]) == 0)

5
src/rufus.c
View file

@ -1562,6 +1562,10 @@ static DWORD WINAPI BootCheckThread(LPVOID param)
goto out; goto out;
} }
if ((WindowsVersion.Version >= WINDOWS_8) && IS_WINDOWS_1X(img_report) && (!is_windows_to_go)) { if ((WindowsVersion.Version >= WINDOWS_8) && IS_WINDOWS_1X(img_report) && (!is_windows_to_go)) {
if (img_report.has_panther_unattend) {
uprintf("NOTICE: A '/sources/$OEM$/$$/Panther/unattend.xml' was detected on the ISO.");
uprintf("As a result, the 'Windows User Experience dialog' will not be displayed.");
} else {
StrArray options; StrArray options;
int arch = _log2(img_report.has_efi >> 1); int arch = _log2(img_report.has_efi >> 1);
uint16_t map[16] = { 0 }, b = 1; uint16_t map[16] = { 0 }, b = 1;
@ -1599,6 +1603,7 @@ static DWORD WINAPI BootCheckThread(LPVOID param)
unattend_xml_mask |= i; unattend_xml_mask |= i;
WriteSetting32(SETTING_WUE_OPTIONS, (UNATTEND_DEFAULT_MASK << 16) | unattend_xml_mask); WriteSetting32(SETTING_WUE_OPTIONS, (UNATTEND_DEFAULT_MASK << 16) | unattend_xml_mask);
} }
}
if ((img_report.projected_size < MAX_ISO_TO_ESP_SIZE * MB) && HAS_REGULAR_EFI(img_report) && if ((img_report.projected_size < MAX_ISO_TO_ESP_SIZE * MB) && HAS_REGULAR_EFI(img_report) &&
(partition_type == PARTITION_STYLE_GPT) && IS_FAT(fs_type) && !esp_already_asked) { (partition_type == PARTITION_STYLE_GPT) && IS_FAT(fs_type) && !esp_already_asked) {

1
src/rufus.h
View file

@ -410,6 +410,7 @@ typedef struct {
BOOLEAN has_grub4dos; BOOLEAN has_grub4dos;
uint8_t has_grub2; uint8_t has_grub2;
BOOLEAN has_compatresources_dll; BOOLEAN has_compatresources_dll;
BOOLEAN has_panther_unattend;
BOOLEAN has_kolibrios; BOOLEAN has_kolibrios;
BOOLEAN needs_syslinux_overwrite; BOOLEAN needs_syslinux_overwrite;
BOOLEAN needs_ntfs; BOOLEAN needs_ntfs;

10
src/rufus.rc
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 4.5.2128" CAPTION "Rufus 4.5.2129"
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
@ -397,8 +397,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,5,2128,0 FILEVERSION 4,5,2129,0
PRODUCTVERSION 4,5,2128,0 PRODUCTVERSION 4,5,2129,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -416,13 +416,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", "4.5.2128" VALUE "FileVersion", "4.5.2129"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "<22> 2011-2024 Pete Batard (GPL v3)" VALUE "LegalCopyright", "<22> 2011-2024 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-4.5.exe" VALUE "OriginalFilename", "rufus-4.5.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "4.5.2128" VALUE "ProductVersion", "4.5.2129"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"