From 32d73bce4863703da73c6e16224746411bd1faf8 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Wed, 10 Mar 2004 00:55:28 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=3053 --- checkin_notes | 6 ++++++ client/win/hostinfo_win.cpp | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/checkin_notes b/checkin_notes index 645006db46..aa66424f6e 100755 --- a/checkin_notes +++ b/checkin_notes @@ -10421,3 +10421,9 @@ Rom Mar 9 2004 project.inc html/user info.php + +Rom Mar 9 2004 + - Windows Product SKU was being over-written if the person was running with Service Pack 6a. + + client/win/ + hostinfo_win.cpp diff --git a/client/win/hostinfo_win.cpp b/client/win/hostinfo_win.cpp index 87659d4e89..86e32ac48b 100755 --- a/client/win/hostinfo_win.cpp +++ b/client/win/hostinfo_win.cpp @@ -158,8 +158,7 @@ int get_host_info(HOST_INFO& host) { // Display service pack (if any) and build number. - if( osvi.dwMajorVersion == 4 && - lstrcmpi( osvi.szCSDVersion, "Service Pack 6" ) == 0 ) + if( osvi.dwMajorVersion == 4 && lstrcmpi( osvi.szCSDVersion, "Service Pack 6" ) == 0 ) { HKEY hKey; LONG lRet; @@ -169,7 +168,11 @@ int get_host_info(HOST_INFO& host) { "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Hotfix\\Q246009", 0, KEY_QUERY_VALUE, &hKey ); if( lRet == ERROR_SUCCESS ) - sprintf( host.os_name, "Service Pack 6a (Build %d)", osvi.dwBuildNumber & 0xFFFF ); + { + sprintf( host.os_name, "%sService Pack 6a (Build %d)", + host.os_name, + osvi.dwBuildNumber & 0xFFFF ); + } else // Windows NT 4.0 prior to SP6a { if ( strlen(osvi.szCSDVersion) > 0 )