Merge pull request #9 from nethesis/ParamURL

nethesis/dev#6141

NethDialer/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.0.8.0")>
-<Assembly: AssemblyFileVersion("3.0.8.0")>
+<Assembly: AssemblyVersion("3.0.9.0")>
+<Assembly: AssemblyFileVersion("3.0.9.0")>

NethDialer/NethDialer.vbproj

@@ -25,7 +25,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>3.0.3.0</ApplicationVersion>
+    <ApplicationVersion>3.0.9.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -208,7 +208,7 @@
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
       <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 e x64%29</ProductName>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">

NethDialer/obj/Debug/NethDialer.vbproj.FileListAbsolute.txt

@@ -1,24 +1,3 @@
-C:\Users\Utente\source\repos\nethifier\NethDialer\bin\Debug\NethDialer.exe.config
-C:\Users\Utente\source\repos\nethifier\NethDialer\bin\Debug\NethDialer.exe.manifest
-C:\Users\Utente\source\repos\nethifier\NethDialer\bin\Debug\NethDialer.application
-C:\Users\Utente\source\repos\nethifier\NethDialer\bin\Debug\NethDialer.exe
-C:\Users\Utente\source\repos\nethifier\NethDialer\bin\Debug\NethDialer.pdb
-C:\Users\Utente\source\repos\nethifier\NethDialer\bin\Debug\NethDialer.xml
-C:\Users\Utente\source\repos\nethifier\NethDialer\bin\Debug\NethUtilities.dll
-C:\Users\Utente\source\repos\nethifier\NethDialer\bin\Debug\NethUtilities.pdb
-C:\Users\Utente\source\repos\nethifier\NethDialer\bin\Debug\NethUtilities.xml
-C:\Users\Utente\source\repos\nethifier\NethDialer\obj\Debug\NethDialer.vbproj.AssemblyReference.cache
-C:\Users\Utente\source\repos\nethifier\NethDialer\obj\Debug\NethDialer.Form1.resources
-C:\Users\Utente\source\repos\nethifier\NethDialer\obj\Debug\NethDialer.Resources.resources
-C:\Users\Utente\source\repos\nethifier\NethDialer\obj\Debug\NethDialer.vbproj.GenerateResource.cache
-C:\Users\Utente\source\repos\nethifier\NethDialer\obj\Debug\NethDialer.vbproj.CoreCompileInputs.cache
-C:\Users\Utente\source\repos\nethifier\NethDialer\obj\Debug\NethDialer.TrustInfo.xml
-C:\Users\Utente\source\repos\nethifier\NethDialer\obj\Debug\NethDialer.exe.manifest
-C:\Users\Utente\source\repos\nethifier\NethDialer\obj\Debug\NethDialer.application
-C:\Users\Utente\source\repos\nethifier\NethDialer\obj\Debug\NethDialer.vbproj.CopyComplete
-C:\Users\Utente\source\repos\nethifier\NethDialer\obj\Debug\NethDialer.exe
-C:\Users\Utente\source\repos\nethifier\NethDialer\obj\Debug\NethDialer.xml
-C:\Users\Utente\source\repos\nethifier\NethDialer\obj\Debug\NethDialer.pdb
 C:\Users\Utente\source\repos\nethifier-220222\NethDialer\bin\Debug\NethDialer.exe.config
 C:\Users\Utente\source\repos\nethifier-220222\NethDialer\bin\Debug\NethDialer.exe.manifest
 C:\Users\Utente\source\repos\nethifier-220222\NethDialer\bin\Debug\NethDialer.application

NethHeadPhone/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all values ​​or set default values ​​for revision and build numbers
 // using the asterisk '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.8.0")]
-[assembly: AssemblyFileVersion("3.0.8.0")]
+[assembly: AssemblyVersion("3.0.9.0")]
+[assembly: AssemblyFileVersion("3.0.9.0")]

