nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove InfInstaller Agg dependencies, prevent ShellExecute on launch

Browse source 
- Fixes failure to launch InfInstaller/pnputil from InnoSetup
This commit is contained in:
John Lewin 2017-01-12 16:47:28 -08:00
parent 0b52b051a1
commit 353c001566
2 changed files with 4 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
PrinterDriverInstaller/InfInstaller.cs
View file

@ -1,5 +1,4 @@
using MatterHackers.Agg;
using System;
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
@ -25,7 +24,7 @@ namespace MatterHackers.InfInstaller
{
Process driverInstallerProcess = new Process();
driverInstallerProcess.StartInfo.Arguments = "-a {0}".FormatWith(Path.GetFullPath(pathAndDriverToInstall));
driverInstallerProcess.StartInfo.Arguments = string.Format("-a \"{0}\"", Path.GetFullPath(pathAndDriverToInstall));
driverInstallerProcess.StartInfo.CreateNoWindow = true;
driverInstallerProcess.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
@ -48,10 +47,9 @@ namespace MatterHackers.InfInstaller
driverInstallerProcess.StartInfo.FileName = pnPUtilPathAndFileName;
driverInstallerProcess.StartInfo.Verb = "runas";
driverInstallerProcess.StartInfo.UseShellExecute = true;
driverInstallerProcess.StartInfo.UseShellExecute = false;
driverInstallerProcess.Start();
driverInstallerProcess.WaitForExit();
if (!fileExists)

28
PrinterDriverInstaller/InfInstaller.csproj
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -141,32 +141,6 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Submodules\agg-sharp\Gui\Gui.csproj">
<Project>{74F6BB6C-9D02-4512-A59A-21940E35C532}</Project>
<Name>Gui</Name>
</ProjectReference>
<ProjectReference Include="..\Submodules\agg-sharp\Tesselate\Tesselate.csproj">
<Project>{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9}</Project>
<Name>Tesselate</Name>
</ProjectReference>
<ProjectReference Include="..\Submodules\agg-sharp\VectorMath\VectorMath.csproj">
<Project>{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD}</Project>
<Name>VectorMath</Name>
</ProjectReference>
<ProjectReference Include="..\Submodules\agg-sharp\Csg\Csg.csproj">
<Project>{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}</Project>
<Name>Csg</Name>
</ProjectReference>
<ProjectReference Include="..\Submodules\agg-sharp\agg\Agg.csproj">
<Project>{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}</Project>
<Name>Agg</Name>
</ProjectReference>
<ProjectReference Include="..\Submodules\agg-sharp\PolygonMesh\PolygonMesh.csproj">
<Project>{86F6AAF2-9B50-40B8-A427-1897D76471C5}</Project>
<Name>PolygonMesh</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="InfInstaller.cs" />
</ItemGroup>