Changeset 2d69ab6 in nscp for helpers

Timestamp:

03/26/11 21:10:52 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

c391984

Parents:

7443b58

Message:

Added ability to rename service (automagically so you can run 0.4.x and 0.3.x side by side)

Location:

helpers

Files:

• installer-dlls/main_dll/main_dll.cpp (modified) (10 diffs)
• installers/installer/Product.wxs (modified) (2 diffs)

helpers/installer-dlls/main_dll/main_dll.cpp

@@ -13 +13 @@
 
 LPCWSTR vcsServiceQuery =
-L"SELECT `ShortName`, `LongName`, `Description`, `Program`, `Attributes`, `Component_` FROM `Services`";
-enum eServiceQuery { feqShortName = 1, feqLongName, feqDesc, feqProgram, feqAttributes, feqComponent };
+L"SELECT `ShortName`, `LongName`, `Description`, `Program`, `Dependencies`, `Attributes`, `Component_` FROM `Services`";
+enum eServiceQuery { feqShortName = 1, feqLongName, feqDesc, feqProgram, feqDeps, feqAttributes, feqComponent };
 enum eFirewallExceptionAttributes { feaIgnoreFailures = 1 };
 
-bool install(msi_helper &h, std::wstring exe, std::wstring service_short_name, std::wstring service_long_name, std::wstring service_description);
+bool install(msi_helper &h, std::wstring exe, std::wstring service_short_name, std::wstring service_long_name, std::wstring service_description, std::wstring service_deps);
 bool uninstall(msi_helper &h, std::wstring service_name);
 UINT SchedServiceMgmt(__in MSIHANDLE hInstall, msi_helper::WCA_TODO todoSched);
@@ -53 +53 @@
       std::wstring longname = data.get_next_string();
       std::wstring desc = data.get_next_string();
+      std::wstring deps = data.get_next_string();
       int attr = data.get_next_int();
       BOOL fIgnoreFailures = feaIgnoreFailures == (attr & feaIgnoreFailures);
@@ -60 +61 @@
       case msi_helper::WCA_TODO_REINSTALL:
         h.logMessage(_T("Installing service install: ") + shortname + _T(", ") + file);
-        install(h, file, shortname, longname, desc);
+        install(h, file, shortname, longname, desc, deps);
         break;
 
@@ -109 +110 @@
       std::wstring longname = h.get_record_formatted_string(hRec, feqLongName);
       std::wstring desc = h.get_record_formatted_string(hRec, feqDesc);
+      std::wstring deps = h.get_record_formatted_string(hRec, feqDeps);
       std::wstring program = h.get_record_formatted_string(hRec, feqProgram);
       int attributes = h.get_record_integer(hRec, feqAttributes);
@@ -127 +129 @@
       custom_data.write_string(longname);
       custom_data.write_string(desc);
+      custom_data.write_string(deps);
       custom_data.write_int(attributes);
       //custom_data.write_int(fetApplication);
@@ -274 +277 @@
 
 
-bool install(msi_helper &h, std::wstring exe, std::wstring service_short_name, std::wstring service_long_name, std::wstring service_description) {
+bool install(msi_helper &h, std::wstring exe, std::wstring service_short_name, std::wstring service_long_name, std::wstring service_desc, std::wstring service_deps) {
   h.updateProgress(_T("Preparing to install service"), service_short_name);
   try {
@@ -286 +289 @@
     }
     h.updateProgress(_T("Installing service"), service_short_name);
-    serviceControll::Install(service_short_name, service_long_name, SZDEPENDENCIES, SERVICE_WIN32_OWN_PROCESS, exe);
+    serviceControll::Install(service_short_name, service_long_name, service_deps, SERVICE_WIN32_OWN_PROCESS, exe);
   } catch (const serviceControll::SCException& e) {
     h.errorMessage(_T("Failed to install service: ") + e.error_);
@@ -292 +295 @@
   }
   try {
-    serviceControll::SetDescription(service_short_name, service_description);
+    serviceControll::SetDescription(service_short_name, service_desc);
   } catch (const serviceControll::SCException& e) {
     h.errorMessage(_T("Failed to set description of service: ") + e.error_);
@@ -453 +456 @@
 
 
-bool start(msi_helper &h, std::wstring service_name = _T("")) {
-  if (service_name.empty())
-    service_name = SZSERVICENAME;
+bool start(msi_helper &h, std::wstring service_name) {
   if (!serviceControll::isInstalled(service_name)) {
     h.logMessage(_T("Service was not installed (so we cannot start it): ")+ service_name);
@@ -474 +475 @@
 }
 
-bool stop(msi_helper &h, std::wstring service_name = _T("")) {
-  if (service_name.empty())
-    service_name = SZSERVICENAME;
+bool stop(msi_helper &h, std::wstring service_name) {
   h.updateProgress(_T("Preparing to stopp service"), service_name);
   try {

helpers/installers/installer/Product.wxs

@@ -266 +266 @@
       <Column Id="Program"  Category="Formatted"  PrimaryKey="no"   Type="string" Width="255" Modularize="Property" Nullable="yes"
           Description="Exception for a program (formatted path name)."/>
+      <Column Id="Dependencies" Category="Formatted"  PrimaryKey="no"   Type="string" Width="255" Modularize="Property" Nullable="yes"
+          Description="Service Dependencies"/>
       <Column Id="Attributes" Category="Integer"    PrimaryKey="no"   Type="int"    Width="4"             Nullable="yes" MinValue="0" MaxValue="65536" 
           Description="Vital=1"/>
@@ -277 +279 @@
         <Data Column="Component_">ServiceRegistration</Data>
         <Data Column="Program">[#NSClientEXE]</Data>
+        <Data Column="Dependencies"></Data>
       </Row>
     </CustomTable>