[Slim-Checkins] r33876 - in /7.7/trunk/server/Slim/Utils: OS/Win32.pm ServiceManager/Win32.pm

Author: mherger
Date: Wed Mar  7 05:50:36 2012
New Revision: 33876

URL: http://svn.slimdevices.com/slim?rev=33876&view=rev
Log:
Bug: 17848
Description: we need to check the Windows version more precisely. Only Vista allows to automatically run as admin (asking for credentials). On Windows 7 we must show a hint about the need to run the control panel as an admin user instead.

Modified:
    7.7/trunk/server/Slim/Utils/OS/Win32.pm
    7.7/trunk/server/Slim/Utils/ServiceManager/Win32.pm

Modified: 7.7/trunk/server/Slim/Utils/OS/Win32.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Utils/OS/Win32.pm?rev=33876&r1=33875&r2=33876&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Utils/OS/Win32.pm (original)
+++ 7.7/trunk/server/Slim/Utils/OS/Win32.pm Wed Mar  7 05:50:36 2012
@@ -60,9 +60,10 @@
 		$class->{osDetails}->{'isWHS'} = 1;
 	}
 	
-	# bug 14590 - what we're really interested in is whether we're running on Vista or later
-	# leaving isVista in in case somebody was using it
+	# This covers Vista or later
 	$class->{osDetails}->{'isWin6+'} = ($major >= 6);
+	
+	# some features are Vista only, no longer supported in Windows 7
 	$class->{osDetails}->{isVista}   = 1 if $class->{osDetails}->{'osName'} =~ /Vista/;
 
 	# let's clean up our temporary folders (pdk* folders)

Modified: 7.7/trunk/server/Slim/Utils/ServiceManager/Win32.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Utils/ServiceManager/Win32.pm?rev=33876&r1=33875&r2=33876&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Utils/ServiceManager/Win32.pm (original)
+++ 7.7/trunk/server/Slim/Utils/ServiceManager/Win32.pm Wed Mar  7 05:50:36 2012
@@ -52,7 +52,7 @@
 sub canSetStartupType {
 
 	# on Vista+ we can elevate privileges	
-	if ($os->get('isWin6+')) {
+	if ($os->get('isVista')) {
 		return 1;
 	}
 	
@@ -68,7 +68,7 @@
 sub getStartupOptions {
 	my $class = shift;
 	
-	if (!$os->get('isWin6+') && !Win32::IsAdminUser()) {
+	if (!$os->get('isVista') && !Win32::IsAdminUser()) {
 		return ('CONTROLPANEL_NEED_ADMINISTRATOR', 'RUN_NEVER', 'RUN_AT_LOGIN');
 	}