From 8c7edffec02ba9484b0325a48ed3af09a5c0fbe0 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Sun, 26 Jul 2009 01:33:33 +0000
Subject: [PATCH]     - MGR: Refine todays checkin with support for the BOINC  
       Service Control utility, don't use the runas verb on systems        
 older than Vista.

    clientlib/win/
        Service.cpp

svn path=/trunk/boinc/; revision=18735
---
 checkin_notes             | 19 +++++++++++++++++++
 clientlib/win/Service.cpp |  8 ++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index b29b25a13c..97518cf6b7 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6532,3 +6532,22 @@ Rom    25 July 2009
 
     clientlib/win/
         Service.cpp
+<<<<<<< .working
+=======
+
+Rom    25 July 2009
+    - Tag for 6.8.11 release, all platforms
+      boinc_core_release_6_8_11
+
+    /
+        configure.ac
+        version.h
+
+Rom    25 July 2009
+    - MGR: Refine todays checkin with support for the BOINC
+        Service Control utility, don't use the runas verb on systems
+        older than Vista.
+
+    clientlib/win/
+        Service.cpp
+>>>>>>> .merge-right.r18732
diff --git a/clientlib/win/Service.cpp b/clientlib/win/Service.cpp
index 8403e3b213..5fa582c8ed 100644
--- a/clientlib/win/Service.cpp
+++ b/clientlib/win/Service.cpp
@@ -257,7 +257,9 @@ EXTERN_C __declspec(dllexport) BOOL StartBOINCService()
     shex.cbSize        = sizeof( SHELLEXECUTEINFO );
     shex.fMask         = SEE_MASK_NOCLOSEPROCESS;
     shex.hwnd          = NULL;
-    shex.lpVerb        = _T("runas");
+    if ((LOBYTE(LOWORD(GetVersion()))) >= 6) {
+        shex.lpVerb        = _T("runas");
+    }
     shex.lpFile        = (LPCTSTR)&szExe;
     shex.lpParameters  = _T("--start");
     shex.lpDirectory   = (LPCTSTR)&szPath;
@@ -352,7 +354,9 @@ EXTERN_C __declspec(dllexport) BOOL StopBOINCService()
     shex.cbSize        = sizeof( SHELLEXECUTEINFO );
     shex.fMask         = SEE_MASK_NOCLOSEPROCESS;
     shex.hwnd          = NULL;
-    shex.lpVerb        = _T("runas");
+    if ((LOBYTE(LOWORD(GetVersion()))) >= 6) {
+        shex.lpVerb        = _T("runas");
+    }
     shex.lpFile        = (LPCTSTR)&szExe;
     shex.lpParameters  = _T("--stop");
     shex.lpDirectory   = (LPCTSTR)&szPath;