diff --git a/res/appstore/Package.appxmanifest b/res/appstore/Package.appxmanifest
index 2752b709..62507bcf 100644
--- a/res/appstore/Package.appxmanifest
+++ b/res/appstore/Package.appxmanifest
@@ -11,7 +11,7 @@
+ Version="3.16.1823.0" />
Rufus
diff --git a/src/format.c b/src/format.c
index 17c8123b..4bb1e634 100644
--- a/src/format.c
+++ b/src/format.c
@@ -730,7 +730,7 @@ static BOOL ClearMBRGPT(HANDLE hPhysicalDrive, LONGLONG DiskSize, DWORD SectorSi
num_sectors_to_clear = (DWORD)((add1MB ? 2048 : 0) + MAX_SECTORS_TO_CLEAR);
uprintf("Erasing %d sectors", num_sectors_to_clear);
- pZeroBuf = calloc(SectorSize, num_sectors_to_clear);
+ pZeroBuf = calloc(SectorSize, (size_t)num_sectors_to_clear);
if (pZeroBuf == NULL) {
FormatStatus = ERROR_SEVERITY_ERROR | FAC(FACILITY_STORAGE) | ERROR_NOT_ENOUGH_MEMORY;
goto out;
diff --git a/src/rufus.rc b/src/rufus.rc
index 6a0724ec..8c1ecbcf 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 3.16.1822"
+CAPTION "Rufus 3.16.1823"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -395,8 +395,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,16,1822,0
- PRODUCTVERSION 3,16,1822,0
+ FILEVERSION 3,16,1823,0
+ PRODUCTVERSION 3,16,1823,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus"
- VALUE "FileVersion", "3.16.1822"
+ VALUE "FileVersion", "3.16.1823"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.16.exe"
VALUE "ProductName", "Rufus"
- VALUE "ProductVersion", "3.16.1822"
+ VALUE "ProductVersion", "3.16.1823"
END
END
BLOCK "VarFileInfo"
diff --git a/src/stdfn.c b/src/stdfn.c
index 3eddbfc4..fae2d263 100644
--- a/src/stdfn.c
+++ b/src/stdfn.c
@@ -239,10 +239,82 @@ int GetCpuArch(void)
}
}
+static const char* GetEdition(DWORD ProductType)
+{
+ // From: https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getproductinfo
+ // These values can be found in the winnt.h header.
+ switch (ProductType) {
+ case 0x00000000: return ""; // Undefined
+ case 0x00000001: return "Ultimate";
+ case 0x00000002: return "Home Basic";
+ case 0x00000003: return "Home Premium";
+ case 0x00000004: return "Enterprise";
+ case 0x00000005: return "Home Basic N";
+ case 0x00000006: return "Business";
+ case 0x00000007: return "Standard Server";
+ case 0x00000008: return "Datacenter Server";
+ case 0x00000009: return "Smallbusiness Server";
+ case 0x0000000A: return "Enterprise Server";
+ case 0x0000000B: return "Starter";
+ case 0x00000010: return "Business N";
+ case 0x00000011: return "Web Server";
+ case 0x00000012: return "Cluster Server";
+ case 0x00000013: return "Home Server";
+ case 0x0000001A: return "Home Premium N";
+ case 0x0000001B: return "Enterprise N";
+ case 0x0000001C: return "Ultimate N";
+ case 0x00000022: return "Home Premium Server";
+ case 0x0000002F: return "Starter N";
+ case 0x00000030: return "Pro";
+ case 0x00000031: return "Pro N";
+ case 0x00000042: return "Starter E";
+ case 0x00000043: return "Home Basic E";
+ case 0x00000044: return "Premium E";
+ case 0x00000045: return "Pro E";
+ case 0x00000046: return "Enterprise E";
+ case 0x00000047: return "Ultimate E";
+ case 0x00000048: return "Enterprise Eval";
+ case 0x00000054: return "Enterprise N Eval";
+ case 0x00000057: return "Thin PC";
+ case 0x0000006F: return "Core Connected";
+ case 0x00000070: return "Pro Student";
+ case 0x00000071: return "Core Connected N";
+ case 0x00000072: return "Pro Student N";
+ case 0x00000073: return "Core Connected Single Language";
+ case 0x00000074: return "Core Connected China";
+ case 0x00000079: return "Edu";
+ case 0x0000007A: return "Edu N";
+ case 0x0000007D: return "Enterprise S";
+ case 0x0000007E: return "Enterprise S N";
+ case 0x0000007F: return "Pro S";
+ case 0x00000080: return "Pro S N";
+ case 0x00000081: return "Enterprise S Eval";
+ case 0x00000082: return "Enterprise S N Eval";
+ case 0x0000008A: return "Pro Single Language";
+ case 0x0000008B: return "Pro China";
+ case 0x0000008C: return "Enterprise Subscription";
+ case 0x0000008D: return "Enterprise Subscription N";
+ case 0x00000095: return "Utility VM";
+ case 0x000000A1: return "Pro Workstation";
+ case 0x000000A2: return "Pro Workstation N";
+ case 0x000000A4: return "Pro for Education";
+ case 0x000000A5: return "Pro for Education N";
+ case 0x000000AB: return "Enterprise G"; // I swear Microsoft are just making up editions...
+ case 0x000000AC: return "Enterprise G N";
+ case 0x000000B6: return "Core OS";
+ case 0x000000B7: return "Cloud E";
+ case 0x000000B8: return "Cloud E N";
+ case 0x000000BD: return "Lite";
+ case 0xABCDABCD: return "(Unlicensed)";
+ default: return "(Unknown Edition)";
+ }
+}
+
// From smartmontools os_win32.cpp
void GetWindowsVersion(void)
{
OSVERSIONINFOEXA vi, vi2;
+ DWORD dwProductType;
const char* w = 0;
const char* w64 = "32 bit";
char *vptr;
@@ -314,13 +386,15 @@ void GetWindowsVersion(void)
case 0x64: w = (ws?"10 (Preview 1)":"Server 10 (Preview 1)");
break;
// Starting with Windows 10 Preview 2, the major is the same as the public-facing version
- case 0xA0: w = (ws?"10":"Server 2016");
+ case 0xA0: w = (ws?((vi.dwBuildNumber<20000)?"10":"11"):((vi.dwBuildNumber<17763)?"Server 2016":"Server 2019"));
+ break;
+ case 0xB0: w = (ws?"11":"Server 2022");
break;
default:
if (nWindowsVersion < 0x51)
nWindowsVersion = WINDOWS_UNSUPPORTED;
else
- w = "11 or later";
+ w = "12 or later";
break;
}
}
@@ -329,6 +403,7 @@ void GetWindowsVersion(void)
if (is_x64())
w64 = "64-bit";
+ GetProductInfo(vi.dwMajorVersion, vi.dwMinorVersion, vi.wServicePackMajor, vi.wServicePackMinor, &dwProductType);
vptr = &WindowsVersionStr[sizeof("Windows ") - 1];
vlen = sizeof(WindowsVersionStr) - sizeof("Windows ") - 1;
if (!w)
@@ -339,7 +414,8 @@ void GetWindowsVersion(void)
else if (vi.wServicePackMajor)
safe_sprintf(vptr, vlen, "%s SP%u %s", w, vi.wServicePackMajor, w64);
else
- safe_sprintf(vptr, vlen, "%s %s", w, w64);
+ safe_sprintf(vptr, vlen, "%s%s%s, %s",
+ w, (dwProductType != PRODUCT_UNDEFINED) ? " " : "", GetEdition(dwProductType), w64);
// Add the build number (including UBR if available) for Windows 8.0 and later
nWindowsBuildNumber = vi.dwBuildNumber;