From cca8015aae2c6b0892b38e7360f0ab7ee81e837d Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 1 Nov 2016 19:09:53 +0000 Subject: [PATCH] TestEIn 1.6w1 : - aggiornamento. --- EgtInterface.vb | 18 +++++++++--------- My Project/AssemblyInfo.vb | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/EgtInterface.vb b/EgtInterface.vb index 5fbf221..dcffe86 100644 --- a/EgtInterface.vb +++ b/EgtInterface.vb @@ -8636,24 +8636,24 @@ Public Function EgtSimHome() As Boolean End Function -Private Function EgtSimGetAxisInfoPos_32(nInd As Integer, ByRef psName As IntPtr, ByRef dVal As Double) As Boolean +Private Function EgtSimGetAxisInfoPos_32(nInd As Integer, ByRef psToken As IntPtr, ByRef bLinear As Boolean, ByRef dVal As Double) As Boolean End Function -Private Function EgtSimGetAxisInfoPos_64(nInd As Integer, ByRef psName As IntPtr, ByRef dVal As Double) As Boolean +Private Function EgtSimGetAxisInfoPos_64(nInd As Integer, ByRef psToken As IntPtr, ByRef bLinear As Boolean, ByRef dVal As Double) As Boolean End Function -Public Function EgtSimGetAxisInfoPos(nInd As Integer, ByRef sName As String, ByRef dVal As Double) As Boolean - Dim psName As IntPtr +Public Function EgtSimGetAxisInfoPos(nInd As Integer, ByRef sToken As String, ByRef bLinear As Boolean, ByRef dVal As Double) As Boolean + Dim psToken As IntPtr Dim bOk As Boolean If IntPtr.Size = 4 Then - bOk = EgtSimGetAxisInfoPos_32(nInd, psName, dVal) + bOk = EgtSimGetAxisInfoPos_32(nInd, psToken, bLinear, dVal) Else - bOk = EgtSimGetAxisInfoPos_64(nInd, psName, dVal) + bOk = EgtSimGetAxisInfoPos_64(nInd, psToken, bLinear, dVal) End If If bOk Then - sName = Marshal.PtrToStringUni(psName) - EgtFreeMemory(psName) + sToken = Marshal.PtrToStringUni(psToken) + EgtFreeMemory(psToken) Else - sName = String.Empty + sToken = String.Empty End If Return bOk End Function diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 0d4d509..7c836cd 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices ' utilizzando l'asterisco (*) come descritto di seguito: ' - - + +