TestEIn 1.6s2 :

- aggiornamento EgtInterface.
This commit is contained in:
Dario Sassi
2016-07-02 15:17:32 +00:00
parent e1f9b932ec
commit 6c9f42fc5a
2 changed files with 141 additions and 16 deletions
+139 -14
View File
@@ -6042,6 +6042,20 @@ Public Function EgtGetCurrMachineName(ByRef sMachineName As String) As Boolean
Return bOk
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetMachGroupCount")>
Private Function EgtGetMachGroupCount_32() As Integer
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetMachGroupCount")>
Private Function EgtGetMachGroupCount_64() As Integer
End Function
Public Function EgtGetMachGroupCount() As Integer
If IntPtr.Size = 4 Then
Return EgtGetMachGroupCount_32()
Else
Return EgtGetMachGroupCount_64()
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetFirstMachGroup")>
Private Function EgtGetFirstMachGroup_32() As Integer
End Function
@@ -6070,20 +6084,6 @@ Public Function EgtGetNextMachGroup(nMGroupId As Integer) As Integer
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetCurrMachGroup")>
Private Function EgtSetCurrMachGroup_32(nMGroupId As Integer) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetCurrMachGroup")>
Private Function EgtSetCurrMachGroup_64(nMGroupId As Integer) As Boolean
End Function
Public Function EgtSetCurrMachGroup(nMGroupId As Integer) As Boolean
If IntPtr.Size = 4 Then
Return EgtSetCurrMachGroup_32(nMGroupId)
Else
Return EgtSetCurrMachGroup_64(nMGroupId)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtAddMachGroup")>
Private Function EgtAddMachGroup_32(sName As String, sMachineName As String) As Integer
End Function
@@ -6112,6 +6112,85 @@ Public Function EgtRemoveMachGroup(nMGroupId As Integer) As Boolean
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetMachGroupName")>
Private Function EgtGetMachGroupName_32(nMGroupId As Integer, ByRef psMachGrpName As IntPtr) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetMachGroupName")>
Private Function EgtGetMachGroupName_64(nMGroupId As Integer, ByRef psMachGrpName As IntPtr) As Boolean
End Function
Public Function EgtGetMachGroupName(nMGroupId As Integer, ByRef sMachGrpName As String) As Boolean
Dim psMachGrpName As IntPtr
Dim bOk As Boolean
If IntPtr.Size = 4 Then
bOk = EgtGetMachGroupName_32(nMGroupId, psMachGrpName)
Else
bOk = EgtGetMachGroupName_64(nMGroupId, psMachGrpName)
End If
If bOk Then
sMachGrpName = Marshal.PtrToStringUni(psMachGrpName)
EgtFreeMemory(psMachGrpName)
Else
sMachGrpName = String.Empty
End If
Return bOk
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetMachGroupId")>
Private Function EgtGetMachGroupId_32(sMachGrpName As String) As Integer
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetMachGroupId")>
Private Function EgtGetMachGroupId_64(sMachGrpName As String) As Integer
End Function
Public Function EgtGetMachGroupId(sMachGrpName As String) As Integer
If IntPtr.Size = 4 Then
Return EgtGetMachGroupId_32(sMachGrpName)
Else
Return EgtGetMachGroupId_64(sMachGrpName)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetCurrMachGroup")>
Private Function EgtSetCurrMachGroup_32(nMGroupId As Integer) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtSetCurrMachGroup")>
Private Function EgtSetCurrMachGroup_64(nMGroupId As Integer) As Boolean
End Function
Public Function EgtSetCurrMachGroup(nMGroupId As Integer) As Boolean
If IntPtr.Size = 4 Then
Return EgtSetCurrMachGroup_32(nMGroupId)
Else
Return EgtSetCurrMachGroup_64(nMGroupId)
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtResetCurrMachGroup")>
Private Function EgtResetCurrMachGroup_32() As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtResetCurrMachGroup")>
Private Function EgtResetCurrMachGroup_64() As Boolean
End Function
Public Function EgtResetCurrMachGroup() As Boolean
If IntPtr.Size = 4 Then
Return EgtResetCurrMachGroup_32()
Else
Return EgtResetCurrMachGroup_64()
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetCurrMachGroup")>
Private Function EgtGetCurrMachGroup_32() As Integer
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetCurrMachGroup")>
Private Function EgtGetCurrMachGroup_64() As Integer
End Function
Public Function EgtGetCurrMachGroup() As Integer
If IntPtr.Size = 4 Then
Return EgtGetCurrMachGroup_32()
Else
Return EgtGetCurrMachGroup_64()
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtAddPhase")>
Private Function EgtAddPhase_32() As Integer
End Function
@@ -6485,6 +6564,29 @@ Public Function EgtSetTable(sTable As String) As Boolean
End If
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetTableName")>
Private Function EgtGetTableName_32(ByRef psTableName As IntPtr) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetTableName")>
Private Function EgtGetTableName_64(ByRef psTableName As IntPtr) As Boolean
End Function
Public Function EgtGetTableName(ByRef sTableName As String) As Boolean
Dim psTableName As IntPtr
Dim bOk As Boolean
If IntPtr.Size = 4 Then
bOk = EgtGetTableName_32(psTableName)
Else
bOk = EgtGetTableName_64(psTableName)
End If
If bOk Then
sTableName = Marshal.PtrToStringUni(psTableName)
EgtFreeMemory(psTableName)
Else
sTableName = String.Empty
End If
Return bOk
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtGetTableRef")>
Private Function EgtGetTableRef_32(nInd As Integer, ByRef ptPos As Point3d) As Boolean
End Function
@@ -6651,6 +6753,29 @@ Public Function EgtTdbGetNextTool(nFamily As Integer, ByRef sName As String, ByR
Return bOk
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbGetToolFromUUID")>
Private Function EgtTdbGetToolFromUUID_32(sTuuid As String, ByRef psName As IntPtr) As Boolean
End Function
<DllImport(EgtIntDll64, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbGetToolFromUUID")>
Private Function EgtTdbGetToolFromUUID_64(sTuuid As String, ByRef psName As IntPtr) As Boolean
End Function
Public Function EgtTdbGetToolFromUUID(sTuuid As String, ByRef sName As String) As Boolean
Dim psName As IntPtr
Dim bOk As Boolean
If IntPtr.Size = 4 Then
bOk = EgtTdbGetToolFromUUID_32(sTuuid, psName)
Else
bOk = EgtTdbGetToolFromUUID_64(sTuuid, psName)
End If
If bOk Then
sName = Marshal.PtrToStringUni(psName)
EgtFreeMemory(psName)
Else
sName = String.Empty
End If
Return bOk
End Function
<DllImport(EgtIntDll32, CharSet:=CharSet.Unicode, EntryPoint:="EgtTdbSetCurrTool")>
Private Function EgtTdbSetCurrTool_32(sName As String) As Boolean
End Function
+2 -2
View File
@@ -46,5 +46,5 @@ Imports System.Runtime.InteropServices
' utilizzando l'asterisco (*) come descritto di seguito:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.6.18.11")>
<Assembly: AssemblyFileVersion("1.6.18.11")>
<Assembly: AssemblyVersion("1.6.19.2")>
<Assembly: AssemblyFileVersion("1.6.19.2")>