Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated hostinfo_win.cpp - missing Windows SKUs (IoT Enterprise, Azure..) #5455

Merged
merged 1 commit into from
Dec 16, 2023
Merged

Updated hostinfo_win.cpp - missing Windows SKUs (IoT Enterprise, Azure..) #5455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion client/hostinfo_win.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,21 @@
#ifndef PRODUCT_ENTERPRISE_S_N_EVALUATION
#define PRODUCT_ENTERPRISE_S_N_EVALUATION 0x00000082
#endif
#ifndef PRODUCT_IOTENTERPRISE
#define PRODUCT_IOTENTERPRISE 0x000000BC
#endif
#ifndef PRODUCT_IOTENTERPRISES
#define PRODUCT_IOTENTERPRISES 0x000000BF
#endif
#ifndef PRODUCT_AZURESTACKHCI_SERVER_CORE
#define PRODUCT_AZURESTACKHCI_SERVER_CORE 0x00000196
#endif
#ifndef PRODUCT_DATACENTER_SERVER_AZURE_EDITION
#define PRODUCT_DATACENTER_SERVER_AZURE_EDITION 0x00000197
#endif
#ifndef PRODUCT_DATACENTER_SERVER_CORE_AZURE_EDITION
#define PRODUCT_DATACENTER_SERVER_CORE_AZURE_EDITION 0x00000198
#endif


// new Architecture(s)
Expand Down Expand Up @@ -367,7 +382,9 @@ int get_os_information(
strlcat(os_name, "Windows 10", os_name_size);
}
} else {
if ( osvi.dwBuildNumber >= 20348 ) {
if (osvi.dwBuildNumber >= 25398) {
strlcat(os_name, "Windows Server 23H2", os_name_size);
} else if (osvi.dwBuildNumber >= 20348) {
strlcat(os_name, "Windows Server 2022", os_name_size);
} else if ( osvi.dwBuildNumber >= 17623) {
strlcat(os_name, "Windows Server 2019", os_name_size);
Expand Down Expand Up @@ -559,6 +576,12 @@ int get_os_information(
case PRODUCT_HOME_PREMIUM_N:
safe_strcat(szSKU, "Home Premium N ");
break;
case PRODUCT_IOTENTERPRISE:
safe_strcat(szSKU, "IoT Enterprise ");
break;
case PRODUCT_IOTENTERPRISES:
safe_strcat(szSKU, "IoT Enterprise LTSC ");
break;
case PRODUCT_IOTUAP:
safe_strcat(szSKU, "Internet of Things ");
break;
Expand Down Expand Up @@ -657,6 +680,9 @@ int get_os_information(
case PRODUCT_ARM64_SERVER:
safe_strcat(szSKU, "ARM64 Server ");
break;
case PRODUCT_AZURESTACKHCI_SERVER_CORE:
safe_strcat(szSKU, "Azure Stack HCI ");
break;
case PRODUCT_CLOUD_HOST_INFRASTRUCTURE_SERVER:
safe_strcat(szSKU, "Cloud Host Infrastructure Server ");
break;
Expand All @@ -681,9 +707,15 @@ int get_os_information(
case PRODUCT_DATACENTER_SERVER:
safe_strcat(szSKU, "Datacenter ");
break;
case PRODUCT_DATACENTER_SERVER_AZURE_EDITION:
safe_strcat(szSKU, "Datacenter Azure ");
break;
case PRODUCT_DATACENTER_SERVER_CORE:
safe_strcat(szSKU, "Datacenter (core installation) ");
break;
case PRODUCT_DATACENTER_SERVER_CORE_AZURE_EDITION:
safe_strcat(szSKU, "Datacenter Azuure (core installation) ");
break;
case PRODUCT_DATACENTER_SERVER_CORE_V:
safe_strcat(szSKU, "Datacenter (core installation without Hyper-V) ");
break;
Expand Down
Loading