NethLED/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.0.8.0")>
-<Assembly: AssemblyFileVersion("3.0.8.0")>
+<Assembly: AssemblyVersion("3.0.9.0")>
+<Assembly: AssemblyFileVersion("3.0.9.0")>

NethUtilities/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.0.8.0")>
-<Assembly: AssemblyFileVersion("3.0.8.0")>
+<Assembly: AssemblyVersion("3.0.9.0")>
+<Assembly: AssemblyFileVersion("3.0.9.0")>

Nethifier/CLS_COMMON.vb

@@ -45,8 +45,8 @@ Friend Class Config
                     P = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\" & Application.ProductName
                 End If
             Else
-                    'P = Application.StartupPath
-                    P = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\" & Application.ProductName
+                'P = Application.StartupPath
+                P = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\" & Application.ProductName
             End If
 
             If Not IO.Directory.Exists(P) Then
@@ -69,6 +69,9 @@ Friend Class Config
     Public AUTH_ADDRESS As String
     Public NOTIFY_TIMEOUT As Int32
     Public AUTO_LOGIN As Boolean = True
+    Public PARAM_CHECK As Boolean = False
+    Public PARAM_MODE As String
+    Public POPUP_POS As Int32 = 0
 
     Public Commands As Hashtable = New Hashtable
     Public LANGUAGE As String = "default"
@@ -110,6 +113,9 @@ Friend Class Config
         "AUTH_ADDRESS=" & Me.AUTH_ADDRESS & vbCrLf &
         "NOTIFY_TIMEOUT=" & Me.NOTIFY_TIMEOUT & vbCrLf &
         "AUTO_LOGIN=" & CStr(IIf(Me.AUTO_LOGIN, "1", "0")) & vbCrLf &
+        "PARAM_CHECK=" & CStr(IIf(Me.PARAM_CHECK, "1", "0")) & vbCrLf &
+        "PARAM_MODE=" & Me.PARAM_MODE & vbCrLf &
+        "POPUP_POS=" & Me.POPUP_POS & vbCrLf &
         "LANGUAGE=" & Me.LANGUAGE & vbCrLf &
         "HOTKEY_MOD_SPEED_DIAL=" & Me.HOTKEY_MOD_SPEED_DIAL & vbCrLf &
         "HOTKEY_MOD_REDIAL=" & Me.HOTKEY_MOD_REDIAL & vbCrLf &
@@ -160,6 +166,7 @@ Friend Class Config
             Dim RD As Boolean
             Dim HKSD As Boolean
             Dim HKRD As Boolean
+            Dim P_POS As Boolean
 
             For I As Integer = 0 To Par.Length - 1
                 Key = Trim(Par(I)) '.ToUpper
@@ -189,6 +196,16 @@ Friend Class Config
                     ElseIf Key.StartsWith("AUTO_LOGIN=") Then
                         Me.AUTO_LOGIN = (Val = "1")
                         X += 1
+                    ElseIf Key.StartsWith("PARAM_CHECK=") Then
+                        Me.PARAM_CHECK = (Val = "1")
+                        X += 1
+                    ElseIf Key.StartsWith("PARAM_MODE=") Then
+                        Me.PARAM_MODE = Val
+                        X += 1
+                    ElseIf Key.StartsWith("POPUP_POS=") Then
+                        P_POS = True
+                        Me.POPUP_POS = CInt(Val)
+                        X += 1
                     ElseIf Key.StartsWith("LANGUAGE=") Then
                         Me.LANGUAGE = Val
                         X += 1
@@ -251,6 +268,10 @@ Friend Class Config
                 Me.HOTKEY_MOD_SPEED_DIAL = &H2 'CTRL
             End If
 
+            If Not (P_POS) Then
+                Me.POPUP_POS = 8
+            End If
+
             _IsSaved = (X = 8)
         End If
 
@@ -517,7 +538,7 @@ Friend Class Helper
 
         Try
             ' Open the access token of the current process with TOKEN_QUERY.
