Skip to content

Commit 2eaa998

Browse files
committed
UWP/MSVC: Small Tweaks
- Detect if the OS is Windows Server 2025 - Identify if the compiler was msvc2026 on the menu
1 parent 4696e5e commit 2eaa998

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

frontend/drivers/platform_uwp.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,6 @@ static size_t frontend_uwp_get_os(char *s, size_t len, int *major, int *minor)
6868
case PROCESSOR_ARCHITECTURE_AMD64:
6969
arch = "x64";
7070
break;
71-
case PROCESSOR_ARCHITECTURE_INTEL:
72-
arch = "x86";
73-
break;
74-
case PROCESSOR_ARCHITECTURE_ARM:
75-
arch = "ARM";
76-
break;
7771
case PROCESSOR_ARCHITECTURE_ARM64:
7872
arch = "ARM64";
7973
break;
@@ -98,8 +92,10 @@ static size_t frontend_uwp_get_os(char *s, size_t len, int *major, int *minor)
9892
_len = strlcpy(s, "Windows Server 2016", len);
9993
else if ((vi.dwBuildNumber >= 17763) && (vi.dwBuildNumber < 20348))
10094
_len = strlcpy(s, "Windows Server 2019", len);
101-
else if (vi.dwBuildNumber >= 20348)
95+
else if ((vi.dwBuildNumber >= 20348) && (vi.dwBuildNumber < 26100))
10296
_len = strlcpy(s, "Windows Server 2022", len);
97+
else if (vi.dwBuildNumber >= 26100)
98+
_len = strlcpy(s, "Windows Server 2025", len);
10399
}
104100
else
105101
{
@@ -181,10 +177,6 @@ enum frontend_architecture frontend_uwp_get_arch(void)
181177
{
182178
case PROCESSOR_ARCHITECTURE_AMD64:
183179
return FRONTEND_ARCH_X86_64;
184-
case PROCESSOR_ARCHITECTURE_INTEL:
185-
return FRONTEND_ARCH_X86;
186-
case PROCESSOR_ARCHITECTURE_ARM:
187-
return FRONTEND_ARCH_ARM;
188180
case PROCESSOR_ARCHITECTURE_ARM64:
189181
return FRONTEND_ARCH_ARMV8;
190182
default:

menu/menu_driver.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4471,8 +4471,10 @@ static const char * msvc_vercode_to_str(const unsigned vercode)
44714471
return " msvc2017";
44724472
else if (vercode >= 1920 && vercode < 1930)
44734473
return " msvc2019";
4474-
else if (vercode >= 1930)
4474+
else if (vercode >= 1930 && vercode < 1950)
44754475
return " msvc2022";
4476+
else if (vercode >= 1950)
4477+
return " msvc2026";
44764478
break;
44774479
}
44784480

0 commit comments

Comments
 (0)