Check multiple files

Author: Timocop

PSMSVirtualDeviceManager/Classes/ClassCameraFirmwareWatchdog.vb

@@ -118,11 +118,25 @@
         End SyncLock
     End Sub
 
-    Public Sub RunFirmwareUploader()
+    Public Function GetFirmwareInstallerPath() As String
         Dim sRootFolder As String = IO.Path.Combine(IO.Path.GetDirectoryName(Application.ExecutablePath), ClassLibusbDriver.DRV_PS4CAM_ROOT_NAME)
         Dim sInstallerPath As String = IO.Path.Combine(sRootFolder, ClassLibusbDriver.DRV_PS4CAM_FIRMWARE_NAME)
+
+        Return sInstallerPath
+    End Function
+
+    Public Function GetFirmwarePath() As String
+        Dim sRootFolder As String = IO.Path.Combine(IO.Path.GetDirectoryName(Application.ExecutablePath), ClassLibusbDriver.DRV_PS4CAM_ROOT_NAME)
         Dim sFirmwarePath As String = IO.Path.Combine(sRootFolder, ClassLibusbDriver.DRV_PS4CAM_FIRMWARE_BIN_NAME)
 
+        Return sFirmwarePath
+    End Function
+
+    Public Sub RunFirmwareUploader()
+        Dim sInstallerPath As String = GetFirmwareInstallerPath()
+        Dim sFirmwarePath As String = GetFirmwarePath()
+        Dim sRootFolder As String = IO.Path.GetDirectoryName(sInstallerPath)
+
         If (Not IO.File.Exists(sFirmwarePath)) Then
             Throw New ArgumentException("Firmware file does not exist")
         End If

PSMSVirtualDeviceManager/Classes/ClassLibusbDriver.vb

@@ -337,6 +337,13 @@ Public Class ClassLibusbDriver
     Public Sub New()
     End Sub
 
+    Public Function GetDriverInstallerPath() As String
+        Dim sRootFolder As String = IO.Path.Combine(IO.Path.GetDirectoryName(Application.ExecutablePath), DRV_WDI_ROOT_NAME)
+        Dim sInstallerPath As String = IO.Path.Combine(sRootFolder, DRV_WDI_INSTALLER_NAME)
+
+        Return sInstallerPath
+    End Function
+
     Public Function InstallPlaystation4CamDriver64() As ENUM_WDI_ERROR
         For Each mConfig As STRUC_DEVICE_DRIVER_INFO In DRV_PS4CAM_WINUSB_CONFIGS
             'Remove device first so we speed up the driver installation using WDI
@@ -739,8 +746,8 @@ Public Class ClassLibusbDriver
     End Function
 
     Private Function InternalInstallDriver64(mInfo As STRUC_DEVICE_DRIVER_INFO) As ENUM_WDI_ERROR
-        Dim sRootFolder As String = IO.Path.Combine(IO.Path.GetDirectoryName(Application.ExecutablePath), DRV_WDI_ROOT_NAME)
-        Dim sInstallerPath As String = IO.Path.Combine(sRootFolder, DRV_WDI_INSTALLER_NAME)
+        Dim sInstallerPath As String = GetDriverInstallerPath()
+        Dim sRootFolder As String = IO.Path.GetDirectoryName(sInstallerPath)
 
         Using mProcess As New Process
             mProcess.StartInfo.FileName = sInstallerPath

PSMSVirtualDeviceManager/FormMain.vb

@@ -24,6 +24,7 @@ Public Class FormMain
     Private g_bAutoClose As Boolean = False
     Private g_bAllowRestartPrompt As Boolean = False
     Private g_bInit As Boolean = False
+    Private g_ForceReinstall As Boolean = False
 
     Private g_mMutex As Threading.Mutex
     Private Const MUTEX_NAME As String = "PSMoveServiceEx_VDM_Mutex"
@@ -181,24 +182,35 @@ Public Class FormMain
             ' Windows Explorer keeps blocking files because the zip has been downlaoded from the internet.
             ' Sadly, blocked files can not run elevated such as for installing drivers.
             ' So abort right here.
-            Dim sExeConfig As String = String.Format("{0}.config", Application.ExecutablePath)
-
-            If (IO.File.Exists(sExeConfig)) Then
-                If (ClassUtils.FileHasZoneIdentifier(sExeConfig)) Then
-                    Dim sBlockedMessage As New Text.StringBuilder
-                    sBlockedMessage.AppendLine("Windows Security blocked PSMoveServiceEx - Virtual Device Manager because it has been downloaded from the internet or another computer.")
-                    sBlockedMessage.AppendLine()
-                    sBlockedMessage.AppendLine("Make sure you unblock the PSMoveServiceEx - Virtual Device Manager ZIP archive you have downloaded (Right-Click on the ZIP archive, open properties and check 'Unblock') before extracting it.")
-                    sBlockedMessage.AppendLine("You can also use a third-party archive manager such as 7zip or WinRAR to extract the archive instead.")
-                    sBlockedMessage.AppendLine()
-                    sBlockedMessage.AppendLine("Application will now close.")
-
-                    MessageBox.Show(sBlockedMessage.ToString, "Windows Security Warning", MessageBoxButtons.OK, MessageBoxIcon.Error)
-
-                    Environment.Exit(-1)
-                    End
+            Dim sCheckedFiles As New List(Of String)
+            sCheckedFiles.Add(String.Format("{0}.config", Application.ExecutablePath))
+            sCheckedFiles.Add((New ClassLibusbDriver).GetDriverInstallerPath())
+            sCheckedFiles.Add((New ClassCameraFirmwareWatchdog).GetFirmwareInstallerPath())
+
+            For Each sFile As String In sCheckedFiles
+                If (IO.File.Exists(sFile)) Then
+                    If (ClassUtils.FileHasZoneIdentifier(sFile)) Then
+                        Dim sBlockedMessage As New Text.StringBuilder
+                        sBlockedMessage.AppendLine("Windows Security blocked PSMoveServiceEx - Virtual Device Manager because it has been downloaded from the internet or another computer.")
+                        sBlockedMessage.AppendLine()
+                        sBlockedMessage.AppendLine("Make sure you unblock the PSMoveServiceEx - Virtual Device Manager ZIP archive you have downloaded (Right-Click on the ZIP archive, open properties and check 'Unblock') before extracting it.")
+                        sBlockedMessage.AppendLine()
+                        sBlockedMessage.AppendLine("Click OK to reinstall PSMoveServiceEx - Virtual Device Manager using the automatic updater to resolve the issue.")
+                        sBlockedMessage.AppendLine("Click CANCEL to close the program and do it manually.")
+
+                        Select Case (MessageBox.Show(sBlockedMessage.ToString, "Windows Security Warning", MessageBoxButtons.OKCancel, MessageBoxIcon.Error))
+                            Case DialogResult.OK
+                                g_ForceReinstall = True
+
+                            Case Else
+                                Environment.Exit(-1)
+                                End
+                        End Select
+
+                        Exit For
+                    End If
                 End If
-            End If
+            Next
         Catch ex As Exception
             ClassAdvancedExceptionLogging.WriteToLogMessageBox(ex)
         End Try
@@ -376,6 +388,10 @@ Public Class FormMain
             ClassAdvancedExceptionLogging.WriteToLogMessageBox(ex)
         End Try
 
+        If (g_ForceReinstall) Then
+            g_mUCStartPage.StartVdmUpdateDownload()
+        End If
+
         g_bAllowRestartPrompt = True
     End Sub