Merge branch '#77-DisableCardReaderInstallIfSmartCardServiceIsDisabled' into Release0.2

This commit is contained in:
chris.watts90@outlook.com 2019-03-29 09:19:37 +00:00
commit e97b0217ce

View File

@ -30,8 +30,18 @@
<Component Id="SmartCardServiceConfig" Guid="{73D2E31D-F256-457C-AFD5-EC456CDAD7E8}" KeyPath="yes"> <Component Id="SmartCardServiceConfig" Guid="{73D2E31D-F256-457C-AFD5-EC456CDAD7E8}" KeyPath="yes">
<ServiceControl Id="SmartCardServiceStarter" <ServiceControl Id="SmartCardServiceStarter"
Start="install" Start="install"
Stop="install"
Name="SCardSvr" Name="SCardSvr"
Wait="yes" /> Wait="yes" />
<ServiceConfig Id="SmartCardServiceSetToAuto"
DelayedAutoStart="0" OnInstall="yes" ServiceName="SCardSvr"/>
</Component>
<Component Id="SCardAutoStart" Permanent="yes" KeyPath="yes" Guid="{75582D3C-C985-4BC9-A0A8-621A52C7E95E}">
<RegistryKey Root="HKLM"
Key="SYSTEM\CurrentControlSet\Services\SCardSvr"
Action="create">
<RegistryValue Type="integer" Name="Start" Value="2"/>
</RegistryKey>
</Component> </Component>
<Component Id="CardReaderServiceExe" Guid="{24C9D834-21E2-476D-8302-EF35730D0BA8}"> <Component Id="CardReaderServiceExe" Guid="{24C9D834-21E2-476D-8302-EF35730D0BA8}">
<File Id="CardReaderService.exe" <File Id="CardReaderService.exe"
@ -61,6 +71,7 @@
ThirdFailureActionType="restart" ThirdFailureActionType="restart"
ResetPeriodInDays="1" ResetPeriodInDays="1"
RestartServiceDelayInSeconds="10" /> RestartServiceDelayInSeconds="10" />
<ServiceDependency Id="SCardSvr" Group="no"/>
</ServiceInstall> </ServiceInstall>
</Component> </Component>
<Component Id="CardReaderServiceExeConfig" Guid="{E20D23BC-C8E7-49F8-962C-DE856A84258E}"> <Component Id="CardReaderServiceExeConfig" Guid="{E20D23BC-C8E7-49F8-962C-DE856A84258E}">