We can re-use the already existing EG(windows_version_info) here and save a little...

diff --git a/ext/standard/info.c b/ext/standard/info.c
index e4447bec17a743e519c8b76ef1c62e75d4677656..9490aae7d615748bded2fb62492bdae5ce48abaa 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -291,21 +291,14 @@ PHPAPI zend_string *php_info_html_esc(char *string)
 
 char* php_get_windows_name()
 {
-       OSVERSIONINFOEX osvi;
+       OSVERSIONINFOEX osvi = EG(windows_version_info);
        SYSTEM_INFO si;
        PGNSI pGNSI;
        PGPI pGPI;
-       BOOL bOsVersionInfoEx;
        DWORD dwType;
        char *major = NULL, *sub = NULL, *retval;
 
        ZeroMemory(&si, sizeof(SYSTEM_INFO));
-       ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
-       osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-
-       if (!(bOsVersionInfoEx = GetVersionEx ((OSVERSIONINFO *) &osvi))) {
-               return NULL;
-       }
 
        pGNSI = (PGNSI) GetProcAddress(GetModuleHandle("kernel32.dll"), "GetNativeSystemInfo");
        if(NULL != pGNSI) {