# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1299951762 0 # Node ID 67f2e890b9dfadb1006558265c33ce13c74a936e # Parent 5f8102bd764619cbbf426afa31df27bc5fad559b Added "Windows Vista" and "Windows 7" to the operating system names reported. diff -r 5f8102bd7646 -r 67f2e890b9df win/dw.c --- a/win/dw.c Sat Mar 12 16:46:22 2011 +0000 +++ b/win/dw.c Sat Mar 12 17:42:42 2011 +0000 @@ -9614,10 +9614,14 @@ if (dwVersion < 0x80000000) { - if(env->MajorVersion == 5 && env->MinorVersion == 1) + if(env->MajorVersion == 5 && env->MinorVersion == 0) + strcpy(env->osName, "Windows 2000"); + else if(env->MajorVersion == 5 && env->MinorVersion > 0) strcpy(env->osName, "Windows XP"); - else if(env->MajorVersion == 5 && env->MinorVersion == 0) - strcpy(env->osName, "Windows 2000"); + else if(env->MajorVersion == 6 && env->MinorVersion == 0) + strcpy(env->osName, "Windows Vista"); + else if(env->MajorVersion == 6 && env->MinorVersion > 0) + strcpy(env->osName, "Windows 7"); else strcpy(env->osName, "Windows NT");