[Commits] Rev 2928: MWL#55 : Address more comments from Philip's MSI Installer review in file:///H:/bzr/5.2-windows-packaging/

Vladislav Vaintroub wlad at montyprogram.com
Tue Jan 18 18:25:03 EET 2011


At file:///H:/bzr/5.2-windows-packaging/

------------------------------------------------------------
revno: 2928
revision-id: wlad at montyprogram.com-20110118162502-twiq3v11p3bpxgqb
parent: wlad at montyprogram.com-20110118123435-e65hp3uyuo7iozjf
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: 5.2-windows-packaging
timestamp: Tue 2011-01-18 17:25:02 +0100
message:
  MWL#55 : Address more comments from Philip's MSI Installer review
  - CleanupDataCheckBox  checkbox  has "Remove default database instance"  text attribute
  rather (no more 2 different elements)
  - Skip port validation if skipnetworking is set
-------------- next part --------------
=== modified file 'win/packaging/ca/CustomAction.cpp'
--- a/win/packaging/ca/CustomAction.cpp	2011-01-18 12:34:35 +0000
+++ b/win/packaging/ca/CustomAction.cpp	2011-01-18 16:25:02 +0000
@@ -423,6 +423,7 @@
 extern "C" UINT  __stdcall CheckDatabaseProperties (MSIHANDLE hInstall) 
 {
   wchar_t ServiceName[MAX_PATH]={0};
+  wchar_t SkipNetworking[MAX_PATH]={0};
   wchar_t Port[6];
   DWORD PortLen=6;
   bool haveInvalidPort=false;
@@ -455,9 +456,12 @@
     }
   }
 
+  DWORD SkipNetworkingLen= MAX_PATH;
+
+  MsiGetPropertyW(hInstall, L"SKIPNETWORKING", SkipNetworking, &SkipNetworkingLen);
   MsiGetPropertyW(hInstall, L"PORT", Port, &PortLen);
   
-  if(Port[0])
+  if(SkipNetworking[0]==0 && Port[0] != 0)
   {
     /* Strip spaces */
     for(DWORD i=PortLen-1; i > 0; i--)

=== modified file 'win/packaging/extra.wxs.in'
--- a/win/packaging/extra.wxs.in	2011-01-17 20:20:58 +0000
+++ b/win/packaging/extra.wxs.in	2011-01-18 16:25:02 +0000
@@ -40,10 +40,8 @@
 
       <!-- Dialog on uninstall of the database -->
       <Dialog Id="ConfirmDataCleanupDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
-        <Control Id="CleanupDataCheckBox" Type="CheckBox" X="20" Y="100" Height="15" Property="CLEANUPDATA" Width="15" CheckBoxValue="1"/>
-        <Control Id="RemoveDataText" Type="Text" X="37" Y="101" Width="300" Height="100" TabSkip="no">
-          <Text>Remove default database directory '[DATADIR]'</Text>
-        </Control>
+        <Control Id="CleanupDataCheckBox" Type="CheckBox" X="20" Y="100" Height="30" Property="CLEANUPDATA" Width="300" CheckBoxValue="1"
+                Text="{\Font1}Remove default database directory &#xD;&#xA;'[DATADIR]'"/>
 
         <!-- Navigation buttons-->
         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back">
@@ -185,7 +183,7 @@
           <Publish Property="SKIPNETWORKING">EnableNetworking</Publish>
         </Control>
         <Control Id="LabelTCPPort" Type="Text" Height="17" Width="75" X="25" Y="142" Text="TCP port:" />
-        <Control Id="Port" Type="MaskedEdit" X="104" Y="140" Width="28" Height="15" Property="PORT" Sunken="yes" Text="[PortTemplate]">
+        <Control Id="Port" Type="MaskedEdit" X="104" Y="140" Width="28" Height="15" Property="PORT"  Sunken="yes" Text="[PortTemplate]">
           <Condition Action="enable" >EnableNetworking</Condition>
           <Condition Action="disable">Not EnableNetworking</Condition>
         </Control>
@@ -292,7 +290,7 @@
         <RegistryValue Root='HKLM'
            Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
            Name='SERVICENAME' Value='[SERVICENAME]' Type='string' KeyPath='yes'/>
-        <ServiceControl Id='DBInstanceServiceStop' Name='[SERVICENAME]'  Stop='uninstall' Remove='uninstall' Wait='yes'/>
+        <ServiceControl Id='DBInstanceServiceStop' Name='[SERVICENAME]'  Stop='both' Remove='uninstall' Wait='yes'/>
         <ServiceControl Id='DBInstanceServiceStart' Name='[SERVICENAME]' Start='install' Wait='yes'/>
       </Component>
 



More information about the commits mailing list