Mercurial > dwindows
comparison win/dw.c @ 716:67f2e890b9df
Added "Windows Vista" and "Windows 7" to the operating system names reported.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sat, 12 Mar 2011 17:42:42 +0000 |
parents | 388f2a48aaae |
children | d26bfc4cd1f0 |
comparison
equal
deleted
inserted
replaced
715:5f8102bd7646 | 716:67f2e890b9df |
---|---|
9612 | 9612 |
9613 env->MinorBuild = 0; | 9613 env->MinorBuild = 0; |
9614 | 9614 |
9615 if (dwVersion < 0x80000000) | 9615 if (dwVersion < 0x80000000) |
9616 { | 9616 { |
9617 if(env->MajorVersion == 5 && env->MinorVersion == 1) | 9617 if(env->MajorVersion == 5 && env->MinorVersion == 0) |
9618 strcpy(env->osName, "Windows 2000"); | |
9619 else if(env->MajorVersion == 5 && env->MinorVersion > 0) | |
9618 strcpy(env->osName, "Windows XP"); | 9620 strcpy(env->osName, "Windows XP"); |
9619 else if(env->MajorVersion == 5 && env->MinorVersion == 0) | 9621 else if(env->MajorVersion == 6 && env->MinorVersion == 0) |
9620 strcpy(env->osName, "Windows 2000"); | 9622 strcpy(env->osName, "Windows Vista"); |
9623 else if(env->MajorVersion == 6 && env->MinorVersion > 0) | |
9624 strcpy(env->osName, "Windows 7"); | |
9621 else | 9625 else |
9622 strcpy(env->osName, "Windows NT"); | 9626 strcpy(env->osName, "Windows NT"); |
9623 | 9627 |
9624 env->MajorBuild = (DWORD)(HIWORD(dwVersion)); | 9628 env->MajorBuild = (DWORD)(HIWORD(dwVersion)); |
9625 } | 9629 } |