-            If (Not NativeMethods.OpenProcessToken(Process.GetCurrentProcess.Handle, _
+            If (Not NativeMethods.OpenProcessToken(Process.GetCurrentProcess.Handle,
                 NativeMethods.TOKEN_QUERY, hToken)) Then
                 Throw New Win32Exception
             End If
@@ -530,8 +551,8 @@ Friend Class Helper
             End If
 
             ' Retrieve token elevation information.
-            If (Not NativeMethods.GetTokenInformation(hToken, _
-                TOKEN_INFORMATION_CLASS.TokenElevation, _
+            If (Not NativeMethods.GetTokenInformation(hToken,
+                TOKEN_INFORMATION_CLASS.TokenElevation,
                 pTokenElevation, cbTokenElevation, cbTokenElevation)) Then
                 Throw New Win32Exception
             End If
@@ -630,18 +651,18 @@ Friend Class Enums
         TokenElevationTypeLimited
     End Enum
 
-    <StructLayout(LayoutKind.Sequential)> _
+    <StructLayout(LayoutKind.Sequential)>
     Friend Structure SID_AND_ATTRIBUTES
         Public Sid As IntPtr
         Public Attributes As UInteger
     End Structure
 
-    <StructLayout(LayoutKind.Sequential)> _
+    <StructLayout(LayoutKind.Sequential)>
     Friend Structure TOKEN_ELEVATION
         Public TokenIsElevated As Integer
     End Structure
 
-    <StructLayout(LayoutKind.Sequential)> _
+    <StructLayout(LayoutKind.Sequential)>
     Friend Structure TOKEN_MANDATORY_LABEL
         Public Label As SID_AND_ATTRIBUTES
     End Structure
@@ -659,7 +680,7 @@ Friend Class SafeTokenHandle
         MyBase.SetHandle(handle)
     End Sub
 
-    <DllImport("kernel32.dll", CharSet:=CharSet.Auto, SetLastError:=True)> _
+    <DllImport("kernel32.dll", CharSet:=CharSet.Auto, SetLastError:=True)>
     Friend Shared Function CloseHandle(ByVal handle As IntPtr) As Boolean
     End Function
 
@@ -685,9 +706,9 @@ Friend Class NativeMethods
     Public Const TOKEN_ADJUST_DEFAULT As UInt32 = &H80
     Public Const TOKEN_ADJUST_SESSIONID As UInt32 = &H100
     Public Const TOKEN_READ As UInt32 = (STANDARD_RIGHTS_READ Or TOKEN_QUERY)
-    Public Const TOKEN_ALL_ACCESS As UInt32 = (STANDARD_RIGHTS_REQUIRED Or _
-        TOKEN_ASSIGN_PRIMARY Or TOKEN_DUPLICATE Or TOKEN_IMPERSONATE Or _
-        TOKEN_QUERY Or TOKEN_QUERY_SOURCE Or TOKEN_ADJUST_PRIVILEGES Or _
+    Public Const TOKEN_ALL_ACCESS As UInt32 = (STANDARD_RIGHTS_REQUIRED Or
+        TOKEN_ASSIGN_PRIMARY Or TOKEN_DUPLICATE Or TOKEN_IMPERSONATE Or
+        TOKEN_QUERY Or TOKEN_QUERY_SOURCE Or TOKEN_ADJUST_PRIVILEGES Or
         TOKEN_ADJUST_GROUPS Or TOKEN_ADJUST_DEFAULT Or TOKEN_ADJUST_SESSIONID)
 
 
@@ -702,45 +723,45 @@ Friend Class NativeMethods
     Public Const SECURITY_MANDATORY_HIGH_RID As Integer = &H3000
     Public Const SECURITY_MANDATORY_SYSTEM_RID As Integer = &H4000
 
-    <DllImport("advapi32", CharSet:=CharSet.Auto, SetLastError:=True)> _
-    Public Shared Function OpenProcessToken( _
-        ByVal hProcess As IntPtr, _
-        ByVal desiredAccess As UInt32, _
+    <DllImport("advapi32", CharSet:=CharSet.Auto, SetLastError:=True)>
+    Public Shared Function OpenProcessToken(
+        ByVal hProcess As IntPtr,
+        ByVal desiredAccess As UInt32,
         <Out()> ByRef hToken As SafeTokenHandle) _
         As <MarshalAs(UnmanagedType.Bool)> Boolean
     End Function
 
-    <DllImport("advapi32.dll", CharSet:=CharSet.Auto, SetLastError:=True)> _
-    Public Shared Function DuplicateToken( _
-        ByVal ExistingTokenHandle As SafeTokenHandle, _
-        ByVal ImpersonationLevel As SECURITY_IMPERSONATION_LEVEL, _
+    <DllImport("advapi32.dll", CharSet:=CharSet.Auto, SetLastError:=True)>
+    Public Shared Function DuplicateToken(
+        ByVal ExistingTokenHandle As SafeTokenHandle,
+        ByVal ImpersonationLevel As SECURITY_IMPERSONATION_LEVEL,
         <Out()> ByRef DuplicateTokenHandle As SafeTokenHandle) _
         As Boolean
     End Function
 
-    <DllImport("advapi32.dll", CharSet:=CharSet.Auto, SetLastError:=True)> _
-    Public Shared Function GetTokenInformation( _
-        ByVal hToken As SafeTokenHandle, _
-        ByVal tokenInfoClass As TOKEN_INFORMATION_CLASS, _
-        ByVal pTokenInfo As IntPtr, _
-        ByVal tokenInfoLength As Integer, _
+    <DllImport("advapi32.dll", CharSet:=CharSet.Auto, SetLastError:=True)>
+    Public Shared Function GetTokenInformation(
+        ByVal hToken As SafeTokenHandle,
+        ByVal tokenInfoClass As TOKEN_INFORMATION_CLASS,
+        ByVal pTokenInfo As IntPtr,
+        ByVal tokenInfoLength As Integer,
         <Out()> ByRef returnLength As Integer) _
         As <MarshalAs(UnmanagedType.Bool)> Boolean
     End Function
 
     Public Const BCM_SETSHIELD As UInt32 = &H160C
-    <DllImport("user32", CharSet:=CharSet.Auto, SetLastError:=True)> _
-    Public Shared Function SendMessage( _
-        ByVal hWnd As IntPtr, _
-        ByVal Msg As UInt32, _
-        ByVal wParam As Integer, _
+    <DllImport("user32", CharSet:=CharSet.Auto, SetLastError:=True)>
+    Public Shared Function SendMessage(
+        ByVal hWnd As IntPtr,
+        ByVal Msg As UInt32,
+        ByVal wParam As Integer,
         ByVal lParam As IntPtr) _
         As Integer
     End Function
 
-    <DllImport("advapi32.dll", CharSet:=CharSet.Auto, SetLastError:=True)> _
-    Public Shared Function GetSidSubAuthority( _
-        ByVal pSid As IntPtr, _
+    <DllImport("advapi32.dll", CharSet:=CharSet.Auto, SetLastError:=True)>
+    Public Shared Function GetSidSubAuthority(
+        ByVal pSid As IntPtr,
         ByVal nSubAuthority As UInt32) _
         As IntPtr
     End Function
@@ -756,7 +777,7 @@ Friend Class LinkHelper
     Private Enum SLGP_FLAGS
         SLGP_SHORTPATH = &H1
         SLGP_UNCPRIORITY = &H2
-         SLGP_RAWPATH = &H4
+        SLGP_RAWPATH = &H4
     End Enum
 
     <StructLayout(LayoutKind.Sequential, CharSet:=CharSet.Auto)>