archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Reuse EG(windows_version_info) in php_get_uname() (GH-17558)

Browse source 
There is no need to retrieve the Windows OS version information again,
since it is already available via `EG(windows_version_info)`.
This commit is contained in:
Christoph M. Becker 2025-02-01 11:23:53 +01:00 • committed by GitHub
parent 3955b01653
commit 64830b9b3d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/standard/info.c
View file

@ -659,10 +659,10 @@ PHPAPI zend_string *php_get_uname(char mode)
ZEND_ASSERT(php_is_valid_uname_mode(mode)); ZEND_ASSERT(php_is_valid_uname_mode(mode));
#ifdef PHP_WIN32 #ifdef PHP_WIN32
char tmp_uname[256]; char tmp_uname[256];
DWORD dwBuild=0; OSVERSIONINFOEX osvi = EG(windows_version_info);
DWORD dwVersion = GetVersion(); DWORD dwWindowsMajorVersion = osvi.dwMajorVersion;
DWORD dwWindowsMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion))); DWORD dwWindowsMinorVersion = osvi.dwMinorVersion;
DWORD dwWindowsMinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion))); DWORD dwBuild = osvi.dwBuildNumber;
DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1; DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1;
char ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; char ComputerName[MAX_COMPUTERNAME_LENGTH + 1];
@ -676,7 +676,6 @@ PHPAPI zend_string *php_get_uname(char mode)
php_uname = ComputerName; php_uname = ComputerName;
} else if (mode == 'v') { } else if (mode == 'v') {
char *winver = php_get_windows_name(); char *winver = php_get_windows_name();
dwBuild = (DWORD)(HIWORD(dwVersion));
ZEND_ASSERT(winver != NULL); ZEND_ASSERT(winver != NULL);
@ -693,7 +692,6 @@ PHPAPI zend_string *php_get_uname(char mode)
ZEND_ASSERT(winver != NULL); ZEND_ASSERT(winver != NULL);
php_get_windows_cpu(wincpu, sizeof(wincpu)); php_get_windows_cpu(wincpu, sizeof(wincpu));
dwBuild = (DWORD)(HIWORD(dwVersion));
/* Windows "version" 6.2 could be Windows 8/Windows Server 2012, but also Windows 8.1/Windows Server 2012 R2 */ /* Windows "version" 6.2 could be Windows 8/Windows Server 2012, but also Windows 8.1/Windows Server 2012 R2 */
if (dwWindowsMajorVersion == 6 && dwWindowsMinorVersion == 2) { if (dwWindowsMajorVersion == 6 && dwWindowsMinorVersion == 2) {