Skip to content
This repository was archived by the owner on May 16, 2024. It is now read-only.

Commit 0d838db

Browse files
metsmaiannaska
authored andcommitted
Add option to disable minidriver registration (#41)
IB-5141 Signed-off-by: Raul Metsma <[email protected]>
1 parent 8c7f3a5 commit 0d838db

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

minidriver.wxs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"A newer version of [ProductName] is already installed. If you are trying to downgrade, please uninstall the newer version first."/>
1616
<UIRef Id="WixUI_Minimal"/>
1717

18+
<Property Id="INSTALL_DRIVER" Value="1"/>
1819
<Property Id="SCPNPENTRY">
1920
<RegistrySearch Id="ScPnP" Root="HKLM" Key="SOFTWARE\Policies\Microsoft\Windows\ScPnP" Name="EnableScPnP" Type="raw"/>
2021
</Property>
@@ -88,14 +89,11 @@
8889
<Custom Action="EnableScSrv" Before="StartServices">NOT Installed</Custom>
8990
</InstallExecuteSequence>
9091

91-
<?if $(var.Platform) = "x64" ?>
92-
<!-- Force install on X64 Windows. "on demand" install smartcard driver does not work on Terminals. X32 has side effects with WIX burn -->
9392
<CustomAction Id="InstallMinidriver" Directory="APPLICATIONFOLDER" Execute="deferred" Impersonate="no" HideTarget="yes" Return="ignore"
9493
ExeCommand="rundll32 syssetup,SetupInfObjectInstallAction DefaultInstall 128 [APPLICATIONFOLDER]\\esteidcm.inf" />
9594
<InstallExecuteSequence>
96-
<Custom Action="InstallMinidriver" After="InstallFiles">NOT Installed</Custom>
95+
<Custom Action="InstallMinidriver" After="InstallFiles">NOT Installed AND INSTALL_DRIVER = 1</Custom>
9796
</InstallExecuteSequence>
98-
<?endif ?>
9997

10098
<Feature Id="minidriver" Title="Estonian Minidriver">
10199
<ComponentRef Id="miniDriverPreW10"/>

0 commit comments

Comments
 (0)