From 46646926c1da2fadfa756fd7c4d68602d14c0edb Mon Sep 17 00:00:00 2001
From: Shauleiz <shaul.eiz@gmail.com>
Date: Sun, 30 Oct 2016 21:37:28 +0200
Subject: [PATCH] Improving code quality

Clean-up of installation script
---
 .../common/vJoyInterface/vJoyInterface2012.vcxproj |  8 ++++----
 install/vJoyInstallerSigned.iss                    | 14 +-------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/apps/common/vJoyInterface/vJoyInterface2012.vcxproj b/apps/common/vJoyInterface/vJoyInterface2012.vcxproj
index 09d2879..1802dee 100644
--- a/apps/common/vJoyInterface/vJoyInterface2012.vcxproj
+++ b/apps/common/vJoyInterface/vJoyInterface2012.vcxproj
@@ -251,7 +251,7 @@
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);$(LOCALAPPDATA)\Atlassian\SourceTree\git_local\bin\</ExecutablePath>
     <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
     <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">
@@ -288,7 +288,7 @@
     <ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);$(LOCALAPPDATA)\Atlassian\SourceTree\git_local\bin\</ExecutablePath>
     <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
     <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">
     <IncludePath>.;$(SolutionDir)..\..\..\inc;$(IncludePath)</IncludePath>
@@ -456,7 +456,7 @@
       <PrecompiledHeader>Create</PrecompiledHeader>
       <PreprocessorDefinitions>VJOYINTERFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <EnablePREfast>true</EnablePREfast>
+      <EnablePREfast>false</EnablePREfast>
       <OmitFramePointers>true</OmitFramePointers>
     </ClCompile>
     <Link>
@@ -624,7 +624,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
-      <EnablePREfast>true</EnablePREfast>
+      <EnablePREfast>false</EnablePREfast>
       <OmitFramePointers>
       </OmitFramePointers>
     </ClCompile>
diff --git a/install/vJoyInstallerSigned.iss b/install/vJoyInstallerSigned.iss
index 0fd2991..25ee53b 100644
--- a/install/vJoyInstallerSigned.iss
+++ b/install/vJoyInstallerSigned.iss
@@ -187,7 +187,6 @@ const
 var
 		SkipToPh2: 		boolean; (* True is installer resumes installation after Set Test mode & restart*)
 		OrigTestMode:	Boolean; (* Value of the original Test Mode *)
-		CalledBySpp:	Boolean; (* True is installer called by SPP Installer *)
 		DldRestart:		Boolean; (* True if delayed restart requested *)
 
 (* Forward Function declarations - Start *)
@@ -236,8 +235,6 @@ var
   Len: Longint;
   Res: Boolean;
   Names: TArrayOfString;
-  I: Integer;
-  S: String;
 
 begin
   // Get the first subkey under 'HIDCLASS' - expected values are 0000 or 0001
@@ -365,9 +362,6 @@ end;
 // If in VerySilent mode - dialog box supressed and message is sent to log file
 function vJoyMsgBox(const Text: String; const Typ: TMsgBoxType; const Buttons: Integer): Integer;
 
-var 
-  MsgBoxReturned: Integer;
-
 begin
   Result :=  IDOK;
   if  not IsVerySilent then
@@ -511,10 +505,6 @@ end;
 (* Pre & Post-install operations *)
 procedure CurStepChanged(CurStep: TSetupStep);
 
-var
-  TmpFileName, ExecStdout, msg: string;
-  ResultCode: Integer;
-
 begin
 //	if  CurStep=ssInstall then
 //		MsgBox('CurStepChanged(ssInstall)' , mbInformation, MB_OK);	
@@ -569,8 +559,6 @@ end;
 *)
 
 function PrepareToInstall(var NeedsRestart: Boolean): String;
-var
-  RunOnceData: String;
   
 begin
 // Default
@@ -947,7 +935,7 @@ end;
 // Returns TRUE if need to restart
 function Exec_vJoyInstall(): Boolean;
 var
-  TmpFileName, ExecStdout, msg: string;
+  TmpFileName, msg: string;
   ResultCode: Integer;
   
   Begin