Changeset 108302 in vbox for trunk/src/VBox/Installer/win/VBoxMergeAppCA.wxi

Timestamp:

Feb 19, 2025 4:01:47 PM (2 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167646

Message:

Host installer/win: Run our custom driver installation code in deferred custom actions rather in immediate ones, as this otherwise can make trouble on Windows 11 and/or 10 if the UAC prompt is configured differently. This makes use of the code committed in r167628. bugref:10762

File:

• trunk/src/VBox/Installer/win/VBoxMergeAppCA.wxi (modified) (2 diffs)

trunk/src/VBox/Installer/win/VBoxMergeAppCA.wxi

@@ -26 +26 @@
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
-    <CustomAction Id="ca_VBoxSupDrvInst" DllEntry="DriverInstall" Execute="immediate" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
-    <CustomAction Id="ca_VBoxSupDrvInstArgInfFile" Property="VBoxDrvInstInfFile" Value="[#file_VBoxSup.inf]" Execute="immediate" />
-    <CustomAction Id="ca_VBoxSupDrvInstArgModel" Property="VBoxDrvInstModel" Value="VBoxSup" Execute="immediate" />
-    <CustomAction Id="ca_VBoxSupDrvInstArgFlagForce" Property="VBoxDrvInstFlagForce" Value="1" Execute="immediate" />
-    <CustomAction Id="ca_VBoxSupDrvInstArgFlagSilent" Property="VBoxDrvInstFlagSilent" Value="1" Execute="immediate" />
+    <CustomAction Id="ca_VBoxSupDrvInstParms" Property="ca_VBoxSupDrvInst" Value="VBoxDrvInstInfFile=[#file_VBoxSup.inf]##VBoxDrvInstModel=VBoxSup##VBoxDrvInstFlagForce=1##VBoxDrvInstFlagSilent=1" Execute="immediate" />
+    <CustomAction Id="ca_VBoxSupDrvInst" DllEntry="DriverInstall" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
 
-    <CustomAction Id="ca_VBoxSupDrvStart" DllEntry="ServiceControl" Execute="immediate" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
-    <CustomAction Id="ca_VBoxSupDrvStartArgName" Property="VBoxSvcCtlName" Value="VBoxSUP" Execute="immediate" />
-    <CustomAction Id="ca_VBoxSupDrvStartArgFn" Property="VBoxSvcCtlFn" Value="start" Execute="immediate" />
+    <CustomAction Id="ca_VBoxSupDrvStartParms" Property="ca_VBoxSupDrvStart" Value="VBoxSvcCtlName=VBoxSUP##VBoxSvcCtlFn=start" Execute="immediate" />
+    <CustomAction Id="ca_VBoxSupDrvStart" DllEntry="ServiceControl" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
 
-    <CustomAction Id="ca_VBoxSupDrvUninst" DllEntry="DriverUninstall" Execute="immediate" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
-    <CustomAction Id="ca_VBoxSupDrvUninstArgModel" Property="VBoxDrvUninstModel" Value="VBoxSup*" Execute="immediate" />
+    <CustomAction Id="ca_VBoxSupDrvUninstParms" Property="ca_VBoxSupDrvUninst" Value="VBoxDrvUninstModel=VBoxSUP*" Execute="immediate" />
+    <CustomAction Id="ca_VBoxSupDrvUninst" DllEntry="DriverUninstall" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
 
     <CustomAction Id="ca_GetPlatformArchitecture" DllEntry="GetPlatformArchitecture" Execute="immediate" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
@@ -51 +47 @@
     <CustomAction Id="ca_CheckTargetDirPost" DllEntry="CheckTargetDir" Execute="immediate" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
 </Include>
-